diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 00000000..ed4bc036
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+_redirects
\ No newline at end of file
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
new file mode 100644
index 00000000..d23208fb
--- /dev/null
+++ b/.idea/jsLibraryMappings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <includedPredefinedLibrary name="Node.js Core" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/404.md b/src/404.md
index 62f8a89f..ba53cccc 100644
--- a/src/404.md
+++ b/src/404.md
@@ -1,13 +1,22 @@
 ---
-title: Oops! Not Found
+title: '404'
 layout: default
 permalink: 404.html
 ---
-
-<h2
-  class="m-0 text-xl font-black leading-tight tracking-normal dark:text-gray-200 md:text-2xl mb-2"
->
-  {{ title }}
-</h2>
-
-Sorry, looks like there's nothing here.
+{% image './src/assets/img/404.jpg', title, 'w-full rounded-lg', '1200px' %}
+<div class="text-center w-full">
+  <h2 class="m-0 text-4xl font-black leading-tight tracking-normal dark:text-gray-200 md:text-6xl mb-4">{{ title }}</h2>
+  <h3 class="m-0 text-xl font-bold leading-tight tracking-normal dark:text-gray-200 md:text-2xl mb-6">
+    What kind of idiots do you have working here?
+  </h3>
+  <div class="flex justify-center not-prose">
+    <a href="/">
+      <button class="flex flex-row items-start md:items-center font-semibold py-2 px-4 rounded-full text-white dark:text-gray-900 !bg-purple-600 dark:bg-purple-400 hover:bg-purple-500">
+        <span class="pt-1 md:pt-0 mr-1">
+          {% heroicon "outline" "receipt-percent" "Receipt" "width=20 height=20" %}
+        </span>
+        <span>Skip out on the room service bill</span>
+      </button>
+    </a>
+  </div>
+</div>
diff --git a/src/_includes/forms/search.liquid b/src/_includes/forms/search.liquid
new file mode 100644
index 00000000..3caba2f2
--- /dev/null
+++ b/src/_includes/forms/search.liquid
@@ -0,0 +1,26 @@
+<link href="/_pagefind/pagefind-ui.css" rel="stylesheet">
+<style>
+  :root {
+    --pagefind-ui-font: InterVariable, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+    --pagefind-ui-primary: #374151;
+    --pagefind-ui-text: #374151;
+  }
+  @media (prefers-color-scheme: dark) {
+    :root {
+      --pagefind-ui-primary: #e5e7eb;
+      --pagefind-ui-text: #e5e7eb;
+      --pagefind-ui-background: #152028;
+      --pagefind-ui-border: #152028;
+      --pagefind-ui-tag: #152028;
+    }
+  }
+</style>
+<div id="search" class="search"></div>
+<script src="/_pagefind/pagefind-ui.js" onload="new PagefindUI({ element: '#search', showImages: false });"></script>
+<script>
+  if (plausible) {
+    document.querySelector('#search').addEventListener('focusout', (e) => {
+      plausible('Search', { props: { query: e.target.value }})
+    })
+  }
+</script>
\ No newline at end of file
diff --git a/src/assets/img/404.jpg b/src/assets/img/404.jpg
new file mode 100644
index 00000000..92c0924f
Binary files /dev/null and b/src/assets/img/404.jpg differ
diff --git a/src/assets/img/og/adblocks.webp b/src/assets/img/og/adblocks.webp
deleted file mode 100644
index 025e149b..00000000
Binary files a/src/assets/img/og/adblocks.webp and /dev/null differ
diff --git a/src/assets/img/og/fastmail-workflow.webp b/src/assets/img/og/fastmail-workflow.webp
deleted file mode 100644
index 6d6fb853..00000000
Binary files a/src/assets/img/og/fastmail-workflow.webp and /dev/null differ
diff --git a/src/search.md b/src/search.md
index 969a2a01..41c1d934 100644
--- a/src/search.md
+++ b/src/search.md
@@ -17,29 +17,4 @@ meta:
   image:
     src: https://coryd.dev/assets/img/avatar.webp
 ---
-<link href="/_pagefind/pagefind-ui.css" rel="stylesheet">
-<style>
-  :root {
-    --pagefind-ui-font: InterVariable, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-    --pagefind-ui-primary: #374151;
-    --pagefind-ui-text: #374151;
-  }
-  @media (prefers-color-scheme: dark) {
-    :root {
-      --pagefind-ui-primary: #e5e7eb;
-      --pagefind-ui-text: #e5e7eb;
-      --pagefind-ui-background: #152028;
-      --pagefind-ui-border: #152028;
-      --pagefind-ui-tag: #152028;
-    }
-  }
-</style>
-<div id="search" class="search"></div>
-<script src="/_pagefind/pagefind-ui.js" onload="new PagefindUI({ element: '#search', showImages: false });"></script>
-<script>
-  if (plausible) {
-    document.querySelector('#search').addEventListener('focusout', (e) => {
-        plausible('Search', { props: { query: e.target.value }})
-    })
-  }
-</script>
+{% include "forms/search.liquid" %}