diff --git a/README.md b/README.md
index 4aa37e6..56aa917 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,11 @@
 # Vuetify Vue Lazy Hydration with Nuxt
 
-This repository includes:
-- using [Vuetify unimport](https://github.com/vuetifyjs/vuetify/pull/21129) PR: prefix Vuetify directives and components
-- Nuxt Vue Lazy Hydration patching Nuxt hydration module to include slots: check [fix(nuxt): pass slots through to lazy hydrated components](https://github.com/nuxt/nuxt/pull/31649/files) from Daniel Roe, it should be fixed in Nuxt 3.17.0.
\ No newline at end of file
+This repository includes (`main` branch):
+- using [Vuetify unimport](https://github.com/vuetifyjs/vuetify/pull/21129) PR: prefix Vuetify directives, components and composables.
+- Nuxt Vue Lazy Hydration patching Nuxt hydration module to include slots: check [fix(nuxt): pass slots through to lazy hydrated components](https://github.com/nuxt/nuxt/pull/31649/files) from Daniel Roe, it should be fixed in Nuxt 3.17.0.
+
+The `use-unplugin-vuetify` branch includes:
+- using [unplugin-vuetify](https://github.com/vuetifyjs/vuetify-loader/pull/347) PR: prefix Vuetify directives, components and composables.
+- Nuxt Vue Lazy Hydration patching Nuxt hydration module to include slots: check [fix(nuxt): pass slots through to lazy hydrated components](https://github.com/nuxt/nuxt/pull/31649/files) from Daniel Roe, it should be fixed in Nuxt 3.17.0.
+
+When switching between `main` and `use-unplugin-vuetify` branches, run `pnpm install` to update the dependencies.
\ No newline at end of file
diff --git a/app/components/AppFooter.vue b/app/components/AppFooter.vue
index b1cb0ac..13b8e9e 100644
--- a/app/components/AppFooter.vue
+++ b/app/components/AppFooter.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+  const year = useState('footer:date', () => new Date().getFullYear())
   const items = shallowRef([
     {
       title: 'Vuetify Documentation',
@@ -57,7 +58,7 @@
       class="text-caption text-disabled"
       style="position: absolute; right: 16px;"
     >
-      &copy; 2016-{{ (new Date()).getFullYear() }} <span class="d-none d-sm-inline-block">Vuetify, LLC</span>
+      &copy; 2016-{{ year }} <span class="d-none d-sm-inline-block">Vuetify, LLC</span>
       —
       <NuxtLink
         class="text-decoration-none on-surface"
diff --git a/app/pages/calendar.vue b/app/pages/calendar.vue
index ea85e50..b871ceb 100644
--- a/app/pages/calendar.vue
+++ b/app/pages/calendar.vue
@@ -70,7 +70,7 @@ const weekdays = ref([
             label="View Mode"
             variant="outlined"
             hide-details
-        ></vuetify-select>
+        />
         <vuetify-select
             v-model="weekday"
             :items="weekdays"
@@ -79,7 +79,7 @@ const weekdays = ref([
             label="weekdays"
             variant="outlined"
             hide-details
-        ></vuetify-select>
+        />
       </vuetify-sheet>
       <vuetify-sheet>
         <vuetify-calendar
@@ -88,7 +88,7 @@ const weekdays = ref([
             :events="events"
             :view-mode="type"
             :weekdays="weekday"
-        ></vuetify-calendar>
+        />
       </vuetify-sheet>
     </div>
 
@@ -101,7 +101,7 @@ const weekdays = ref([
           :weekdays="weekday"
           hydrate-on-visible
           @hydrated="onHydrated"
-      ></lazy-vuetify-calendar>
+      />
     </vuetify-sheet>
   </div>
 </template>
diff --git a/modules/auto-import/index.ts b/modules/auto-import/index.ts
index 0b0a93a..5626018 100644
--- a/modules/auto-import/index.ts
+++ b/modules/auto-import/index.ts
@@ -3,20 +3,26 @@ import type {
     VuetifyComponentsOptions,
     VuetifyComposablesOptions,
     VuetifyDirectivesOptions,
-} from "vuetify/unimport-presets";
+} from "unplugin-vuetify/unimport-presets";
+import type {
+    VuetifyStylesOptions,
+} from "unplugin-vuetify";
+import {
+    VuetifyStylesVitePlugin,
+} from "unplugin-vuetify";
 import {
     VuetifyComposables,
     VuetifyDirectives,
     buildAddonsOptions,
     prepareVuetifyComponents,
-} from "vuetify/unimport-presets";
+} from "unplugin-vuetify/unimport-presets";
 import type {Addon, AddonsOptions} from "unimport";
+import { prepareTransformAssetUrls } from 'unplugin-vuetify/utils'
 import type {AssetURLOptions, AssetURLTagConfig} from "@vue/compiler-sfc";
 import type {ViteConfig} from "@nuxt/schema";
 import defu from 'defu'
-import { transformAssetUrls as vuetifyTransformAssetUrls } from 'vite-plugin-vuetify'
 
-export interface ModuleOptions {
+export interface ModuleOptions extends VuetifyStylesOptions {
     composables?: VuetifyComposablesOptions
     directives?: VuetifyDirectivesOptions
     components?: VuetifyComponentsOptions
@@ -33,7 +39,13 @@ export default defineNuxtModule<ModuleOptions>({
     },
     async setup(options, nuxt) {
 
-        const { directives, composables, components: vuetifyComponents } = options.moduleOptions
+        const {
+            directives,
+            composables,
+            components: vuetifyComponents,
+            mode,
+            registerApi,
+        } = options
 
         nuxt.hook('imports:sources', (sources) => {
             sources.push(
@@ -64,7 +76,7 @@ export default defineNuxtModule<ModuleOptions>({
         })
         // hack vuetify nuxt module removing the vuetify vite plugin
         nuxt.hook('vite:extendConfig', (viteInlineConfig) => {
-            if (vuetifyComponents.prefix) {
+            if (vuetifyComponents?.prefix) {
                 const transformAssetUrls = createTransformAssetUrls(
                     viteInlineConfig,
                 )
@@ -83,6 +95,9 @@ export default defineNuxtModule<ModuleOptions>({
                     }
                 }
             })
+            viteInlineConfig.plugins.push(VuetifyStylesVitePlugin({
+                mode, registerApi,
+            }))
         })
     }
 })
@@ -102,10 +117,7 @@ export function createTransformAssetUrls(viteInlineConfig: ViteConfig) {
         existingTransformAssetUrls = (existingTransformAssetUrls.tags ?? {}) as Record<string, string[]>
     }
 
-    const prefixed = Object.entries(vuetifyTransformAssetUrls).reduce((acc, [key, value]) => {
-        acc[key.replace(/^V/, 'Vuetify')] = value
-        return acc
-    }, {} as Record<string, string[]>)
+    const prefixed = prepareTransformAssetUrls(true)
 
     const transformAssetUrls = normalizeTransformAssetUrls(
         defu(existingTransformAssetUrls, prefixed)
@@ -148,7 +160,7 @@ function normalizeTransformAssetUrls(transformAssetUrls: Record<string, string[]
     let kebab: string
     let pascal: string
     for (const name of names) {
-        transformAssetUrls[name] = normalizeTransformAssetUrlsAttrs(transformAssetUrls[name])
+        transformAssetUrls[name] = normalizeTransformAssetUrlsAttrs(transformAssetUrls[name]!)
         kebab = toKebabCase(name)
         pascal = pascalize(name)
         if (!names.has(kebab))
diff --git a/nuxt.config.ts b/nuxt.config.ts
index dd6d719..762ea4d 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -29,11 +29,12 @@ export default defineNuxtConfig({
   modules: ['@nuxt/fonts', 'vuetify-nuxt-module', '@nuxt/eslint'],
 
   vuetifyAutoImport: {
-    moduleOptions: {
-      composables: { prefix: true },
-      components: { prefix: true },
-      directives: { prefix: true },
-    }
+    composables: { prefix: true },
+    components: { prefix: true },
+    directives: { prefix: true },
+    mode: {
+      configFile: 'assets/settings.scss',
+    },
   },
   vuetify: {
     moduleOptions: {
@@ -51,9 +52,11 @@ export default defineNuxtConfig({
 
       // /* If customizing sass global variables ($utilities, $reset, $color-pack, $body-font-family, etc) */
       // disableVuetifyStyles: true,
-      styles: {
+      styles: true,
+      // disable vuetify styles from the module
+      /*styles: {
         configFile: 'assets/settings.scss',
-      },
+      },*/
     },
   },
 })
\ No newline at end of file
diff --git a/package.json b/package.json
index 786d876..1a8ba6d 100644
--- a/package.json
+++ b/package.json
@@ -18,14 +18,16 @@
     "eslint": "^9.0.0",
     "nuxt": "^3.16.2",
     "vue": "latest",
-    "vuetify": "file:vuetify-3.8.0.tgz"
+    "vuetify": "^3.8.1"
   },
   "devDependencies": {
     "@mdi/font": "^7.4.47",
     "@nuxt/fonts": "^0.11.1",
+    "@nuxt/kit": "^3.16.2",
     "sass-embedded": "^1.86.3",
     "typescript": "^5.6.3",
     "unimport": "^5.0.0",
+    "unplugin-vuetify": "file:unplugin-vuetify-v1.0.0.tgz",
     "vite-plugin-vuetify": "^2.1.1",
     "vue-tsc": "^2.1.6",
     "vuetify-nuxt-module": "^0.18.6"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6d6c739..24d2482 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,8 +26,8 @@ importers:
         specifier: latest
         version: 3.5.13(typescript@5.8.3)
       vuetify:
-        specifier: file:vuetify-3.8.0.tgz
-        version: file:vuetify-3.8.0.tgz(typescript@5.8.3)(vite-plugin-vuetify@2.1.1)(vue@3.5.13(typescript@5.8.3))
+        specifier: ^3.8.1
+        version: 3.8.1(typescript@5.8.3)(vite-plugin-vuetify@2.1.1)(vue@3.5.13(typescript@5.8.3))
     devDependencies:
       '@mdi/font':
         specifier: ^7.4.47
@@ -35,6 +35,9 @@ importers:
       '@nuxt/fonts':
         specifier: ^0.11.1
         version: 0.11.1(db0@0.3.1)(ioredis@5.6.0)(magicast@0.3.5)(vite@6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1))
+      '@nuxt/kit':
+        specifier: ^3.16.2
+        version: 3.16.2(magicast@0.3.5)
       sass-embedded:
         specifier: ^1.86.3
         version: 1.86.3
@@ -44,9 +47,12 @@ importers:
       unimport:
         specifier: ^5.0.0
         version: 5.0.0
+      unplugin-vuetify:
+        specifier: file:unplugin-vuetify-v1.0.0.tgz
+        version: file:unplugin-vuetify-v1.0.0.tgz(unimport@5.0.0)(vite@6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1))(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.1)
       vite-plugin-vuetify:
         specifier: ^2.1.1
-        version: 2.1.1(vite@6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1))(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.0)
+        version: 2.1.1(vite@6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1))(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.1)
       vue-tsc:
         specifier: ^2.1.6
         version: 2.2.8(typescript@5.8.3)
@@ -3722,6 +3728,24 @@ packages:
       vue-router:
         optional: true
 
+  unplugin-vuetify@file:unplugin-vuetify-v1.0.0.tgz:
+    resolution: {integrity: sha512-rRMPv2eWQcoZFkYrisrEZ2EH76hjRzomlqNxQRSCbpe0B4JhwrMimWCofygmesjUJVNTX49whbq9+hEXB62SHg==, tarball: file:unplugin-vuetify-v1.0.0.tgz}
+    version: 1.0.0
+    engines: {node: ^18.0.0 || >=20.0.0}
+    peerDependencies:
+      unimport: ^4.0.0 || ^5.0.0
+      unplugin-vue-components: ^28.4.1
+      vite: ^5.0.0 || ^6.0.0
+      vue: ^3.0.0
+      vuetify: ^3.0.0
+    peerDependenciesMeta:
+      unimport:
+        optional: true
+      unplugin-vue-components:
+        optional: true
+      vite:
+        optional: true
+
   unplugin@1.16.1:
     resolution: {integrity: sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==}
     engines: {node: '>=14.0.0'}
@@ -3983,25 +4007,8 @@ packages:
   vuetify-nuxt-module@0.18.6:
     resolution: {integrity: sha512-IEoV2XlAWkAVkUWnNx2dkFmScgZLZ58AxFnmXYS7ECQJvmskLODc/BUhonK6Ueqzu+SQhYkHjmaOi5ZukLl4PQ==}
 
-  vuetify@3.8.0:
-    resolution: {integrity: sha512-ROC0Xq2G/25ZyUpQMhaynMyXZBJY1WbOGlqOB810yubp8hfY8RlrOw+mzXJonOq6jylCY32muQ9xiJF1JPTLVA==}
-    engines: {node: ^12.20 || >=14.13}
-    peerDependencies:
-      typescript: '>=4.7'
-      vite-plugin-vuetify: '>=2.1.0'
-      vue: ^3.5.0
-      webpack-plugin-vuetify: '>=3.1.0'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-      vite-plugin-vuetify:
-        optional: true
-      webpack-plugin-vuetify:
-        optional: true
-
-  vuetify@file:vuetify-3.8.0.tgz:
-    resolution: {integrity: sha512-YnO2rNSR6b3Q9bdoYgpuZSl21kIBe8SPLoGPqVBXtYH9boXNRoJ4+vevRSsg0uU7t6qbKtXglLvPxvWv3S38XQ==, tarball: file:vuetify-3.8.0.tgz}
-    version: 3.8.0
+  vuetify@3.8.1:
+    resolution: {integrity: sha512-3qReKBBWIIdJJmwnFU1blVIKHDtnLfIP7kk0MwUrrfjYkWmsDpsymtDnsukkTCnlJ1WvhLr64eQFosr0RVbj9w==}
     engines: {node: ^12.20 || >=14.13}
     peerDependencies:
       typescript: '>=4.7'
@@ -5593,11 +5600,11 @@ snapshots:
 
   '@vue/shared@3.5.13': {}
 
-  '@vuetify/loader-shared@2.1.0(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.0)':
+  '@vuetify/loader-shared@2.1.0(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.1)':
     dependencies:
       upath: 2.0.1
       vue: 3.5.13(typescript@5.8.3)
-      vuetify: file:vuetify-3.8.0.tgz(typescript@5.8.3)(vite-plugin-vuetify@2.1.1)(vue@3.5.13(typescript@5.8.3))
+      vuetify: 3.8.1(typescript@5.8.3)(vite-plugin-vuetify@2.1.1)(vue@3.5.13(typescript@5.8.3))
 
   abbrev@3.0.0: {}
 
@@ -8195,6 +8202,19 @@ snapshots:
     transitivePeerDependencies:
       - vue
 
+  unplugin-vuetify@file:unplugin-vuetify-v1.0.0.tgz(unimport@5.0.0)(vite@6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1))(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.1):
+    dependencies:
+      debug: 4.4.0
+      pathe: 2.0.3
+      upath: 2.0.1
+      vue: 3.5.13(typescript@5.8.3)
+      vuetify: 3.8.1(typescript@5.8.3)(vite-plugin-vuetify@2.1.1)(vue@3.5.13(typescript@5.8.3))
+    optionalDependencies:
+      unimport: 5.0.0
+      vite: 6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1)
+    transitivePeerDependencies:
+      - supports-color
+
   unplugin@1.16.1:
     dependencies:
       acorn: 8.14.1
@@ -8364,14 +8384,14 @@ snapshots:
       vite: 6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1)
       vue: 3.5.13(typescript@5.8.3)
 
-  vite-plugin-vuetify@2.1.1(vite@6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1))(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.0):
+  vite-plugin-vuetify@2.1.1(vite@6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1))(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.1):
     dependencies:
-      '@vuetify/loader-shared': 2.1.0(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.0)
+      '@vuetify/loader-shared': 2.1.0(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.1)
       debug: 4.4.0
       upath: 2.0.1
       vite: 6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1)
       vue: 3.5.13(typescript@5.8.3)
-      vuetify: file:vuetify-3.8.0.tgz(typescript@5.8.3)(vite-plugin-vuetify@2.1.1)(vue@3.5.13(typescript@5.8.3))
+      vuetify: 3.8.1(typescript@5.8.3)(vite-plugin-vuetify@2.1.1)(vue@3.5.13(typescript@5.8.3))
     transitivePeerDependencies:
       - supports-color
 
@@ -8441,8 +8461,8 @@ snapshots:
       ufo: 1.6.1
       unconfig: 0.5.5
       upath: 2.0.1
-      vite-plugin-vuetify: 2.1.1(vite@6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1))(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.0)
-      vuetify: 3.8.0(typescript@5.8.3)(vite-plugin-vuetify@2.1.1)(vue@3.5.13(typescript@5.8.3))
+      vite-plugin-vuetify: 2.1.1(vite@6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1))(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.1)
+      vuetify: 3.8.1(typescript@5.8.3)(vite-plugin-vuetify@2.1.1)(vue@3.5.13(typescript@5.8.3))
     transitivePeerDependencies:
       - magicast
       - supports-color
@@ -8451,19 +8471,12 @@ snapshots:
       - vue
       - webpack-plugin-vuetify
 
-  vuetify@3.8.0(typescript@5.8.3)(vite-plugin-vuetify@2.1.1)(vue@3.5.13(typescript@5.8.3)):
-    dependencies:
-      vue: 3.5.13(typescript@5.8.3)
-    optionalDependencies:
-      typescript: 5.8.3
-      vite-plugin-vuetify: 2.1.1(vite@6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1))(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.0)
-
-  vuetify@file:vuetify-3.8.0.tgz(typescript@5.8.3)(vite-plugin-vuetify@2.1.1)(vue@3.5.13(typescript@5.8.3)):
+  vuetify@3.8.1(typescript@5.8.3)(vite-plugin-vuetify@2.1.1)(vue@3.5.13(typescript@5.8.3)):
     dependencies:
       vue: 3.5.13(typescript@5.8.3)
     optionalDependencies:
       typescript: 5.8.3
-      vite-plugin-vuetify: 2.1.1(vite@6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1))(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.0)
+      vite-plugin-vuetify: 2.1.1(vite@6.2.6(jiti@2.4.2)(sass-embedded@1.86.3)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.1))(vue@3.5.13(typescript@5.8.3))(vuetify@3.8.1)
 
   webidl-conversions@3.0.1: {}
 
diff --git a/unplugin-vuetify-v1.0.0.tgz b/unplugin-vuetify-v1.0.0.tgz
new file mode 100644
index 0000000..7e1419f
Binary files /dev/null and b/unplugin-vuetify-v1.0.0.tgz differ