AppConfig changes

src/layout/AppConfig.vue

@@ -20,10 +20,9 @@ const onChangeTheme = (theme, mode) => {
     cloneLinkElement.addEventListener('load', () => {
         linkElement.remove();
         cloneLinkElement.setAttribute('id', elementId);
+        changeThemeSettings(theme, mode === 'dark');
     });
     linkElement.parentNode.insertBefore(cloneLinkElement, linkElement.nextSibling);
-
-    changeThemeSettings(theme, mode === 'dark');
 };
 const decrementScale = () => {
     setScale(layoutConfig.scale.value - 1);

src/layout/composables/layoutService.js

@@ -19,17 +19,17 @@ const layoutState = reactive({
     menuHoverActive: false
 });
 
-export function useLayoutService() {
+export function useLayoutService () {
     const changeThemeSettings = (theme, darkTheme) => {
-        layoutConfig.theme = theme;
         layoutConfig.darkTheme = darkTheme;
+        layoutConfig.theme = theme;
     };
 
-    const setScale = (scale) => {
+    const setScale = scale => {
         layoutConfig.scale = scale;
     };
 
-    const setActiveMenuItem = (item) => {
+    const setActiveMenuItem = item => {
         layoutConfig.activeMenuItem = item.value || item;
     };
 

src/views/uikit/Chart.vue

@@ -225,10 +225,8 @@ const setChart = () => {
 watch(
     layoutConfig.theme,
     () => {
-        setTimeout(() => {
-            setColorOptions();
-            setChart();
-        }, 200);
+        setColorOptions();
+        setChart();
     },
     { immediate: true }
 );