diff --git a/components/Layout/index.jsx b/components/Layout/index.jsx
index 9c48efa..dfe472b 100644
--- a/components/Layout/index.jsx
+++ b/components/Layout/index.jsx
@@ -23,7 +23,7 @@ export default ({ metadata, headings, readingTime, children }) => (
   <>
     <Analytics basePath="/learn/_vercel" />
     <SpeedInsights basePath="/learn/_vercel" />
-    <NavBar />
+    <NavBar metadata={metadata} />
     <Article>
       <SideBar metadata={metadata} />
       <div>
diff --git a/components/Navigation/index.jsx b/components/Navigation/index.jsx
index 1145153..c2c9903 100644
--- a/components/Navigation/index.jsx
+++ b/components/Navigation/index.jsx
@@ -11,8 +11,8 @@ import Logo from '#theme/Logo';
 /**
  * NavBar component that displays the headings, search, etc.
  */
-export default () => {
-  const [theme, toggleTheme] = useTheme();
+export default ({ metadata }) => {
+  const [themePreference, setThemePreference] = useTheme();
 
   return (
     <NavBar
@@ -36,10 +36,10 @@ export default () => {
         },
       ]}
     >
-      <SearchBox />
+      <SearchBox pathname={metadata.path} />
       <ThemeToggle
-        onClick={toggleTheme}
-        aria-label={`Switch to ${theme === 'light' ? 'dark' : 'light'} theme`}
+        onChange={setThemePreference}
+        currentTheme={themePreference}
       />
       <a
         href={`https://github.com/nodejs/learn`}
diff --git a/package-lock.json b/package-lock.json
index 1ef9715..1e503ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       },
       "devDependencies": {
         "@eslint/js": "^10.0.1",
-        "@node-core/doc-kit": "1.3.0",
+        "@node-core/doc-kit": "1.3.1",
         "@node-core/remark-lint": "^1.3.0",
         "eslint": "^10.1.0",
         "eslint-plugin-mdx": "^3.7.0",
@@ -827,9 +827,9 @@
       }
     },
     "node_modules/@node-core/doc-kit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@node-core/doc-kit/-/doc-kit-1.3.0.tgz",
-      "integrity": "sha512-AVdpEryoIYhhjzrqvQ/VYMCqqVQef9G3YW+EkqVbXBcw02ZqmHH8fE+kq7QcMWUIUavbA4sUm0MWzqNIxEGvOA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@node-core/doc-kit/-/doc-kit-1.3.1.tgz",
+      "integrity": "sha512-GNgtXYSmA93Nuh3I9Dn30CsGqpomsfySp3gaqxiQ5Ih2AVH4js9GRxp+WdSJHjRY4dZ+UsQTLcv7ig7m6I+bGA==",
       "dev": true,
       "dependencies": {
         "@actions/core": "^3.0.0",
diff --git a/package.json b/package.json
index ca88dbb..1256ad4 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@node-core/doc-kit": "1.3.0",
+    "@node-core/doc-kit": "1.3.1",
     "@node-core/remark-lint": "^1.3.0",
     "eslint": "^10.1.0",
     "eslint-plugin-mdx": "^3.7.0",