diff --git a/layouts/AppConfigurator.vue b/layouts/AppConfigurator.vue
index f0473391e..c48f9a327 100755
--- a/layouts/AppConfigurator.vue
+++ b/layouts/AppConfigurator.vue
@@ -1,10 +1,10 @@
 <template>
     <div :class="containerClass">
         <div class="layout-config-content-wrapper">
-            <a class="layout-config-button" @click="toggleConfigurator">
+            <a href="#" class="layout-config-button" @click="toggleConfigurator">
                 <i class="pi pi-cog"></i>
             </a>
-            <a to="#" class="layout-config-close" @click="hideConfigurator">
+            <a href="#" class="layout-config-close" @click="hideConfigurator">
                 <i class="pi pi-times"></i>
             </a>
 
@@ -13,7 +13,7 @@
                     <h4>Component Scale</h4>
                     <div class="config-scale">
                         <Button icon="pi pi-minus" @click="decrementScale()" class="p-button-text" :disabled="scale === scales[0]" />
-                        <i class="pi pi-circle-fill" v-for="s of scales" :class="{ 'scale-active': s === scale }" :key="s" />
+                        <i v-for="s of scales" :key="s" class="pi pi-circle-fill" :class="{ 'scale-active': s === scale }" />
                         <Button icon="pi pi-plus" @click="incrementScale()" class="p-button-text" :disabled="scale === scales[scales.length - 1]" />
                     </div>
 
@@ -23,31 +23,31 @@
                     <InputSwitch :modelValue="rippleActive" @update:modelValue="onRippleChange" />
 
                     <h4>Free Themes</h4>
-                    <p>Built-in component themes created by the <nuxt-link to="https://www.primefaces.org/designer/primevue">PrimeVue Theme Designer</nuxt-link>.</p>
+                    <p>Built-in component themes created by the <a href="https://www.primefaces.org/designer/primevue">PrimeVue Theme Designer</a>.</p>
 
                     <h5>Bootstrap</h5>
                     <div class="grid free-themes">
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'bootstrap4-light-blue')">
-                                <img src="/demo/images/themes/bootstrap4-light-blue.svg" alt="Bootstrap Light Blue" />
+                                <img src="demo/images/themes/bootstrap4-light-blue.svg" alt="Bootstrap Light Blue" />
                             </button>
                             <span>Blue</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'bootstrap4-light-purple')">
-                                <img src="/demo/images/themes/bootstrap4-light-purple.svg" alt="Bootstrap Light Blue" />
+                                <img src="demo/images/themes/bootstrap4-light-purple.svg" alt="Bootstrap Light Blue" />
                             </button>
                             <span>Purple</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'bootstrap4-dark-blue', true)">
-                                <img src="/demo/images/themes/bootstrap4-dark-blue.svg" alt="Bootstrap Dark Blue" />
+                                <img src="demo/images/themes/bootstrap4-dark-blue.svg" alt="Bootstrap Dark Blue" />
                             </button>
                             <span>Blue</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'bootstrap4-dark-purple', true)">
-                                <img src="/demo/images/themes/bootstrap4-dark-purple.svg" alt="Bootstrap Dark Blue" />
+                                <img src="demo/images/themes/bootstrap4-dark-purple.svg" alt="Bootstrap Dark Blue" />
                             </button>
                             <span>Purple</span>
                         </div>
@@ -57,25 +57,25 @@
                     <div class="grid free-themes">
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'md-light-indigo')">
-                                <img src="/demo/images/themes/md-light-indigo.svg" alt="Material Light Indigo" />
+                                <img src="demo/images/themes/md-light-indigo.svg" alt="Material Light Indigo" />
                             </button>
                             <span>Indigo</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'md-light-deeppurple')">
-                                <img src="/demo/images/themes/md-light-deeppurple.svg" alt="Material Light Deep Purple" />
+                                <img src="demo/images/themes/md-light-deeppurple.svg" alt="Material Light Deep Purple" />
                             </button>
                             <span>Deep Purple</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'md-dark-indigo', true)">
-                                <img src="/demo/images/themes/md-dark-indigo.svg" alt="Material Dark Indigo" />
+                                <img src="demo/images/themes/md-dark-indigo.svg" alt="Material Dark Indigo" />
                             </button>
                             <span>Indigo</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'md-dark-deeppurple', true)">
-                                <img src="/demo/images/themes/md-dark-deeppurple.svg" alt="Material Dark Deep Purple" />
+                                <img src="demo/images/themes/md-dark-deeppurple.svg" alt="Material Dark Deep Purple" />
                             </button>
                             <span>Deep Purple</span>
                         </div>
@@ -85,25 +85,25 @@
                     <div class="grid free-themes">
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'mdc-light-indigo')">
-                                <img src="/demo/images/themes/md-light-indigo.svg" alt="Material Compact Light Indigo" />
+                                <img src="demo/images/themes/md-light-indigo.svg" alt="Material Compact Light Indigo" />
                             </button>
                             <span>Indigo</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'mdc-light-deeppurple')">
-                                <img src="/demo/images/themes/md-light-deeppurple.svg" alt="Material Compact Deep Purple" />
+                                <img src="demo/images/themes/md-light-deeppurple.svg" alt="Material Compact Deep Purple" />
                             </button>
                             <span>Deep Purple</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'mdc-dark-indigo', true)">
-                                <img src="/demo/images/themes/md-dark-indigo.svg" alt="Material Compact Dark Indigo" />
+                                <img src="demo/images/themes/md-dark-indigo.svg" alt="Material Compact Dark Indigo" />
                             </button>
                             <span>Indigo</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'mdc-dark-deeppurple', true)">
-                                <img src="/demo/images/themes/md-dark-deeppurple.svg" alt="Material Compact Dark Deep Purple" />
+                                <img src="demo/images/themes/md-dark-deeppurple.svg" alt="Material Compact Dark Deep Purple" />
                             </button>
                             <span>Deep Purple</span>
                         </div>
@@ -113,7 +113,7 @@
                     <div class="grid free-themes">
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'tailwind-light')">
-                                <img src="/demo/images/themes/tailwind-light.png" alt="Tailwind Light" />
+                                <img src="demo/images/themes/tailwind-light.png" alt="Tailwind Light" />
                             </button>
                             <span>Tailwind Light</span>
                         </div>
@@ -123,7 +123,7 @@
                     <div class="grid free-themes">
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'fluent-light')">
-                                <img src="/demo/images/themes/fluent-light.png" alt="Fluent Light" />
+                                <img src="demo/images/themes/fluent-light.png" alt="Fluent Light" />
                             </button>
                             <span>Fluent Light</span>
                         </div>
@@ -133,49 +133,49 @@
                     <div class="grid free-themes">
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'lara-light-indigo')">
-                                <img src="/demo/images/themes/lara-light-indigo.png" alt="Lara Light Indigo" />
+                                <img src="demo/images/themes/lara-light-indigo.png" alt="Lara Light Indigo" />
                             </button>
                             <span>Lara Light Indigo</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'lara-light-blue')">
-                                <img src="/demo/images/themes/lara-light-blue.png" alt="Lara Light Blue" />
+                                <img src="demo/images/themes/lara-light-blue.png" alt="Lara Light Blue" />
                             </button>
                             <span>Lara Light Blue</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'lara-light-purple')">
-                                <img src="/demo/images/themes/lara-light-purple.png" alt="Lara Light Purple" />
+                                <img src="demo/images/themes/lara-light-purple.png" alt="Lara Light Purple" />
                             </button>
                             <span>Lara Light Purple</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'lara-light-teal')">
-                                <img src="/demo/images/themes/lara-light-teal.png" alt="Lara Light Teal" />
+                                <img src="demo/images/themes/lara-light-teal.png" alt="Lara Light Teal" />
                             </button>
                             <span>Lara Light Teal</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'lara-dark-indigo', true)">
-                                <img src="/demo/images/themes/lara-dark-indigo.png" alt="Lara Dark Indigo" />
+                                <img src="demo/images/themes/lara-dark-indigo.png" alt="Lara Dark Indigo" />
                             </button>
                             <span>Lara Dark Indigo</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'lara-dark-blue', true)">
-                                <img src="/demo/images/themes/lara-dark-blue.png" alt="Lara Dark Blue" />
+                                <img src="demo/images/themes/lara-dark-blue.png" alt="Lara Dark Blue" />
                             </button>
                             <span>Lara Dark Blue</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'lara-dark-purple', true)">
-                                <img src="/demo/images/themes/lara-dark-purple.png" alt="Lara Dark Purple" />
+                                <img src="demo/images/themes/lara-dark-purple.png" alt="Lara Dark Purple" />
                             </button>
                             <span>Lara Dark Purple</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'lara-dark-teal', true)">
-                                <img src="/demo/images/themes/lara-dark-teal.png" alt="Lara Dark Teal" />
+                                <img src="demo/images/themes/lara-dark-teal.png" alt="Lara Dark Teal" />
                             </button>
                             <span>Lara Dark Teal</span>
                         </div>
@@ -185,191 +185,191 @@
                     <div class="grid free-themes">
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'saga-blue')">
-                                <img src="/demo/images/themes/saga-blue.png" alt="Saga Blue" />
+                                <img src="demo/images/themes/saga-blue.png" alt="Saga Blue" />
                             </button>
                             <span>Saga Blue</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'saga-green')">
-                                <img src="/demo/images/themes/saga-green.png" alt="Saga Green" />
+                                <img src="demo/images/themes/saga-green.png" alt="Saga Green" />
                             </button>
                             <span>Saga Green</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'saga-orange')">
-                                <img src="/demo/images/themes/saga-orange.png" alt="Saga Orange" />
+                                <img src="demo/images/themes/saga-orange.png" alt="Saga Orange" />
                             </button>
                             <span>Saga Orange</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'saga-purple')">
-                                <img src="/demo/images/themes/saga-purple.png" alt="Saga Purple" />
+                                <img src="demo/images/themes/saga-purple.png" alt="Saga Purple" />
                             </button>
                             <span>Saga Purple</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'vela-blue', true)">
-                                <img src="/demo/images/themes/vela-blue.png" alt="Vela Blue" />
+                                <img src="demo/images/themes/vela-blue.png" alt="Vela Blue" />
                             </button>
                             <span>Vela Blue</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'vela-green', true)">
-                                <img src="/demo/images/themes/vela-green.png" alt="Vela Green" />
+                                <img src="demo/images/themes/vela-green.png" alt="Vela Green" />
                             </button>
                             <span>Vela Green</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'vela-orange', true)">
-                                <img src="/demo/images/themes/vela-orange.png" alt="Vela Orange" />
+                                <img src="demo/images/themes/vela-orange.png" alt="Vela Orange" />
                             </button>
                             <span>Vela Orange</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'vela-purple', true)">
-                                <img src="/demo/images/themes/vela-purple.png" alt="Vela Purple" />
+                                <img src="demo/images/themes/vela-purple.png" alt="Vela Purple" />
                             </button>
                             <span>Vela Purple</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'arya-blue', true)">
-                                <img src="/demo/images/themes/arya-blue.png" alt="Arya Blue" />
+                                <img src="demo/images/themes/arya-blue.png" alt="Arya Blue" />
                             </button>
                             <span>Arya Blue</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'arya-green', true)">
-                                <img src="/demo/images/themes/arya-green.png" alt="Arya Green" />
+                                <img src="demo/images/themes/arya-green.png" alt="Arya Green" />
                             </button>
                             <span>Arya Green</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'arya-orange', true)">
-                                <img src="/demo/images/themes/arya-orange.png" alt="Arya Orange" />
+                                <img src="demo/images/themes/arya-orange.png" alt="Arya Orange" />
                             </button>
                             <span>Arya Orange</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'arya-purple', true)">
-                                <img src="/demo/images/themes/arya-purple.png" alt="Arya Purple" />
+                                <img src="demo/images/themes/arya-purple.png" alt="Arya Purple" />
                             </button>
                             <span>Arya Purple</span>
                         </div>
                     </div>
 
                     <h4>Premium Themes</h4>
-                    <p>Premium themes are only available exclusively for <nuxt-link to="https://www.primefaces.org/designer/primevue">PrimeVue Theme Designer</nuxt-link> subscribers and therefore not included in PrimeVue core.</p>
+                    <p>Premium themes are only available exclusively for <a href="https://www.primefaces.org/designer/primevue">PrimeVue Theme Designer</a> subscribers and therefore not included in PrimeVue core.</p>
                     <div class="grid free-themes">
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'soho-light')">
-                                <img src="/demo/images/themes/soho-light.png" alt="Soho Light" />
+                                <img src="demo/images/themes/soho-light.png" alt="Soho Light" />
                             </button>
                             <span>Soho Light</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'soho-dark', true)">
-                                <img src="/demo/images/themes/soho-dark.png" alt="Soho Dark" />
+                                <img src="demo/images/themes/soho-dark.png" alt="Soho Dark" />
                             </button>
                             <span>Soho Dark</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'viva-light')">
-                                <img src="/demo/images/themes/viva-light.svg" alt="Viva Light" />
+                                <img src="demo/images/themes/viva-light.svg" alt="Viva Light" />
                             </button>
                             <span>Viva Light</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'viva-dark', true)">
-                                <img src="/demo/images/themes/viva-dark.svg" alt="Viva Dark" />
+                                <img src="demo/images/themes/viva-dark.svg" alt="Viva Dark" />
                             </button>
                             <span>Viva Dark</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'mira')">
-                                <img src="/demo/images/themes/mira.jpg" alt="Mira" />
+                                <img src="demo/images/themes/mira.jpg" alt="Mira" />
                             </button>
                             <span>Mira</span>
                         </div>
                         <div class="col-3">
                             <button class="p-link" type="button" @click="changeTheme($event, 'nano')">
-                                <img src="/demo/images/themes/nano.jpg" alt="Mira" />
+                                <img src="demo/images/themes/nano.jpg" alt="Mira" />
                             </button>
                             <span>Nano</span>
                         </div>
                     </div>
 
                     <h4>Admin Templates</h4>
-                    <p>Beautifully crafted <nuxt-link to="https://cli.vuejs.org">Vue CLI</nuxt-link> application templates by the PrimeTek design team.</p>
+                    <p>Beautifully crafted <a href="https://cli.vuejs.org">Vue CLI</a> application templates by the PrimeTek design team.</p>
                     <div class="grid premium-themes">
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/sakai-vue">
-                                <img alt="Ultima" src="@/assets/images/layouts/sakai-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/sakai-vue">
+                                <img alt="Ultima" src="./assets/images/layouts/sakai-vue.jpg" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/atlantis-vue">
-                                <img alt="Atlantis" src="@/assets/images/layouts/atlantis-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/atlantis-vue">
+                                <img alt="Atlantis" src="./assets/images/layouts/atlantis-vue.jpg" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/freya-vue">
-                                <img alt="Freya" src="@/assets/images/layouts/freya-vue.png" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/freya-vue">
+                                <img alt="Freya" src="./assets/images/layouts/freya-vue.png" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/ultima-vue">
-                                <img alt="Ultima" src="@/assets/images/layouts/ultima-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/ultima-vue">
+                                <img alt="Ultima" src="./assets/images/layouts/ultima-vue.jpg" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/diamond-vue">
-                                <img alt="Diamond" src="@/assets/images/layouts/diamond-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/diamond-vue">
+                                <img alt="Diamond" src="./assets/images/layouts/diamond-vue.jpg" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/verona-vue">
-                                <img alt="Verona" src="@/assets/images/layouts/verona-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/verona-vue">
+                                <img alt="Verona" src="./assets/images/layouts/verona-vue.jpg" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/poseidon-vue">
-                                <img alt="Poseidon" src="@/assets/images/layouts/poseidon-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/poseidon-vue">
+                                <img alt="Poseidon" src="./assets/images/layouts/poseidon-vue.jpg" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/sapphire-vue">
-                                <img alt="Sapphire" src="@/assets/images/layouts/sapphire-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/sapphire-vue">
+                                <img alt="Sapphire" src="./assets/images/layouts/sapphire-vue.jpg" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/serenity-vue">
-                                <img alt="Serenity" src="@/assets/images/layouts/serenity-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/serenity-vue">
+                                <img alt="Serenity" src="./assets/images/layouts/serenity-vue.jpg" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/babylon-vue">
-                                <img alt="Babylon" src="@/assets/images/layouts/babylon-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/babylon-vue">
+                                <img alt="Babylon" src="./assets/images/layouts/babylon-vue.jpg" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/avalon-vue">
-                                <img alt="Avalon" src="@/assets/images/layouts/avalon-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/avalon-vue">
+                                <img alt="Avalon" src="./assets/images/layouts/avalon-vue.jpg" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/apollo-vue">
-                                <img alt="Apollo" src="@/assets/images/layouts/apollo-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/apollo-vue">
+                                <img alt="Apollo" src="./assets/images/layouts/apollo-vue.jpg" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/roma-vue">
-                                <img alt="Roma" src="@/assets/images/layouts/roma-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/roma-vue">
+                                <img alt="Roma" src="./assets/images/layouts/roma-vue.jpg" />
+                            </a>
                         </div>
                         <div class="col-12 md:col-6">
-                            <nuxt-link to="https://www.primefaces.org/layouts/prestige-vue">
-                                <img alt="Prestige" src="@/assets/images/layouts/prestige-vue.jpg" />
-                            </nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/prestige-vue">
+                                <img alt="Prestige" src="./assets/images/layouts/prestige-vue.jpg" />
+                            </a>
                         </div>
                     </div>
                 </div>
@@ -379,7 +379,7 @@
 </template>
 
 <script>
-import EventBus from './AppEventBus';
+import EventBus from '@/layouts/AppEventBus';
 
 export default {
     props: {
@@ -439,6 +439,7 @@ export default {
                         this.active = false;
                     }
                 };
+
                 document.addEventListener('click', this.outsideClickListener);
             }
         },
diff --git a/layouts/AppFooter.vue b/layouts/AppFooter.vue
index 005e405ae..3c4bfd87f 100755
--- a/layouts/AppFooter.vue
+++ b/layouts/AppFooter.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="layout-footer">
         <div class="layout-footer-left">
-            <span>PrimeVue 3.17.0-SNAPSHOT on Vue 3 by </span>
+            <span>PrimeVue 3.21.0 on Vue 3 by </span>
             <nuxt-link to="https://www.primetek.com.tr">PrimeTek</nuxt-link>
         </div>
 
diff --git a/layouts/AppMenu.vue b/layouts/AppMenu.vue
index 61f49aa7e..5b85a4ac6 100755
--- a/layouts/AppMenu.vue
+++ b/layouts/AppMenu.vue
@@ -1,8 +1,8 @@
 <template>
     <div :class="['layout-sidebar', { active: active }]">
-        <nuxt-link to="/" class="logo">
-            <img :src="'/demo/images/primevue-logo-' + `${$appState.darkTheme ? 'light' : 'dark'}` + '.svg'" alt="primevue logo" />
-        </nuxt-link>
+        <router-link to="/" class="logo">
+            <img :src="'demo/images/primevue-logo-' + `${$appState.darkTheme ? 'light' : 'dark'}` + '.svg'" alt="primevue logo" />
+        </router-link>
         <div class="layout-sidebar-filter p-fluid">
             <AutoComplete
                 v-model="selectedRoute"
@@ -24,34 +24,34 @@
                     {{ item.name }}
                     <Tag v-if="item.badge" :value="item.badge"></Tag>
                 </div>
-                <div class="menu-items" v-if="item.children && item.children.length">
+                <div v-if="item.children && item.children.length" class="menu-items">
                     <template v-for="child of item.children" :key="child.name">
                         <a v-if="child.href" :href="child.href" target="_blank">{{ child.name }}</a>
-                        <nuxt-link v-if="child.to" :to="child.to">
+                        <router-link v-if="child.to" :to="child.to">
                             {{ child.name }}
                             <Tag v-if="child.badge" :value="child.badge"></Tag>
-                        </nuxt-link>
+                        </router-link>
                         <template v-if="child.children">
-                            <nuxt-link :to="child.children[0].to" v-slot="{ isActive }" custom>
+                            <router-link v-slot="{ isActive }" :to="child.children[0].to" custom>
                                 <div>
                                     <a tabindex="0" @click="toggleSubmenu($event, child.meta[0])">
                                         {{ child.name }}
                                         <Tag v-if="child.badge" :value="child.badge"></Tag>
                                     </a>
                                     <transition name="p-toggleable-content">
-                                        <div class="p-toggleable-content" v-show="isSubmenuActive(child.meta[0], isActive)">
+                                        <div v-show="isSubmenuActive(child.meta[0], isActive)" class="p-toggleable-content">
                                             <ul>
                                                 <li v-for="(submenuitem, i) of child.children" :key="i">
-                                                    <nuxt-link :to="submenuitem.to">
+                                                    <router-link :to="submenuitem.to">
                                                         {{ submenuitem.name }}
                                                         <Tag v-if="submenuitem.badge" :value="submenuitem.badge"></Tag>
-                                                    </nuxt-link>
+                                                    </router-link>
                                                 </li>
                                             </ul>
                                         </div>
                                     </transition>
                                 </div>
-                            </nuxt-link>
+                            </router-link>
                         </template>
                     </template>
                 </div>
@@ -85,6 +85,7 @@ export default {
     mounted() {
         this.menu.forEach((route) => {
             let childRoute = { ...route };
+
             childRoute.children = childRoute.children.filter((child) => {
                 if (child.meta) {
                     this.routes.push(child);
@@ -107,8 +108,10 @@ export default {
                 return true;
             } else if (routerIsActive) {
                 this.activeSubmenus[name] = true;
+
                 return true;
             }
+
             return false;
         },
         searchRoute(event) {
@@ -117,6 +120,7 @@ export default {
 
             for (let route of this.routes) {
                 let filteredItems = FilterService.filter(route.children, ['to', 'href'], query, FilterMatchMode.CONTAINS);
+
                 if (filteredItems && filteredItems.length) {
                     filteredRoutes.push({ name: route.name, children: filteredItems });
                 }
diff --git a/layouts/AppTopBar.vue b/layouts/AppTopBar.vue
index 41ab16047..5c37ff8e6 100755
--- a/layouts/AppTopBar.vue
+++ b/layouts/AppTopBar.vue
@@ -3,9 +3,9 @@
         <a class="menu-button" @click="$emit('menubutton-click')">
             <i class="pi pi-bars"></i>
         </a>
-        <!-- <div class="app-theme" v-tooltip.bottom="$appState.theme">
-            <img :src="'/demo/images/themes/' + logoMap[$appState.theme]" />
-        </div> -->
+        <div v-tooltip.bottom="$appState.theme" class="app-theme">
+            <img :src="'demo/images/themes/' + logoMap[$appState.theme]" />
+        </div>
         <ul ref="topbarMenu" class="topbar-menu">
             <li class="topbar-submenu">
                 <a tabindex="0" @click="toggleMenu($event, 0)">
@@ -15,155 +15,155 @@
                     <ul v-show="activeMenuIndex === 0">
                         <li class="topbar-submenu-header">THEMING</li>
                         <li>
-                            <nuxt-link to="/theming"><i class="pi pi-fw pi-file" /><span>Guide</span></nuxt-link>
+                            <router-link to="/theming"><i class="pi pi-fw pi-file" /><span>Guide</span></router-link>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/designer/primevue"><i class="pi pi-fw pi-palette" /><span>Designer</span></nuxt-link>
+                            <a href="https://www.primefaces.org/designer/primevue"><i class="pi pi-fw pi-palette" /><span>Designer</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/designer-vue"><i class="pi pi-fw pi-desktop" /><span>Visual Editor</span></nuxt-link>
+                            <a href="https://www.primefaces.org/designer-vue"><i class="pi pi-fw pi-desktop" /><span>Visual Editor</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="/icons"><i class="pi pi-fw pi-info-circle" /><span>Icons</span></nuxt-link>
+                            <router-link to="/icons"><i class="pi pi-fw pi-info-circle" /><span>Icons</span></router-link>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.figma.com/community/file/890589747170608208/PrimeOne-Design-Library"><i class="pi pi-fw pi-pencil" /><span>Figma UI Kit</span></nuxt-link>
+                            <a href="https://www.figma.com/community/file/890589747170608208/PrimeOne-Design-Library"><i class="pi pi-fw pi-pencil" /><span>Figma UI Kit</span></a>
                         </li>
 
                         <li class="topbar-submenu-header">BOOTSTRAP</li>
                         <li>
-                            <a @click="changeTheme($event, 'bootstrap4-light-blue')"><img src="/demo/images/themes/bootstrap4-light-blue.svg" alt="Blue Light" /><span>Blue Light</span></a>
+                            <a @click="changeTheme($event, 'bootstrap4-light-blue')"><img src="demo/images/themes/bootstrap4-light-blue.svg" alt="Blue Light" /><span>Blue Light</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'bootstrap4-light-purple')"><img src="/demo/images/themes/bootstrap4-light-purple.svg" alt="Purple Light" /><span>Purple Light</span></a>
+                            <a @click="changeTheme($event, 'bootstrap4-light-purple')"><img src="demo/images/themes/bootstrap4-light-purple.svg" alt="Purple Light" /><span>Purple Light</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'bootstrap4-dark-blue', true)"><img src="/demo/images/themes/bootstrap4-dark-blue.svg" alt="Blue Dark" /><span>Blue Dark</span></a>
+                            <a @click="changeTheme($event, 'bootstrap4-dark-blue', true)"><img src="demo/images/themes/bootstrap4-dark-blue.svg" alt="Blue Dark" /><span>Blue Dark</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'bootstrap4-dark-purple', true)"><img src="/demo/images/themes/bootstrap4-dark-purple.svg" alt="Purple Dark" /><span>Purple Dark</span></a>
+                            <a @click="changeTheme($event, 'bootstrap4-dark-purple', true)"><img src="demo/images/themes/bootstrap4-dark-purple.svg" alt="Purple Dark" /><span>Purple Dark</span></a>
                         </li>
 
                         <li class="topbar-submenu-header">MATERIAL DESIGN</li>
                         <li>
-                            <a @click="changeTheme($event, 'md-light-indigo')"><img src="/demo/images/themes/md-light-indigo.svg" alt="Indigo Light" /><span>Indigo Light</span></a>
+                            <a @click="changeTheme($event, 'md-light-indigo')"><img src="demo/images/themes/md-light-indigo.svg" alt="Indigo Light" /><span>Indigo Light</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'md-light-deeppurple')"><img src="/demo/images/themes/md-light-deeppurple.svg" alt="Deep Purple Light" /><span>Deep Purple Light</span></a>
+                            <a @click="changeTheme($event, 'md-light-deeppurple')"><img src="demo/images/themes/md-light-deeppurple.svg" alt="Deep Purple Light" /><span>Deep Purple Light</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'md-dark-indigo', true)"><img src="/demo/images/themes/md-dark-indigo.svg" alt="Indigo Dark" /><span>Indigo Dark</span></a>
+                            <a @click="changeTheme($event, 'md-dark-indigo', true)"><img src="demo/images/themes/md-dark-indigo.svg" alt="Indigo Dark" /><span>Indigo Dark</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'md-dark-deeppurple', true)"><img src="/demo/images/themes/md-dark-deeppurple.svg" alt="Deep Purple Dark" /><span>Deep Purple Dark</span></a>
+                            <a @click="changeTheme($event, 'md-dark-deeppurple', true)"><img src="demo/images/themes/md-dark-deeppurple.svg" alt="Deep Purple Dark" /><span>Deep Purple Dark</span></a>
                         </li>
 
                         <li class="topbar-submenu-header">MATERIAL DESIGN COMPACT</li>
                         <li>
-                            <a @click="changeTheme($event, 'mdc-light-indigo')"><img src="/demo/images/themes/md-light-indigo.svg" alt="Indigo Light" /><span>Indigo Light</span></a>
+                            <a @click="changeTheme($event, 'mdc-light-indigo')"><img src="demo/images/themes/md-light-indigo.svg" alt="Indigo Light" /><span>Indigo Light</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'mdc-light-deeppurple')"><img src="/demo/images/themes/md-light-deeppurple.svg" alt="Deep Purple Light" /><span>Deep Purple Light</span></a>
+                            <a @click="changeTheme($event, 'mdc-light-deeppurple')"><img src="demo/images/themes/md-light-deeppurple.svg" alt="Deep Purple Light" /><span>Deep Purple Light</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'mdc-dark-indigo', true)"><img src="/demo/images/themes/md-dark-indigo.svg" alt="Indigo Dark" /><span>Indigo Dark</span></a>
+                            <a @click="changeTheme($event, 'mdc-dark-indigo', true)"><img src="demo/images/themes/md-dark-indigo.svg" alt="Indigo Dark" /><span>Indigo Dark</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'mdc-dark-deeppurple', true)"><img src="/demo/images/themes/md-dark-deeppurple.svg" alt="Deep Purple Dark" /><span>Deep Purple Dark</span></a>
+                            <a @click="changeTheme($event, 'mdc-dark-deeppurple', true)"><img src="demo/images/themes/md-dark-deeppurple.svg" alt="Deep Purple Dark" /><span>Deep Purple Dark</span></a>
                         </li>
 
                         <li class="topbar-submenu-header">TAILWIND</li>
                         <li>
-                            <a @click="changeTheme($event, 'tailwind-light')"><img src="/demo/images/themes/tailwind-light.png" alt="Tailwind Light" /><span>Tailwind Light</span></a>
+                            <a @click="changeTheme($event, 'tailwind-light')"><img src="demo/images/themes/tailwind-light.png" alt="Tailwind Light" /><span>Tailwind Light</span></a>
                         </li>
 
                         <li class="topbar-submenu-header">FLUENT UI</li>
                         <li>
-                            <a @click="changeTheme($event, 'fluent-light')"><img src="/demo/images/themes/fluent-light.png" alt="Fluent Light" /><span>Fluent Light</span></a>
+                            <a @click="changeTheme($event, 'fluent-light')"><img src="demo/images/themes/fluent-light.png" alt="Fluent Light" /><span>Fluent Light</span></a>
                         </li>
 
                         <li class="topbar-submenu-header flex align-items-center">PRIMEONE 2022 <Tag class="ml-3" value="NEW" rounded severity="success"></Tag></li>
                         <li>
-                            <a @click="changeTheme($event, 'lara-light-indigo')"><img src="/demo/images/themes/lara-light-indigo.png" alt="Lara Light Indigo" /><span>Lara Light Indigo</span></a>
+                            <a @click="changeTheme($event, 'lara-light-indigo')"><img src="demo/images/themes/lara-light-indigo.png" alt="Lara Light Indigo" /><span>Lara Light Indigo</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'lara-light-blue')"><img src="/demo/images/themes/lara-light-blue.png" alt="Lara Light Blue" /><span>Lara Light Blue</span></a>
+                            <a @click="changeTheme($event, 'lara-light-blue')"><img src="demo/images/themes/lara-light-blue.png" alt="Lara Light Blue" /><span>Lara Light Blue</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'lara-light-purple')"><img src="/demo/images/themes/lara-light-purple.png" alt="Lara Light Purple" /><span>Lara Light Purple</span></a>
+                            <a @click="changeTheme($event, 'lara-light-purple')"><img src="demo/images/themes/lara-light-purple.png" alt="Lara Light Purple" /><span>Lara Light Purple</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'lara-light-teal')"><img src="/demo/images/themes/lara-light-teal.png" alt="Lara Light Teal" /><span>Lara Light Teal</span></a>
+                            <a @click="changeTheme($event, 'lara-light-teal')"><img src="demo/images/themes/lara-light-teal.png" alt="Lara Light Teal" /><span>Lara Light Teal</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'lara-dark-blue')"><img src="/demo/images/themes/lara-dark-blue.png" alt="Lara Dark Blue" /><span>Lara Dark Blue</span></a>
+                            <a @click="changeTheme($event, 'lara-dark-blue')"><img src="demo/images/themes/lara-dark-blue.png" alt="Lara Dark Blue" /><span>Lara Dark Blue</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'lara-dark-indigo')"><img src="/demo/images/themes/lara-dark-indigo.png" alt="Lara Dark Indigo" /><span>Lara Dark Indigo</span></a>
+                            <a @click="changeTheme($event, 'lara-dark-indigo')"><img src="demo/images/themes/lara-dark-indigo.png" alt="Lara Dark Indigo" /><span>Lara Dark Indigo</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'lara-dark-purple')"><img src="/demo/images/themes/lara-dark-purple.png" alt="Lara Dark Purple" /><span>Lara Dark Purple</span></a>
+                            <a @click="changeTheme($event, 'lara-dark-purple')"><img src="demo/images/themes/lara-dark-purple.png" alt="Lara Dark Purple" /><span>Lara Dark Purple</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'lara-dark-teal')"><img src="/demo/images/themes/lara-dark-teal.png" alt="Lara Dark Teal" /><span>Lara Dark Teal</span></a>
+                            <a @click="changeTheme($event, 'lara-dark-teal')"><img src="demo/images/themes/lara-dark-teal.png" alt="Lara Dark Teal" /><span>Lara Dark Teal</span></a>
                         </li>
 
                         <li class="topbar-submenu-header">PRIMEONE 2021</li>
                         <li>
-                            <a @click="changeTheme($event, 'saga-blue')"><img src="/demo/images/themes/saga-blue.png" alt="Saga Blue" /><span>Saga Blue</span></a>
+                            <a @click="changeTheme($event, 'saga-blue')"><img src="demo/images/themes/saga-blue.png" alt="Saga Blue" /><span>Saga Blue</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'saga-green')"><img src="/demo/images/themes/saga-green.png" alt="Saga Green" /><span>Saga Green</span></a>
+                            <a @click="changeTheme($event, 'saga-green')"><img src="demo/images/themes/saga-green.png" alt="Saga Green" /><span>Saga Green</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'saga-orange')"><img src="/demo/images/themes/saga-orange.png" alt="Saga Orange" /><span>Saga Orange</span></a>
+                            <a @click="changeTheme($event, 'saga-orange')"><img src="demo/images/themes/saga-orange.png" alt="Saga Orange" /><span>Saga Orange</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'saga-purple')"><img src="/demo/images/themes/saga-purple.png" alt="Saga Purple" /><span>Saga Purple</span></a>
+                            <a @click="changeTheme($event, 'saga-purple')"><img src="demo/images/themes/saga-purple.png" alt="Saga Purple" /><span>Saga Purple</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'vela-blue', true)"><img src="/demo/images/themes/vela-blue.png" alt="Vela Blue" /><span>Vela Blue</span></a>
+                            <a @click="changeTheme($event, 'vela-blue', true)"><img src="demo/images/themes/vela-blue.png" alt="Vela Blue" /><span>Vela Blue</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'vela-green', true)"><img src="/demo/images/themes/vela-green.png" alt="Vela Green" /><span>Vela Green</span></a>
+                            <a @click="changeTheme($event, 'vela-green', true)"><img src="demo/images/themes/vela-green.png" alt="Vela Green" /><span>Vela Green</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'vela-orange', true)"><img src="/demo/images/themes/vela-orange.png" alt="Vela Orange" /><span>Vela Orange</span></a>
+                            <a @click="changeTheme($event, 'vela-orange', true)"><img src="demo/images/themes/vela-orange.png" alt="Vela Orange" /><span>Vela Orange</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'vela-purple', true)"><img src="/demo/images/themes/vela-purple.png" alt="Vela Purple" /><span>Vela Purple</span></a>
+                            <a @click="changeTheme($event, 'vela-purple', true)"><img src="demo/images/themes/vela-purple.png" alt="Vela Purple" /><span>Vela Purple</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'arya-blue', true)"><img src="/demo/images/themes/arya-blue.png" alt="Arya Blue" /><span>Arya Blue</span></a>
+                            <a @click="changeTheme($event, 'arya-blue', true)"><img src="demo/images/themes/arya-blue.png" alt="Arya Blue" /><span>Arya Blue</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'arya-green', true)"><img src="/demo/images/themes/arya-green.png" alt="Arya Green" /><span>Arya Green</span></a>
+                            <a @click="changeTheme($event, 'arya-green', true)"><img src="demo/images/themes/arya-green.png" alt="Arya Green" /><span>Arya Green</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'arya-orange', true)"><img src="/demo/images/themes/arya-orange.png" alt="Arya Orange" /><span>Arya Orange</span></a>
+                            <a @click="changeTheme($event, 'arya-orange', true)"><img src="demo/images/themes/arya-orange.png" alt="Arya Orange" /><span>Arya Orange</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'arya-purple', true)"><img src="/demo/images/themes/arya-purple.png" alt="Arya Purple" /><span>Arya Purple</span></a>
+                            <a @click="changeTheme($event, 'arya-purple', true)"><img src="demo/images/themes/arya-purple.png" alt="Arya Purple" /><span>Arya Purple</span></a>
                         </li>
 
                         <li class="topbar-submenu-header">PREMIUM</li>
                         <li>
-                            <a @click="changeTheme($event, 'soho-light')"><img src="/demo/images/themes/soho-light.png" alt="Soho Light" /><span>Soho Light</span></a>
+                            <a @click="changeTheme($event, 'soho-light')"><img src="demo/images/themes/soho-light.png" alt="Soho Light" /><span>Soho Light</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'soho-dark', true)"><img src="/demo/images/themes/soho-dark.png" alt="Soho Dark" /><span>Soho Dark</span></a>
+                            <a @click="changeTheme($event, 'soho-dark', true)"><img src="demo/images/themes/soho-dark.png" alt="Soho Dark" /><span>Soho Dark</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'viva-light')"><img src="/demo/images/themes/viva-light.svg" alt="Viva Light" /><span>Viva Light</span></a>
+                            <a @click="changeTheme($event, 'viva-light')"><img src="demo/images/themes/viva-light.svg" alt="Viva Light" /><span>Viva Light</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'viva-dark', true)"><img src="/demo/images/themes/viva-dark.svg" alt="Viva Dark" /><span>Viva Dark</span></a>
+                            <a @click="changeTheme($event, 'viva-dark', true)"><img src="demo/images/themes/viva-dark.svg" alt="Viva Dark" /><span>Viva Dark</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'mira')"><img src="/demo/images/themes/mira.jpg" alt="Mira" /><span>Mira</span></a>
+                            <a @click="changeTheme($event, 'mira')"><img src="demo/images/themes/mira.jpg" alt="Mira" /><span>Mira</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'nano')"><img src="/demo/images/themes/nano.jpg" alt="Nano" /><span>Nano</span></a>
+                            <a @click="changeTheme($event, 'nano')"><img src="demo/images/themes/nano.jpg" alt="Nano" /><span>Nano</span></a>
                         </li>
                     </ul>
                 </transition>
@@ -174,67 +174,63 @@
                     <ul v-show="activeMenuIndex === 1">
                         <li class="topbar-submenu-header">FREE ADMIN TEMPLATE</li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/sakai-vue"><img src="@/assets/images/layouts/themeswitcher-sakai.svg" alt="Sakai" /><span>Sakai</span></nuxt-link>
+                            <a href="https://www.primefaces.org/sakai-vue"><img src="./assets/images/layouts/themeswitcher-sakai.svg" alt="Sakai" /><span>Sakai</span></a>
                         </li>
                         <li class="topbar-submenu-header">PREMIUM ADMIN TEMPLATES</li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/atlantis-vue"><img src="@/assets/images/layouts/themeswitcher-atlantis.svg" alt="Atlantis" /><span>Atlantis</span></nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/atlantis-vue"><img src="./assets/images/layouts/themeswitcher-atlantis.svg" alt="Atlantis" /><span>Atlantis</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/freya-vue"><img src="@/assets/images/layouts/themeswitcher-freya.png" alt="Freya" /><span>Freya</span></nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/freya-vue"><img src="./assets/images/layouts/themeswitcher-freya.png" alt="Freya" /><span>Freya</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/diamond-vue"><img src="@/assets/images/layouts/themeswitcher-diamond.png" alt="Diamond" /><span>Diamond</span></nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/diamond-vue"><img src="./assets/images/layouts/themeswitcher-diamond.png" alt="Diamond" /><span>Diamond</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/verona-vue"><img src="@/assets/images/layouts/themeswitcher-verona.png" alt="Verona" /><span>Verona</span></nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/verona-vue"><img src="./assets/images/layouts/themeswitcher-verona.png" alt="Verona" /><span>Verona</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/poseidon-vue"><img src="@/assets/images/layouts/themeswitcher-poseidon.svg" alt="Poseidon" /><span>Poseidon</span></nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/poseidon-vue"><img src="./assets/images/layouts/themeswitcher-poseidon.svg" alt="Poseidon" /><span>Poseidon</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/sapphire-vue"
-                                ><img src="@/assets/images/layouts/themeswitcher-sapphire.png" alt="Sapphire" /><span>Sapphire</span><span class="theme-badge material">material</span></nuxt-link
-                            >
+                            <a href="https://www.primefaces.org/layouts/sapphire-vue"><img src="./assets/images/layouts/themeswitcher-sapphire.png" alt="Sapphire" /><span>Sapphire</span><span class="theme-badge material">material</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/serenity-vue"
-                                ><img src="@/assets/images/layouts/themeswitcher-serenity.png" alt="Serenity" /><span>Serenity</span><span class="theme-badge material">material</span></nuxt-link
-                            >
+                            <a href="https://www.primefaces.org/layouts/serenity-vue"><img src="./assets/images/layouts/themeswitcher-serenity.png" alt="Serenity" /><span>Serenity</span><span class="theme-badge material">material</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/ultima-vue"><img src="@/assets/images/layouts/themeswitcher-ultima.png" alt="Ultima" /><span>Ultima</span><span class="theme-badge material">material</span></nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/ultima-vue"><img src="./assets/images/layouts/themeswitcher-ultima.png" alt="Ultima" /><span>Ultima</span><span class="theme-badge material">material</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/avalon-vue"><img src="@/assets/images/layouts/themeswitcher-avalon.png" alt="Avalon" /><span>Avalon</span><span class="theme-badge bootstrap">bootstrap</span></nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/avalon-vue"><img src="./assets/images/layouts/themeswitcher-avalon.png" alt="Avalon" /><span>Avalon</span><span class="theme-badge bootstrap">bootstrap</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/babylon-vue"><img src="@/assets/images/layouts/themeswitcher-babylon.png" alt="Babylon" /><span>Babylon</span></nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/babylon-vue"><img src="./assets/images/layouts/themeswitcher-babylon.png" alt="Babylon" /><span>Babylon</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/apollo-vue"><img src="@/assets/images/layouts/themeswitcher-apollo.png" alt="Apollo" /><span>Apollo</span><span class="theme-badge darkmode">dark mode</span></nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/apollo-vue"><img src="./assets/images/layouts/themeswitcher-apollo.png" alt="Apollo" /><span>Apollo</span><span class="theme-badge darkmode">dark mode</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/roma-vue"><img src="@/assets/images/layouts/themeswitcher-roma.jpg" alt="Roma" /><span>Roma</span></nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/roma-vue"><img src="./assets/images/layouts/themeswitcher-roma.jpg" alt="Roma" /><span>Roma</span></a>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/layouts/prestige-vue"><img src="@/assets/images/layouts/themeswitcher-prestige.png" alt="Prestige" /><span>Prestige</span></nuxt-link>
+                            <a href="https://www.primefaces.org/layouts/prestige-vue"><img src="./assets/images/layouts/themeswitcher-prestige.png" alt="Prestige" /><span>Prestige</span></a>
                         </li>
                     </ul>
                 </transition>
             </li>
             <li class="topbar-submenu topbar-resources-submenu">
-                <nuxt-link to="https://www.primefaces.org/primeblocks-vue/#/" target="_blank"><span>Blocks</span></nuxt-link>
+                <a href="https://www.primefaces.org/primeblocks-vue/#/" target="_blank"><span>Blocks</span></a>
             </li>
             <li class="topbar-submenu">
-                <a tabindex="0" @click="toggleMenu($event, 3)">v3.16.2</a>
+                <a tabindex="0" @click="toggleMenu($event, 3)">v3.21.0</a>
                 <transition name="p-connected-overlay" @enter="onMenuEnter">
                     <ul v-show="activeMenuIndex === 3" style="width: 100%">
                         <li>
-                            <nuxt-link to="/"><span class="m-0">v3.16.2</span></nuxt-link>
+                            <router-link to="/"><span class="m-0">v3.21.0</span></router-link>
                         </li>
                         <li>
-                            <nuxt-link to="https://www.primefaces.org/primevue-v2"><span class="m-0">v2.10.0</span></nuxt-link>
+                            <a href="https://www.primefaces.org/primevue-v2"><span class="m-0">v2.10.1</span></a>
                         </li>
                     </ul>
                 </transition>
@@ -244,16 +240,12 @@
 </template>
 
 <script>
-import EventBus from './AppEventBus';
+import EventBus from '@/layouts/AppEventBus';
 
 export default {
+    emits: ['menubutton-click'],
     outsideClickListener: null,
     darkDemoStyle: null,
-    watch: {
-        $route() {
-            this.activeMenuIndex = null;
-        }
-    },
     data() {
         return {
             activeMenuIndex: null,
@@ -310,6 +302,11 @@ export default {
             }
         };
     },
+    watch: {
+        $route() {
+            this.activeMenuIndex = null;
+        }
+    },
     scrollListener: null,
     container: null,
     mounted() {
@@ -342,6 +339,7 @@ export default {
                     };
                 }
             }
+
             window.addEventListener('scroll', this.scrollListener);
         },
         unbindScrollListener() {
@@ -358,6 +356,7 @@ export default {
                         this.unbindOutsideClickListener();
                     }
                 };
+
                 document.addEventListener('click', this.outsideClickListener);
             }
         },