diff --git a/docs/nuxt.config.ts b/docs/nuxt.config.ts
index 7c89e591..028551ff 100644
--- a/docs/nuxt.config.ts
+++ b/docs/nuxt.config.ts
@@ -7,7 +7,7 @@ import pkg from '../package.json'
 const { resolve } = createResolver(import.meta.url)
 
 export default defineNuxtConfig({
-  extends: '@nuxt-themes/ui-kit',
+  extends: '@nuxthq/elements',
   modules: [
     '@nuxt/content',
     // '@nuxt/devtools',
@@ -48,7 +48,7 @@ export default defineNuxtConfig({
   },
   componentMeta: {
     globalsOnly: true,
-    exclude: [resolve('./components'), resolve('@nuxt-themes/ui-kit/components')],
+    exclude: [resolve('./components'), resolve('@nuxthq/elements/components')],
     metaFields: {
       props: true,
       slots: false,
diff --git a/docs/package.json b/docs/package.json
index 6c5aacc3..85f8f1e5 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -7,10 +7,10 @@
   "devDependencies": {
     "@iconify-json/heroicons": "latest",
     "@iconify-json/simple-icons": "latest",
-    "@nuxt-themes/ui-kit": "npm:@nuxt-themes/ui-kit-edge@0.0.1-28191382.fd52259",
     "@nuxt/content": "^2.7.2",
     "@nuxt/devtools": "^0.6.7",
     "@nuxt/eslint-config": "^0.1.1",
+    "@nuxthq/elements": "npm:@nuxthq/elements-edge@0.0.1-28196105.f195471",
     "@nuxthq/studio": "^0.13.4",
     "@nuxtjs/fontaine": "^0.4.1",
     "@nuxtjs/google-fonts": "^3.0.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b8d8e344..018ad1fc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -104,13 +104,10 @@ importers:
     devDependencies:
       '@iconify-json/heroicons':
         specifier: latest
-        version: 1.1.11
+        version: 1.1.12
       '@iconify-json/simple-icons':
         specifier: latest
         version: 1.1.63
-      '@nuxt-themes/ui-kit':
-        specifier: npm:@nuxt-themes/ui-kit-edge@0.0.1-28191382.fd52259
-        version: /@nuxt-themes/ui-kit-edge@0.0.1-28191382.fd52259(@nuxt/content@2.7.2)(@nuxthq/ui@)(vue@3.3.4)
       '@nuxt/content':
         specifier: ^2.7.2
         version: 2.7.2(rollup@3.26.2)
@@ -120,6 +117,9 @@ importers:
       '@nuxt/eslint-config':
         specifier: ^0.1.1
         version: 0.1.1(eslint@8.45.0)
+      '@nuxthq/elements':
+        specifier: npm:@nuxthq/elements-edge@0.0.1-28196105.f195471
+        version: /@nuxthq/elements-edge@0.0.1-28196105.f195471(@nuxt/content@2.7.2)(@nuxthq/ui@)(vue@3.3.4)
       '@nuxthq/studio':
         specifier: ^0.13.4
         version: 0.13.4(rollup@3.26.2)
@@ -1257,6 +1257,13 @@ packages:
     resolution: {integrity: sha512-Autw98FvUTmBCgb4CuKZ7iQQ2633YBCmcCbAbVNU9hAo6vms9uVcbtrAQt/qlB+qzNi52PV3DWDiRtJgmPeZIw==}
     dependencies:
       '@iconify/types': 2.0.0
+    dev: false
+
+  /@iconify-json/heroicons@1.1.12:
+    resolution: {integrity: sha512-9tsn/xUU+HX56OngEDRTej4LzVm2qcMVLvEJ+q+1ZJBO4sjMDxycmbHq16HGl1LOeVG21fq4jNZHslVveVCwSQ==}
+    dependencies:
+      '@iconify/types': 2.0.0
+    dev: true
 
   /@iconify-json/simple-icons@1.1.63:
     resolution: {integrity: sha512-aIbo99YLjwZ53XxU9HC+CO9Br9H0vRuGmq8b0TOaGA1g7HX2ZlpmzPvWAte5xbmbohfRzAMX/OVsFhOT+CL+Aw==}
@@ -1447,22 +1454,6 @@ packages:
       - supports-color
     dev: true
 
-  /@nuxt-themes/ui-kit-edge@0.0.1-28191382.fd52259(@nuxt/content@2.7.2)(@nuxthq/ui@)(vue@3.3.4):
-    resolution: {integrity: sha512-J+ELuYVfqQIyKr4hfgqqzZJieIFxN379wM8rfJ3QA++cc929Cw4g0P/0rmd6H3dXhtyCR1k5Rfb3L9DRczWoug==}
-    peerDependencies:
-      '@nuxt/content': ^2.7.2
-      '@nuxthq/ui': npm:@nuxthq/ui-edge@latest
-    dependencies:
-      '@nuxt/content': 2.7.2(rollup@3.26.2)
-      '@nuxthq/ui': 'link:'
-      '@vueuse/core': 10.3.0(vue@3.3.4)
-      lodash-es: 4.17.21
-      tailwind-merge: 1.14.0
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - vue
-    dev: true
-
   /@nuxt/content@2.7.2(rollup@3.26.2):
     resolution: {integrity: sha512-fP0nrnyjtFbluKltKUtC7jSMFc1xAH+bwweZyLwXb3gkIap2EHlVL+e9ptGt39+4HIkRkLgME7TNr/fUO+CHug==}
     dependencies:
@@ -1853,6 +1844,22 @@ packages:
       - vue-tsc
     dev: true
 
+  /@nuxthq/elements-edge@0.0.1-28196105.f195471(@nuxt/content@2.7.2)(@nuxthq/ui@)(vue@3.3.4):
+    resolution: {integrity: sha512-+kiKZur5IKWMr15R0bWlq5m0OZqf+Y2hY5x/gpNdonAgwLCTdKi6Bvhlru+t/tPwrP6H5B5ubykpuulbEgphOA==}
+    peerDependencies:
+      '@nuxt/content': ^2.7.2
+      '@nuxthq/ui': npm:@nuxthq/ui-edge@latest
+    dependencies:
+      '@nuxt/content': 2.7.2(rollup@3.26.2)
+      '@nuxthq/ui': 'link:'
+      '@vueuse/core': 10.3.0(vue@3.3.4)
+      lodash-es: 4.17.21
+      tailwind-merge: 1.14.0
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
+    dev: true
+
   /@nuxthq/studio@0.13.4(rollup@3.26.2):
     resolution: {integrity: sha512-+Jn0iN6TvRTTtTBX4qXWhtOMLL4rsyUIX3/9HM+eBAwr5/cELLw3RuI1tgp942QteTi7PvI5Av4nEi6BlLBr+A==}
     dependencies: