diff --git a/packages/site-kit/src/lib/nav/MobileMenu.svelte b/packages/site-kit/src/lib/nav/MobileMenu.svelte
index 98fa16fe1b..a1c6a2cd29 100644
--- a/packages/site-kit/src/lib/nav/MobileMenu.svelte
+++ b/packages/site-kit/src/lib/nav/MobileMenu.svelte
@@ -147,7 +147,9 @@
 						<ul>
 							<li><a href="/chat">Discord</a></li>
 							<li><a href="https://bsky.app/profile/svelte.dev">Bluesky</a></li>
-							<li><a href="https://github.com/sveltejs/svelte">GitHub</a></li>
+							<li>
+								<a href="https://github.com/sveltejs">GitHub</a>
+							</li>
 						</ul>
 					</div>
 				</div>
diff --git a/packages/site-kit/src/lib/nav/Nav.svelte b/packages/site-kit/src/lib/nav/Nav.svelte
index b71147ad06..d6dd5b5e0f 100644
--- a/packages/site-kit/src/lib/nav/Nav.svelte
+++ b/packages/site-kit/src/lib/nav/Nav.svelte
@@ -6,7 +6,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 	import { overlay_open, on_this_page_open } from '../stores';
 	import { search } from '../state/search.svelte';
 	import Icon from '../components/Icon.svelte';
-	import { page } from '$app/stores';
+	import { page } from '$app/state';
 	import ThemeToggle from '../components/ThemeToggle.svelte';
 	import MobileMenu from './MobileMenu.svelte';
 	import type { NavigationLink } from '../types';
@@ -86,7 +86,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 					<Dropdown>
 						<a
 							href="/{link.slug}"
-							aria-current={$page.url.pathname.startsWith(`/${link.slug}`) ? 'page' : undefined}
+							aria-current={page.url.pathname.startsWith(`/${link.slug}`) ? 'page' : undefined}
 						>
 							{link.title}
 
@@ -99,8 +99,8 @@ Top navigation bar for the application. It provides a slot for the left side, th
 									<a
 										class="secondary"
 										href={section.path}
-										aria-current={$page.url.pathname === section.path ||
-										$page.url.pathname.startsWith(section.path!)
+										aria-current={page.url.pathname === section.path ||
+										page.url.pathname.startsWith(section.path!)
 											? 'page'
 											: undefined}
 									>
@@ -113,7 +113,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 				{:else}
 					<a
 						href="/{link.slug}"
-						aria-current={$page.url.pathname.startsWith(`/${link.slug}`) ? 'page' : null}
+						aria-current={page.url.pathname.startsWith(`/${link.slug}`) ? 'page' : null}
 					>
 						{link.title}
 					</a>
@@ -133,7 +133,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 					<span data-icon="bluesky"></span>
 				</a>
 
-				<a href="https://github.com/sveltejs/svelte" aria-label="GitHub Repo">
+				<a href="https://github.com/sveltejs" aria-label="GitHub Organization">
 					<span data-icon="github"></span>
 				</a>
 			</div>
@@ -169,7 +169,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 				open = !open;
 
 				if (open) {
-					const segment = $page.url.pathname.split('/')[1];
+					const segment = page.url.pathname.split('/')[1];
 					current = links.find((link) => link.slug === segment);
 				}
 			}}