diff --git a/AGENTS.md b/AGENTS.md
index 7ff02d14..a3638fd5 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -2,8 +2,8 @@
 
 ## Project Structure & Module Organization
 
-- `src/routes` contains SvelteKit routes, including dynamic handle pages in `src/routes/[handle]/[[page]]`, edit flows in `src/routes/[handle]/[[page]]/edit` and `src/routes/edit`, and API endpoints under `src/routes/api`.
-- `src/lib` holds reusable modules: card implementations in `src/lib/cards`, shared UI in `src/lib/components`, OAuth helpers in `src/lib/oauth`, and site data/loading in `src/lib/website`.
+- `src/routes` contains SvelteKit routes. User-facing pages are under `src/routes/[[actor=actor]]/(pages)/` with an optional actor param (double brackets). When omitted, the actor is resolved from custom domain KV or `PUBLIC_HANDLE`. API endpoints live under `src/routes/api` and `src/routes/[[actor=actor]]/api`.
+- `src/lib` holds reusable modules: card implementations in `src/lib/cards`, shared UI in `src/lib/components`, ATProto/OAuth helpers in `src/lib/atproto`, and site data/loading in `src/lib/website`.
 - Root app setup lives in `src/app.html` and `src/app.css`.
 - `static` is for public assets served as-is.
 - `docs` includes contributor-facing docs like custom cards and self-hosting.
diff --git a/CLAUDE.md b/CLAUDE.md
index 94ea2492..3ece8fbd 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -61,12 +61,13 @@ Grid margins: 16px desktop, 12px mobile.
 - See e.g. `src/lib/cards/EmbedCard/` and `src/lib/cards/LivestreamCard/` for examples of implementation.
 - Cards should be styled to work in light and dark mode (with `dark:` class modifier) as well as when cards are colorful (= bg-color-500 for the card background) (with `accent:` modifier).
 
-**ATProto Integration (`src/lib/oauth/`):**
+**ATProto Integration (`src/lib/atproto/`):**
 
 - `auth.svelte.ts` - OAuth client state and login/logout flow using `@atcute/oauth-browser-client`
 - `atproto.ts` - ATProto API helpers: `resolveHandle`, `listRecords`, `getRecord`, `putRecord`, `deleteRecord`, `uploadImage`
 - Data is stored in user's PDS under collection `app.blento.card`
 - **Important**: ATProto does not allow floating point numbers in records. All numeric values must be integers.
+- Login redirect: before OAuth redirect, the current path is saved to `localStorage` (`login-redirect`) and restored after callback
 
 **Caching (`src/lib/cache.ts`):**
 
@@ -88,13 +89,18 @@ Grid margins: 16px desktop, 12px mobile.
 
 ### Routes
 
-- `/` - Landing page
-- `/[handle]/[[page]]` - View a user's bento site (loads from their PDS)
-- `/[handle]/[[page]]/edit` - Edit mode for a user's site page
-- `/edit` - Self-hosted edit mode
-- `/api/links` - Link preview API
+All user-facing pages live under `src/routes/[[actor=actor]]/(pages)/` using an optional `[[actor=actor]]` param. When the actor param is omitted, the layout resolves the actor from a custom domain (via KV lookup) or the `PUBLIC_HANDLE` env var.
+
+- `/` - Landing page (or a user's site when on a custom domain)
+- `/[actor]` - View a user's bento site (loads from their PDS)
+- `/[actor]/edit` - Edit mode for a user's main page
+- `/[actor]/p/[page]` - View a named sub-page
+- `/[actor]/p/[page]/edit` - Edit mode for a sub-page
+- `/[actor]/p/[page]/copy` - Copy a page to your own site
+- `/[actor]/og.png` - Dynamic OG image generation
+- `/[actor]/api/refresh` - Cache refresh endpoint
+- `/[actor]/.well-known/site.standard.publication` - Site publication metadata
 - `/api/geocoding` - Geocoding API for map cards
-- `/api/reloadRecent`, `/api/update` - Additional data endpoints
 
 ### Item Type
 
diff --git a/src/lib/atproto/auth.svelte.ts b/src/lib/atproto/auth.svelte.ts
index b9dd5e29..1715862e 100644
--- a/src/lib/atproto/auth.svelte.ts
+++ b/src/lib/atproto/auth.svelte.ts
@@ -126,6 +126,8 @@ async function startAuthorization(identity?: ActorIdentifier) {
 		scope: metadata.scope
 	});
 
+	localStorage.setItem('login-redirect', location.pathname + location.search);
+
 	// let browser persist local storage
 	await new Promise((resolve) => setTimeout(resolve, 200));
 
diff --git a/src/lib/website/EditBar.svelte b/src/lib/website/EditBar.svelte
index 7ed8dfd6..1fd53a91 100644
--- a/src/lib/website/EditBar.svelte
+++ b/src/lib/website/EditBar.svelte
@@ -63,7 +63,7 @@
 	function getShareUrl() {
 		const base = typeof window !== 'undefined' ? window.location.origin : '';
 		const pagePath =
-			data.page && data.page !== 'blento.self' ? `/${data.page.replace('blento.', '')}` : '';
+			data.page && data.page !== 'blento.self' ? `/p/${data.page.replace('blento.', '')}` : '';
 		return `${base}/${data.handle}${pagePath}`;
 	}
 
diff --git a/src/lib/website/SaveModal.svelte b/src/lib/website/SaveModal.svelte
index 0be64218..dd8d42a9 100644
--- a/src/lib/website/SaveModal.svelte
+++ b/src/lib/website/SaveModal.svelte
@@ -15,7 +15,7 @@
 
 	function getShareUrl() {
 		const base = typeof window !== 'undefined' ? window.location.origin : '';
-		const pagePath = page && page !== 'blento.self' ? `/${page.replace('blento.', '')}` : '';
+		const pagePath = page && page !== 'blento.self' ? `/p/${page.replace('blento.', '')}` : '';
 		return `${base}/${handle}${pagePath}`;
 	}
 
diff --git a/src/routes/(auth)/oauth/callback/+page.svelte b/src/routes/(auth)/oauth/callback/+page.svelte
index 097a332a..99b8899c 100644
--- a/src/routes/(auth)/oauth/callback/+page.svelte
+++ b/src/routes/(auth)/oauth/callback/+page.svelte
@@ -7,9 +7,18 @@
 
 	let startedErrorTimer = $state();
 
+	let hasRedirected = $state(false);
+
 	$effect(() => {
 		if (user.profile) {
-			goto('/' + getHandleOrDid(user.profile) + '/edit', {});
+			if (hasRedirected) return;
+
+			const redirect = localStorage.getItem('login-redirect');
+			localStorage.removeItem('login-redirect');
+			console.log('redirect', redirect);
+			goto(redirect || '/' + getHandleOrDid(user.profile) + '/edit', {});
+
+			hasRedirected = true;
 		}
 
 		if (!user.isInitializing && !startedErrorTimer) {
@@ -17,14 +26,14 @@
 
 			setTimeout(() => {
 				showError = true;
-			}, 3000);
+			}, 5000);
 		}
 	});
 </script>
 
-{#if user.isInitializing || !showError}
+{#if !showError}
 	<div class="flex min-h-screen w-full items-center justify-center text-3xl">Loading...</div>
-{:else if showError}
+{:else}
 	<div class="flex min-h-screen w-full items-center justify-center text-3xl">
 		<span class="max-w-xl text-center font-medium"
 			>There was an error signing you in, please go back to the
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 5a9eff70..4f99a9de 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -18,13 +18,6 @@
 
 	onMount(() => {
 		initClient({ customDomain: data.customDomain });
-
-		const error = page.url.searchParams.get('error');
-		if (error) {
-			const msg = errorMessages[error]?.(page.url.searchParams) ?? error;
-			toast.error(msg);
-			goto(page.url.pathname, { replaceState: true });
-		}
 	});
 </script>
 
@@ -33,6 +26,7 @@
 </Tooltip.Provider>
 
 <ThemeToggle class="fixed top-2 left-2 z-10" />
+
 <Toaster />
 
 {#if videoPlayer.id}
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
deleted file mode 100644
index c5c69968..00000000
--- a/src/routes/+page.server.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { loadData } from '$lib/website/load';
-import { env } from '$env/dynamic/public';
-import { env as privateEnv } from '$env/dynamic/private';
-import { createCache } from '$lib/cache';
-import type { ActorIdentifier } from '@atcute/lexicons';
-
-export async function load({ platform, request }) {
-	const handle = env.PUBLIC_HANDLE;
-
-	const kv = platform?.env?.CUSTOM_DOMAINS;
-
-	const cache = createCache(platform);
-	const customDomain = request.headers.get('X-Custom-Domain')?.toLocaleLowerCase();
-
-	if (kv && customDomain) {
-		try {
-			const did = await kv.get(customDomain);
-
-			if (did) return await loadData(did as ActorIdentifier, cache, false, 'self', privateEnv);
-		} catch (error) {
-			console.error('failed to get custom domain kv', error);
-		}
-	}
-
-	return await loadData(handle as ActorIdentifier, cache, false, 'self', privateEnv);
-}
diff --git a/src/routes/[[actor=actor]]/(pages)/+layout.server.ts b/src/routes/[[actor=actor]]/(pages)/+layout.server.ts
new file mode 100644
index 00000000..69e6cb2e
--- /dev/null
+++ b/src/routes/[[actor=actor]]/(pages)/+layout.server.ts
@@ -0,0 +1,40 @@
+import { loadData } from '$lib/website/load';
+import { env } from '$env/dynamic/private';
+import { error } from '@sveltejs/kit';
+import { createCache } from '$lib/cache';
+import type { ActorIdentifier } from '@atcute/lexicons';
+import { env as publicEnv } from '$env/dynamic/public';
+
+export async function load({ params, platform, request }) {
+	if (env.PUBLIC_IS_SELFHOSTED) error(404);
+
+	const cache = createCache(platform);
+
+	const customDomain = request.headers.get('X-Custom-Domain')?.toLowerCase();
+
+	let actor: ActorIdentifier | undefined = params.actor;
+
+	if (!actor) {
+		const kv = platform?.env?.CUSTOM_DOMAINS;
+
+		if (kv && customDomain) {
+			try {
+				const did = await kv.get(customDomain);
+
+				if (did) actor = did as ActorIdentifier;
+			} catch (error) {
+				console.error('failed to get custom domain kv', error);
+			}
+		} else {
+			actor = publicEnv.PUBLIC_HANDLE as ActorIdentifier;
+		}
+	} else if (customDomain && params.actor) {
+		actor = undefined;
+	}
+
+	if (!actor) {
+		throw error(404, 'Page not found');
+	}
+
+	return await loadData(actor, cache, false, params.page, env);
+}
diff --git a/src/routes/+page.svelte b/src/routes/[[actor=actor]]/(pages)/+page.svelte
similarity index 100%
rename from src/routes/+page.svelte
rename to src/routes/[[actor=actor]]/(pages)/+page.svelte
diff --git a/src/routes/[actor=actor]/(pages)/edit/+page.svelte b/src/routes/[[actor=actor]]/(pages)/edit/+page.svelte
similarity index 100%
rename from src/routes/[actor=actor]/(pages)/edit/+page.svelte
rename to src/routes/[[actor=actor]]/(pages)/edit/+page.svelte
diff --git a/src/routes/[actor=actor]/(pages)/+page.svelte b/src/routes/[[actor=actor]]/(pages)/p/[[page]]/+page.svelte
similarity index 100%
rename from src/routes/[actor=actor]/(pages)/+page.svelte
rename to src/routes/[[actor=actor]]/(pages)/p/[[page]]/+page.svelte
diff --git a/src/routes/p/[[page]]/copy/+page.svelte b/src/routes/[[actor=actor]]/(pages)/p/[[page]]/copy/+page.svelte
similarity index 98%
rename from src/routes/p/[[page]]/copy/+page.svelte
rename to src/routes/[[actor=actor]]/(pages)/p/[[page]]/copy/+page.svelte
index b456d151..cfcfb41a 100644
--- a/src/routes/p/[[page]]/copy/+page.svelte
+++ b/src/routes/[[actor=actor]]/(pages)/p/[[page]]/copy/+page.svelte
@@ -159,7 +159,7 @@
 			success = true;
 
 			// Redirect to the logged-in user's destination page edit
-			const destPath = destinationPage.trim() === '' ? '' : `/${destinationPage.trim()}`;
+			const destPath = destinationPage.trim() === '' ? '' : `/p/${destinationPage.trim()}`;
 			setTimeout(() => {
 				goto(`/${userHandle}${destPath}/edit`);
 			}, 1000);
diff --git a/src/routes/[actor=actor]/(pages)/p/[[page]]/edit/+page.svelte b/src/routes/[[actor=actor]]/(pages)/p/[[page]]/edit/+page.svelte
similarity index 100%
rename from src/routes/[actor=actor]/(pages)/p/[[page]]/edit/+page.svelte
rename to src/routes/[[actor=actor]]/(pages)/p/[[page]]/edit/+page.svelte
diff --git a/src/routes/[[actor=actor]]/.well-known/site.standard.publication/+server.ts b/src/routes/[[actor=actor]]/.well-known/site.standard.publication/+server.ts
new file mode 100644
index 00000000..faccbef3
--- /dev/null
+++ b/src/routes/[[actor=actor]]/.well-known/site.standard.publication/+server.ts
@@ -0,0 +1,44 @@
+import { loadData } from '$lib/website/load';
+import { createCache } from '$lib/cache';
+import { env } from '$env/dynamic/private';
+import { env as publicEnv } from '$env/dynamic/public';
+import type { ActorIdentifier } from '@atcute/lexicons';
+
+import { error } from '@sveltejs/kit';
+import { text } from '@sveltejs/kit';
+
+export async function GET({ params, platform, request }) {
+	const cache = createCache(platform);
+
+	const customDomain = request.headers.get('X-Custom-Domain')?.toLowerCase();
+
+	let actor: ActorIdentifier | undefined = params.actor;
+
+	if (!actor) {
+		const kv = platform?.env?.CUSTOM_DOMAINS;
+
+		if (kv && customDomain) {
+			try {
+				const did = await kv.get(customDomain);
+
+				if (did) actor = did as ActorIdentifier;
+			} catch (error) {
+				console.error('failed to get custom domain kv', error);
+			}
+		} else {
+			actor = publicEnv.PUBLIC_HANDLE as ActorIdentifier;
+		}
+	} else if (customDomain && params.actor) {
+		actor = undefined;
+	}
+
+	if (!actor) {
+		throw error(404, 'Page not found');
+	}
+
+	const data = await loadData(actor, cache, false, params.page, env);
+
+	if (!data.publication) throw error(300);
+
+	return text(data.did + '/site.standard.publication/blento.self');
+}
diff --git a/src/routes/[[actor=actor]]/api/refresh/+server.ts b/src/routes/[[actor=actor]]/api/refresh/+server.ts
new file mode 100644
index 00000000..66105123
--- /dev/null
+++ b/src/routes/[[actor=actor]]/api/refresh/+server.ts
@@ -0,0 +1,37 @@
+import { createCache } from '$lib/cache';
+import { loadData } from '$lib/website/load.js';
+import { env } from '$env/dynamic/private';
+import { env as publicEnv } from '$env/dynamic/public';
+import type { ActorIdentifier } from '@atcute/lexicons';
+import { error, json } from '@sveltejs/kit';
+
+export async function GET({ params, platform, request }) {
+	const cache = createCache(platform);
+	if (!cache) return json('no cache');
+
+	const customDomain = request.headers.get('X-Custom-Domain')?.toLowerCase();
+
+	let actor: ActorIdentifier | undefined = params.actor;
+
+	if (!actor) {
+		const kv = platform?.env?.CUSTOM_DOMAINS;
+
+		if (kv && customDomain) {
+			try {
+				const did = await kv.get(customDomain);
+
+				if (did) actor = did as ActorIdentifier;
+			} catch (error) {
+				console.error('failed to get custom domain kv', error);
+			}
+		} else {
+			actor = publicEnv.PUBLIC_HANDLE as ActorIdentifier;
+		}
+	}
+
+	if (!actor) {
+		throw error(404, 'Page not found');
+	}
+
+	return json(await loadData(actor, cache, true, 'self', env));
+}
diff --git a/src/routes/[actor=actor]/og.png/+server.ts b/src/routes/[[actor=actor]]/og.png/+server.ts
similarity index 71%
rename from src/routes/[actor=actor]/og.png/+server.ts
rename to src/routes/[[actor=actor]]/og.png/+server.ts
index c469fb32..1fbc59a4 100644
--- a/src/routes/[actor=actor]/og.png/+server.ts
+++ b/src/routes/[[actor=actor]]/og.png/+server.ts
@@ -2,8 +2,11 @@ import { getCDNImageBlobUrl } from '$lib/atproto/methods.js';
 import { createCache } from '$lib/cache';
 import { loadData } from '$lib/website/load';
 import { env } from '$env/dynamic/private';
-import type { Handle } from '@atcute/lexicons';
+import { env as publicEnv } from '$env/dynamic/public';
+
+import type { ActorIdentifier } from '@atcute/lexicons';
 import { ImageResponse } from '@ethercorps/sveltekit-og';
+import { error } from '@sveltejs/kit';
 
 function escapeHtml(str: string): string {
 	return str
@@ -14,10 +17,34 @@ function escapeHtml(str: string): string {
 		.replace(/'/g, '&#39;');
 }
 
-export async function GET({ params, platform }) {
+export async function GET({ params, platform, request }) {
 	const cache = createCache(platform);
 
-	const data = await loadData(params.actor, cache, false, 'self', env);
+	const customDomain = request.headers.get('X-Custom-Domain')?.toLowerCase();
+
+	let actor: ActorIdentifier | undefined = params.actor;
+
+	if (!actor) {
+		const kv = platform?.env?.CUSTOM_DOMAINS;
+
+		if (kv && customDomain) {
+			try {
+				const did = await kv.get(customDomain);
+
+				if (did) actor = did as ActorIdentifier;
+			} catch (error) {
+				console.error('failed to get custom domain kv', error);
+			}
+		} else {
+			actor = publicEnv.PUBLIC_HANDLE as ActorIdentifier;
+		}
+	}
+
+	if (!actor) {
+		throw error(404, 'Page not found');
+	}
+
+	const data = await loadData(actor, cache, false, 'self', env);
 
 	let image: string | undefined = data.profile.avatar;
 
diff --git a/src/routes/[actor=actor]/(pages)/+layout.server.ts b/src/routes/[actor=actor]/(pages)/+layout.server.ts
deleted file mode 100644
index 4150b37c..00000000
--- a/src/routes/[actor=actor]/(pages)/+layout.server.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { loadData } from '$lib/website/load';
-import { env } from '$env/dynamic/private';
-import { error } from '@sveltejs/kit';
-import { createCache } from '$lib/cache';
-
-export async function load({ params, platform, request }) {
-	if (env.PUBLIC_IS_SELFHOSTED) error(404);
-
-	const cache = createCache(platform);
-
-	const customDomain = request.headers.get('X-Custom-Domain');
-
-	if (customDomain) {
-		throw error(404, 'Page not found!');
-	}
-
-	return await loadData(params.actor, cache, false, params.page, env);
-}
diff --git a/src/routes/[actor=actor]/(pages)/p/[[page]]/+page.svelte b/src/routes/[actor=actor]/(pages)/p/[[page]]/+page.svelte
deleted file mode 100644
index 3419d88c..00000000
--- a/src/routes/[actor=actor]/(pages)/p/[[page]]/+page.svelte
+++ /dev/null
@@ -1,13 +0,0 @@
-<script lang="ts">
-	import { refreshData } from '$lib/helper.js';
-	import Website from '$lib/website/Website.svelte';
-	import { onMount } from 'svelte';
-
-	let { data } = $props();
-
-	onMount(() => {
-		refreshData(data);
-	});
-</script>
-
-<Website {data} />
diff --git a/src/routes/[actor=actor]/(pages)/p/[[page]]/copy/+page.svelte b/src/routes/[actor=actor]/(pages)/p/[[page]]/copy/+page.svelte
deleted file mode 100644
index b456d151..00000000
--- a/src/routes/[actor=actor]/(pages)/p/[[page]]/copy/+page.svelte
+++ /dev/null
@@ -1,252 +0,0 @@
-<script lang="ts">
-	import {
-		putRecord,
-		deleteRecord,
-		listRecords,
-		uploadBlob,
-		getCDNImageBlobUrl
-	} from '$lib/atproto/methods';
-	import { user } from '$lib/atproto/auth.svelte';
-	import { goto } from '$app/navigation';
-	import * as TID from '@atcute/tid';
-	import { Button } from '@foxui/core';
-	import { loginModalState } from '$lib/atproto/UI/LoginModal.svelte';
-
-	let { data } = $props();
-
-	let destinationPage = $state('');
-	let copying = $state(false);
-	let error = $state('');
-	let success = $state(false);
-
-	const sourceHandle = $derived(data.handle);
-
-	const sourcePage = $derived(
-		data.page === 'blento.self' ? 'main' : data.page.replace('blento.', '')
-	);
-	const sourceCards = $derived(data.cards);
-
-	// Re-upload blobs from source repo to current user's repo
-	async function reuploadBlobs(obj: any, sourceDid: string): Promise<void> {
-		if (!obj || typeof obj !== 'object') return;
-
-		for (const key of Object.keys(obj)) {
-			const value = obj[key];
-
-			if (value && typeof value === 'object') {
-				// Check if this is a blob reference
-				if (value.$type === 'blob' && value.ref?.$link) {
-					try {
-						// Get the blob URL from source repo
-						const blobUrl = getCDNImageBlobUrl({ did: sourceDid, blob: value });
-						if (!blobUrl) continue;
-
-						// Fetch the blob via proxy to avoid CORS
-						const response = await fetch(`/api/image-proxy?url=${encodeURIComponent(blobUrl)}`);
-						if (!response.ok) {
-							console.error('Failed to fetch blob:', blobUrl);
-							continue;
-						}
-
-						// Upload to current user's repo
-						const blob = await response.blob();
-						const newBlobRef = await uploadBlob({ blob });
-
-						if (newBlobRef) {
-							// Replace with new blob reference
-							obj[key] = newBlobRef;
-						}
-					} catch (err) {
-						console.error('Failed to re-upload blob:', err);
-					}
-				} else {
-					// Recursively check nested objects
-					await reuploadBlobs(value, sourceDid);
-				}
-			}
-		}
-	}
-
-	async function copyPage() {
-		if (!user.isLoggedIn || !user.did) {
-			error = 'You must be logged in to copy pages';
-			return;
-		}
-
-		copying = true;
-		error = '';
-
-		try {
-			const targetPage =
-				destinationPage.trim() === '' ? 'blento.self' : `blento.${destinationPage.trim()}`;
-
-			// Fetch existing cards from destination page and delete them
-			const existingCards = await listRecords({
-				did: user.did,
-				collection: 'app.blento.card'
-			});
-
-			const cardsToDelete = existingCards.filter(
-				(card: { value: { page?: string } }) => card.value.page === targetPage
-			);
-
-			// Delete existing cards from destination page
-			const deletePromises = cardsToDelete.map((card: { uri: string }) => {
-				const rkey = card.uri.split('/').pop()!;
-				return deleteRecord({
-					collection: 'app.blento.card',
-					rkey
-				});
-			});
-
-			await Promise.all(deletePromises);
-
-			// Copy each card with a new ID to the destination page
-			// Re-upload blobs from source repo to current user's repo
-			for (const card of sourceCards) {
-				const newCard = {
-					...structuredClone(card),
-					id: TID.now(),
-					page: targetPage,
-					updatedAt: new Date().toISOString(),
-					version: 2
-				};
-
-				// Re-upload any blobs in cardData
-				await reuploadBlobs(newCard.cardData, data.did);
-
-				await putRecord({
-					collection: 'app.blento.card',
-					rkey: newCard.id,
-					record: newCard
-				});
-			}
-
-			const userHandle = user.profile?.handle ?? data.handle;
-
-			// Copy publication data if it exists
-			if (data.publication) {
-				const publicationCopy = structuredClone(data.publication) as Record<string, unknown>;
-
-				// Re-upload any blobs in publication (e.g., icon)
-				await reuploadBlobs(publicationCopy, data.did);
-
-				// Update the URL to point to the user's page
-				publicationCopy.url = `https://blento.app/${userHandle}`;
-				if (targetPage !== 'blento.self') {
-					publicationCopy.url += '/' + targetPage.replace('blento.', '');
-				}
-
-				// Save to appropriate collection based on destination page type
-				if (targetPage === 'blento.self') {
-					await putRecord({
-						collection: 'site.standard.publication',
-						rkey: targetPage,
-						record: publicationCopy
-					});
-				} else {
-					await putRecord({
-						collection: 'app.blento.page',
-						rkey: targetPage,
-						record: publicationCopy
-					});
-				}
-			}
-
-			// Refresh the logged-in user's cache
-			await fetch(`/${userHandle}/api/refresh`);
-
-			success = true;
-
-			// Redirect to the logged-in user's destination page edit
-			const destPath = destinationPage.trim() === '' ? '' : `/${destinationPage.trim()}`;
-			setTimeout(() => {
-				goto(`/${userHandle}${destPath}/edit`);
-			}, 1000);
-		} catch (e) {
-			error = e instanceof Error ? e.message : 'Failed to copy page';
-		} finally {
-			copying = false;
-		}
-	}
-</script>
-
-<div class="bg-base-50 dark:bg-base-900 flex min-h-screen items-center justify-center p-4">
-	<div class="bg-base-100 dark:bg-base-800 w-full max-w-md rounded-2xl p-6 shadow-lg">
-		{#if user.isLoggedIn}
-			<h1 class="text-base-900 dark:text-base-50 mb-6 text-2xl font-bold">Copy Page</h1>
-
-			<div class="mb-4">
-				<div class="text-base-700 dark:text-base-300 mb-1 block text-sm font-medium">
-					Source Page
-				</div>
-				<div
-					class="bg-base-200 dark:bg-base-700 text-base-900 dark:text-base-100 rounded-lg px-3 py-2"
-				>
-					{sourceHandle}/{sourcePage || 'main'}
-				</div>
-				<p class="text-base-500 mt-1 text-sm">{sourceCards.length} cards</p>
-			</div>
-
-			<div class="mb-6">
-				<label
-					for="destination"
-					class="text-base-700 dark:text-base-300 mb-1 block text-sm font-medium"
-				>
-					Destination Page (on your profile: {user.profile?.handle})
-				</label>
-				<input
-					id="destination"
-					type="text"
-					bind:value={destinationPage}
-					placeholder="Leave empty for main page"
-					class="bg-base-50 dark:bg-base-700 border-base-300 dark:border-base-600 text-base-900 dark:text-base-100 focus:ring-accent-500 w-full rounded-lg border px-3 py-2 focus:ring-2 focus:outline-none"
-				/>
-			</div>
-
-			{#if error}
-				<div
-					class="mb-4 rounded-lg bg-red-100 p-3 text-red-700 dark:bg-red-900/30 dark:text-red-400"
-				>
-					{error}
-				</div>
-			{/if}
-
-			{#if success}
-				<div
-					class="mb-4 rounded-lg bg-green-100 p-3 text-green-700 dark:bg-green-900/30 dark:text-green-400"
-				>
-					Page copied successfully! Redirecting...
-				</div>
-			{/if}
-
-			<div class="flex gap-3">
-				<a
-					href="/{data.handle}/{sourcePage === 'main' ? '' : sourcePage}"
-					class="bg-base-200 hover:bg-base-300 dark:bg-base-700 dark:hover:bg-base-600 text-base-700 dark:text-base-300 flex-1 rounded-lg px-4 py-2 text-center font-medium transition-colors"
-				>
-					Cancel
-				</a>
-				<button
-					onclick={copyPage}
-					disabled={copying || success}
-					class="bg-accent-500 hover:bg-accent-600 flex-1 rounded-lg px-4 py-2 font-medium text-white transition-colors disabled:cursor-not-allowed disabled:opacity-50"
-				>
-					{#if copying}
-						Copying...
-					{:else}
-						Copy {sourceCards.length} cards
-					{/if}
-				</button>
-			</div>
-		{:else}
-			<h1 class="text-base-900 dark:text-base-50 mb-6 text-2xl font-bold">
-				You must be signed in to copy a page!
-			</h1>
-
-			<div class="flex w-full justify-center">
-				<Button size="lg" onclick={() => loginModalState.show()}>Login</Button>
-			</div>
-		{/if}
-	</div>
-</div>
diff --git a/src/routes/[actor=actor]/.well-known/site.standard.publication/+server.ts b/src/routes/[actor=actor]/.well-known/site.standard.publication/+server.ts
deleted file mode 100644
index a4275a7b..00000000
--- a/src/routes/[actor=actor]/.well-known/site.standard.publication/+server.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { loadData } from '$lib/website/load';
-import { createCache } from '$lib/cache';
-import { env } from '$env/dynamic/private';
-
-import { error } from '@sveltejs/kit';
-import { text } from '@sveltejs/kit';
-
-export async function GET({ params, platform }) {
-	const cache = createCache(platform);
-
-	const data = await loadData(params.actor, cache, false, params.page, env);
-
-	if (!data.publication) throw error(300);
-
-	return text(data.did + '/site.standard.publication/blento.self');
-}
diff --git a/src/routes/[actor=actor]/api/refresh/+server.ts b/src/routes/[actor=actor]/api/refresh/+server.ts
deleted file mode 100644
index 35e5d734..00000000
--- a/src/routes/[actor=actor]/api/refresh/+server.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { createCache } from '$lib/cache';
-import { loadData } from '$lib/website/load.js';
-import { env } from '$env/dynamic/private';
-import type { Handle } from '@atcute/lexicons';
-import { json } from '@sveltejs/kit';
-
-export async function GET({ params, platform }) {
-	const cache = createCache(platform);
-	if (!cache) return json('no cache');
-
-	await loadData(params.actor, cache, true, 'self', env);
-
-	return json('ok');
-}
diff --git a/src/routes/edit/+page.server.ts b/src/routes/edit/+page.server.ts
deleted file mode 100644
index c61c78f1..00000000
--- a/src/routes/edit/+page.server.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { loadData } from '$lib/website/load';
-import { env } from '$env/dynamic/public';
-import { env as privateEnv } from '$env/dynamic/private';
-import { createCache } from '$lib/cache';
-import type { ActorIdentifier } from '@atcute/lexicons';
-
-export async function load({ platform, request }) {
-	const handle = env.PUBLIC_HANDLE;
-
-	const kv = platform?.env?.CUSTOM_DOMAINS;
-
-	const cache = createCache(platform);
-	const customDomain = request.headers.get('X-Custom-Domain')?.toLowerCase();
-
-	if (kv && customDomain) {
-		try {
-			const did = await kv.get(customDomain);
-
-			if (did) return await loadData(did as ActorIdentifier, cache, false, 'self', privateEnv);
-		} catch (error) {
-			console.error('failed to get custom domain kv', error);
-		}
-	}
-
-	return await loadData(handle as ActorIdentifier, cache, false, 'self', privateEnv);
-}
diff --git a/src/routes/edit/+page.svelte b/src/routes/edit/+page.svelte
deleted file mode 100644
index 7c2ce21f..00000000
--- a/src/routes/edit/+page.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts">
-	import EditableWebsite from '$lib/website/EditableWebsite.svelte';
-
-	let { data } = $props();
-</script>
-
-<EditableWebsite {data} />
diff --git a/src/routes/p/[[page]]/+layout.server.ts b/src/routes/p/[[page]]/+layout.server.ts
deleted file mode 100644
index f320e90e..00000000
--- a/src/routes/p/[[page]]/+layout.server.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { loadData } from '$lib/website/load';
-import { env } from '$env/dynamic/public';
-import { env as privateEnv } from '$env/dynamic/private';
-import { createCache } from '$lib/cache';
-import type { Did, Handle } from '@atcute/lexicons';
-
-export async function load({ params, platform, request }) {
-	const cache = createCache(platform);
-
-	const handle = env.PUBLIC_HANDLE;
-
-	const kv = platform?.env?.CUSTOM_DOMAINS;
-
-	const customDomain = request.headers.get('X-Custom-Domain')?.toLocaleLowerCase();
-
-	if (kv && customDomain) {
-		try {
-			const did = await kv.get(customDomain);
-			return await loadData(did as Did, cache, false, params.page, privateEnv);
-		} catch {
-			console.error('failed');
-		}
-	}
-
-	return await loadData(handle as Handle, cache, false, params.page, privateEnv);
-}
diff --git a/src/routes/p/[[page]]/+page.svelte b/src/routes/p/[[page]]/+page.svelte
deleted file mode 100644
index 3419d88c..00000000
--- a/src/routes/p/[[page]]/+page.svelte
+++ /dev/null
@@ -1,13 +0,0 @@
-<script lang="ts">
-	import { refreshData } from '$lib/helper.js';
-	import Website from '$lib/website/Website.svelte';
-	import { onMount } from 'svelte';
-
-	let { data } = $props();
-
-	onMount(() => {
-		refreshData(data);
-	});
-</script>
-
-<Website {data} />
diff --git a/src/routes/p/[[page]]/edit/+page.svelte b/src/routes/p/[[page]]/edit/+page.svelte
deleted file mode 100644
index e57bf319..00000000
--- a/src/routes/p/[[page]]/edit/+page.svelte
+++ /dev/null
@@ -1,6 +0,0 @@
-<script lang="ts">
-	import EditableWebsite from '$lib/website/EditableWebsite.svelte';
-	let { data } = $props();
-</script>
-
-<EditableWebsite {data} />