diff --git a/web/renderer/_error.page.vue b/web/pages/_error/+Page.vue
similarity index 79%
rename from web/renderer/_error.page.vue
rename to web/pages/_error/+Page.vue
index ef58d080..e3bde21c 100644
--- a/web/renderer/_error.page.vue
+++ b/web/pages/_error/+Page.vue
@@ -6,11 +6,11 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
-import ErrorLayout from '~/layouts/error.vue'
+import ErrorLayout from '../../layouts/error.vue'
 import '~/assets/css/tailwind.css'
 import '~/assets/css/transitions.css'
 import '~/assets/css/fonts.css'
-import Error from '../pages/error.vue'
+import Error from '../error.vue'
 
 export default defineComponent({
   components: {
diff --git a/web/pages/_error/+config.h.ts b/web/pages/_error/+config.h.ts
new file mode 100644
index 00000000..e334bada
--- /dev/null
+++ b/web/pages/_error/+config.h.ts
@@ -0,0 +1,7 @@
+export default {
+  passToClient: [
+    'errorWhileRendering',
+    'errorMessage',
+    'statusCode',
+  ],
+}
diff --git a/web/pages/_error/+onRenderClient.ts b/web/pages/_error/+onRenderClient.ts
new file mode 100644
index 00000000..8feee60b
--- /dev/null
+++ b/web/pages/_error/+onRenderClient.ts
@@ -0,0 +1,9 @@
+import { createApp } from './error-app'
+import type { PageContext } from '../../renderer/types'
+
+export { onRenderClient }
+
+async function onRenderClient(pageContext: PageContext) {
+  const params = createApp(pageContext)
+  params.app.mount('#app')
+}
diff --git a/web/renderer/_error.page.server.ts b/web/pages/_error/+onRenderHtml.ts
similarity index 78%
rename from web/renderer/_error.page.server.ts
rename to web/pages/_error/+onRenderHtml.ts
index c6b12c27..c50e449f 100644
--- a/web/renderer/_error.page.server.ts
+++ b/web/pages/_error/+onRenderHtml.ts
@@ -1,19 +1,12 @@
 import { renderToString } from '@vue/server-renderer'
 import { dangerouslySkipEscape, escapeInject } from 'vike/server'
 import { createApp } from './error-app'
-import type { PageContext } from './types'
+import type { PageContext } from '../../renderer/types'
 import { renderSSRHead } from '@unhead/ssr'
 
-export { passToClient }
-export { render }
+export { onRenderHtml }
 
-const passToClient = [
-  'errorWhileRendering',
-  'errorMessage',
-  'statusCode',
-]
-
-async function render(pageContext: PageContext) {
+async function onRenderHtml(pageContext: PageContext) {
   const { app, head } = createApp(pageContext)
 
   const string = await renderToString(app)
diff --git a/web/renderer/error-app.ts b/web/pages/_error/error-app.ts
similarity index 88%
rename from web/renderer/error-app.ts
rename to web/pages/_error/error-app.ts
index bd633cf4..f872c9ff 100644
--- a/web/renderer/error-app.ts
+++ b/web/pages/_error/error-app.ts
@@ -1,6 +1,6 @@
 import { createSSRApp } from 'vue'
-import type { PageContext } from './types'
-import { setPageContext } from './usePageContext'
+import type { PageContext } from '../../renderer/types'
+import { setPageContext } from '../../renderer/usePageContext'
 import { createHead } from '@unhead/vue'
 import { ClientOnly } from '@schneefux/klicker/components'
 
diff --git a/web/renderer/all.page.vue b/web/renderer/+Page.vue
similarity index 100%
rename from web/renderer/all.page.vue
rename to web/renderer/+Page.vue
diff --git a/web/renderer/+config.h.ts b/web/renderer/+config.h.ts
new file mode 100644
index 00000000..44d91513
--- /dev/null
+++ b/web/renderer/+config.h.ts
@@ -0,0 +1,13 @@
+export default {
+  passToClient: [
+    'vueQueryState',
+    'piniaState',
+    'errorWhileRendering',
+    'envConfig',
+    'validated',
+    'statusCode',
+    'redirectTo',
+    'refs',
+    'localeMessages',
+  ],
+}
diff --git a/web/renderer/all.page.server.ts b/web/renderer/+onBeforeRender.ts
similarity index 52%
rename from web/renderer/all.page.server.ts
rename to web/renderer/+onBeforeRender.ts
index 5aede3cc..51b6c2a1 100644
--- a/web/renderer/all.page.server.ts
+++ b/web/renderer/+onBeforeRender.ts
@@ -1,29 +1,8 @@
-import { renderToString } from '@vue/server-renderer'
-import { dangerouslySkipEscape, escapeInject } from 'vike/server'
-import { createApp } from './app'
 import type { Config, PageContext } from './types'
-import type { PageContextBuiltInServer } from 'vike/types'
-import { dehydrate } from '@tanstack/vue-query'
-import { renderSSRHead } from '@unhead/ssr'
-import SuperJSON from 'superjson'
 import Sentry from '@sentry/vue'
 import { getTraduoraToken, TraduoraToken } from '@/locales'
 
 export { onBeforeRender }
-export { passToClient }
-export { render }
-
-const passToClient = [
-  'vueQueryState',
-  'piniaState',
-  'errorWhileRendering',
-  'envConfig',
-  'validated',
-  'statusCode',
-  'redirectTo',
-  'refs',
-  'localeMessages',
-]
 
 let cachedTraduoraToken: TraduoraToken | undefined = undefined
 async function onBeforeRender(pageContext: PageContext) {
@@ -73,44 +52,3 @@ async function onBeforeRender(pageContext: PageContext) {
     }
   }
 }
-
-async function render(pageContext: PageContextBuiltInServer & PageContext) {
-  const { app, head, pinia, router, queryClient } = createApp(pageContext)
-
-  let firstError: unknown = undefined
-  app.config.errorHandler = (err) => {
-    firstError = firstError ?? err
-    return false
-  }
-  router.push(pageContext.urlOriginal)
-  await router.isReady()
-
-  let string = await renderToString(app)
-  if (firstError) {
-    throw firstError
-  }
-
-  const payload = await renderSSRHead(head)
-  const vueQueryState = dehydrate(queryClient)
-  const piniaState = SuperJSON.stringify(pinia.state.value)
-
-  const documentHtml = escapeInject`<!DOCTYPE html>
-    <html${dangerouslySkipEscape(payload.htmlAttrs)}>
-      <head>
-        ${dangerouslySkipEscape(payload.headTags)}
-      </head>
-      <body${dangerouslySkipEscape(payload.bodyAttrs)}>
-        ${dangerouslySkipEscape(payload.bodyTagsOpen)}
-        <div id="app">${dangerouslySkipEscape(string)}</div>
-        ${dangerouslySkipEscape(payload.bodyTags)}
-      </body>
-    </html>`
-
-  return {
-    documentHtml,
-    pageContext: {
-      vueQueryState,
-      piniaState,
-    },
-  }
-}
diff --git a/web/renderer/all.page.client.ts b/web/renderer/+onRenderClient.ts
similarity index 95%
rename from web/renderer/all.page.client.ts
rename to web/renderer/+onRenderClient.ts
index 28b0b007..72038013 100644
--- a/web/renderer/all.page.client.ts
+++ b/web/renderer/+onRenderClient.ts
@@ -11,9 +11,9 @@ import {
   RewriteFrames as RewriteFramesIntegration,
 } from '@sentry/integrations'
 
-export { render }
+export { onRenderClient }
 
-async function render(pageContext: PageContext) {
+async function onRenderClient(pageContext: PageContext) {
   const params = createApp(pageContext)
 
   Sentry.init({
diff --git a/web/renderer/+onRenderHtml.ts b/web/renderer/+onRenderHtml.ts
new file mode 100644
index 00000000..064437fb
--- /dev/null
+++ b/web/renderer/+onRenderHtml.ts
@@ -0,0 +1,51 @@
+import { renderToString } from '@vue/server-renderer'
+import { dangerouslySkipEscape, escapeInject } from 'vike/server'
+import { createApp } from './app'
+import type { PageContext } from './types'
+import type { PageContextBuiltInServer } from 'vike/types'
+import { dehydrate } from '@tanstack/vue-query'
+import { renderSSRHead } from '@unhead/ssr'
+import SuperJSON from 'superjson'
+
+export { onRenderHtml }
+
+async function onRenderHtml(pageContext: PageContextBuiltInServer & PageContext) {
+  const { app, head, pinia, router, queryClient } = createApp(pageContext)
+
+  let firstError: unknown = undefined
+  app.config.errorHandler = (err) => {
+    firstError = firstError ?? err
+    return false
+  }
+  router.push(pageContext.urlOriginal)
+  await router.isReady()
+
+  let string = await renderToString(app)
+  if (firstError) {
+    throw firstError
+  }
+
+  const payload = await renderSSRHead(head)
+  const vueQueryState = dehydrate(queryClient)
+  const piniaState = SuperJSON.stringify(pinia.state.value)
+
+  const documentHtml = escapeInject`<!DOCTYPE html>
+    <html${dangerouslySkipEscape(payload.htmlAttrs)}>
+      <head>
+        ${dangerouslySkipEscape(payload.headTags)}
+      </head>
+      <body${dangerouslySkipEscape(payload.bodyAttrs)}>
+        ${dangerouslySkipEscape(payload.bodyTagsOpen)}
+        <div id="app">${dangerouslySkipEscape(string)}</div>
+        ${dangerouslySkipEscape(payload.bodyTags)}
+      </body>
+    </html>`
+
+  return {
+    documentHtml,
+    pageContext: {
+      vueQueryState,
+      piniaState,
+    },
+  }
+}
diff --git a/web/renderer/all.page.route.ts b/web/renderer/+route.ts
similarity index 100%
rename from web/renderer/all.page.route.ts
rename to web/renderer/+route.ts
diff --git a/web/renderer/_error.page.client.ts b/web/renderer/_error.page.client.ts
deleted file mode 100644
index b5cee809..00000000
--- a/web/renderer/_error.page.client.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createApp } from './error-app'
-import type { PageContext } from './types'
-
-export { render }
-
-async function render(pageContext: PageContext) {
-  const params = createApp(pageContext)
-  params.app.mount('#app')
-}