diff --git a/src/assets/images/themes/arya-blue.png b/public/demo/images/themes/arya-blue.png
similarity index 100%
rename from src/assets/images/themes/arya-blue.png
rename to public/demo/images/themes/arya-blue.png
diff --git a/src/assets/images/themes/arya-green.png b/public/demo/images/themes/arya-green.png
similarity index 100%
rename from src/assets/images/themes/arya-green.png
rename to public/demo/images/themes/arya-green.png
diff --git a/src/assets/images/themes/arya-orange.png b/public/demo/images/themes/arya-orange.png
similarity index 100%
rename from src/assets/images/themes/arya-orange.png
rename to public/demo/images/themes/arya-orange.png
diff --git a/src/assets/images/themes/arya-purple.png b/public/demo/images/themes/arya-purple.png
similarity index 100%
rename from src/assets/images/themes/arya-purple.png
rename to public/demo/images/themes/arya-purple.png
diff --git a/src/assets/images/themes/bootstrap4-dark-blue.svg b/public/demo/images/themes/bootstrap4-dark-blue.svg
similarity index 100%
rename from src/assets/images/themes/bootstrap4-dark-blue.svg
rename to public/demo/images/themes/bootstrap4-dark-blue.svg
diff --git a/src/assets/images/themes/bootstrap4-dark-purple.svg b/public/demo/images/themes/bootstrap4-dark-purple.svg
similarity index 100%
rename from src/assets/images/themes/bootstrap4-dark-purple.svg
rename to public/demo/images/themes/bootstrap4-dark-purple.svg
diff --git a/src/assets/images/themes/bootstrap4-light-blue.svg b/public/demo/images/themes/bootstrap4-light-blue.svg
similarity index 100%
rename from src/assets/images/themes/bootstrap4-light-blue.svg
rename to public/demo/images/themes/bootstrap4-light-blue.svg
diff --git a/src/assets/images/themes/bootstrap4-light-purple.svg b/public/demo/images/themes/bootstrap4-light-purple.svg
similarity index 100%
rename from src/assets/images/themes/bootstrap4-light-purple.svg
rename to public/demo/images/themes/bootstrap4-light-purple.svg
diff --git a/src/assets/images/themes/md-dark-deeppurple.svg b/public/demo/images/themes/md-dark-deeppurple.svg
similarity index 100%
rename from src/assets/images/themes/md-dark-deeppurple.svg
rename to public/demo/images/themes/md-dark-deeppurple.svg
diff --git a/src/assets/images/themes/md-dark-indigo.svg b/public/demo/images/themes/md-dark-indigo.svg
similarity index 100%
rename from src/assets/images/themes/md-dark-indigo.svg
rename to public/demo/images/themes/md-dark-indigo.svg
diff --git a/src/assets/images/themes/md-light-deeppurple.svg b/public/demo/images/themes/md-light-deeppurple.svg
similarity index 100%
rename from src/assets/images/themes/md-light-deeppurple.svg
rename to public/demo/images/themes/md-light-deeppurple.svg
diff --git a/src/assets/images/themes/md-light-indigo.svg b/public/demo/images/themes/md-light-indigo.svg
similarity index 100%
rename from src/assets/images/themes/md-light-indigo.svg
rename to public/demo/images/themes/md-light-indigo.svg
diff --git a/src/assets/images/themes/saga-blue.png b/public/demo/images/themes/saga-blue.png
similarity index 100%
rename from src/assets/images/themes/saga-blue.png
rename to public/demo/images/themes/saga-blue.png
diff --git a/src/assets/images/themes/saga-green.png b/public/demo/images/themes/saga-green.png
similarity index 100%
rename from src/assets/images/themes/saga-green.png
rename to public/demo/images/themes/saga-green.png
diff --git a/src/assets/images/themes/saga-orange.png b/public/demo/images/themes/saga-orange.png
similarity index 100%
rename from src/assets/images/themes/saga-orange.png
rename to public/demo/images/themes/saga-orange.png
diff --git a/src/assets/images/themes/saga-purple.png b/public/demo/images/themes/saga-purple.png
similarity index 100%
rename from src/assets/images/themes/saga-purple.png
rename to public/demo/images/themes/saga-purple.png
diff --git a/src/assets/images/themes/vela-blue.png b/public/demo/images/themes/vela-blue.png
similarity index 100%
rename from src/assets/images/themes/vela-blue.png
rename to public/demo/images/themes/vela-blue.png
diff --git a/src/assets/images/themes/vela-green.png b/public/demo/images/themes/vela-green.png
similarity index 100%
rename from src/assets/images/themes/vela-green.png
rename to public/demo/images/themes/vela-green.png
diff --git a/src/assets/images/themes/vela-orange.png b/public/demo/images/themes/vela-orange.png
similarity index 100%
rename from src/assets/images/themes/vela-orange.png
rename to public/demo/images/themes/vela-orange.png
diff --git a/src/assets/images/themes/vela-purple.png b/public/demo/images/themes/vela-purple.png
similarity index 100%
rename from src/assets/images/themes/vela-purple.png
rename to public/demo/images/themes/vela-purple.png
diff --git a/src/App.vue b/src/App.vue
index eee392a43..506eb7c58 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,8 +18,8 @@
             <router-view/>
             <app-footer />
         </div>
-        <div class="app-theme">
-            <img :src="getLogo()" />
+        <div class="app-theme" v-tooltip.bottom="theme">
+            <img :src="'demo/images/themes/' + logoMap[theme]" />
         </div>
         <Toast />
         <Toast position="topleft" group="tl" />
@@ -46,15 +46,14 @@ export default {
                 'bootstrap4-light-purple': 'bootstrap4-light-purple.svg',
                 'bootstrap4-dark-blue': 'bootstrap4-dark-blue.svg',
                 'bootstrap4-dark-purple': 'bootstrap4-dark-purple.svg',
-                'bootstrap4-dark-purple': 'bootstrap4-dark-purple.svg',
                 'md-light-indigo': 'md-light-indigo.svg',
                 'md-light-purple': 'md-light-purple.svg',
                 'md-dark-indigo': 'md-dark-indigo.svg',
-                'md-dark-indigo': 'md-dark-purple.svg',
+                'md-dark-purple': 'md-dark-purple.svg',
                 'mdc-light-indigo': 'md-light-indigo.svg',
                 'mdc-light-purple': 'md-light-purple.svg',
                 'mdc-dark-indigo': 'md-dark-indigo.svg',
-                'mdc-dark-indigo': 'md-dark-purple.svg',
+                'mdc-dark-purple': 'md-dark-purple.svg',
                 'saga-blue': 'saga-blue.png',
                 'saga-green': 'saga-green.png',
                 'saga-orange': 'saga-orange.png',
@@ -152,11 +151,7 @@ export default {
             }
 
             return false;
-        },
-        getLogo() {
-            var images = require.context('./assets/images/themes', false);
-            return images('./' + this.logoMap[this.theme]);
-        },
+        }
     },
     computed: {
         containerClass() {
diff --git a/src/AppConfigurator.vue b/src/AppConfigurator.vue
index 9cffb9f36..462e5572c 100755
--- a/src/AppConfigurator.vue
+++ b/src/AppConfigurator.vue
@@ -29,25 +29,25 @@
                     <div class="p-grid free-themes">
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/bootstrap4-light-blue.svg" alt="Bootstrap Light Blue" @click="changeTheme($event, 'bootstrap4-light-blue')"/>
+                                <img src="demo/images/themes/bootstrap4-light-blue.svg" alt="Bootstrap Light Blue" @click="changeTheme($event, 'bootstrap4-light-blue')"/>
                             </button>
                             <span>Blue</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/bootstrap4-light-purple.svg" alt="Bootstrap Light Blue" @click="changeTheme($event, 'bootstrap4-light-purple')"/>
+                                <img src="demo/images/themes/bootstrap4-light-purple.svg" alt="Bootstrap Light Blue" @click="changeTheme($event, 'bootstrap4-light-purple')"/>
                             </button>
                             <span>Purple</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/bootstrap4-dark-blue.svg" alt="Bootstrap Dark Blue" @click="changeTheme($event, 'bootstrap4-dark-blue', true)"/>
+                                <img src="demo/images/themes/bootstrap4-dark-blue.svg" alt="Bootstrap Dark Blue" @click="changeTheme($event, 'bootstrap4-dark-blue', true)"/>
                             </button>
                             <span>Blue</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/bootstrap4-dark-purple.svg" alt="Bootstrap Dark Blue" @click="changeTheme($event, 'bootstrap4-dark-purple', true)"/>
+                                <img src="demo/images/themes/bootstrap4-dark-purple.svg" alt="Bootstrap Dark Blue" @click="changeTheme($event, 'bootstrap4-dark-purple', true)"/>
                             </button>
                             <span>Purple</span>
                         </div>
@@ -57,25 +57,25 @@
                     <div class="p-grid free-themes">
                          <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/md-light-indigo.svg" alt="Material Light Indigo" @click="changeTheme($event, 'md-light-indigo')"/>
+                                <img src="demo/images/themes/md-light-indigo.svg" alt="Material Light Indigo" @click="changeTheme($event, 'md-light-indigo')"/>
                             </button>
                             <span>Indigo</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/md-light-deeppurple.svg" alt="Material Light Deep Purple" @click="changeTheme($event, 'md-light-deeppurple')"/>
+                                <img src="demo/images/themes/md-light-deeppurple.svg" alt="Material Light Deep Purple" @click="changeTheme($event, 'md-light-deeppurple')"/>
                             </button>
                             <span>Deep Purple</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/md-dark-indigo.svg" alt="Material Dark Indigo" @click="changeTheme($event, 'md-dark-indigo', true)"/>
+                                <img src="demo/images/themes/md-dark-indigo.svg" alt="Material Dark Indigo" @click="changeTheme($event, 'md-dark-indigo', true)"/>
                             </button>
                             <span>Indigo</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/md-dark-deeppurple.svg" alt="Material Dark Deep Purple" @click="changeTheme($event, 'md-dark-deeppurple', true)"/>
+                                <img src="demo/images/themes/md-dark-deeppurple.svg" alt="Material Dark Deep Purple" @click="changeTheme($event, 'md-dark-deeppurple', true)"/>
                             </button>
                             <span>Deep Purple</span>
                         </div>
@@ -85,25 +85,25 @@
                     <div class="p-grid free-themes">
                          <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/md-light-indigo.svg" alt="Material Compact Light Indigo" @click="changeTheme($event, 'mdc-light-indigo')"/>
+                                <img src="demo/images/themes/md-light-indigo.svg" alt="Material Compact Light Indigo" @click="changeTheme($event, 'mdc-light-indigo')"/>
                             </button>
                             <span>Indigo</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/md-light-deeppurple.svg" alt="Material Compact Deep Purple" @click="changeTheme($event, 'mdc-light-deeppurple')"/>
+                                <img src="demo/images/themes/md-light-deeppurple.svg" alt="Material Compact Deep Purple" @click="changeTheme($event, 'mdc-light-deeppurple')"/>
                             </button>
                             <span>Deep Purple</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/md-dark-indigo.svg" alt="Material Compact Dark Indigo" @click="changeTheme($event, 'mdc-dark-indigo', true)"/>
+                                <img src="demo/images/themes/md-dark-indigo.svg" alt="Material Compact Dark Indigo" @click="changeTheme($event, 'mdc-dark-indigo', true)"/>
                             </button>
                             <span>Indigo</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/md-dark-deeppurple.svg" alt="Material Compact Dark Deep Purple" @click="changeTheme($event, 'mdc-dark-deeppurple', true)"/>
+                                <img src="demo/images/themes/md-dark-deeppurple.svg" alt="Material Compact Dark Deep Purple" @click="changeTheme($event, 'mdc-dark-deeppurple', true)"/>
                             </button>
                             <span>Deep Purple</span>
                         </div>
@@ -113,73 +113,73 @@
                     <div class="p-grid free-themes">
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/saga-blue.png" alt="Saga Blue" @click="changeTheme($event, 'saga-blue')"/>
+                                <img src="demo/images/themes/saga-blue.png" alt="Saga Blue" @click="changeTheme($event, 'saga-blue')"/>
                             </button>
                             <span>Saga Blue</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/saga-green.png" alt="Saga Green" @click="changeTheme($event, 'saga-green')"/>
+                                <img src="demo/images/themes/saga-green.png" alt="Saga Green" @click="changeTheme($event, 'saga-green')"/>
                             </button>
                             <span>Saga Green</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/saga-orange.png" alt="Saga Orange" @click="changeTheme($event, 'saga-orange')"/>
+                                <img src="demo/images/themes/saga-orange.png" alt="Saga Orange" @click="changeTheme($event, 'saga-orange')"/>
                             </button>
                             <span>Saga Orange</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/saga-purple.png" alt="Saga Purple" @click="changeTheme($event, 'saga-purple')"/>
+                                <img src="demo/images/themes/saga-purple.png" alt="Saga Purple" @click="changeTheme($event, 'saga-purple')"/>
                             </button>
                             <span>Saga Purple</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/vela-blue.png" alt="Vela Blue" @click="changeTheme($event, 'vela-blue', true)"/>
+                                <img src="demo/images/themes/vela-blue.png" alt="Vela Blue" @click="changeTheme($event, 'vela-blue', true)"/>
                             </button>
                             <span>Vela Blue</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/vela-green.png" alt="Vela Green" @click="changeTheme($event, 'vela-green', true)"/>
+                                <img src="demo/images/themes/vela-green.png" alt="Vela Green" @click="changeTheme($event, 'vela-green', true)"/>
                             </button>
                             <span>Vela Green</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/vela-orange.png" alt="Vela Orange" @click="changeTheme($event, 'vela-orange', true)"/>
+                                <img src="demo/images/themes/vela-orange.png" alt="Vela Orange" @click="changeTheme($event, 'vela-orange', true)"/>
                             </button>
                             <span>Vela Orange</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/vela-purple.png" alt="Vela Purple" @click="changeTheme($event, 'vela-purple', true)"/>
+                                <img src="demo/images/themes/vela-purple.png" alt="Vela Purple" @click="changeTheme($event, 'vela-purple', true)"/>
                             </button>
                             <span>Vela Purple</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/arya-blue.png" alt="Arya Blue" @click="changeTheme($event, 'arya-blue', true)"/>
+                                <img src="demo/images/themes/arya-blue.png" alt="Arya Blue" @click="changeTheme($event, 'arya-blue', true)"/>
                             </button>
                             <span>Arya Blue</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/arya-green.png" alt="Arya Green" @click="changeTheme($event, 'arya-green', true)"/>
+                                <img src="demo/images/themes/arya-green.png" alt="Arya Green" @click="changeTheme($event, 'arya-green', true)"/>
                             </button>
                             <span>Arya Green</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/arya-orange.png" alt="Arya Orange" @click="changeTheme($event, 'arya-orange', true)"/>
+                                <img src="demo/images/themes/arya-orange.png" alt="Arya Orange" @click="changeTheme($event, 'arya-orange', true)"/>
                             </button>
                             <span>Arya Orange</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/arya-purple.png" alt="Arya Purple" @click="changeTheme($event, 'arya-purple', true)"/>
+                                <img src="demo/images/themes/arya-purple.png" alt="Arya Purple" @click="changeTheme($event, 'arya-purple', true)"/>
                             </button>
                             <span>Arya Purple</span>
                         </div>
diff --git a/src/AppTopBar.vue b/src/AppTopBar.vue
index 782acf1b6..397a541f1 100755
--- a/src/AppTopBar.vue
+++ b/src/AppTopBar.vue
@@ -17,36 +17,36 @@
                         <li><a href="https://www.primefaces.org/designer/primevue"><i class="pi pi-fw pi-palette" /><span>Designer</span></a></li>
                         <li><router-link to="/icons"><i class="pi pi-fw pi-info-circle"/><span>Icons</span></router-link></li>
                         <li class="topbar-submenu-header">BOOTSTRAP</li>
-                        <li><a @click="changeTheme($event, 'bootstrap4-light-blue')"><img src="./assets/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="./assets/images/themes/bootstrap4-light-purple.svg" alt="Purple Light" /><span>Purple Light</span></a></li>
-                        <li><a @click="changeTheme($event, 'bootstrap4-dark-blue')"><img src="./assets/images/themes/bootstrap4-dark-blue.svg" alt="Blue Dark" /><span>Blue Dark</span></a></li>
-                        <li><a @click="changeTheme($event, 'bootstrap4-dark-purple')"><img src="./assets/images/themes/bootstrap4-dark-purple.svg" alt="Purple Dark" /><span>Purple Dark</span></a></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></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></li>
+                        <li><a @click="changeTheme($event, 'bootstrap4-dark-blue')"><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')"><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="./assets/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="./assets/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')"><img src="./assets/images/themes/md-dark-indigo.svg" alt="Indigo Dark" /><span>Indigo Dark</span></a></li>
-                        <li><a @click="changeTheme($event, 'md-dark-deeppurple')"><img src="./assets/images/themes/md-dark-deeppurple.svg" alt="Deep Purple Dark" /><span>Deep Purple Dark</span></a></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></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></li>
+                        <li><a @click="changeTheme($event, 'md-dark-indigo')"><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')"><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="./assets/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="./assets/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')"><img src="./assets/images/themes/md-dark-indigo.svg" alt="Indigo Dark" /><span>Indigo Dark</span></a></li>
-                        <li><a @click="changeTheme($event, 'mdc-dark-deeppurple')"><img src="./assets/images/themes/md-dark-deeppurple.svg" alt="Deep Purple Dark" /><span>Deep Purple Dark</span></a></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></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></li>
+                        <li><a @click="changeTheme($event, 'mdc-dark-indigo')"><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')"><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">PRIMEONE</li>
-                        <li><a @click="changeTheme($event, 'saga-blue')"><img src="./assets/images/themes/saga-blue.png" alt="Saga Blue" /><span>Saga Blue</span></a></li>
-                        <li><a @click="changeTheme($event, 'saga-green')"><img src="./assets/images/themes/saga-green.png" alt="Saga Green" /><span>Saga Green</span></a></li>
-                        <li><a @click="changeTheme($event, 'saga-orange')"><img src="./assets/images/themes/saga-orange.png" alt="Saga Orange" /><span>Saga Orange</span></a></li>
-                        <li><a @click="changeTheme($event, 'saga-purple')"><img src="./assets/images/themes/saga-purple.png" alt="Saga Purple" /><span>Saga Purple</span></a></li>
-                        <li><a @click="changeTheme($event, 'vela-blue', true)"><img src="./assets/images/themes/vela-blue.png" alt="Vela Blue" /><span>Vela Blue</span></a></li>
-                        <li><a @click="changeTheme($event, 'vela-green', true)"><img src="./assets/images/themes/vela-green.png" alt="Vela Green" /><span>Vela Green</span></a></li>
-                        <li><a @click="changeTheme($event, 'vela-orange', true)"><img src="./assets/images/themes/vela-orange.png" alt="Vela Orange" /><span>Vela Orange</span></a></li>
-                        <li><a @click="changeTheme($event, 'vela-purple', true)"><img src="./assets/images/themes/vela-purple.png" alt="Vela Purple" /><span>Vela Purple</span></a></li>
-                        <li><a @click="changeTheme($event, 'arya-blue', true)"><img src="./assets/images/themes/arya-blue.png" alt="Arya Blue" /><span>Arya Blue</span></a></li>
-                        <li><a @click="changeTheme($event, 'arya-green', true)"><img src="./assets/images/themes/arya-green.png" alt="Arya Green" /><span>Arya Green</span></a></li>
-                        <li><a @click="changeTheme($event, 'arya-orange', true)"><img src="./assets/images/themes/arya-orange.png" alt="Arya Orange" /><span>Arya Orange</span></a></li>
-                        <li><a @click="changeTheme($event, 'arya-purple', true)"><img src="./assets/images/themes/arya-purple.png" alt="Arya Purple" /><span>Arya Purple</span></a></li>
+                        <li><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></li>
+                        <li><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></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></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></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></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></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></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></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></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></li>
 
                         <li class="topbar-submenu-header">LEGACY</li>
                         <li><a @click="changeTheme($event, 'nova')"><img src="./assets/images/layouts/themeswitcher-nova.png" alt="Nova" /><span>Nova</span></a></li>