diff --git a/content/blog/prism-changes-feb-april-2021/index.md b/content/blog/prism-changes-feb-april-2021/index.md
index 614d076..dd10f05 100644
--- a/content/blog/prism-changes-feb-april-2021/index.md
+++ b/content/blog/prism-changes-feb-april-2021/index.md
@@ -35,13 +35,7 @@ Right now SDL is used for Windows and Linux, and I have no plans on supporting i
 
 ### Windows now has multiviewports!
 
-{{< rawhtml >}}
-
-<video width=100% controls>
-<source src="weewoo.webm">
-</video>
-
-{{< /rawhtml >}}
+{{< video "weewoo.webm" >}}
 
 This is a pretty and clear nice benefit from using the SDL backend, because now it gets multiviewport support for free! If you've never seen this [dear imgui feature before](https://github.com/ocornut/imgui/wiki/Multi-Viewports), it's really cool to see it in action. It allows regular imgui windows to be dragged outside the main window, and enables some really cool workflows and use-cases you would normally see in other GUI toolkits like Qt and GTK.
 
diff --git a/content/blog/prism-changes-may-march-2022/index.md b/content/blog/prism-changes-may-march-2022/index.md
index cd5d710..60a4bb2 100644
--- a/content/blog/prism-changes-may-march-2022/index.md
+++ b/content/blog/prism-changes-may-march-2022/index.md
@@ -51,13 +51,7 @@ Also part of this slew of changes is MoltenVK being fully supported by the Vulka
 There's now a real, working example application available
 right in the source code repository. This has technically been around since the last changelog, but now it's way more involved and focused around recreating some nice screenshots in the README.
 
-{{< rawhtml >}}
-
-<video width=100% controls>
-<source src="JezVKVk.webm">
-</video>
-
-{{< /rawhtml >}}
+{{< video "JezVKVk.webm" >}}
 
 ### Material system is being reworked
 I ripped out the old material system, and now it's going to be replaced with something way, way simpler. It was insanely complex, and had really no reason to exist. It was also the cause of a bunch of bugs.
diff --git a/content/guestbook.md b/content/guestbook.md
index a5990a1..ee09c28 100644
--- a/content/guestbook.md
+++ b/content/guestbook.md
@@ -4,8 +4,4 @@ title: "Guestbook"
 
 My guestbook is currently hosted by [123Guestbook](https://123guestbook.com/). They have a seperate [Terms of Service](https://www.123guestbook.com/tos) and [Privacy Policy](https://www.123guestbook.com/privacy-policy).
 
-{{< rawhtml >}}
-
-<iframe style="width:100%" height="500px" src="https://redstrate.123Guestbook.com/"/>
-
-{{< /rawhtml >}}
+{{< guestbook >}}
diff --git a/themes/red/layouts/shortcodes/guestbook.html b/themes/red/layouts/shortcodes/guestbook.html
new file mode 100644
index 0000000..6eeb538
--- /dev/null
+++ b/themes/red/layouts/shortcodes/guestbook.html
@@ -0,0 +1,2 @@
+<iframe style="width:100%" height="500px" src="https://redstrate.123Guestbook.com/">
+</iframe>
diff --git a/themes/red/layouts/shortcodes/video.html b/themes/red/layouts/shortcodes/video.html
new file mode 100644
index 0000000..fdc9ccb
--- /dev/null
+++ b/themes/red/layouts/shortcodes/video.html
@@ -0,0 +1,3 @@
+<video width=100% controls>
+    <source src="{{ .Get 0 }}">
+</video>