diff --git a/bun.lockb b/bun.lockb
index 9c808c3b1..5ef51acc4 100644
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/packages/website/package.json b/packages/website/package.json
index 4f2353317..4418620a2 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -4,7 +4,7 @@
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
-    "build": "astro check && astro build",
+    "build": "astro build",
     "preview": "astro preview",
     "astro": "astro"
   },
@@ -16,18 +16,18 @@
     "@nanostores/react": "^0.7.3",
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/themes": "^3.1.3",
-    "@vanilla-extract/css": "^1.15.5",
-    "astro": "^4.15.6",
-    "three": "0.159.0",
     "@react-three/drei": "^9.111.5",
     "@react-three/fiber": "^8.17.6",
+    "@vanilla-extract/css": "^1.15.5",
+    "astro": "^4.15.6",
     "astro-purgecss": "^4.6.0",
     "nanostores": "^0.11.3",
     "purgecss": "^6.0.0",
     "react": "^18.3.1",
-    "zustand": "^4.5.5",
     "react-dom": "^18.3.1",
-    "react-promise-suspense": "^0.3.4"
+    "react-promise-suspense": "^0.3.4",
+    "three": "0.159.0",
+    "zustand": "^4.5.5"
   },
   "devDependencies": {
     "@types/three": "^0.160.0",
diff --git a/packages/website/src/components/Navbar.astro b/packages/website/src/components/Navbar.astro
index 82f8754ec..95137401c 100644
--- a/packages/website/src/components/Navbar.astro
+++ b/packages/website/src/components/Navbar.astro
@@ -142,10 +142,9 @@ const isBranchNamed =
                 (branch) =>
                   branch !== assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH),
               );
-              // const selected = window.location.pathname.startsWith(
-              //   `/tools/${tool.id}`,
-              // );
-              const selected = false;
+              const selected = Astro.url.pathname.startsWith(
+                `/tools/${tool.id}`,
+              );
 
               if (unavailableOnBranch) return null;
 
diff --git a/packages/website/src/layouts/RootLayout.astro b/packages/website/src/layouts/RootLayout.astro
index ab0679ec8..bbfd63f2d 100644
--- a/packages/website/src/layouts/RootLayout.astro
+++ b/packages/website/src/layouts/RootLayout.astro
@@ -4,8 +4,8 @@ import { BlitzKitTheme } from '../components/BlitzKitTheme';
 import Footer from '../components/Footer.astro';
 import Navbar from '../components/Navbar.astro';
 import Party3 from '../components/Party3.astro';
-const { pathname } = Astro.url;
 
+const { pathname } = Astro.url;
 const isRoot = pathname === '/';
 ---