diff --git a/src/routes/(site)/+error.svelte b/src/routes/(site)/+error.svelte
deleted file mode 100644
index 74aa30e11..000000000
--- a/src/routes/(site)/+error.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-<script>
-	import { page } from '$app/stores';
-</script>
-
-<div class="error">
-	<h1>Oopsie-daisy</h1>
-	{#if $page?.error?.message}
-		<p>{$page.error.message}</p>
-	{:else}
-		<p>Something went wrong. Don't worry, we use Sentry!</p>
-	{/if}
-</div>
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
new file mode 100644
index 000000000..6b305b4c2
--- /dev/null
+++ b/src/routes/+error.svelte
@@ -0,0 +1,30 @@
+<script lang="ts">
+	import { page } from '$app/stores';
+	import Layout from './(site)/+layout.svelte';
+	import type { UserWithRoles } from '$/server/auth/users';
+
+	// error page does not automatically infer layout data...
+	export let data: {
+		user: UserWithRoles,
+		user_theme: string;
+	};
+	$: ({ user, user_theme } = data);
+</script>
+
+<!-- Manually render (site) layout around error -->
+<Layout data={{ user: user, user_theme }}>
+	<div>
+		<h2>Oopsie-daisy</h2>
+		{#if $page?.error?.message}
+			<p class="error">{$page.error.message}</p>
+		{:else}
+			<p class="error">Something went wrong. Don't worry, we use Sentry!</p>
+		{/if}
+	</div>
+</Layout>
+
+<style>
+	.error {
+		color: var(--warning);
+	}
+</style>
\ No newline at end of file
diff --git a/src/routes/(site)/+layout.server.ts b/src/routes/+layout.server.ts
similarity index 100%
rename from src/routes/(site)/+layout.server.ts
rename to src/routes/+layout.server.ts