diff --git a/public/demo/images/themes/arya-blue.png b/assets/demo/images/themes/arya-blue.png
similarity index 100%
rename from public/demo/images/themes/arya-blue.png
rename to assets/demo/images/themes/arya-blue.png
diff --git a/public/demo/images/themes/arya-green.png b/assets/demo/images/themes/arya-green.png
similarity index 100%
rename from public/demo/images/themes/arya-green.png
rename to assets/demo/images/themes/arya-green.png
diff --git a/public/demo/images/themes/arya-orange.png b/assets/demo/images/themes/arya-orange.png
similarity index 100%
rename from public/demo/images/themes/arya-orange.png
rename to assets/demo/images/themes/arya-orange.png
diff --git a/public/demo/images/themes/arya-purple.png b/assets/demo/images/themes/arya-purple.png
similarity index 100%
rename from public/demo/images/themes/arya-purple.png
rename to assets/demo/images/themes/arya-purple.png
diff --git a/public/demo/images/themes/bootstrap4-dark-blue.svg b/assets/demo/images/themes/bootstrap4-dark-blue.svg
similarity index 100%
rename from public/demo/images/themes/bootstrap4-dark-blue.svg
rename to assets/demo/images/themes/bootstrap4-dark-blue.svg
diff --git a/public/demo/images/themes/bootstrap4-dark-purple.svg b/assets/demo/images/themes/bootstrap4-dark-purple.svg
similarity index 100%
rename from public/demo/images/themes/bootstrap4-dark-purple.svg
rename to assets/demo/images/themes/bootstrap4-dark-purple.svg
diff --git a/public/demo/images/themes/bootstrap4-light-blue.svg b/assets/demo/images/themes/bootstrap4-light-blue.svg
similarity index 100%
rename from public/demo/images/themes/bootstrap4-light-blue.svg
rename to assets/demo/images/themes/bootstrap4-light-blue.svg
diff --git a/public/demo/images/themes/bootstrap4-light-purple.svg b/assets/demo/images/themes/bootstrap4-light-purple.svg
similarity index 100%
rename from public/demo/images/themes/bootstrap4-light-purple.svg
rename to assets/demo/images/themes/bootstrap4-light-purple.svg
diff --git a/public/demo/images/themes/fluent-light.png b/assets/demo/images/themes/fluent-light.png
similarity index 100%
rename from public/demo/images/themes/fluent-light.png
rename to assets/demo/images/themes/fluent-light.png
diff --git a/public/demo/images/themes/lara-dark-blue.png b/assets/demo/images/themes/lara-dark-blue.png
similarity index 100%
rename from public/demo/images/themes/lara-dark-blue.png
rename to assets/demo/images/themes/lara-dark-blue.png
diff --git a/public/demo/images/themes/lara-dark-indigo.png b/assets/demo/images/themes/lara-dark-indigo.png
similarity index 100%
rename from public/demo/images/themes/lara-dark-indigo.png
rename to assets/demo/images/themes/lara-dark-indigo.png
diff --git a/public/demo/images/themes/lara-dark-purple.png b/assets/demo/images/themes/lara-dark-purple.png
similarity index 100%
rename from public/demo/images/themes/lara-dark-purple.png
rename to assets/demo/images/themes/lara-dark-purple.png
diff --git a/public/demo/images/themes/lara-dark-teal.png b/assets/demo/images/themes/lara-dark-teal.png
similarity index 100%
rename from public/demo/images/themes/lara-dark-teal.png
rename to assets/demo/images/themes/lara-dark-teal.png
diff --git a/public/demo/images/themes/lara-light-blue.png b/assets/demo/images/themes/lara-light-blue.png
similarity index 100%
rename from public/demo/images/themes/lara-light-blue.png
rename to assets/demo/images/themes/lara-light-blue.png
diff --git a/public/demo/images/themes/lara-light-indigo.png b/assets/demo/images/themes/lara-light-indigo.png
similarity index 100%
rename from public/demo/images/themes/lara-light-indigo.png
rename to assets/demo/images/themes/lara-light-indigo.png
diff --git a/public/demo/images/themes/lara-light-purple.png b/assets/demo/images/themes/lara-light-purple.png
similarity index 100%
rename from public/demo/images/themes/lara-light-purple.png
rename to assets/demo/images/themes/lara-light-purple.png
diff --git a/public/demo/images/themes/lara-light-teal.png b/assets/demo/images/themes/lara-light-teal.png
similarity index 100%
rename from public/demo/images/themes/lara-light-teal.png
rename to assets/demo/images/themes/lara-light-teal.png
diff --git a/public/demo/images/themes/luna-amber.png b/assets/demo/images/themes/luna-amber.png
similarity index 100%
rename from public/demo/images/themes/luna-amber.png
rename to assets/demo/images/themes/luna-amber.png
diff --git a/public/demo/images/themes/luna-blue.png b/assets/demo/images/themes/luna-blue.png
similarity index 100%
rename from public/demo/images/themes/luna-blue.png
rename to assets/demo/images/themes/luna-blue.png
diff --git a/public/demo/images/themes/luna-green.png b/assets/demo/images/themes/luna-green.png
similarity index 100%
rename from public/demo/images/themes/luna-green.png
rename to assets/demo/images/themes/luna-green.png
diff --git a/public/demo/images/themes/luna-pink.png b/assets/demo/images/themes/luna-pink.png
similarity index 100%
rename from public/demo/images/themes/luna-pink.png
rename to assets/demo/images/themes/luna-pink.png
diff --git a/public/demo/images/themes/md-dark-deeppurple.svg b/assets/demo/images/themes/md-dark-deeppurple.svg
similarity index 100%
rename from public/demo/images/themes/md-dark-deeppurple.svg
rename to assets/demo/images/themes/md-dark-deeppurple.svg
diff --git a/public/demo/images/themes/md-dark-indigo.svg b/assets/demo/images/themes/md-dark-indigo.svg
similarity index 100%
rename from public/demo/images/themes/md-dark-indigo.svg
rename to assets/demo/images/themes/md-dark-indigo.svg
diff --git a/public/demo/images/themes/md-light-deeppurple.svg b/assets/demo/images/themes/md-light-deeppurple.svg
similarity index 100%
rename from public/demo/images/themes/md-light-deeppurple.svg
rename to assets/demo/images/themes/md-light-deeppurple.svg
diff --git a/public/demo/images/themes/md-light-indigo.svg b/assets/demo/images/themes/md-light-indigo.svg
similarity index 100%
rename from public/demo/images/themes/md-light-indigo.svg
rename to assets/demo/images/themes/md-light-indigo.svg
diff --git a/public/demo/images/themes/mira.jpg b/assets/demo/images/themes/mira.jpg
similarity index 100%
rename from public/demo/images/themes/mira.jpg
rename to assets/demo/images/themes/mira.jpg
diff --git a/public/demo/images/themes/nano.jpg b/assets/demo/images/themes/nano.jpg
similarity index 100%
rename from public/demo/images/themes/nano.jpg
rename to assets/demo/images/themes/nano.jpg
diff --git a/public/demo/images/themes/nova-accent.png b/assets/demo/images/themes/nova-accent.png
similarity index 100%
rename from public/demo/images/themes/nova-accent.png
rename to assets/demo/images/themes/nova-accent.png
diff --git a/public/demo/images/themes/nova-alt.png b/assets/demo/images/themes/nova-alt.png
similarity index 100%
rename from public/demo/images/themes/nova-alt.png
rename to assets/demo/images/themes/nova-alt.png
diff --git a/public/demo/images/themes/nova-vue.png b/assets/demo/images/themes/nova-vue.png
similarity index 100%
rename from public/demo/images/themes/nova-vue.png
rename to assets/demo/images/themes/nova-vue.png
diff --git a/public/demo/images/themes/nova.png b/assets/demo/images/themes/nova.png
similarity index 100%
rename from public/demo/images/themes/nova.png
rename to assets/demo/images/themes/nova.png
diff --git a/public/demo/images/themes/rhea.png b/assets/demo/images/themes/rhea.png
similarity index 100%
rename from public/demo/images/themes/rhea.png
rename to assets/demo/images/themes/rhea.png
diff --git a/public/demo/images/themes/saga-blue.png b/assets/demo/images/themes/saga-blue.png
similarity index 100%
rename from public/demo/images/themes/saga-blue.png
rename to assets/demo/images/themes/saga-blue.png
diff --git a/public/demo/images/themes/saga-green.png b/assets/demo/images/themes/saga-green.png
similarity index 100%
rename from public/demo/images/themes/saga-green.png
rename to assets/demo/images/themes/saga-green.png
diff --git a/public/demo/images/themes/saga-orange.png b/assets/demo/images/themes/saga-orange.png
similarity index 100%
rename from public/demo/images/themes/saga-orange.png
rename to assets/demo/images/themes/saga-orange.png
diff --git a/public/demo/images/themes/saga-purple.png b/assets/demo/images/themes/saga-purple.png
similarity index 100%
rename from public/demo/images/themes/saga-purple.png
rename to assets/demo/images/themes/saga-purple.png
diff --git a/public/demo/images/themes/soho-dark.png b/assets/demo/images/themes/soho-dark.png
similarity index 100%
rename from public/demo/images/themes/soho-dark.png
rename to assets/demo/images/themes/soho-dark.png
diff --git a/public/demo/images/themes/soho-light.png b/assets/demo/images/themes/soho-light.png
similarity index 100%
rename from public/demo/images/themes/soho-light.png
rename to assets/demo/images/themes/soho-light.png
diff --git a/public/demo/images/themes/tailwind-light.png b/assets/demo/images/themes/tailwind-light.png
similarity index 100%
rename from public/demo/images/themes/tailwind-light.png
rename to assets/demo/images/themes/tailwind-light.png
diff --git a/public/demo/images/themes/vela-blue.png b/assets/demo/images/themes/vela-blue.png
similarity index 100%
rename from public/demo/images/themes/vela-blue.png
rename to assets/demo/images/themes/vela-blue.png
diff --git a/public/demo/images/themes/vela-green.png b/assets/demo/images/themes/vela-green.png
similarity index 100%
rename from public/demo/images/themes/vela-green.png
rename to assets/demo/images/themes/vela-green.png
diff --git a/public/demo/images/themes/vela-orange.png b/assets/demo/images/themes/vela-orange.png
similarity index 100%
rename from public/demo/images/themes/vela-orange.png
rename to assets/demo/images/themes/vela-orange.png
diff --git a/public/demo/images/themes/vela-purple.png b/assets/demo/images/themes/vela-purple.png
similarity index 100%
rename from public/demo/images/themes/vela-purple.png
rename to assets/demo/images/themes/vela-purple.png
diff --git a/public/demo/images/themes/viva-dark.svg b/assets/demo/images/themes/viva-dark.svg
similarity index 100%
rename from public/demo/images/themes/viva-dark.svg
rename to assets/demo/images/themes/viva-dark.svg
diff --git a/public/demo/images/themes/viva-light.svg b/assets/demo/images/themes/viva-light.svg
similarity index 100%
rename from public/demo/images/themes/viva-light.svg
rename to assets/demo/images/themes/viva-light.svg
diff --git a/layouts/AppConfigurator.vue b/layouts/AppConfigurator.vue
index 2edd8dba3..8f65a5b62 100755
--- a/layouts/AppConfigurator.vue
+++ b/layouts/AppConfigurator.vue
@@ -29,25 +29,25 @@
                     <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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/demo/images/themes/lara-dark-teal.png" alt="Lara Dark Teal" />
                             </button>
                             <span>Lara Dark Teal</span>
                         </div>
@@ -185,73 +185,73 @@
                     <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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/demo/images/themes/arya-purple.png" alt="Arya Purple" />
                             </button>
                             <span>Arya Purple</span>
                         </div>
@@ -262,37 +262,37 @@
                     <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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/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="@/assets/demo/images/themes/nano.jpg" alt="Mira" />
                             </button>
                             <span>Nano</span>
                         </div>
diff --git a/layouts/AppTopBar.vue b/layouts/AppTopBar.vue
index 584ff1c32..0bc82b977 100755
--- a/layouts/AppTopBar.vue
+++ b/layouts/AppTopBar.vue
@@ -32,138 +32,138 @@
 
                         <li class="topbar-submenu-header">BOOTSTRAP</li>
                         <li>
-                            <a @click="changeTheme($event, 'bootstrap4-light-blue')"><img :src="baseUrl + 'demo/images/themes/bootstrap4-light-blue.svg'" alt="Blue Light" /><span>Blue Light</span></a>
+                            <a @click="changeTheme($event, 'bootstrap4-light-blue')"><img src="@/assets/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="baseUrl + 'demo/images/themes/bootstrap4-light-purple.svg'" alt="Purple Light" /><span>Purple Light</span></a>
+                            <a @click="changeTheme($event, 'bootstrap4-light-purple')"><img src="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + 'demo/images/themes/md-light-indigo.svg'" alt="Indigo Light" /><span>Indigo Light</span></a>
+                            <a @click="changeTheme($event, 'md-light-indigo')"><img src="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + 'demo/images/themes/md-light-indigo.svg'" alt="Indigo Light" /><span>Indigo Light</span></a>
+                            <a @click="changeTheme($event, 'mdc-light-indigo')"><img src="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + 'demo/images/themes/tailwind-light.png'" alt="Tailwind Light" /><span>Tailwind Light</span></a>
+                            <a @click="changeTheme($event, 'tailwind-light')"><img src="@/assets/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="baseUrl + 'demo/images/themes/fluent-light.png'" alt="Fluent Light" /><span>Fluent Light</span></a>
+                            <a @click="changeTheme($event, 'fluent-light')"><img src="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + '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="@/assets/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="baseUrl + 'demo/images/themes/saga-blue.png'" alt="Saga Blue" /><span>Saga Blue</span></a>
+                            <a @click="changeTheme($event, 'saga-blue')"><img src="@/assets/demo/images/themes/saga-blue.png" alt="Saga Blue" /><span>Saga Blue</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'saga-green')"><img :src="baseUrl + 'demo/images/themes/saga-green.png'" alt="Saga Green" /><span>Saga Green</span></a>
+                            <a @click="changeTheme($event, 'saga-green')"><img src="@/assets/demo/images/themes/saga-green.png" alt="Saga Green" /><span>Saga Green</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'saga-orange')"><img :src="baseUrl + 'demo/images/themes/saga-orange.png'" alt="Saga Orange" /><span>Saga Orange</span></a>
+                            <a @click="changeTheme($event, 'saga-orange')"><img src="@/assets/demo/images/themes/saga-orange.png" alt="Saga Orange" /><span>Saga Orange</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'saga-purple')"><img :src="baseUrl + 'demo/images/themes/saga-purple.png'" alt="Saga Purple" /><span>Saga Purple</span></a>
+                            <a @click="changeTheme($event, 'saga-purple')"><img src="@/assets/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="baseUrl + 'demo/images/themes/vela-blue.png'" alt="Vela Blue" /><span>Vela Blue</span></a>
+                            <a @click="changeTheme($event, 'vela-blue', true)"><img src="@/assets/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="baseUrl + 'demo/images/themes/vela-green.png'" alt="Vela Green" /><span>Vela Green</span></a>
+                            <a @click="changeTheme($event, 'vela-green', true)"><img src="@/assets/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="baseUrl + 'demo/images/themes/vela-orange.png'" alt="Vela Orange" /><span>Vela Orange</span></a>
+                            <a @click="changeTheme($event, 'vela-orange', true)"><img src="@/assets/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="baseUrl + 'demo/images/themes/vela-purple.png'" alt="Vela Purple" /><span>Vela Purple</span></a>
+                            <a @click="changeTheme($event, 'vela-purple', true)"><img src="@/assets/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="baseUrl + 'demo/images/themes/arya-blue.png'" alt="Arya Blue" /><span>Arya Blue</span></a>
+                            <a @click="changeTheme($event, 'arya-blue', true)"><img src="@/assets/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="baseUrl + 'demo/images/themes/arya-green.png'" alt="Arya Green" /><span>Arya Green</span></a>
+                            <a @click="changeTheme($event, 'arya-green', true)"><img src="@/assets/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="baseUrl + 'demo/images/themes/arya-orange.png'" alt="Arya Orange" /><span>Arya Orange</span></a>
+                            <a @click="changeTheme($event, 'arya-orange', true)"><img src="@/assets/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="baseUrl + 'demo/images/themes/arya-purple.png'" alt="Arya Purple" /><span>Arya Purple</span></a>
+                            <a @click="changeTheme($event, 'arya-purple', true)"><img src="@/assets/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="baseUrl + 'demo/images/themes/soho-light.png'" alt="Soho Light" /><span>Soho Light</span></a>
+                            <a @click="changeTheme($event, 'soho-light')"><img src="@/assets/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="baseUrl + 'demo/images/themes/soho-dark.png'" alt="Soho Dark" /><span>Soho Dark</span></a>
+                            <a @click="changeTheme($event, 'soho-dark', true)"><img src="@/assets/demo/images/themes/soho-dark.png" alt="Soho Dark" /><span>Soho Dark</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'viva-light')"><img :src="baseUrl + 'demo/images/themes/viva-light.svg'" alt="Viva Light" /><span>Viva Light</span></a>
+                            <a @click="changeTheme($event, 'viva-light')"><img src="@/assets/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="baseUrl + 'demo/images/themes/viva-dark.svg'" alt="Viva Dark" /><span>Viva Dark</span></a>
+                            <a @click="changeTheme($event, 'viva-dark', true)"><img src="@/assets/demo/images/themes/viva-dark.svg" alt="Viva Dark" /><span>Viva Dark</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'mira')"><img :src="baseUrl + 'demo/images/themes/mira.jpg'" alt="Mira" /><span>Mira</span></a>
+                            <a @click="changeTheme($event, 'mira')"><img src="@/assets/demo/images/themes/mira.jpg" alt="Mira" /><span>Mira</span></a>
                         </li>
                         <li>
-                            <a @click="changeTheme($event, 'nano')"><img :src="baseUrl + 'demo/images/themes/nano.jpg'" alt="Nano" /><span>Nano</span></a>
+                            <a @click="changeTheme($event, 'nano')"><img src="@/assets/demo/images/themes/nano.jpg" alt="Nano" /><span>Nano</span></a>
                         </li>
                     </ul>
                 </transition>