diff --git a/docs/app.config.ts b/docs/app/app.config.ts
similarity index 100%
rename from docs/app.config.ts
rename to docs/app/app.config.ts
diff --git a/docs/app.vue b/docs/app/app.vue
similarity index 65%
rename from docs/app.vue
rename to docs/app/app.vue
index 88f2fa67..73b6c0c7 100644
--- a/docs/app.vue
+++ b/docs/app/app.vue
@@ -1,20 +1,22 @@
 <script setup lang="ts">
 import { withoutTrailingSlash } from 'ufo'
-import { debounce } from 'perfect-debounce'
-import type { ParsedContent } from '@nuxt/content/dist/runtime/types'
+// import { debounce } from 'perfect-debounce'
+import type { ContentSearchFile } from '#ui-pro/types'
 
-const searchRef = ref()
+const searchTerm = ref('')
 
 const route = useRoute()
-const colorMode = useColorMode()
+// const colorMode = useColorMode()
 // const { branch } = useContentSource()
+const runtimeConfig = useRuntimeConfig()
+const { integrity, api } = runtimeConfig.public.content
 
-const { data: navigation } = await useAsyncData('navigation', () => fetchContentNavigation())
-const { data: files } = useLazyFetch<ParsedContent[]>('/api/search.json', { default: () => [], server: false })
+const { data: navigation } = await useAsyncData('navigation', () => fetchContentNavigation(), { default: () => [] })
+const { data: files } = await useLazyFetch<ContentSearchFile[]>(`${api.baseURL}/search${integrity ? '.' + integrity : ''}`, { default: () => [] })
 
 // Computed
 
-const color = computed(() => colorMode.value === 'dark' ? '#18181b' : 'white')
+// const color = computed(() => colorMode.value === 'dark' ? '#18181b' : 'white')
 
 const links = computed(() => {
   return [{
@@ -44,20 +46,20 @@ const links = computed(() => {
 
 // Watch
 
-watch(() => searchRef.value?.commandPaletteRef?.query, debounce((query: string) => {
-  if (!query) {
-    return
-  }
+// watch(searchTerm, debounce((query: string) => {
+//   if (!query) {
+//     return
+//   }
 
-  useTrackEvent('Search', { props: { query: `${query} - ${searchRef.value?.commandPaletteRef.results.length} results` } })
-}, 500))
+//   useTrackEvent('Search', { props: { query: `${query} - ${searchTerm.value?.commandPaletteRef.results.length} results` } })
+// }, 500))
 
 // Head
 
 useHead({
   meta: [
     { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-    { key: 'theme-color', name: 'theme-color', content: color }
+    // { key: 'theme-color', name: 'theme-color', content: color }
   ],
   link: [
     { rel: 'icon', type: 'image/svg+xml', href: '/icon.svg' },
@@ -93,8 +95,6 @@ provide('files', files)
 
     <Footer v-if="!$route.path.startsWith('/examples')" />
 
-    <!-- <ClientOnly>
-      <LazyUContentSearch ref="searchRef" :files="files" :navigation="navigation" :links="links" :fuse="{ resultLimit: 42 }" />
-    </ClientOnly> -->
+    <LazyUContentSearch v-model:search-term="searchTerm" :files="files" :navigation="navigation" :links="links" :fuse="{ resultLimit: 42 }" />
   </UApp>
 </template>
diff --git a/docs/components/Banner.vue b/docs/app/components/Banner.vue
similarity index 100%
rename from docs/components/Banner.vue
rename to docs/app/components/Banner.vue
diff --git a/docs/components/Footer.vue b/docs/app/components/Footer.vue
similarity index 100%
rename from docs/components/Footer.vue
rename to docs/app/components/Footer.vue
diff --git a/docs/components/Header.vue b/docs/app/components/Header.vue
similarity index 100%
rename from docs/components/Header.vue
rename to docs/app/components/Header.vue
diff --git a/docs/components/Logo.vue b/docs/app/components/Logo.vue
similarity index 100%
rename from docs/components/Logo.vue
rename to docs/app/components/Logo.vue
diff --git a/docs/components/LogoOnly.vue b/docs/app/components/LogoOnly.vue
similarity index 100%
rename from docs/components/LogoOnly.vue
rename to docs/app/components/LogoOnly.vue
diff --git a/docs/components/OgImage/OgImageDocs.vue b/docs/app/components/OgImage/OgImageDocs.vue
similarity index 100%
rename from docs/components/OgImage/OgImageDocs.vue
rename to docs/app/components/OgImage/OgImageDocs.vue
diff --git a/docs/components/ads/AdsCarbon.vue b/docs/app/components/ads/AdsCarbon.vue
similarity index 100%
rename from docs/components/ads/AdsCarbon.vue
rename to docs/app/components/ads/AdsCarbon.vue
diff --git a/docs/components/ads/AdsPro.vue b/docs/app/components/ads/AdsPro.vue
similarity index 100%
rename from docs/components/ads/AdsPro.vue
rename to docs/app/components/ads/AdsPro.vue
diff --git a/docs/components/content/Placeholder.vue b/docs/app/components/content/Placeholder.vue
similarity index 100%
rename from docs/components/content/Placeholder.vue
rename to docs/app/components/content/Placeholder.vue
diff --git a/docs/components/home/HomeDemo.vue b/docs/app/components/home/HomeDemo.vue
similarity index 100%
rename from docs/components/home/HomeDemo.vue
rename to docs/app/components/home/HomeDemo.vue
diff --git a/docs/components/home/HomeProDemo.vue b/docs/app/components/home/HomeProDemo.vue
similarity index 100%
rename from docs/components/home/HomeProDemo.vue
rename to docs/app/components/home/HomeProDemo.vue
diff --git a/docs/components/home/HomeProDemoBlock.vue b/docs/app/components/home/HomeProDemoBlock.vue
similarity index 100%
rename from docs/components/home/HomeProDemoBlock.vue
rename to docs/app/components/home/HomeProDemoBlock.vue
diff --git a/docs/components/home/HomeTetris.vue b/docs/app/components/home/HomeTetris.vue
similarity index 100%
rename from docs/components/home/HomeTetris.vue
rename to docs/app/components/home/HomeTetris.vue
diff --git a/docs/components/releases/ReleasesItem.vue b/docs/app/components/releases/ReleasesItem.vue
similarity index 100%
rename from docs/components/releases/ReleasesItem.vue
rename to docs/app/components/releases/ReleasesItem.vue
diff --git a/docs/composables/useComponentMeta.ts b/docs/app/composables/useComponentMeta.ts
similarity index 100%
rename from docs/composables/useComponentMeta.ts
rename to docs/app/composables/useComponentMeta.ts
diff --git a/docs/composables/useContentExamplesCode.ts b/docs/app/composables/useContentExamplesCode.ts
similarity index 100%
rename from docs/composables/useContentExamplesCode.ts
rename to docs/app/composables/useContentExamplesCode.ts
diff --git a/docs/composables/useShikiHighlighter.ts b/docs/app/composables/useShikiHighlighter.ts
similarity index 100%
rename from docs/composables/useShikiHighlighter.ts
rename to docs/app/composables/useShikiHighlighter.ts
diff --git a/docs/content/1.getting-started/1.index.md b/docs/app/content/1.getting-started/1.index.md
similarity index 100%
rename from docs/content/1.getting-started/1.index.md
rename to docs/app/content/1.getting-started/1.index.md
diff --git a/docs/content/1.getting-started/2.installation.md b/docs/app/content/1.getting-started/2.installation.md
similarity index 100%
rename from docs/content/1.getting-started/2.installation.md
rename to docs/app/content/1.getting-started/2.installation.md
diff --git a/docs/content/1.getting-started/3.theming.md b/docs/app/content/1.getting-started/3.theming.md
similarity index 100%
rename from docs/content/1.getting-started/3.theming.md
rename to docs/app/content/1.getting-started/3.theming.md
diff --git a/docs/content/1.getting-started/4.shortcuts.md b/docs/app/content/1.getting-started/4.shortcuts.md
similarity index 100%
rename from docs/content/1.getting-started/4.shortcuts.md
rename to docs/app/content/1.getting-started/4.shortcuts.md
diff --git a/docs/content/1.getting-started/6.contributing.md b/docs/app/content/1.getting-started/6.contributing.md
similarity index 100%
rename from docs/content/1.getting-started/6.contributing.md
rename to docs/app/content/1.getting-started/6.contributing.md
diff --git a/docs/content/1.getting-started/_dir.yml b/docs/app/content/1.getting-started/_dir.yml
similarity index 100%
rename from docs/content/1.getting-started/_dir.yml
rename to docs/app/content/1.getting-started/_dir.yml
diff --git a/docs/content/2.components/accordion.md b/docs/app/content/2.components/accordion.md
similarity index 100%
rename from docs/content/2.components/accordion.md
rename to docs/app/content/2.components/accordion.md
diff --git a/docs/content/2.components/alert.md b/docs/app/content/2.components/alert.md
similarity index 100%
rename from docs/content/2.components/alert.md
rename to docs/app/content/2.components/alert.md
diff --git a/docs/content/2.components/avatar.md b/docs/app/content/2.components/avatar.md
similarity index 100%
rename from docs/content/2.components/avatar.md
rename to docs/app/content/2.components/avatar.md
diff --git a/docs/content/2.components/badge.md b/docs/app/content/2.components/badge.md
similarity index 100%
rename from docs/content/2.components/badge.md
rename to docs/app/content/2.components/badge.md
diff --git a/docs/content/2.components/breadcrumb.md b/docs/app/content/2.components/breadcrumb.md
similarity index 100%
rename from docs/content/2.components/breadcrumb.md
rename to docs/app/content/2.components/breadcrumb.md
diff --git a/docs/content/2.components/button.md b/docs/app/content/2.components/button.md
similarity index 100%
rename from docs/content/2.components/button.md
rename to docs/app/content/2.components/button.md
diff --git a/docs/content/2.components/card.md b/docs/app/content/2.components/card.md
similarity index 100%
rename from docs/content/2.components/card.md
rename to docs/app/content/2.components/card.md
diff --git a/docs/content/2.components/carousel.md b/docs/app/content/2.components/carousel.md
similarity index 100%
rename from docs/content/2.components/carousel.md
rename to docs/app/content/2.components/carousel.md
diff --git a/docs/content/2.components/checkbox.md b/docs/app/content/2.components/checkbox.md
similarity index 100%
rename from docs/content/2.components/checkbox.md
rename to docs/app/content/2.components/checkbox.md
diff --git a/docs/content/2.components/chip.md b/docs/app/content/2.components/chip.md
similarity index 100%
rename from docs/content/2.components/chip.md
rename to docs/app/content/2.components/chip.md
diff --git a/docs/content/2.components/command-palette.md b/docs/app/content/2.components/command-palette.md
similarity index 100%
rename from docs/content/2.components/command-palette.md
rename to docs/app/content/2.components/command-palette.md
diff --git a/docs/content/2.components/container.md b/docs/app/content/2.components/container.md
similarity index 100%
rename from docs/content/2.components/container.md
rename to docs/app/content/2.components/container.md
diff --git a/docs/content/2.components/context-menu.md b/docs/app/content/2.components/context-menu.md
similarity index 100%
rename from docs/content/2.components/context-menu.md
rename to docs/app/content/2.components/context-menu.md
diff --git a/docs/content/2.components/date-picker.md b/docs/app/content/2.components/date-picker.md
similarity index 100%
rename from docs/content/2.components/date-picker.md
rename to docs/app/content/2.components/date-picker.md
diff --git a/docs/content/2.components/divider.md b/docs/app/content/2.components/divider.md
similarity index 100%
rename from docs/content/2.components/divider.md
rename to docs/app/content/2.components/divider.md
diff --git a/docs/content/2.components/dropdown.md b/docs/app/content/2.components/dropdown.md
similarity index 100%
rename from docs/content/2.components/dropdown.md
rename to docs/app/content/2.components/dropdown.md
diff --git a/docs/content/2.components/form-group.md b/docs/app/content/2.components/form-group.md
similarity index 100%
rename from docs/content/2.components/form-group.md
rename to docs/app/content/2.components/form-group.md
diff --git a/docs/content/2.components/form.md b/docs/app/content/2.components/form.md
similarity index 100%
rename from docs/content/2.components/form.md
rename to docs/app/content/2.components/form.md
diff --git a/docs/content/2.components/horizontal-navigation.md b/docs/app/content/2.components/horizontal-navigation.md
similarity index 100%
rename from docs/content/2.components/horizontal-navigation.md
rename to docs/app/content/2.components/horizontal-navigation.md
diff --git a/docs/content/2.components/icon.md b/docs/app/content/2.components/icon.md
similarity index 100%
rename from docs/content/2.components/icon.md
rename to docs/app/content/2.components/icon.md
diff --git a/docs/content/2.components/input-menu.md b/docs/app/content/2.components/input-menu.md
similarity index 100%
rename from docs/content/2.components/input-menu.md
rename to docs/app/content/2.components/input-menu.md
diff --git a/docs/content/2.components/input.md b/docs/app/content/2.components/input.md
similarity index 100%
rename from docs/content/2.components/input.md
rename to docs/app/content/2.components/input.md
diff --git a/docs/content/2.components/kbd.md b/docs/app/content/2.components/kbd.md
similarity index 100%
rename from docs/content/2.components/kbd.md
rename to docs/app/content/2.components/kbd.md
diff --git a/docs/content/2.components/link.md b/docs/app/content/2.components/link.md
similarity index 100%
rename from docs/content/2.components/link.md
rename to docs/app/content/2.components/link.md
diff --git a/docs/content/2.components/meter.md b/docs/app/content/2.components/meter.md
similarity index 100%
rename from docs/content/2.components/meter.md
rename to docs/app/content/2.components/meter.md
diff --git a/docs/content/2.components/modal.md b/docs/app/content/2.components/modal.md
similarity index 100%
rename from docs/content/2.components/modal.md
rename to docs/app/content/2.components/modal.md
diff --git a/docs/content/2.components/notification.md b/docs/app/content/2.components/notification.md
similarity index 100%
rename from docs/content/2.components/notification.md
rename to docs/app/content/2.components/notification.md
diff --git a/docs/content/2.components/pagination.md b/docs/app/content/2.components/pagination.md
similarity index 100%
rename from docs/content/2.components/pagination.md
rename to docs/app/content/2.components/pagination.md
diff --git a/docs/content/2.components/popover.md b/docs/app/content/2.components/popover.md
similarity index 100%
rename from docs/content/2.components/popover.md
rename to docs/app/content/2.components/popover.md
diff --git a/docs/content/2.components/progress.md b/docs/app/content/2.components/progress.md
similarity index 100%
rename from docs/content/2.components/progress.md
rename to docs/app/content/2.components/progress.md
diff --git a/docs/content/2.components/radio-group.md b/docs/app/content/2.components/radio-group.md
similarity index 100%
rename from docs/content/2.components/radio-group.md
rename to docs/app/content/2.components/radio-group.md
diff --git a/docs/content/2.components/range.md b/docs/app/content/2.components/range.md
similarity index 100%
rename from docs/content/2.components/range.md
rename to docs/app/content/2.components/range.md
diff --git a/docs/content/2.components/select-menu.md b/docs/app/content/2.components/select-menu.md
similarity index 100%
rename from docs/content/2.components/select-menu.md
rename to docs/app/content/2.components/select-menu.md
diff --git a/docs/content/2.components/select.md b/docs/app/content/2.components/select.md
similarity index 100%
rename from docs/content/2.components/select.md
rename to docs/app/content/2.components/select.md
diff --git a/docs/content/2.components/skeleton.md b/docs/app/content/2.components/skeleton.md
similarity index 100%
rename from docs/content/2.components/skeleton.md
rename to docs/app/content/2.components/skeleton.md
diff --git a/docs/content/2.components/slideover.md b/docs/app/content/2.components/slideover.md
similarity index 100%
rename from docs/content/2.components/slideover.md
rename to docs/app/content/2.components/slideover.md
diff --git a/docs/content/2.components/table.md b/docs/app/content/2.components/table.md
similarity index 100%
rename from docs/content/2.components/table.md
rename to docs/app/content/2.components/table.md
diff --git a/docs/content/2.components/tabs.md b/docs/app/content/2.components/tabs.md
similarity index 100%
rename from docs/content/2.components/tabs.md
rename to docs/app/content/2.components/tabs.md
diff --git a/docs/content/2.components/textarea.md b/docs/app/content/2.components/textarea.md
similarity index 100%
rename from docs/content/2.components/textarea.md
rename to docs/app/content/2.components/textarea.md
diff --git a/docs/content/2.components/toggle.md b/docs/app/content/2.components/toggle.md
similarity index 100%
rename from docs/content/2.components/toggle.md
rename to docs/app/content/2.components/toggle.md
diff --git a/docs/content/2.components/tooltip.md b/docs/app/content/2.components/tooltip.md
similarity index 100%
rename from docs/content/2.components/tooltip.md
rename to docs/app/content/2.components/tooltip.md
diff --git a/docs/content/2.components/vertical-navigation.md b/docs/app/content/2.components/vertical-navigation.md
similarity index 100%
rename from docs/content/2.components/vertical-navigation.md
rename to docs/app/content/2.components/vertical-navigation.md
diff --git a/docs/content/index.yml b/docs/app/content/index.yml
similarity index 100%
rename from docs/content/index.yml
rename to docs/app/content/index.yml
diff --git a/docs/content/releases.yml b/docs/app/content/releases.yml
similarity index 100%
rename from docs/content/releases.yml
rename to docs/app/content/releases.yml
diff --git a/docs/error.vue b/docs/app/error.vue
similarity index 68%
rename from docs/error.vue
rename to docs/app/error.vue
index eca9bd7b..7f983ee7 100644
--- a/docs/error.vue
+++ b/docs/app/error.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { NuxtError } from '#app'
-import type { ParsedContent } from '@nuxt/content/dist/runtime/types'
+import type { ContentSearchFile } from '#ui-pro/types'
 
 useSeoMeta({
   title: 'Page not found',
@@ -12,25 +12,29 @@ defineProps<{
 }>()
 
 const route = useRoute()
-const colorMode = useColorMode()
+// const colorMode = useColorMode()
 // const { branch } = useContentSource()
+const runtimeConfig = useRuntimeConfig()
+const { integrity, api } = runtimeConfig.public.content
 
-const { data: navigation } = await useAsyncData('navigation', () => fetchContentNavigation())
-const { data: files } = useLazyFetch<ParsedContent[]>('/api/search.json', { default: () => [], server: false })
+const { data: navigation } = await useAsyncData('navigation', () => fetchContentNavigation(), { default: () => [] })
+const { data: files } = await useLazyFetch<ContentSearchFile[]>(`${api.baseURL}/search${integrity ? '.' + integrity : ''}`, { default: () => [] })
 
 // Computed
 
-const color = computed(() => colorMode.value === 'dark' ? '#18181b' : 'white')
+// const color = computed(() => colorMode.value === 'dark' ? '#18181b' : 'white')
 
 const links = computed(() => {
   return [{
     label: 'Docs',
     icon: 'i-heroicons-book-open',
     to: '/getting-started',
+    active: route.path.startsWith('/getting-started') || route.path.startsWith('/components')
   }, ...(navigation.value.find(item => item._path === '/pro') ? [{
     label: 'Pro',
     icon: 'i-heroicons-square-3-stack-3d',
     to: '/pro',
+    active: route.path.startsWith('/pro/getting-started') || route.path.startsWith('/pro/components') || route.path.startsWith('/pro/prose')
   }, {
     label: 'Pricing',
     icon: 'i-heroicons-credit-card',
@@ -51,7 +55,7 @@ const links = computed(() => {
 useHead({
   meta: [
     { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-    { key: 'theme-color', name: 'theme-color', content: color }
+    // { key: 'theme-color', name: 'theme-color', content: color }
   ],
   link: [
     { rel: 'icon', type: 'image/svg+xml', href: '/icon.svg' }
diff --git a/docs/layouts/default.vue b/docs/app/layouts/default.vue
similarity index 100%
rename from docs/layouts/default.vue
rename to docs/app/layouts/default.vue
diff --git a/docs/layouts/docs.vue b/docs/app/layouts/docs.vue
similarity index 85%
rename from docs/layouts/docs.vue
rename to docs/app/layouts/docs.vue
index 70ea6517..b60aa30a 100644
--- a/docs/layouts/docs.vue
+++ b/docs/app/layouts/docs.vue
@@ -6,7 +6,7 @@
           <UPageAside>
             <!-- <BranchSelect /> -->
 
-            <!-- <UNavigationTree :links="mapContentNavigation(navigation)" /> -->
+            <UContentNavigation :navigation="navigation" />
           </UPageAside>
         </template>
 
diff --git a/docs/pages/[...slug].vue b/docs/app/pages/[...slug].vue
similarity index 100%
rename from docs/pages/[...slug].vue
rename to docs/app/pages/[...slug].vue
diff --git a/docs/pages/examples/[...slug].vue b/docs/app/pages/examples/[...slug].vue
similarity index 100%
rename from docs/pages/examples/[...slug].vue
rename to docs/app/pages/examples/[...slug].vue
diff --git a/docs/pages/index.vue b/docs/app/pages/index.vue
similarity index 100%
rename from docs/pages/index.vue
rename to docs/app/pages/index.vue
diff --git a/docs/pages/playground.vue b/docs/app/pages/playground.vue
similarity index 100%
rename from docs/pages/playground.vue
rename to docs/app/pages/playground.vue
diff --git a/docs/pages/releases.vue b/docs/app/pages/releases.vue
similarity index 100%
rename from docs/pages/releases.vue
rename to docs/app/pages/releases.vue
diff --git a/docs/pages/roadmap.vue b/docs/app/pages/roadmap.vue
similarity index 100%
rename from docs/pages/roadmap.vue
rename to docs/app/pages/roadmap.vue
diff --git a/docs/plugins/prettier.ts b/docs/app/plugins/prettier.ts
similarity index 100%
rename from docs/plugins/prettier.ts
rename to docs/app/plugins/prettier.ts
diff --git a/docs/types/index.d.ts b/docs/app/types/index.d.ts
similarity index 100%
rename from docs/types/index.d.ts
rename to docs/app/types/index.d.ts
diff --git a/docs/workers/prettier.js b/docs/app/workers/prettier.js
similarity index 100%
rename from docs/workers/prettier.js
rename to docs/app/workers/prettier.js
diff --git a/docs/nuxt.config.ts b/docs/nuxt.config.ts
index ada46a76..2f6ee345 100644
--- a/docs/nuxt.config.ts
+++ b/docs/nuxt.config.ts
@@ -5,6 +5,13 @@ import pkg from '../package.json'
 const { resolve } = createResolver(import.meta.url)
 
 export default defineNuxtConfig({
+  app: {
+    head: {
+      bodyAttrs: {
+        class: 'antialiased font-sans text-gray-700 dark:text-gray-200 bg-white dark:bg-gray-900'
+      }
+    }
+  },
   extends: [
     process.env.NUXT_UI_PRO_PATH ? resolve(process.env.NUXT_UI_PRO_PATH, 'docs') : process.env.NUXT_GITHUB_TOKEN && ['github:nuxt/ui-pro/docs#dev', { giget: { auth: process.env.NUXT_GITHUB_TOKEN } }]
   ],
@@ -19,28 +26,31 @@ export default defineNuxtConfig({
     'nuxt-og-image',
     // 'modules/content-examples-code'
   ],
+  future: {
+    compatibilityVersion: 4
+  },
   runtimeConfig: {
     public: {
       version: pkg.version
     }
   },
-  ui: {
-    global: true
-  },
+  // ui: {
+  //   global: true
+  // },
   content: {
     sources: {
       pro: process.env.NUXT_UI_PRO_PATH ? {
         prefix: '/pro',
         driver: 'fs',
         base: resolve(process.env.NUXT_UI_PRO_PATH, 'docs/content/pro')
-      } : process.env.NUXT_GITHUB_TOKEN && {
+      } : process.env.NUXT_GITHUB_TOKEN ? {
         prefix: '/pro',
         driver: 'github',
         repo: 'nuxt/ui-pro',
         branch: 'dev',
         dir: 'docs/content/pro',
         token: process.env.NUXT_GITHUB_TOKEN || ''
-      }
+      } : undefined
     }
   },
   image: {
@@ -52,7 +62,6 @@ export default defineNuxtConfig({
         '/',
         '/getting-started',
         '/dev/getting-started',
-        '/api/search.json',
         '/api/releases.json',
         '/api/pulls.json'
       ],
@@ -63,26 +72,26 @@ export default defineNuxtConfig({
     '/components': { redirect: '/components/app', prerender: false },
     '/dev/components': { redirect: '/dev/components/app', prerender: false }
   },
-  componentMeta: {
-    exclude: [
-      // '@nuxt/content',
-      // '@nuxt/ui-templates',
-      // '@nuxtjs/color-mode',
-      // '@nuxtjs/mdc',
-      // 'nuxt/dist',
-      // 'nuxt-og-image',
-      // 'nuxt-site-config',
-      resolve('./components'),
-      // process.env.NUXT_UI_PRO_PATH ? resolve(process.env.NUXT_UI_PRO_PATH, 'docs', 'components') : '.c12'
-    ],
-    // metaFields: {
-    //   type: false,
-    //   props: true,
-    //   slots: true,
-    //   events: false,
-    //   exposed: false
-    // }
-  },
+  // componentMeta: {
+  //   exclude: [
+  //     // '@nuxt/content',
+  //     // '@nuxt/ui-templates',
+  //     // '@nuxtjs/color-mode',
+  //     // '@nuxtjs/mdc',
+  //     // 'nuxt/dist',
+  //     // 'nuxt-og-image',
+  //     // 'nuxt-site-config',
+  //     resolve('./components'),
+  //     // process.env.NUXT_UI_PRO_PATH ? resolve(process.env.NUXT_UI_PRO_PATH, 'docs', 'components') : '.c12'
+  //   ],
+  //   // metaFields: {
+  //   //   type: false,
+  //   //   props: true,
+  //   //   slots: true,
+  //   //   events: false,
+  //   //   exposed: false
+  //   // }
+  // },
   hooks: {
     // Related to https://github.com/nuxt/nuxt/pull/22558
     // 'components:extend': (components) => {
@@ -95,9 +104,6 @@ export default defineNuxtConfig({
     //   })
     // }
   },
-  typescript: {
-    strict: false
-  },
   vite: {
     optimizeDeps: {
       include: ['date-fns']
diff --git a/docs/package.json b/docs/package.json
index d385103f..cbb2ad8d 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "@nuxt/ui-docs",
   "private": true,
+  "name": "@nuxt/ui-docs",
   "type": "module",
   "dependencies": {
     "@iconify-json/heroicons": "^1.1.21",
     "@iconify-json/simple-icons": "^1.1.105",
     "@iconify-json/vscode-icons": "^1.1.35",
-    "@nuxt/content": "^2.12.1",
+    "@nuxt/content": "npm:@nuxt/content-edge@2.12.1-28635002.f66778a",
     "@nuxt/fonts": "^0.7.0",
     "@nuxt/image": "^1.7.0",
     "@nuxt/ui": "latest",
diff --git a/docs/server/api/search.json.get.ts b/docs/server/api/search.json.get.ts
deleted file mode 100644
index f5ef8e4a..00000000
--- a/docs/server/api/search.json.get.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { serverQueryContent } from '#content/server'
-
-export default eventHandler(async (event) => {
-  return serverQueryContent(event).where({ _type: 'markdown', navigation: { $ne: false } }).find()
-})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0ed290ea..3d5436c5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,8 +135,8 @@ importers:
         specifier: ^1.1.35
         version: 1.1.35
       '@nuxt/content':
-        specifier: ^2.12.1
-        version: 2.12.1(ioredis@5.4.1)(nuxt@3.12.1(@opentelemetry/api@1.9.0)(@parcel/watcher@2.4.1)(@types/node@20.14.2)(@unocss/reset@0.60.4)(encoding@0.1.13)(eslint@9.4.0)(floating-vue@5.2.2(@nuxt/kit@3.12.1(rollup@4.18.0))(vue@3.4.27(typescript@5.4.5)))(fuse.js@7.0.0)(ioredis@5.4.1)(lightningcss@1.25.1)(optionator@0.9.4)(rollup@4.18.0)(terser@5.31.1)(typescript@5.4.5)(unocss@0.60.4(@unocss/webpack@0.60.4(rollup@4.18.0)(webpack@5.91.0))(postcss@8.4.38)(rollup@4.18.0)(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1)))(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1))(vue-tsc@2.0.21(typescript@5.4.5)))(rollup@4.18.0)(vue@3.4.27(typescript@5.4.5))
+        specifier: npm:@nuxt/content-edge@2.12.1-28635002.f66778a
+        version: '@nuxt/content-edge@2.12.1-28635002.f66778a(ioredis@5.4.1)(nuxt@3.12.1(@opentelemetry/api@1.9.0)(@parcel/watcher@2.4.1)(@types/node@20.14.2)(@unocss/reset@0.60.4)(encoding@0.1.13)(eslint@9.4.0)(floating-vue@5.2.2(@nuxt/kit@3.12.1(rollup@4.18.0))(vue@3.4.27(typescript@5.4.5)))(fuse.js@7.0.0)(ioredis@5.4.1)(lightningcss@1.25.1)(optionator@0.9.4)(rollup@4.18.0)(terser@5.31.1)(typescript@5.4.5)(unocss@0.60.4(@unocss/webpack@0.60.4(rollup@4.18.0)(webpack@5.91.0))(postcss@8.4.38)(rollup@4.18.0)(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1)))(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1))(vue-tsc@2.0.21(typescript@5.4.5)))(rollup@4.18.0)(vue@3.4.27(typescript@5.4.5))'
       '@nuxt/fonts':
         specifier: ^0.7.0
         version: 0.7.0(encoding@0.1.13)(ioredis@5.4.1)(nuxt@3.12.1(@opentelemetry/api@1.9.0)(@parcel/watcher@2.4.1)(@types/node@20.14.2)(@unocss/reset@0.60.4)(encoding@0.1.13)(eslint@9.4.0)(floating-vue@5.2.2(@nuxt/kit@3.12.1(rollup@4.18.0))(vue@3.4.27(typescript@5.4.5)))(fuse.js@7.0.0)(ioredis@5.4.1)(lightningcss@1.25.1)(optionator@0.9.4)(rollup@4.18.0)(terser@5.31.1)(typescript@5.4.5)(unocss@0.60.4(@unocss/webpack@0.60.4(rollup@4.18.0)(webpack@5.91.0))(postcss@8.4.38)(rollup@4.18.0)(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1)))(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1))(vue-tsc@2.0.21(typescript@5.4.5)))(rollup@4.18.0)(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1))
@@ -1053,8 +1053,8 @@ packages:
     resolution: {integrity: sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==}
     engines: {node: ^16.14.0 || >=18.0.0}
 
-  '@nuxt/content@2.12.1':
-    resolution: {integrity: sha512-xW4xjyYm6zqglb17Tu0J+rpKUV1PF9zp6SLu1lopylFnerdyImtce84206HT6Zd/DJgivKtoW4dyyJn0ZaSqCQ==}
+  '@nuxt/content-edge@2.12.1-28635002.f66778a':
+    resolution: {integrity: sha512-BvD3oVJwzkUiF2kXpHSHpDGftgpuR9qs79opcmDVK8UQmbNT+FSfTqTHI9BnLE13j9l6PXIVOt+dY3LQdgMoOw==}
 
   '@nuxt/devalue@2.0.2':
     resolution: {integrity: sha512-GBzP8zOc7CGWyFQS6dv1lQz8VVpz5C2yRszbXufwG/9zhStTIH50EtD87NmWbTMwXDvZLNg8GIpb1UFdH93JCA==}
@@ -1171,8 +1171,8 @@ packages:
   '@nuxtjs/color-mode@3.4.1':
     resolution: {integrity: sha512-vZgJqDstxInGw3RGSWbLoCLXtU1mvh1LLeuEA/X3a++DYA4ifwSbNoiSiOyb9qZHFEwz1Xr99H71sXV4IhOaEg==}
 
-  '@nuxtjs/mdc@0.6.1':
-    resolution: {integrity: sha512-zS5QK7DZ/SBrjqQX1DOy7GnxKy+wbj2+LvooefOWmQqHfLTAqJLVIjuv/BmKnQWiRCq19+uysys3iY42EoY5/A==}
+  '@nuxtjs/mdc@0.7.1':
+    resolution: {integrity: sha512-RTKqrQEs7Lthc2r8dlEEvwWBCgtQpWfx8X+Ozd6in7OhXILAhHpqR737sj031gxFu3nujSOwG/wS63crN76czg==}
 
   '@nuxtjs/plausible@1.0.0':
     resolution: {integrity: sha512-2K0/AbPJAEr3yMA8oDD0I6WB+SXs/YlF297azjR5eSZVQjuimDAwLf4bEXk9ilbrzoMFmm0Tpzn4CC6f0rISBA==}
@@ -8108,10 +8108,10 @@ snapshots:
       - bluebird
       - supports-color
 
-  '@nuxt/content@2.12.1(ioredis@5.4.1)(nuxt@3.12.1(@opentelemetry/api@1.9.0)(@parcel/watcher@2.4.1)(@types/node@20.14.2)(@unocss/reset@0.60.4)(encoding@0.1.13)(eslint@9.4.0)(floating-vue@5.2.2(@nuxt/kit@3.12.1(rollup@4.18.0))(vue@3.4.27(typescript@5.4.5)))(fuse.js@7.0.0)(ioredis@5.4.1)(lightningcss@1.25.1)(optionator@0.9.4)(rollup@4.18.0)(terser@5.31.1)(typescript@5.4.5)(unocss@0.60.4(@unocss/webpack@0.60.4(rollup@4.18.0)(webpack@5.91.0))(postcss@8.4.38)(rollup@4.18.0)(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1)))(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1))(vue-tsc@2.0.21(typescript@5.4.5)))(rollup@4.18.0)(vue@3.4.27(typescript@5.4.5))':
+  '@nuxt/content-edge@2.12.1-28635002.f66778a(ioredis@5.4.1)(nuxt@3.12.1(@opentelemetry/api@1.9.0)(@parcel/watcher@2.4.1)(@types/node@20.14.2)(@unocss/reset@0.60.4)(encoding@0.1.13)(eslint@9.4.0)(floating-vue@5.2.2(@nuxt/kit@3.12.1(rollup@4.18.0))(vue@3.4.27(typescript@5.4.5)))(fuse.js@7.0.0)(ioredis@5.4.1)(lightningcss@1.25.1)(optionator@0.9.4)(rollup@4.18.0)(terser@5.31.1)(typescript@5.4.5)(unocss@0.60.4(@unocss/webpack@0.60.4(rollup@4.18.0)(webpack@5.91.0))(postcss@8.4.38)(rollup@4.18.0)(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1)))(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1))(vue-tsc@2.0.21(typescript@5.4.5)))(rollup@4.18.0)(vue@3.4.27(typescript@5.4.5))':
     dependencies:
       '@nuxt/kit': 3.12.1(rollup@4.18.0)
-      '@nuxtjs/mdc': 0.6.1(rollup@4.18.0)
+      '@nuxtjs/mdc': 0.7.1(rollup@4.18.0)
       '@vueuse/core': 10.10.0(vue@3.4.27(typescript@5.4.5))
       '@vueuse/head': 2.0.0(vue@3.4.27(typescript@5.4.5))
       '@vueuse/nuxt': 10.10.0(nuxt@3.12.1(@opentelemetry/api@1.9.0)(@parcel/watcher@2.4.1)(@types/node@20.14.2)(@unocss/reset@0.60.4)(encoding@0.1.13)(eslint@9.4.0)(floating-vue@5.2.2(@nuxt/kit@3.12.1(rollup@4.18.0))(vue@3.4.27(typescript@5.4.5)))(fuse.js@7.0.0)(ioredis@5.4.1)(lightningcss@1.25.1)(optionator@0.9.4)(rollup@4.18.0)(terser@5.31.1)(typescript@5.4.5)(unocss@0.60.4(@unocss/webpack@0.60.4(rollup@4.18.0)(webpack@5.91.0))(postcss@8.4.38)(rollup@4.18.0)(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1)))(vite@5.2.4(@types/node@20.14.2)(lightningcss@1.25.1)(terser@5.31.1))(vue-tsc@2.0.21(typescript@5.4.5)))(rollup@4.18.0)(vue@3.4.27(typescript@5.4.5))
@@ -8694,7 +8694,7 @@ snapshots:
       - rollup
       - supports-color
 
-  '@nuxtjs/mdc@0.6.1(rollup@4.18.0)':
+  '@nuxtjs/mdc@0.7.1(rollup@4.18.0)':
     dependencies:
       '@nuxt/kit': 3.12.1(rollup@4.18.0)
       '@shikijs/transformers': 1.6.3