diff --git a/docs/components/Footer.vue b/docs/components/Footer.vue
index d721e781..210bab5c 100644
--- a/docs/components/Footer.vue
+++ b/docs/components/Footer.vue
@@ -24,9 +24,9 @@
     </template>
 
     <template #right>
-      <USocialButton aria-label="Nuxt Website" icon="i-simple-icons-nuxtdotjs" to="https://nuxt.com" />
-      <USocialButton aria-label="Nuxt on X" icon="i-simple-icons-x" to="https://x.com/nuxt_js" />
-      <USocialButton aria-label="Nuxt UI on GitHub" icon="i-simple-icons-github" to="https://github.com/nuxt/ui" />
+      <UButton aria-label="Nuxt Website" icon="i-simple-icons-nuxtdotjs" to="https://nuxt.com" target="_blank" v-bind="$elements.button.secondary" />
+      <UButton aria-label="Nuxt on X" icon="i-simple-icons-x" to="https://x.com/nuxt_js" target="_blank" v-bind="$elements.button.secondary" />
+      <UButton aria-label="Nuxt UI on GitHub" icon="i-simple-icons-github" to="https://github.com/nuxt/ui" target="_blank" v-bind="$elements.button.secondary" />
     </template>
   </UFooter>
 </template>
diff --git a/docs/components/Header.vue b/docs/components/Header.vue
index 7411ab24..ed1369a5 100644
--- a/docs/components/Header.vue
+++ b/docs/components/Header.vue
@@ -16,12 +16,19 @@
       <ColorPicker />
 
       <UTooltip text="Search" :shortcuts="[metaSymbol, 'K']">
-        <UDocsSearchButton icon-only />
+        <UDocsSearchButton :label="null" />
       </UTooltip>
 
       <UColorModeButton />
 
-      <USocialButton to="https://github.com/nuxt/ui" target="_blank" icon="i-simple-icons-github" aria-label="GitHub" class="hidden lg:inline-flex" />
+      <UButton
+        to="https://github.com/nuxt/ui"
+        target="_blank"
+        icon="i-simple-icons-github"
+        aria-label="GitHub"
+        class="hidden lg:inline-flex"
+        v-bind="$elements.button.secondary"
+      />
     </template>
 
     <template #panel>
diff --git a/docs/package.json b/docs/package.json
index f2751855..c4c6fb72 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -7,10 +7,10 @@
   "devDependencies": {
     "@iconify-json/heroicons": "latest",
     "@iconify-json/simple-icons": "latest",
-    "@nuxt/content": "npm:@nuxt/content-edge@2.8.2-28246249.76260da",
+    "@nuxt/content": "npm:@nuxt/content-edge@2.8.2-28246255.cae34d7",
     "@nuxt/devtools": "^0.8.3",
     "@nuxt/eslint-config": "^0.2.0",
-    "@nuxthq/elements": "npm:@nuxthq/elements-edge@0.0.1-28246224.5395dca",
+    "@nuxthq/elements": "npm:@nuxthq/elements-edge@0.0.1-28246521.0e46d44",
     "@nuxthq/studio": "^0.14.1",
     "@nuxtjs/fontaine": "^0.4.1",
     "@nuxtjs/google-fonts": "^3.0.2",
@@ -19,7 +19,7 @@
     "eslint": "^8.49.0",
     "joi": "^17.10.1",
     "nuxt": "^3.7.3",
-    "nuxt-component-meta": "^0.5.3",
+    "nuxt-component-meta": "^0.5.4",
     "nuxt-og-image": "^2.0.28",
     "typescript": "^5.2.2",
     "ufo": "^1.3.0",
diff --git a/package.json b/package.json
index af597c3a..c8a82d9b 100644
--- a/package.json
+++ b/package.json
@@ -65,10 +65,5 @@
     "yup": "^1.2.0",
     "zod": "^3.22.2",
     "valibot": "^0.15.0"
-  },
-  "pnpm": {
-    "patchedDependencies": {
-      "nuxt-component-meta@0.5.3": "patches/nuxt-component-meta@0.5.3.patch"
-    }
   }
-}
\ No newline at end of file
+}
diff --git a/patches/nuxt-component-meta@0.5.3.patch b/patches/nuxt-component-meta@0.5.3.patch
deleted file mode 100644
index 163fd3f8..00000000
--- a/patches/nuxt-component-meta@0.5.3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/dist/module.mjs b/dist/module.mjs
-index 286319046560f8ead5a26f811e7643fe990f9ee6..14be2f9551c24cd1e5c35dadaad9f83009f4c5a0 100644
---- a/dist/module.mjs
-+++ b/dist/module.mjs
-@@ -142,10 +142,6 @@ const module = defineNuxtModule({
-       references.push({
-         path: join(nuxt.options.buildDir, "component-meta.d.ts")
-       });
--      tsConfig.compilerOptions = tsConfig.compilerOptions || {};
--      tsConfig.compilerOptions.paths = tsConfig.compilerOptions.paths || {};
--      tsConfig.compilerOptions.paths["#nuxt-component-meta"] = [withoutLeadingSlash(join(nuxt.options.buildDir, "/component-meta.mjs").replace(nuxt.options.rootDir, ""))];
--      tsConfig.compilerOptions.paths["#nuxt-component-meta/types"] = [withoutLeadingSlash(join(nuxt.options.buildDir, "/component-meta.d.ts").replace(nuxt.options.rootDir, ""))];
-     });
-     nuxt.hook("nitro:config", (nitroConfig) => {
-       nitroConfig.handlers = nitroConfig.handlers || [];
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a3ebf4c8..f14f8d7b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,11 +4,6 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
-patchedDependencies:
-  nuxt-component-meta@0.5.3:
-    hash: ybky4hlfy36ww3cfjktd7bj6kq
-    path: patches/nuxt-component-meta@0.5.3.patch
-
 importers:
 
   .:
@@ -127,8 +122,8 @@ importers:
         specifier: latest
         version: 1.1.70
       '@nuxt/content':
-        specifier: npm:@nuxt/content-edge@2.8.2-28246249.76260da
-        version: /@nuxt/content-edge@2.8.2-28246249.76260da(rollup@3.28.1)(vue@3.3.4)
+        specifier: npm:@nuxt/content-edge@2.8.2-28246255.cae34d7
+        version: /@nuxt/content-edge@2.8.2-28246255.cae34d7(rollup@3.28.1)(vue@3.3.4)
       '@nuxt/devtools':
         specifier: ^0.8.3
         version: 0.8.3(nuxt@3.7.3)(rollup@3.28.1)(vite@4.4.9)
@@ -136,8 +131,8 @@ importers:
         specifier: ^0.2.0
         version: 0.2.0(eslint@8.49.0)
       '@nuxthq/elements':
-        specifier: npm:@nuxthq/elements-edge@0.0.1-28246224.5395dca
-        version: /@nuxthq/elements-edge@0.0.1-28246224.5395dca(rollup@3.28.1)(vue@3.3.4)(webpack@5.88.2)
+        specifier: npm:@nuxthq/elements-edge@0.0.1-28246521.0e46d44
+        version: /@nuxthq/elements-edge@0.0.1-28246521.0e46d44(rollup@3.28.1)(vue@3.3.4)(webpack@5.88.2)
       '@nuxthq/studio':
         specifier: ^0.14.1
         version: 0.14.1(rollup@3.28.1)
@@ -163,8 +158,8 @@ importers:
         specifier: ^3.7.3
         version: 3.7.3(eslint@8.49.0)(rollup@3.28.1)(typescript@5.2.2)(vue-tsc@1.8.11)
       nuxt-component-meta:
-        specifier: ^0.5.3
-        version: 0.5.3(patch_hash=ybky4hlfy36ww3cfjktd7bj6kq)(rollup@3.28.1)
+        specifier: ^0.5.4
+        version: 0.5.4(rollup@3.28.1)
       nuxt-og-image:
         specifier: ^2.0.28
         version: 2.0.28(rollup@3.28.1)
@@ -1292,8 +1287,8 @@ packages:
       - supports-color
     dev: true
 
-  /@nuxt/content-edge@2.8.2-28246249.76260da(rollup@3.28.1)(vue@3.3.4):
-    resolution: {integrity: sha512-gO4tECJf/oYh/DPB94S2gPbUOJ0cM1RxKO2AUbAcJD5HMOh43iP9MrHdgwXvsAGtjIJLDiOX8KVXUAqFikegPA==}
+  /@nuxt/content-edge@2.8.2-28246255.cae34d7(rollup@3.28.1)(vue@3.3.4):
+    resolution: {integrity: sha512-FBHilhbYrju846tGtvP4Yp1V7j8ueE+Kd8XBCN/5IZ/4ZYP4hz/S/0UVM8A+bNIP8YByz8Wk2atpWMJN9Ly7Iw==}
     dependencies:
       '@nuxt/kit': 3.7.3(rollup@3.28.1)
       '@nuxtjs/mdc': 0.1.6(rollup@3.28.1)
@@ -1753,8 +1748,8 @@ packages:
       - vue-tsc
     dev: true
 
-  /@nuxthq/elements-edge@0.0.1-28246224.5395dca(rollup@3.28.1)(vue@3.3.4)(webpack@5.88.2):
-    resolution: {integrity: sha512-GOuFqa5QDAnTyXW2SJff0XT/cjTZNdepkMkdodZTduCKZy4/ZzNzXRQd6vOr/Knj3arMOc9VRKBe/ZeA89gE+Q==}
+  /@nuxthq/elements-edge@0.0.1-28246521.0e46d44(rollup@3.28.1)(vue@3.3.4)(webpack@5.88.2):
+    resolution: {integrity: sha512-8MU2WXawTcZFpaAOuz0WYDBR8fjblH6UTS9wlXz3qNRya15wOAH62a7VNfdy2xsE8Rlmv1DeuIVFZnIO24Rmbw==}
     dependencies:
       '@nuxt/ui': 2.8.1(rollup@3.28.1)(vue@3.3.4)(webpack@5.88.2)
       '@vueuse/core': 10.4.1(vue@3.3.4)
@@ -1786,7 +1781,7 @@ packages:
     dependencies:
       '@nuxt/kit': 3.7.1(rollup@3.28.1)
       defu: 6.1.2
-      nuxt-component-meta: 0.5.3(patch_hash=ybky4hlfy36ww3cfjktd7bj6kq)(rollup@3.28.1)
+      nuxt-component-meta: 0.5.4(rollup@3.28.1)
       nuxt-config-schema: 0.4.6(rollup@3.28.1)
       socket.io-client: 4.7.2
       ufo: 1.3.0
@@ -8825,10 +8820,10 @@ packages:
       fsevents: 2.3.3
     dev: true
 
-  /nuxt-component-meta@0.5.3(patch_hash=ybky4hlfy36ww3cfjktd7bj6kq)(rollup@3.28.1):
-    resolution: {integrity: sha512-+MHUrESdr+Si9PdbkxQrzQv+X6RdRd/ffmFWVVsZAHA7X9vGoNAYxwvoB1Pbs15TaPtFBWA1P5a4VGqtp+bhAg==}
+  /nuxt-component-meta@0.5.4(rollup@3.28.1):
+    resolution: {integrity: sha512-0ou1O5Dky/avUAm6XrO4r4aZiRgP3wCwBlOe49FcyVZo0uAULFw8b3j48BvKWzBdOywf8hJEL4V5o7FWnd1E+A==}
     dependencies:
-      '@nuxt/kit': 3.7.0(rollup@3.28.1)
+      '@nuxt/kit': 3.7.3(rollup@3.28.1)
       scule: 1.0.0
       typescript: 5.2.2
       vue-component-meta: 1.8.8(typescript@5.2.2)
@@ -8836,7 +8831,6 @@ packages:
       - rollup
       - supports-color
     dev: true
-    patched: true
 
   /nuxt-config-schema@0.4.6(rollup@3.28.1):
     resolution: {integrity: sha512-kHLWJFynj5QrxVZ1MjY2xmDaTSN1BCMLGExA+hMMLoCb3wn9TJlDVqnE/nSdUJPMRkNn/NQ5WP9NLA9vlAXRUw==}
@@ -11921,7 +11915,7 @@ packages:
       destr: 2.0.1
       h3: 1.8.1
       ioredis: 5.3.2
-      listhen: 1.5.1
+      listhen: 1.5.3
       lru-cache: 10.0.1
       mri: 1.2.0
       node-fetch-native: 1.4.0