diff --git a/apps/svelte.dev/src/lib/components/ModalDropdown.svelte b/apps/svelte.dev/src/lib/components/ModalDropdown.svelte
index 0846af232..2c6d454ad 100644
--- a/apps/svelte.dev/src/lib/components/ModalDropdown.svelte
+++ b/apps/svelte.dev/src/lib/components/ModalDropdown.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { afterNavigate } from '$app/navigation';
-	import { page } from '$app/stores';
+	import { page } from '$app/state';
 	import { focusable_children, trap } from '@sveltejs/site-kit/actions';
 	import { Icon } from '@sveltejs/site-kit/components';
 	import type { Snippet } from 'svelte';
@@ -46,7 +46,7 @@
 
 		// except parents of the current one
 		const current = details.querySelector(
-			`[href="${$page.url.pathname}"]`
+			`[href="${page.url.pathname}"]`
 		) as HTMLAnchorElement | null;
 		if (!current) return;
 
diff --git a/apps/svelte.dev/src/routes/(authed)/playground/[id]/+page.svelte b/apps/svelte.dev/src/routes/(authed)/playground/[id]/+page.svelte
index f5181943c..f883a1ec6 100644
--- a/apps/svelte.dev/src/routes/(authed)/playground/[id]/+page.svelte
+++ b/apps/svelte.dev/src/routes/(authed)/playground/[id]/+page.svelte
@@ -7,7 +7,7 @@
 	import { mapbox_setup } from '../../../../config.js';
 	import AppControls from './AppControls.svelte';
 	import { compress_and_encode_text, decode_and_decompress_text } from './gzip.js';
-	import { page } from '$app/stores';
+	import { page } from '$app/state';
 	import type { File } from 'editor';
 
 	let { data } = $props();
@@ -20,12 +20,12 @@
 	let setting_hash: any = null;
 
 	// svelte-ignore non_reactive_update
-	let version = $page.url.searchParams.get('version') || 'latest';
+	let version = page.url.searchParams.get('version') || 'latest';
 	let is_pr_or_commit_version = version.startsWith('pr-') || version.startsWith('commit-');
 
 	// Hashed URLs are less safe (we can't delete malicious REPLs), therefore
 	// don't allow links to escape the sandbox restrictions
-	const can_escape = browser && !$page.url.hash;
+	const can_escape = browser && !page.url.hash;
 
 	if (version !== 'local' && !is_pr_or_commit_version) {
 		$effect(() => {
diff --git a/apps/svelte.dev/src/routes/(authed)/playground/[id]/AppControls.svelte b/apps/svelte.dev/src/routes/(authed)/playground/[id]/AppControls.svelte
index a1b691714..a4f096234 100644
--- a/apps/svelte.dev/src/routes/(authed)/playground/[id]/AppControls.svelte
+++ b/apps/svelte.dev/src/routes/(authed)/playground/[id]/AppControls.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { page } from '$app/stores';
+	import { page } from '$app/state';
 	import UserMenu from './UserMenu.svelte';
 	import { Icon } from '@sveltejs/site-kit/components';
 	import { isMac } from '$lib/utils/compat.js';
@@ -193,7 +193,7 @@
 							<li>
 								<a
 									href="/playground/{example.slug}"
-									aria-current={$page.params.id === example.slug ? 'page' : undefined}
+									aria-current={page.params.id === example.slug ? 'page' : undefined}
 								>
 									{example.title}
 								</a>
diff --git a/apps/svelte.dev/src/routes/(authed)/playground/[id]/embed/+page.svelte b/apps/svelte.dev/src/routes/(authed)/playground/[id]/embed/+page.svelte
index e67c9e528..4bc1be3e7 100644
--- a/apps/svelte.dev/src/routes/(authed)/playground/[id]/embed/+page.svelte
+++ b/apps/svelte.dev/src/routes/(authed)/playground/[id]/embed/+page.svelte
@@ -4,14 +4,13 @@
 	import { theme } from '@sveltejs/site-kit/stores';
 	import { Repl } from '@sveltejs/repl';
 	import { mapbox_setup } from '../../../../../config.js';
-	import { page } from '$app/stores';
+	import { page } from '$app/state';
 
 	let { data } = $props();
 
 	let repl = $state() as ReturnType<typeof Repl>;
 
-	// svelte-ignore non_reactive_update
-	let version = $page.url.searchParams.get('version') || 'latest';
+	let version = page.url.searchParams.get('version') || 'latest';
 	let is_pr_or_commit_version = version.startsWith('pr-') || version.startsWith('commit-');
 
 	if (version !== 'local' && !is_pr_or_commit_version) {
diff --git a/apps/svelte.dev/src/routes/tutorial/[...slug]/+page.svelte b/apps/svelte.dev/src/routes/tutorial/[...slug]/+page.svelte
index 9539e5f3e..2e8332ef6 100644
--- a/apps/svelte.dev/src/routes/tutorial/[...slug]/+page.svelte
+++ b/apps/svelte.dev/src/routes/tutorial/[...slug]/+page.svelte
@@ -12,7 +12,7 @@
 	import { solution } from './state.svelte';
 	import { needs_webcontainers, text_files } from './shared';
 	import OutputRollup from './OutputRollup.svelte';
-	import { page } from '$app/stores';
+	import { page } from '$app/state';
 	import Controls from './Controls.svelte';
 	import type { Item } from 'editor';
 	import type { Snapshot } from './$types.js';
@@ -319,7 +319,7 @@
 					</section>
 
 					<section slot="b" class="preview">
-						{#if needs_webcontainers($page.data.exercise)}
+						{#if needs_webcontainers(page.data.exercise)}
 							<Output exercise={data.exercise} {paused} {workspace} />
 						{:else}
 							<OutputRollup />
diff --git a/apps/svelte.dev/src/routes/tutorial/[...slug]/Controls.svelte b/apps/svelte.dev/src/routes/tutorial/[...slug]/Controls.svelte
index 17e04eb2f..31c5011b3 100644
--- a/apps/svelte.dev/src/routes/tutorial/[...slug]/Controls.svelte
+++ b/apps/svelte.dev/src/routes/tutorial/[...slug]/Controls.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { page } from '$app/stores';
+	import { page } from '$app/state';
 	import SecondaryNav from '$lib/components/SecondaryNav.svelte';
 	import ModalDropdown from '$lib/components/ModalDropdown.svelte';
 	import type { Exercise, PartStub } from '$lib/tutorial';
@@ -30,7 +30,7 @@
 								{#each chapter.exercises as exercise}
 									<li value={exercise.slug}>
 										<a
-											aria-current={$page.url.pathname === `/tutorial/${exercise.slug}`
+											aria-current={page.url.pathname === `/tutorial/${exercise.slug}`
 												? 'page'
 												: undefined}
 											href="/tutorial/{exercise.slug}">{exercise.title}</a