diff --git a/src/assets/images/layouts/themeswitcher-luna-amber.png b/public/demo/images/themes/luna-amber.png
similarity index 100%
rename from src/assets/images/layouts/themeswitcher-luna-amber.png
rename to public/demo/images/themes/luna-amber.png
diff --git a/src/assets/images/layouts/themeswitcher-luna-blue.png b/public/demo/images/themes/luna-blue.png
similarity index 100%
rename from src/assets/images/layouts/themeswitcher-luna-blue.png
rename to public/demo/images/themes/luna-blue.png
diff --git a/src/assets/images/layouts/themeswitcher-luna-green.png b/public/demo/images/themes/luna-green.png
similarity index 100%
rename from src/assets/images/layouts/themeswitcher-luna-green.png
rename to public/demo/images/themes/luna-green.png
diff --git a/src/assets/images/layouts/themeswitcher-luna-pink.png b/public/demo/images/themes/luna-pink.png
similarity index 100%
rename from src/assets/images/layouts/themeswitcher-luna-pink.png
rename to public/demo/images/themes/luna-pink.png
diff --git a/src/assets/images/layouts/themeswitcher-nova-accent.png b/public/demo/images/themes/nova-accent.png
similarity index 100%
rename from src/assets/images/layouts/themeswitcher-nova-accent.png
rename to public/demo/images/themes/nova-accent.png
diff --git a/src/assets/images/layouts/themeswitcher-nova-alt.png b/public/demo/images/themes/nova-alt.png
similarity index 100%
rename from src/assets/images/layouts/themeswitcher-nova-alt.png
rename to public/demo/images/themes/nova-alt.png
diff --git a/src/assets/images/layouts/themeswitcher-nova-vue.png b/public/demo/images/themes/nova-vue.png
similarity index 100%
rename from src/assets/images/layouts/themeswitcher-nova-vue.png
rename to public/demo/images/themes/nova-vue.png
diff --git a/src/assets/images/layouts/themeswitcher-nova.png b/public/demo/images/themes/nova.png
similarity index 100%
rename from src/assets/images/layouts/themeswitcher-nova.png
rename to public/demo/images/themes/nova.png
diff --git a/src/assets/images/layouts/themeswitcher-rhea.png b/public/demo/images/themes/rhea.png
similarity index 100%
rename from src/assets/images/layouts/themeswitcher-rhea.png
rename to public/demo/images/themes/rhea.png
diff --git a/src/App.vue b/src/App.vue
index 506eb7c58..d97714b50 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -66,15 +66,15 @@ export default {
                 'arya-green': 'arya-green.png',
                 'arya-orange': 'arya-orange.png',
                 'arya-purple': 'arya-purple.png',
-                'nova': 'themeswitcher-nova.png',
-                'nova-alt': 'themeswitcher-nova-alt.png',
-                'nova-accent': 'themeswitcher-nova-accent.png',
-                'nova-vue': 'themeswitcher-nova-vue.png',
-                'luna-blue': 'themeswitcher-luna-blue.png',
-                'luna-green': 'themeswitcher-luna-green.png',
-                'luna-pink': 'themeswitcher-luna-pink.png',
-                'luna-amber': 'themeswitcher-luna-amber.png',
-                'rhea': 'themeswitcher-rhea.png'
+                'nova': 'nova.png',
+                'nova-alt': 'nova-alt.png',
+                'nova-accent': 'nova-accent.png',
+                'nova-vue': 'nova-vue.png',
+                'luna-blue': 'luna-blue.png',
+                'luna-green': 'luna-green.png',
+                'luna-pink': 'luna-pink.png',
+                'luna-amber': 'luna-amber.png',
+                'rhea': 'rhea.png'
             }
         }
     },
diff --git a/src/AppConfigurator.vue b/src/AppConfigurator.vue
index 462e5572c..55cdbe614 100755
--- a/src/AppConfigurator.vue
+++ b/src/AppConfigurator.vue
@@ -189,55 +189,55 @@
                     <div class="p-grid free-themes">
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/layouts/themeswitcher-nova.png" alt="Nova" @click="changeTheme($event, 'nova')"/>
+                                <img src="demo/images/themes/nova.png" alt="Nova" @click="changeTheme($event, 'nova')"/>
                             </button>
                             <span>Nova</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/layouts/themeswitcher-nova-alt.png" alt="Nova Alt" @click="changeTheme($event, 'nova-alt')"/>
+                                <img src="demo/images/themes/nova-alt.png" alt="Nova Alt" @click="changeTheme($event, 'nova-alt')"/>
                             </button>
                             <span>Nova Alt</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/layouts/themeswitcher-nova-accent.png" alt="Nova Accent" @click="changeTheme($event, 'nova-accent')"/>
+                                <img src="demo/images/themes/nova-accent.png" alt="Nova Accent" @click="changeTheme($event, 'nova-accent')"/>
                             </button>
                             <span>Nova Accent</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/layouts/themeswitcher-nova-vue.png" alt="Nova Colored" @click="changeTheme($event, 'nova-vue')"/>
+                                <img src="demo/images/themes/nova-vue.png" alt="Nova Colored" @click="changeTheme($event, 'nova-vue')"/>
                             </button>
                             <span>Nova Vue</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/layouts/themeswitcher-luna-blue.png" alt="Luna Blue" @click="changeTheme($event, 'luna-blue', true)"/>
+                                <img src="demo/images/themes/luna-blue.png" alt="Luna Blue" @click="changeTheme($event, 'luna-blue', true)"/>
                             </button>
                             <span>Luna Blue</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/layouts/themeswitcher-luna-green.png" alt="Luna Green" @click="changeTheme($event, 'luna-green', true)"/>
+                                <img src="demo/images/themes/luna-green.png" alt="Luna Green" @click="changeTheme($event, 'luna-green', true)"/>
                             </button>
                             <span>Luna Green</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/layouts/themeswitcher-luna-amber.png" alt="Luna Amber" @click="changeTheme($event, 'luna-amber', true)" target="_blank"/>
+                                <img src="demo/images/themes/luna-amber.png" alt="Luna Amber" @click="changeTheme($event, 'luna-amber', true)" target="_blank"/>
                             </button>
                             <span>Luna Amber</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/layouts/themeswitcher-luna-pink.png" alt="Luna Pink" @click="changeTheme($event, 'luna-pink', true)" target="_blank"/>
+                                <img src="demo/images/themes/luna-pink.png" alt="Luna Pink" @click="changeTheme($event, 'luna-pink', true)" target="_blank"/>
                             </button>
                             <span>Luna Pink</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/layouts/themeswitcher-rhea.png" alt="Rhea" @click="changeTheme($event, 'rhea', false)" target="_blank"/>
+                                <img src="demo/images/themes/rhea.png" alt="Rhea" @click="changeTheme($event, 'rhea', false)" target="_blank"/>
                             </button>
                             <span>Rhea</span>
                         </div>
diff --git a/src/AppTopBar.vue b/src/AppTopBar.vue
index 397a541f1..280446565 100755
--- a/src/AppTopBar.vue
+++ b/src/AppTopBar.vue
@@ -49,15 +49,15 @@
                         <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>
-                        <li><a @click="changeTheme($event, 'nova-alt')"><img src="./assets/images/layouts/themeswitcher-nova-alt.png" alt="Nova Alt" /><span>Nova Alt</span></a></li>
-                        <li><a @click="changeTheme($event, 'nova-accent')"><img src="./assets/images/layouts/themeswitcher-nova-accent.png" alt="Nova Accent" /><span>Nova Accent</span></a></li>
-                        <li><a @click="changeTheme($event, 'nova-vue')"><img src="./assets/images/layouts/themeswitcher-nova-vue.png" alt="Nova Vue" /><span>Nova Vue</span></a></li>
-                        <li><a @click="changeTheme($event, 'luna-amber', true)"><img src="./assets/images/layouts/themeswitcher-luna-amber.png" alt="Luna Amber" /><span>Luna Amber</span></a></li>
-                        <li><a @click="changeTheme($event, 'luna-blue', true)"><img src="./assets/images/layouts/themeswitcher-luna-blue.png" alt="Luna Blue" /><span>Luna Blue</span></a></li>
-                        <li><a @click="changeTheme($event, 'luna-green', true)"><img src="./assets/images/layouts/themeswitcher-luna-green.png" alt="Luna Green" /><span>Luna Green</span></a></li>
-                        <li><a @click="changeTheme($event, 'luna-pink', true)"><img src="./assets/images/layouts/themeswitcher-luna-pink.png" alt="Luna Pink" /><span>Luna Pink</span></a></li>
-                        <li><a @click="changeTheme($event, 'rhea')"><img src="./assets/images/layouts/themeswitcher-rhea.png" alt="Rhea" /><span>Rhea</span></a></li>
+                        <li><a @click="changeTheme($event, 'nova')"><img src="demo/images/themes/nova.png" alt="Nova" /><span>Nova</span></a></li>
+                        <li><a @click="changeTheme($event, 'nova-alt')"><img src="demo/images/themes/nova-alt.png" alt="Nova Alt" /><span>Nova Alt</span></a></li>
+                        <li><a @click="changeTheme($event, 'nova-accent')"><img src="demo/images/themes/nova-accent.png" alt="Nova Accent" /><span>Nova Accent</span></a></li>
+                        <li><a @click="changeTheme($event, 'nova-vue')"><img src="demo/images/themes/nova-vue.png" alt="Nova Vue" /><span>Nova Vue</span></a></li>
+                        <li><a @click="changeTheme($event, 'luna-amber', true)"><img src="demo/images/themes/luna-amber.png" alt="Luna Amber" /><span>Luna Amber</span></a></li>
+                        <li><a @click="changeTheme($event, 'luna-blue', true)"><img src="demo/images/themes/una-blue.png" alt="Luna Blue" /><span>Luna Blue</span></a></li>
+                        <li><a @click="changeTheme($event, 'luna-green', true)"><img src="demo/images/themes/luna-green.png" alt="Luna Green" /><span>Luna Green</span></a></li>
+                        <li><a @click="changeTheme($event, 'luna-pink', true)"><img src="demo/images/themes/luna-pink.png" alt="Luna Pink" /><span>Luna Pink</span></a></li>
+                        <li><a @click="changeTheme($event, 'rhea')"><img src="demo/images/themes/rhea.png" alt="Rhea" /><span>Rhea</span></a></li>
                     </ul>
                 </transition>
             </li>