diff --git a/apps/kit.svelte.dev/vercel.json b/apps/kit.svelte.dev/vercel.json
index 4df4ecb39f..6b9ecfbe6e 100644
--- a/apps/kit.svelte.dev/vercel.json
+++ b/apps/kit.svelte.dev/vercel.json
@@ -16,10 +16,6 @@
 			"destination": "https://svelte.dev/docs/kit/load",
 			"permanent": true
 		},
-		{
-			"source": "/docs/modules",
-			"destination": "https://svelte.dev/docs/kit/@sveltejs-kit"
-		},
 		{
 			"source": "/docs/types",
 			"destination": "https://svelte.dev/docs/kit/@sveltejs-kit"
diff --git a/apps/svelte.dev/src/routes/docs/RemovedPage.svelte b/apps/svelte.dev/src/routes/docs/RemovedPage.svelte
index 5d4e6b610a..092e269fa0 100644
--- a/apps/svelte.dev/src/routes/docs/RemovedPage.svelte
+++ b/apps/svelte.dev/src/routes/docs/RemovedPage.svelte
@@ -17,6 +17,10 @@
 			goto(new_docs[1], { replaceState: true });
 		}
 	});
+
+	function render(title: string) {
+		return title.replace(/`(.+?)`/g, (_, text) => `<code>${text.replaceAll('<', '&lt;')}</code>`);
+	}
 </script>
 
 <svelte:head>
@@ -34,8 +38,7 @@
 		<ul>
 			{#each docs.values() as [title, href]}
 				<li>
-					<span style="font-weight:bold">{title}</span> is now
-					<a {href}>here</a>
+					<a {href}>{@html render(title)}</a>
 				</li>
 			{/each}
 		</ul>
@@ -48,5 +51,13 @@
 		max-width: var(--sk-page-content-width);
 		box-sizing: content-box;
 		margin: auto;
+
+		a {
+			text-decoration: none !important;
+
+			&:hover {
+				text-decoration: underline !important;
+			}
+		}
 	}
 </style>
diff --git a/apps/svelte.dev/src/routes/docs/component-directives/+page.svelte b/apps/svelte.dev/src/routes/docs/component-directives/+page.svelte
index 9f7f4e6f07..b62057946c 100644
--- a/apps/svelte.dev/src/routes/docs/component-directives/+page.svelte
+++ b/apps/svelte.dev/src/routes/docs/component-directives/+page.svelte
@@ -4,11 +4,11 @@
 	const docs = new Map([
 		[
 			'on-eventname ',
-			['on:eventname', '/docs/svelte/v5-migration-guide#Event-changes-Component-events']
+			['`on:eventname`', '/docs/svelte/v5-migration-guide#Event-changes-Component-events']
 		],
-		['style-props', ['--style-props', '/docs/svelte/custom-properties']],
-		['bind-property ', ['bind:property', '/docs/svelte/bind#bind:property-for-components']],
-		['bind-this ', ['bind:this', '/docs/svelte/bind#bind:this']]
+		['style-props', ['`--style-props`', '/docs/svelte/custom-properties']],
+		['bind-property ', ['`bind:property`', '/docs/svelte/bind#bind:property-for-components']],
+		['bind-this ', ['`bind:this`', '/docs/svelte/bind#bind:this']]
 	]);
 </script>
 
diff --git a/apps/svelte.dev/src/routes/docs/element-directives/+page.svelte b/apps/svelte.dev/src/routes/docs/element-directives/+page.svelte
index b99e5abc28..459b5e8797 100644
--- a/apps/svelte.dev/src/routes/docs/element-directives/+page.svelte
+++ b/apps/svelte.dev/src/routes/docs/element-directives/+page.svelte
@@ -2,21 +2,21 @@
 	import RemovedPage from '../RemovedPage.svelte';
 
 	const docs = new Map([
-		['on-eventname ', ['on:eventname', '/docs/svelte/basic-markup#Events']],
-		['bind-property', ['bind:property', '/docs/svelte/bind']],
-		['binding-select-value ', ['Binding <select> value', '/docs/svelte/bind#select-bind:value']],
+		['on-eventname ', ['`on:eventname`', '/docs/svelte/basic-markup#Events']],
+		['bind-property', ['`bind:property`', '/docs/svelte/bind']],
+		['binding-select-value ', ['Binding `<select>` value', '/docs/svelte/bind#select-bind:value']],
 		['media-element-bindings ', ['Media element bindings', '/docs/svelte/bind#audio']],
 		['image-element-bindings ', ['Image element bindings', '/docs/svelte/bind#img']],
 		[
 			'block-level-element-bindings ',
 			['Block-level element bindings', '/docs/svelte/bind#Dimensions']
 		],
-		['bind-group ', ['bind:group', '/docs/svelte/bind#input-bind:group']],
-		['bind-this ', ['bind:this', '/docs/svelte/bind#bind:this']],
-		['class-name ', ['class:name', '/docs/svelte/class']],
-		['style-property ', ['style:property', '/docs/svelte/style']],
-		['use-action', ['use:action', '/docs/svelte/use']],
-		['transition-fn ', ['transition:fn', '/docs/svelte/transition']],
+		['bind-group ', ['`bind:group`', '/docs/svelte/bind#input-bind:group']],
+		['bind-this ', ['`bind:this`', '/docs/svelte/bind#bind:this']],
+		['class-name ', ['`class:name`', '/docs/svelte/class']],
+		['style-property ', ['`style:property`', '/docs/svelte/style']],
+		['use-action', ['`use:action`', '/docs/svelte/use']],
+		['transition-fn ', ['`transition:fn`', '/docs/svelte/transition']],
 		[
 			'transition-parameters ',
 			['Transition parameters', '/docs/svelte/transition#Transition-parameters']
@@ -26,8 +26,8 @@
 			['Custom transition functions', '/docs/svelte/transition#Custom-transition-functions']
 		],
 		['transition-events ', ['Transition events', '/docs/svelte/transition#Transition-events']],
-		['in-fn-out-fn ', ['in:fn/out:fn', '/docs/svelte/in-and-out']],
-		['animate-fn ', ['animate:fn', '/docs/svelte/animate']],
+		['in-fn-out-fn ', ['`in:fn`/`out:fn`', '/docs/svelte/in-and-out']],
+		['animate-fn ', ['`animate:fn`', '/docs/svelte/animate']],
 		[
 			'animation-parameters ',
 			['Animation Parameters', '/docs/svelte/animate#Animation-Parameters']
diff --git a/apps/svelte.dev/src/routes/docs/kit/modules/+page.svelte b/apps/svelte.dev/src/routes/docs/kit/modules/+page.svelte
new file mode 100644
index 0000000000..81eb6358b7
--- /dev/null
+++ b/apps/svelte.dev/src/routes/docs/kit/modules/+page.svelte
@@ -0,0 +1,120 @@
+<script>
+	import RemovedPage from '../../RemovedPage.svelte';
+
+	const docs = new Map([
+		[
+			'$app-environment-browser',
+			['`$app/environment#browser`', '/docs/kit/$app-environment#browser']
+		],
+		[
+			'$app-environment-building',
+			['`$app/environment#building`', '/docs/kit/$app-environment#building']
+		],
+		['$app-environment-dev', ['`$app/environment#dev`', '/docs/kit/$app-environment#dev']],
+		[
+			'$app-environment-version',
+			['`$app/environment#version`', '/docs/kit/$app-environment#version']
+		],
+		['$app-forms-applyaction', ['`$app/forms#applyAction`', '/docs/kit/$app-forms#applyAction']],
+		['$app-forms-deserialize', ['`$app/forms#deserialize`', '/docs/kit/$app-forms#deserialize']],
+		['$app-forms-enhance', ['`$app/forms#enhance`', '/docs/kit/$app-forms#enhance']],
+		[
+			'$app-navigation-afternavigate',
+			['`$app/navigation#afternavigate`', '/docs/kit/$app-navigation#afterNavigate']
+		],
+		[
+			'$app-navigation-beforenavigate',
+			['`$app/navigation#beforeNavigate`', '/docs/kit/$app-navigation#beforeNavigate']
+		],
+		[
+			'$app-navigation-disablescrollhandling',
+			['`$app/navigation#disableScrollHandling`', '/docs/kit/$app-navigation#disableScrollHandling']
+		],
+		['$app-navigation-goto', ['`$app/navigation#goto`', '/docs/kit/$app-navigation#goto']],
+		[
+			'$app-navigation-invalidate',
+			['`$app/navigation#invalidate`', '/docs/kit/$app-navigation#invalidate']
+		],
+		[
+			'$app-navigation-invalidateall',
+			['`$app/navigation#invalidateAll`', '/docs/kit/$app-navigation#invalidateAll']
+		],
+		[
+			'$app-navigation-onnavigate',
+			['`$app/navigation#onNavigate`', '/docs/kit/$app-navigation#onNavigate']
+		],
+		[
+			'$app-navigation-preloadcode',
+			['`$app/navigation#preloadCode`', '/docs/kit/$app-navigation#preloadCode']
+		],
+		[
+			'$app-navigation-preloaddata',
+			['`$app/navigation#preloadData`', '/docs/kit/$app-navigation#preloadData']
+		],
+		[
+			'$app-navigation-pushstate',
+			['`$app/navigation#pushState`', '/docs/kit/$app-navigation#pushState']
+		],
+		[
+			'$app-navigation-replacestate',
+			['`$app/navigation#replaceState`', '/docs/kit/$app-navigation#replaceState']
+		],
+		['$app-paths-assets', ['`$app/paths#assets`', '/docs/kit/$app-paths#assets']],
+		['$app-paths-base', ['`$app/paths#base`', '/docs/kit/$app-paths#base']],
+		['$app-paths-resolveroute', ['`$app-paths#resolveRoute`', '/docs/kit/$app-paths#resolveRoute']],
+		['$app-server-read', ['`$app/paths#read`', '/docs/kit/$app-paths#read']],
+		['$app-stores-getstores', ['`$app/stores#getStores`', '/docs/kit/$app-stores#getStores']],
+		['$app-stores-navigating', ['`$app/stores#assets`', '/docs/kit/$app-stores#assets']],
+		['$app-stores-page', ['`$app/stores#page`', '/docs/kit/$app-stores#page']],
+		['$app-stores-updated', ['`$app/stores#updated`', '/docs/kit/$app-stores#updated']],
+		['$lib-$lib-server', ['`$lib`', '/docs/kit/$lib']],
+		['$service-worker-base', ['`$service-worker#base`', '/docs/kit/$service-worker#base']],
+		['$service-worker-build', ['`$service-worker#build`', '/docs/kit/$service-worker#build']],
+		['$service-worker-files', ['`$service-worker#files`', '/docs/kit/$service-worker#files']],
+		[
+			'$service-worker-prerendered',
+			['`$service-worker#prerendered`', '/docs/kit/$service-worker#prerendered']
+		],
+		['$service-worker-version', ['`$service-worker#version`', '/docs/kit/$service-worker#version']],
+		['sveltejs-kit-version', ['`@sveltejs/kit#VERSION`', '/@sveltejs-kit#VERSION']],
+		['sveltejs-kit-error', ['`@sveltejs/kit#error`', '/@sveltejs-kit#error']],
+		['sveltejs-kit-fail', ['`@sveltejs/kit#fail`', '/@sveltejs-kit#fail']],
+		['sveltejs-kit-ishttperror', ['`@sveltejs/kit#isHttpError`', '/@sveltejs-kit#isHttpError']],
+		['sveltejs-kit-isredirect', ['`@sveltejs/kit#isRedirect`', '/@sveltejs-kit#isRedirect']],
+		['sveltejs-kit-json', ['`@sveltejs/kit#json`', '/@sveltejs-kit#json']],
+		['sveltejs-kit-redirect', ['`@sveltejs/kit#redirect`', '/@sveltejs-kit#redirect']],
+		['sveltejs-kit-text', ['`@sveltejs/kit#text`', '/@sveltejs-kit#text']],
+		[
+			'sveltejs-kit-hooks-sequence',
+			['`@sveltejs/kit/hooks#sequence`', '/docs/kit/@sveltejs-kit-hooks#sequence']
+		],
+		[
+			'sveltejs-kit-node-createreadablestream',
+			[
+				'`@sveltejs/kit/node#createReadableStream`',
+				'/docs/kit/@sveltejs-kit-node#createReadableStream'
+			]
+		],
+		[
+			'sveltejs-kit-node-getrequest',
+			['`@sveltejs/kit/node#getRequest`', '/docs/kit/@sveltejs-kit-node#getRequest']
+		],
+		[
+			'sveltejs-kit-node-setresponse',
+			['`@sveltejs/kit/node#setResponse`', '/docs/kit/@sveltejs-kit-node#setResponse']
+		],
+		[
+			'sveltejs-kit-node-polyfills-installpolyfills',
+			[
+				'`@sveltejs/kit/node/polyfills#installPolyfills`',
+				'/docs/kit/@sveltejs-kit-node-polyfills#installPolyfills'
+			]
+		],
+		[
+			'sveltejs-kit-vite-sveltekit',
+			['`@sveltejs/kit/vite#sveltekit`', '/docs/kit/@sveltejs-kit-vite#sveltekit']
+		]
+	]);
+</script>
+
+<RemovedPage {docs} />
diff --git a/apps/svelte.dev/src/routes/docs/logic-blocks/+page.svelte b/apps/svelte.dev/src/routes/docs/logic-blocks/+page.svelte
index afbd312ecb..04f076dc5b 100644
--- a/apps/svelte.dev/src/routes/docs/logic-blocks/+page.svelte
+++ b/apps/svelte.dev/src/routes/docs/logic-blocks/+page.svelte
@@ -2,10 +2,10 @@
 	import RemovedPage from '../RemovedPage.svelte';
 
 	const docs = new Map([
-		['if', ['{#if ...}', '/docs/svelte/if']],
-		['each', ['{#each ...}', '/docs/svelte/each']],
-		['await', ['{#key ...}', '/docs/svelte/await']],
-		['key', ['{#await ...}', '/docs/svelte/key']]
+		['if', ['`{#if ...}`', '/docs/svelte/if']],
+		['each', ['`{#each ...}`', '/docs/svelte/each']],
+		['await', ['`{#await ...}`', '/docs/svelte/await']],
+		['key', ['`{#key ...}`', '/docs/svelte/key']]
 	]);
 </script>
 
diff --git a/apps/svelte.dev/src/routes/docs/special-elements/+page.svelte b/apps/svelte.dev/src/routes/docs/special-elements/+page.svelte
index 289e81740c..5bcdc43593 100644
--- a/apps/svelte.dev/src/routes/docs/special-elements/+page.svelte
+++ b/apps/svelte.dev/src/routes/docs/special-elements/+page.svelte
@@ -2,16 +2,16 @@
 	import RemovedPage from '../RemovedPage.svelte';
 
 	const docs = new Map([
-		['slot ', ['<slot>', '/docs/svelte/legacy-slots']],
-		['svelte-self', ['<svelte:self>', '/docs/svelte/legacy-svelte-self']],
-		['svelte-component ', ['<svelte:component>', '/docs/svelte/legacy-svelte-component']],
-		['svelte-element ', ['<svelte:element>', '/docs/svelte/svelte-element']],
-		['svelte-window ', ['<svelte:window>', '/docs/svelte/svelte-window']],
-		['svelte-document ', ['<svelte:document>', '/docs/svelte/svelte-document']],
-		['svelte-body ', ['<svelte:body>', '/docs/svelte/svelte-body']],
-		['svelte-head ', ['<svelte:head>', '/docs/svelte/svelte-head']],
-		['svelte-options ', ['<svelte:options>', '/docs/svelte/svelte-options']],
-		['svelte-fragment ', ['<svelte:fragment>', '/docs/svelte/legacy-svelte-fragment']]
+		['slot ', ['`<slot>`', '/docs/svelte/legacy-slots']],
+		['svelte-self', ['`<svelte:self>`', '/docs/svelte/legacy-svelte-self']],
+		['svelte-component ', ['`<svelte:component>`', '/docs/svelte/legacy-svelte-component']],
+		['svelte-element ', ['`<svelte:element>`', '/docs/svelte/svelte-element']],
+		['svelte-window ', ['`<svelte:window>`', '/docs/svelte/svelte-window']],
+		['svelte-document ', ['`<svelte:document>`', '/docs/svelte/svelte-document']],
+		['svelte-body ', ['`<svelte:body>`', '/docs/svelte/svelte-body']],
+		['svelte-head ', ['`<svelte:head>`', '/docs/svelte/svelte-head']],
+		['svelte-options ', ['`<svelte:options>`', '/docs/svelte/svelte-options']],
+		['svelte-fragment ', ['`<svelte:fragment>`', '/docs/svelte/legacy-svelte-fragment']]
 	]);
 </script>