From e2a8c664ae9af8f64a920ccdfd531687041446a9 Mon Sep 17 00:00:00 2001
From: Florian <45694132+flo-bit@users.noreply.github.com>
Date: Sat, 3 Oct 2026 10:33:27 +0200
Subject: [PATCH] remove standard site publication

---
 apps/web/src/lib/atproto/methods.ts           |  17 +-
 .../web/src/lib/atproto/server/repo.remote.ts |   3 +-
 .../lib/cards/special/UpdatedBlentos/index.ts |   6 +-
 apps/web/src/lib/contrail.config.ts           |   3 +-
 apps/web/src/lib/helpers/save.test.ts         |  84 +++++++++
 apps/web/src/lib/helpers/save.ts              |  39 ++--
 apps/web/src/lib/website/data/load.ts         |  46 ++---
 .../lib/website/edit/EditableWebsite.svelte   |   2 +-
 .../website/settings/SettingsOverlay.svelte   |   5 +-
 .../sections/CustomDomainSection.svelte       | 167 ++++++++++++++----
 .../(pages)/p/[[page]]/copy/+page.svelte      |  19 +-
 .../[[actor=actor]]/blog/+layout.server.ts    |  11 +-
 .../blog/layout.server.test.ts                |  66 +++++++
 .../src/routes/api/activate-domain/+server.ts |  36 +++-
 14 files changed, 395 insertions(+), 109 deletions(-)
 create mode 100644 apps/web/src/lib/helpers/save.test.ts
 create mode 100644 apps/web/src/routes/[[actor=actor]]/blog/layout.server.test.ts

diff --git a/apps/web/src/lib/atproto/methods.ts b/apps/web/src/lib/atproto/methods.ts
index 93e9ba6..e268939 100644
--- a/apps/web/src/lib/atproto/methods.ts
+++ b/apps/web/src/lib/atproto/methods.ts
@@ -103,13 +103,22 @@ export async function getBlentoOrBskyProfile(data: { did: Did; client?: Client }
 	let blentoProfile;
 	try {
 		blentoProfile = await getRecord({
-			collection: 'site.standard.publication',
-			did: data?.did,
+			collection: 'app.blento.page',
+			did: data.did,
 			rkey: 'blento.self',
-			client: data?.client
+			client: data.client
 		});
 	} catch {
-		// User doesn't have a blento publication — expected for most users
+		try {
+			blentoProfile = await getRecord({
+				collection: 'site.standard.publication',
+				did: data.did,
+				rkey: 'blento.self',
+				client: data.client
+			});
+		} catch {
+			// No Blento page yet.
+		}
 	}
 
 	let response;
diff --git a/apps/web/src/lib/atproto/server/repo.remote.ts b/apps/web/src/lib/atproto/server/repo.remote.ts
index facff98..a765b9b 100644
--- a/apps/web/src/lib/atproto/server/repo.remote.ts
+++ b/apps/web/src/lib/atproto/server/repo.remote.ts
@@ -48,7 +48,8 @@ export const putRecord = command(
 				status: response.status,
 				data: response.data
 			});
-			error(500, 'Failed to put record');
+			const message = (response.data as { message?: string } | undefined)?.message;
+			error(response.status >= 400 ? response.status : 500, message || 'Failed to put record');
 		}
 
 		// Immediately index in contrail
diff --git a/apps/web/src/lib/cards/special/UpdatedBlentos/index.ts b/apps/web/src/lib/cards/special/UpdatedBlentos/index.ts
index b0a5e53..23270b6 100644
--- a/apps/web/src/lib/cards/special/UpdatedBlentos/index.ts
+++ b/apps/web/src/lib/cards/special/UpdatedBlentos/index.ts
@@ -48,7 +48,11 @@ function extractProfiles(
 			}
 		}
 
-		if (p.collection === 'site.standard.publication' && value) {
+		if (
+			(p.collection === 'app.blento.page' || p.collection === 'site.standard.publication') &&
+			value &&
+			(p.collection === 'app.blento.page' || !existing.hasBlento)
+		) {
 			existing.hasBlento = true;
 			existing.displayName = (value.name as string) ?? existing.displayName;
 			existing.url = value.url as string | undefined;
diff --git a/apps/web/src/lib/contrail.config.ts b/apps/web/src/lib/contrail.config.ts
index cb6a245..50ef24a 100644
--- a/apps/web/src/lib/contrail.config.ts
+++ b/apps/web/src/lib/contrail.config.ts
@@ -30,7 +30,8 @@ export const config: ContrailConfig = {
 	},
 	profiles: [
 		'app.bsky.actor.profile',
-		{ collection: 'site.standard.publication', rkey: 'blento.self' },
+		{ collection: 'site.standard.publication', rkey: 'blento.self' }, // legacy
+		{ collection: 'app.blento.page', rkey: 'blento.self' },
 		{ collection: 'app.nearhorizon.actor.pronouns', rkey: 'self' }
 	]
 };
diff --git a/apps/web/src/lib/helpers/save.test.ts b/apps/web/src/lib/helpers/save.test.ts
new file mode 100644
index 0000000..7886f5d
--- /dev/null
+++ b/apps/web/src/lib/helpers/save.test.ts
@@ -0,0 +1,84 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { WebsiteData } from '../types';
+
+const { putRecord, deleteRecord } = vi.hoisted(() => ({
+	putRecord: vi.fn().mockResolvedValue({}),
+	deleteRecord: vi.fn().mockResolvedValue(true)
+}));
+
+vi.mock('$lib/atproto', () => ({ putRecord, deleteRecord }));
+vi.mock('../cards', () => ({ CardDefinitionsByType: {} }));
+vi.mock('$env/dynamic/public', () => ({ env: { PUBLIC_ENABLE_NODE_MIGRATION: 'false' } }));
+
+import { savePage } from './save';
+
+function page(page: string): WebsiteData {
+	return {
+		page,
+		did: 'did:plc:example',
+		handle: 'example.test',
+		cards: [],
+		sections: [],
+		publication: { name: 'Example', description: 'Bio', preferences: { accentColor: 'red' } },
+		profile: { did: 'did:plc:example', handle: 'example.test' } as WebsiteData['profile'],
+		additionalData: {},
+		updatedAt: 0
+	};
+}
+
+beforeEach(() => {
+	putRecord.mockClear();
+	deleteRecord.mockClear();
+	vi.stubGlobal('fetch', vi.fn().mockResolvedValue({}));
+});
+
+describe('savePage metadata', () => {
+	it('writes the home page to app.blento.page even if metadata has not changed', async () => {
+		const data = page('blento.self');
+		await savePage(data, [], [], JSON.stringify(data.publication));
+
+		expect(putRecord).toHaveBeenCalledWith({
+			collection: 'app.blento.page',
+			rkey: 'blento.self',
+			record: expect.objectContaining({ name: 'Example', url: 'https://blento.app/example.test' })
+		});
+		expect(putRecord).not.toHaveBeenCalledWith(
+			expect.objectContaining({ collection: 'site.standard.publication' })
+		);
+	});
+
+	it('deletes only the legacy blento.self publication record after writing the home page', async () => {
+		const data = page('blento.self');
+		await savePage(data, [], [], JSON.stringify(data.publication));
+
+		expect(deleteRecord).toHaveBeenCalledTimes(1);
+		expect(deleteRecord).toHaveBeenCalledWith({
+			collection: 'site.standard.publication',
+			rkey: 'blento.self'
+		});
+		expect(putRecord.mock.invocationCallOrder[0]).toBeLessThan(
+			deleteRecord.mock.invocationCallOrder[0]
+		);
+	});
+
+	it('keeps the legacy record if writing the home page fails', async () => {
+		putRecord.mockRejectedValueOnce(new Error('PDS down'));
+		const data = page('blento.self');
+		await expect(savePage(data, [], [], JSON.stringify(data.publication))).rejects.toThrow();
+		expect(deleteRecord).not.toHaveBeenCalled();
+	});
+
+	it('does not touch site.standard.publication when saving a sub-page', async () => {
+		const data = page('blento.about');
+		await savePage(data, [], [], '');
+		expect(deleteRecord).not.toHaveBeenCalled();
+	});
+
+	it('writes changed sub-page metadata to app.blento.page', async () => {
+		const data = page('blento.about');
+		await savePage(data, [], [], '');
+		expect(putRecord).toHaveBeenCalledWith(
+			expect.objectContaining({ collection: 'app.blento.page', rkey: 'blento.about' })
+		);
+	});
+});
diff --git a/apps/web/src/lib/helpers/save.ts b/apps/web/src/lib/helpers/save.ts
index 43060c2..45cdc8e 100644
--- a/apps/web/src/lib/helpers/save.ts
+++ b/apps/web/src/lib/helpers/save.ts
@@ -106,14 +106,13 @@ export async function savePage(
 		data.publication.preferences.hideProfileSection = data.publication?.preferences?.hideProfile;
 	}
 
-	// With nodes on, the root record moves to app.blento.page for all pages and the legacy
-	// site.standard.publication store is retired on first migration. Legacy path keeps v1's split
-	// (app.blento.page for sub-pages, site.standard.publication for the main page).
-	const needsRootMigration = useNodes && data.page === 'blento.self' && !data.migratedStorage;
+	// The home page belongs in app.blento.page, too. site.standard.publication requires a
+	// TID rkey, so blento.self cannot be written there (even when using legacy cards/sections).
+	// Always write the page record on save to migrate older home pages as well.
 	if (
 		!originalPublication ||
 		originalPublication !== JSON.stringify(data.publication) ||
-		needsRootMigration
+		data.page === 'blento.self'
 	) {
 		data.publication ??= {
 			name: getName(data),
@@ -131,22 +130,22 @@ export async function savePage(
 			}
 		}
 
-		if (useNodes || data.page !== 'blento.self') {
-			promises.push(
-				putRecord({ collection: 'app.blento.page', rkey: data.page, record: data.publication })
-			);
-		} else {
-			promises.push(
-				putRecord({
-					collection: 'site.standard.publication',
-					rkey: data.page,
-					record: data.publication
-				})
-			);
-		}
-		if (needsRootMigration) {
+		const pagePut = putRecord({
+			collection: 'app.blento.page',
+			rkey: data.page,
+			record: data.publication
+		});
+		promises.push(pagePut);
+
+		// Retire the legacy home record once its replacement is written. Only Blento's own
+		// blento.self rkey: other apps keep their site.standard.publication records.
+		if (data.page === 'blento.self') {
 			promises.push(
-				deleteRecord({ collection: 'site.standard.publication', rkey: data.page }).catch(() => {})
+				pagePut.then(() =>
+					deleteRecord({ collection: 'site.standard.publication', rkey: 'blento.self' }).catch(
+						() => {}
+					)
+				)
 			);
 		}
 
diff --git a/apps/web/src/lib/website/data/load.ts b/apps/web/src/lib/website/data/load.ts
index 2776672..b2870aa 100644
--- a/apps/web/src/lib/website/data/load.ts
+++ b/apps/web/src/lib/website/data/load.ts
@@ -75,7 +75,10 @@ function extractProfileData(
 		if (p.collection === 'app.bsky.actor.profile' && value) {
 			bskyRecord = value;
 		}
-		if (p.collection === 'site.standard.publication' && value) {
+		if (p.collection === 'site.standard.publication' && value && !pubRecord) {
+			pubRecord = value;
+		}
+		if (p.collection === 'app.blento.page' && p.rkey === 'blento.self' && value) {
 			pubRecord = value;
 		}
 		if (p.collection === 'app.nearhorizon.actor.pronouns' && value) {
@@ -227,12 +230,18 @@ function getPronounsFromPDS(did: Did) {
 	}).catch(() => undefined) as Promise<PronounsRecord | undefined>;
 }
 
-function getSelfPublicationFromPDS(did: Did) {
-	return getRecord({
-		did,
-		collection: 'site.standard.publication',
-		rkey: 'blento.self'
-	}).catch(() => undefined);
+async function getSelfPublicationFromPDS(did: Did) {
+	const page = await getRecord({ did, collection: 'app.blento.page', rkey: 'blento.self' }).catch(
+		() => undefined
+	);
+	return (
+		page ??
+		(await getRecord({
+			did,
+			collection: 'site.standard.publication',
+			rkey: 'blento.self'
+		}).catch(() => undefined))
+	);
 }
 
 export async function loadData(
@@ -334,11 +343,9 @@ export async function loadData(
 		pronounsRecord = pronouns;
 	}
 
-	// If no publication found from contrail profiles, check page records
-	if (!publication) {
-		const pubFromPages = pageRecords.find((v) => parseUri(v.uri)?.rkey === 'blento.' + page);
-		publication = pubFromPages?.value as WebsiteData['publication'] | undefined;
-	}
+	// Page records take precedence over the legacy publication profile, including on the home page.
+	const pubFromPages = pageRecords.find((v) => parseUri(v.uri)?.rkey === fullPage);
+	if (pubFromPages?.value) publication = pubFromPages.value as WebsiteData['publication'];
 
 	publication ??= defaultPublication(profile);
 
@@ -472,15 +479,12 @@ export async function loadCardData(
 	const card = migrateCard(structuredClone(cardValue));
 	const page = card.page ?? 'blento.self';
 
-	// For non-self pages, publication comes from app.blento.page (not in contrail profiles).
-	if (!publication || page !== 'blento.self') {
-		const pubRecord = await getRecord({
-			did,
-			collection: page === 'blento.self' ? 'site.standard.publication' : 'app.blento.page',
-			rkey: page
-		}).catch(() => undefined);
-		if (pubRecord?.value) publication = pubRecord.value as WebsiteData['publication'];
-	}
+	// Page metadata lives in app.blento.page; retain a fallback for old home pages.
+	const pubRecord =
+		page === 'blento.self'
+			? await getSelfPublicationFromPDS(did)
+			: await getRecord({ did, collection: 'app.blento.page', rkey: page }).catch(() => undefined);
+	if (pubRecord?.value) publication = pubRecord.value as WebsiteData['publication'];
 
 	const cards = [card];
 	const resolvedHandle = profile?.handle || (isHandle(handle) ? handle : did);
diff --git a/apps/web/src/lib/website/edit/EditableWebsite.svelte b/apps/web/src/lib/website/edit/EditableWebsite.svelte
index 37afeb4..138a1cd 100644
--- a/apps/web/src/lib/website/edit/EditableWebsite.svelte
+++ b/apps/web/src/lib/website/edit/EditableWebsite.svelte
@@ -553,7 +553,7 @@
 	</button>
 {/if}
 
-<SettingsOverlay bind:data publicationUrl={data.publication?.url} />
+<SettingsOverlay bind:data />
 
 <ContextProvider {data} isEditing={true}>
 	<ImageViewerProvider />
diff --git a/apps/web/src/lib/website/settings/SettingsOverlay.svelte b/apps/web/src/lib/website/settings/SettingsOverlay.svelte
index 67023a2..ea96b70 100644
--- a/apps/web/src/lib/website/settings/SettingsOverlay.svelte
+++ b/apps/web/src/lib/website/settings/SettingsOverlay.svelte
@@ -15,8 +15,7 @@
 	import AccountSection from './sections/AccountSection.svelte';
 	import AnalyticsSection from './sections/AnalyticsSection.svelte';
 
-	let { data = $bindable(), publicationUrl }: { data: WebsiteData; publicationUrl?: string } =
-		$props();
+	let { data = $bindable() }: { data: WebsiteData } = $props();
 
 	$effect(() => {
 		if (settingsOverlayState.visible) {
@@ -85,7 +84,7 @@
 				{:else if settingsOverlayState.activeSection === 'layout'}
 					<LayoutSection bind:data />
 				{:else if settingsOverlayState.activeSection === 'domain'}
-					<CustomDomainSection {publicationUrl} />
+					<CustomDomainSection bind:data />
 				{:else if settingsOverlayState.activeSection === 'analytics'}
 					<AnalyticsSection />
 				{:else if settingsOverlayState.activeSection === 'account'}
diff --git a/apps/web/src/lib/website/settings/sections/CustomDomainSection.svelte b/apps/web/src/lib/website/settings/sections/CustomDomainSection.svelte
index d785391..6e5173c 100644
--- a/apps/web/src/lib/website/settings/sections/CustomDomainSection.svelte
+++ b/apps/web/src/lib/website/settings/sections/CustomDomainSection.svelte
@@ -1,48 +1,116 @@
 <script lang="ts">
-	import { putRecord, getRecord } from '$lib/atproto/methods';
+	import { getClient, putRecord } from '$lib/atproto/methods';
 	import { user } from '$lib/atproto';
+	import type { WebsiteData } from '$lib/types';
 	import { Button, Input } from '@foxui/core';
 	import { launchConfetti } from '@foxui/visual';
+	import { untrack } from 'svelte';
 	import { settingsOverlayState } from '../SettingsOverlay.svelte';
 
-	let { publicationUrl }: { publicationUrl?: string } = $props();
-
-	let currentDomain = $derived(
-		publicationUrl?.startsWith('https://') && !publicationUrl.includes('blento.app')
-			? publicationUrl.replace('https://', '')
-			: ''
-	);
-
-	let step: 'current' | 'input' | 'instructions' | 'verifying' | 'removing' | 'success' | 'error' =
-		$state('input');
+	let { data = $bindable() }: { data: WebsiteData } = $props();
+
+	// The domain always belongs to the home page, even when this is opened from a sub-page editor.
+	let homeUrl: string | undefined = $state();
+	let currentDomain = $derived(domainOf(homeUrl));
+	// The domain bound when the section was opened, released once it is replaced.
+	let previousDomain = '';
+
+	let step:
+		| 'loading'
+		| 'current'
+		| 'input'
+		| 'instructions'
+		| 'verifying'
+		| 'removing'
+		| 'success'
+		| 'error' = $state('input');
 	let rawDomain = $state('');
 	let domain = $derived(rawDomain.replace(/^https?:\/\//, '').replace(/\/+$/, ''));
 	let errorMessage = $state('');
 	let errorHint = $state('');
+	let failedAction: 'load' | 'verify' | 'remove' = $state('verify');
 
 	$effect(() => {
 		if (settingsOverlayState.visible && settingsOverlayState.activeSection === 'domain') {
-			step = currentDomain ? 'current' : 'input';
+			untrack(loadCurrentDomain);
 		}
 	});
 
-	async function removeDomain() {
-		step = 'removing';
+	function domainOf(url: string | undefined) {
 		try {
-			const existing = await getRecord({
-				collection: 'site.standard.publication',
-				rkey: 'blento.self'
-			});
+			const { protocol, hostname } = new URL(url ?? '');
+			return protocol === 'https:' && hostname !== 'blento.app' ? hostname : '';
+		} catch {
+			return '';
+		}
+	}
+
+	async function loadCurrentDomain() {
+		if (data.page === 'blento.self') {
+			homeUrl = data.publication?.url;
+		} else {
+			failedAction = 'load';
+			step = 'loading';
+			try {
+				homeUrl = (await getHomePageRecord()).url as string | undefined;
+			} catch (err: unknown) {
+				errorMessage = err instanceof Error ? err.message : String(err);
+				errorHint = '';
+				step = 'error';
+				return;
+			}
+		}
+		previousDomain = currentDomain;
+		step = currentDomain ? 'current' : 'input';
+	}
 
-			if (existing?.value) {
-				const { url: _url, ...rest } = existing.value as Record<string, unknown>;
-				await putRecord({
-					collection: 'site.standard.publication',
-					rkey: 'blento.self',
-					record: rest
-				});
+	// Read the stored home record rather than the editor state, so unsaved edits (and un-uploaded
+	// icons) are not written along with the url. Home pages not re-saved since the move to
+	// app.blento.page still only have the legacy record.
+	async function getHomePageRecord(): Promise<Record<string, unknown>> {
+		const did = user.did!;
+		const client = await getClient({ did });
+		for (const collection of ['app.blento.page', 'site.standard.publication'] as const) {
+			const res = await client.get('com.atproto.repo.getRecord', {
+				params: { repo: did, collection, rkey: 'blento.self' }
+			});
+			if (res.ok) return { ...(res.data.value as Record<string, unknown>) };
+			// Only a missing record means "try the next one": on any other failure, writing
+			// { url } on top of an empty record would wipe the home page's metadata.
+			if (res.data.error !== 'RecordNotFound') {
+				throw new Error(res.data.message ?? 'Failed to load your home page record.');
 			}
+		}
+		return {};
+	}
+
+	async function setHomeUrl(url: string) {
+		const record = await getHomePageRecord();
+		await putRecord({
+			collection: 'app.blento.page',
+			rkey: 'blento.self',
+			record: { ...record, url }
+		});
+		homeUrl = url;
+		if (data.page === 'blento.self' && data.publication) data.publication.url = url;
+	}
+
+	async function unbindDomain(domain: string) {
+		const res = await fetch('/api/activate-domain', {
+			method: 'DELETE',
+			headers: { 'Content-Type': 'application/json' },
+			body: JSON.stringify({ domain })
+		});
+		if (!res.ok) throw new Error((await res.json()).error || 'Failed to remove domain');
+	}
 
+	async function removeDomain() {
+		failedAction = 'remove';
+		step = 'removing';
+		try {
+			await unbindDomain(currentDomain);
+			await setHomeUrl(`https://blento.app/${data.handle}`);
+			previousDomain = '';
 			step = 'input';
 		} catch (err: unknown) {
 			errorMessage = err instanceof Error ? err.message : String(err);
@@ -56,6 +124,7 @@
 	}
 
 	async function verify() {
+		failedAction = 'verify';
 		step = 'verifying';
 		try {
 			const dnsRes = await fetch('/api/verify-domain', {
@@ -73,19 +142,7 @@
 				return;
 			}
 
-			const existing = await getRecord({
-				collection: 'site.standard.publication',
-				rkey: 'blento.self'
-			});
-
-			await putRecord({
-				collection: 'site.standard.publication',
-				rkey: 'blento.self',
-				record: {
-					...(existing?.value || {}),
-					url: 'https://' + domain
-				}
-			});
+			await setHomeUrl('https://' + domain);
 
 			const activateRes = await fetch('/api/activate-domain', {
 				method: 'POST',
@@ -102,6 +159,12 @@
 				return;
 			}
 
+			// Changing domains: release the old one so it stops serving this site.
+			if (previousDomain && previousDomain !== domain.toLowerCase()) {
+				await unbindDomain(previousDomain).catch(() => {});
+			}
+			previousDomain = domain.toLowerCase();
+
 			launchConfetti();
 			step = 'success';
 		} catch (err: unknown) {
@@ -201,6 +264,26 @@
 		</svg>
 		<span class="text-base-600 dark:text-base-400 text-sm">Verifying...</span>
 	</div>
+{:else if step === 'loading'}
+	<h3 class="text-base-900 dark:text-base-100 text-lg font-semibold">Custom Domain</h3>
+
+	<div class="mt-4 flex items-center gap-2">
+		<svg
+			class="text-base-500 size-5 animate-spin"
+			xmlns="http://www.w3.org/2000/svg"
+			fill="none"
+			viewBox="0 0 24 24"
+		>
+			<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"
+			></circle>
+			<path
+				class="opacity-75"
+				fill="currentColor"
+				d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+			></path>
+		</svg>
+		<span class="text-base-600 dark:text-base-400 text-sm">Loading...</span>
+	</div>
 {:else if step === 'removing'}
 	<h3 class="text-base-900 dark:text-base-100 text-lg font-semibold">Removing...</h3>
 
@@ -245,6 +328,12 @@
 
 	<div class="mt-4 flex gap-2">
 		<Button variant="ghost" onclick={() => settingsOverlayState.hide()}>Close</Button>
-		<Button onclick={verify}>Retry</Button>
+		<Button
+			onclick={failedAction === 'load'
+				? loadCurrentDomain
+				: failedAction === 'remove'
+					? removeDomain
+					: verify}>Retry</Button
+		>
 	</div>
 {/if}
diff --git a/apps/web/src/routes/[[actor=actor]]/(pages)/p/[[page]]/copy/+page.svelte b/apps/web/src/routes/[[actor=actor]]/(pages)/p/[[page]]/copy/+page.svelte
index 4d90eb3..93967f1 100644
--- a/apps/web/src/routes/[[actor=actor]]/(pages)/p/[[page]]/copy/+page.svelte
+++ b/apps/web/src/routes/[[actor=actor]]/(pages)/p/[[page]]/copy/+page.svelte
@@ -137,20 +137,11 @@
 					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
-					});
-				}
+				await putRecord({
+					collection: 'app.blento.page',
+					rkey: targetPage,
+					record: publicationCopy
+				});
 			}
 
 			success = true;
diff --git a/apps/web/src/routes/[[actor=actor]]/blog/+layout.server.ts b/apps/web/src/routes/[[actor=actor]]/blog/+layout.server.ts
index 9406d13..1a7bf3a 100644
--- a/apps/web/src/routes/[[actor=actor]]/blog/+layout.server.ts
+++ b/apps/web/src/routes/[[actor=actor]]/blog/+layout.server.ts
@@ -10,9 +10,16 @@ export async function load({ params, platform, request }) {
 	try {
 		const publication = await getRecord({
 			did: did as Did,
-			collection: 'site.standard.publication',
+			collection: 'app.blento.page',
 			rkey: 'blento.self'
-		});
+		}).catch(() =>
+			// Home pages that have not been re-saved still use the legacy collection.
+			getRecord({
+				did: did as Did,
+				collection: 'site.standard.publication',
+				rkey: 'blento.self'
+			})
+		);
 
 		const preferences = publication?.value?.preferences as
 			| { accentColor?: string; baseColor?: string }
diff --git a/apps/web/src/routes/[[actor=actor]]/blog/layout.server.test.ts b/apps/web/src/routes/[[actor=actor]]/blog/layout.server.test.ts
new file mode 100644
index 0000000..18e4030
--- /dev/null
+++ b/apps/web/src/routes/[[actor=actor]]/blog/layout.server.test.ts
@@ -0,0 +1,66 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const { getRecord, getActor } = vi.hoisted(() => ({
+	getRecord: vi.fn(),
+	getActor: vi.fn()
+}));
+
+vi.mock('$lib/atproto/methods.js', () => ({ getRecord }));
+vi.mock('$lib/helpers/actor.js', () => ({ getActor }));
+
+import { load } from './+layout.server';
+
+const did = 'did:plc:example';
+// Only these event fields are consumed by the layout loader.
+const event = {
+	params: { actor: 'example.test' },
+	platform: undefined,
+	request: new Request('https://blento.app/example.test/blog')
+} as unknown as Parameters<typeof load>[0];
+
+beforeEach(() => {
+	getRecord.mockReset();
+	getActor.mockReset().mockResolvedValue(did);
+});
+
+describe('blog theme', () => {
+	it('prefers the migrated home page without reading the legacy record', async () => {
+		getRecord.mockResolvedValueOnce({
+			value: { preferences: { accentColor: 'red', baseColor: 'gray' } }
+		});
+
+		expect(await load(event)).toEqual({ accentColor: 'red', baseColor: 'gray' });
+		expect(getRecord).toHaveBeenCalledExactlyOnceWith({
+			did,
+			collection: 'app.blento.page',
+			rkey: 'blento.self'
+		});
+	});
+
+	it('uses the legacy theme when the migrated home page is missing', async () => {
+		getRecord.mockRejectedValueOnce(new Error('Record not found')).mockResolvedValueOnce({
+			value: { preferences: { accentColor: 'blue', baseColor: 'slate' } }
+		});
+
+		expect(await load(event)).toEqual({ accentColor: 'blue', baseColor: 'slate' });
+		expect(getRecord).toHaveBeenNthCalledWith(2, {
+			did,
+			collection: 'site.standard.publication',
+			rkey: 'blento.self'
+		});
+	});
+
+	it('returns default colors when neither record is available', async () => {
+		getRecord.mockRejectedValue(new Error('Record not found'));
+
+		expect(await load(event)).toEqual({ accentColor: undefined, baseColor: undefined });
+		expect(getRecord).toHaveBeenCalledTimes(2);
+	});
+
+	it('does not fetch records when there is no actor', async () => {
+		getActor.mockResolvedValueOnce(undefined);
+
+		expect(await load(event)).toEqual({ accentColor: undefined, baseColor: undefined });
+		expect(getRecord).not.toHaveBeenCalled();
+	});
+});
diff --git a/apps/web/src/routes/api/activate-domain/+server.ts b/apps/web/src/routes/api/activate-domain/+server.ts
index b080a69..e37de89 100644
--- a/apps/web/src/routes/api/activate-domain/+server.ts
+++ b/apps/web/src/routes/api/activate-domain/+server.ts
@@ -6,6 +6,38 @@ import type { Did } from '@atcute/lexicons';
 
 const EXPECTED_TARGET = 'blento-proxy.fly.dev';
 
+export async function DELETE({ request, platform, locals }) {
+	if (!locals.did) return json({ error: 'Not authenticated' }, { status: 401 });
+
+	let domain: string;
+	try {
+		({ domain } = await request.json());
+	} catch {
+		return json({ error: 'Invalid JSON body' }, { status: 400 });
+	}
+	if (
+		!domain ||
+		!/^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?)+$/.test(
+			domain
+		)
+	) {
+		return json({ error: 'Invalid domain format' }, { status: 400 });
+	}
+	const kv = platform?.env?.CUSTOM_DOMAINS;
+	if (!kv) return json({ error: 'KV storage not available.' }, { status: 500 });
+
+	const key = domain.toLowerCase();
+	try {
+		// Idempotent: a domain not bound to this account (never activated, or activation failed
+		// because another account holds it) counts as removed, so the user can clear their url.
+		const owner = await kv.get(key);
+		if (owner === locals.did) await kv.delete(key);
+		return json({ success: true });
+	} catch {
+		return json({ error: 'Failed to remove domain.' }, { status: 500 });
+	}
+}
+
 export async function POST({ request, platform, locals }) {
 	if (!locals.did) {
 		return json({ error: 'Not authenticated' }, { status: 401 });
@@ -42,11 +74,11 @@ export async function POST({ request, platform, locals }) {
 
 	const normalizedDomain = domain.toLowerCase();
 
-	// Verify the user's ATProto profile has this domain set
+	// Verify the user's Blento home page has this domain set
 	try {
 		const record = await getRecord({
 			did: did as Did,
-			collection: 'site.standard.publication',
+			collection: 'app.blento.page',
 			rkey: 'blento.self'
 		});
 
-- 
2.51.2