diff --git a/src/AppConfigurator.vue b/src/AppConfigurator.vue
index 00355582b..b86a4134f 100755
--- a/src/AppConfigurator.vue
+++ b/src/AppConfigurator.vue
@@ -19,168 +19,168 @@
                                 <img src="./assets/images/themes/saga-blue.png" alt="Saga Blue" @click="changeTheme($event, 'saga-blue', false)"/>
                                 <i class="pi pi-check" v-if="theme === 'saga-blue'" />
                             </button>
-                            <span>Saga-Blue</span>
+                            <span>Saga Blue</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
                                 <img src="./assets/images/themes/saga-cyan.png" alt="Saga Cyan" @click="changeTheme($event, 'saga-cyan', false)"/>
                                 <i class="pi pi-check" v-if="theme === 'saga-cyan'" />
                             </button>
-                            <span>Saga-Cyan</span>
+                            <span>Saga Cyan</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/saga-deeppurple.png" alt="Saga DeepPurple" @click="changeTheme($event, 'saga-deeppurple', false)"/>
+                                <img src="./assets/images/themes/saga-deeppurple.png" alt="Saga Deep Purple" @click="changeTheme($event, 'saga-deeppurple', false)"/>
                                 <i class="pi pi-check" v-if="theme === 'saga-deeppurple'" />
                             </button>
-                            <span>Saga-DeepPurple</span>
+                            <span>Saga Deep Purple</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', false)"/>
                                 <i class="pi pi-check" v-if="theme === 'saga-green'" />
                             </button>
-                            <span>Saga-Green</span>
+                            <span>Saga Green</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
                                 <img src="./assets/images/themes/saga-indigo.png" alt="Saga Indigo" @click="changeTheme($event, 'saga-indigo', false)"/>
                                 <i class="pi pi-check" v-if="theme === 'saga-indigo'" />
                             </button>
-                            <span>Saga-Indigo</span>
+                            <span>Saga Indigo</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', false)"/>
                                 <i class="pi pi-check" v-if="theme === 'saga-orange'" />
                             </button>
-                            <span>Saga-Orange</span>
+                            <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', false)"/>
                                 <i class="pi pi-check" v-if="theme === 'saga-purple'" />
                             </button>
-                            <span>Saga-Purple</span>
+                            <span>Saga Purple</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
                                 <img src="./assets/images/themes/saga-teal.png" alt="Saga Teal" @click="changeTheme($event, 'saga-teal', false)"/>
                                 <i class="pi pi-check" v-if="theme === 'saga-teal'" />
                             </button>
-                            <span>Saga-Teal</span>
+                            <span>Saga Teal</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', 'dark-theme-alt')"/>
                                 <i class="pi pi-check" v-if="theme === 'vela-blue'" />
                             </button>
-                            <span>Vela-Blue</span>
+                            <span>Vela Blue</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
                                 <img src="./assets/images/themes/vela-cyan.png" alt="Vela Cyan" @click="changeTheme($event, 'vela-cyan', 'dark-theme-alt')"/>
                                 <i class="pi pi-check" v-if="theme === 'vela-cyan'" />
                             </button>
-                            <span>Vela-Cyan</span>
+                            <span>Vela Cyan</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
-                                <img src="./assets/images/themes/vela-deeppurple.png" alt="Vela DeepPurple" @click="changeTheme($event, 'vela-deeppurple', 'dark-theme-alt')"/>
+                                <img src="./assets/images/themes/vela-deeppurple.png" alt="Vela Deep Purple" @click="changeTheme($event, 'vela-deeppurple', 'dark-theme-alt')"/>
                                 <i class="pi pi-check" v-if="theme === 'vela-deeppurple'" />
                             </button>
-                            <span>Vela-DeepPurple</span>
+                            <span>Vela Deep Purple</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', 'dark-theme-alt')"/>
                                 <i class="pi pi-check" v-if="theme === 'vela-green'" />
                             </button>
-                            <span>Vela-Green</span>
+                            <span>Vela Green</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
                                 <img src="./assets/images/themes/vela-indigo.png" alt="Vela Indigo" @click="changeTheme($event, 'vela-indigo', 'dark-theme-alt')"/>
                                 <i class="pi pi-check" v-if="theme === 'vela-indigo'" />
                             </button>
-                            <span>Vela-Indigo</span>
+                            <span>Vela Indigo</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', 'dark-theme-alt')"/>
                                 <i class="pi pi-check" v-if="theme === 'vela-orange'" />
                             </button>
-                            <span>Vela-Orange</span>
+                            <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', 'dark-theme-alt')"/>
                                 <i class="pi pi-check" v-if="theme === 'vela-purple'" />
                             </button>
-                            <span>Vela-Purple</span>
+                            <span>Vela Purple</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
                                 <img src="./assets/images/themes/vela-teal.png" alt="Vela Teal" @click="changeTheme($event, 'vela-teal', 'dark-theme-alt')"/>
                                 <i class="pi pi-check" v-if="theme === 'vela-teal'" />
                             </button>
-                            <span>Vela-Teal</span>
+                            <span>Vela Teal</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
                                 <img src="./assets/images/layouts/themeswitcher-nova-light.png" alt="Nova Light" @click="changeTheme($event, 'nova-light', false)"/>
                                 <i class="pi pi-check" v-if="theme === 'nova-light'" />
                             </button>
-                            <span>Nova-Light</span>
+                            <span>Nova Light</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
                                 <img src="./assets/images/layouts/themeswitcher-nova-dark.png" alt="Nova Dark" @click="changeTheme($event, 'nova-dark', false)"/>
                                 <i class="pi pi-check" v-if="theme === 'nova-dark'" />
                             </button>
-                            <span>Nova-Dark</span>
+                            <span>Nova Dark</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
                                 <img src="./assets/images/layouts/themeswitcher-nova-colored.png" alt="Nova Colored" @click="changeTheme($event, 'nova-colored', false)"/>
                                 <i class="pi pi-check" v-if="theme === 'nova-colored'" />
                             </button>
-                            <span>Nova-Colored</span>
+                            <span>Nova Colored</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', false)"/>
                                 <i class="pi pi-check" v-if="theme === 'nova-vue'" />
                             </button>
-                            <span>Nova-Vue</span>
+                            <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', 'dark-theme')"/>
                                 <i class="pi pi-check" v-if="theme === 'luna-blue'" />
                             </button>
-                            <span>Luna-Blue</span>
+                            <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', 'dark-theme')"/>
                                 <i class="pi pi-check" v-if="theme === 'luna-green'" />
                             </button>
-                            <span>Luna-Green</span>
+                            <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', 'dark-theme')" target="_blank"/>
                                 <i class="pi pi-check" v-if="theme === 'luna-amber'" />
                             </button>
-                            <span>Luna-Amber</span>
+                            <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', 'dark-theme')" target="_blank"/>
                                 <i class="pi pi-check" v-if="theme === 'luna-pink'" />
                             </button>
-                            <span>Luna-Pink</span>
+                            <span>Luna Pink</span>
                         </div>
                         <div class="p-col-3">
                             <button class="p-link">
diff --git a/src/AppTopBar.vue b/src/AppTopBar.vue
index d66ebb792..b44b699b6 100755
--- a/src/AppTopBar.vue
+++ b/src/AppTopBar.vue
@@ -19,15 +19,15 @@
                         <li class="topbar-submenu-header">FREE COMPONENT THEMES</li>
                         <li><a @click="changeTheme($event, 'saga-blue', false)"><img src="./assets/images/themes/saga-blue.png" alt="Saga Blue" /><span>Saga Blue</span></a></li>
                         <li><a @click="changeTheme($event, 'saga-cyan', false)"><img src="./assets/images/themes/saga-cyan.png" alt="Saga Cyan" /><span>Saga Cyan</span></a></li>
-                        <li><a @click="changeTheme($event, 'saga-deeppurple', false)"><img src="./assets/images/themes/saga-deeppurple.png" alt="Saga DeepPurple" /><span>Saga DeepPurple</span></a></li>
+                        <li><a @click="changeTheme($event, 'saga-deeppurple', false)"><img src="./assets/images/themes/saga-deeppurple.png" alt="Saga Deep Purple" /><span>Saga Deep Purple</span></a></li>
                         <li><a @click="changeTheme($event, 'saga-green', false)"><img src="./assets/images/themes/saga-green.png" alt="Saga Green" /><span>Saga Green</span></a></li>
                         <li><a @click="changeTheme($event, 'saga-indigo', false)"><img src="./assets/images/themes/saga-indigo.png" alt="Saga Indigo" /><span>Saga Indigo</span></a></li>
                         <li><a @click="changeTheme($event, 'saga-orange', false)"><img src="./assets/images/themes/saga-orange.png" alt="Saga Orange" /><span>Saga Orange</span></a></li>
                         <li><a @click="changeTheme($event, 'saga-purple', false)"><img src="./assets/images/themes/saga-purple.png" alt="Saga Purple" /><span>Saga Purple</span></a></li>
                         <li><a @click="changeTheme($event, 'saga-teal', false)"><img src="./assets/images/themes/saga-teal.png" alt="Saga Teal" /><span>Saga Teal</span></a></li>
                         <li><a @click="changeTheme($event, 'vela-blue')"><img src="./assets/images/themes/vela-blue.png" alt="Vela Blue" /><span>Vela Blue</span></a></li>
-                        <li><a @click="changeTheme($event, 'vela-cyan')"><img src="./assets/images/themes/vela-cyan.png" alt="Vela Blue" /><span>Vela Cyan</span></a></li>
-                        <li><a @click="changeTheme($event, 'vela-deeppurple')"><img src="./assets/images/themes/vela-deeppurple.png" alt="Vela Blue" /><span>Vela DeepPurple</span></a></li>
+                        <li><a @click="changeTheme($event, 'vela-cyan')"><img src="./assets/images/themes/vela-cyan.png" alt="Vela Cyan" /><span>Vela Cyan</span></a></li>
+                        <li><a @click="changeTheme($event, 'vela-deeppurple')"><img src="./assets/images/themes/vela-deeppurple.png" alt="Vela Deep Purple" /><span>Vela Deep Purple</span></a></li>
                         <li><a @click="changeTheme($event, 'vela-green')"><img src="./assets/images/themes/vela-green.png" alt="Vela Green" /><span>Vela Green</span></a></li>
                         <li><a @click="changeTheme($event, 'vela-indigo')"><img src="./assets/images/themes/vela-indigo.png" alt="Vela Indigo" /><span>Vela Indigo</span></a></li>
                         <li><a @click="changeTheme($event, 'vela-orange')"><img src="./assets/images/themes/vela-orange.png" alt="Vela Orange" /><span>Vela Orange</span></a></li>