diff --git a/apps/volt/app.vue b/apps/volt/app.vue
index a43a8a86d..3243af37d 100644
--- a/apps/volt/app.vue
+++ b/apps/volt/app.vue
@@ -4,32 +4,33 @@
     </NuxtLayout>
 </template>
 
-<script>
+<script setup>
 import EventBus from '@/layouts/AppEventBus';
+import { onBeforeUnmount, onMounted } from 'vue';
 
-export default {
-    mounted() {
-        EventBus.on('dark-mode-toggle', this.darkModeToggleListener);
-    },
-    beforeUnmount() {
-        EventBus.off('dark-mode-toggle', this.darkModeToggleListener);
-    },
-    methods: {
-        darkModeToggleListener(event) {
-            if (!document.startViewTransition) {
-                this.toggleDarkMode(event);
+const { layoutState } = useLayout();
 
-                return;
-            }
+const toggleDarkMode = () => {
+    document.documentElement.classList.toggle('p-dark');
+    layoutState.darkTheme = !layoutState.darkTheme;
 
-            document.startViewTransition(() => this.toggleDarkMode(event));
-        },
-        toggleDarkMode() {
-            document.documentElement.classList.toggle('p-dark');
-            this.$appState.darkTheme = !this.$appState.darkTheme;
-
-            EventBus.emit('dark-mode-toggle-complete');
-        }
-    }
+    EventBus.emit('dark-mode-toggle-complete');
 };
+
+const darkModeToggleListener = (event) => {
+    if (!document.startViewTransition) {
+        toggleDarkMode(event);
+        return;
+    }
+
+    document.startViewTransition(() => toggleDarkMode(event));
+};
+
+onMounted(() => {
+    EventBus.on('dark-mode-toggle', darkModeToggleListener);
+});
+
+onBeforeUnmount(() => {
+    EventBus.off('dark-mode-toggle', darkModeToggleListener);
+});
 </script>
diff --git a/apps/volt/components/app/AppConfigurator.vue b/apps/volt/components/app/AppConfigurator.vue
index 8e14011dc..679c7b8b2 100644
--- a/apps/volt/components/app/AppConfigurator.vue
+++ b/apps/volt/components/app/AppConfigurator.vue
@@ -22,7 +22,7 @@
                         :key="surface.name"
                         type="button"
                         @click="updateColors('surface', surface)"
-                        :class="{ 'active-color': selectedSurfaceColor ? selectedSurfaceColor === surface.name : $appState.darkTheme ? surface.name === 'zinc' : surface.name === 'slate' }"
+                        :class="{ 'active-color': selectedSurfaceColor ? selectedSurfaceColor === surface.name : layoutState.darkTheme ? surface.name === 'zinc' : surface.name === 'slate' }"
                         :style="{ backgroundColor: `${surface.palette[500]}` }"
                     ></button>
                 </div>
@@ -31,106 +31,99 @@
     </div>
 </template>
 
-<script>
+<script setup>
 import EventBus from '@/layouts/AppEventBus';
+import { computed, ref } from 'vue';
 
-export default {
-    data() {
-        return {
-            primaryColors: [
-                { name: 'noir', palette: {} },
-                { name: 'emerald', palette: { 50: '#ecfdf5', 100: '#d1fae5', 200: '#a7f3d0', 300: '#6ee7b7', 400: '#34d399', 500: '#10b981', 600: '#059669', 700: '#047857', 800: '#065f46', 900: '#064e3b', 950: '#022c22' } },
-                { name: 'green', palette: { 50: '#f0fdf4', 100: '#dcfce7', 200: '#bbf7d0', 300: '#86efac', 400: '#4ade80', 500: '#22c55e', 600: '#16a34a', 700: '#15803d', 800: '#166534', 900: '#14532d', 950: '#052e16' } },
-                { name: 'lime', palette: { 50: '#f7fee7', 100: '#ecfccb', 200: '#d9f99d', 300: '#bef264', 400: '#a3e635', 500: '#84cc16', 600: '#65a30d', 700: '#4d7c0f', 800: '#3f6212', 900: '#365314', 950: '#1a2e05' } },
-                { name: 'orange', palette: { 50: '#fff7ed', 100: '#ffedd5', 200: '#fed7aa', 300: '#fdba74', 400: '#fb923c', 500: '#f97316', 600: '#ea580c', 700: '#c2410c', 800: '#9a3412', 900: '#7c2d12', 950: '#431407' } },
-                { name: 'amber', palette: { 50: '#fffbeb', 100: '#fef3c7', 200: '#fde68a', 300: '#fcd34d', 400: '#fbbf24', 500: '#f59e0b', 600: '#d97706', 700: '#b45309', 800: '#92400e', 900: '#78350f', 950: '#451a03' } },
-                { name: 'yellow', palette: { 50: '#fefce8', 100: '#fef9c3', 200: '#fef08a', 300: '#fde047', 400: '#facc15', 500: '#eab308', 600: '#ca8a04', 700: '#a16207', 800: '#854d0e', 900: '#713f12', 950: '#422006' } },
-                { name: 'teal', palette: { 50: '#f0fdfa', 100: '#ccfbf1', 200: '#99f6e4', 300: '#5eead4', 400: '#2dd4bf', 500: '#14b8a6', 600: '#0d9488', 700: '#0f766e', 800: '#115e59', 900: '#134e4a', 950: '#042f2e' } },
-                { name: 'cyan', palette: { 50: '#ecfeff', 100: '#cffafe', 200: '#a5f3fc', 300: '#67e8f9', 400: '#22d3ee', 500: '#06b6d4', 600: '#0891b2', 700: '#0e7490', 800: '#155e75', 900: '#164e63', 950: '#083344' } },
-                { name: 'sky', palette: { 50: '#f0f9ff', 100: '#e0f2fe', 200: '#bae6fd', 300: '#7dd3fc', 400: '#38bdf8', 500: '#0ea5e9', 600: '#0284c7', 700: '#0369a1', 800: '#075985', 900: '#0c4a6e', 950: '#082f49' } },
-                { name: 'blue', palette: { 50: '#eff6ff', 100: '#dbeafe', 200: '#bfdbfe', 300: '#93c5fd', 400: '#60a5fa', 500: '#3b82f6', 600: '#2563eb', 700: '#1d4ed8', 800: '#1e40af', 900: '#1e3a8a', 950: '#172554' } },
-                { name: 'indigo', palette: { 50: '#eef2ff', 100: '#e0e7ff', 200: '#c7d2fe', 300: '#a5b4fc', 400: '#818cf8', 500: '#6366f1', 600: '#4f46e5', 700: '#4338ca', 800: '#3730a3', 900: '#312e81', 950: '#1e1b4b' } },
-                { name: 'violet', palette: { 50: '#f5f3ff', 100: '#ede9fe', 200: '#ddd6fe', 300: '#c4b5fd', 400: '#a78bfa', 500: '#8b5cf6', 600: '#7c3aed', 700: '#6d28d9', 800: '#5b21b6', 900: '#4c1d95', 950: '#2e1065' } },
-                { name: 'purple', palette: { 50: '#faf5ff', 100: '#f3e8ff', 200: '#e9d5ff', 300: '#d8b4fe', 400: '#c084fc', 500: '#a855f7', 600: '#9333ea', 700: '#7e22ce', 800: '#6b21a8', 900: '#581c87', 950: '#3b0764' } },
-                { name: 'fuchsia', palette: { 50: '#fdf4ff', 100: '#fae8ff', 200: '#f5d0fe', 300: '#f0abfc', 400: '#e879f9', 500: '#d946ef', 600: '#c026d3', 700: '#a21caf', 800: '#86198f', 900: '#701a75', 950: '#4a044e' } },
-                { name: 'pink', palette: { 50: '#fdf2f8', 100: '#fce7f3', 200: '#fbcfe8', 300: '#f9a8d4', 400: '#f472b6', 500: '#ec4899', 600: '#db2777', 700: '#be185d', 800: '#9d174d', 900: '#831843', 950: '#500724' } },
-                { name: 'rose', palette: { 50: '#fff1f2', 100: '#ffe4e6', 200: '#fecdd3', 300: '#fda4af', 400: '#fb7185', 500: '#f43f5e', 600: '#e11d48', 700: '#be123c', 800: '#9f1239', 900: '#881337', 950: '#4c0519' } }
-            ],
-            surfaces: [
-                {
-                    name: 'slate',
-                    palette: { 0: '#ffffff', 50: '#f8fafc', 100: '#f1f5f9', 200: '#e2e8f0', 300: '#cbd5e1', 400: '#94a3b8', 500: '#64748b', 600: '#475569', 700: '#334155', 800: '#1e293b', 900: '#0f172a', 950: '#020617' }
-                },
-                {
-                    name: 'gray',
-                    palette: { 0: '#ffffff', 50: '#f9fafb', 100: '#f3f4f6', 200: '#e5e7eb', 300: '#d1d5db', 400: '#9ca3af', 500: '#6b7280', 600: '#4b5563', 700: '#374151', 800: '#1f2937', 900: '#111827', 950: '#030712' }
-                },
-                {
-                    name: 'zinc',
-                    palette: { 0: '#ffffff', 50: '#fafafa', 100: '#f4f4f5', 200: '#e4e4e7', 300: '#d4d4d8', 400: '#a1a1aa', 500: '#71717a', 600: '#52525b', 700: '#3f3f46', 800: '#27272a', 900: '#18181b', 950: '#09090b' }
-                },
-                {
-                    name: 'neutral',
-                    palette: { 0: '#ffffff', 50: '#fafafa', 100: '#f5f5f5', 200: '#e5e5e5', 300: '#d4d4d4', 400: '#a3a3a3', 500: '#737373', 600: '#525252', 700: '#404040', 800: '#262626', 900: '#171717', 950: '#0a0a0a' }
-                },
-                {
-                    name: 'stone',
-                    palette: { 0: '#ffffff', 50: '#fafaf9', 100: '#f5f5f4', 200: '#e7e5e4', 300: '#d6d3d1', 400: '#a8a29e', 500: '#78716c', 600: '#57534e', 700: '#44403c', 800: '#292524', 900: '#1c1917', 950: '#0c0a09' }
-                },
-                {
-                    name: 'soho',
-                    palette: { 0: '#ffffff', 50: '#f4f4f4', 100: '#e8e9e9', 200: '#d2d2d4', 300: '#bbbcbe', 400: '#a5a5a9', 500: '#8e8f93', 600: '#77787d', 700: '#616268', 800: '#4a4b52', 900: '#34343d', 950: '#1d1e27' }
-                },
-                {
-                    name: 'viva',
-                    palette: { 0: '#ffffff', 50: '#f3f3f3', 100: '#e7e7e8', 200: '#cfd0d0', 300: '#b7b8b9', 400: '#9fa1a1', 500: '#87898a', 600: '#6e7173', 700: '#565a5b', 800: '#3e4244', 900: '#262b2c', 950: '#0e1315' }
-                },
-                {
-                    name: 'ocean',
-                    palette: { 0: '#ffffff', 50: '#fbfcfc', 100: '#F7F9F8', 200: '#EFF3F2', 300: '#DADEDD', 400: '#B1B7B6', 500: '#828787', 600: '#5F7274', 700: '#415B61', 800: '#29444E', 900: '#183240', 950: '#0c1920' }
-                }
-            ]
-        };
+const { layoutState } = useLayout();
+
+const primaryColors = ref([
+    { name: 'noir', palette: {} },
+    { name: 'emerald', palette: { 50: '#ecfdf5', 100: '#d1fae5', 200: '#a7f3d0', 300: '#6ee7b7', 400: '#34d399', 500: '#10b981', 600: '#059669', 700: '#047857', 800: '#065f46', 900: '#064e3b', 950: '#022c22' } },
+    { name: 'green', palette: { 50: '#f0fdf4', 100: '#dcfce7', 200: '#bbf7d0', 300: '#86efac', 400: '#4ade80', 500: '#22c55e', 600: '#16a34a', 700: '#15803d', 800: '#166534', 900: '#14532d', 950: '#052e16' } },
+    { name: 'lime', palette: { 50: '#f7fee7', 100: '#ecfccb', 200: '#d9f99d', 300: '#bef264', 400: '#a3e635', 500: '#84cc16', 600: '#65a30d', 700: '#4d7c0f', 800: '#3f6212', 900: '#365314', 950: '#1a2e05' } },
+    { name: 'orange', palette: { 50: '#fff7ed', 100: '#ffedd5', 200: '#fed7aa', 300: '#fdba74', 400: '#fb923c', 500: '#f97316', 600: '#ea580c', 700: '#c2410c', 800: '#9a3412', 900: '#7c2d12', 950: '#431407' } },
+    { name: 'amber', palette: { 50: '#fffbeb', 100: '#fef3c7', 200: '#fde68a', 300: '#fcd34d', 400: '#fbbf24', 500: '#f59e0b', 600: '#d97706', 700: '#b45309', 800: '#92400e', 900: '#78350f', 950: '#451a03' } },
+    { name: 'yellow', palette: { 50: '#fefce8', 100: '#fef9c3', 200: '#fef08a', 300: '#fde047', 400: '#facc15', 500: '#eab308', 600: '#ca8a04', 700: '#a16207', 800: '#854d0e', 900: '#713f12', 950: '#422006' } },
+    { name: 'teal', palette: { 50: '#f0fdfa', 100: '#ccfbf1', 200: '#99f6e4', 300: '#5eead4', 400: '#2dd4bf', 500: '#14b8a6', 600: '#0d9488', 700: '#0f766e', 800: '#115e59', 900: '#134e4a', 950: '#042f2e' } },
+    { name: 'cyan', palette: { 50: '#ecfeff', 100: '#cffafe', 200: '#a5f3fc', 300: '#67e8f9', 400: '#22d3ee', 500: '#06b6d4', 600: '#0891b2', 700: '#0e7490', 800: '#155e75', 900: '#164e63', 950: '#083344' } },
+    { name: 'sky', palette: { 50: '#f0f9ff', 100: '#e0f2fe', 200: '#bae6fd', 300: '#7dd3fc', 400: '#38bdf8', 500: '#0ea5e9', 600: '#0284c7', 700: '#0369a1', 800: '#075985', 900: '#0c4a6e', 950: '#082f49' } },
+    { name: 'blue', palette: { 50: '#eff6ff', 100: '#dbeafe', 200: '#bfdbfe', 300: '#93c5fd', 400: '#60a5fa', 500: '#3b82f6', 600: '#2563eb', 700: '#1d4ed8', 800: '#1e40af', 900: '#1e3a8a', 950: '#172554' } },
+    { name: 'indigo', palette: { 50: '#eef2ff', 100: '#e0e7ff', 200: '#c7d2fe', 300: '#a5b4fc', 400: '#818cf8', 500: '#6366f1', 600: '#4f46e5', 700: '#4338ca', 800: '#3730a3', 900: '#312e81', 950: '#1e1b4b' } },
+    { name: 'violet', palette: { 50: '#f5f3ff', 100: '#ede9fe', 200: '#ddd6fe', 300: '#c4b5fd', 400: '#a78bfa', 500: '#8b5cf6', 600: '#7c3aed', 700: '#6d28d9', 800: '#5b21b6', 900: '#4c1d95', 950: '#2e1065' } },
+    { name: 'purple', palette: { 50: '#faf5ff', 100: '#f3e8ff', 200: '#e9d5ff', 300: '#d8b4fe', 400: '#c084fc', 500: '#a855f7', 600: '#9333ea', 700: '#7e22ce', 800: '#6b21a8', 900: '#581c87', 950: '#3b0764' } },
+    { name: 'fuchsia', palette: { 50: '#fdf4ff', 100: '#fae8ff', 200: '#f5d0fe', 300: '#f0abfc', 400: '#e879f9', 500: '#d946ef', 600: '#c026d3', 700: '#a21caf', 800: '#86198f', 900: '#701a75', 950: '#4a044e' } },
+    { name: 'pink', palette: { 50: '#fdf2f8', 100: '#fce7f3', 200: '#fbcfe8', 300: '#f9a8d4', 400: '#f472b6', 500: '#ec4899', 600: '#db2777', 700: '#be185d', 800: '#9d174d', 900: '#831843', 950: '#500724' } },
+    { name: 'rose', palette: { 50: '#fff1f2', 100: '#ffe4e6', 200: '#fecdd3', 300: '#fda4af', 400: '#fb7185', 500: '#f43f5e', 600: '#e11d48', 700: '#be123c', 800: '#9f1239', 900: '#881337', 950: '#4c0519' } }
+]);
+
+const surfaces = ref([
+    {
+        name: 'slate',
+        palette: { 0: '#ffffff', 50: '#f8fafc', 100: '#f1f5f9', 200: '#e2e8f0', 300: '#cbd5e1', 400: '#94a3b8', 500: '#64748b', 600: '#475569', 700: '#334155', 800: '#1e293b', 900: '#0f172a', 950: '#020617' }
     },
-    methods: {
-        updateColors(type, color) {
-            if (type === 'primary') {
-                this.$appState.primary = color.name;
-
-                if (color.name === 'noir') {
-                    document.documentElement.classList.add('p-noir');
-                    document.documentElement.style.setProperty('--logo-color', 'var(--text-secondary-color)');
-
-                    this.applyTheme(
-                        type,
-                        this.surfaces.find((s) => s.name === this.$appState.surface)
-                    );
-                } else {
-                    document.documentElement.classList.remove('p-noir');
-                    document.documentElement.style.setProperty('--logo-color', 'var(--primary-color)');
-
-                    this.applyTheme(type, color);
-                }
-            } else if (type === 'surface') {
-                this.$appState.surface = color.name;
-                this.applyTheme(type, color);
-            }
-
-            EventBus.emit('theme-palette-change');
-        },
-        applyTheme(type, color) {
-            Object.keys(color.palette).forEach((key) => {
-                document.documentElement.style.setProperty(`--p-${type}-${key}`, color.palette[key]);
-            });
-        }
+    {
+        name: 'gray',
+        palette: { 0: '#ffffff', 50: '#f9fafb', 100: '#f3f4f6', 200: '#e5e7eb', 300: '#d1d5db', 400: '#9ca3af', 500: '#6b7280', 600: '#4b5563', 700: '#374151', 800: '#1f2937', 900: '#111827', 950: '#030712' }
     },
-    computed: {
-        selectedPrimaryColor() {
-            return this.$appState.primary;
-        },
-        selectedSurfaceColor() {
-            return this.$appState.surface;
-        }
+    {
+        name: 'zinc',
+        palette: { 0: '#ffffff', 50: '#fafafa', 100: '#f4f4f5', 200: '#e4e4e7', 300: '#d4d4d8', 400: '#a1a1aa', 500: '#71717a', 600: '#52525b', 700: '#3f3f46', 800: '#27272a', 900: '#18181b', 950: '#09090b' }
+    },
+    {
+        name: 'neutral',
+        palette: { 0: '#ffffff', 50: '#fafafa', 100: '#f5f5f5', 200: '#e5e5e5', 300: '#d4d4d4', 400: '#a3a3a3', 500: '#737373', 600: '#525252', 700: '#404040', 800: '#262626', 900: '#171717', 950: '#0a0a0a' }
+    },
+    {
+        name: 'stone',
+        palette: { 0: '#ffffff', 50: '#fafaf9', 100: '#f5f5f4', 200: '#e7e5e4', 300: '#d6d3d1', 400: '#a8a29e', 500: '#78716c', 600: '#57534e', 700: '#44403c', 800: '#292524', 900: '#1c1917', 950: '#0c0a09' }
+    },
+    {
+        name: 'soho',
+        palette: { 0: '#ffffff', 50: '#f4f4f4', 100: '#e8e9e9', 200: '#d2d2d4', 300: '#bbbcbe', 400: '#a5a5a9', 500: '#8e8f93', 600: '#77787d', 700: '#616268', 800: '#4a4b52', 900: '#34343d', 950: '#1d1e27' }
+    },
+    {
+        name: 'viva',
+        palette: { 0: '#ffffff', 50: '#f3f3f3', 100: '#e7e7e8', 200: '#cfd0d0', 300: '#b7b8b9', 400: '#9fa1a1', 500: '#87898a', 600: '#6e7173', 700: '#565a5b', 800: '#3e4244', 900: '#262b2c', 950: '#0e1315' }
+    },
+    {
+        name: 'ocean',
+        palette: { 0: '#ffffff', 50: '#fbfcfc', 100: '#F7F9F8', 200: '#EFF3F2', 300: '#DADEDD', 400: '#B1B7B6', 500: '#828787', 600: '#5F7274', 700: '#415B61', 800: '#29444E', 900: '#183240', 950: '#0c1920' }
     }
+]);
+
+const selectedPrimaryColor = computed(() => layoutState.primary);
+const selectedSurfaceColor = computed(() => layoutState.surface);
+
+const applyTheme = (type, color) => {
+    Object.keys(color.palette).forEach((key) => {
+        document.documentElement.style.setProperty(`--p-${type}-${key}`, color.palette[key]);
+    });
+};
+
+const updateColors = (type, color) => {
+    if (type === 'primary') {
+        layoutState.primary = color.name;
+
+        if (color.name === 'noir') {
+            document.documentElement.classList.add('p-noir');
+            document.documentElement.style.setProperty('--logo-color', 'var(--text-secondary-color)');
+
+            applyTheme(
+                type,
+                surfaces.value.find((s) => s.name === layoutState.surface)
+            );
+        } else {
+            document.documentElement.classList.remove('p-noir');
+            document.documentElement.style.setProperty('--logo-color', 'var(--primary-color)');
+
+            applyTheme(type, color);
+        }
+    } else if (type === 'surface') {
+        layoutState.surface = color.name;
+        applyTheme(type, color);
+    }
+
+    EventBus.emit('theme-palette-change');
 };
 </script>
diff --git a/apps/volt/components/app/AppFooter.vue b/apps/volt/components/app/AppFooter.vue
index 92d434d53..e26c2ab2a 100755
--- a/apps/volt/components/app/AppFooter.vue
+++ b/apps/volt/components/app/AppFooter.vue
@@ -7,14 +7,9 @@
     </div>
 </template>
 
-<script>
+<script setup>
 import pkg from '@/package.json';
+import { ref } from 'vue';
 
-export default {
-    data() {
-        return {
-            version: pkg.version
-        };
-    }
-};
+const version = ref(pkg.version);
 </script>
diff --git a/apps/volt/components/app/AppMenu.vue b/apps/volt/components/app/AppMenu.vue
index 31655209a..c55d855dd 100755
--- a/apps/volt/components/app/AppMenu.vue
+++ b/apps/volt/components/app/AppMenu.vue
@@ -8,20 +8,16 @@
     </aside>
 </template>
 
-<script>
+<script setup>
 import menudata from '@/assets/data/menu.json';
+import { ref } from 'vue';
 
-export default {
-    props: {
-        active: {
-            type: Boolean,
-            default: true
-        }
-    },
-    data() {
-        return {
-            menu: menudata.data
-        };
+const props = defineProps({
+    active: {
+        type: Boolean,
+        default: true
     }
-};
+});
+
+const menu = ref(menudata.data);
 </script>
diff --git a/apps/volt/components/app/AppMenuItem.vue b/apps/volt/components/app/AppMenuItem.vue
index 62b3c1a21..d82128aa8 100644
--- a/apps/volt/components/app/AppMenuItem.vue
+++ b/apps/volt/components/app/AppMenuItem.vue
@@ -33,30 +33,24 @@
     </li>
 </template>
 
-<script>
+<script setup>
 import Tag from '@/volt/tag';
+import { useRouter } from 'vue-router';
 
-export default {
-    props: {
-        root: {
-            type: Boolean,
-            default: true
-        },
-        menu: {
-            type: Object,
-            default: null
-        }
+const props = defineProps({
+    root: {
+        type: Boolean,
+        default: true
     },
-    methods: {
-        isActiveRootmenuItem(menuitem) {
-            return (
-                menuitem.children &&
-                !menuitem.children.some((item) => item.to === `/${this.$router.currentRoute.value?.name?.replaceAll('-', '/')}` || (item.children && item.children.some((it) => it.to === `/${this.$router.currentRoute.value.name}`)))
-            );
-        }
-    },
-    components: {
-        Tag
+    menu: {
+        type: Object,
+        default: null
     }
+});
+
+const router = useRouter();
+
+const isActiveRootmenuItem = (menuitem) => {
+    return menuitem.children && !menuitem.children.some((item) => item.to === `/${router.currentRoute.value?.name?.replaceAll('-', '/')}` || (item.children && item.children.some((it) => it.to === `/${router.currentRoute.value.name}`)));
 };
 </script>
diff --git a/apps/volt/components/app/AppNews.vue b/apps/volt/components/app/AppNews.vue
index 76c5d3eae..f58fc6bc6 100644
--- a/apps/volt/components/app/AppNews.vue
+++ b/apps/volt/components/app/AppNews.vue
@@ -1,10 +1,10 @@
 <template>
-    <div v-if="$appState.newsActive" class="layout-news">
+    <div v-if="layoutState.newsActive" class="layout-news">
         <div class="layout-news-container">
             <i></i>
             <div class="layout-news-content">
-                <span class="layout-news-text">{{ $appState.announcement.content }}</span>
-                <a v-if="$appState.announcement.linkHref" class="layout-news-link" :href="$appState.announcement.linkHref">{{ $appState.announcement.linkText }}</a>
+                <span class="layout-news-text">{{ layoutState.announcement.content }}</span>
+                <a v-if="layoutState.announcement.linkHref" class="layout-news-link" :href="layoutState.announcement.linkHref">{{ layoutState.announcement.linkText }}</a>
             </div>
             <a class="layout-news-close" @click="onClose">
                 <span class="pi pi-times"></span>
@@ -13,36 +13,36 @@
     </div>
 </template>
 
-<script>
+<script setup>
 import News from '@/assets/data/news.json';
+import { onMounted } from 'vue';
 
-export default {
-    mounted() {
-        const itemString = localStorage.getItem(this.$appState.storageKey);
+const { layoutState } = useLayout();
 
-        if (itemString) {
-            const item = JSON.parse(itemString);
+onMounted(() => {
+    const itemString = localStorage.getItem(layoutState.storageKey);
 
-            if (!item.hiddenNews || item.hiddenNews !== News.id) {
-                this.$appState.newsActive = true;
-                this.$appState.announcement = News;
-            } else {
-                this.$appState.newsActive = false;
-            }
+    if (itemString) {
+        const item = JSON.parse(itemString);
+
+        if (!item.hiddenNews || item.hiddenNews !== News.id) {
+            layoutState.newsActive = true;
+            layoutState.announcement = News;
         } else {
-            this.$appState.announcement = News;
-            this.$appState.newsActive = true;
-        }
-    },
-    methods: {
-        onClose() {
-            this.$appState.newsActive = false;
-            const item = {
-                hiddenNews: this.$appState.announcement.id
-            };
-
-            localStorage.setItem(this.$appState.storageKey, JSON.stringify(item));
+            layoutState.newsActive = false;
         }
+    } else {
+        layoutState.announcement = News;
+        layoutState.newsActive = true;
     }
+});
+
+const onClose = () => {
+    layoutState.newsActive = false;
+    const item = {
+        hiddenNews: layoutState.announcement.id
+    };
+
+    localStorage.setItem(layoutState.storageKey, JSON.stringify(item));
 };
 </script>
diff --git a/apps/volt/components/app/AppTopBar.vue b/apps/volt/components/app/AppTopBar.vue
index 81c6062f6..476067326 100755
--- a/apps/volt/components/app/AppTopBar.vue
+++ b/apps/volt/components/app/AppTopBar.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :ref="containerRef" class="layout-topbar">
+    <div ref="container" class="layout-topbar">
         <div class="layout-topbar-inner">
             <div class="layout-topbar-logo-container">
                 <PrimeVueNuxtLink to="/" class="layout-topbar-logo" aria-label="PrimeVue logo">
@@ -51,7 +51,7 @@
                 </li>
                 <li>
                     <button type="button" class="topbar-item" @click="toggleDarkMode">
-                        <i :class="['pi', { 'pi-moon': $appState.darkTheme, 'pi-sun': !$appState.darkTheme }]"></i>
+                        <i :class="['pi', { 'pi-moon': layoutState.darkTheme, 'pi-sun': !layoutState.darkTheme }]"></i>
                     </button>
                 </li>
                 <li class="relative">
@@ -64,8 +64,8 @@
                     </button>
                     <AppConfigurator />
                 </li>
-                <li v-if="showMenuButton" class="menu-button">
-                    <button type="button" class="topbar-item menu-button" @click="onMenuButtonClick" aria-haspopup aria-label="Menu">
+                <li class="menu-button">
+                    <button type="button" class="topbar-item" @click="onMenuButtonClick" aria-haspopup aria-label="Menu">
                         <i class="pi pi-bars"></i>
                     </button>
                 </li>
@@ -74,75 +74,52 @@
     </div>
 </template>
 
-<script>
+<script setup>
 import EventBus from '@/layouts/AppEventBus';
+import { onBeforeUnmount, onMounted, ref } from 'vue';
 
-export default {
-    emits: ['menubutton-click'],
-    props: {
-        showMenuButton: {
-            type: Boolean,
-            default: true
-        }
-    },
-    scrollListener: null,
-    container: null,
-    mounted() {
-        this.bindScrollListener();
-    },
-    beforeUnmount() {
-        if (this.scrollListener) {
-            this.unbindScrollListener();
-        }
-    },
-    methods: {
-        onMenuButtonClick(event) {
-            this.$emit('menubutton-click', event);
-        },
-        toggleDarkMode() {
-            EventBus.emit('dark-mode-toggle', { dark: !this.$appState.darkTheme });
-        },
-        bindScrollListener() {
-            if (!this.scrollListener) {
-                if (this.container) {
-                    this.scrollListener = () => {
-                        if (window.scrollY > 0) this.container.classList.add('layout-topbar-sticky');
-                        else this.container.classList.remove('layout-topbar-sticky');
-                    };
-                }
-            }
+const emit = defineEmits(['menubutton-click']);
 
-            window.addEventListener('scroll', this.scrollListener);
-        },
-        unbindScrollListener() {
-            if (this.scrollListener) {
-                window.removeEventListener('scroll', this.scrollListener);
-                this.scrollListener = null;
-            }
-        },
-        bindOutsideClickListener() {
-            if (!this.outsideClickListener) {
-                this.outsideClickListener = (event) => {
-                    if (this.isOutsideTopbarMenuClicked(event)) {
-                        this.unbindOutsideClickListener();
-                    }
-                };
+const { layoutState } = useLayout();
 
-                document.addEventListener('click', this.outsideClickListener);
-            }
-        },
-        unbindOutsideClickListener() {
-            if (this.outsideClickListener) {
-                document.removeEventListener('click', this.outsideClickListener);
-                this.outsideClickListener = null;
-            }
-        },
-        isOutsideTopbarMenuClicked(event) {
-            return !(this.$refs.topbarMenu.isSameNode(event.target) || this.$refs.topbarMenu.contains(event.target));
-        },
-        containerRef(el) {
-            this.container = el;
+const container = ref(null);
+let scrollListener = null;
+
+const onMenuButtonClick = (event) => {
+    emit('menubutton-click', event);
+};
+
+const toggleDarkMode = () => {
+    EventBus.emit('dark-mode-toggle', { dark: !layoutState.darkTheme });
+};
+
+const bindScrollListener = () => {
+    if (!scrollListener) {
+        if (container.value) {
+            scrollListener = () => {
+                if (window.scrollY > 0) container.value.classList.add('layout-topbar-sticky');
+                else container.value.classList.remove('layout-topbar-sticky');
+            };
         }
     }
+
+    window.addEventListener('scroll', scrollListener);
 };
+
+const unbindScrollListener = () => {
+    if (scrollListener) {
+        window.removeEventListener('scroll', scrollListener);
+        scrollListener = null;
+    }
+};
+
+onMounted(() => {
+    bindScrollListener();
+});
+
+onBeforeUnmount(() => {
+    if (scrollListener) {
+        unbindScrollListener();
+    }
+});
 </script>
diff --git a/apps/volt/composables/use-layout.js b/apps/volt/composables/use-layout.js
new file mode 100644
index 000000000..65541c0bb
--- /dev/null
+++ b/apps/volt/composables/use-layout.js
@@ -0,0 +1,16 @@
+import { reactive } from 'vue';
+
+const layoutState = reactive({
+    primary: 'emerald',
+    surface: 'zinc',
+    darkTheme: false,
+    codeSandbox: false,
+    sourceType: 'options-api',
+    newsActive: false,
+    announcement: null,
+    storageKey: 'primevue-tailwind'
+});
+
+export function useLayout() {
+    return { layoutState };
+}
diff --git a/apps/volt/layouts/default.vue b/apps/volt/layouts/default.vue
index b7e3cf610..a1dd3d59f 100644
--- a/apps/volt/layouts/default.vue
+++ b/apps/volt/layouts/default.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="layout-wrapper" :class="containerClass">
+    <div :class="containerClass">
         <AppNews />
         <AppTopBar @menubutton-click="onMenuButtonClick" />
         <div :class="['layout-mask', { 'layout-mask-active': sidebarActive }]" @click="onMaskClick"></div>
@@ -17,57 +17,50 @@
     </div>
 </template>
 
-<script>
+<script setup>
 import Toast from '@/volt/toast';
 import { blockBodyScroll, unblockBodyScroll } from '@primeuix/utils/dom';
+import { useToast } from 'primevue/usetoast';
+import { computed, ref, watch } from 'vue';
 
-export default {
-    data() {
-        return {
-            sidebarActive: false
-        };
-    },
-    /*watch: {
-        $route: {
-            immediate: true,
-            handler() {
-                if (!process.client || typeof window === 'undefined') {
-                    return;
-                }
+const { layoutState } = useLayout();
+const route = useRoute();
+const toast = useToast();
+const sidebarActive = ref(false);
 
-                this.sidebarActive = false;
-                unblockBodyScroll('blocked-scroll');
-                this.$toast.removeAllGroups();
-            }
+const containerClass = computed(() => {
+    return [
+        {
+            'layout-news-active': layoutState.newsActive
         }
-    },*/
-    methods: {
-        onMenuButtonClick() {
-            if (this.sidebarActive) {
-                this.sidebarActive = false;
-                unblockBodyScroll('blocked-scroll');
-            } else {
-                this.sidebarActive = true;
-                blockBodyScroll('blocked-scroll');
-            }
-        },
-        onMaskClick() {
-            this.sidebarActive = false;
-            unblockBodyScroll('blocked-scroll');
-        }
-    },
-    computed: {
-        containerClass() {
-            return [
-                'layout-wrapper',
-                {
-                    'layout-news-active': this.$appState.newsActive
-                }
-            ];
-        }
-    },
-    components: {
-        Toast
+    ];
+});
+
+const onMenuButtonClick = () => {
+    if (sidebarActive.value) {
+        sidebarActive.value = false;
+        unblockBodyScroll('blocked-scroll');
+    } else {
+        sidebarActive.value = true;
+        blockBodyScroll('blocked-scroll');
     }
 };
+
+const onMaskClick = () => {
+    sidebarActive.value = false;
+    unblockBodyScroll('blocked-scroll');
+};
+
+watch(
+    () => route.path,
+    () => {
+        // if (!import.meta.client || typeof window === 'undefined') {
+        //     return;
+        // }
+
+        sidebarActive.value = false;
+        unblockBodyScroll('blocked-scroll');
+        toast.removeAllGroups();
+    }
+);
 </script>
diff --git a/apps/volt/pages/index.vue b/apps/volt/pages/index.vue
index 72e34166b..cf3e2c8e8 100644
--- a/apps/volt/pages/index.vue
+++ b/apps/volt/pages/index.vue
@@ -7,24 +7,30 @@
 </template>
 
 <script setup>
+import { usePrimeVue } from 'primevue/config';
+import { computed } from 'vue';
+
 definePageMeta({
     layout: 'custom'
 });
-</script>
 
-<script>
-export default {
-    layout: 'custom',
-    props: {
-        theme: {
-            type: String,
-            default: null
-        }
-    },
-    computed: {
-        landingClass() {
-            return ['landing bg-surface-0 dark:bg-surface-900', { 'layout-news-active': this.$appState?.newsActive, 'layout-ripple-disabled': this.$primevue.config.ripple === false }];
-        }
+const props = defineProps({
+    theme: {
+        type: String,
+        default: null
     }
-};
+});
+
+const { layoutState } = useLayout();
+const primevue = usePrimeVue();
+
+const landingClass = computed(() => {
+    return [
+        'landing bg-surface-0 dark:bg-surface-900',
+        {
+            'layout-news-active': layoutState.newsActive,
+            'layout-ripple-disabled': primevue.config.ripple === false
+        }
+    ];
+});
 </script>
diff --git a/apps/volt/plugins/primevue.js b/apps/volt/plugins/primevue.js
index 29c23a6a7..07d7d98af 100644
--- a/apps/volt/plugins/primevue.js
+++ b/apps/volt/plugins/primevue.js
@@ -1,9 +1,11 @@
 import PrimeVue from 'primevue/config';
 import StyleClass from 'primevue/styleclass';
+import ToastService from 'primevue/toastservice';
 
 export default defineNuxtPlugin((nuxtApp) => {
     nuxtApp.vueApp.use(PrimeVue, {
         unstyled: true
     });
     nuxtApp.vueApp.directive('styleclass', StyleClass);
+    nuxtApp.vueApp.use(ToastService);
 });