chore(release): v3.0.0-beta.1

chore(package): prepare beta release
chore(package): use beta tag
2026-01-15 12:39:35 +01:00 · 2025-02-28 16:39:47 +01:00 · 2025-02-28 16:35:09 +01:00 · 2025-02-28 16:35:09 +01:00 · 2025-02-28 16:27:24 +01:00 · 2025-02-28 16:18:07 +01:00
762 changed files with 29244 additions and 23319 deletions
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -1,12 +1,6 @@
 name: docs

-on:
-  push:
-    branches:
-      - v3
-  pull_request:
-    branches:
-      - v3
+on: push

 jobs:
  deploy:
--- a/.github/workflows/module.yml
+++ b/.github/workflows/module.yml
@@ -43,9 +43,6 @@ jobs:
      - name: Prepare
        run: pnpm run dev:prepare

-      - name: Devtools prepare
-        run: pnpm run devtools:prepare
-
      - name: Lint
        run: pnpm run lint

--- a/.npmrc
+++ b/.npmrc
@@ -1,3 +1,4 @@
 shamefully-hoist=true
 auto-install-peers=true
 ignore-workspace-root-check=true
+shell-emulator=true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,119 @@
 # Changelog

+## [3.0.0-beta.1](https://github.com/nuxt/ui/compare/v3.0.0-alpha.13...v3.0.0-beta.1) (2025-02-28)
+
+### ⚠ BREAKING CHANGES
+
+* **module:** remove devtools in favor of compodium (#3380)
+* **useOverlay:** handle programmatic modals and slideovers (#3279)
+
+### Features
+
+* **Form:** add prop to disable state transformation ([#3356](https://github.com/nuxt/ui/issues/3356)) ([015ceac](https://github.com/nuxt/ui/commit/015ceacb11f94c6ae0829e59b8dfdef6c325b67d))
+* **module:** remove devtools in favor of compodium ([#3380](https://github.com/nuxt/ui/issues/3380)) ([7a8c00c](https://github.com/nuxt/ui/commit/7a8c00c37451f7b9b33630f7a790a12c0fb2caa1))
+* **Table:** add `select` event ([#2822](https://github.com/nuxt/ui/issues/2822)) ([0668a39](https://github.com/nuxt/ui/commit/0668a399dced48d1976de3820118bf2a29fe116e))
+* **Tree:** new component ([#3180](https://github.com/nuxt/ui/issues/3180)) ([71728d3](https://github.com/nuxt/ui/commit/71728d3c3fa95255db03448c8b87fb75bc2d805c))
+* **useOverlay:** handle programmatic modals and slideovers ([#3279](https://github.com/nuxt/ui/issues/3279)) ([108d36f](https://github.com/nuxt/ui/commit/108d36fd8a4c7b325fcf85882f054bb5e784de57))
+
+### Bug Fixes
+
+* **Avatar:** render on SSR ([67e5465](https://github.com/nuxt/ui/commit/67e546504d2eb807c9b707aacc58761b10eb7d37))
+* **CommandPalette:** wrong ellipsis color ([ada04f6](https://github.com/nuxt/ui/commit/ada04f64a529feab43f5b54162daffe9d3313435))
+* **components:** missing `$attrs` bind ([#3152](https://github.com/nuxt/ui/issues/3152)) ([fb36df5](https://github.com/nuxt/ui/commit/fb36df5302e379f58ceb9c3a91348256806c8df5))
+* **Drawer/Modal/Slideover:** disable close autofocus ([ae30f94](https://github.com/nuxt/ui/commit/ae30f9423dfae1f6e27f00176bb3175beeb888e4)), closes [#3227](https://github.com/nuxt/ui/issues/3227)
+* **Form:** ensure loading state resets to false after an error ([#3359](https://github.com/nuxt/ui/issues/3359)) ([19d76c8](https://github.com/nuxt/ui/commit/19d76c8b75b053f1c44b691ca46c9d3b234dbce1))
+* **Link:** improve external links handling in vue ([b53f77b](https://github.com/nuxt/ui/commit/b53f77b304a520e925af9d4a752e0f2933cfb71d))
+* **Modal/Slideover:** add wrapper around title & description ([bc01136](https://github.com/nuxt/ui/commit/bc01136da7e838004088fffbf2acfd6788f3c5fb))
+* **Modal/Slideover:** fixed header height ([d33a83e](https://github.com/nuxt/ui/commit/d33a83e147b009ebe1e52b7d677d364d18f24333)), closes [#3333](https://github.com/nuxt/ui/issues/3333)
+* **Modal:** use `dvh` unit ([aefa09c](https://github.com/nuxt/ui/commit/aefa09c69b8f0dbd38d29883dc79d77fc7025f43))
+* **module:** use key when merging modules options ([9821894](https://github.com/nuxt/ui/commit/98218945328b947e6c2a75f03b89c27e401dc6d5))
+* **Tooltip:** bind `$attrs` on trigger ([637f5d3](https://github.com/nuxt/ui/commit/637f5d342ee1f1b1bf7de99020df9ca9f07e197e)), closes [#3339](https://github.com/nuxt/ui/issues/3339) [#2897](https://github.com/nuxt/ui/issues/2897)
+* **vite:** exclude `@nuxt/ui` from vite pre-optimization ([#3352](https://github.com/nuxt/ui/issues/3352)) ([09492f7](https://github.com/nuxt/ui/commit/09492f79f29c0b5dd7a642f76f55aa3d305c0a69))
+
+## [3.0.0-alpha.13](https://github.com/nuxt/ui/compare/v3.0.0-alpha.12...v3.0.0-alpha.13) (2025-02-17)
+
+### ⚠ BREAKING CHANGES
+
+* **useToast:** don't return a promise on `add`
+* **Toast:** rename `click` to `onClick` for consistency
+* **Alert/Toast:** add `orientation` prop
+
+### Features
+
+* **Alert/Toast:** add `orientation` prop ([2c192ac](https://github.com/nuxt/ui/commit/2c192ac145e3550153821627a389f03e26f247b5))
+* **Badge:** add support within button groups ([#3224](https://github.com/nuxt/ui/issues/3224)) ([10fb843](https://github.com/nuxt/ui/commit/10fb843f8ffc2cda9cf9a29cdf37c6b5dae9ca17))
+* **Card:** add `variant` prop ([847d4aa](https://github.com/nuxt/ui/commit/847d4aa752decc8c21a8eb57bff32a371c800b6d))
+* **CommandPalette:** support link props in items ([e2b78a7](https://github.com/nuxt/ui/commit/e2b78a78a45c1b2339ba57e3ec1fcf2a1500b3af)), closes [#3190](https://github.com/nuxt/ui/issues/3190)
+* **ContextMenu/DropdownMenu/NavigationMenu:** add `external-icon` prop ([5846c1e](https://github.com/nuxt/ui/commit/5846c1e2ee9f0851e902550f7e873cc703fe7cb4)), closes [#2996](https://github.com/nuxt/ui/issues/2996)
+* **Drawer:** add `inset` prop ([6d9b9ed](https://github.com/nuxt/ui/commit/6d9b9edc5524ad32abdec925c276519e1a1a59e4)), closes [#2994](https://github.com/nuxt/ui/issues/2994)
+* **locale:** add Azerbaijani language ([#3209](https://github.com/nuxt/ui/issues/3209)) ([0fb6753](https://github.com/nuxt/ui/commit/0fb6753c9de9144b7958052ae287b34911afcbd7))
+* **locale:** add Bengali (বাংলা) language ([#3321](https://github.com/nuxt/ui/issues/3321)) ([1d09a2a](https://github.com/nuxt/ui/commit/1d09a2aa35944bc798cf53809ae227d05592a5bd))
+* **module:** generate `tailwindcss` theme colors ([#2967](https://github.com/nuxt/ui/issues/2967)) ([443a0be](https://github.com/nuxt/ui/commit/443a0be0174f84526145db8c0349136e5fc4bbf3))
+* **Table:** extends core options and support other options like `pagination` ([#3177](https://github.com/nuxt/ui/issues/3177)) ([4aa3179](https://github.com/nuxt/ui/commit/4aa317944e17956b08e5ded3fb564ae0bbd4e888))
+* **Toast:** handle vnodes in `title` and `description` ([abd2be1](https://github.com/nuxt/ui/commit/abd2be1aa667f91c47673450445e09211c821365)), closes [#3226](https://github.com/nuxt/ui/issues/3226)
+* **unplugin:** expose options for embedded plugins, throw warnings for duplication  ([#3207](https://github.com/nuxt/ui/issues/3207)) ([6c20f8a](https://github.com/nuxt/ui/commit/6c20f8a9ea03273a795c5f88c071830decd54c1e))
+* **useToast:** proxy emits ([089185f](https://github.com/nuxt/ui/commit/089185fbe4a13fa3253bf49780c4d0a673eef59a))
+
+### Bug Fixes
+
+* **App:** wrap `ModalProvider` / `SlideoverProvider` inside `TooltipProvider` ([cd0a9d3](https://github.com/nuxt/ui/commit/cd0a9d39d879a80342462b1c553602177f1ae8ee)), closes [#3236](https://github.com/nuxt/ui/issues/3236)
+* **Badge:** missing `UAvatar` import ([49dd088](https://github.com/nuxt/ui/commit/49dd0885a043e736cfa335d7657bb68ae6142ccf)), closes [#3203](https://github.com/nuxt/ui/issues/3203)
+* **Calendar/InputMenu/Textarea:** add missing `PartialString` type on `ui` prop ([9d29e0b](https://github.com/nuxt/ui/commit/9d29e0b4078c4638365caca4784ecad569cd0464)), closes [#3299](https://github.com/nuxt/ui/issues/3299)
+* **Card:** remove `shadow-sm` for consistency ([8097fff](https://github.com/nuxt/ui/commit/8097fff79d3d9f63481c6cd8e3e724a67f7761df))
+* **Link:** allow usage without `vue-router` in vue ([f55e869](https://github.com/nuxt/ui/commit/f55e86963737238749a8d7e85bca1e724ae4c4c2)), closes [#3001](https://github.com/nuxt/ui/issues/3001)
+* **locale:** export `km` ([#3201](https://github.com/nuxt/ui/issues/3201)) ([995e07d](https://github.com/nuxt/ui/commit/995e07d6ffa47ee593b28aa587699676e2ad3b90))
+* **Modal/Slideover:** improve `title` & `description` accessibility ([e419dcb](https://github.com/nuxt/ui/commit/e419dcbe61e6949abc76b8a1fc2f088fd7a402a0)), closes [#3267](https://github.com/nuxt/ui/issues/3267) [#3215](https://github.com/nuxt/ui/issues/3215)
+* **Modal:** always fullscreen on mobile ([#2637](https://github.com/nuxt/ui/issues/2637)) ([7641d89](https://github.com/nuxt/ui/commit/7641d89552df1ed42e70bbac90f5486b58bd9349))
+* **NavigationMenu:** disable collapsible with `collapsed` prop ([07e1b4f](https://github.com/nuxt/ui/commit/07e1b4f1f44efe90ac16138de5dbd78faf66e974))
+* **NavigationMenu:** remove negative mb causing overflow issues ([0e46c3e](https://github.com/nuxt/ui/commit/0e46c3e8cf94fb52c47b9d46eaba2d18329a6f45))
+* **NavigationMenu:** wrong `level` compute on `vertical` orientation ([c1c9da4](https://github.com/nuxt/ui/commit/c1c9da4d38b7675ce6323d938030e1b9a577f7c4))
+* **SelectMenu:** wrap content with `FocusScope` ([e7e7585](https://github.com/nuxt/ui/commit/e7e75858d7c5f0d966d2b9b7a16bc95573a31025)), closes [#2657](https://github.com/nuxt/ui/issues/2657)
+* **Table:** proxy props without `useForwardProps` ([f0553eb](https://github.com/nuxt/ui/commit/f0553ebb496f2f4bad5fd5ab0b3006c9ee8edba3))
+* **Toast:** rename `click` to `onClick` for consistency ([533e889](https://github.com/nuxt/ui/commit/533e88958916b356c00511a90e16c8b11af0b521))
+* **useToast:** don't return a promise on `add` ([153f341](https://github.com/nuxt/ui/commit/153f341a8c1a09a6fd3069886a26d9a3f5de41de))
+
+## [3.0.0-alpha.12](https://github.com/nuxt/ui/compare/v3.0.0-alpha.11...v3.0.0-alpha.12) (2025-01-27)
+
+### ⚠ BREAKING CHANGES
+
+* **ColorPicker:** migrate from `color` to `colortranslator` (#3097)
+* **Form:** include nested state in submit data (#3028)
+
+### Features
+
+* **css:** add `light` variant to reverse colors ([75f7064](https://github.com/nuxt/ui/commit/75f7064b409a47d068007d0b4f3af007fb24c679))
+* **FormField:** set `aria-describedby`  and `aria-invalid`  attributes ([#3123](https://github.com/nuxt/ui/issues/3123)) ([b95b913](https://github.com/nuxt/ui/commit/b95b91391af21ee0fd96c69fb6ccf99b3126bc79))
+* **Form:** form validation properties ([#3137](https://github.com/nuxt/ui/issues/3137)) ([c0b485d](https://github.com/nuxt/ui/commit/c0b485d56376d6655d15d6241daeef19f25db25f))
+* **locale:** add Hebrew language ([#3181](https://github.com/nuxt/ui/issues/3181)) ([f395877](https://github.com/nuxt/ui/commit/f3958773d610d64fe15cf57525044eec22dc1f96))
+* **locale:** add Hindi language ([#3170](https://github.com/nuxt/ui/issues/3170)) ([8e96daa](https://github.com/nuxt/ui/commit/8e96daa5cc57e1a2c7605d54f8640f8e012a645d))
+* **locale:** add Hungarian language ([#3129](https://github.com/nuxt/ui/issues/3129)) ([891ba1f](https://github.com/nuxt/ui/commit/891ba1fec64255ba4db0f4447e044cc9140ced94))
+* **locale:** add Khmer language ([#3119](https://github.com/nuxt/ui/issues/3119)) ([64421a1](https://github.com/nuxt/ui/commit/64421a190ff43563cc73f64b6a9141d69e3f5ca5))
+* **locale:** add Norwegian Bokmål language ([#3095](https://github.com/nuxt/ui/issues/3095)) ([9ccfe8f](https://github.com/nuxt/ui/commit/9ccfe8fbb3284a5bdd0766ba5831135d298b563f))
+* **NavigationMenu:** add `collapsed` prop ([3fc2210](https://github.com/nuxt/ui/commit/3fc2210e0392b63b065e4f4899ff864f1a3717b1))
+* **NavigationMenu:** add `contentOrientation` prop ([ac86ee0](https://github.com/nuxt/ui/commit/ac86ee01b9fc9b5dc882b210d88b8fef73148e42))
+* **NavigationMenu:** handle `label` type in items ([27fdc8e](https://github.com/nuxt/ui/commit/27fdc8e260bb8d2ca815c84cfdc30b6ca3baa038)), closes [#2993](https://github.com/nuxt/ui/issues/2993)
+
+### Bug Fixes
+
+* **Alert:** allow actions wrap ([#3083](https://github.com/nuxt/ui/issues/3083)) ([e7c10bc](https://github.com/nuxt/ui/commit/e7c10bcb0dbbfbbe48bbdea7cbd99d4535be1adb))
+* **Avatar:** handle loading manually to support `@nuxt/image` ([00c5f26](https://github.com/nuxt/ui/commit/00c5f261117fd986c8be70ecdc21762023e7ebc0)), closes [nuxt/ui-pro#727](https://github.com/nuxt/ui-pro/issues/727)
+* **Avatar:** hide fallback when image is loaded ([36d7402](https://github.com/nuxt/ui/commit/36d7402be1f823c753c7cd44cca82bbb5fd4cddd)), closes [nuxt/ui-pro#727](https://github.com/nuxt/ui-pro/issues/727)
+* **Button:** wrong avatar size with `block` prop ([ba1dd13](https://github.com/nuxt/ui/commit/ba1dd13173835c9b72b862eb9f875a8cd79c5604))
+* **colors:** move css variables to `base` layer ([533ccec](https://github.com/nuxt/ui/commit/533ccec11007ec9078fd8daefd88f6b146991939)), closes [#3075](https://github.com/nuxt/ui/issues/3075)
+* **components:** prevent multiple `appConfig` identifier import ([#3186](https://github.com/nuxt/ui/issues/3186)) ([cd16b95](https://github.com/nuxt/ui/commit/cd16b95c98c0ec29bc0586ba890555f79be00290))
+* **ContextMenu/DropdownMenu:** remove unnecessary bindings in html ([9b5a957](https://github.com/nuxt/ui/commit/9b5a957cdd01baafaa981864ad7d03902ad6918d))
+* **Form:** include nested state in submit data ([#3028](https://github.com/nuxt/ui/issues/3028)) ([de9ecb1](https://github.com/nuxt/ui/commit/de9ecb1d767060f88c1dbdf69b9c04d5731b049d))
+* **Form:** standard schema validation no longer wrapped in `value` object ([#3104](https://github.com/nuxt/ui/issues/3104)) ([8f7f579](https://github.com/nuxt/ui/commit/8f7f579da0fc58575184dc445ff0dda0c0ca1298))
+* **locale:** remove emoji fallback for Chinese ([#3134](https://github.com/nuxt/ui/issues/3134)) ([1a95104](https://github.com/nuxt/ui/commit/1a951046319eaf85c2adb44928a0255dedef093d))
+* **locale:** year translation missing `ñ` in `es` ([#3090](https://github.com/nuxt/ui/issues/3090)) ([1bf370e](https://github.com/nuxt/ui/commit/1bf370e6fd27fab644689335b7356bbf4c359663))
+* **NavigationMenu:** handle children recursively in vertical orientation ([2b7ff3e](https://github.com/nuxt/ui/commit/2b7ff3edf6620d7ed4a491d89f0e616b5916984b)), closes [#3128](https://github.com/nuxt/ui/issues/3128)
+* **NavigationMenu:** highlight open items on `horizontal` orientation only ([931211a](https://github.com/nuxt/ui/commit/931211a634183a8122ce0be874cc1f9048768d88))
+* **useToast:** add in queue and improve unique ids ([aafddd8](https://github.com/nuxt/ui/commit/aafddd8eed0f3fc7c7228c2db4718ba54f3fc522)), closes [#2686](https://github.com/nuxt/ui/issues/2686)
+
+### Code Refactoring
+
+* **ColorPicker:** migrate from `color` to `colortranslator` ([#3097](https://github.com/nuxt/ui/issues/3097)) ([51e5e65](https://github.com/nuxt/ui/commit/51e5e65be7f834ec226be28d95a1b547b85b329c))
+
 ## [3.0.0-alpha.11](https://github.com/nuxt/ui/compare/v3.0.0-alpha.10...v3.0.0-alpha.11) (2025-01-13)

 ### ⚠ BREAKING CHANGES
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
-[![nuxt-ui.png](https://volta.s3.fr-par.scw.cloud/nuxt_ui_social_card_531d133fa2.png)](https://ui.nuxt.com)
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="https://github.com/user-attachments/assets/91ceab67-89ce-4ef4-8678-4402a92baca5">
+  <source media="(prefers-color-scheme: light)" srcset="https://github.com/user-attachments/assets/51526d6d-e5ec-41b4-aa37-242dec1cdb27">
+  <img alt="Nuxt UI" src="https://github.com/user-attachments/assets/51526d6d-e5ec-41b4-aa37-242dec1cdb27">
+</picture>

 # Nuxt UI

@@ -7,7 +11,7 @@
 [![License][license-src]][license-href]
 [![Nuxt][nuxt-src]][nuxt-href]

-We're thrilled to introduce Nuxt UI v3, a significant upgrade to our UI library that delivers extensive improvements and robust new capabilities. This major update harnesses the combined strengths of [Reka UI](https://reka-ui.com/), [Tailwind CSS v4](https://tailwindcss.com/docs/v4-beta), and [Tailwind Variants](https://www.tailwind-variants.org/) to offer developers an unparalleled set of tools for creating sophisticated, accessible, and highly performant user interfaces.
+We're thrilled to introduce Nuxt UI v3, a significant upgrade to our UI library that delivers extensive improvements and robust new capabilities. This major update harnesses the combined strengths of [Reka UI](https://reka-ui.com/), [Tailwind CSS v4](https://tailwindcss.com/), and [Tailwind Variants](https://www.tailwind-variants.org/) to offer developers an unparalleled set of tools for creating sophisticated, accessible, and highly performant user interfaces.

 > [!NOTE]
 > You are on the `v3` development branch, check out the [dev branch](https://github.com/nuxt/ui/tree/dev) for Nuxt UI v2.
@@ -47,7 +51,7 @@ export default defineNuxtConfig({
 2. Import Tailwind CSS and Nuxt UI in your CSS:

 ```css [assets/css/main.css]
-@import "tailwindcss";
+@import "tailwindcss" theme(static);
@import "@nuxt/ui";
 ```

@@ -94,7 +98,7 @@ app.mount('#app')
 3. Import Tailwind CSS and Nuxt UI in your CSS:

 ```css [assets/main.css]
-@import "tailwindcss";
+@import "tailwindcss" theme(static);
@import "@nuxt/ui";
 ```

--- a/build.config.ts
+++ b/build.config.ts
@@ -2,8 +2,6 @@ import { defineBuildConfig } from 'unbuild'

 export default defineBuildConfig({
  entries: [
-    // Include devtools runtime files
-    { input: './src/devtools/runtime', builder: 'mkdist', outDir: 'dist/devtools/runtime' },
    // Vue support
    './src/unplugin',
    './src/vite'
@@ -12,8 +10,7 @@ export default defineBuildConfig({
    emitCJS: true
  },
  replace: {
-    'process.env.DEV': 'false',
-    'process.env.NUXT_UI_DEVTOOLS_LOCAL': 'false'
+    'process.env.DEV': 'false'
  },
  hooks: {
    'mkdist:entry:options'(ctx, entry, options) {
--- a/cli/package.json
+++ b/cli/package.json
@@ -6,8 +6,8 @@
  },
  "dependencies": {
    "citty": "^0.1.6",
-    "consola": "^3.3.3",
-    "pathe": "^2.0.1",
+    "consola": "^3.4.0",
+    "pathe": "^2.0.3",
    "scule": "^1.3.0"
  }
 }
--- a/cli/templates.mjs
+++ b/cli/templates.mjs
@@ -33,11 +33,11 @@ const component = ({ name, primitive, pro, prose, content }) => {
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/${path}/${prose ? 'prose/' : ''}${content ? 'content/' : ''}${kebabName}'
-import { tv } from ${pro ? '#ui/utils/tv' : '../utils/tv'}
+import { tv } from '${pro ? '#ui/utils/tv' : '../utils/tv'}'

-const appConfig = _appConfig as AppConfig & { ${key}: { ${prose ? 'prose: { ' : ''}${camelName}: Partial<typeof theme> } }${prose ? ' }' : ''}
+const appConfig${camelName} = _appConfig as AppConfig & { ${key}: { ${prose ? 'prose: { ' : ''}${camelName}: Partial<typeof theme> } }${prose ? ' }' : ''}

-const ${camelName} = tv({ extend: tv(theme), ...(appConfig.${key}?.${prose ? 'prose?.' : ''}${camelName} || {}) })
+const ${camelName} = tv({ extend: tv(theme), ...(appConfig${camelName}.${key}?.${prose ? 'prose?.' : ''}${camelName} || {}) })

 export interface ${upperName}Props {
  /**
@@ -76,11 +76,11 @@ import type { ${upperName}RootProps, ${upperName}RootEmits } from 'reka-ui'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/${path}/${prose ? 'prose/' : ''}${content ? 'content/' : ''}${kebabName}'
-import { tv } from ${pro ? '#ui/utils/tv' : '../utils/tv'}
+import { tv } from '${pro ? '#ui/utils/tv' : '../utils/tv'}'

-const appConfig = _appConfig as AppConfig & { ${key}: { ${prose ? 'prose: { ' : ''}${camelName}: Partial<typeof theme> } }${prose ? ' }' : ''}
+const appConfig${camelName} = _appConfig as AppConfig & { ${key}: { ${prose ? 'prose: { ' : ''}${camelName}: Partial<typeof theme> } }${prose ? ' }' : ''}

-const ${camelName} = tv({ extend: tv(theme), ...(appConfig.${key}?.${prose ? 'prose?.' : ''}${camelName} || {}) })
+const ${camelName} = tv({ extend: tv(theme), ...(appConfig${camelName}.${key}?.${prose ? 'prose?.' : ''}${camelName} || {}) })

 type ${upperName}Variants = VariantProps<typeof ${camelName}>

@@ -181,7 +181,7 @@ links:${primitive
  : `
  - label: ${upperName}
    icon: i-custom-reka-ui
-    to: https://www.reka-ui.com/components/${kebabName}.html`}
+    to: https://reka-ui.com/docs/components/${kebabName}`}
  - label: GitHub
    icon: i-simple-icons-github
    to: https://github.com/nuxt/${pro ? 'ui-pro' : 'ui'}/tree/v3/src/runtime/components/${upperName}.vue
--- a/devtools/app/app.config.ts
+++ b/devtools/app/app.config.ts
@@ -1,8 +0,0 @@
-export default defineAppConfig({
-  ui: {
-    colors: {
-      primary: 'green',
-      neutral: 'zinc'
-    }
-  }
-})
--- a/devtools/app/app.vue
+++ b/devtools/app/app.vue
@@ -1,222 +0,0 @@
-<script setup lang="ts">
-import type { Component } from '../../src/devtools/meta'
-import { watchDebounced } from '@vueuse/core'
-
-// Disable devtools in component renderer iframe
-// @ts-expect-error - Nuxt Devtools internal value
-window.__NUXT_DEVTOOLS_DISABLE__ = true
-
-const component = useState<Component | undefined>('__ui-devtools-component')
-const state = useState<Record<string, any>>('__ui-devtools-state', () => ({}))
-
-const { data: components, status, error } = useAsyncData<Array<Component>>('__ui-devtools-components', async () => {
-  const componentMeta = await $fetch<Record<string, Component>>('/api/component-meta')
-
-  if (!component.value || !componentMeta[component.value.slug]) {
-    component.value = componentMeta['button']
-  }
-
-  state.value.props = Object.values(componentMeta).reduce((acc, comp) => {
-    const componentDefaultProps = comp.meta?.props.reduce((acc, prop) => {
-      if (prop.default) acc[prop.name] = prop.default
-      return acc
-    }, {} as Record<string, any>)
-
-    acc[comp.slug] = {
-      ...comp.defaultVariants, // Default values from the theme template
-      ...componentDefaultProps, // Default values from vue props
-      ...componentMeta[comp.slug]?.meta?.devtools?.defaultProps // Default values from devtools extended meta
-    }
-
-    return acc
-  }, {} as Record<string, any>)
-
-  return Object.values(componentMeta)
-})
-
-const componentProps = computed(() => {
-  if (!component.value) return
-  return state.value.props[component.value?.slug]
-})
-
-const componentPropsMeta = computed(() => {
-  return component.value?.meta?.props.filter(prop => prop.name !== 'ui').sort((a, b) => a.name.localeCompare(b.name))
-})
-
-function updateRenderer() {
-  if (!component.value) return
-  const event: Event & { data?: any } = new Event('nuxt-ui-devtools:update-renderer')
-  event.data = {
-    props: state.value.props?.[component.value.slug], slots: state.value.slots?.[component.value?.slug]
-  }
-  window.dispatchEvent(event)
-}
-
-watchDebounced(state, updateRenderer, { deep: true, debounce: 200, maxWait: 500 })
-onMounted(() => window.addEventListener('nuxt-ui-devtools:component-loaded', onComponentLoaded))
-onUnmounted(() => window.removeEventListener('nuxt-ui-devtools:component-loaded', onComponentLoaded))
-
-function onComponentLoaded() {
-  if (!component.value) return
-  updateRenderer()
-}
-
-const tabs = computed(() => {
-  if (!component.value) return
-  return [
-    { label: 'Props', slot: 'props', icon: 'i-lucide-settings', disabled: !component.value.meta?.props?.length }
-  ]
-})
-
-function openDocs() {
-  if (!component.value) return
-  window.parent.open(`https://ui3.nuxt.dev/components/${component.value.slug}`)
-}
-
-const colorMode = useColorMode()
-const isDark = computed({
-  get() {
-    return colorMode.value === 'dark'
-  },
-  set(value) {
-    colorMode.preference = value ? 'dark' : 'light'
-
-    const event: Event & { isDark?: boolean } = new Event('nuxt-ui-devtools:set-color-mode')
-    event.isDark = value
-    window.dispatchEvent(event)
-  }
-})
-</script>
-
-<template>
-  <UApp class="flex justify-center items-center h-screen w-full relative font-sans">
-    <div v-if="status === 'pending' || error || !component || !components?.length">
-      <div v-if="error" class="flex flex-col justify-center items-center h-screen w-screen text-center text-[var(--ui-color-error-500)]">
-        <UILogo class="h-8" />
-        <UIcon name="i-lucide-circle-alert" size="20" class="mt-2" />
-        <p>
-          {{ (error.data as any)?.error ?? 'Unexpected error' }}
-        </p>
-      </div>
-    </div>
-    <template v-else>
-      <div
-        class="top-0 h-[49px] border-b border-[var(--ui-border)] flex justify-center"
-      >
-        <span />
-
-        <UInputMenu
-          v-model="component"
-          variant="none"
-          :items="components"
-          placeholder="Search component..."
-          class="top-0 translate-y-0 w-full mx-2"
-          icon="i-lucide-search"
-        />
-
-        <div class="absolute top-[49px] bottom-0 inset-x-0 grid xl:grid-cols-8 grid-cols-4 bg-[var(--ui-bg)]">
-          <div class="col-span-1 border-r border-[var(--ui-border)] hidden xl:block overflow-y-auto">
-            <UNavigationMenu
-              :items="components.map((c) => ({ ...c, active: c.slug === component?.slug, onSelect: () => component = c }))"
-              orientation="vertical"
-              :ui="{ link: 'before:rounded-none' }"
-            />
-          </div>
-
-          <div class="xl:col-span-5 col-span-2 relative">
-            <ComponentPreview :component="component" :props="componentProps" class="h-full" />
-            <div class="flex gap-2 absolute top-1 right-2">
-              <UButton
-                :icon="isDark ? 'i-lucide-moon' : 'i-lucide-sun'"
-                variant="ghost"
-                color="neutral"
-                @click="isDark = !isDark"
-              />
-              <UButton
-                v-if="component"
-                variant="ghost"
-                color="neutral"
-                icon="i-lucide-external-link"
-                @click="openDocs()"
-              >
-                Open docs
-              </UButton>
-            </div>
-          </div>
-
-          <div class="border-l border-[var(--ui-border)] flex flex-col col-span-2 overflow-y-auto">
-            <UTabs color="neutral" variant="link" :items="tabs" class="relative" :ui="{ list: 'sticky top-0 bg-[var(--ui-bg)] z-50' }">
-              <template #props>
-                <div v-for="prop in componentPropsMeta" :key="'prop-' + prop.name" class="px-3 py-5 border-b border-[var(--ui-border)]">
-                  <ComponentPropInput
-                    v-model="componentProps[prop.name]"
-                    :meta="prop"
-                    :ignore="component.meta?.devtools?.ignoreProps?.includes(prop.name)"
-                  />
-                </div>
-              </template>
-            </UTabs>
-          </div>
-        </div>
-      </div>
-    </template>
-  </UApp>
-</template>
-
-<style>
-@import 'tailwindcss';
-@import '@nuxt/ui';
-
-@theme {
-  --font-sans: 'DM Sans', sans-serif;
-
-  --color-primary-50: var(--ui-color-primary-50);
-  --color-primary-100: var(--ui-color-primary-100);
-  --color-primary-200: var(--ui-color-primary-200);
-  --color-primary-300: var(--ui-color-primary-300);
-  --color-primary-400: var(--ui-color-primary-400);
-  --color-primary-500: var(--ui-color-primary-500);
-  --color-primary-600: var(--ui-color-primary-600);
-  --color-primary-700: var(--ui-color-primary-700);
-  --color-primary-800: var(--ui-color-primary-800);
-  --color-primary-900: var(--ui-color-primary-900);
-  --color-primary-950: var(--ui-color-primary-950);
-
-  --color-neutral-50: var(--ui-color-neutral-50);
-  --color-neutral-100: var(--ui-color-neutral-100);
-  --color-neutral-200: var(--ui-color-neutral-200);
-  --color-neutral-300: var(--ui-color-neutral-300);
-  --color-neutral-400: var(--ui-color-neutral-400);
-  --color-neutral-500: var(--ui-color-neutral-500);
-  --color-neutral-600: var(--ui-color-neutral-600);
-  --color-neutral-700: var(--ui-color-neutral-700);
-  --color-neutral-800: var(--ui-color-neutral-800);
-  --color-neutral-900: var(--ui-color-neutral-900);
-  --color-neutral-950: var(--ui-color-neutral-950);
-}
-
-:root {
-  --ui-border: var(--ui-color-neutral-200);
-  --ui-bg: white;
-}
-
-.dark {
-  --ui-border: var(--ui-color-neutral-800);
-  --ui-bg: var(--ui-color-neutral-900);
-}
-
-.shiki
-.shiki span {
-  background-color: transparent !important;
-}
-
-html.dark .shiki,
-html.dark .shiki span {
-  color: var(--shiki-dark) !important;
-  background-color: transparent !important;
-  /* Optional, if you also want font styles */
-  font-style: var(--shiki-dark-font-style) !important;
-  font-weight: var(--shiki-dark-font-weight) !important;
-  text-decoration: var(--shiki-dark-text-decoration) !important;
-}
-</style>
--- a/devtools/app/components/CollapseContainer.vue
+++ b/devtools/app/components/CollapseContainer.vue
@@ -1,43 +0,0 @@
-<script setup lang="ts">
-import { ref, computed, onMounted } from 'vue'
-
-const collapsed = ref(true)
-const wrapper = ref<HTMLElement | null>(null)
-const content = ref<HTMLElement | null>(null)
-
-const overflow = computed(() => {
-  if (!content.value || !wrapper.value) return false
-  return content.value.scrollHeight > 48 * 4
-})
-
-onMounted(() => {
-  if (wrapper.value) {
-    wrapper.value.style.transition = 'max-height 0.3s ease' // Set transition for max-height
-  }
-})
-</script>
-
-<template>
-  <div class="border rounded-[var(--ui-radius)] border-[var(--ui-border)]">
-    <div
-      ref="wrapper"
-      :class="['overflow-hidden', collapsed && overflow ? 'max-h-48' : 'max-h-none']"
-    >
-      <div ref="content">
-        <slot />
-      </div>
-    </div>
-    <UButton
-      v-if="overflow"
-      class="bg-[var(--ui-bg)] group w-full flex justify-center my-1 border-t border-[var(--ui-border)] rounded-t-none"
-      variant="link"
-      color="neutral"
-      trailing-icon="i-lucide-chevron-down"
-      :data-state="collapsed ? 'closed' : 'open'"
-      :ui="{ trailingIcon: 'transition group-data-[state=open]:rotate-180' }"
-      @click="collapsed = !collapsed"
-    >
-      {{ collapsed ? 'Expand' : 'Collapse' }}
-    </UButton>
-  </div>
-</template>
--- a/devtools/app/components/ComponentPreview.vue
+++ b/devtools/app/components/ComponentPreview.vue
@@ -1,151 +0,0 @@
-<script setup lang="ts">
-import type { Component } from '../../../src/devtools/meta'
-import { useClipboard } from '@vueuse/core'
-import { kebabCase } from 'scule'
-import { escapeString } from 'knitwork'
-
-const props = defineProps<{ component?: Component, props?: object, themeSlots?: Record<string, any> }>()
-
-const { data: componentExample } = useAsyncData('__ui_devtools_component-source', async () => {
-  const example = props.component?.meta?.devtools?.example
-  if (!example) return false
-  return await $fetch<{ source: string }>(`/api/component-example`, { params: { component: example } })
-}, { watch: [() => props.component?.slug] })
-
-function genPropValue(value: any): string {
-  if (typeof value === 'string') {
-    return `'${escapeString(value).replace(/'/g, '&apos;').replace(/"/g, '&quot;')}'`
-  }
-  if (Array.isArray(value)) {
-    return `[ ${value.map(item => `${genPropValue(item)}`).join(',')} ]`
-  }
-  if (typeof value === 'object' && value !== null) {
-    const entries = Object.entries(value).map(([key, val]) => `${key}: ${genPropValue(val)}`)
-    return `{ ${entries.join(`,`)} }`
-  }
-
-  return value
-}
-
-const code = computed(() => {
-  if (!props.component) return
-
-  const propsTemplate = Object.entries(props.props ?? {})?.map(([key, value]: [string, any]) => {
-    const defaultValue: any = props.component?.meta?.props.find(prop => prop.name === key)?.default
-    if (defaultValue === value) return
-    if (value === true) return kebabCase(key)
-    if (value === false && defaultValue === true) return `:${kebabCase(key)}="false"`
-    if (!value) return
-    if (props.component?.defaultVariants?.[key] === value) return
-    if (typeof value === 'string') return `${kebabCase(key)}=${genPropValue(value)}`
-    return `:${kebabCase(key)}="${genPropValue(value)}"`
-  }).filter(Boolean).join('\n')
-
-  const slotsTemplate = props.themeSlots
-    ? genPropValue(Object.keys(props.themeSlots).filter(key => key !== 'base').reduce((acc, key) => {
-        acc[key] = genPropValue(props.themeSlots?.[key])
-        return acc
-      }, {} as Record<string, string>))
-    : undefined
-
-  const extraTemplate = [
-    propsTemplate,
-    props.themeSlots?.base ? `class="${genPropValue(props.themeSlots.base)}"` : null,
-    slotsTemplate && slotsTemplate !== '{}' ? `:ui="${slotsTemplate}"` : null
-  ].filter(Boolean).join(' ')
-
-  if (componentExample.value) {
-    const componentRegexp = new RegExp(`<${props.component.label}(\\s|\\r|>)`)
-
-    return componentExample.value?.source
-      .replace(/import .* from ['"]#.*['"];?\n+/, '')
-      .replace(componentRegexp, `<${props.component.label} ${extraTemplate}$1`)
-      .replace('v-bind="$attrs"', '')
-  }
-  return `<${props.component.label} ${extraTemplate} />`
-})
-
-const { $prettier } = useNuxtApp()
-const { data: formattedCode } = useAsyncData('__ui-devtools-component-formatted-code', async () => {
-  if (!code.value) return
-  return await $prettier.format(code.value, {
-    semi: false,
-    singleQuote: true,
-    printWidth: 80
-  })
-}, { watch: [code] })
-
-const { codeToHtml } = useShiki()
-const { data: highlightedCode } = useAsyncData('__ui-devtools-component-highlighted-code', async () => {
-  return formattedCode.value
-    ? codeToHtml(formattedCode.value, 'vue')
-    : undefined
-}, { watch: [formattedCode] })
-
-const { copy, copied } = useClipboard()
-
-const rendererVisible = ref(true)
-const renderer = ref()
-const rendererReady = ref(false)
-function onRendererReady() {
-  rendererReady.value = true
-  setTimeout(() => rendererVisible.value = !!renderer.value.contentWindow.document.getElementById('ui-devtools-renderer'), 500)
-}
-
-watch(() => props.component, () => rendererReady.value = false)
-
-const previewUrl = computed(() => {
-  if (!props.component) return
-  const baseUrl = `/__nuxt_ui__/components/${props.component.slug}`
-  const params = new URLSearchParams()
-
-  if (props.component?.meta?.devtools?.example !== undefined) {
-    params.append('example', props.component.meta.devtools.example)
-  }
-  const queryString = params.toString()
-  return queryString ? `${baseUrl}?${queryString}` : baseUrl
-})
-</script>
-
-<template>
-  <div class="flex flex-col bg-grid">
-    <iframe
-      v-if="component"
-      v-show="rendererReady && rendererVisible"
-      ref="renderer"
-      class="grow w-full"
-      :src="previewUrl"
-      @load="onRendererReady"
-    />
-    <div v-if="!rendererVisible" class="grow w-full flex justify-center items-center px-8">
-      <UAlert color="error" variant="subtle" title="Component preview not found" icon="i-lucide-circle-alert">
-        <template #description>
-          <p>Ensure your <code>app.vue</code> file includes a <code>&lt;NuxtPage /&gt;</code> component, as the component preview is mounted as a page. </p>
-        </template>
-      </UAlert>
-    </div>
-    <div v-if="highlightedCode && formattedCode" v-show="rendererReady" class="relative w-full p-3">
-      <!-- eslint-disable vue/no-v-html -->
-      <pre class="p-4 min-h-40 max-h-72 text-sm overflow-y-auto rounded-[calc(var(--ui-radius)*1.5)] border border-[var(--ui-border)] bg-neutral-50 dark:bg-neutral-800" v-html="highlightedCode" />
-      <UButton
-        color="neutral"
-        variant="link"
-        :icon="copied ? 'i-lucide-clipboard-check' : 'i-lucide-clipboard'"
-        class="absolute top-6 right-6"
-        @click="copy(formattedCode)"
-      />
-    </div>
-  </div>
-</template>
-
-<style scoped>
-.bg-grid {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' transform='scale(3)'%3E%3Crect width='100%25' height='100%25' fill='%23fff'/%3E%3Cpath fill='none' stroke='hsla(0, 0%25, 98%25, 1)' stroke-width='.2' d='M10 0v20ZM0 10h20Z'/%3E%3C/svg%3E");
-  background-size: 40px 40px;
-}
-
-.dark .bg-grid {
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' transform='scale(3)'%3E%3Crect width='100%25' height='100%25' fill='hsl(0, 0%25, 8.5%25)'/%3E%3Cpath fill='none' stroke='hsl(0, 0%25, 11.0%25)' stroke-width='.2' d='M10 0v20ZM0 10h20Z'/%3E%3C/svg%3E");
-  background-size: 40px 40px;
-}
-</style>
--- a/devtools/app/components/ComponentPropInput.vue
+++ b/devtools/app/components/ComponentPropInput.vue
@@ -1,39 +0,0 @@
-<script setup lang="ts">
-import type { PropertyMeta } from 'vue-component-meta'
-
-const props = defineProps<{ meta: Partial<PropertyMeta>, ignore?: boolean }>()
-const modelValue = defineModel<any>()
-
-const matchedInput = shallowRef()
-const parsedSchema = shallowRef()
-
-const { resolveInputSchema } = usePropSchema()
-
-watchEffect(() => {
-  if (!props.meta?.schema) return
-  const result = resolveInputSchema(props.meta.schema)
-  parsedSchema.value = result?.schema
-  matchedInput.value = result?.input
-})
-
-const description = computed(() => {
-  return props.meta.description?.replace(/`([^`]+)`/g, '<code class="font-medium bg-[var(--ui-bg-elevated)] px-1 py-0.5 rounded-[var(--ui-radius)]">$1</code>')
-})
-</script>
-
-<template>
-  <UFormField :name="meta?.name" class="" :ui="{ wrapper: 'mb-2' }" :class="{ 'opacity-70 cursor-not-allowed': !matchedInput || ignore }">
-    <template #label>
-      <p v-if="meta?.name" class="font-mono font-bold px-1.5 py-0.5 border border-[var(--ui-border-accented)] border-dashed rounded-[var(--ui-radius)] bg-[var(--ui-bg-elevated)]">
-        {{ meta?.name }}
-      </p>
-    </template>
-
-    <template #description>
-      <!-- eslint-disable vue/no-v-html -->
-      <p v-if="meta.description" class="text-neutral-600 dark:text-neutral-400 mt-1" v-html="description" />
-    </template>
-
-    <component :is="matchedInput.component" v-if="!ignore && matchedInput" v-model="modelValue" :schema="parsedSchema" />
-  </UFormField>
-</template>
--- a/devtools/app/components/UILogo.vue
+++ b/devtools/app/components/UILogo.vue
@@ -1,10 +0,0 @@
-<template>
-  <svg
-    width="1020"
-    height="200"
-    viewBox="0 0 1020 200"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    class="w-auto h-6 shrink-0 text-[var(--ui-text)]"
-  ><path d="M377 200C379.16 200 381 198.209 381 196V103C381 103 386 112 395 127L434 194C435.785 197.74 439.744 200 443 200H470V50H443C441.202 50 439 51.4941 439 54V148L421 116L385 55C383.248 51.8912 379.479 50 376 50H350V200H377Z" fill="currentColor" /><path d="M726 92H739C742.314 92 745 89.3137 745 86V60H773V92H800V116H773V159C773 169.5 778.057 174 787 174H800V200H783C759.948 200 745 185.071 745 160V116H726V92Z" fill="currentColor" /><path d="M591 92V154C591 168.004 585.742 179.809 578 188C570.258 196.191 559.566 200 545 200C530.434 200 518.742 196.191 511 188C503.389 179.809 498 168.004 498 154V92H514C517.412 92 520.769 92.622 523 95C525.231 97.2459 526 98.5652 526 102V154C526 162.059 526.457 167.037 530 171C533.543 174.831 537.914 176 545 176C552.217 176 555.457 174.831 559 171C562.543 167.037 563 162.059 563 154V102C563 98.5652 563.769 96.378 566 94C567.96 91.9107 570.028 91.9599 573 92C573.411 92.0055 574.586 92 575 92H591Z" fill="currentColor" /><path d="M676 144L710 92H684C680.723 92 677.812 93.1758 676 96L660 120L645 97C643.188 94.1758 639.277 92 636 92H611L645 143L608 200H634C637.25 200 640.182 196.787 642 194L660 167L679 195C680.818 197.787 683.75 200 687 200H713L676 144Z" fill="currentColor" /><path d="M168 200H279C282.542 200 285.932 198.756 289 197C292.068 195.244 295.23 193.041 297 190C298.77 186.959 300.002 183.51 300 179.999C299.998 176.488 298.773 173.04 297 170.001L222 41C220.23 37.96 218.067 35.7552 215 34C211.933 32.2448 207.542 31 204 31C200.458 31 197.067 32.2448 194 34C190.933 35.7552 188.77 37.96 187 41L168 74L130 9.99764C128.228 6.95784 126.068 3.75491 123 2C119.932 0.245087 116.542 0 113 0C109.458 0 106.068 0.245087 103 2C99.9323 3.75491 96.7717 6.95784 95 9.99764L2 170.001C0.226979 173.04 0.00154312 176.488 1.90993e-06 179.999C-0.0015393 183.51 0.229648 186.959 2 190C3.77035 193.04 6.93245 195.244 10 197C13.0675 198.756 16.4578 200 20 200H90C117.737 200 137.925 187.558 152 164L186 105L204 74L259 168H186L168 200ZM89 168H40L113 42L150 105L125.491 147.725C116.144 163.01 105.488 168 89 168Z" fill="var(--ui-color-primary-500)" /><path d="M958 60.0001H938C933.524 60.0001 929.926 59.9395 927 63C924.074 65.8905 925 67.5792 925 72V141C925 151.372 923.648 156.899 919 162C914.352 166.931 908.468 169 899 169C889.705 169 882.648 166.931 878 162C873.352 156.899 873 151.372 873 141V72.0001C873 67.5793 872.926 65.8906 870 63.0001C867.074 59.9396 863.476 60.0001 859 60.0001H840V141C840 159.023 845.016 173.458 855 184C865.156 194.542 879.893 200 899 200C918.107 200 932.844 194.542 943 184C953.156 173.458 958 159.023 958 141V60.0001Z" fill="var(--ui-color-primary-500)" /><path fill-rule="evenodd" clip-rule="evenodd" d="M1000 60.0233L1020 60V77L1020 128V156.007L1020 181L1020 189.004C1020 192.938 1019.98 194.429 1017 197.001C1014.02 199.725 1009.56 200 1005 200H986.001V181.006L986 130.012V70.0215C986 66.1576 986.016 64.5494 989 62.023C991.819 59.6358 995.437 60.0233 1000 60.0233Z" fill="var(--ui-color-primary-500)" /></svg>
-</template>
--- a/devtools/app/components/inputs/ArrayInput.vue
+++ b/devtools/app/components/inputs/ArrayInput.vue
@@ -1,76 +0,0 @@
-<script lang="ts">
-import * as z from 'zod'
-
-export const arrayInputSchema = z.object({
-  kind: z.literal('array'),
-  schema: z.array(z.any({}))
-    .or(z.record(z.number(), z.any({})).transform(t => Object.values(t)))
-    .transform((t) => {
-      return t.filter(s => s !== 'undefined')
-    }).pipe(z.array(z.any()).max(1))
-})
-
-export type ArrayInputSchema = z.infer<typeof arrayInputSchema>
-</script>
-
-<script setup lang="ts">
-const props = defineProps<{
-  schema: ArrayInputSchema
-}>()
-
-const modelValue = defineModel<Array<any>>({})
-
-const itemSchema = computed(() => {
-  return props.schema?.schema[0]
-})
-
-function removeArrayItem(index: number) {
-  if (!modelValue.value) return
-  modelValue.value.splice(index, 1)
-}
-
-function addArrayItem() {
-  if (!modelValue.value) {
-    modelValue.value = [{}]
-  } else {
-    modelValue.value.push({})
-  }
-}
-</script>
-
-<template>
-  <div>
-    <div v-for="value, index in modelValue" :key="index" class="relative">
-      <ComponentPropInput
-        :model-value="value"
-        :meta="{ schema: itemSchema }"
-      />
-
-      <UPopover>
-        <UButton variant="ghost" color="neutral" icon="i-lucide-ellipsis-vertical" class="absolute top-4 right-1" />
-        <template #content>
-          <UButton
-            variant="ghost"
-            color="error"
-            icon="i-lucide-trash"
-            block
-            @click="removeArrayItem(index)"
-          >
-            Remove
-          </UButton>
-        </template>
-      </UPopover>
-    </div>
-
-    <UButton
-      icon="i-lucide-plus"
-      color="neutral"
-      variant="ghost"
-      block
-      class="justify-center mt-4"
-      @click="addArrayItem()"
-    >
-      Add value
-    </UButton>
-  </div>
-</template>
--- a/devtools/app/components/inputs/BooleanInput.vue
+++ b/devtools/app/components/inputs/BooleanInput.vue
@@ -1,20 +0,0 @@
-<script lang="ts">
-import * as z from 'zod'
-
-export const booleanInputSchema = z.literal('boolean').or(z.object({
-  kind: z.literal('enum'),
-  type: z.string().refine((type) => {
-    return type.split('|').some(t => t.trim() === 'boolean')
-  })
-}))
-
-export type BooleanInputSchema = z.infer<typeof booleanInputSchema>
-</script>
-
-<script setup lang="ts">
-defineProps<{ schema: BooleanInputSchema }>()
-</script>
-
-<template>
-  <USwitch />
-</template>
--- a/devtools/app/components/inputs/NumberInput.vue
+++ b/devtools/app/components/inputs/NumberInput.vue
@@ -1,15 +0,0 @@
-<script lang="ts">
-import * as z from 'zod'
-
-export const numberInputSchema = z.literal('number')
-export type NumberInputSchema = z.infer<typeof numberInputSchema>
-</script>
-
-<script setup lang="ts">
-defineProps<{ schema: NumberInputSchema }>()
-const modelValue = defineModel<number>()
-</script>
-
-<template>
-  <UInput v-model.number="modelValue" type="number" />
-</template>
--- a/devtools/app/components/inputs/ObjectInput.vue
+++ b/devtools/app/components/inputs/ObjectInput.vue
@@ -1,38 +0,0 @@
-<script lang="ts">
-import * as z from 'zod'
-
-export const objectInputSchema = z.object({
-  kind: z.literal('object'),
-  schema: z.record(z.string(), z.any())
-})
-
-export type ObjectInputSchema = z.infer<typeof objectInputSchema>
-</script>
-
-<script setup lang="ts">
-const props = defineProps<{
-  schema: ObjectInputSchema
-}>()
-
-const modelValue = defineModel<Record<string, any>>({})
-
-const attributesSchemas = computed(() => {
-  return Object.values(props.schema.schema)
-})
-</script>
-
-<template>
-  <CollapseContainer>
-    <ComponentPropInput
-      v-for="attributeSchema in attributesSchemas"
-      :key="attributeSchema.name"
-      class="border-b last:border-b-0 border-[var(--ui-border)] p-4"
-      :model-value="modelValue?.[attributeSchema.name]"
-      :meta="attributeSchema"
-      @update:model-value="(value: any) => {
-        if (!modelValue) modelValue ||= {}
-        else modelValue[attributeSchema.name] = value
-      }"
-    />
-  </CollapseContainer>
-</template>
--- a/devtools/app/components/inputs/StringEnumInput.vue
+++ b/devtools/app/components/inputs/StringEnumInput.vue
@@ -1,60 +0,0 @@
-<script lang="ts">
-import * as z from 'zod'
-
-export const stringEnumInputSchema = z.object({
-  kind: z.literal('enum'),
-  schema: z.array(z.string())
-    .or(z.record(z.any(), z.string()).transform<string[]>(t => Object.values(t)))
-    .transform<string[]>(t => t.filter(s => s.trim().match(/^["'`]/)).map(s => s.trim().replaceAll(/["'`]/g, '')))
-    .pipe(z.array(z.string()).min(1))
-})
-
-export type StringEnumInputSchema = z.infer<typeof stringEnumInputSchema>
-</script>
-
-<script setup lang="ts">
-const props = defineProps<{
-  schema: StringEnumInputSchema
-}>()
-
-const sizes = ['xs', 'sm', 'md', 'lg', 'xl']
-function parseSize(size: string) {
-  const sizePattern = sizes.join('|')
-  const regex = new RegExp(`^(\\d*)(${sizePattern})$`, 'i')
-
-  const match = size.match(regex)
-
-  if (!match) return null
-
-  const number = match[1] ? Number.parseInt(match[1], 10) : 1 // Default to 1 if no number is present
-  const suffix = match[2] ?? ''
-
-  return { number, suffix }
-}
-
-const options = computed(() => {
-  return [...props.schema.schema].sort((a, b) => {
-    const sizeA = parseSize(a)
-    const sizeB = parseSize(b)
-    if (!sizeA || !sizeB) return a.localeCompare(b)
-
-    const suffixAIndex = sizes.indexOf(sizeA.suffix)
-    const suffixBIndex = sizes.indexOf(sizeB.suffix)
-
-    if (suffixAIndex !== -1 && suffixBIndex !== -1) {
-      if (suffixAIndex !== suffixBIndex) {
-        return suffixAIndex - suffixBIndex
-      }
-    } else if (suffixAIndex === -1 || suffixBIndex === -1) {
-      if (sizeA.suffix !== sizeB.suffix) {
-        return sizeA.suffix.localeCompare(sizeB.suffix)
-      }
-    }
-    return sizeA.number - sizeB.number
-  })
-})
-</script>
-
-<template>
-  <USelectMenu :items="options" class="min-w-[167px]" />
-</template>
--- a/devtools/app/components/inputs/StringInput.vue
+++ b/devtools/app/components/inputs/StringInput.vue
@@ -1,15 +0,0 @@
-<script lang="ts">
-import * as z from 'zod'
-
-export const stringInputSchema = z.literal('string').or(z.string().transform(t => t.split('|').find(s => s.trim() === 'string')).pipe(z.string()))
-
-export type StringInputSchema = z.infer<typeof stringInputSchema>
-</script>
-
-<script setup lang="ts">
-defineProps<{ schema: StringInputSchema }>()
-</script>
-
-<template>
-  <UInput />
-</template>
--- a/devtools/app/composables/usePropSchema.ts
+++ b/devtools/app/composables/usePropSchema.ts
@@ -1,44 +0,0 @@
-import type { PropertyMeta } from 'vue-component-meta'
-import BooleanInput, { booleanInputSchema } from '../components/inputs/BooleanInput.vue'
-import StringInput, { stringInputSchema } from '../components/inputs/StringInput.vue'
-import NumberInput, { numberInputSchema } from '../components/inputs/NumberInput.vue'
-import StringEnumInput, { stringEnumInputSchema } from '../components/inputs/StringEnumInput.vue'
-import ObjectInput, { objectInputSchema } from '../components/inputs/ObjectInput.vue'
-import ArrayInput, { arrayInputSchema } from '../components/inputs/ArrayInput.vue'
-
-// List of available inputs.
-const availableInputs = [
-  { id: 'string', schema: stringInputSchema, component: StringInput },
-  { id: 'number', schema: numberInputSchema, component: NumberInput },
-  { id: 'boolean', schema: booleanInputSchema, component: BooleanInput },
-  { id: 'stringEnum', schema: stringEnumInputSchema, component: StringEnumInput },
-  { id: 'object', schema: objectInputSchema, component: ObjectInput },
-  { id: 'array', schema: arrayInputSchema, component: ArrayInput }
-]
-
-export function usePropSchema() {
-  function resolveInputSchema(schema: PropertyMeta['schema']): { schema: PropertyMeta['schema'], input: any } | undefined {
-    // Return the first input in the list of available inputs that matches the schema.
-    for (const input of availableInputs) {
-      const result = input.schema.safeParse(schema)
-      if (result.success) {
-        // Returns the output from zod to get the transformed output.
-        // It only includes attributes defined in the zod schema.
-        return { schema: result.data as PropertyMeta['schema'], input }
-      }
-    }
-
-    if (typeof schema === 'string') return
-
-    // If the schema is a complex enum or array return the first nested schema that matches an input.
-    if (schema.kind === 'enum' && schema.schema) {
-      const enumSchemas = typeof schema.schema === 'object' ? Object.values(schema.schema) : schema.schema
-      for (const enumSchema of enumSchemas) {
-        const result = resolveInputSchema(enumSchema)
-        if (result) return result
-      }
-    }
-  }
-
-  return { resolveInputSchema }
-}
--- a/devtools/app/composables/useShiki.ts
+++ b/devtools/app/composables/useShiki.ts
@@ -1,34 +0,0 @@
-import { createHighlighterCore } from 'shiki/core'
-import type { BuiltinLanguage, HighlighterCore } from 'shiki'
-import loadWasm from 'shiki/wasm'
-import MaterialThemeLighter from 'shiki/themes/material-theme-lighter.mjs'
-import MaterialThemePalenight from 'shiki/themes/material-theme-palenight.mjs'
-import VueLang from 'shiki/langs/vue.mjs'
-import MarkdownLang from 'shiki/langs/markdown.mjs'
-
-export const highlighter = shallowRef<HighlighterCore>()
-
-// A custom composable for syntax highlighting with Shiki since `@nuxt/mdc` relies on
-// a server endpoint to highlight code.
-export function useShiki() {
-  async function codeToHtml(code: string, lang: BuiltinLanguage | 'text' = 'text') {
-    if (!highlighter.value) {
-      highlighter.value = await createHighlighterCore({
-        themes: [MaterialThemeLighter, MaterialThemePalenight],
-        langs: [VueLang, MarkdownLang],
-        loadWasm
-      })
-    }
-
-    return highlighter.value.codeToHtml(code, {
-      lang,
-      themes: {
-        dark: 'material-theme-palenight',
-        default: 'material-theme-lighter',
-        light: 'material-theme-lighter'
-      }
-    })
-  }
-
-  return { codeToHtml }
-}
--- a/devtools/app/plugins/prettier.client.ts
+++ b/devtools/app/plugins/prettier.client.ts
@@ -1,54 +0,0 @@
-import type { Options } from 'prettier'
-import PrettierWorker from '@/workers/prettier.js?worker&inline'
-
-export interface SimplePrettier {
-  format: (source: string, options?: Options) => Promise<string>
-}
-
-function createPrettierWorkerApi(worker: Worker): SimplePrettier {
-  let counter = 0
-  const handlers: any = {}
-
-  worker.addEventListener('message', (event) => {
-    const { uid, message, error } = event.data
-
-    if (!handlers[uid]) {
-      return
-    }
-
-    const [resolve, reject] = handlers[uid]
-    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-    delete handlers[uid]
-
-    if (error) {
-      reject(error)
-    } else {
-      resolve(message)
-    }
-  })
-
-  function postMessage<T>(message: any) {
-    const uid = ++counter
-    return new Promise<T>((resolve, reject) => {
-      handlers[uid] = [resolve, reject]
-      worker.postMessage({ uid, message })
-    })
-  }
-
-  return {
-    format(source: string, options?: Options) {
-      return postMessage({ type: 'format', source, options })
-    }
-  }
-}
-
-export default defineNuxtPlugin(async () => {
-  const worker = new PrettierWorker()
-  const prettier = createPrettierWorkerApi(worker)
-
-  return {
-    provide: {
-      prettier
-    }
-  }
-})
--- a/devtools/app/workers/prettier.js
+++ b/devtools/app/workers/prettier.js
@@ -1,36 +0,0 @@
-/* eslint-disable no-undef */
-self.onmessage = async function (event) {
-  self.postMessage({
-    uid: event.data.uid,
-    message: await handleMessage(event.data.message)
-  })
-}
-
-function handleMessage(message) {
-  switch (message.type) {
-    case 'format':
-      return handleFormatMessage(message)
-  }
-}
-
-async function handleFormatMessage(message) {
-  if (!globalThis.prettier) {
-    await Promise.all([
-      import('https://unpkg.com/prettier@3.3.3/standalone.js'),
-      import('https://unpkg.com/prettier@3.3.3/plugins/html.js'),
-      import('https://unpkg.com/prettier@3.3.3/plugins/postcss.js'),
-      import('https://unpkg.com/prettier@3.3.3/plugins/babel.js'),
-      import('https://unpkg.com/prettier@3.3.3/plugins/estree.js'),
-      import('https://unpkg.com/prettier@3.3.3/plugins/typescript.js')
-    ])
-  }
-
-  const { options, source } = message
-  const formatted = await prettier.format(source, {
-    parser: 'vue',
-    plugins: prettierPlugins,
-    ...options
-  })
-
-  return formatted
-}
--- a/devtools/nuxt.config.ts
+++ b/devtools/nuxt.config.ts
@@ -1,38 +0,0 @@
-import { resolve } from 'node:path'
-
-export default defineNuxtConfig({
-
-  modules: ['../src/module', '@nuxt/test-utils/module'],
-
-  ssr: false,
-
-  devtools: { enabled: false },
-
-  app: {
-    baseURL: '/__nuxt_ui__/devtools'
-  },
-
-  future: {
-    compatibilityVersion: 4
-  },
-  compatibilityDate: '2024-04-03',
-
-  nitro: {
-    hooks: {
-      'prerender:routes': function (routes) {
-        routes.clear()
-      }
-    },
-    output: {
-      publicDir: resolve(__dirname, '../dist/client/devtools')
-    }
-  },
-
-  vite: {
-    server: {
-      hmr: {
-        clientPort: process.env.PORT ? +process.env.PORT : undefined
-      }
-    }
-  }
-})
--- a/devtools/package.json
+++ b/devtools/package.json
@@ -1,19 +0,0 @@
-{
-  "name": "@nuxt/ui-devtools",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "build": "nuxt build",
-    "dev": "nuxt dev",
-    "generate": "nuxt generate",
-    "preview": "nuxt preview",
-    "test": "vitest"
-  },
-  "dependencies": {
-    "@nuxt/ui": "latest",
-    "knitwork": "^1.2.0",
-    "nuxt": "^3.15.1",
-    "prettier": "^3.4.2",
-    "zod": "^3.24.1"
-  }
-}
--- a/devtools/public/favicon.svg
+++ b/devtools/public/favicon.svg
@@ -1 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" class="w-auto h-6 shrink-0" viewBox="840 60 180 140"><path d="M958 60.0001H938C933.524 60.0001 929.926 59.9395 927 63C924.074 65.8905 925 67.5792 925 72V141C925 151.372 923.648 156.899 919 162C914.352 166.931 908.468 169 899 169C889.705 169 882.648 166.931 878 162C873.352 156.899 873 151.372 873 141V72.0001C873 67.5793 872.926 65.8906 870 63.0001C867.074 59.9396 863.476 60.0001 859 60.0001H840V141C840 159.023 845.016 173.458 855 184C865.156 194.542 879.893 200 899 200C918.107 200 932.844 194.542 943 184C953.156 173.458 958 159.023 958 141V60.0001Z" fill="currentColor"></path><path fill-rule="evenodd" clip-rule="evenodd" d="M1000 60.0233L1020 60V77L1020 128V156.007L1020 181L1020 189.004C1020 192.938 1019.98 194.429 1017 197.001C1014.02 199.725 1009.56 200 1005 200H986.001V181.006L986 130.012V70.0215C986 66.1576 986.016 64.5494 989 62.023C991.819 59.6358 995.437 60.0233 1000 60.0233Z" fill="currentColor"></path> <style> path { fill: #00000080; } @media (prefers-color-scheme: dark) { path { fill: #ffffff80; } } </style> </svg>
--- a/devtools/test/composables/usePropSchema.test.ts
+++ b/devtools/test/composables/usePropSchema.test.ts
@@ -1,24 +0,0 @@
-// @vitest-environment node
-import { it, expect, describe } from 'vitest'
-import { usePropSchema } from '../../app/composables/usePropSchema'
-import { stringSchema, optionalStringSchema, booleanSchema, numberSchema, optionalNumberSchema, optionalBooleanSchema, objectSchema, arraySchema, arrayOptionalSchema, stringEnumSchema } from '../fixtures/schemas'
-
-describe('usePropSchema', () => {
-  const { resolveInputSchema } = usePropSchema()
-
-  it.each([
-    ['string', { schema: stringSchema, inputId: 'string' }],
-    ['optional string', { schema: optionalStringSchema, inputId: 'string' }],
-    ['number', { schema: numberSchema, inputId: 'number' }],
-    ['optional number', { schema: optionalNumberSchema, inputId: 'number' }],
-    ['boolean', { schema: booleanSchema, inputId: 'boolean' }],
-    ['string enum', { schema: stringEnumSchema, inputId: 'stringEnum' }],
-    ['object', { schema: objectSchema, inputId: 'object' }],
-    ['optional boolean', { schema: optionalBooleanSchema, inputId: 'boolean' }],
-    ['array', { schema: arraySchema, inputId: 'array' }],
-    ['optional array', { schema: arrayOptionalSchema, inputId: 'array' }]
-  ])('resolveInputSchema should resolve %s schema', async (_: string, options) => {
-    const result = resolveInputSchema(options.schema as any)
-    expect(result?.input.id).toBe(options.inputId)
-  })
-})
--- a/devtools/test/fixtures/schemas.ts
+++ b/devtools/test/fixtures/schemas.ts
@@ -1,133 +0,0 @@
-export const stringSchema = 'string' as const
-
-export const optionalStringSchema = {
-  kind: 'enum',
-  type: 'string | undefined',
-  schema: {
-    0: 'undefined',
-    1: 'string'
-  }
-}
-
-export const numberSchema = 'number' as const
-export const optionalNumberSchema = {
-  kind: 'enum',
-  type: 'number | undefined',
-  schema: {
-    0: 'undefined',
-    1: 'number'
-  }
-}
-
-export const booleanSchema = 'boolean' as const
-export const optionalBooleanSchema = {
-  kind: 'enum',
-  type: 'boolean | undefined',
-  schema: {
-    0: 'undefined',
-    1: 'boolean'
-  }
-}
-
-export const objectSchema = {
-  kind: 'object',
-  type: 'AccordionItem',
-  schema: {
-    label: {
-      name: 'label',
-      global: false,
-      description: '',
-      tags: [],
-      required: false,
-      type: 'string | undefined',
-      schema: {
-        kind: 'enum',
-        type: 'string | undefined',
-        schema: {
-          0: 'undefined',
-          1: 'string'
-        }
-      }
-    }
-  }
-}
-
-export const arraySchema = {
-  kind: 'array',
-  type: 'AccordionItem[]',
-  schema: [
-    {
-      kind: 'object',
-      type: 'AccordionItem',
-      schema: {
-        label: {
-          name: 'label',
-          global: false,
-          description: '',
-          tags: [],
-          required: false,
-          type: 'string | undefined',
-          schema: {
-            kind: 'enum',
-            type: 'string | undefined',
-            schema: {
-              0: 'undefined',
-              1: 'string'
-            }
-          }
-        }
-      }
-    }
-  ]
-}
-
-export const arrayOptionalSchema = {
-  kind: 'enum',
-  type: 'AccordionItem[] | undefined',
-  schema: {
-    0: 'undefined',
-    1: {
-      kind: 'array',
-      type: 'AccordionItem[]',
-      schema: [
-        {
-          kind: 'object',
-          type: 'AccordionItem',
-          schema: {
-            label: {
-              name: 'label',
-              global: false,
-              description: '',
-              tags: [],
-              required: false,
-              type: 'string | undefined',
-              schema: {
-                kind: 'enum',
-                type: 'string | undefined',
-                schema: {
-                  0: 'undefined',
-                  1: 'string'
-                }
-              }
-            }
-          }
-        }
-      ]
-    }
-  }
-}
-
-export const stringEnumSchema = {
-  kind: 'enum',
-  type: '"true" | "false" | "page" | "step" | "location" | "date" | "time" | undefined',
-  schema: {
-    0: 'undefined',
-    1: '"true"',
-    2: '"false"',
-    3: '"page"',
-    4: '"step"',
-    5: '"location"',
-    6: '"date"',
-    7: '"time"'
-  }
-}
--- a/devtools/test/vitest.config.ts
+++ b/devtools/test/vitest.config.ts
@@ -1,7 +0,0 @@
-import { defineVitestConfig } from '@nuxt/test-utils/config'
-
-export default defineVitestConfig({
-  test: {
-    environment: 'nuxt'
-  }
-})
--- a/devtools/tsconfig.json
+++ b/devtools/tsconfig.json
@@ -1,4 +0,0 @@
-{
-  // https://nuxt.com/docs/guide/concepts/typescript
-  "extends": "./.nuxt/tsconfig.json"
-}
--- a/docs/app/app.config.ts
+++ b/docs/app/app.config.ts
@@ -5,7 +5,8 @@ export default defineAppConfig({
    duration: 5000
  },
  theme: {
-    radius: 0.25
+    radius: 0.25,
+    blackAsPrimary: false
  },
  ui: {
    colors: {
--- a/docs/app/app.vue
+++ b/docs/app/app.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { withoutTrailingSlash } from 'ufo'
+// import { withoutTrailingSlash } from 'ufo'
 import colors from 'tailwindcss/colors'
 // import { debounce } from 'perfect-debounce'

@@ -22,34 +22,10 @@ const searchTerm = ref('')
 //   useTrackEvent('Search', { props: { query: `${query} - ${searchTerm.value?.commandPaletteRef.results.length} results` } })
 // }, 500))

-const links = computed(() => [{
-  label: 'Docs',
-  icon: 'i-lucide-square-play',
-  to: '/getting-started',
-  active: route.path.startsWith('/getting-started')
-}, {
-  label: 'Components',
-  icon: 'i-lucide-square-code',
-  to: '/components',
-  active: route.path.startsWith('/components')
-}, {
-  label: 'Roadmap',
-  icon: 'i-lucide-map',
-  to: '/roadmap'
-}, {
-  label: 'Figma',
-  icon: 'i-lucide-figma',
-  to: 'https://www.figma.com/community/file/1288455405058138934',
-  target: '_blank'
-}, {
-  label: 'Releases',
-  icon: 'i-lucide-rocket',
-  to: 'https://github.com/nuxt/ui/releases',
-  target: '_blank'
-}].filter(Boolean))
-
+const links = useLinks()
 const color = computed(() => colorMode.value === 'dark' ? (colors as any)[appConfig.ui.colors.neutral][900] : 'white')
 const radius = computed(() => `:root { --ui-radius: ${appConfig.theme.radius}rem; }`)
+const blackAsPrimary = computed(() => appConfig.theme.blackAsPrimary ? `:root { --ui-primary: black; } .dark { --ui-primary: white; }` : ':root {}')

 useHead({
  meta: [
@@ -57,11 +33,12 @@ useHead({
    { key: 'theme-color', name: 'theme-color', content: color }
  ],
  link: [
-    { rel: 'icon', type: 'image/svg+xml', href: '/icon.svg' },
-    { rel: 'canonical', href: `https://ui.nuxt.com${withoutTrailingSlash(route.path)}` }
+    { rel: 'icon', type: 'image/svg+xml', href: '/icon.svg' }
+    // { rel: 'canonical', href: `https://ui.nuxt.com${withoutTrailingSlash(route.path)}` }
  ],
  style: [
-    { innerHTML: radius, id: 'nuxt-ui-radius', tagPriority: -2 }
+    { innerHTML: radius, id: 'nuxt-ui-radius', tagPriority: -2 },
+    { innerHTML: blackAsPrimary, id: 'nuxt-ui-black-as-primary', tagPriority: -2 }
  ],
  htmlAttrs: {
    lang: 'en'
@@ -81,7 +58,7 @@ provide('navigation', mappedNavigation)

 <template>
  <UApp :toaster="appConfig.toaster">
-    <NuxtLoadingIndicator color="#FFF" />
+    <NuxtLoadingIndicator color="var(--ui-primary)" :height="2" />

    <template v-if="!route.path.startsWith('/examples')">
      <!-- <Banner /> -->
@@ -94,7 +71,7 @@ provide('navigation', mappedNavigation)
    </NuxtLayout>

    <template v-if="!route.path.startsWith('/examples')">
-      <!-- <Footer /> -->
+      <Footer />

      <ClientOnly>
        <LazyUContentSearch
@@ -110,7 +87,7 @@ provide('navigation', mappedNavigation)
            items: modules
          }]"
          :navigation="filteredNavigation"
-          :fuse="{ resultLimit: 42 }"
+          :fuse="{ resultLimit: 100 }"
        />
      </ClientOnly>
    </template>
@@ -118,39 +95,5 @@ provide('navigation', mappedNavigation)
 </template>

 <style>
-@import "tailwindcss";
-@import "@nuxt/ui-pro";
-
-@source "../content";
-
-@theme {
-  --container-8xl: 90rem;
-
-  --font-sans: 'Public Sans', sans-serif;
-
-  --color-green-50: #EFFDF5;
-  --color-green-100: #D9FBE8;
-  --color-green-200: #B3F5D1;
-  --color-green-300: #75EDAE;
-  --color-green-400: #00DC82;
-  --color-green-500: #00C16A;
-  --color-green-600: #00A155;
-  --color-green-700: #007F45;
-  --color-green-800: #016538;
-  --color-green-900: #0A5331;
-  --color-green-950: #052E16;
-}
-
-:root {
-  --ui-container: var(--container-8xl);
-}
-
-html[data-framework="nuxt"] .vue-only,
-html[data-framework="vue"] .nuxt-only,
-html[data-module="ui-pro"] .ui-only,
-html[data-module="ui"] .ui-pro-only {
-  display: none;
-}
-
-/* Safelist (do not remove): [&>div]:*:my-0 [&>div]:*:w-full */
+/* Safelist (do not remove): [&>div]:*:my-0 [&>div]:*:w-full h-64 !px-0 !py-0 !pt-0 !pb-0 !p-0 !justify-start !min-h-96 h-136 */
 </style>
--- a/docs/app/assets/css/main.css
+++ b/docs/app/assets/css/main.css
@@ -0,0 +1,33 @@
+@import "tailwindcss" theme(static) source("../../../..");
+@import "@nuxt/ui-pro";
+
+@source "../../../content";
+
+@theme static {
+  --container-8xl: 90rem;
+
+  --font-sans: 'Public Sans', sans-serif;
+
+  --color-green-50: #EFFDF5;
+  --color-green-100: #D9FBE8;
+  --color-green-200: #B3F5D1;
+  --color-green-300: #75EDAE;
+  --color-green-400: #00DC82;
+  --color-green-500: #00C16A;
+  --color-green-600: #00A155;
+  --color-green-700: #007F45;
+  --color-green-800: #016538;
+  --color-green-900: #0A5331;
+  --color-green-950: #052E16;
+}
+
+:root {
+  --ui-container: var(--container-8xl);
+}
+
+html[data-framework="nuxt"] .vue-only,
+html[data-framework="vue"] .nuxt-only,
+html[data-module="ui-pro"] .ui-only,
+html[data-module="ui"] .ui-pro-only {
+  display: none;
+}
--- a/docs/app/assets/icons/fuse-js.svg
+++ b/docs/app/assets/icons/fuse-js.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 90 90">
+  <g transform="translate(0,90) scale(0.1,-0.1)" fill="#9b59b6" stroke="none">
+    <path d="M385 796 c-17 -12 -18 -19 -7 -109 20 -164 25 -158 -75 -77 -50 39 -97 70 -110 70 -26 0 -73 -72 -73 -112 0 -23 10 -30 103 -68 56 -24 106 -46 110 -50 4 -4 -32 -22 -80 -40 -146 -54 -155 -66 -108 -147 19 -31 32 -43 49 -43 13 0 61 29 109 65 99 75 94 80 75 -72 -11 -90 -10 -97 7 -109 24 -18 106 -18 130 0 17 12 18 19 7 109 -19 152 -24 147 75 72 47 -36 96 -65 109 -65 16 0 30 13 48 44 47 81 39 92 -107 147 -48 18 -84 36 -80 39 5 4 54 26 111 50 92 38 102 45 102 68 0 41 -47 112 -74 112 -13 0 -59 -29 -109 -70 -100 -81 -95 -86 -75 77 11 90 10 97 -7 109 -10 8 -40 14 -65 14 -25 0 -55 -6 -65 -14z" />
+  </g>
+</svg>
--- a/docs/app/components/Footer.vue
+++ b/docs/app/components/Footer.vue
@@ -1,21 +1,18 @@
 <script setup lang="ts">
-const route = useRoute()
-
-// const items = [{
-//   label: 'Figma Kit',
-//   to: 'https://www.figma.com/community/file/1288455405058138934',
-//   target: '_blank'
-// }, {
-//   label: 'Playground',
-//   to: 'https://stackblitz.com/edit/nuxt-ui',
-//   target: '_blank'
-// }, {
-//   label: 'Roadmap',
-//   to: '/roadmap'
-// }, {
-//   label: 'Releases',
-//   to: '/releases'
-// }]
+const links = [{
+  label: 'Figma',
+  to: '/figma'
+}, {
+  label: 'Roadmap',
+  to: '/roadmap'
+}, {
+  label: 'Terms',
+  to: '/pro/terms'
+}, {
+  label: 'Releases',
+  to: 'https://github.com/nuxt/ui/releases',
+  target: '_blank'
+}]
 </script>

 <template>
@@ -23,15 +20,12 @@ const route = useRoute()

  <UFooter>
    <template #left>
-      <NuxtLink v-if="route.path.startsWith('/pro')" to="https://ui.nuxt.com/pro/purchase" target="_blank" class="text-sm text-[var(--ui-text-muted)]">
-        Purchase <span class="text-[var(--ui-text-highlighted)]">Nuxt UI Pro</span>
-      </NuxtLink>
-      <NuxtLink v-else to="https://github.com/nuxt/ui" target="_blank" class="text-sm text-[var(--ui-text-muted)]">
-        Published under <span class="text-[var(--ui-text-highlighted)]">MIT License</span>
+      <NuxtLink to="https://github.com/nuxt/ui" target="_blank" class="text-sm text-(--ui-text-muted)">
+        Published under <span class="text-(--ui-text-highlighted)">MIT License</span>
      </NuxtLink>
    </template>

-    <!-- <UNavigationMenu :items="items" variant="link" color="neutral" /> -->
+    <UNavigationMenu :items="links" variant="link" color="neutral" />

    <template #right>
      <UButton
@@ -41,6 +35,7 @@ const route = useRoute()
        target="_blank"
        color="neutral"
        variant="ghost"
+        size="sm"
      />
      <UButton
        aria-label="Nuxt UI on Discord"
@@ -49,6 +44,7 @@ const route = useRoute()
        target="_blank"
        color="neutral"
        variant="ghost"
+        size="sm"
      />
      <UButton
        aria-label="Nuxt on X"
@@ -57,6 +53,16 @@ const route = useRoute()
        target="_blank"
        color="neutral"
        variant="ghost"
+        size="sm"
+      />
+      <UButton
+        aria-label="Nuxt on BlueSky"
+        icon="i-simple-icons-bluesky"
+        to="https://bsky.app/profile/nuxt.com"
+        target="_blank"
+        color="neutral"
+        variant="ghost"
+        size="sm"
      />
      <UButton
        aria-label="Nuxt UI on GitHub"
@@ -65,6 +71,7 @@ const route = useRoute()
        target="_blank"
        color="neutral"
        variant="ghost"
+        size="sm"
      />
    </template>
  </UFooter>
--- a/docs/app/components/FrameworkSelect.vue
+++ b/docs/app/components/FrameworkSelect.vue
@@ -6,6 +6,10 @@ const value = ref<string | undefined>(undefined)
 onMounted(() => {
  value.value = framework.value
 })
+
+watch(framework, () => {
+  value.value = framework.value
+})
 </script>

 <template>
@@ -15,10 +19,10 @@ onMounted(() => {
    :content="false"
    color="neutral"
    :ui="{
-      indicator: 'bg-[var(--ui-bg)]',
-      trigger: 'px-1 data-[state=active]:text-[var(--ui-text-highlighted)]'
+      indicator: 'bg-(--ui-bg)',
+      trigger: 'px-1 data-[state=active]:text-(--ui-text-highlighted)'
    }"
-    size="sm"
+    size="xs"
    @update:model-value="(framework = $event as string)"
  />
 </template>
--- a/docs/app/components/Header.vue
+++ b/docs/app/components/Header.vue
@@ -6,18 +6,30 @@ const props = defineProps<{
  links: NavigationMenuItem[]
 }>()

+const route = useRoute()
 const config = useRuntimeConfig().public
 const { module } = useSharedData()

+const value = ref<string | undefined>(module.value)
+
+watch(module, () => {
+  value.value = module.value
+})
+
+onMounted(() => {
+  value.value = module.value
+})
+
 const navigation = inject<Ref<ContentNavigationItem[]>>('navigation')

-const items = computed(() => props.links.map(({ icon, ...link }) => link))
+const desktopLinks = computed(() => props.links.map(({ icon, ...link }) => link))
+const mobileLinks = computed(() => props.links.map(link => ({ ...link, defaultOpen: link.children && route.path.startsWith(link.to as string) })))
 </script>

 <template>
-  <UHeader :ui="{ left: 'min-w-0' }" mode="drawer" :menu="{ shouldScaleBackground: true }">
+  <UHeader :ui="{ left: 'min-w-0' }" :menu="{ shouldScaleBackground: true }">
    <template #left>
-      <NuxtLink to="/" class="flex items-end gap-2 font-bold text-xl text-[var(--ui-text-highlighted)] min-w-0 focus-visible:outline-[var(--ui-primary)] shrink-0" aria-label="Nuxt UI">
+      <NuxtLink to="/" class="flex items-end gap-2 font-bold text-xl text-(--ui-text-highlighted) min-w-0 focus-visible:outline-(--ui-primary) shrink-0" aria-label="Nuxt UI">
        <LogoPro class="w-auto h-6 shrink-0 ui-pro-only" />
        <Logo class="w-auto h-6 shrink-0 ui-only" />
      </NuxtLink>
@@ -35,7 +47,7 @@ const items = computed(() => props.links.map(({ icon, ...link }) => link))
          trailing-icon="i-lucide-chevron-down"
          size="xs"
          class="-mb-[6px] font-semibold rounded-full truncate"
-          :class="[open && 'bg-[var(--ui-primary)]/15 ']"
+          :class="[open && 'bg-(--ui-primary)/15 ']"
          :ui="{
            trailingIcon: ['transition-transform duration-200', open ? 'rotate-180' : undefined].filter(Boolean).join(' ')
          }"
@@ -43,7 +55,7 @@ const items = computed(() => props.links.map(({ icon, ...link }) => link))
      </UDropdownMenu>
    </template>

-    <UNavigationMenu :items="items" variant="link" />
+    <UNavigationMenu :items="desktopLinks" variant="link" />

    <template #right>
      <ThemePicker />
@@ -52,11 +64,12 @@ const items = computed(() => props.links.map(({ icon, ...link }) => link))
        <UContentSearchButton />
      </UTooltip>

-      <UTooltip text="Open on GitHub" :kbds="['meta', 'G']" class="hidden lg:flex">
+      <UTooltip text="Open on GitHub" class="hidden lg:flex">
        <UButton
+          :key="value"
          color="neutral"
          variant="ghost"
-          :to="`https://github.com/nuxt/${module}`"
+          :to="`https://github.com/nuxt/${value}`"
          target="_blank"
          icon="i-simple-icons-github"
          aria-label="GitHub"
@@ -64,8 +77,8 @@ const items = computed(() => props.links.map(({ icon, ...link }) => link))
      </UTooltip>
    </template>

-    <template #content>
-      <UNavigationMenu orientation="vertical" :items="links" class="-mx-2.5" />
+    <template #body>
+      <UNavigationMenu orientation="vertical" :items="mobileLinks" class="-mx-2.5" default-open />

      <USeparator type="dashed" class="mt-4 mb-6" />

@@ -79,7 +92,7 @@ const items = computed(() => props.links.map(({ icon, ...link }) => link))
          <span class="inline-flex items-center gap-0.5">
            {{ link.title }}

-            <sup v-if="link.module === 'ui-pro' && link.path.startsWith('/components')" class="text-[8px] font-medium text-(--ui-primary)">PRO</sup>
+            <sup v-if="link.module === 'ui-pro'" class="text-[8px] font-medium text-(--ui-primary)">PRO</sup>
          </span>
        </template>
      </UContentNavigation>
--- a/docs/app/components/LogoPro.vue
+++ b/docs/app/components/LogoPro.vue
@@ -1,14 +1,22 @@
+<script setup lang="ts">
+defineProps<{
+  collapsed?: boolean
+}>()
+</script>
+
 <template>
-  <svg width="1352" height="200" viewBox="0 0 1352 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M377 200C379.16 200 381 198.209 381 196V103C381 103 386 112 395 127L434 194C435.785 197.74 439.744 200 443 200H470V50H443C441.202 50 439 51.4941 439 54V148L421 116L385 55C383.248 51.8912 379.479 50 376 50H350V200H377Z" fill="currentColor" />
-    <path d="M726 92H739C742.314 92 745 89.3137 745 86V60H773V92H800V116H773V159C773 169.5 778.057 174 787 174H800V200H783C759.948 200 745 185.071 745 160V116H726V92Z" fill="currentColor" />
-    <path d="M591 92V154C591 168.004 585.742 179.809 578 188C570.258 196.191 559.566 200 545 200C530.434 200 518.742 196.191 511 188C503.389 179.809 498 168.004 498 154V92H514C517.412 92 520.769 92.622 523 95C525.231 97.2459 526 98.5652 526 102V154C526 162.059 526.457 167.037 530 171C533.543 174.831 537.914 176 545 176C552.217 176 555.457 174.831 559 171C562.543 167.037 563 162.059 563 154V102C563 98.5652 563.769 96.378 566 94C567.96 91.9107 570.028 91.9599 573 92C573.411 92.0055 574.586 92 575 92H591Z" fill="currentColor" />
-    <path d="M676 144L710 92H684C680.723 92 677.812 93.1758 676 96L660 120L645 97C643.188 94.1758 639.277 92 636 92H611L645 143L608 200H634C637.25 200 640.182 196.787 642 194L660 167L679 195C680.818 197.787 683.75 200 687 200H713L676 144Z" fill="currentColor" />
+  <svg :viewBox="collapsed? '0 0 320 200' : '0 0 1352 200'" fill="none" xmlns="http://www.w3.org/2000/svg">
    <path d="M168 200H279C282.542 200 285.932 198.756 289 197C292.068 195.244 295.23 193.041 297 190C298.77 186.959 300.002 183.51 300 179.999C299.998 176.488 298.773 173.04 297 170.001L222 41C220.23 37.96 218.067 35.7552 215 34C211.933 32.2448 207.542 31 204 31C200.458 31 197.067 32.2448 194 34C190.933 35.7552 188.77 37.96 187 41L168 74L130 9.99764C128.228 6.95784 126.068 3.75491 123 2C119.932 0.245087 116.542 0 113 0C109.458 0 106.068 0.245087 103 2C99.9323 3.75491 96.7717 6.95784 95 9.99764L2 170.001C0.226979 173.04 0.00154312 176.488 1.90993e-06 179.999C-0.0015393 183.51 0.229648 186.959 2 190C3.77035 193.04 6.93245 195.244 10 197C13.0675 198.756 16.4578 200 20 200H90C117.737 200 137.925 187.558 152 164L186 105L204 74L259 168H186L168 200ZM89 168H40L113 42L150 105L125.491 147.725C116.144 163.01 105.488 168 89 168Z" fill="var(--ui-primary)" />
-    <path d="M958 60.0001H938C933.524 60.0001 929.926 59.9395 927 63C924.074 65.8905 925 67.5792 925 72V141C925 151.372 923.648 156.899 919 162C914.352 166.931 908.468 169 899 169C889.705 169 882.648 166.931 878 162C873.352 156.899 873 151.372 873 141V72.0001C873 67.5793 872.926 65.8906 870 63.0001C867.074 59.9396 863.476 60.0001 859 60.0001H840V141C840 159.023 845.016 173.458 855 184C865.156 194.542 879.893 200 899 200C918.107 200 932.844 194.542 943 184C953.156 173.458 958 159.023 958 141V60.0001Z" fill="currentColor" />
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M1000 60.0233L1020 60V77L1020 128V156.007L1020 181L1020 189.004C1020 192.938 1019.98 194.429 1017 197.001C1014.02 199.725 1009.56 200 1005 200H986.001V181.006L986 130.012V70.0215C986 66.1576 986.016 64.5494 989 62.023C991.819 59.6358 995.437 60.0233 1000 60.0233Z" fill="currentColor" />
-    <path d="M1060 200V60H1117C1126.67 60 1134.98 61.2896 1142 65C1149.16 68.7104 1155.29 74.3744 1159 81C1162.71 87.6256 1164 95.3867 1164 104C1164 112.481 1162.71 120.374 1159 127C1155.29 133.626 1149.16 138.157 1142 142C1134.98 145.71 1126.67 148 1117 148H1090V200H1060ZM1115 123C1121.63 123 1126.69 121.578 1130 118C1133.31 114.29 1135 109.433 1135 104C1135 98.567 1133.31 93.5778 1130 90C1126.69 86.2896 1121.63 85 1115 85H1090V123H1115Z" fill="var(--ui-primary)" />
-    <path d="M1226 123C1219.37 123 1214.31 124.965 1211 130C1207.69 135.035 1206 142.122 1206 151V200H1178V100H1200C1203.31 100 1206 102.686 1206 106V116C1208.65 109.904 1211.16 106.518 1215 104C1218.98 101.482 1224.77 100 1231 100H1242V123H1226Z" fill="var(--ui-primary)" />
-    <path d="M1299 200C1288.93 200 1280.08 197.373 1272 193C1263.92 188.495 1257.51 182.818 1253 175C1248.49 167.049 1246 157.806 1246 148C1246 138.194 1248.49 129.818 1253 122C1257.51 114.049 1263.92 107.373 1272 103C1280.08 98.4946 1288.93 97 1299 97C1309.07 97 1318.92 98.4946 1327 103C1335.08 107.373 1340.49 114.049 1345 122C1349.51 129.818 1352 138.194 1352 148C1352 157.806 1349.51 167.049 1345 175C1340.49 182.818 1335.08 188.495 1327 193C1318.92 197.373 1309.07 200 1299 200ZM1299 176C1306.42 176 1312.36 173.168 1317 168C1321.64 162.832 1324 156.216 1324 148C1324 139.652 1321.64 133.168 1317 128C1312.36 122.832 1306.42 120 1299 120C1291.58 120 1285.64 122.832 1281 128C1276.36 133.168 1274 139.652 1274 148C1274 156.216 1276.36 162.832 1281 168C1285.64 173.168 1291.58 176 1299 176Z" fill="var(--ui-primary)" />
+    <g v-if="!collapsed">
+      <path d="M377 200C379.16 200 381 198.209 381 196V103C381 103 386 112 395 127L434 194C435.785 197.74 439.744 200 443 200H470V50H443C441.202 50 439 51.4941 439 54V148L421 116L385 55C383.248 51.8912 379.479 50 376 50H350V200H377Z" fill="currentColor" />
+      <path d="M726 92H739C742.314 92 745 89.3137 745 86V60H773V92H800V116H773V159C773 169.5 778.057 174 787 174H800V200H783C759.948 200 745 185.071 745 160V116H726V92Z" fill="currentColor" />
+      <path d="M591 92V154C591 168.004 585.742 179.809 578 188C570.258 196.191 559.566 200 545 200C530.434 200 518.742 196.191 511 188C503.389 179.809 498 168.004 498 154V92H514C517.412 92 520.769 92.622 523 95C525.231 97.2459 526 98.5652 526 102V154C526 162.059 526.457 167.037 530 171C533.543 174.831 537.914 176 545 176C552.217 176 555.457 174.831 559 171C562.543 167.037 563 162.059 563 154V102C563 98.5652 563.769 96.378 566 94C567.96 91.9107 570.028 91.9599 573 92C573.411 92.0055 574.586 92 575 92H591Z" fill="currentColor" />
+      <path d="M676 144L710 92H684C680.723 92 677.812 93.1758 676 96L660 120L645 97C643.188 94.1758 639.277 92 636 92H611L645 143L608 200H634C637.25 200 640.182 196.787 642 194L660 167L679 195C680.818 197.787 683.75 200 687 200H713L676 144Z" fill="currentColor" />
+      <path d="M958 60.0001H938C933.524 60.0001 929.926 59.9395 927 63C924.074 65.8905 925 67.5792 925 72V141C925 151.372 923.648 156.899 919 162C914.352 166.931 908.468 169 899 169C889.705 169 882.648 166.931 878 162C873.352 156.899 873 151.372 873 141V72.0001C873 67.5793 872.926 65.8906 870 63.0001C867.074 59.9396 863.476 60.0001 859 60.0001H840V141C840 159.023 845.016 173.458 855 184C865.156 194.542 879.893 200 899 200C918.107 200 932.844 194.542 943 184C953.156 173.458 958 159.023 958 141V60.0001Z" fill="currentColor" />
+      <path fill-rule="evenodd" clip-rule="evenodd" d="M1000 60.0233L1020 60V77L1020 128V156.007L1020 181L1020 189.004C1020 192.938 1019.98 194.429 1017 197.001C1014.02 199.725 1009.56 200 1005 200H986.001V181.006L986 130.012V70.0215C986 66.1576 986.016 64.5494 989 62.023C991.819 59.6358 995.437 60.0233 1000 60.0233Z" fill="currentColor" />
+      <path d="M1060 200V60H1117C1126.67 60 1134.98 61.2896 1142 65C1149.16 68.7104 1155.29 74.3744 1159 81C1162.71 87.6256 1164 95.3867 1164 104C1164 112.481 1162.71 120.374 1159 127C1155.29 133.626 1149.16 138.157 1142 142C1134.98 145.71 1126.67 148 1117 148H1090V200H1060ZM1115 123C1121.63 123 1126.69 121.578 1130 118C1133.31 114.29 1135 109.433 1135 104C1135 98.567 1133.31 93.5778 1130 90C1126.69 86.2896 1121.63 85 1115 85H1090V123H1115Z" fill="var(--ui-primary)" />
+      <path d="M1226 123C1219.37 123 1214.31 124.965 1211 130C1207.69 135.035 1206 142.122 1206 151V200H1178V100H1200C1203.31 100 1206 102.686 1206 106V116C1208.65 109.904 1211.16 106.518 1215 104C1218.98 101.482 1224.77 100 1231 100H1242V123H1226Z" fill="var(--ui-primary)" />
+      <path d="M1299 200C1288.93 200 1280.08 197.373 1272 193C1263.92 188.495 1257.51 182.818 1253 175C1248.49 167.049 1246 157.806 1246 148C1246 138.194 1248.49 129.818 1253 122C1257.51 114.049 1263.92 107.373 1272 103C1280.08 98.4946 1288.93 97 1299 97C1309.07 97 1318.92 98.4946 1327 103C1335.08 107.373 1340.49 114.049 1345 122C1349.51 129.818 1352 138.194 1352 148C1352 157.806 1349.51 167.049 1345 175C1340.49 182.818 1335.08 188.495 1327 193C1318.92 197.373 1309.07 200 1299 200ZM1299 176C1306.42 176 1312.36 173.168 1317 168C1321.64 162.832 1324 156.216 1324 148C1324 139.652 1321.64 133.168 1317 128C1312.36 122.832 1306.42 120 1299 120C1291.58 120 1285.64 122.832 1281 128C1276.36 133.168 1274 139.652 1274 148C1274 156.216 1276.36 162.832 1281 168C1285.64 173.168 1291.58 176 1299 176Z" fill="var(--ui-primary)" />
+    </g>
  </svg>
 </template>
--- a/docs/app/components/ModuleSelect.vue
+++ b/docs/app/components/ModuleSelect.vue
@@ -6,6 +6,10 @@ const value = ref<string | undefined>(undefined)
 onMounted(() => {
  value.value = module.value
 })
+
+watch(module, () => {
+  value.value = module.value
+})
 </script>

 <template>
@@ -15,10 +19,10 @@ onMounted(() => {
    :content="false"
    color="neutral"
    :ui="{
-      indicator: 'bg-[var(--ui-bg)]',
-      trigger: 'px-1 data-[state=active]:text-[var(--ui-text-highlighted)]'
+      indicator: 'bg-(--ui-bg)',
+      trigger: 'px-1 data-[state=active]:text-(--ui-text-highlighted)'
    }"
-    size="sm"
+    size="xs"
    @update:model-value="(module = $event as string)"
  />
 </template>
--- a/docs/app/components/StarsBg.vue
+++ b/docs/app/components/StarsBg.vue
--- a/docs/app/components/content/ComponentCode.vue
+++ b/docs/app/components/content/ComponentCode.vue
@@ -84,7 +84,7 @@ const props = defineProps<{
 const route = useRoute()
 const { $prettier } = useNuxtApp()

-const camelName = camelCase(props.slug ?? route.params.slug?.[route.params.slug.length - 1] ?? '')
+const camelName = camelCase(props.slug ?? route.path.split('/').pop() ?? '')
 const name = `${props.prose ? 'Prose' : 'U'}${upperFirst(camelName)}`
 const component = defineAsyncComponent(() => {
  if (props.pro) {
@@ -211,7 +211,7 @@ ${props.slots?.default}
 `
    for (const key of props.external) {
      const cast = props.cast?.[key]
-      const value = cast ? castMap[cast]!.template(componentProps[key]) : json5.stringify(componentProps[key], null, 2).replace(/,([ |\t\n]+[}|\]])/g, '$1')
+      const value = cast ? castMap[cast]!.template(componentProps[key]) : json5.stringify(componentProps[key], null, 2)?.replace(/,([ |\t\n]+[}|\]])/g, '$1')

      code += `const ${key === 'modelValue' ? 'value' : key} = ref(${value})
 `
@@ -316,15 +316,15 @@ const { data: ast } = await useAsyncData(`component-code-${name}-${hash({ props:
 <template>
  <div class="my-5">
    <div>
-      <div v-if="options.length" class="flex items-center gap-2.5 border border-[var(--ui-border-muted)] border-b-0 relative rounded-t-[calc(var(--ui-radius)*1.5)] px-4 py-2.5 overflow-x-auto">
+      <div v-if="options.length" class="flex flex-wrap items-center gap-2.5 border border-(--ui-border-muted) border-b-0 relative rounded-t-[calc(var(--ui-radius)*1.5)] px-4 py-2.5 overflow-x-auto">
        <template v-for="option in options" :key="option.name">
          <UFormField
            :label="option.label"
            size="sm"
-            class="inline-flex ring ring-[var(--ui-border-accented)] rounded-[var(--ui-radius)]"
+            class="inline-flex ring ring-(--ui-border-accented) rounded-(--ui-radius)"
            :ui="{
-              wrapper: 'bg-[var(--ui-bg-elevated)]/50 rounded-l-[var(--ui-radius)] flex border-r border-[var(--ui-border-accented)]',
-              label: 'text-[var(--ui-text-muted)] px-2 py-1.5',
+              wrapper: 'bg-(--ui-bg-elevated)/50 rounded-l-(--ui-radius) flex border-r border-(--ui-border-accented)',
+              label: 'text-(--ui-text-muted) px-2 py-1.5',
              container: 'mt-0'
            }"
          >
@@ -335,7 +335,7 @@ const { data: ast } = await useAsyncData(`component-code-${name}-${hash({ props:
              value-key="value"
              color="neutral"
              variant="soft"
-              class="rounded-[var(--ui-radius)] rounded-l-none min-w-12"
+              class="rounded-(--ui-radius) rounded-l-none min-w-12"
              :class="[option.name.toLowerCase().endsWith('color') && 'pl-6']"
              :ui="{ itemLeadingChip: 'size-2' }"
              @update:model-value="setComponentProp(option.name, $event)"
@@ -357,14 +357,14 @@ const { data: ast } = await useAsyncData(`component-code-${name}-${hash({ props:
              :model-value="getComponentProp(option.name)"
              color="neutral"
              variant="soft"
-              :ui="{ base: 'rounded-[var(--ui-radius)] rounded-l-none min-w-12' }"
+              :ui="{ base: 'rounded-(--ui-radius) rounded-l-none min-w-12' }"
              @update:model-value="setComponentProp(option.name, $event)"
            />
          </UFormField>
        </template>
      </div>

-      <div v-if="component" class="flex justify-center border border-b-0 border-[var(--ui-border-muted)] relative p-4 z-[1]" :class="[!options.length && 'rounded-t-[calc(var(--ui-radius)*1.5)]', props.class, { 'overflow-hidden': props.overflowHidden }]">
+      <div v-if="component" class="flex justify-center border border-b-0 border-(--ui-border-muted) relative p-4 z-[1]" :class="[!options.length && 'rounded-t-[calc(var(--ui-radius)*1.5)]', props.class, { 'overflow-hidden': props.overflowHidden }]">
        <component :is="component" v-bind="{ ...componentProps, ...componentEvents }">
          <template v-for="slot in Object.keys(slots || {})" :key="slot" #[slot]>
            <slot :name="slot" mdc-unwrap="p">
--- a/docs/app/components/content/ComponentEmits.vue
+++ b/docs/app/components/content/ComponentEmits.vue
@@ -7,7 +7,7 @@ const props = defineProps<{

 const route = useRoute()

-const camelName = camelCase(route.params.slug?.[route.params.slug.length - 1] ?? '')
+const camelName = camelCase(route.path.split('/').pop() ?? '')
 const name = props.prose ? `Prose${upperFirst(camelName)}` : `U${upperFirst(camelName)}`

 const meta = await fetchComponentMeta(name as any)
--- a/docs/app/components/content/ComponentExample.vue
+++ b/docs/app/components/content/ComponentExample.vue
@@ -132,18 +132,25 @@ const optionsValues = ref(props.options?.reduce((acc, option) => {
  return acc
 }, {} as Record<string, any>) || {})

-const urlSearchParams = computed(() => new URLSearchParams({
-  ...optionsValues.value,
-  ...componentProps,
-  width: Math.round(width.value).toString()
-}).toString())
+const urlSearchParams = computed(() => {
+  const params = {
+    ...optionsValues.value,
+    ...componentProps
+  }
+
+  if (!props.iframeMobile) {
+    params.width = Math.round(width.value).toString()
+  }
+
+  return new URLSearchParams(params).toString()
+})
 </script>

 <template>
  <div ref="el" class="my-5">
    <template v-if="preview">
-      <div class="border border-[var(--ui-border-muted)] relative z-[1]" :class="[{ 'border-b-0 rounded-t-[calc(var(--ui-radius)*1.5)]': props.source, 'rounded-[calc(var(--ui-radius)*1.5)]': !props.source, 'overflow-hidden': props.overflowHidden }]">
-        <div v-if="props.options?.length || !!slots.options" class="flex gap-4 p-4 border-b border-[var(--ui-border-muted)]">
+      <div class="border border-(--ui-border-muted) relative z-[1]" :class="[{ 'border-b-0 rounded-t-[calc(var(--ui-radius)*1.5)]': props.source, 'rounded-[calc(var(--ui-radius)*1.5)]': !props.source, 'overflow-hidden': props.overflowHidden }]">
+        <div v-if="props.options?.length || !!slots.options" class="flex gap-4 p-4 border-b border-(--ui-border-muted)">
          <slot name="options" />

          <UFormField
@@ -152,10 +159,10 @@ const urlSearchParams = computed(() => new URLSearchParams({
            :label="option.label"
            :name="option.name"
            size="sm"
-            class="inline-flex ring ring-[var(--ui-border-accented)] rounded-[var(--ui-radius)]"
+            class="inline-flex ring ring-(--ui-border-accented) rounded-(--ui-radius)"
            :ui="{
-              wrapper: 'bg-[var(--ui-bg-elevated)]/50 rounded-l-[var(--ui-radius)] flex border-r border-[var(--ui-border-accented)]',
-              label: 'text-[var(--ui-text-muted)] px-2 py-1.5',
+              wrapper: 'bg-(--ui-bg-elevated)/50 rounded-l-(--ui-radius) flex border-r border-(--ui-border-accented)',
+              label: 'text-(--ui-text-muted) px-2 py-1.5',
              container: 'mt-0'
            }"
          >
@@ -167,7 +174,7 @@ const urlSearchParams = computed(() => new URLSearchParams({
              :value-key="option.name.toLowerCase().endsWith('color') ? 'value' : undefined"
              color="neutral"
              variant="soft"
-              class="rounded-[var(--ui-radius)] rounded-l-none min-w-12"
+              class="rounded-(--ui-radius) rounded-l-none min-w-12"
              :multiple="option.multiple"
              :class="[option.name.toLowerCase().endsWith('color') && 'pl-6']"
              :ui="{ itemLeadingChip: 'size-2' }"
@@ -188,7 +195,7 @@ const urlSearchParams = computed(() => new URLSearchParams({
              :model-value="get(optionsValues, option.name)"
              color="neutral"
              variant="soft"
-              :ui="{ base: 'rounded-[var(--ui-radius)] rounded-l-none min-w-12' }"
+              :ui="{ base: 'rounded-(--ui-radius) rounded-l-none min-w-12' }"
              @update:model-value="set(optionsValues, option.name, $event)"
            />
          </UFormField>
--- a/docs/app/components/content/ComponentProps.vue
+++ b/docs/app/components/content/ComponentProps.vue
@@ -34,7 +34,7 @@ const props = withDefaults(defineProps<{

 const route = useRoute()

-const camelName = camelCase(props.name ?? route.params.slug?.[route.params.slug.length - 1] ?? '')
+const camelName = camelCase(props.name ?? route.path.split('/').pop() ?? '')
 const componentName = props.prose ? `Prose${upperFirst(camelName)}` : `U${upperFirst(camelName)}`

 const componentTheme = ((props.pro ? props.prose ? themePro.prose : themePro : theme) as any)[camelName]
@@ -112,7 +112,7 @@ const metaProps: ComputedRef<ComponentMeta['props']> = computed(() => {
        <ProseTd>
          <HighlightInlineType v-if="prop.type" :type="prop.type" />

-          <MDC v-if="prop.description" :value="prop.description" class="text-[var(--ui-text-toned)] mt-1" />
+          <MDC v-if="prop.description" :value="prop.description" class="text-(--ui-text-toned) mt-1" />

          <ComponentPropsLinks v-if="prop.tags?.length" :prop="prop" />
          <ComponentPropsSchema v-if="prop.schema" :prop="prop" :ignore="ignore" />
--- a/docs/app/components/content/ComponentPropsSchema.vue
+++ b/docs/app/components/content/ComponentPropsSchema.vue
@@ -40,7 +40,7 @@ const schemaProps = computed(() => {
      <ProseLi v-for="schemaProp in schemaProps" :key="schemaProp.name">
        <HighlightInlineType :type="`${schemaProp.name}${schemaProp.required === false ? '?' : ''}: ${schemaProp.type}`" />

-        <MDC v-if="schemaProp.description" :value="schemaProp.description" class="text-[var(--ui-text-muted)] my-1" />
+        <MDC v-if="schemaProp.description" :value="schemaProp.description" class="text-(--ui-text-muted) my-1" />
      </ProseLi>
    </ProseUl>
  </ProseCollapsible>
--- a/docs/app/components/content/ComponentSlots.vue
+++ b/docs/app/components/content/ComponentSlots.vue
@@ -3,12 +3,13 @@ import { upperFirst, camelCase } from 'scule'

 const props = defineProps<{
  prose?: boolean
+  slug?: string
 }>()

 const route = useRoute()

-const camelName = camelCase(route.params.slug?.[route.params.slug.length - 1] ?? '')
-const name = props.prose ? `Prose${upperFirst(camelName)}` : `U${upperFirst(camelName)}`
+const camelName = camelCase(props.slug ?? route.path.split('/').pop() ?? '')
+const name = `${props.prose ? 'Prose' : 'U'}${upperFirst(camelName)}`

 const meta = await fetchComponentMeta(name as any)
 </script>
@@ -35,7 +36,7 @@ const meta = await fetchComponentMeta(name as any)
        <ProseTd>
          <HighlightInlineType v-if="slot.type" :type="slot.type" />

-          <MDC v-if="slot.description" :value="slot.description" class="text-[var(--ui-text-toned)] mt-1" />
+          <MDC v-if="slot.description" :value="slot.description" class="text-(--ui-text-toned) mt-1" />
        </ProseTd>
      </ProseTr>
    </ProseTbody>
--- a/docs/app/components/content/ComponentTheme.vue
+++ b/docs/app/components/content/ComponentTheme.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import json5 from 'json5'
 import { camelCase } from 'scule'
+import { hash } from 'ohash'
 import * as theme from '#build/ui'
 import * as themePro from '#build/ui-pro'

@@ -14,7 +15,8 @@ const props = defineProps<{
 const route = useRoute()
 const { framework } = useSharedData()

-const name = camelCase(props.slug ?? route.params.slug?.[route.params.slug.length - 1] ?? '')
+const name = props.slug ?? route.path.split('/').pop() ?? ''
+const camelName = camelCase(name)

 const strippedCompoundVariants = ref(false)

@@ -22,7 +24,7 @@ const computedTheme = computed(() => props.pro ? props.prose ? themePro.prose :

 const strippedTheme = computed(() => {
  const strippedTheme = {
-    ...(computedTheme.value as any)[name]
+    ...(computedTheme.value as any)[camelName]
  }

  if (strippedTheme?.compoundVariants) {
@@ -62,8 +64,8 @@ const component = computed(() => {
  const baseKey = props.pro ? 'uiPro' : 'ui'

  const content = props.prose
-    ? { prose: { [name]: strippedTheme.value } }
-    : { [name]: strippedTheme.value }
+    ? { prose: { [camelName]: strippedTheme.value } }
+    : { [camelName]: strippedTheme.value }

  if (props.extra?.length) {
    props.extra.forEach((extra) => {
@@ -77,7 +79,14 @@ const component = computed(() => {
  }
 })

-const { data: ast } = await useAsyncData(`component-theme-${name}`, async () => {
+const themeLink = computed(() => {
+  const repo = props.pro ? 'ui-pro' : 'ui'
+  const slug = name.startsWith('content') ? `content/${name}` : name
+
+  return `https://github.com/nuxt/${repo}/blob/v3/src/theme/${slug}.ts`
+})
+
+const { data: ast } = await useAsyncData(`component-theme-${camelName}-${hash({ props })}`, async () => {
  const md = `
 ::code-collapse{class="nuxt-only"}

@@ -87,7 +96,7 @@ export default defineAppConfig(${json5.stringify(component.value, null, 2).repla

 ::

-::code-collapse{class="vue-only"}
+::code-collapse{class="vue-only ui-only"}

 \`\`\`ts [vite.config.ts]
 import { defineConfig } from 'vite'
@@ -107,9 +116,29 @@ export default defineConfig({

 ::

+::code-collapse{class="vue-only ui-pro-only"}
+
+\`\`\`ts [vite.config.ts]
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+import uiPro from '@nuxt/ui-pro/vite'
+
+export default defineConfig({
+  plugins: [
+    vue(),
+    uiPro(${json5.stringify(component.value, null, 2).replace(/,([ |\t\n]+[}|\])])/g, '$1')
+      .split('\n')
+      .map((line, i) => i === 0 ? line : `    ${line}`)
+      .join('\n')})
+  ]
+})
+\`\`\`
+
+::
+
 ${strippedCompoundVariants.value
  ? `
-::callout{icon="i-simple-icons-github" to="https://github.com/nuxt/ui/blob/v3/src/theme/${name}.ts"}
+::callout{icon="i-simple-icons-github" to="${themeLink.value}" title="Compound variants"}
 Some colors in \`compoundVariants\` are omitted for readability. Check out the source code on GitHub.
 ::`
  : ''}
--- a/docs/app/components/content/IconsTheme.vue
+++ b/docs/app/components/content/IconsTheme.vue
@@ -31,11 +31,7 @@ export default defineAppConfig(${json5.stringify({

 ::

-::caution{class="ui-pro-only vue-only"}
-Nuxt UI Pro v3 does not support Vue yet.
-::
-
-::code-collapse{class="vue-only"}
+::code-collapse{class="vue-only ui-only"}

 \`\`\`ts [vite.config.ts]
 import { defineConfig } from 'vite'
@@ -57,6 +53,30 @@ export default defineConfig({
 })
 \`\`\`

+::
+
+::code-collapse{class="vue-only ui-pro-only"}
+
+\`\`\`ts [vite.config.ts]
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+import uiPro from '@nuxt/ui-pro/vite'
+
+export default defineConfig({
+  plugins: [
+    vue(),
+    uiPro(${json5.stringify({
+      ui: {
+        icons
+      }
+    }, null, 2).replace(/,([ |\t\n]+[}|\])])/g, '$1')
+      .split('\n')
+      .map((line, i) => i === 0 ? line : `    ${line}`)
+      .join('\n')})
+  ]
+})
+\`\`\`
+
 ::
 `

--- a/docs/app/components/content/Placeholder.vue
+++ b/docs/app/components/content/Placeholder.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="relative overflow-hidden rounded-[var(--ui-radius)] border border-dashed border-[var(--ui-border-accented)] opacity-75 px-4 flex items-center justify-center">
-    <svg class="absolute inset-0 h-full w-full stroke-[var(--ui-border-inverted)]/10" fill="none">
+  <div class="relative overflow-hidden rounded-(--ui-radius) border border-dashed border-(--ui-border-accented) opacity-75 px-4 flex items-center justify-center">
+    <svg class="absolute inset-0 h-full w-full stroke-(--ui-border-inverted)/10" fill="none">
      <defs>
        <pattern
          id="pattern-5c1e4f0e-62d5-498b-8ff0-cf77bb448c8e"
--- a/docs/app/components/content/SupportedLanguages.vue
+++ b/docs/app/components/content/SupportedLanguages.vue
@@ -10,16 +10,20 @@ const props = withDefaults(defineProps<{
 function getEmojiFlag(locale: string): string {
  const languageToCountry: Record<string, string> = {
    ar: 'sa',
+    bn: 'bd',
    cs: 'cz',
    da: 'dk',
    el: 'gr',
+    et: 'ee',
    en: 'gb',
+    hi: 'in',
    ja: 'jp',
+    km: 'kh',
    ko: 'kr',
+    nb: 'no',
    sv: 'se',
    uk: 'ua',
-    vi: 'vn',
-    zh: 'cn'
+    vi: 'vn'
  }

  const baseLanguage = locale.split('-')[0]?.toLowerCase() || locale
--- a/docs/app/components/content/examples/accordion/AccordionContentSlotExample.vue
+++ b/docs/app/components/content/examples/accordion/AccordionContentSlotExample.vue
@@ -18,7 +18,7 @@ const items = [
 <template>
  <UAccordion :items="items">
    <template #content="{ item }">
-      <p class="pb-3.5 text-sm text-[var(--ui-text-muted)]">
+      <p class="pb-3.5 text-sm text-(--ui-text-muted)">
        This is the {{ item.label }} panel.
      </p>
    </template>
--- a/docs/app/components/content/examples/accordion/AccordionCustomSlotExample.vue
+++ b/docs/app/components/content/examples/accordion/AccordionCustomSlotExample.vue
@@ -22,7 +22,7 @@ const items = [
 <template>
  <UAccordion :items="items">
    <template #colors="{ item }">
-      <p class="text-sm pb-3.5 text-[var(--ui-primary)]">
+      <p class="text-sm pb-3.5 text-(--ui-primary)">
        {{ item.content }}
      </p>
    </template>
--- a/docs/app/components/content/examples/avatar-group/AvatarGroupLinkExample.vue
+++ b/docs/app/components/content/examples/avatar-group/AvatarGroupLinkExample.vue
@@ -3,7 +3,7 @@
    <ULink
      to="https://github.com/benjamincanac"
      target="_blank"
-      class="hover:ring-[var(--ui-primary)] transition"
+      class="hover:ring-(--ui-primary) transition"
      raw
    >
      <UAvatar
@@ -15,7 +15,7 @@
    <ULink
      to="https://github.com/romhml"
      target="_blank"
-      class="hover:ring-[var(--ui-primary)] transition"
+      class="hover:ring-(--ui-primary) transition"
      raw
    >
      <UAvatar
@@ -27,7 +27,7 @@
    <ULink
      to="https://github.com/noook"
      target="_blank"
-      class="hover:ring-[var(--ui-primary)] transition"
+      class="hover:ring-(--ui-primary) transition"
      raw
    >
      <UAvatar
--- a/docs/app/components/content/examples/breadcrumb/BreadcrumbSeparatorSlotExample.vue
+++ b/docs/app/components/content/examples/breadcrumb/BreadcrumbSeparatorSlotExample.vue
@@ -14,7 +14,7 @@ const items = [{
 <template>
  <UBreadcrumb :items="items">
    <template #separator>
-      <span class="mx-2 text-[var(--ui-text-muted)]">/</span>
+      <span class="mx-2 text-(--ui-text-muted)">/</span>
    </template>
  </UBreadcrumb>
 </template>
--- a/docs/app/components/content/examples/button-group/ButtonGroupBadgeExample.vue
+++ b/docs/app/components/content/examples/button-group/ButtonGroupBadgeExample.vue
@@ -0,0 +1,7 @@
+<template>
+  <UButtonGroup>
+    <UBadge color="neutral" variant="outline" size="lg" label="https://" />
+
+    <UInput color="neutral" variant="outline" placeholder="www.example.com" />
+  </UButtonGroup>
+</template>
--- a/docs/app/components/content/examples/calendar/CalendarDatePickerExample.vue
+++ b/docs/app/components/content/examples/calendar/CalendarDatePickerExample.vue
@@ -11,7 +11,7 @@ const modelValue = shallowRef(new CalendarDate(2022, 1, 10))
 <template>
  <UPopover>
    <UButton color="neutral" variant="subtle" icon="i-lucide-calendar">
-      {{ df.format(modelValue.toDate(getLocalTimeZone())) }}
+      {{ modelValue ? df.format(modelValue.toDate(getLocalTimeZone())) : 'Select a date' }}
    </UButton>

    <template #content>
--- a/docs/app/components/content/examples/calendar/CalendarDisabledDatesExample.vue
+++ b/docs/app/components/content/examples/calendar/CalendarDisabledDatesExample.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
+import type { DateValue } from '@internationalized/date'
 import { CalendarDate } from '@internationalized/date'
-import type { Matcher } from 'reka-ui/date'

 const modelValue = shallowRef({
  start: new CalendarDate(2022, 1, 1),
  end: new CalendarDate(2022, 1, 9)
 })

-const isDateDisabled: Matcher = (date) => {
+const isDateDisabled = (date: DateValue) => {
  return date.day >= 10 && date.day <= 16
 }
 </script>
--- a/docs/app/components/content/examples/calendar/CalendarUnavailableDatesExample.vue
+++ b/docs/app/components/content/examples/calendar/CalendarUnavailableDatesExample.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
+import type { DateValue } from '@internationalized/date'
 import { CalendarDate } from '@internationalized/date'
-import type { Matcher } from 'reka-ui/date'

 const modelValue = shallowRef({
  start: new CalendarDate(2022, 1, 1),
  end: new CalendarDate(2022, 1, 9)
 })

-const isDateUnavailable: Matcher = (date) => {
+const isDateUnavailable = (date: DateValue) => {
  return date.day >= 10 && date.day <= 16
 }
 </script>
--- a/docs/app/components/content/examples/command-palette/CommandPaletteCustomSlotExample.vue
+++ b/docs/app/components/content/examples/command-palette/CommandPaletteCustomSlotExample.vue
@@ -29,31 +29,45 @@ const groups = [{
  items: [
    {
      label: 'Benjamin Canac',
-      suffix: 'benjamincanac'
+      suffix: 'benjamincanac',
+      to: 'https://github.com/benjamincanac',
+      target: '_blank'
    },
    {
      label: 'Sylvain Marroufin',
-      suffix: 'smarroufin'
+      suffix: 'smarroufin',
+      to: 'https://github.com/smarroufin',
+      target: '_blank'
    },
    {
      label: 'Sébastien Chopin',
-      suffix: 'atinux'
+      suffix: 'atinux',
+      to: 'https://github.com/atinux',
+      target: '_blank'
    },
    {
      label: 'Romain Hamel',
-      suffix: 'romhml'
+      suffix: 'romhml',
+      to: 'https://github.com/romhml',
+      target: '_blank'
    },
    {
      label: 'Haytham A. Salama',
-      suffix: 'Haythamasalama'
+      suffix: 'Haythamasalama',
+      to: 'https://github.com/Haythamasalama',
+      target: '_blank'
    },
    {
      label: 'Daniel Roe',
-      suffix: 'danielroe'
+      suffix: 'danielroe',
+      to: 'https://github.com/danielroe',
+      target: '_blank'
    },
    {
      label: 'Neil Richter',
-      suffix: 'noook'
+      suffix: 'noook',
+      to: 'https://github.com/noook',
+      target: '_blank'
    }
  ]
 }]
--- a/docs/app/components/content/examples/command-palette/CommandPaletteOpenExample.vue
+++ b/docs/app/components/content/examples/command-palette/CommandPaletteOpenExample.vue
@@ -5,6 +5,8 @@ const users = [
  {
    label: 'Benjamin Canac',
    suffix: 'benjamincanac',
+    to: 'https://github.com/benjamincanac',
+    target: '_blank',
    avatar: {
      src: 'https://github.com/benjamincanac.png'
    }
@@ -12,6 +14,8 @@ const users = [
  {
    label: 'Sylvain Marroufin',
    suffix: 'smarroufin',
+    to: 'https://github.com/smarroufin',
+    target: '_blank',
    avatar: {
      src: 'https://github.com/smarroufin.png'
    }
@@ -19,6 +23,8 @@ const users = [
  {
    label: 'Sébastien Chopin',
    suffix: 'atinux',
+    to: 'https://github.com/atinux',
+    target: '_blank',
    avatar: {
      src: 'https://github.com/atinux.png'
    }
@@ -26,6 +32,8 @@ const users = [
  {
    label: 'Romain Hamel',
    suffix: 'romhml',
+    to: 'https://github.com/romhml',
+    target: '_blank',
    avatar: {
      src: 'https://github.com/romhml.png'
    }
@@ -33,6 +41,8 @@ const users = [
  {
    label: 'Haytham A. Salama',
    suffix: 'Haythamasalama',
+    to: 'https://github.com/Haythamasalama',
+    target: '_blank',
    avatar: {
      src: 'https://github.com/Haythamasalama.png'
    }
@@ -40,6 +50,8 @@ const users = [
  {
    label: 'Daniel Roe',
    suffix: 'danielroe',
+    to: 'https://github.com/danielroe',
+    target: '_blank',
    avatar: {
      src: 'https://github.com/danielroe.png'
    }
@@ -47,6 +59,8 @@ const users = [
  {
    label: 'Neil Richter',
    suffix: 'noook',
+    to: 'https://github.com/noook',
+    target: '_blank',
    avatar: {
      src: 'https://github.com/noook.png'
    }
--- a/docs/app/components/content/examples/command-palette/CommandPaletteSearchTermExample.vue
+++ b/docs/app/components/content/examples/command-palette/CommandPaletteSearchTermExample.vue
@@ -6,8 +6,7 @@ const users = [
    to: 'https://github.com/benjamincanac',
    target: '_blank',
    avatar: {
-      src: 'https://github.com/benjamincanac.png',
-      alt: 'benjamincanac'
+      src: 'https://github.com/benjamincanac.png'
    }
  },
  {
@@ -16,8 +15,7 @@ const users = [
    to: 'https://github.com/smarroufin',
    target: '_blank',
    avatar: {
-      src: 'https://github.com/smarroufin.png',
-      alt: 'smarroufin'
+      src: 'https://github.com/smarroufin.png'
    }
  },
  {
@@ -26,8 +24,7 @@ const users = [
    to: 'https://github.com/atinux',
    target: '_blank',
    avatar: {
-      src: 'https://github.com/atinux.png',
-      alt: 'atinux'
+      src: 'https://github.com/atinux.png'
    }
  },
  {
@@ -36,8 +33,7 @@ const users = [
    to: 'https://github.com/romhml',
    target: '_blank',
    avatar: {
-      src: 'https://github.com/romhml.png',
-      alt: 'romhml'
+      src: 'https://github.com/romhml.png'
    }
  },
  {
@@ -46,8 +42,7 @@ const users = [
    to: 'https://github.com/Haythamasalama',
    target: '_blank',
    avatar: {
-      src: 'https://github.com/Haythamasalama.png',
-      alt: 'Haythamasalama'
+      src: 'https://github.com/Haythamasalama.png'
    }
  },
  {
@@ -56,8 +51,7 @@ const users = [
    to: 'https://github.com/danielroe',
    target: '_blank',
    avatar: {
-      src: 'https://github.com/danielroe.png',
-      alt: 'danielroe'
+      src: 'https://github.com/danielroe.png'
    }
  },
  {
@@ -66,8 +60,7 @@ const users = [
    to: 'https://github.com/noook',
    target: '_blank',
    avatar: {
-      src: 'https://github.com/noook.png',
-      alt: 'noook'
+      src: 'https://github.com/noook.png'
    }
  }
 ]
--- a/docs/app/components/content/examples/command-palette/CommandPaletteSelectExample.vue
+++ b/docs/app/components/content/examples/command-palette/CommandPaletteSelectExample.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const router = useRouter()
+const toast = useToast()

 const groups = ref([
  {
@@ -12,8 +12,7 @@ const groups = ref([
        to: 'https://github.com/benjamincanac',
        target: '_blank',
        avatar: {
-          src: 'https://github.com/benjamincanac.png',
-          alt: 'benjamincanac'
+          src: 'https://github.com/benjamincanac.png'
        }
      },
      {
@@ -22,8 +21,7 @@ const groups = ref([
        to: 'https://github.com/smarroufin',
        target: '_blank',
        avatar: {
-          src: 'https://github.com/smarroufin.png',
-          alt: 'smarroufin'
+          src: 'https://github.com/smarroufin.png'
        }
      },
      {
@@ -32,8 +30,7 @@ const groups = ref([
        to: 'https://github.com/atinux',
        target: '_blank',
        avatar: {
-          src: 'https://github.com/atinux.png',
-          alt: 'atinux'
+          src: 'https://github.com/atinux.png'
        }
      },
      {
@@ -42,8 +39,7 @@ const groups = ref([
        to: 'https://github.com/romhml',
        target: '_blank',
        avatar: {
-          src: 'https://github.com/romhml.png',
-          alt: 'romhml'
+          src: 'https://github.com/romhml.png'
        }
      },
      {
@@ -52,8 +48,7 @@ const groups = ref([
        to: 'https://github.com/Haythamasalama',
        target: '_blank',
        avatar: {
-          src: 'https://github.com/Haythamasalama.png',
-          alt: 'Haythamasalama'
+          src: 'https://github.com/Haythamasalama.png'
        }
      },
      {
@@ -62,8 +57,7 @@ const groups = ref([
        to: 'https://github.com/danielroe',
        target: '_blank',
        avatar: {
-          src: 'https://github.com/danielroe.png',
-          alt: 'danielroe'
+          src: 'https://github.com/danielroe.png'
        }
      },
      {
@@ -72,8 +66,7 @@ const groups = ref([
        to: 'https://github.com/noook',
        target: '_blank',
        avatar: {
-          src: 'https://github.com/noook.png',
-          alt: 'noook'
+          src: 'https://github.com/noook.png'
        }
      }
    ]
@@ -90,7 +83,7 @@ const groups = ref([
          'N'
        ],
        onSelect() {
-          console.log('Add new file')
+          toast.add({ title: 'Add new file' })
        }
      },
      {
@@ -102,7 +95,7 @@ const groups = ref([
          'F'
        ],
        onSelect() {
-          console.log('Add new folder')
+          toast.add({ title: 'Add new folder' })
        }
      },
      {
@@ -114,7 +107,7 @@ const groups = ref([
          'H'
        ],
        onSelect() {
-          console.log('Add hashtag')
+          toast.add({ title: 'Add hashtag' })
        }
      },
      {
@@ -126,7 +119,7 @@ const groups = ref([
          'L'
        ],
        onSelect() {
-          console.log('Add label')
+          toast.add({ title: 'Add label' })
        }
      }
    ]
@@ -134,15 +127,7 @@ const groups = ref([
 ])

 function onSelect(item: any) {
-  if (item.onSelect) {
-    item.onSelect()
-  } else if (item.to) {
-    if (typeof item.to === 'string' && (item.target === '_blank' || item.to.startsWith('http'))) {
-      window.open(item.to, item.target || '_blank')
-    } else {
-      router.push(item.to)
-    }
-  }
+  console.log(item)
 }
 </script>

--- a/docs/app/components/content/examples/context-menu/ContextMenuCheckboxItemsExample.vue
+++ b/docs/app/components/content/examples/context-menu/ContextMenuCheckboxItemsExample.vue
@@ -33,7 +33,7 @@ const items = computed(() => [{

 <template>
  <UContextMenu :items="items" :ui="{ content: 'w-48' }">
-    <div class="flex items-center justify-center rounded-md border border-dashed border-[var(--ui-border-accented)] text-sm aspect-video w-72">
+    <div class="flex items-center justify-center rounded-md border border-dashed border-(--ui-border-accented) text-sm aspect-video w-72">
      Right click here
    </div>
  </UContextMenu>
--- a/docs/app/components/content/examples/context-menu/ContextMenuColorItemsExample.vue
+++ b/docs/app/components/content/examples/context-menu/ContextMenuColorItemsExample.vue
@@ -26,7 +26,7 @@ const items = [

 <template>
  <UContextMenu :items="items" :ui="{ content: 'w-48' }">
-    <div class="flex items-center justify-center rounded-md border border-dashed border-[var(--ui-border-accented)] text-sm aspect-video w-72">
+    <div class="flex items-center justify-center rounded-md border border-dashed border-(--ui-border-accented) text-sm aspect-video w-72">
      Right click here
    </div>
  </UContextMenu>
--- a/docs/app/components/content/examples/context-menu/ContextMenuCustomSlotExample.vue
+++ b/docs/app/components/content/examples/context-menu/ContextMenuCustomSlotExample.vue
@@ -13,7 +13,7 @@ const items = [{

 <template>
  <UContextMenu :items="items" :ui="{ content: 'w-48' }">
-    <div class="flex items-center justify-center rounded-md border border-dashed border-[var(--ui-border-accented)] text-sm aspect-video w-72">
+    <div class="flex items-center justify-center rounded-md border border-dashed border-(--ui-border-accented) text-sm aspect-video w-72">
      Right click here
    </div>

@@ -22,7 +22,7 @@ const items = [{
    </template>

    <template #refresh-trailing>
-      <UIcon v-if="loading" name="i-lucide-refresh-cw" class="shrink-0 size-5 text-[var(--ui-primary)] animate-spin" />
+      <UIcon v-if="loading" name="i-lucide-refresh-cw" class="shrink-0 size-5 text-(--ui-primary) animate-spin" />
    </template>
  </UContextMenu>
 </template>
--- a/docs/app/components/content/examples/drawer/DrawerDismissibleExample.vue
+++ b/docs/app/components/content/examples/drawer/DrawerDismissibleExample.vue
@@ -7,7 +7,7 @@ const open = ref(false)
    <UButton label="Open" color="neutral" variant="subtle" trailing-icon="i-lucide-chevron-up" />

    <template #header>
-      <h2 class="text-[var(--ui-text-highlighted)] font-semibold">
+      <h2 class="text-(--ui-text-highlighted) font-semibold">
        Drawer non-dismissible
      </h2>

--- a/docs/app/components/content/examples/dropdown-menu/DropdownMenuColorItemsExample.vue
+++ b/docs/app/components/content/examples/dropdown-menu/DropdownMenuColorItemsExample.vue
@@ -29,7 +29,7 @@ const items = [
    <UButton label="Open" color="neutral" variant="outline" icon="i-lucide-menu" />

    <template #profile-trailing>
-      <UIcon name="i-lucide-badge-check" class="shrink-0 size-5 text-[var(--ui-primary)]" />
+      <UIcon name="i-lucide-badge-check" class="shrink-0 size-5 text-(--ui-primary)" />
    </template>
  </UDropdownMenu>
 </template>
--- a/docs/app/components/content/examples/dropdown-menu/DropdownMenuCustomSlotExample.vue
+++ b/docs/app/components/content/examples/dropdown-menu/DropdownMenuCustomSlotExample.vue
@@ -17,7 +17,7 @@ const items = [{
    <UButton label="Open" color="neutral" variant="outline" icon="i-lucide-menu" />

    <template #profile-trailing>
-      <UIcon name="i-lucide-badge-check" class="shrink-0 size-5 text-[var(--ui-primary)]" />
+      <UIcon name="i-lucide-badge-check" class="shrink-0 size-5 text-(--ui-primary)" />
    </template>
  </UDropdownMenu>
 </template>
--- a/docs/app/components/content/examples/form/FormExampleBasic.vue
+++ b/docs/app/components/content/examples/form/FormExampleBasic.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { FormError, FormSubmitEvent } from '#ui/types'
+import type { FormError, FormSubmitEvent } from '@nuxt/ui'

 const state = reactive({
  email: undefined,
--- a/docs/app/components/content/examples/form/FormExampleJoi.vue
+++ b/docs/app/components/content/examples/form/FormExampleJoi.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import Joi from 'joi'
-import type { FormSubmitEvent } from '#ui/types'
+import type { FormSubmitEvent } from '@nuxt/ui'

 const schema = Joi.object({
  email: Joi.string().required(),
--- a/docs/app/components/content/examples/form/FormExampleNested.vue
+++ b/docs/app/components/content/examples/form/FormExampleNested.vue
@@ -4,7 +4,7 @@ import type { FormSubmitEvent } from '@nuxt/ui'

 const schema = z.object({
  name: z.string().min(2),
-  news: z.boolean()
+  news: z.boolean().default(false)
 })

 type Schema = z.output<typeof schema>
@@ -36,7 +36,7 @@ async function onSubmit(event: FormSubmitEvent<any>) {
    </UFormField>

    <div>
-      <UCheckbox v-model="state.news" name="news" label="Register to our newsletter" />
+      <UCheckbox v-model="state.news" name="news" label="Register to our newsletter" @update:model-value="state.email = undefined" />
    </div>

    <UForm v-if="state.news" :state="state" :schema="nestedSchema">
--- a/docs/app/components/content/examples/form/FormExampleOnError.vue
+++ b/docs/app/components/content/examples/form/FormExampleOnError.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { FormError, FormErrorEvent, FormSubmitEvent } from '#ui/types'
+import type { FormError, FormErrorEvent, FormSubmitEvent } from '@nuxt/ui'

 const state = reactive({
  email: undefined,
--- a/docs/app/components/content/examples/form/FormExampleSuperstruct.vue
+++ b/docs/app/components/content/examples/form/FormExampleSuperstruct.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { object, string, nonempty, refine, type Infer } from 'superstruct'
-import type { FormSubmitEvent } from '#ui/types'
+import type { FormSubmitEvent } from '@nuxt/ui'

 const schema = object({
  email: nonempty(string()),
--- a/docs/app/components/content/examples/form/FormExampleValibot.vue
+++ b/docs/app/components/content/examples/form/FormExampleValibot.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import * as v from 'valibot'
-import type { FormSubmitEvent } from '#ui/types'
+import type { FormSubmitEvent } from '@nuxt/ui'

 const schema = v.object({
  email: v.pipe(v.string(), v.email('Invalid email')),
--- a/docs/app/components/content/examples/form/FormExampleYup.vue
+++ b/docs/app/components/content/examples/form/FormExampleYup.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { object, string, type InferType } from 'yup'
-import type { FormSubmitEvent } from '#ui/types'
+import type { FormSubmitEvent } from '@nuxt/ui'

 const schema = object({
  email: string().email('Invalid email').required('Required'),
--- a/docs/app/components/content/examples/form/FormExampleZod.vue
+++ b/docs/app/components/content/examples/form/FormExampleZod.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import * as z from 'zod'
-import type { FormSubmitEvent } from '#ui/types'
+import type { FormSubmitEvent } from '@nuxt/ui'

 const schema = z.object({
  email: z.string().email('Invalid email'),
--- a/docs/app/components/content/examples/input-menu/InputMenuFilterFieldsExample.vue
+++ b/docs/app/components/content/examples/input-menu/InputMenuFilterFieldsExample.vue
@@ -33,7 +33,7 @@ const { data: users, status } = await useFetch('https://jsonplaceholder.typicode
    <template #item-label="{ item }">
      {{ item.label }}

-      <span class="text-[var(--ui-text-muted)]">
+      <span class="text-(--ui-text-muted)">
        {{ item.email }}
      </span>
    </template>
--- a/docs/app/components/content/examples/input/InputButtonGroupExample.vue
+++ b/docs/app/components/content/examples/input/InputButtonGroupExample.vue
@@ -15,7 +15,7 @@ const domain = ref(domains[0])
      }"
    >
      <template #leading>
-        <p class="text-sm text-[var(--ui-text-muted)]">
+        <p class="text-sm text-(--ui-text-muted)">
          https://
        </p>
      </template>
--- a/docs/app/components/content/examples/input/InputCharacterLimitExample.vue
+++ b/docs/app/components/content/examples/input/InputCharacterLimitExample.vue
@@ -13,7 +13,7 @@ const maxLength = 15
    <template #trailing>
      <div
        id="character-count"
-        class="text-xs text-[var(--ui-text-muted)] tabular-nums"
+        class="text-xs text-(--ui-text-muted) tabular-nums"
        aria-live="polite"
        role="status"
      >
--- a/docs/app/components/content/examples/input/InputFloatingLabelExample.vue
+++ b/docs/app/components/content/examples/input/InputFloatingLabelExample.vue
@@ -4,8 +4,8 @@ const value = ref('')

 <template>
  <UInput v-model="value" placeholder="" :ui="{ base: 'peer' }">
-    <label class="pointer-events-none absolute left-0 -top-2.5 text-[var(--ui-text-highlighted)] text-xs font-medium px-1.5 transition-all peer-focus:-top-2.5 peer-focus:text-[var(--ui-text-highlighted)] peer-focus:text-xs peer-focus:font-medium peer-placeholder-shown:text-sm peer-placeholder-shown:text-[var(--ui-text-dimmed)] peer-placeholder-shown:top-1.5 peer-placeholder-shown:font-normal">
-      <span class="inline-flex bg-[var(--ui-bg)] px-1">Email address</span>
+    <label class="pointer-events-none absolute left-0 -top-2.5 text-(--ui-text-highlighted) text-xs font-medium px-1.5 transition-all peer-focus:-top-2.5 peer-focus:text-(--ui-text-highlighted) peer-focus:text-xs peer-focus:font-medium peer-placeholder-shown:text-sm peer-placeholder-shown:text-(--ui-text-dimmed) peer-placeholder-shown:top-1.5 peer-placeholder-shown:font-normal">
+      <span class="inline-flex bg-(--ui-bg) px-1">Email address</span>
    </label>
  </UInput>
 </template>
--- a/docs/app/components/content/examples/input/InputPasswordStrengthIndicatorExample.vue
+++ b/docs/app/components/content/examples/input/InputPasswordStrengthIndicatorExample.vue
@@ -51,7 +51,7 @@ const text = computed(() => {
            variant="link"
            size="sm"
            :icon="show ? 'i-lucide-eye-off' : 'i-lucide-eye'"
-            aria-label="show ? 'Hide password' : 'Show password'"
+            :aria-label="show ? 'Hide password' : 'Show password'"
            :aria-pressed="show"
            aria-controls="password"
            @click="show = !show"
@@ -77,7 +77,7 @@ const text = computed(() => {
        v-for="(req, index) in strength"
        :key="index"
        class="flex items-center gap-0.5"
-        :class="req.met ? 'text-[var(--ui-success)]' : 'text-[var(--ui-text-muted)]'"
+        :class="req.met ? 'text-(--ui-success)' : 'text-(--ui-text-muted)'"
      >
        <UIcon :name="req.met ? 'i-lucide-circle-check' : 'i-lucide-circle-x'" class="size-4 shrink-0" />

--- a/docs/app/components/content/examples/input/InputPasswordToggleExample.vue
+++ b/docs/app/components/content/examples/input/InputPasswordToggleExample.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 const show = ref(false)
-const password = ref('password')
+const password = ref('')
 </script>

 <template>
@@ -16,7 +16,7 @@ const password = ref('password')
        variant="link"
        size="sm"
        :icon="show ? 'i-lucide-eye-off' : 'i-lucide-eye'"
-        aria-label="show ? 'Hide password' : 'Show password'"
+        :aria-label="show ? 'Hide password' : 'Show password'"
        :aria-pressed="show"
        aria-controls="password"
        @click="show = !show"
--- a/docs/app/components/content/examples/modal/ModalExample.vue
+++ b/docs/app/components/content/examples/modal/ModalExample.vue
@@ -1,15 +1,18 @@
 <script setup lang="ts">
-const modal = useModal()
-
 defineProps<{
  count: number
 }>()
+
+const emit = defineEmits<{ close: [boolean] }>()
 </script>

 <template>
-  <UModal :title="`This modal was opened programmatically ${count} times`">
+  <UModal :close="{ onClick: () => emit('close', false) }" :title="`This modal was opened programmatically ${count} times`">
    <template #footer>
-      <UButton color="neutral" label="Close" @click="modal.close()" />
+      <div class="flex gap-2">
+        <UButton color="neutral" label="Dismiss" @click="emit('close', false)" />
+        <UButton label="Success" @click="emit('close', true)" />
+      </div>
    </template>
  </UModal>
 </template>
--- a/docs/app/components/content/examples/modal/ModalProgrammaticExample.vue
+++ b/docs/app/components/content/examples/modal/ModalProgrammaticExample.vue
@@ -3,14 +3,38 @@ import { LazyModalExample } from '#components'

 const count = ref(0)

-const modal = useModal()
+const toast = useToast()
+const overlay = useOverlay()

-function open() {
-  count.value++
-
-  modal.open(LazyModalExample, {
-    description: 'And you can even provide a description!',
+const modal = overlay.create(LazyModalExample, {
+  props: {
    count: count.value
+  }
+})
+
+async function open() {
+  const shouldIncrement = await modal.open()
+
+  if (shouldIncrement) {
+    count.value++
+
+    toast.add({
+      title: `Success: ${shouldIncrement}`,
+      color: 'success',
+      id: 'modal-success'
+    })
+
+    // Update the count
+    modal.patch({
+      count: count.value
+    })
+    return
+  }
+
+  toast.add({
+    title: `Dismissed: ${shouldIncrement}`,
+    color: 'error',
+    id: 'modal-dismiss'
  })
 }
 </script>
--- a/docs/app/components/content/examples/navigation-menu/NavigationMenuContentSlotExample.vue
+++ b/docs/app/components/content/examples/navigation-menu/NavigationMenuContentSlotExample.vue
@@ -51,7 +51,8 @@ const items = [
    ]
  },
  {
-    label: 'GitHub'
+    label: 'GitHub',
+    icon: 'i-simple-icons-github'
  }
 ]
 </script>
@@ -61,7 +62,7 @@ const items = [
    :items="items"
    class="w-full justify-center"
    :ui="{
-      viewport: 'sm:w-[var(--reka-navigation-menu-viewport-width)]',
+      viewport: 'sm:w-(--reka-navigation-menu-viewport-width)',
      childList: 'sm:w-96',
      childLinkDescription: 'text-balance line-clamp-2'
    }"
@@ -73,11 +74,11 @@ const items = [
        </li>

        <li v-for="child in item.children" :key="child.label">
-          <ULink class="text-sm text-left rounded-md p-3 transition-colors hover:bg-[var(--ui-bg-elevated)]/50">
-            <p class="font-medium text-[var(--ui-text-highlighted)]">
+          <ULink class="text-sm text-left rounded-md p-3 transition-colors hover:bg-(--ui-bg-elevated)/50">
+            <p class="font-medium text-(--ui-text-highlighted)">
              {{ child.label }}
            </p>
-            <p class="text-[var(--ui-text-muted)] line-clamp-2">
+            <p class="text-(--ui-text-muted) line-clamp-2">
              {{ child.description }}
            </p>
          </ULink>
--- a/docs/app/components/content/examples/navigation-menu/NavigationMenuModelValueExample.vue
+++ b/docs/app/components/content/examples/navigation-menu/NavigationMenuModelValueExample.vue
@@ -41,14 +41,9 @@ const items = [
        description: 'Define shortcuts for your application.'
      },
      {
-        label: 'useModal',
+        label: 'useOverlay',
        icon: 'i-lucide-file-text',
-        description: 'Display a modal within your application.'
-      },
-      {
-        label: 'useSlideover',
-        icon: 'i-lucide-file-text',
-        description: 'Display a slideover within your application.'
+        description: 'Display a modal/slideover within your application.'
      },
      {
        label: 'useToast',
--- a/docs/app/components/content/examples/popover/PopoverDismissibleExample.vue
+++ b/docs/app/components/content/examples/popover/PopoverDismissibleExample.vue
@@ -8,7 +8,7 @@ const open = ref(false)

    <template #content>
      <div class="flex items-center gap-4 mb-4">
-        <h2 class="text-[var(--ui-text-highlighted)] font-semibold">
+        <h2 class="text-(--ui-text-highlighted) font-semibold">
          Popover non-dismissible
        </h2>

--- a/docs/app/components/content/examples/select-menu/SelectMenuFilterFieldsExample.vue
+++ b/docs/app/components/content/examples/select-menu/SelectMenuFilterFieldsExample.vue
@@ -33,7 +33,7 @@ const { data: users, status } = await useFetch('https://jsonplaceholder.typicode
    <template #item-label="{ item }">
      {{ item.label }}

-      <span class="text-[var(--ui-text-muted)]">
+      <span class="text-(--ui-text-muted)">
        {{ item.email }}
      </span>
    </template>
--- a/docs/app/components/content/examples/slideover/SlideoverExample.vue
+++ b/docs/app/components/content/examples/slideover/SlideoverExample.vue
@@ -1,19 +1,22 @@
 <script setup lang="ts">
-const slideover = useSlideover()
-
 defineProps<{
  count: number
 }>()
+
+const emit = defineEmits<{ close: [boolean] }>()
 </script>

 <template>
-  <USlideover :description="`This slideover was opened programmatically ${count} times`">
+  <USlideover :close="{ onClick: () => emit('close', false) }" :description="`This slideover was opened programmatically ${count} times`">
    <template #body>
      <Placeholder class="h-full" />
    </template>

    <template #footer>
-      <UButton color="neutral" label="Close" @click="slideover.close()" />
+      <div class="flex gap-2">
+        <UButton color="neutral" label="Dismiss" @click="emit('close', false)" />
+        <UButton label="Success" @click="emit('close', true)" />
+      </div>
    </template>
  </USlideover>
 </template>
--- a/docs/app/components/content/examples/slideover/SlideoverProgrammaticExample.vue
+++ b/docs/app/components/content/examples/slideover/SlideoverProgrammaticExample.vue
@@ -3,14 +3,38 @@ import { LazySlideoverExample } from '#components'

 const count = ref(0)

-const slideover = useSlideover()
+const toast = useToast()
+const overlay = useOverlay()

-function open() {
-  count.value++
-
-  slideover.open(LazySlideoverExample, {
-    title: 'Slideover',
+const slideover = overlay.create(LazySlideoverExample, {
+  props: {
    count: count.value
+  }
+})
+
+async function open() {
+  const shouldIncrement = await slideover.open()
+
+  if (shouldIncrement) {
+    count.value++
+
+    toast.add({
+      title: `Success: ${shouldIncrement}`,
+      color: 'success',
+      id: 'slideover-success'
+    })
+
+    // Update the count
+    slideover.patch({
+      count: count.value
+    })
+    return
+  }
+
+  toast.add({
+    title: `Dismissed: ${shouldIncrement}`,
+    color: 'error',
+    id: 'slideover-dismiss'
  })
 }
 </script>
--- a/docs/app/components/content/examples/table/TableColumnFiltersExample.vue
+++ b/docs/app/components/content/examples/table/TableColumnFiltersExample.vue
@@ -100,7 +100,7 @@ const columnFilters = ref([{

 <template>
  <div class="flex flex-col flex-1 w-full">
-    <div class="flex px-4 py-3.5 border-b border-[var(--ui-border-accented)]">
+    <div class="flex px-4 py-3.5 border-b border-(--ui-border-accented)">
      <UInput
        :model-value="(table?.tableApi?.getColumn('email')?.getFilterValue() as string)"
        class="max-w-sm"
--- a/docs/app/components/content/examples/table/TableColumnSortingReusableExample.vue
+++ b/docs/app/components/content/examples/table/TableColumnSortingReusableExample.vue
@@ -130,7 +130,7 @@ function getHeader(column: Column<Payment>, label: string) {
    variant: 'ghost',
    label,
    icon: isSorted ? (isSorted === 'asc' ? 'i-lucide-arrow-up-narrow-wide' : 'i-lucide-arrow-down-wide-narrow') : 'i-lucide-arrow-up-down',
-    class: '-mx-2.5 data-[state=open]:bg-[var(--ui-bg-elevated)]'
+    class: '-mx-2.5 data-[state=open]:bg-(--ui-bg-elevated)'
  }))
 }

--- a/docs/app/components/content/examples/table/TableColumnVisibilityExample.vue
+++ b/docs/app/components/content/examples/table/TableColumnVisibilityExample.vue
@@ -100,7 +100,7 @@ const columnVisibility = ref({

 <template>
  <div class="flex flex-col flex-1 w-full">
-    <div class="flex justify-end px-4 py-3.5 border-b  border-[var(--ui-border-accented)]">
+    <div class="flex justify-end px-4 py-3.5 border-b  border-(--ui-border-accented)">
      <UDropdownMenu
        :items="table?.tableApi?.getAllColumns().filter(column => column.getCanHide()).map(column => ({
          label: upperFirst(column.id),
--- a/docs/app/components/content/examples/table/TableExample.vue
+++ b/docs/app/components/content/examples/table/TableExample.vue
@@ -263,7 +263,7 @@ function randomize() {
 </script>

 <template>
-  <div class="flex-1 divide-y divide-[var(--ui-border-accented)] w-full">
+  <div class="flex-1 divide-y divide-(--ui-border-accented) w-full">
    <div class="flex items-center gap-2 px-4 py-3.5 overflow-x-auto">
      <UInput
        :model-value="(table?.tableApi?.getColumn('email')?.getFilterValue() as string)"
@@ -310,7 +310,7 @@ function randomize() {
      </template>
    </UTable>

-    <div class="px-4 py-3.5 text-sm text-[var(--ui-text-muted)]">
+    <div class="px-4 py-3.5 text-sm text-(--ui-text-muted)">
      {{ table?.tableApi?.getFilteredSelectedRowModel().rows.length || 0 }} of
      {{ table?.tableApi?.getFilteredRowModel().rows.length || 0 }} row(s) selected.
    </div>
--- a/docs/app/components/content/examples/table/TableFetchExample.vue
+++ b/docs/app/components/content/examples/table/TableFetchExample.vue
@@ -35,7 +35,7 @@ const columns: TableColumn<User>[] = [{
        size: 'lg'
      }),
      h('div', undefined, [
-        h('p', { class: 'font-medium text-[var(--ui-text-highlighted)]' }, row.original.name),
+        h('p', { class: 'font-medium text-(--ui-text-highlighted)' }, row.original.name),
        h('p', { class: '' }, `@${row.original.username}`)
      ])
    ])
--- a/docs/app/components/content/examples/table/TableGlobalFilterExample.vue
+++ b/docs/app/components/content/examples/table/TableGlobalFilterExample.vue
@@ -90,14 +90,12 @@ const columns: TableColumn<Payment>[] = [{
  }
 }]

-const table = useTemplateRef('table')
-
 const globalFilter = ref('45')
 </script>

 <template>
  <div class="flex flex-col flex-1 w-full">
-    <div class="flex px-4 py-3.5 border-b border-[var(--ui-border-accented)]">
+    <div class="flex px-4 py-3.5 border-b border-(--ui-border-accented)">
      <UInput
        v-model="globalFilter"
        class="max-w-sm"
--- a/docs/app/components/content/examples/table/TablePaginationExample.vue
+++ b/docs/app/components/content/examples/table/TablePaginationExample.vue
@@ -0,0 +1,174 @@
+<script setup lang="ts">
+import { getPaginationRowModel } from '@tanstack/vue-table'
+import type { TableColumn } from '@nuxt/ui'
+
+const table = useTemplateRef('table')
+
+type Payment = {
+  id: string
+  date: string
+  email: string
+  amount: number
+}
+const data = ref<Payment[]>([{
+  id: '4600',
+  date: '2024-03-11T15:30:00',
+  email: 'james.anderson@example.com',
+  amount: 594
+}, {
+  id: '4599',
+  date: '2024-03-11T10:10:00',
+  email: 'mia.white@example.com',
+  amount: 276
+}, {
+  id: '4598',
+  date: '2024-03-11T08:50:00',
+  email: 'william.brown@example.com',
+  amount: 315
+}, {
+  id: '4597',
+  date: '2024-03-10T19:45:00',
+  email: 'emma.davis@example.com',
+  amount: 529
+}, {
+  id: '4596',
+  date: '2024-03-10T15:55:00',
+  email: 'ethan.harris@example.com',
+  amount: 639
+}, {
+  id: '4595',
+  date: '2024-03-10T13:20:00',
+  email: 'sophia.miller@example.com',
+  amount: 428
+}, {
+  id: '4594',
+  date: '2024-03-10T11:05:00',
+  email: 'noah.wilson@example.com',
+  amount: 673
+}, {
+  id: '4593',
+  date: '2024-03-09T22:15:00',
+  email: 'olivia.jones@example.com',
+  amount: 382
+}, {
+  id: '4592',
+  date: '2024-03-09T20:30:00',
+  email: 'liam.taylor@example.com',
+  amount: 547
+}, {
+  id: '4591',
+  date: '2024-03-09T18:45:00',
+  email: 'ava.thomas@example.com',
+  amount: 291
+}, {
+  id: '4590',
+  date: '2024-03-09T16:20:00',
+  email: 'lucas.martin@example.com',
+  amount: 624
+}, {
+  id: '4589',
+  date: '2024-03-09T14:10:00',
+  email: 'isabella.clark@example.com',
+  amount: 438
+}, {
+  id: '4588',
+  date: '2024-03-09T12:05:00',
+  email: 'mason.rodriguez@example.com',
+  amount: 583
+}, {
+  id: '4587',
+  date: '2024-03-09T10:30:00',
+  email: 'sophia.lee@example.com',
+  amount: 347
+}, {
+  id: '4586',
+  date: '2024-03-09T08:15:00',
+  email: 'ethan.walker@example.com',
+  amount: 692
+}, {
+  id: '4585',
+  date: '2024-03-08T23:40:00',
+  email: 'amelia.hall@example.com',
+  amount: 419
+}, {
+  id: '4584',
+  date: '2024-03-08T21:25:00',
+  email: 'oliver.young@example.com',
+  amount: 563
+}, {
+  id: '4583',
+  date: '2024-03-08T19:50:00',
+  email: 'aria.king@example.com',
+  amount: 328
+}, {
+  id: '4582',
+  date: '2024-03-08T17:35:00',
+  email: 'henry.wright@example.com',
+  amount: 647
+}, {
+  id: '4581',
+  date: '2024-03-08T15:20:00',
+  email: 'luna.lopez@example.com',
+  amount: 482
+}])
+const columns: TableColumn<Payment>[] = [{
+  accessorKey: 'id',
+  header: '#',
+  cell: ({ row }) => `#${row.getValue('id')}`
+}, {
+  accessorKey: 'date',
+  header: 'Date',
+  cell: ({ row }) => {
+    return new Date(row.getValue('date')).toLocaleString('en-US', {
+      day: 'numeric',
+      month: 'short',
+      hour: '2-digit',
+      minute: '2-digit',
+      hour12: false
+    })
+  }
+}, {
+  accessorKey: 'email',
+  header: 'Email'
+}, {
+  accessorKey: 'amount',
+  header: () => h('div', { class: 'text-right' }, 'Amount'),
+  cell: ({ row }) => {
+    const amount = Number.parseFloat(row.getValue('amount'))
+    const formatted = new Intl.NumberFormat('en-US', {
+      style: 'currency',
+      currency: 'EUR'
+    }).format(amount)
+    return h('div', { class: 'text-right font-medium' }, formatted)
+  }
+}]
+
+const pagination = ref({
+  pageIndex: 0,
+  pageSize: 5
+})
+</script>
+
+<template>
+  <div class="w-full space-y-4 pb-4">
+    <UTable
+      ref="table"
+      v-model:pagination="pagination"
+      :data="data"
+      :columns="columns"
+      :pagination-options="{
+        getPaginationRowModel: getPaginationRowModel()
+      }"
+      class="flex-1"
+    />
+
+    <div class="flex justify-center border-t border-(--ui-border) pt-4">
+      <UPagination
+        :default-page="(table?.tableApi?.getState().pagination.pageIndex || 0) + 1"
+        :items-per-page="table?.tableApi?.getState().pagination.pageSize"
+        :total="table?.tableApi?.getFilteredRowModel().rows.length"
+        @update:page="(p) => table?.tableApi?.setPageIndex(p - 1)"
+      />
+    </div>
+  </div>
+</template>
--- a/docs/app/components/content/examples/table/TableRowExpandableExample.vue
+++ b/docs/app/components/content/examples/table/TableRowExpandableExample.vue
@@ -111,7 +111,7 @@ const expanded = ref({ 1: true })
    v-model:expanded="expanded"
    :data="data"
    :columns="columns"
-    :ui="{ tr: 'data-[expanded=true]:bg-[var(--ui-bg-elevated)]/50' }"
+    :ui="{ tr: 'data-[expanded=true]:bg-(--ui-bg-elevated)/50' }"
    class="flex-1"
  >
    <template #expanded="{ row }">
--- a/docs/app/components/content/examples/table/TableRowSelectionEventExample.vue
+++ b/docs/app/components/content/examples/table/TableRowSelectionEventExample.vue
@@ -0,0 +1,131 @@
+<script setup lang="ts">
+import { h, resolveComponent } from 'vue'
+import type { TableColumn, TableRow } from '@nuxt/ui'
+
+const UBadge = resolveComponent('UBadge')
+const UCheckbox = resolveComponent('UCheckbox')
+
+type Payment = {
+  id: string
+  date: string
+  status: 'paid' | 'failed' | 'refunded'
+  email: string
+  amount: number
+}
+
+const data = ref<Payment[]>([{
+  id: '4600',
+  date: '2024-03-11T15:30:00',
+  status: 'paid',
+  email: 'james.anderson@example.com',
+  amount: 594
+}, {
+  id: '4599',
+  date: '2024-03-11T10:10:00',
+  status: 'failed',
+  email: 'mia.white@example.com',
+  amount: 276
+}, {
+  id: '4598',
+  date: '2024-03-11T08:50:00',
+  status: 'refunded',
+  email: 'william.brown@example.com',
+  amount: 315
+}, {
+  id: '4597',
+  date: '2024-03-10T19:45:00',
+  status: 'paid',
+  email: 'emma.davis@example.com',
+  amount: 529
+}, {
+  id: '4596',
+  date: '2024-03-10T15:55:00',
+  status: 'paid',
+  email: 'ethan.harris@example.com',
+  amount: 639
+}])
+
+const columns: TableColumn<Payment>[] = [{
+  id: 'select',
+  header: ({ table }) => h(UCheckbox, {
+    'modelValue': table.getIsSomePageRowsSelected() ? 'indeterminate' : table.getIsAllPageRowsSelected(),
+    'onUpdate:modelValue': (value: boolean | 'indeterminate') => table.toggleAllPageRowsSelected(!!value),
+    'ariaLabel': 'Select all'
+  }),
+  cell: ({ row }) => h(UCheckbox, {
+    'modelValue': row.getIsSelected(),
+    'onUpdate:modelValue': (value: boolean | 'indeterminate') => row.toggleSelected(!!value),
+    'ariaLabel': 'Select row'
+  })
+}, {
+  accessorKey: 'date',
+  header: 'Date',
+  cell: ({ row }) => {
+    return new Date(row.getValue('date')).toLocaleString('en-US', {
+      day: 'numeric',
+      month: 'short',
+      hour: '2-digit',
+      minute: '2-digit',
+      hour12: false
+    })
+  }
+}, {
+  accessorKey: 'status',
+  header: 'Status',
+  cell: ({ row }) => {
+    const color = ({
+      paid: 'success' as const,
+      failed: 'error' as const,
+      refunded: 'neutral' as const
+    })[row.getValue('status') as string]
+
+    return h(UBadge, { class: 'capitalize', variant: 'subtle', color }, () => row.getValue('status'))
+  }
+}, {
+  accessorKey: 'email',
+  header: 'Email'
+}, {
+  accessorKey: 'amount',
+  header: () => h('div', { class: 'text-right' }, 'Amount'),
+  cell: ({ row }) => {
+    const amount = Number.parseFloat(row.getValue('amount'))
+
+    const formatted = new Intl.NumberFormat('en-US', {
+      style: 'currency',
+      currency: 'EUR'
+    }).format(amount)
+
+    return h('div', { class: 'text-right font-medium' }, formatted)
+  }
+}]
+
+const table = useTemplateRef('table')
+
+const rowSelection = ref<Record<string, boolean>>({ })
+
+function onSelect(row: TableRow<Payment>, e?: Event) {
+  /* If you decide to also select the column you can do this  */
+  row.toggleSelected(!row.getIsSelected())
+
+  console.log(e)
+}
+</script>
+
+<template>
+  <div class=" flex w-full flex-1 gap-1">
+    <div class="flex-1">
+      <UTable
+        ref="table"
+        v-model:row-selection="rowSelection"
+        :data="data"
+        :columns="columns"
+        @select="onSelect"
+      />
+
+      <div class="px-4 py-3.5 border-t border-[var(--ui-border-accented)] text-sm text-[var(--ui-text-muted)]">
+        {{ table?.tableApi?.getFilteredSelectedRowModel().rows.length || 0 }} of
+        {{ table?.tableApi?.getFilteredRowModel().rows.length || 0 }} row(s) selected.
+      </div>
+    </div>
+  </div>
+</template>
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<svg fill="none" xmlns="http://www.w3.org/2000/svg" class="w-auto h-6 shrink-0" viewBox="840 60 180 140"><path d="M958 60.0001H938C933.524 60.0001 929.926 59.9395 927 63C924.074 65.8905 925 67.5792 925 72V141C925 151.372 923.648 156.899 919 162C914.352 166.931 908.468 169 899 169C889.705 169 882.648 166.931 878 162C873.352 156.899 873 151.372 873 141V72.0001C873 67.5793 872.926 65.8906 870 63.0001C867.074 59.9396 863.476 60.0001 859 60.0001H840V141C840 159.023 845.016 173.458 855 184C865.156 194.542 879.893 200 899 200C918.107 200 932.844 194.542 943 184C953.156 173.458 958 159.023 958 141V60.0001Z" fill="currentColor"></path><path fill-rule="evenodd" clip-rule="evenodd" d="M1000 60.0233L1020 60V77L1020 128V156.007L1020 181L1020 189.004C1020 192.938 1019.98 194.429 1017 197.001C1014.02 199.725 1009.56 200 1005 200H986.001V181.006L986 130.012V70.0215C986 66.1576 986.016 64.5494 989 62.023C991.819 59.6358 995.437 60.0233 1000 60.0233Z" fill="currentColor"></path> <style> path { fill: #00000080; } @media (prefers-color-scheme: dark) { path { fill: #ffffff80; } } </style> </svg>