diff --git a/.eslintrc.js b/.eslintrc.js
index 85b3eb0..b650cfe 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -8,7 +8,7 @@ module.exports = {
     plugins: ['@typescript-eslint', 'import'],
     extends: ['plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended'],
     root: true,
-    ignorePatterns: ['.eslintrc.js', 'types/**/*.ts'],
+    ignorePatterns: ['.eslintrc.js', 'types/**/*.ts', 'scripts/**/*.js'],
     env: {
         es6: true,
         browser: true,
diff --git a/customModules/config.ts b/customModules/config.ts
index 07092ac..71edca8 100644
--- a/customModules/config.ts
+++ b/customModules/config.ts
@@ -421,6 +421,14 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
                     title: 'Button Border',
                     type: 'boolean',
                 }),
+                Option({
+                    opt: options.bar.customModules.submap.showSubmapName,
+                    title: 'Show Submap Name',
+                    subtitle:
+                        'When enabled, the name of the current submap will be displayed' +
+                        ' instead of the Submap Enabled or Disabled text.',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.customModules.submap.enabledIcon,
                     title: 'Enabled Icon',
diff --git a/customModules/submap/index.ts b/customModules/submap/index.ts
index 163bf5b..c97fa2c 100644
--- a/customModules/submap/index.ts
+++ b/customModules/submap/index.ts
@@ -7,9 +7,11 @@ import Button from 'types/widgets/button';
 import { Variable as VariableType } from 'types/variable';
 import { Attribute, Child } from 'lib/types/widget';
 import { BarBoxChild } from 'lib/types/bar';
+import { caapitalizeFirstLetter } from 'lib/utils';
 
 const {
     label,
+    showSubmapName,
     enabledIcon,
     disabledIcon,
     enabledText,
@@ -21,10 +23,10 @@ const {
     scrollDown,
 } = options.bar.customModules.submap;
 
-const submapStatus: VariableType<boolean> = Variable(false);
+const submapStatus: VariableType<string> = Variable('');
 
-hyprland.connect('submap', () => {
-    submapStatus.value = !submapStatus.value;
+hyprland.connect('submap', (_, currentSubmap) => {
+    submapStatus.value = currentSubmap;
 });
 
 export const Submap = (): BarBoxChild => {
@@ -32,20 +34,36 @@ export const Submap = (): BarBoxChild => {
         textIcon: Utils.merge(
             [submapStatus.bind('value'), enabledIcon.bind('value'), disabledIcon.bind('value')],
             (status, enabled, disabled) => {
-                return status ? enabled : disabled;
+                return status.length > 0 ? enabled : disabled;
             },
         ),
         tooltipText: Utils.merge(
-            [submapStatus.bind('value'), enabledText.bind('value'), disabledText.bind('value')],
-            (status, enabled, disabled) => {
-                return status ? enabled : disabled;
+            [
+                submapStatus.bind('value'),
+                enabledText.bind('value'),
+                disabledText.bind('value'),
+                showSubmapName.bind('value'),
+            ],
+            (status, enabled, disabled, showSmName) => {
+                if (showSmName) {
+                    return status.length > 0 ? caapitalizeFirstLetter(status) : 'Default';
+                }
+                return status.length > 0 ? enabled : disabled;
             },
         ),
         boxClass: 'submap',
         label: Utils.merge(
-            [submapStatus.bind('value'), enabledText.bind('value'), disabledText.bind('value')],
-            (status, enabled, disabled) => {
-                return status ? enabled : disabled;
+            [
+                submapStatus.bind('value'),
+                enabledText.bind('value'),
+                disabledText.bind('value'),
+                showSubmapName.bind('value'),
+            ],
+            (status, enabled, disabled, showSmName) => {
+                if (showSmName) {
+                    return status.length > 0 ? caapitalizeFirstLetter(status) : 'Default';
+                }
+                return status.length > 0 ? enabled : disabled;
             },
         ),
         showLabelBinding: label.bind('value'),
diff --git a/globals.d.ts b/globals.d.ts
index ef10cde..8e44a87 100644
--- a/globals.d.ts
+++ b/globals.d.ts
@@ -4,7 +4,6 @@
 import { Options, Variable as VariableType } from 'types/variable';
 
 declare global {
-    var globalMousePos: VariableType<number[]>;
     var useTheme: (filePath: string) => void;
     var isWindowVisible: (windowName: string) => boolean;
     var globalWeatherVar: VariableType<Weather>;
diff --git a/globals/dropdown.ts b/globals/dropdown.ts
new file mode 100644
index 0000000..b1178bf
--- /dev/null
+++ b/globals/dropdown.ts
@@ -0,0 +1,6 @@
+import { Variable as VariableType } from 'types/variable';
+
+type GlobalEventBoxes = {
+    [key: string]: unknown;
+};
+export const globalEventBoxes: VariableType<GlobalEventBoxes> = Variable({});
diff --git a/globals/mousePos.ts b/globals/mousePos.ts
deleted file mode 100644
index 390ee30..0000000
--- a/globals/mousePos.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { Variable as VariableType } from 'types/variable';
-
-const globalMousePosVar: VariableType<number[]> = Variable([0, 0]);
-
-globalThis['globalMousePos'] = globalMousePosVar;
diff --git a/globals/variables.ts b/globals/variables.ts
index 721ddab..ea2eb5d 100644
--- a/globals/variables.ts
+++ b/globals/variables.ts
@@ -1,13 +1,29 @@
 import { Opt } from 'lib/option';
-import { HexColor, RecursiveOptionsObject } from 'lib/types/options';
+import { HexColor, MatugenTheme, RecursiveOptionsObject } from 'lib/types/options';
 
 export const isOpt = <T>(value: unknown): value is Opt<T> =>
     typeof value === 'object' && value !== null && 'value' in value && value instanceof Opt;
 
-export const isRecursiveOptionsObject = (value: unknown): value is RecursiveOptionsObject => {
-    return typeof value === 'object' && value !== null && !Array.isArray(value);
+export const isOptString = (value: unknown): value is Opt<string> => {
+    return value instanceof Opt && typeof value.value === 'string';
 };
 
-export const isHexColor = (value: string): value is HexColor => {
-    return /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(value);
+export const isOptNumber = (value: unknown): value is Opt<number> => {
+    return value instanceof Opt && typeof value.value === 'number';
+};
+
+export const isOptBoolean = (value: unknown): value is Opt<boolean> => {
+    return value instanceof Opt && typeof value.value === 'boolean';
+};
+
+export const isOptMatugenTheme = (value: unknown): value is Opt<MatugenTheme> => {
+    return value instanceof Opt && typeof value.value === 'object' && 'specificProperty' in value.value; // Replace 'specificProperty' with an actual property of MatugenTheme
+};
+
+export const isRecursiveOptionsObject = (value: unknown): value is RecursiveOptionsObject => {
+    return typeof value === 'object' && value !== null && !(value instanceof Opt);
+};
+
+export const isHexColor = (val: unknown): val is HexColor => {
+    return typeof val === 'string' && /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(val);
 };
diff --git a/lib/option.ts b/lib/option.ts
index 1c6be5a..c261657 100644
--- a/lib/option.ts
+++ b/lib/option.ts
@@ -87,7 +87,7 @@ export function mkOptions<T extends object>(
     cacheFile: string,
     object: T,
     confFile: string = 'config.json',
-): T & MkOptionsResult<T> {
+): T & MkOptionsResult {
     for (const opt of getOptions(object as Record<string, unknown>)) opt.init(cacheFile);
 
     Utils.ensureDirectory(cacheFile.split('/').slice(0, -1).join('/'));
diff --git a/lib/types/dropdownmenu.d.ts b/lib/types/dropdownmenu.d.ts
index 1349b3d..8d76e5c 100644
--- a/lib/types/dropdownmenu.d.ts
+++ b/lib/types/dropdownmenu.d.ts
@@ -1,11 +1,12 @@
 import { WindowProps } from 'types/widgets/window';
 import { GtkWidget, Transition } from './widget';
+import { Binding } from 'types/service';
 
 export type DropdownMenuProps = {
     name: string;
     child: GtkWidget;
     layout?: string;
-    transition?: Transition;
+    transition?: Transition | Binding<Transition>;
     exclusivity?: Exclusivity;
     fixed?: boolean;
 } & WindowProps;
diff --git a/lib/types/globals.d.ts b/lib/types/globals.d.ts
new file mode 100644
index 0000000..ecdb39f
--- /dev/null
+++ b/lib/types/globals.d.ts
@@ -0,0 +1,4 @@
+export type MousePos = {
+    source: string;
+    pos: number[];
+};
diff --git a/lib/types/options.d.ts b/lib/types/options.d.ts
index beb31f3..51e7f76 100644
--- a/lib/types/options.d.ts
+++ b/lib/types/options.d.ts
@@ -2,7 +2,7 @@ import { Opt } from 'lib/option';
 import { Variable } from 'types/variable';
 import { defaultColorMap } from './defaults/options';
 
-export type MkOptionsResult<T> = {
+export type MkOptionsResult = {
     configFile: string;
     array: () => Opt[];
     reset: () => Promise<string>;
@@ -11,7 +11,7 @@ export type MkOptionsResult<T> = {
 };
 
 export type RecursiveOptionsObject = {
-    [key: string]: RecursiveOptionsObject | Opt<string | number | boolean> | Opt<any>;
+    [key: string]: RecursiveOptionsObject | Opt<string> | Opt<number> | Opt<boolean>;
 };
 
 export type BarLocation = 'top' | 'bottom';
@@ -57,7 +57,7 @@ export type RowProps<T> = {
     min?: number;
     disabledBinding?: Variable<boolean>;
     exportData?: ThemeExportData;
-    subtitle?: string | VarType<any> | Opt;
+    subtitle?: string | VarType<string> | Opt;
     subtitleLink?: string;
     dependencies?: string[];
     increment?: number;
diff --git a/lib/types/popupwindow.d.ts b/lib/types/popupwindow.d.ts
index 0c29706..300baab 100644
--- a/lib/types/popupwindow.d.ts
+++ b/lib/types/popupwindow.d.ts
@@ -4,9 +4,9 @@ import { Transition } from './widget';
 
 export type PopupWindowProps = {
     name: string;
-    child: any;
+    child: Widget;
     layout?: Layouts;
-    transition?: any;
+    transition?: Transition | Binding<Transition>;
     exclusivity?: Exclusivity;
 } & WindowProps;
 
diff --git a/lib/types/powerprofiles.d.ts b/lib/types/powerprofiles.d.ts
index a3592fa..980ac3b 100644
--- a/lib/types/powerprofiles.d.ts
+++ b/lib/types/powerprofiles.d.ts
@@ -1,4 +1,3 @@
-import icons from 'modules/icons/index';
 import PowerProfiles from 'types/service/powerprofiles.js';
 
 export type PowerProfiles = InstanceType<typeof PowerProfiles>;
diff --git a/lib/utils.ts b/lib/utils.ts
index 8c50008..dd5b316 100644
--- a/lib/utils.ts
+++ b/lib/utils.ts
@@ -153,7 +153,7 @@ export const Notify = (notifPayload: NotificationArgs): void => {
     Utils.execAsync(command);
 };
 
-export function getPosition(pos: NotificationAnchor | OSDAnchor): ('top' | 'bottom' | 'left' | 'right')[] {
+export const getPosition = (pos: NotificationAnchor | OSDAnchor): ('top' | 'bottom' | 'left' | 'right')[] => {
     const positionMap: { [key: string]: ('top' | 'bottom' | 'left' | 'right')[] } = {
         top: ['top'],
         'top right': ['top', 'right'],
@@ -166,7 +166,7 @@ export function getPosition(pos: NotificationAnchor | OSDAnchor): ('top' | 'bott
     };
 
     return positionMap[pos] || ['top'];
-}
+};
 export const isValidGjsColor = (color: string): boolean => {
     const colorLower = color.toLowerCase().trim();
 
@@ -189,3 +189,7 @@ export const isValidGjsColor = (color: string): boolean => {
 
     return false;
 };
+
+export const caapitalizeFirstLetter = (str: string): string => {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+};
diff --git a/main.ts b/main.ts
index c531445..399c1f9 100644
--- a/main.ts
+++ b/main.ts
@@ -1,8 +1,8 @@
 import 'lib/session';
 import 'scss/style';
 import 'globals/useTheme';
+import 'globals/dropdown.js';
 import 'globals/utilities';
-import 'globals/mousePos';
 
 import { Bar } from 'modules/bar/Bar';
 import MenuWindows from './modules/menus/main.js';
diff --git a/modules/bar/utils.ts b/modules/bar/utils.ts
index 11acac8..f2f545a 100644
--- a/modules/bar/utils.ts
+++ b/modules/bar/utils.ts
@@ -1,5 +1,6 @@
 import Gdk from 'gi://Gdk?version=3.0';
 import { Attribute, Child } from 'lib/types/widget';
+import { calculateMenuPosition } from 'modules/menus/shared/dropdown/locationHandler/index';
 import Button from 'types/widgets/button';
 
 export const closeAllMenus = (): void => {
@@ -20,7 +21,7 @@ export const closeAllMenus = (): void => {
     });
 };
 
-export const openMenu = (clicked: Button<Child, Attribute>, event: Gdk.Event, window: string): void => {
+export const openMenu = async (clicked: Button<Child, Attribute>, event: Gdk.Event, window: string): Promise<void> => {
     /*
      * NOTE: We have to make some adjustments so the menu pops up relatively
      * to the center of the button clicked. We don't want the menu to spawn
@@ -44,7 +45,11 @@ export const openMenu = (clicked: Button<Child, Attribute>, event: Gdk.Event, wi
     const adjustedXCoord = clickPos[1] + middleOffset;
     const coords = [adjustedXCoord, clickPos[2]];
 
-    globalMousePos.value = coords;
+    try {
+        await calculateMenuPosition(coords, window);
+    } catch (error) {
+        console.error(`Error calculating menu position: ${error}`);
+    }
 
     closeAllMenus();
     App.toggleWindow(window);
diff --git a/modules/bar/workspaces/index.ts b/modules/bar/workspaces/index.ts
index caba353..c95e212 100644
--- a/modules/bar/workspaces/index.ts
+++ b/modules/bar/workspaces/index.ts
@@ -16,9 +16,9 @@ const Workspaces = (monitor = -1): BarBoxChild => {
     return {
         component: Widget.Box({
             class_name: 'workspaces-box-container',
-            child: options.bar.workspaces.hideUnoccupied
-                .bind('value')
-                .as((hideUnoccupied) => (hideUnoccupied ? occupiedWses(monitor) : defaultWses(monitor))),
+            child: options.bar.workspaces.hideUnoccupied.bind('value').as((hideUnoccupied) => {
+                return hideUnoccupied ? occupiedWses(monitor) : defaultWses(monitor);
+            }),
         }),
         isVisible: true,
         boxClass: 'workspaces',
diff --git a/modules/bar/workspaces/variants/default.ts b/modules/bar/workspaces/variants/default.ts
index d6f9e86..dddabc9 100644
--- a/modules/bar/workspaces/variants/default.ts
+++ b/modules/bar/workspaces/variants/default.ts
@@ -44,7 +44,6 @@ export const defaultWses = (monitor: number): BoxWidget => {
                                         options.theme.matugen.bind('value'),
                                         options.theme.bar.buttons.workspaces.smartHighlight.bind('value'),
                                         hyprland.bind('monitors'),
-                                        hyprland.active.workspace.bind('id'),
                                     ],
                                     (
                                         sp: number,
@@ -70,7 +69,6 @@ export const defaultWses = (monitor: number): BoxWidget => {
                                         hyprland.bind('monitors'),
                                         options.bar.workspaces.icons.available.bind('value'),
                                         options.bar.workspaces.icons.active.bind('value'),
-                                        hyprland.active.workspace.bind('id'),
                                     ],
                                     (
                                         showIcons: boolean,
@@ -102,7 +100,6 @@ export const defaultWses = (monitor: number): BoxWidget => {
                                         options.bar.workspaces.showWsIcons.bind('value'),
                                         workspaceMask.bind('value'),
                                         hyprland.bind('monitors'),
-                                        hyprland.active.workspace.bind('id'),
                                     ],
                                     (
                                         showIcons: boolean,
diff --git a/modules/bar/workspaces/variants/occupied.ts b/modules/bar/workspaces/variants/occupied.ts
index a1fb334..31f3f14 100644
--- a/modules/bar/workspaces/variants/occupied.ts
+++ b/modules/bar/workspaces/variants/occupied.ts
@@ -24,7 +24,6 @@ export const occupiedWses = (monitor: number): BoxWidget => {
                 options.bar.workspaces.show_numbered.bind('value'),
                 options.bar.workspaces.numbered_active_indicator.bind('value'),
                 spacing.bind('value'),
-                hyprland.active.workspace.bind('id'),
                 options.bar.workspaces.workspaceIconMap.bind('value'),
                 options.bar.workspaces.showWsIcons.bind('value'),
                 options.theme.matugen.bind('value'),
@@ -45,13 +44,13 @@ export const occupiedWses = (monitor: number): BoxWidget => {
                 showNumbered: boolean,
                 numberedActiveIndicator: string,
                 spacing: number,
-                activeId: number,
                 wsIconMap: WorkspaceIconMap,
                 showWsIcons: boolean,
                 matugen: boolean,
                 smartHighlight: boolean,
                 monitors: Monitor[],
             ) => {
+                const activeId = hyprland.active.workspace.id;
                 let allWkspcs = range(totalWkspcs || 8);
 
                 const activeWorkspaces = wkSpaces.map((w) => w.id);
@@ -92,13 +91,13 @@ export const occupiedWses = (monitor: number): BoxWidget => {
                 }
 
                 return allWkspcs
-                    .filter((workspaceNumber) => {
-                        return !isWorkspaceIgnored(ignored, workspaceNumber);
-                    })
                     .sort((a, b) => {
                         return a - b;
                     })
                     .map((i, index) => {
+                        if (isWorkspaceIgnored(ignored, i)) {
+                            return Widget.Box();
+                        }
                         return Widget.Button({
                             class_name: 'workspace-button',
                             on_primary_click: () => {
diff --git a/modules/menus/audio/active/SelectedInput.ts b/modules/menus/audio/active/SelectedInput.ts
index cf47ea1..4e3cff3 100644
--- a/modules/menus/audio/active/SelectedInput.ts
+++ b/modules/menus/audio/active/SelectedInput.ts
@@ -12,27 +12,30 @@ const renderActiveInput = (): Box<Child, Attribute>[] => {
                     vexpand: false,
                     vpack: 'end',
                     setup: (self) => {
-                        self.hook(audio, () => {
+                        const updateClass = (): void => {
                             const mic = audio.microphone;
                             const className = `menu-active-button input ${mic.is_muted ? 'muted' : ''}`;
-                            return (self.class_name = className);
-                        });
+                            self.class_name = className;
+                        };
+
+                        self.hook(audio.microphone, updateClass, 'notify::is-muted');
                     },
                     on_primary_click: () => (audio.microphone.is_muted = !audio.microphone.is_muted),
                     child: Widget.Icon({
                         class_name: 'menu-active-icon input',
                         setup: (self) => {
-                            self.hook(audio, () => {
+                            const updateIcon = (): void => {
                                 const isMicMuted =
                                     audio.microphone.is_muted !== null ? audio.microphone.is_muted : true;
 
                                 if (audio.microphone.volume > 0) {
                                     self.icon = getIcon(audio.microphone.volume, isMicMuted)['mic'];
-                                    return;
+                                } else {
+                                    self.icon = getIcon(100, true)['mic'];
                                 }
-
-                                self.icon = getIcon(100, false)['mic'];
-                            });
+                            };
+                            self.hook(audio.microphone, updateIcon, 'notify::volume');
+                            self.hook(audio.microphone, updateIcon, 'notify::is-muted');
                         },
                     }),
                 }),
@@ -44,9 +47,9 @@ const renderActiveInput = (): Box<Child, Attribute>[] => {
                             hpack: 'start',
                             truncate: 'end',
                             wrap: true,
-                            label: audio
-                                .bind('microphone')
-                                .as((v) => (v.description === null ? 'No input device found...' : v.description)),
+                            label: audio.bind('microphone').as((v) => {
+                                return v.description === null ? 'No input device found...' : v.description;
+                            }),
                         }),
                         Widget.Slider({
                             value: audio.microphone.bind('volume').as((v) => v),
diff --git a/modules/menus/audio/active/SelectedPlayback.ts b/modules/menus/audio/active/SelectedPlayback.ts
index 5eedb13..29e5afd 100644
--- a/modules/menus/audio/active/SelectedPlayback.ts
+++ b/modules/menus/audio/active/SelectedPlayback.ts
@@ -12,20 +12,24 @@ const renderActivePlayback = (): Box<Child, Attribute>[] => {
                     vexpand: false,
                     vpack: 'end',
                     setup: (self) => {
-                        self.hook(audio, () => {
+                        const updateClass = (): void => {
                             const spkr = audio.speaker;
                             const className = `menu-active-button playback ${spkr.is_muted ? 'muted' : ''}`;
-                            return (self.class_name = className);
-                        });
+                            self.class_name = className;
+                        };
+
+                        self.hook(audio.speaker, updateClass, 'notify::is-muted');
                     },
                     on_primary_click: () => (audio.speaker.is_muted = !audio.speaker.is_muted),
                     child: Widget.Icon({
                         class_name: 'menu-active-icon playback',
                         setup: (self) => {
-                            self.hook(audio, () => {
+                            const updateIcon = (): void => {
                                 const isSpeakerMuted = audio.speaker.is_muted !== null ? audio.speaker.is_muted : true;
                                 self.icon = getIcon(audio.speaker.volume, isSpeakerMuted)['spkr'];
-                            });
+                            };
+                            self.hook(audio.speaker, updateIcon, 'notify::volume');
+                            self.hook(audio.speaker, updateIcon, 'notify::is-muted');
                         },
                     }),
                 }),
diff --git a/modules/menus/audio/index.ts b/modules/menus/audio/index.ts
index 5bf317d..6801151 100644
--- a/modules/menus/audio/index.ts
+++ b/modules/menus/audio/index.ts
@@ -3,11 +3,12 @@ import DropdownMenu from '../shared/dropdown/index.js';
 import { activeDevices } from './active/index.js';
 import { availableDevices } from './available/index.js';
 import { Attribute, Child } from 'lib/types/widget.js';
+import options from 'options.js';
 
 export default (): Window<Child, Attribute> => {
     return DropdownMenu({
         name: 'audiomenu',
-        transition: 'crossfade',
+        transition: options.menus.transition.bind('value'),
         child: Widget.Box({
             class_name: 'menu-items audio',
             hpack: 'fill',
diff --git a/modules/menus/bluetooth/index.ts b/modules/menus/bluetooth/index.ts
index 3eb722e..54dfcad 100644
--- a/modules/menus/bluetooth/index.ts
+++ b/modules/menus/bluetooth/index.ts
@@ -2,11 +2,12 @@ import Window from 'types/widgets/window.js';
 import DropdownMenu from '../shared/dropdown/index.js';
 import { Devices } from './devices/index.js';
 import { Attribute, Child } from 'lib/types/widget.js';
+import options from 'options.js';
 
 export default (): Window<Child, Attribute> => {
     return DropdownMenu({
         name: 'bluetoothmenu',
-        transition: 'crossfade',
+        transition: options.menus.transition.bind('value'),
         child: Widget.Box({
             class_name: 'menu-items bluetooth',
             hpack: 'fill',
diff --git a/modules/menus/calendar/index.ts b/modules/menus/calendar/index.ts
index ee34c2f..d3fecb8 100644
--- a/modules/menus/calendar/index.ts
+++ b/modules/menus/calendar/index.ts
@@ -11,7 +11,7 @@ const { enabled: weatherEnabled } = options.menus.clock.weather;
 export default (): Window<Child, Attribute> => {
     return DropdownMenu({
         name: 'calendarmenu',
-        transition: 'crossfade',
+        transition: options.menus.transition.bind('value'),
         child: Widget.Box({
             class_name: 'calendar-menu-content',
             css: 'padding: 1px; margin: -1px;',
diff --git a/modules/menus/dashboard/controls/index.ts b/modules/menus/dashboard/controls/index.ts
index 44d4fa7..e158f96 100644
--- a/modules/menus/dashboard/controls/index.ts
+++ b/modules/menus/dashboard/controls/index.ts
@@ -59,16 +59,24 @@ const Controls = (): BoxWidget => {
                 expand: true,
                 on_primary_click: () => (audio.speaker.is_muted = !audio.speaker.is_muted),
                 setup: (self) => {
-                    self.hook(audio, () => {
-                        return (self.class_name = `dashboard-button playback ${audio.speaker.is_muted ? 'disabled' : ''}`);
-                    });
+                    self.hook(
+                        audio.speaker,
+                        () => {
+                            return (self.class_name = `dashboard-button playback ${audio.speaker.is_muted ? 'disabled' : ''}`);
+                        },
+                        'notify::is-muted',
+                    );
                 },
                 child: Widget.Label({
                     class_name: 'txt-icon',
                     setup: (self) => {
-                        self.hook(audio, () => {
-                            return (self.label = audio.speaker.is_muted ? '󰖁' : '󰕾');
-                        });
+                        self.hook(
+                            audio.speaker,
+                            () => {
+                                return (self.label = audio.speaker.is_muted ? '󰖁' : '󰕾');
+                            },
+                            'notify::is-muted',
+                        );
                     },
                 }),
             }),
@@ -77,16 +85,24 @@ const Controls = (): BoxWidget => {
                 expand: true,
                 on_primary_click: () => (audio.microphone.is_muted = !audio.microphone.is_muted),
                 setup: (self) => {
-                    self.hook(audio, () => {
-                        return (self.class_name = `dashboard-button input ${audio.microphone.is_muted ? 'disabled' : ''}`);
-                    });
+                    self.hook(
+                        audio.microphone,
+                        () => {
+                            return (self.class_name = `dashboard-button input ${audio.microphone.is_muted ? 'disabled' : ''}`);
+                        },
+                        'notify::is-muted',
+                    );
                 },
                 child: Widget.Label({
                     class_name: 'txt-icon',
                     setup: (self) => {
-                        self.hook(audio, () => {
-                            return (self.label = audio.microphone.is_muted ? '󰍭' : '󰍬');
-                        });
+                        self.hook(
+                            audio.microphone,
+                            () => {
+                                return (self.label = audio.microphone.is_muted ? '󰍭' : '󰍬');
+                            },
+                            'notify::is-muted',
+                        );
                     },
                 }),
             }),
diff --git a/modules/menus/dashboard/index.ts b/modules/menus/dashboard/index.ts
index ea37628..6aee225 100644
--- a/modules/menus/dashboard/index.ts
+++ b/modules/menus/dashboard/index.ts
@@ -6,11 +6,12 @@ import { Stats } from './stats/index.js';
 import { Directories } from './directories/index.js';
 import Window from 'types/widgets/window.js';
 import { Attribute, Child } from 'lib/types/widget.js';
+import options from 'options.js';
 
 export default (): Window<Child, Attribute> => {
     return DropdownMenu({
         name: 'dashboardmenu',
-        transition: 'crossfade',
+        transition: options.menus.transition.bind('value'),
         child: Widget.Box({
             class_name: 'dashboard-menu-content',
             css: 'padding: 1px; margin: -1px;',
diff --git a/modules/menus/dashboard/shortcuts/index.ts b/modules/menus/dashboard/shortcuts/index.ts
index ce00aae..5b4f49c 100644
--- a/modules/menus/dashboard/shortcuts/index.ts
+++ b/modules/menus/dashboard/shortcuts/index.ts
@@ -38,7 +38,7 @@ const Shortcuts = (): BoxWidget => {
         hpack: 'fill',
         hexpand: true,
         setup: (self) => {
-            self.hook(hyprland, () => {
+            const renderMonitorList = (): void => {
                 const displays = hyprland.monitors.map((mon) => {
                     return Widget.MenuItem({
                         label: `Display ${mon.name}`,
@@ -64,12 +64,14 @@ const Shortcuts = (): BoxWidget => {
                 //     });
                 // });
 
-                return (self.children = [
+                self.children = [
                     ...displays,
                     // Disabled since window recording isn't available on wayland
                     // ...apps
-                ]);
-            });
+                ];
+            };
+            self.hook(hyprland, renderMonitorList, 'monitor-added');
+            self.hook(hyprland, renderMonitorList, 'monitor-removed');
         },
     });
 
diff --git a/modules/menus/energy/index.ts b/modules/menus/energy/index.ts
index 86c898b..134d2cc 100644
--- a/modules/menus/energy/index.ts
+++ b/modules/menus/energy/index.ts
@@ -3,11 +3,12 @@ import { EnergyProfiles } from './profiles/index.js';
 import { Brightness } from './brightness/index.js';
 import { Attribute, Child } from 'lib/types/widget.js';
 import Window from 'types/widgets/window.js';
+import options from 'options.js';
 
 export default (): Window<Child, Attribute> => {
     return DropdownMenu({
         name: 'energymenu',
-        transition: 'crossfade',
+        transition: options.menus.transition.bind('value'),
         child: Widget.Box({
             class_name: 'menu-items energy',
             hpack: 'fill',
diff --git a/modules/menus/media/components/bar.ts b/modules/menus/media/components/bar.ts
index 50d03e8..81448db 100644
--- a/modules/menus/media/components/bar.ts
+++ b/modules/menus/media/components/bar.ts
@@ -46,10 +46,15 @@ const Bar = (getPlayerInfo: (media: Mpris) => MprisPlayer): BoxWidget => {
                             const curSec = Math.floor(foundPlayer.position % 60);
 
                             if (typeof foundPlayer.position === 'number' && foundPlayer.position >= 0) {
-                                // WARN: These nested ternaries are absolutely disgusting lol
-                                self.tooltip_text = `${
-                                    curHour > 0 ? (curHour < 10 ? '0' + curHour : curHour) + ':' : ''
-                                }${curMin < 10 ? '0' + curMin : curMin}:${curSec < 10 ? '0' + curSec : curSec}`;
+                                const formatTime = (time: number): string => {
+                                    return time.toString().padStart(2, '0');
+                                };
+
+                                const formatHour = (hour: number): string => {
+                                    return hour > 0 ? formatTime(hour) + ':' : '';
+                                };
+
+                                self.tooltip_text = `${formatHour(curHour)}${formatTime(curMin)}:${formatTime(curSec)}`;
                             } else {
                                 self.tooltip_text = `00:00`;
                             }
diff --git a/modules/menus/media/index.ts b/modules/menus/media/index.ts
index ebc45ae..489034d 100644
--- a/modules/menus/media/index.ts
+++ b/modules/menus/media/index.ts
@@ -2,11 +2,12 @@ import Window from 'types/widgets/window.js';
 import DropdownMenu from '../shared/dropdown/index.js';
 import { Media } from './media.js';
 import { Attribute, Child } from 'lib/types/widget.js';
+import options from 'options.js';
 
 export default (): Window<Child, Attribute> => {
     return DropdownMenu({
         name: 'mediamenu',
-        transition: 'crossfade',
+        transition: options.menus.transition.bind('value'),
         child: Widget.Box({
             class_name: 'menu-items media',
             hpack: 'fill',
diff --git a/modules/menus/network/index.ts b/modules/menus/network/index.ts
index d0fb9ff..f3e88dc 100644
--- a/modules/menus/network/index.ts
+++ b/modules/menus/network/index.ts
@@ -3,11 +3,12 @@ import DropdownMenu from '../shared/dropdown/index.js';
 import { Ethernet } from './ethernet/index.js';
 import { Wifi } from './wifi/index.js';
 import { Attribute, Child } from 'lib/types/widget.js';
+import options from 'options.js';
 
 export default (): Window<Child, Attribute> => {
     return DropdownMenu({
         name: 'networkmenu',
-        transition: 'crossfade',
+        transition: options.menus.transition.bind('value'),
         child: Widget.Box({
             class_name: 'menu-items network',
             child: Widget.Box({
diff --git a/modules/menus/notifications/index.ts b/modules/menus/notifications/index.ts
index ae2b151..bbdbce2 100644
--- a/modules/menus/notifications/index.ts
+++ b/modules/menus/notifications/index.ts
@@ -27,7 +27,7 @@ export default (): Window<Child, Attribute> => {
 
     return DropdownMenu({
         name: 'notificationsmenu',
-        transition: 'crossfade',
+        transition: options.menus.transition.bind('value'),
         child: Widget.Box({
             class_name: 'notification-menu-content',
             css: 'padding: 1px; margin: -1px;',
diff --git a/modules/menus/notifications/notification/placeholder/index.ts b/modules/menus/notifications/notification/placeholder/index.ts
index 8e53af9..e22df55 100644
--- a/modules/menus/notifications/notification/placeholder/index.ts
+++ b/modules/menus/notifications/notification/placeholder/index.ts
@@ -14,7 +14,7 @@ const Placeholder = (notifs: Notifications): BoxWidget => {
             children: [
                 Widget.Label({
                     vpack: 'center',
-                    class_name: 'placeholder-label dim bell',
+                    class_name: 'placeholder-label dim bell txt-icon',
                     label: notifs.bind('dnd').as((dnd) => (dnd ? '󰂛' : '󰂚')),
                 }),
                 Widget.Label({
diff --git a/modules/menus/power/index.ts b/modules/menus/power/index.ts
index 394cd77..bb8505d 100644
--- a/modules/menus/power/index.ts
+++ b/modules/menus/power/index.ts
@@ -4,6 +4,7 @@ import powermenu from './helpers/actions.js';
 import icons from '../../icons/index.js';
 import Window from 'types/widgets/window.js';
 import { Attribute, Child, GButton } from 'lib/types/widget.js';
+import options from 'options.js';
 
 const SysButton = (action: Action, label: string): GButton =>
     Widget.Button({
@@ -27,7 +28,7 @@ const SysButton = (action: Action, label: string): GButton =>
 export default (): Window<Child, Attribute> =>
     PopupWindow({
         name: 'powermenu',
-        transition: 'crossfade',
+        transition: options.menus.transition.bind('value'),
         child: Widget.Box({
             class_name: 'powermenu horizontal',
             children: [
diff --git a/modules/menus/powerDropdown/index.ts b/modules/menus/powerDropdown/index.ts
index 8ebfee4..1562d8b 100644
--- a/modules/menus/powerDropdown/index.ts
+++ b/modules/menus/powerDropdown/index.ts
@@ -2,11 +2,12 @@ import Window from 'types/widgets/window.js';
 import DropdownMenu from '../shared/dropdown/index.js';
 import { PowerButton } from './button.js';
 import { Attribute, Child } from 'lib/types/widget.js';
+import options from 'options.js';
 
 export default (): Window<Child, Attribute> => {
     return DropdownMenu({
         name: 'powerdropdownmenu',
-        transition: 'crossfade',
+        transition: options.menus.transition.bind('value'),
         child: Widget.Box({
             class_name: 'menu-items power-dropdown',
             child: Widget.Box({
diff --git a/modules/menus/shared/dropdown/index.ts b/modules/menus/shared/dropdown/index.ts
index 56bd97b..d9496e7 100644
--- a/modules/menus/shared/dropdown/index.ts
+++ b/modules/menus/shared/dropdown/index.ts
@@ -2,8 +2,8 @@ import options from 'options';
 import { DropdownMenuProps } from 'lib/types/dropdownmenu';
 import { Attribute, Child, Exclusivity } from 'lib/types/widget';
 import Window from 'types/widgets/window';
-import { moveBoxToCursor } from './locationHandler/index';
 import { barEventMargins } from './eventBoxes/index';
+import { globalEventBoxes } from 'globals/dropdown';
 
 const { location } = options.theme.bar;
 
@@ -22,7 +22,6 @@ export default ({
     child,
     transition,
     exclusivity = 'ignore' as Exclusivity,
-    fixed = false,
     ...props
 }: DropdownMenuProps): Window<Child, Attribute> =>
     Widget.Window({
@@ -61,7 +60,7 @@ export default ({
                             return true;
                         },
                         setup: (self) => {
-                            moveBoxToCursor(self, fixed);
+                            globalEventBoxes.value[name] = self;
                         },
                         child: Widget.Box({
                             class_name: 'dropdown-menu-container',
@@ -73,7 +72,7 @@ export default ({
                                         if (wname === name) self.reveal_child = visible;
                                     }),
                                 transition,
-                                transitionDuration: 350,
+                                transitionDuration: options.menus.transitionTime.bind('value'),
                                 child: Widget.Box({
                                     class_name: 'dropdown-menu-container',
                                     can_focus: true,
diff --git a/modules/menus/shared/dropdown/locationHandler/index.ts b/modules/menus/shared/dropdown/locationHandler/index.ts
index 5625cee..28ce7c7 100644
--- a/modules/menus/shared/dropdown/locationHandler/index.ts
+++ b/modules/menus/shared/dropdown/locationHandler/index.ts
@@ -7,6 +7,7 @@ import { Monitor } from 'types/service/hyprland';
 import Box from 'types/widgets/box';
 import EventBox from 'types/widgets/eventbox';
 import Revealer from 'types/widgets/revealer';
+import { globalEventBoxes } from 'globals/dropdown';
 
 type NestedRevealer = Revealer<Box<TWidget, unknown>, unknown>;
 type NestedBox = Box<NestedRevealer, unknown>;
@@ -15,90 +16,83 @@ type NestedEventBox = EventBox<NestedBox, unknown>;
 const { location } = options.theme.bar;
 const { scalingPriority } = options;
 
-export const moveBoxToCursor = <T extends NestedEventBox>(self: T, fixed: boolean): void => {
-    if (fixed) {
+export const calculateMenuPosition = async (pos: number[], windowName: string): Promise<void> => {
+    const self = globalEventBoxes.value[windowName] as NestedEventBox;
+    const curHyprlandMonitor = hyprland.monitors.find((m) => m.id === hyprland.active.monitor.id);
+    const dropdownWidth = self.child.get_allocation().width;
+    const dropdownHeight = self.child.get_allocation().height;
+
+    let hyprScaling = 1;
+    try {
+        const monitorInfo = await bash('hyprctl monitors -j');
+        const parsedMonitorInfo = JSON.parse(monitorInfo);
+
+        const foundMonitor = parsedMonitorInfo.find((monitor: Monitor) => monitor.id === hyprland.active.monitor.id);
+        hyprScaling = foundMonitor?.scale || 1;
+    } catch (error) {
+        console.error(`Error parsing hyprland monitors: ${error}`);
+    }
+
+    let monWidth = curHyprlandMonitor?.width;
+    let monHeight = curHyprlandMonitor?.height;
+
+    if (monWidth === undefined || monHeight === undefined || hyprScaling === undefined) {
         return;
     }
 
-    globalMousePos.connect('changed', async ({ value }) => {
-        const curHyprlandMonitor = hyprland.monitors.find((m) => m.id === hyprland.active.monitor.id);
-        const dropdownWidth = self.child.get_allocation().width;
-        const dropdownHeight = self.child.get_allocation().height;
+    // If GDK Scaling is applied, then get divide width by scaling
+    // to get the proper coordinates.
+    // Ex: On a 2860px wide monitor... if scaling is set to 2, then the right
+    // end of the monitor is the 1430th pixel.
+    const gdkScale = Utils.exec('bash -c "echo $GDK_SCALE"');
 
-        let hyprScaling = 1;
-        try {
-            const monitorInfo = await bash('hyprctl monitors -j');
-            const parsedMonitorInfo = JSON.parse(monitorInfo);
+    if (scalingPriority.value === 'both') {
+        const scale = parseFloat(gdkScale);
+        monWidth = monWidth / scale;
+        monHeight = monHeight / scale;
 
-            const foundMonitor = parsedMonitorInfo.find(
-                (monitor: Monitor) => monitor.id === hyprland.active.monitor.id,
-            );
-            hyprScaling = foundMonitor?.scale || 1;
-        } catch (error) {
-            console.error(`Error parsing hyprland monitors: ${error}`);
-        }
+        monWidth = monWidth / hyprScaling;
+        monHeight = monHeight / hyprScaling;
+    } else if (/^\d+(.\d+)?$/.test(gdkScale) && scalingPriority.value === 'gdk') {
+        const scale = parseFloat(gdkScale);
+        monWidth = monWidth / scale;
+        monHeight = monHeight / scale;
+    } else {
+        monWidth = monWidth / hyprScaling;
+        monHeight = monHeight / hyprScaling;
+    }
 
-        let monWidth = curHyprlandMonitor?.width;
-        let monHeight = curHyprlandMonitor?.height;
+    // If monitor is vertical (transform = 1 || 3) swap height and width
+    const isVertical = curHyprlandMonitor?.transform !== undefined ? curHyprlandMonitor.transform % 2 !== 0 : false;
 
-        if (monWidth === undefined || monHeight === undefined || hyprScaling === undefined) {
-            return;
-        }
+    if (isVertical) {
+        [monWidth, monHeight] = [monHeight, monWidth];
+    }
 
-        // If GDK Scaling is applied, then get divide width by scaling
-        // to get the proper coordinates.
-        // Ex: On a 2860px wide monitor... if scaling is set to 2, then the right
-        // end of the monitor is the 1430th pixel.
-        const gdkScale = Utils.exec('bash -c "echo $GDK_SCALE"');
+    let marginRight = monWidth - dropdownWidth / 2;
+    marginRight = marginRight - pos[0];
+    let marginLeft = monWidth - dropdownWidth - marginRight;
 
-        if (scalingPriority.value === 'both') {
-            const scale = parseFloat(gdkScale);
-            monWidth = monWidth / scale;
-            monHeight = monHeight / scale;
+    const minimumMargin = 0;
 
-            monWidth = monWidth / hyprScaling;
-            monHeight = monHeight / hyprScaling;
-        } else if (/^\d+(.\d+)?$/.test(gdkScale) && scalingPriority.value === 'gdk') {
-            const scale = parseFloat(gdkScale);
-            monWidth = monWidth / scale;
-            monHeight = monHeight / scale;
-        } else {
-            monWidth = monWidth / hyprScaling;
-            monHeight = monHeight / hyprScaling;
-        }
+    if (marginRight < minimumMargin) {
+        marginRight = minimumMargin;
+        marginLeft = monWidth - dropdownWidth - minimumMargin;
+    }
 
-        // If monitor is vertical (transform = 1 || 3) swap height and width
-        const isVertical = curHyprlandMonitor?.transform !== undefined ? curHyprlandMonitor.transform % 2 !== 0 : false;
+    if (marginLeft < minimumMargin) {
+        marginLeft = minimumMargin;
+        marginRight = monWidth - dropdownWidth - minimumMargin;
+    }
 
-        if (isVertical) {
-            [monWidth, monHeight] = [monHeight, monWidth];
-        }
+    self.set_margin_left(marginLeft);
+    self.set_margin_right(marginRight);
 
-        let marginRight = monWidth - dropdownWidth / 2;
-        marginRight = fixed ? marginRight - monWidth / 2 : marginRight - value[0];
-        let marginLeft = monWidth - dropdownWidth - marginRight;
-
-        const minimumMargin = 0;
-
-        if (marginRight < minimumMargin) {
-            marginRight = minimumMargin;
-            marginLeft = monWidth - dropdownWidth - minimumMargin;
-        }
-
-        if (marginLeft < minimumMargin) {
-            marginLeft = minimumMargin;
-            marginRight = monWidth - dropdownWidth - minimumMargin;
-        }
-
-        self.set_margin_left(marginLeft);
-        self.set_margin_right(marginRight);
-
-        if (location.value === 'top') {
-            self.set_margin_top(0);
-            self.set_margin_bottom(monHeight);
-        } else {
-            self.set_margin_bottom(0);
-            self.set_margin_top(monHeight - dropdownHeight);
-        }
-    });
+    if (location.value === 'top') {
+        self.set_margin_top(0);
+        self.set_margin_bottom(monHeight);
+    } else {
+        self.set_margin_bottom(0);
+        self.set_margin_top(monHeight - dropdownHeight);
+    }
 };
diff --git a/modules/menus/shared/popup/index.ts b/modules/menus/shared/popup/index.ts
index 659c12a..3738030 100644
--- a/modules/menus/shared/popup/index.ts
+++ b/modules/menus/shared/popup/index.ts
@@ -163,7 +163,7 @@ export default ({
     name,
     child,
     layout = 'center',
-    transition,
+    transition = 'none',
     exclusivity = 'ignore' as Exclusivity,
     ...props
 }: PopupWindowProps): Window<Child, Attribute> => {
diff --git a/options.ts b/options.ts
index 28096c7..97fdf3d 100644
--- a/options.ts
+++ b/options.ts
@@ -21,6 +21,7 @@ import {
 } from 'lib/types/options';
 import { MatugenScheme, MatugenTheme, MatugenVariations } from 'lib/types/options';
 import { UnitType } from 'lib/types/weather';
+import { Transition } from 'lib/types/widget';
 import { WorkspaceIcons, WorkspaceIconsColored } from 'lib/types/workspace';
 
 // WARN: CHANGING THESE VALUES WILL PREVENT MATUGEN COLOR GENERATION FOR THE CHANGED VALUE
@@ -1007,6 +1008,7 @@ const options = mkOptions(OPTIONS, {
             },
             submap: {
                 label: opt(true),
+                showSubmapName: opt(true),
                 enabledIcon: opt('󰌐'),
                 disabledIcon: opt('󰌌'),
                 enabledText: opt('Submap On'),
@@ -1039,6 +1041,8 @@ const options = mkOptions(OPTIONS, {
     },
 
     menus: {
+        transition: opt<Transition>('crossfade'),
+        transitionTime: opt(200),
         power: {
             showLabel: opt(true),
             confirmation: opt(true),
diff --git a/scripts/fillThemes.js b/scripts/fillThemes.js
new file mode 100644
index 0000000..085d05f
--- /dev/null
+++ b/scripts/fillThemes.js
@@ -0,0 +1,388 @@
+#!/usr/bin/env node
+
+/**
+ * compare_themes.js
+ *
+ * A Node.js script to compare theme JSON files against base themes and add missing keys,
+ * as well as remove any properties that don't exist in the corresponding base theme.
+ * It assigns values based on matching colors or randomly selects from border colors.
+ *
+ * Usage:
+ *   node compare_themes.js [--dry-run] [themes_directory]
+ *
+ * If no themes_directory is provided, it defaults to '~/.config/ags/themes'.
+ */
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+/**
+ * ANSI color codes for formatting console output.
+ */
+const COLORS = {
+    RESET: '\x1b[0m',
+    FG_RED: '\x1b[31m',
+    FG_GREEN: '\x1b[32m',
+    FG_YELLOW: '\x1b[33m',
+    FG_BLUE: '\x1b[34m',
+    FG_MAGENTA: '\x1b[35m',
+    FG_CYAN: '\x1b[36m',
+    FG_WHITE: '\x1b[37m',
+    BG_RED: '\x1b[41m',
+    BG_GREEN: '\x1b[42m',
+    BG_YELLOW: '\x1b[43m',
+    BG_BLUE: '\x1b[44m',
+    BG_MAGENTA: '\x1b[45m',
+    BG_CYAN: '\x1b[46m',
+    BG_WHITE: '\x1b[47m',
+};
+
+/**
+ * Formats a message with the given color.
+ *
+ * @param {string} color - The ANSI color code.
+ * @param {string} message - The message to format.
+ * @returns {string} The formatted message.
+ */
+const formatMessage = (color, message) => `${color}${message}${COLORS.RESET}`;
+
+/**
+ * Loads and parses a JSON file.
+ *
+ * @param {string} filePath - The path to the JSON file.
+ * @returns {Object} The parsed JSON object.
+ */
+const loadJSON = (filePath) => {
+    try {
+        const data = fs.readFileSync(filePath, 'utf8');
+        return JSON.parse(data);
+    } catch (error) {
+        console.error(formatMessage(COLORS.FG_RED, `Error reading or parsing '${filePath}': ${error.message}`));
+        process.exit(1);
+    }
+};
+
+/**
+ * Saves a JSON object to a file with indentation.
+ *
+ * @param {string} filePath - The path to the JSON file.
+ * @param {Object} data - The JSON data to save.
+ */
+const saveJSON = (filePath, data) => {
+    try {
+        const jsonString = JSON.stringify(data, null, 2);
+        fs.writeFileSync(filePath, jsonString, 'utf8');
+    } catch (error) {
+        console.error(formatMessage(COLORS.FG_RED, `Error writing to '${filePath}': ${error.message}`));
+        process.exit(1);
+    }
+};
+
+/**
+ * Finds the most common value in an array.
+ *
+ * @param {Array} arr - The array to analyze.
+ * @returns {*} The most common value in the array.
+ */
+const getMostCommonValue = (arr) => {
+    const frequency = {};
+    let maxFreq = 0;
+    let mostCommon = arr[0] || null;
+
+    arr.forEach((value) => {
+        frequency[value] = (frequency[value] || 0) + 1;
+        if (frequency[value] > maxFreq) {
+            maxFreq = frequency[value];
+            mostCommon = value;
+        }
+    });
+
+    return mostCommon;
+};
+
+/**
+ * Compares two JSON objects and finds missing keys in the target.
+ *
+ * @param {Object} baseJSON - The base JSON object.
+ * @param {Object} targetJSON - The target JSON object to compare.
+ * @returns {Array<string>} An array of missing keys.
+ */
+const findMissingKeys = (baseJSON, targetJSON) => {
+    const baseKeys = new Set(Object.keys(baseJSON));
+    const targetKeys = new Set(Object.keys(targetJSON));
+
+    const missingKeys = [...baseKeys].filter((key) => !targetKeys.has(key));
+    return missingKeys;
+};
+
+/**
+ * Determines if a key should be excluded based on predefined patterns.
+ *
+ * @param {string} key - The key to check.
+ * @returns {boolean} True if the key is excluded, otherwise false.
+ */
+const isExcludedKey = (key) => {
+    const excludedPatterns = [];
+
+    return excludedPatterns.some((pattern) => pattern.test(key));
+};
+
+/**
+ * Builds a mapping from values to their corresponding keys in the base theme.
+ *
+ * @param {Object} baseJSON - The base JSON object.
+ * @returns {Object} A map where keys are values and values are arrays of keys.
+ */
+const buildValueToKeysMap = (baseJSON) => {
+    const valueToKeysMap = {};
+
+    Object.entries(baseJSON).forEach(([key, value]) => {
+        if (!valueToKeysMap[value]) {
+            valueToKeysMap[value] = [];
+        }
+        valueToKeysMap[value].push(key);
+    });
+
+    return valueToKeysMap;
+};
+
+/**
+ * Collects all border colors from the base theme.
+ *
+ * @param {Object} baseJSON - The base JSON object.
+ * @returns {Array<string>} An array of border color values.
+ */
+const collectBorderColors = (baseJSON) => {
+    const borderColors = new Set();
+
+    Object.entries(baseJSON).forEach(([key, value]) => {
+        if (/^theme\.bar\.buttons\..*\.border$/.test(key)) {
+            borderColors.add(value);
+        }
+    });
+
+    return Array.from(borderColors);
+};
+
+/**
+ * Determines the best match value for a missing key based on related keys.
+ *
+ * @param {string} baseValue - The value of the missing key in the base theme.
+ * @param {Object} valueToKeysMap - A map from values to keys in the base theme.
+ * @param {Object} targetJSON - The target JSON object.
+ * @returns {*} The best matching value or null if a random selection is needed.
+ */
+const determineBestMatchValue = (baseValue, valueToKeysMap, targetJSON) => {
+    const relatedBaseKeys = valueToKeysMap[baseValue] || [];
+
+    const correspondingTargetValues = relatedBaseKeys
+        .map((baseKey) => targetJSON[baseKey])
+        .filter((value) => value !== undefined);
+
+    if (correspondingTargetValues.length > 0) {
+        return getMostCommonValue(correspondingTargetValues);
+    }
+
+    return null;
+};
+
+/**
+ * Finds extra keys in the target JSON that are not present in the base theme.
+ *
+ * @param {Object} baseTheme - The base JSON object.
+ * @param {Object} targetJSON - The target JSON object.
+ * @returns {Array<string>} An array of extra keys.
+ */
+const findExtraKeys = (baseTheme, targetJSON) => {
+    const validKeys = new Set(Object.keys(baseTheme));
+
+    const targetKeys = Object.keys(targetJSON);
+
+    const extraKeys = targetKeys.filter((key) => !validKeys.has(key) && !isExcludedKey(key));
+
+    return extraKeys;
+};
+
+/**
+ * Creates a backup of a theme file.
+ *
+ * @param {string} themePath - The path to the theme file.
+ */
+const backupTheme = (themePath) => {
+    const backupDir = path.join(path.dirname(themePath), 'backup');
+    if (!fs.existsSync(backupDir)) {
+        fs.mkdirSync(backupDir);
+    }
+    const backupPath = path.join(backupDir, path.basename(themePath));
+    fs.copyFileSync(themePath, backupPath);
+    console.log(formatMessage(COLORS.FG_CYAN, `Backup created at '${backupPath}'.`));
+};
+
+/**
+ * Processes a single theme by adding missing keys and removing extra keys.
+ *
+ * @param {string} themePath - The path to the theme file.
+ * @param {Object} baseTheme - The base JSON object.
+ * @param {boolean} dryRun - If true, no changes will be written to files.
+ */
+const processTheme = (themePath, baseTheme, dryRun) => {
+    const themeJSON = loadJSON(themePath);
+    const missingKeys = findMissingKeys(baseTheme, themeJSON);
+
+    let hasChanges = false;
+
+    if (missingKeys.length === 0) {
+        console.log(formatMessage(COLORS.FG_GREEN, `✅ No missing keys in '${path.basename(themePath)}'.`));
+    } else {
+        console.log(
+            formatMessage(
+                COLORS.FG_YELLOW,
+                `\n🔍 Processing '${path.basename(themePath)}': Found ${missingKeys.length} missing key(s).`,
+            ),
+        );
+
+        const valueToKeysMap = buildValueToKeysMap(baseTheme);
+        const borderColors = collectBorderColors(baseTheme);
+
+        missingKeys.forEach((key) => {
+            if (isExcludedKey(key)) {
+                console.log(formatMessage(COLORS.FG_MAGENTA, `❗ Excluded key from addition: "${key}"`));
+                return;
+            }
+
+            const baseValue = baseTheme[key];
+            const bestValue = determineBestMatchValue(baseValue, valueToKeysMap, themeJSON);
+
+            if (bestValue !== null) {
+                themeJSON[key] = bestValue;
+                console.log(formatMessage(COLORS.FG_GREEN, `➕ Added key: "${key}": "${bestValue}"`));
+            } else {
+                if (borderColors.length === 0) {
+                    console.error(formatMessage(COLORS.FG_RED, '❌ Error: No border colors available to assign.'));
+                    return;
+                }
+                const randomColor = borderColors[Math.floor(Math.random() * borderColors.length)];
+                themeJSON[key] = randomColor;
+                console.log(
+                    formatMessage(
+                        COLORS.FG_YELLOW,
+                        `➕ Added key with random border color: "${key}": "${randomColor}"`,
+                    ),
+                );
+            }
+
+            hasChanges = true;
+        });
+    }
+
+    const extraKeys = findExtraKeys(baseTheme, themeJSON);
+
+    if (extraKeys.length === 0) {
+        console.log(formatMessage(COLORS.FG_GREEN, `✅ No extra keys to remove in '${path.basename(themePath)}'.`));
+    } else {
+        console.log(
+            formatMessage(
+                COLORS.FG_YELLOW,
+                `\n🗑️ Processing '${path.basename(themePath)}': Found ${extraKeys.length} extra key(s) to remove.`,
+            ),
+        );
+
+        extraKeys.forEach((key) => {
+            delete themeJSON[key];
+            console.log(formatMessage(COLORS.FG_RED, `➖ Removed key: "${key}"`));
+            hasChanges = true;
+        });
+    }
+
+    if (hasChanges) {
+        if (dryRun) {
+            console.log(
+                formatMessage(
+                    COLORS.FG_CYAN,
+                    `(Dry-Run) 📝 Would update '${path.basename(themePath)}' with missing and extra keys.`,
+                ),
+            );
+        } else {
+            backupTheme(themePath);
+            saveJSON(themePath, themeJSON);
+            console.log(
+                formatMessage(COLORS.FG_GREEN, `✅ Updated '${path.basename(themePath)}' with missing and extra keys.`),
+            );
+        }
+    } else {
+        console.log(formatMessage(COLORS.FG_BLUE, `ℹ️ No changes made to '${path.basename(themePath)}'.`));
+    }
+};
+
+/**
+ * The main function that orchestrates the theme comparison and updating.
+ */
+const main = () => {
+    const args = process.argv.slice(2);
+    const dryRunIndex = args.indexOf('--dry-run');
+    const dryRun = dryRunIndex !== -1;
+    if (dryRun) {
+        args.splice(dryRunIndex, 1);
+        console.log(formatMessage(COLORS.FG_CYAN, '🔍 Running in Dry-Run mode. No files will be modified.'));
+    }
+
+    const themesDir = args[0] || path.join(os.homedir(), '.config', 'ags', 'themes');
+
+    if (!fs.existsSync(themesDir)) {
+        console.error(formatMessage(COLORS.FG_RED, `❌ Error: Themes directory '${themesDir}' does not exist.`));
+        process.exit(1);
+    }
+
+    const baseThemeFile = 'catppuccin_mocha.json';
+    const baseThemeSplitFile = 'catppuccin_mocha_split.json';
+    const baseThemePath = path.join(themesDir, baseThemeFile);
+    const baseThemeSplitPath = path.join(themesDir, baseThemeSplitFile);
+
+    if (!fs.existsSync(baseThemePath)) {
+        console.error(
+            formatMessage(COLORS.FG_RED, `❌ Error: Base theme '${baseThemeFile}' does not exist in '${themesDir}'.`),
+        );
+        process.exit(1);
+    }
+
+    if (!fs.existsSync(baseThemeSplitPath)) {
+        console.error(
+            formatMessage(
+                COLORS.FG_RED,
+                `❌ Error: Base split theme '${baseThemeSplitFile}' does not exist in '${themesDir}'.`,
+            ),
+        );
+        process.exit(1);
+    }
+
+    const baseTheme = loadJSON(baseThemePath);
+    const baseThemeSplit = loadJSON(baseThemeSplitPath);
+
+    const themeFiles = fs.readdirSync(themesDir).filter((file) => file.endsWith('.json'));
+
+    themeFiles.forEach((file) => {
+        if (file === baseThemeFile || file === baseThemeSplitFile) {
+            return;
+        }
+
+        const themePath = path.join(themesDir, file);
+        let correspondingBaseTheme;
+
+        if (file.endsWith('_split.json')) {
+            correspondingBaseTheme = baseThemeSplit;
+        } else {
+            correspondingBaseTheme = baseTheme;
+        }
+
+        try {
+            processTheme(themePath, correspondingBaseTheme, dryRun);
+        } catch (error) {
+            console.error(formatMessage(COLORS.FG_RED, `❌ Error processing '${file}': ${error.message}`));
+        }
+    });
+
+    console.log(formatMessage(COLORS.FG_GREEN, '\n🎉 All themes have been processed.'));
+};
+
+main();
diff --git a/scss/style.ts b/scss/style.ts
index 221ee08..0679506 100644
--- a/scss/style.ts
+++ b/scss/style.ts
@@ -3,6 +3,7 @@ import { bash, dependencies } from 'lib/utils';
 import { MatugenColors, RecursiveOptionsObject } from 'lib/types/options';
 import { initializeTrackers } from './optionsTrackers';
 import { generateMatugenColors, replaceHexValues } from '../services/matugen/index';
+import { isHexColor } from 'globals/variables';
 
 const deps = ['font', 'theme', 'bar.flatButtons', 'bar.position', 'bar.battery.charging', 'bar.battery.blocks'];
 
@@ -13,24 +14,25 @@ function extractVariables(theme: RecursiveOptionsObject, prefix = '', matugenCol
             continue;
         }
 
-        const value = theme[key];
+        const themeValue = theme[key];
 
         const newPrefix = prefix ? `${prefix}-${key}` : key;
 
-        const isColor = /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(value.value);
         const replacedValue =
-            isColor && matugenColors !== undefined ? replaceHexValues(value.value, matugenColors) : value.value;
+            isHexColor(themeValue.value) && matugenColors !== undefined
+                ? replaceHexValues(themeValue.value, matugenColors)
+                : themeValue.value;
 
-        if (typeof value === 'function') {
+        if (typeof themeValue === 'function') {
             result.push(`$${newPrefix}: ${replacedValue};`);
             continue;
         }
-        if (typeof value !== 'object' || value === null || Array.isArray(value)) continue;
+        if (typeof themeValue !== 'object' || themeValue === null || Array.isArray(themeValue)) continue;
 
-        if (typeof value.value !== 'undefined') {
+        if (typeof themeValue.value !== 'undefined') {
             result.push(`$${newPrefix}: ${replacedValue};`);
         } else {
-            result = result.concat(extractVariables(value as RecursiveOptionsObject, newPrefix, matugenColors));
+            result = result.concat(extractVariables(themeValue, newPrefix, matugenColors));
         }
     }
 
@@ -43,7 +45,7 @@ const resetCss = async (): Promise<void> => {
     try {
         const matugenColors = await generateMatugenColors();
 
-        const variables = [...extractVariables(options.theme, '', matugenColors)];
+        const variables = extractVariables(options.theme as RecursiveOptionsObject, '', matugenColors);
 
         const vars = `${TMP}/variables.scss`;
         const css = `${TMP}/main.css`;
diff --git a/themes/catppuccin_frappe.json b/themes/catppuccin_frappe.json
index 6656935..a59a4a0 100644
--- a/themes/catppuccin_frappe.json
+++ b/themes/catppuccin_frappe.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#292c3c",
   "theme.bar.buttons.notifications.total": "#babbf1",
   "theme.bar.buttons.notifications.icon": "#babbf1",
-  "theme.bar.buttons.notifications.hover": "#51576d",
   "theme.bar.buttons.notifications.background": "#303446",
   "theme.bar.buttons.clock.icon": "#f4b8e4",
   "theme.bar.buttons.clock.text": "#f4b8e4",
-  "theme.bar.buttons.clock.hover": "#51576d",
   "theme.bar.buttons.clock.background": "#303446",
   "theme.bar.buttons.battery.icon": "#e5c890",
   "theme.bar.buttons.battery.text": "#e5c890",
-  "theme.bar.buttons.battery.hover": "#51576d",
   "theme.bar.buttons.battery.background": "#303446",
-  "theme.bar.buttons.systray.hover": "#51576d",
   "theme.bar.buttons.systray.background": "#303446",
   "theme.bar.buttons.bluetooth.icon": "#99d1db",
   "theme.bar.buttons.bluetooth.text": "#99d1db",
-  "theme.bar.buttons.bluetooth.hover": "#51576d",
   "theme.bar.buttons.bluetooth.background": "#303446",
   "theme.bar.buttons.network.icon": "#ca9ee6",
   "theme.bar.buttons.network.text": "#ca9ee6",
-  "theme.bar.buttons.network.hover": "#51576d",
   "theme.bar.buttons.network.background": "#303446",
   "theme.bar.buttons.volume.icon": "#ea999c",
   "theme.bar.buttons.volume.text": "#ea999c",
-  "theme.bar.buttons.volume.hover": "#51576d",
   "theme.bar.buttons.volume.background": "#303446",
-  "theme.bar.buttons.media.hover": "#51576d",
   "theme.bar.buttons.windowtitle.icon": "#f4b8e4",
   "theme.bar.buttons.windowtitle.text": "#f4b8e4",
-  "theme.bar.buttons.windowtitle.hover": "#51576d",
   "theme.bar.buttons.windowtitle.background": "#303446",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#232634",
   "theme.bar.buttons.workspaces.active": "#f4b8e4",
   "theme.bar.buttons.workspaces.occupied": "#eebebe",
   "theme.bar.buttons.workspaces.available": "#99d1db",
   "theme.bar.buttons.workspaces.hover": "#51576d",
   "theme.bar.buttons.workspaces.background": "#303446",
   "theme.bar.buttons.dashboard.icon": "#e5c890",
-  "theme.bar.buttons.dashboard.hover": "#51576d",
   "theme.bar.buttons.dashboard.background": "#303446",
   "theme.osd.label": "#babbf1",
   "theme.osd.icon": "#232634",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#babbf1",
   "theme.bar.buttons.windowtitle.border": "#f4b8e4",
   "theme.bar.buttons.workspaces.border": "#232634",
-  "theme.bar.buttons.dashboard.border": "#e5c890"
+  "theme.bar.buttons.dashboard.border": "#e5c890",
+  "theme.bar.buttons.modules.submap.background": "#303446",
+  "theme.bar.buttons.modules.submap.text": "#81c8be",
+  "theme.bar.buttons.modules.submap.border": "#81c8be",
+  "theme.bar.buttons.modules.submap.icon": "#81c8be",
+  "theme.bar.buttons.modules.submap.icon_background": "#303446"
 }
\ No newline at end of file
diff --git a/themes/catppuccin_frappe_split.json b/themes/catppuccin_frappe_split.json
index 385a838..2eefc00 100644
--- a/themes/catppuccin_frappe_split.json
+++ b/themes/catppuccin_frappe_split.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#292c3c",
   "theme.bar.buttons.notifications.total": "#babbf1",
   "theme.bar.buttons.notifications.icon": "#303446",
-  "theme.bar.buttons.notifications.hover": "#51576d",
   "theme.bar.buttons.notifications.background": "#303446",
   "theme.bar.buttons.clock.icon": "#303446",
   "theme.bar.buttons.clock.text": "#f4b8e4",
-  "theme.bar.buttons.clock.hover": "#51576d",
   "theme.bar.buttons.clock.background": "#303446",
   "theme.bar.buttons.battery.icon": "#303446",
   "theme.bar.buttons.battery.text": "#e5c890",
-  "theme.bar.buttons.battery.hover": "#51576d",
   "theme.bar.buttons.battery.background": "#303446",
-  "theme.bar.buttons.systray.hover": "#51576d",
   "theme.bar.buttons.systray.background": "#303446",
   "theme.bar.buttons.bluetooth.icon": "#303446",
   "theme.bar.buttons.bluetooth.text": "#99d1db",
-  "theme.bar.buttons.bluetooth.hover": "#51576d",
   "theme.bar.buttons.bluetooth.background": "#303446",
   "theme.bar.buttons.network.icon": "#303446",
   "theme.bar.buttons.network.text": "#ca9ee6",
-  "theme.bar.buttons.network.hover": "#51576d",
   "theme.bar.buttons.network.background": "#303446",
   "theme.bar.buttons.volume.icon": "#303446",
   "theme.bar.buttons.volume.text": "#ea999c",
-  "theme.bar.buttons.volume.hover": "#51576d",
   "theme.bar.buttons.volume.background": "#303446",
-  "theme.bar.buttons.media.hover": "#51576d",
   "theme.bar.buttons.windowtitle.icon": "#303446",
   "theme.bar.buttons.windowtitle.text": "#f4b8e4",
-  "theme.bar.buttons.windowtitle.hover": "#51576d",
   "theme.bar.buttons.windowtitle.background": "#303446",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#232634",
   "theme.bar.buttons.workspaces.active": "#f4b8e4",
   "theme.bar.buttons.workspaces.occupied": "#eebebe",
   "theme.bar.buttons.workspaces.available": "#99d1db",
   "theme.bar.buttons.workspaces.hover": "#51576d",
   "theme.bar.buttons.workspaces.background": "#303446",
   "theme.bar.buttons.dashboard.icon": "#303446",
-  "theme.bar.buttons.dashboard.hover": "#51576d",
   "theme.bar.buttons.dashboard.background": "#e5c890",
   "theme.osd.label": "#babbf1",
   "theme.osd.icon": "#232634",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#babbf1",
   "theme.bar.buttons.windowtitle.border": "#f4b8e4",
   "theme.bar.buttons.workspaces.border": "#232634",
-  "theme.bar.buttons.dashboard.border": "#e5c890"
+  "theme.bar.buttons.dashboard.border": "#e5c890",
+  "theme.bar.buttons.modules.submap.background": "#303446",
+  "theme.bar.buttons.modules.submap.text": "#81c8be",
+  "theme.bar.buttons.modules.submap.border": "#81c8be",
+  "theme.bar.buttons.modules.submap.icon": "#181825",
+  "theme.bar.buttons.modules.submap.icon_background": "#81c8be"
 }
\ No newline at end of file
diff --git a/themes/catppuccin_latte.json b/themes/catppuccin_latte.json
index 1360c73..64559e2 100644
--- a/themes/catppuccin_latte.json
+++ b/themes/catppuccin_latte.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#dce0e8",
   "theme.bar.buttons.notifications.total": "#7287fd",
   "theme.bar.buttons.notifications.icon": "#7287fd",
-  "theme.bar.buttons.notifications.hover": "#bcc0cc",
   "theme.bar.buttons.notifications.background": "#dcdfe8",
   "theme.bar.buttons.clock.icon": "#ea76cb",
   "theme.bar.buttons.clock.text": "#ea76cb",
-  "theme.bar.buttons.clock.hover": "#bcc0cc",
   "theme.bar.buttons.clock.background": "#dcdfe8",
   "theme.bar.buttons.battery.icon": "#df8e1d",
   "theme.bar.buttons.battery.text": "#df8e1d",
-  "theme.bar.buttons.battery.hover": "#bcc0cc",
   "theme.bar.buttons.battery.background": "#dcdfe8",
-  "theme.bar.buttons.systray.hover": "#bcc0cc",
   "theme.bar.buttons.systray.background": "#dcdfe8",
   "theme.bar.buttons.bluetooth.icon": "#04a5e5",
   "theme.bar.buttons.bluetooth.text": "#04a5e5",
-  "theme.bar.buttons.bluetooth.hover": "#bcc0cc",
   "theme.bar.buttons.bluetooth.background": "#dcdfe8",
   "theme.bar.buttons.network.icon": "#8839ef",
   "theme.bar.buttons.network.text": "#8839ef",
-  "theme.bar.buttons.network.hover": "#bcc0cc",
   "theme.bar.buttons.network.background": "#dcdfe8",
   "theme.bar.buttons.volume.icon": "#e64553",
   "theme.bar.buttons.volume.text": "#e64553",
-  "theme.bar.buttons.volume.hover": "#bcc0cc",
   "theme.bar.buttons.volume.background": "#dcdfe8",
-  "theme.bar.buttons.media.hover": "#bcc0cc",
   "theme.bar.buttons.windowtitle.icon": "#ea76cb",
   "theme.bar.buttons.windowtitle.text": "#ea76cb",
-  "theme.bar.buttons.windowtitle.hover": "#bcc0cc",
   "theme.bar.buttons.windowtitle.background": "#dcdfe8",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#dce0e8",
   "theme.bar.buttons.workspaces.active": "#ea76cb",
   "theme.bar.buttons.workspaces.occupied": "#dd7878",
   "theme.bar.buttons.workspaces.available": "#04a5e5",
   "theme.bar.buttons.workspaces.hover": "#bcc0cc",
   "theme.bar.buttons.workspaces.background": "#dcdfe8",
   "theme.bar.buttons.dashboard.icon": "#df8e1d",
-  "theme.bar.buttons.dashboard.hover": "#bcc0cc",
   "theme.bar.buttons.dashboard.background": "#dcdfe8",
   "theme.osd.label": "#7287fd",
   "theme.osd.icon": "#ccd0da",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#7287fd",
   "theme.bar.buttons.windowtitle.border": "#ea76cb",
   "theme.bar.buttons.workspaces.border": "#dce0e8",
-  "theme.bar.buttons.dashboard.border": "#df8e1d"
+  "theme.bar.buttons.dashboard.border": "#df8e1d",
+  "theme.bar.buttons.modules.submap.background": "#dcdfe8",
+  "theme.bar.buttons.modules.submap.text": "#179299",
+  "theme.bar.buttons.modules.submap.border": "#179299",
+  "theme.bar.buttons.modules.submap.icon": "#179299",
+  "theme.bar.buttons.modules.submap.icon_background": "#dcdfe8"
 }
\ No newline at end of file
diff --git a/themes/catppuccin_latte_split.json b/themes/catppuccin_latte_split.json
index 17755b5..13aa39c 100644
--- a/themes/catppuccin_latte_split.json
+++ b/themes/catppuccin_latte_split.json
@@ -332,5 +332,10 @@
   "theme.notification.label": "#7287fd",
   "theme.notification.actions.text": "#dce0e8",
   "theme.notification.actions.background": "#7287fd",
-  "theme.notification.background": "#ccd0da"
+  "theme.notification.background": "#ccd0da",
+  "theme.bar.buttons.modules.submap.background": "#dcdfe8",
+  "theme.bar.buttons.modules.submap.text": "#179299",
+  "theme.bar.buttons.modules.submap.border": "#179299",
+  "theme.bar.buttons.modules.submap.icon": "#181825",
+  "theme.bar.buttons.modules.submap.icon_background": "#179299"
 }
\ No newline at end of file
diff --git a/themes/catppuccin_macchiato.json b/themes/catppuccin_macchiato.json
index e62b348..cf5ecc8 100644
--- a/themes/catppuccin_macchiato.json
+++ b/themes/catppuccin_macchiato.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#1e2030",
   "theme.bar.buttons.notifications.total": "#b7bdf8",
   "theme.bar.buttons.notifications.icon": "#b7bdf8",
-  "theme.bar.buttons.notifications.hover": "#494d64",
   "theme.bar.buttons.notifications.background": "#24273a",
   "theme.bar.buttons.clock.icon": "#f5bde6",
   "theme.bar.buttons.clock.text": "#f5bde6",
-  "theme.bar.buttons.clock.hover": "#494d64",
   "theme.bar.buttons.clock.background": "#24273a",
   "theme.bar.buttons.battery.icon": "#eed49f",
   "theme.bar.buttons.battery.text": "#eed49f",
-  "theme.bar.buttons.battery.hover": "#494d64",
   "theme.bar.buttons.battery.background": "#24273a",
-  "theme.bar.buttons.systray.hover": "#494d64",
   "theme.bar.buttons.systray.background": "#24273a",
   "theme.bar.buttons.bluetooth.icon": "#91d7e3",
   "theme.bar.buttons.bluetooth.text": "#91d7e3",
-  "theme.bar.buttons.bluetooth.hover": "#494d64",
   "theme.bar.buttons.bluetooth.background": "#24273a",
   "theme.bar.buttons.network.icon": "#c6a0f6",
   "theme.bar.buttons.network.text": "#c6a0f6",
-  "theme.bar.buttons.network.hover": "#494d64",
   "theme.bar.buttons.network.background": "#24273a",
   "theme.bar.buttons.volume.icon": "#ee99a0",
   "theme.bar.buttons.volume.text": "#ee99a0",
-  "theme.bar.buttons.volume.hover": "#494d64",
   "theme.bar.buttons.volume.background": "#24273a",
-  "theme.bar.buttons.media.hover": "#494d64",
   "theme.bar.buttons.windowtitle.icon": "#f5bde6",
   "theme.bar.buttons.windowtitle.text": "#f5bde6",
-  "theme.bar.buttons.windowtitle.hover": "#494d64",
   "theme.bar.buttons.windowtitle.background": "#24273a",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#181926",
   "theme.bar.buttons.workspaces.active": "#f5bde6",
   "theme.bar.buttons.workspaces.occupied": "#f0c6c6",
   "theme.bar.buttons.workspaces.available": "#91d7e3",
   "theme.bar.buttons.workspaces.hover": "#494d64",
   "theme.bar.buttons.workspaces.background": "#24273a",
   "theme.bar.buttons.dashboard.icon": "#eed49f",
-  "theme.bar.buttons.dashboard.hover": "#494d64",
   "theme.bar.buttons.dashboard.background": "#24273a",
   "theme.osd.label": "#b7bdf8",
   "theme.osd.icon": "#181926",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#b7bdf8",
   "theme.bar.buttons.windowtitle.border": "#f5bde6",
   "theme.bar.buttons.workspaces.border": "#181926",
-  "theme.bar.buttons.dashboard.border": "#eed49f"
+  "theme.bar.buttons.dashboard.border": "#eed49f",
+  "theme.bar.buttons.modules.submap.background": "#24273a",
+  "theme.bar.buttons.modules.submap.text": "#8bd5ca",
+  "theme.bar.buttons.modules.submap.border": "#8bd5ca",
+  "theme.bar.buttons.modules.submap.icon": "#8bd5ca",
+  "theme.bar.buttons.modules.submap.icon_background": "#24273a"
 }
\ No newline at end of file
diff --git a/themes/catppuccin_macchiato_split.json b/themes/catppuccin_macchiato_split.json
index 7cf1273..d5602a8 100644
--- a/themes/catppuccin_macchiato_split.json
+++ b/themes/catppuccin_macchiato_split.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#1e2030",
   "theme.bar.buttons.notifications.total": "#b7bdf8",
   "theme.bar.buttons.notifications.icon": "#24273a",
-  "theme.bar.buttons.notifications.hover": "#494d64",
   "theme.bar.buttons.notifications.background": "#24273a",
   "theme.bar.buttons.clock.icon": "#24273a",
   "theme.bar.buttons.clock.text": "#f5bde6",
-  "theme.bar.buttons.clock.hover": "#494d64",
   "theme.bar.buttons.clock.background": "#24273a",
   "theme.bar.buttons.battery.icon": "#24273a",
   "theme.bar.buttons.battery.text": "#eed49f",
-  "theme.bar.buttons.battery.hover": "#494d64",
   "theme.bar.buttons.battery.background": "#24273a",
-  "theme.bar.buttons.systray.hover": "#494d64",
   "theme.bar.buttons.systray.background": "#24273a",
   "theme.bar.buttons.bluetooth.icon": "#24273a",
   "theme.bar.buttons.bluetooth.text": "#91d7e3",
-  "theme.bar.buttons.bluetooth.hover": "#494d64",
   "theme.bar.buttons.bluetooth.background": "#24273a",
   "theme.bar.buttons.network.icon": "#24273a",
   "theme.bar.buttons.network.text": "#c6a0f6",
-  "theme.bar.buttons.network.hover": "#494d64",
   "theme.bar.buttons.network.background": "#24273a",
   "theme.bar.buttons.volume.icon": "#24273a",
   "theme.bar.buttons.volume.text": "#ee99a0",
-  "theme.bar.buttons.volume.hover": "#494d64",
   "theme.bar.buttons.volume.background": "#24273a",
-  "theme.bar.buttons.media.hover": "#494d64",
   "theme.bar.buttons.windowtitle.icon": "#24273a",
   "theme.bar.buttons.windowtitle.text": "#f5bde6",
-  "theme.bar.buttons.windowtitle.hover": "#494d64",
   "theme.bar.buttons.windowtitle.background": "#24273a",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#181926",
   "theme.bar.buttons.workspaces.active": "#f5bde6",
   "theme.bar.buttons.workspaces.occupied": "#f0c6c6",
   "theme.bar.buttons.workspaces.available": "#91d7e3",
   "theme.bar.buttons.workspaces.hover": "#494d64",
   "theme.bar.buttons.workspaces.background": "#24273a",
   "theme.bar.buttons.dashboard.icon": "#24273a",
-  "theme.bar.buttons.dashboard.hover": "#494d64",
   "theme.bar.buttons.dashboard.background": "#eed49f",
   "theme.osd.label": "#b7bdf8",
   "theme.osd.icon": "#181926",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#b7bdf8",
   "theme.bar.buttons.windowtitle.border": "#f5bde6",
   "theme.bar.buttons.workspaces.border": "#181926",
-  "theme.bar.buttons.dashboard.border": "#eed49f"
+  "theme.bar.buttons.dashboard.border": "#eed49f",
+  "theme.bar.buttons.modules.submap.background": "#24273a",
+  "theme.bar.buttons.modules.submap.text": "#8bd5ca",
+  "theme.bar.buttons.modules.submap.border": "#8bd5ca",
+  "theme.bar.buttons.modules.submap.icon": "#181825",
+  "theme.bar.buttons.modules.submap.icon_background": "#8bd5ca"
 }
\ No newline at end of file
diff --git a/themes/catppuccin_mocha.json b/themes/catppuccin_mocha.json
index 6d6857f..3290501 100644
--- a/themes/catppuccin_mocha.json
+++ b/themes/catppuccin_mocha.json
@@ -1,336 +1,342 @@
 {
-  "theme.bar.menus.menu.notifications.scrollbar.color": "#b4befe",
-  "theme.bar.menus.menu.notifications.pager.label": "#9399b2",
-  "theme.bar.menus.menu.notifications.pager.button": "#b4befe",
-  "theme.bar.menus.menu.notifications.pager.background": "#11111b",
-  "theme.bar.menus.menu.notifications.switch.puck": "#454759",
-  "theme.bar.menus.menu.notifications.switch.disabled": "#313245",
-  "theme.bar.menus.menu.notifications.switch.enabled": "#b4befe",
-  "theme.bar.menus.menu.notifications.clear": "#f38ba8",
-  "theme.bar.menus.menu.notifications.switch_divider": "#45475a",
-  "theme.bar.menus.menu.notifications.border": "#313244",
-  "theme.bar.menus.menu.notifications.card": "#1e1e2e",
-  "theme.bar.menus.menu.notifications.background": "#11111b",
-  "theme.bar.menus.menu.notifications.no_notifications_label": "#313244",
-  "theme.bar.menus.menu.notifications.label": "#b4befe",
-  "theme.bar.menus.menu.power.buttons.sleep.icon": "#181824",
-  "theme.bar.menus.menu.power.buttons.sleep.text": "#89dceb",
-  "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#89dceb",
-  "theme.bar.menus.menu.power.buttons.sleep.background": "#1e1e2e",
-  "theme.bar.menus.menu.power.buttons.logout.icon": "#181824",
-  "theme.bar.menus.menu.power.buttons.logout.text": "#a6e3a1",
-  "theme.bar.menus.menu.power.buttons.logout.icon_background": "#a6e3a1",
-  "theme.bar.menus.menu.power.buttons.logout.background": "#1e1e2e",
-  "theme.bar.menus.menu.power.buttons.restart.icon": "#181824",
-  "theme.bar.menus.menu.power.buttons.restart.text": "#fab387",
-  "theme.bar.menus.menu.power.buttons.restart.icon_background": "#fab387",
-  "theme.bar.menus.menu.power.buttons.restart.background": "#1e1e2e",
-  "theme.bar.menus.menu.power.buttons.shutdown.icon": "#181824",
-  "theme.bar.menus.menu.power.buttons.shutdown.text": "#f38ba8",
-  "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#f38ba7",
-  "theme.bar.menus.menu.power.buttons.shutdown.background": "#1e1e2e",
-  "theme.bar.menus.menu.power.border.color": "#313244",
-  "theme.bar.menus.menu.power.background.color": "#11111b",
-  "theme.bar.menus.menu.dashboard.monitors.disk.label": "#f5c2e7",
-  "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#f5c2e8",
-  "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#f5c2e7",
-  "theme.bar.menus.menu.dashboard.monitors.gpu.label": "#a6e3a1",
-  "theme.bar.menus.menu.dashboard.monitors.gpu.bar": "#a6e3a2",
-  "theme.bar.menus.menu.dashboard.monitors.gpu.icon": "#a6e3a1",
-  "theme.bar.menus.menu.dashboard.monitors.ram.label": "#f9e2af",
-  "theme.bar.menus.menu.dashboard.monitors.ram.bar": "#f9e2ae",
-  "theme.bar.menus.menu.dashboard.monitors.ram.icon": "#f9e2af",
-  "theme.bar.menus.menu.dashboard.monitors.cpu.label": "#eba0ac",
-  "theme.bar.menus.menu.dashboard.monitors.cpu.bar": "#eba0ad",
-  "theme.bar.menus.menu.dashboard.monitors.cpu.icon": "#eba0ac",
-  "theme.bar.menus.menu.dashboard.monitors.bar_background": "#45475a",
-  "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#b4befe",
-  "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#cba6f7",
-  "theme.bar.menus.menu.dashboard.directories.right.top.color": "#94e2d5",
-  "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#eba0ac",
-  "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#f9e2af",
-  "theme.bar.menus.menu.dashboard.directories.left.top.color": "#f5c2e7",
-  "theme.bar.menus.menu.dashboard.controls.input.text": "#181824",
-  "theme.bar.menus.menu.dashboard.controls.input.background": "#f5c2e7",
-  "theme.bar.menus.menu.dashboard.controls.volume.text": "#181824",
-  "theme.bar.menus.menu.dashboard.controls.volume.background": "#eba0ac",
-  "theme.bar.menus.menu.dashboard.controls.notifications.text": "#181824",
-  "theme.bar.menus.menu.dashboard.controls.notifications.background": "#f9e2af",
-  "theme.bar.menus.menu.dashboard.controls.bluetooth.text": "#181824",
-  "theme.bar.menus.menu.dashboard.controls.bluetooth.background": "#89dceb",
-  "theme.bar.menus.menu.dashboard.controls.wifi.text": "#181824",
-  "theme.bar.menus.menu.dashboard.controls.wifi.background": "#cba6f7",
-  "theme.bar.menus.menu.dashboard.controls.disabled": "#585b70",
-  "theme.bar.menus.menu.dashboard.shortcuts.recording": "#a6e3a1",
-  "theme.bar.menus.menu.dashboard.shortcuts.text": "#181824",
-  "theme.bar.menus.menu.dashboard.shortcuts.background": "#b4befe",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#11111a",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#f38ba8",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#a6e3a1",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#cdd6f4",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#b4befe",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#313244",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#11111b",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#1e1e2e",
-  "theme.bar.menus.menu.dashboard.powermenu.sleep": "#89dceb",
-  "theme.bar.menus.menu.dashboard.powermenu.logout": "#a6e3a1",
-  "theme.bar.menus.menu.dashboard.powermenu.restart": "#fab387",
-  "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#f38ba8",
-  "theme.bar.menus.menu.dashboard.profile.name": "#f5c2e7",
-  "theme.bar.menus.menu.dashboard.border.color": "#313244",
-  "theme.bar.menus.menu.dashboard.background.color": "#11111b",
-  "theme.bar.menus.menu.dashboard.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.clock.weather.hourly.temperature": "#f5c2e7",
-  "theme.bar.menus.menu.clock.weather.hourly.icon": "#f5c2e7",
-  "theme.bar.menus.menu.clock.weather.hourly.time": "#f5c2e7",
-  "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#89dceb",
-  "theme.bar.menus.menu.clock.weather.thermometer.cold": "#89b4fa",
-  "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#b4befe",
-  "theme.bar.menus.menu.clock.weather.thermometer.hot": "#fab387",
-  "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#f38ba8",
-  "theme.bar.menus.menu.clock.weather.stats": "#f5c2e7",
-  "theme.bar.menus.menu.clock.weather.status": "#94e2d5",
-  "theme.bar.menus.menu.clock.weather.temperature": "#cdd6f4",
-  "theme.bar.menus.menu.clock.weather.icon": "#f5c2e7",
-  "theme.bar.menus.menu.clock.calendar.contextdays": "#585b70",
-  "theme.bar.menus.menu.clock.calendar.days": "#cdd6f4",
-  "theme.bar.menus.menu.clock.calendar.currentday": "#f5c2e7",
-  "theme.bar.menus.menu.clock.calendar.paginator": "#f5c2e6",
-  "theme.bar.menus.menu.clock.calendar.weekdays": "#f5c2e7",
-  "theme.bar.menus.menu.clock.calendar.yearmonth": "#94e2d5",
-  "theme.bar.menus.menu.clock.time.timeperiod": "#94e2d5",
-  "theme.bar.menus.menu.clock.time.time": "#f5c2e7",
-  "theme.bar.menus.menu.clock.text": "#cdd6f4",
-  "theme.bar.menus.menu.clock.border.color": "#313244",
-  "theme.bar.menus.menu.clock.background.color": "#11111b",
-  "theme.bar.menus.menu.clock.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.battery.slider.puck": "#6c7086",
-  "theme.bar.menus.menu.battery.slider.backgroundhover": "#45475a",
-  "theme.bar.menus.menu.battery.slider.background": "#585b71",
-  "theme.bar.menus.menu.battery.slider.primary": "#f9e2af",
-  "theme.bar.menus.menu.battery.icons.active": "#f9e2af",
-  "theme.bar.menus.menu.battery.icons.passive": "#9399b2",
-  "theme.bar.menus.menu.battery.listitems.active": "#f9e2af",
-  "theme.bar.menus.menu.battery.listitems.passive": "#cdd6f3",
-  "theme.bar.menus.menu.battery.text": "#cdd6f4",
-  "theme.bar.menus.menu.battery.label.color": "#f9e2af",
-  "theme.bar.menus.menu.battery.border.color": "#313244",
-  "theme.bar.menus.menu.battery.background.color": "#11111b",
-  "theme.bar.menus.menu.battery.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.systray.dropdownmenu.divider": "#1e1e2e",
-  "theme.bar.menus.menu.systray.dropdownmenu.text": "#cdd6f4",
-  "theme.bar.menus.menu.systray.dropdownmenu.background": "#11111b",
-  "theme.bar.menus.menu.bluetooth.iconbutton.active": "#89dceb",
-  "theme.bar.menus.menu.bluetooth.iconbutton.passive": "#cdd6f4",
-  "theme.bar.menus.menu.bluetooth.icons.active": "#89dceb",
-  "theme.bar.menus.menu.bluetooth.icons.passive": "#9399b2",
-  "theme.bar.menus.menu.bluetooth.listitems.active": "#89dcea",
-  "theme.bar.menus.menu.bluetooth.listitems.passive": "#cdd6f4",
-  "theme.bar.menus.menu.bluetooth.switch.puck": "#454759",
-  "theme.bar.menus.menu.bluetooth.switch.disabled": "#313245",
-  "theme.bar.menus.menu.bluetooth.switch.enabled": "#89dceb",
-  "theme.bar.menus.menu.bluetooth.switch_divider": "#45475a",
-  "theme.bar.menus.menu.bluetooth.status": "#6c7086",
-  "theme.bar.menus.menu.bluetooth.text": "#cdd6f4",
-  "theme.bar.menus.menu.bluetooth.label.color": "#89dceb",
-  "theme.bar.menus.menu.bluetooth.border.color": "#313244",
-  "theme.bar.menus.menu.bluetooth.background.color": "#11111b",
-  "theme.bar.menus.menu.bluetooth.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.network.iconbuttons.active": "#cba6f7",
-  "theme.bar.menus.menu.network.iconbuttons.passive": "#cdd6f4",
-  "theme.bar.menus.menu.network.icons.active": "#cba6f7",
-  "theme.bar.menus.menu.network.icons.passive": "#9399b2",
-  "theme.bar.menus.menu.network.listitems.active": "#cba6f6",
-  "theme.bar.menus.menu.network.listitems.passive": "#cdd6f4",
-  "theme.bar.menus.menu.network.status.color": "#6c7086",
-  "theme.bar.menus.menu.network.text": "#cdd6f4",
-  "theme.bar.menus.menu.network.label.color": "#cba6f7",
-  "theme.bar.menus.menu.network.border.color": "#313244",
-  "theme.bar.menus.menu.network.background.color": "#11111b",
-  "theme.bar.menus.menu.network.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.volume.input_slider.puck": "#585b70",
-  "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#45475a",
-  "theme.bar.menus.menu.volume.input_slider.background": "#585b71",
-  "theme.bar.menus.menu.volume.input_slider.primary": "#eba0ac",
-  "theme.bar.menus.menu.volume.audio_slider.puck": "#585b70",
-  "theme.bar.menus.menu.volume.audio_slider.backgroundhover": "#45475a",
-  "theme.bar.menus.menu.volume.audio_slider.background": "#585b71",
-  "theme.bar.menus.menu.volume.audio_slider.primary": "#eba0ac",
-  "theme.bar.menus.menu.volume.icons.active": "#eba0ac",
-  "theme.bar.menus.menu.volume.icons.passive": "#9399b2",
-  "theme.bar.menus.menu.volume.iconbutton.active": "#eba0ac",
-  "theme.bar.menus.menu.volume.iconbutton.passive": "#cdd6f4",
-  "theme.bar.menus.menu.volume.listitems.active": "#eba0ab",
-  "theme.bar.menus.menu.volume.listitems.passive": "#cdd6f4",
-  "theme.bar.menus.menu.volume.text": "#cdd6f4",
-  "theme.bar.menus.menu.volume.label.color": "#eba0ac",
-  "theme.bar.menus.menu.volume.border.color": "#313244",
-  "theme.bar.menus.menu.volume.background.color": "#11111b",
-  "theme.bar.menus.menu.volume.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.media.slider.puck": "#6c7086",
-  "theme.bar.menus.menu.media.slider.backgroundhover": "#45475a",
-  "theme.bar.menus.menu.media.slider.background": "#585b71",
-  "theme.bar.menus.menu.media.slider.primary": "#f5c2e7",
-  "theme.bar.menus.menu.media.buttons.text": "#11111b",
-  "theme.bar.menus.menu.media.buttons.background": "#b4beff",
-  "theme.bar.menus.menu.media.buttons.enabled": "#94e2d4",
-  "theme.bar.menus.menu.media.buttons.inactive": "#585b70",
-  "theme.bar.menus.menu.media.border.color": "#313244",
-  "theme.bar.menus.menu.media.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.media.background.color": "#11111b",
-  "theme.bar.menus.menu.media.album": "#f5c2e8",
-  "theme.bar.menus.menu.media.artist": "#94e2d6",
-  "theme.bar.menus.menu.media.song": "#b4beff",
-  "theme.bar.menus.tooltip.text": "#cdd6f4",
-  "theme.bar.menus.tooltip.background": "#11111b",
-  "theme.bar.menus.dropdownmenu.divider": "#1e1e2e",
-  "theme.bar.menus.dropdownmenu.text": "#cdd6f4",
-  "theme.bar.menus.dropdownmenu.background": "#11111b",
-  "theme.bar.menus.slider.puck": "#6c7086",
-  "theme.bar.menus.slider.backgroundhover": "#45475a",
-  "theme.bar.menus.slider.background": "#585b71",
-  "theme.bar.menus.slider.primary": "#b4befe",
-  "theme.bar.menus.progressbar.background": "#45475a",
-  "theme.bar.menus.progressbar.foreground": "#b4befe",
-  "theme.bar.menus.iconbuttons.active": "#b4beff",
-  "theme.bar.menus.iconbuttons.passive": "#cdd6f3",
-  "theme.bar.menus.buttons.text": "#181824",
-  "theme.bar.menus.buttons.disabled": "#585b71",
-  "theme.bar.menus.buttons.active": "#f5c2e6",
-  "theme.bar.menus.buttons.default": "#b4befe",
-  "theme.bar.menus.check_radio_button.active": "#b4beff",
-  "theme.bar.menus.check_radio_button.background": "#45475a",
-  "theme.bar.menus.switch.puck": "#454759",
-  "theme.bar.menus.switch.disabled": "#313245",
-  "theme.bar.menus.switch.enabled": "#b4befe",
-  "theme.bar.menus.icons.active": "#b4befe",
-  "theme.bar.menus.icons.passive": "#585b70",
-  "theme.bar.menus.listitems.active": "#b4befd",
-  "theme.bar.menus.listitems.passive": "#cdd6f4",
-  "theme.bar.menus.popover.border": "#181824",
-  "theme.bar.menus.popover.background": "#181824",
-  "theme.bar.menus.popover.text": "#b4befe",
-  "theme.bar.menus.label": "#b4befe",
-  "theme.bar.menus.feinttext": "#313244",
-  "theme.bar.menus.dimtext": "#585b70",
-  "theme.bar.menus.text": "#cdd6f4",
-  "theme.bar.menus.border.color": "#313244",
-  "theme.bar.menus.cards": "#1e1e2e",
-  "theme.bar.menus.background": "#11111b",
-  "theme.bar.buttons.modules.power.icon_background": "#f38ba8",
-  "theme.bar.buttons.modules.power.icon": "#f38ba8",
-  "theme.bar.buttons.modules.power.background": "#242438",
-  "theme.bar.buttons.modules.power.border": "#f38ba8",
-  "theme.bar.buttons.modules.weather.icon_background": "#b4befe",
-  "theme.bar.buttons.modules.weather.icon": "#b4befe",
-  "theme.bar.buttons.modules.weather.text": "#b4befe",
-  "theme.bar.buttons.modules.weather.background": "#242438",
-  "theme.bar.buttons.modules.weather.border": "#b4befe",
-  "theme.bar.buttons.modules.updates.icon_background": "#cba6f7",
-  "theme.bar.buttons.modules.updates.icon": "#cba6f7",
-  "theme.bar.buttons.modules.updates.text": "#cba6f7",
-  "theme.bar.buttons.modules.updates.background": "#242438",
-  "theme.bar.buttons.modules.updates.border": "#cba6f7",
-  "theme.bar.buttons.modules.kbLayout.icon_background": "#89dceb",
-  "theme.bar.buttons.modules.kbLayout.icon": "#89dceb",
-  "theme.bar.buttons.modules.kbLayout.text": "#89dceb",
-  "theme.bar.buttons.modules.kbLayout.background": "#242438",
-  "theme.bar.buttons.modules.kbLayout.border": "#89dceb",
-  "theme.bar.buttons.modules.netstat.icon_background": "#a6e3a1",
-  "theme.bar.buttons.modules.netstat.icon": "#a6e3a1",
-  "theme.bar.buttons.modules.netstat.text": "#a6e3a1",
-  "theme.bar.buttons.modules.netstat.background": "#242438",
-  "theme.bar.buttons.modules.netstat.border": "#a6e3a1",
-  "theme.bar.buttons.modules.storage.icon_background": "#f5c2e7",
-  "theme.bar.buttons.modules.storage.icon": "#f5c2e7",
-  "theme.bar.buttons.modules.storage.text": "#f5c2e7",
-  "theme.bar.buttons.modules.storage.background": "#242438",
-  "theme.bar.buttons.modules.storage.border": "#f5c2e7",
-  "theme.bar.buttons.modules.cpu.icon_background": "#f38ba8",
-  "theme.bar.buttons.modules.cpu.icon": "#f38ba8",
-  "theme.bar.buttons.modules.cpu.text": "#f38ba8",
-  "theme.bar.buttons.modules.cpu.background": "#242438",
-  "theme.bar.buttons.modules.cpu.border": "#f38ba8",
-  "theme.bar.buttons.modules.ram.icon_background": "#f9e2af",
-  "theme.bar.buttons.modules.ram.icon": "#f9e2af",
-  "theme.bar.buttons.modules.ram.text": "#f9e2af",
-  "theme.bar.buttons.modules.ram.background": "#242438",
-  "theme.bar.buttons.modules.ram.border": "#f9e2af",
-  "theme.bar.buttons.notifications.total": "#b4befe",
-  "theme.bar.buttons.notifications.icon_background": "#b4befe",
-  "theme.bar.buttons.notifications.icon": "#b4befe",
-  "theme.bar.buttons.notifications.background": "#242438",
-  "theme.bar.buttons.notifications.border": "#b4befe",
-  "theme.bar.buttons.clock.icon_background": "#f5c2e7",
-  "theme.bar.buttons.clock.icon": "#f5c2e7",
-  "theme.bar.buttons.clock.text": "#f5c2e7",
-  "theme.bar.buttons.clock.background": "#242438",
-  "theme.bar.buttons.clock.border": "#f5c2e7",
-  "theme.bar.buttons.battery.icon_background": "#f9e2af",
-  "theme.bar.buttons.battery.icon": "#f9e2af",
-  "theme.bar.buttons.battery.text": "#f9e2af",
-  "theme.bar.buttons.battery.background": "#242438",
-  "theme.bar.buttons.battery.border": "#f9e2af",
-  "theme.bar.buttons.systray.background": "#242438",
-  "theme.bar.buttons.systray.border": "#b4befe",
-  "theme.bar.buttons.bluetooth.icon_background": "#89dbeb",
-  "theme.bar.buttons.bluetooth.icon": "#89dceb",
-  "theme.bar.buttons.bluetooth.text": "#89dceb",
-  "theme.bar.buttons.bluetooth.background": "#242438",
-  "theme.bar.buttons.bluetooth.border": "#89dceb",
-  "theme.bar.buttons.network.icon_background": "#caa6f7",
-  "theme.bar.buttons.network.icon": "#cba6f7",
-  "theme.bar.buttons.network.text": "#cba6f7",
-  "theme.bar.buttons.network.background": "#242438",
-  "theme.bar.buttons.network.border": "#cba6f7",
-  "theme.bar.buttons.volume.icon_background": "#eba0ac",
-  "theme.bar.buttons.volume.icon": "#eba0ac",
-  "theme.bar.buttons.volume.text": "#eba0ac",
-  "theme.bar.buttons.volume.background": "#242438",
-  "theme.bar.buttons.volume.border": "#eba0ac",
-  "theme.bar.buttons.media.icon_background": "#b4befe",
-  "theme.bar.buttons.media.icon": "#b4befe",
-  "theme.bar.buttons.media.text": "#b4befe",
-  "theme.bar.buttons.media.background": "#242438",
-  "theme.bar.buttons.media.border": "#b4befe",
-  "theme.bar.buttons.windowtitle.icon_background": "#f5c2e7",
-  "theme.bar.buttons.windowtitle.icon": "#f5c2e7",
-  "theme.bar.buttons.windowtitle.text": "#f5c2e7",
-  "theme.bar.buttons.windowtitle.border": "#f5c2e7",
-  "theme.bar.buttons.windowtitle.background": "#242438",
-  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#f5c2e7",
-  "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
-  "theme.bar.buttons.workspaces.hover": "#f5c2e7",
-  "theme.bar.buttons.workspaces.active": "#f5c2e7",
-  "theme.bar.buttons.workspaces.occupied": "#f2cdcd",
-  "theme.bar.buttons.workspaces.available": "#89dceb",
-  "theme.bar.buttons.workspaces.border": "#f5c2e7",
-  "theme.bar.buttons.workspaces.background": "#242438",
-  "theme.bar.buttons.dashboard.icon": "#f9e2af",
-  "theme.bar.buttons.dashboard.border": "#f9e2af",
-  "theme.bar.buttons.dashboard.background": "#242438",
-  "theme.bar.buttons.icon": "#b4befe",
-  "theme.bar.buttons.text": "#b4befe",
-  "theme.bar.buttons.hover": "#45475a",
-  "theme.bar.buttons.icon_background": "#242438",
-  "theme.bar.buttons.background": "#242438",
-  "theme.bar.buttons.style": "default",
-  "theme.bar.background": "#11111b",
-  "theme.osd.label": "#b4beff",
-  "theme.osd.icon": "#11111b",
-  "theme.osd.bar_overflow_color": "#f38ba7",
-  "theme.osd.bar_empty_color": "#313244",
-  "theme.osd.bar_color": "#b4beff",
-  "theme.osd.icon_container": "#b4beff",
-  "theme.osd.bar_container": "#11111b",
-  "theme.notification.close_button.label": "#11111b",
-  "theme.notification.close_button.background": "#f38ba7",
-  "theme.notification.labelicon": "#b4befe",
-  "theme.notification.text": "#cdd6f4",
-  "theme.notification.time": "#7f849b",
-  "theme.notification.border": "#313243",
-  "theme.notification.label": "#b4befe",
-  "theme.notification.actions.text": "#181825",
-  "theme.notification.actions.background": "#b4befd",
-  "theme.notification.background": "#181826"
-}
\ No newline at end of file
+    "theme.bar.menus.menu.notifications.scrollbar.color": "#b4befe",
+    "theme.bar.menus.menu.notifications.pager.label": "#9399b2",
+    "theme.bar.menus.menu.notifications.pager.button": "#b4befe",
+    "theme.bar.menus.menu.notifications.pager.background": "#11111b",
+    "theme.bar.menus.menu.notifications.switch.puck": "#454759",
+    "theme.bar.menus.menu.notifications.switch.disabled": "#313245",
+    "theme.bar.menus.menu.notifications.switch.enabled": "#b4befe",
+    "theme.bar.menus.menu.notifications.clear": "#f38ba8",
+    "theme.bar.menus.menu.notifications.switch_divider": "#45475a",
+    "theme.bar.menus.menu.notifications.border": "#313244",
+    "theme.bar.menus.menu.notifications.card": "#1e1e2e",
+    "theme.bar.menus.menu.notifications.background": "#11111b",
+    "theme.bar.menus.menu.notifications.no_notifications_label": "#313244",
+    "theme.bar.menus.menu.notifications.label": "#b4befe",
+    "theme.bar.menus.menu.power.buttons.sleep.icon": "#181824",
+    "theme.bar.menus.menu.power.buttons.sleep.text": "#89dceb",
+    "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#89dceb",
+    "theme.bar.menus.menu.power.buttons.sleep.background": "#1e1e2e",
+    "theme.bar.menus.menu.power.buttons.logout.icon": "#181824",
+    "theme.bar.menus.menu.power.buttons.logout.text": "#a6e3a1",
+    "theme.bar.menus.menu.power.buttons.logout.icon_background": "#a6e3a1",
+    "theme.bar.menus.menu.power.buttons.logout.background": "#1e1e2e",
+    "theme.bar.menus.menu.power.buttons.restart.icon": "#181824",
+    "theme.bar.menus.menu.power.buttons.restart.text": "#fab387",
+    "theme.bar.menus.menu.power.buttons.restart.icon_background": "#fab387",
+    "theme.bar.menus.menu.power.buttons.restart.background": "#1e1e2e",
+    "theme.bar.menus.menu.power.buttons.shutdown.icon": "#181824",
+    "theme.bar.menus.menu.power.buttons.shutdown.text": "#f38ba8",
+    "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#f38ba7",
+    "theme.bar.menus.menu.power.buttons.shutdown.background": "#1e1e2e",
+    "theme.bar.menus.menu.power.border.color": "#313244",
+    "theme.bar.menus.menu.power.background.color": "#11111b",
+    "theme.bar.menus.menu.dashboard.monitors.disk.label": "#f5c2e7",
+    "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#f5c2e8",
+    "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#f5c2e7",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.label": "#a6e3a1",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.bar": "#a6e3a2",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.icon": "#a6e3a1",
+    "theme.bar.menus.menu.dashboard.monitors.ram.label": "#f9e2af",
+    "theme.bar.menus.menu.dashboard.monitors.ram.bar": "#f9e2ae",
+    "theme.bar.menus.menu.dashboard.monitors.ram.icon": "#f9e2af",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.label": "#eba0ac",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.bar": "#eba0ad",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.icon": "#eba0ac",
+    "theme.bar.menus.menu.dashboard.monitors.bar_background": "#45475a",
+    "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#b4befe",
+    "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#cba6f7",
+    "theme.bar.menus.menu.dashboard.directories.right.top.color": "#94e2d5",
+    "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#eba0ac",
+    "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#f9e2af",
+    "theme.bar.menus.menu.dashboard.directories.left.top.color": "#f5c2e7",
+    "theme.bar.menus.menu.dashboard.controls.input.text": "#181824",
+    "theme.bar.menus.menu.dashboard.controls.input.background": "#f5c2e7",
+    "theme.bar.menus.menu.dashboard.controls.volume.text": "#181824",
+    "theme.bar.menus.menu.dashboard.controls.volume.background": "#eba0ac",
+    "theme.bar.menus.menu.dashboard.controls.notifications.text": "#181824",
+    "theme.bar.menus.menu.dashboard.controls.notifications.background": "#f9e2af",
+    "theme.bar.menus.menu.dashboard.controls.bluetooth.text": "#181824",
+    "theme.bar.menus.menu.dashboard.controls.bluetooth.background": "#89dceb",
+    "theme.bar.menus.menu.dashboard.controls.wifi.text": "#181824",
+    "theme.bar.menus.menu.dashboard.controls.wifi.background": "#cba6f7",
+    "theme.bar.menus.menu.dashboard.controls.disabled": "#585b70",
+    "theme.bar.menus.menu.dashboard.shortcuts.recording": "#a6e3a1",
+    "theme.bar.menus.menu.dashboard.shortcuts.text": "#181824",
+    "theme.bar.menus.menu.dashboard.shortcuts.background": "#b4befe",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#11111a",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#f38ba8",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#a6e3a1",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#cdd6f4",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#b4befe",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#313244",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#11111b",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#1e1e2e",
+    "theme.bar.menus.menu.dashboard.powermenu.sleep": "#89dceb",
+    "theme.bar.menus.menu.dashboard.powermenu.logout": "#a6e3a1",
+    "theme.bar.menus.menu.dashboard.powermenu.restart": "#fab387",
+    "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#f38ba8",
+    "theme.bar.menus.menu.dashboard.profile.name": "#f5c2e7",
+    "theme.bar.menus.menu.dashboard.border.color": "#313244",
+    "theme.bar.menus.menu.dashboard.background.color": "#11111b",
+    "theme.bar.menus.menu.dashboard.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.clock.weather.hourly.temperature": "#f5c2e7",
+    "theme.bar.menus.menu.clock.weather.hourly.icon": "#f5c2e7",
+    "theme.bar.menus.menu.clock.weather.hourly.time": "#f5c2e7",
+    "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#89dceb",
+    "theme.bar.menus.menu.clock.weather.thermometer.cold": "#89b4fa",
+    "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#b4befe",
+    "theme.bar.menus.menu.clock.weather.thermometer.hot": "#fab387",
+    "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#f38ba8",
+    "theme.bar.menus.menu.clock.weather.stats": "#f5c2e7",
+    "theme.bar.menus.menu.clock.weather.status": "#94e2d5",
+    "theme.bar.menus.menu.clock.weather.temperature": "#cdd6f4",
+    "theme.bar.menus.menu.clock.weather.icon": "#f5c2e7",
+    "theme.bar.menus.menu.clock.calendar.contextdays": "#585b70",
+    "theme.bar.menus.menu.clock.calendar.days": "#cdd6f4",
+    "theme.bar.menus.menu.clock.calendar.currentday": "#f5c2e7",
+    "theme.bar.menus.menu.clock.calendar.paginator": "#f5c2e6",
+    "theme.bar.menus.menu.clock.calendar.weekdays": "#f5c2e7",
+    "theme.bar.menus.menu.clock.calendar.yearmonth": "#94e2d5",
+    "theme.bar.menus.menu.clock.time.timeperiod": "#94e2d5",
+    "theme.bar.menus.menu.clock.time.time": "#f5c2e7",
+    "theme.bar.menus.menu.clock.text": "#cdd6f4",
+    "theme.bar.menus.menu.clock.border.color": "#313244",
+    "theme.bar.menus.menu.clock.background.color": "#11111b",
+    "theme.bar.menus.menu.clock.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.battery.slider.puck": "#6c7086",
+    "theme.bar.menus.menu.battery.slider.backgroundhover": "#45475a",
+    "theme.bar.menus.menu.battery.slider.background": "#585b71",
+    "theme.bar.menus.menu.battery.slider.primary": "#f9e2af",
+    "theme.bar.menus.menu.battery.icons.active": "#f9e2af",
+    "theme.bar.menus.menu.battery.icons.passive": "#9399b2",
+    "theme.bar.menus.menu.battery.listitems.active": "#f9e2af",
+    "theme.bar.menus.menu.battery.listitems.passive": "#cdd6f3",
+    "theme.bar.menus.menu.battery.text": "#cdd6f4",
+    "theme.bar.menus.menu.battery.label.color": "#f9e2af",
+    "theme.bar.menus.menu.battery.border.color": "#313244",
+    "theme.bar.menus.menu.battery.background.color": "#11111b",
+    "theme.bar.menus.menu.battery.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.systray.dropdownmenu.divider": "#1e1e2e",
+    "theme.bar.menus.menu.systray.dropdownmenu.text": "#cdd6f4",
+    "theme.bar.menus.menu.systray.dropdownmenu.background": "#11111b",
+    "theme.bar.menus.menu.bluetooth.iconbutton.active": "#89dceb",
+    "theme.bar.menus.menu.bluetooth.iconbutton.passive": "#cdd6f4",
+    "theme.bar.menus.menu.bluetooth.icons.active": "#89dceb",
+    "theme.bar.menus.menu.bluetooth.icons.passive": "#9399b2",
+    "theme.bar.menus.menu.bluetooth.listitems.active": "#89dcea",
+    "theme.bar.menus.menu.bluetooth.listitems.passive": "#cdd6f4",
+    "theme.bar.menus.menu.bluetooth.switch.puck": "#454759",
+    "theme.bar.menus.menu.bluetooth.switch.disabled": "#313245",
+    "theme.bar.menus.menu.bluetooth.switch.enabled": "#89dceb",
+    "theme.bar.menus.menu.bluetooth.switch_divider": "#45475a",
+    "theme.bar.menus.menu.bluetooth.status": "#6c7086",
+    "theme.bar.menus.menu.bluetooth.text": "#cdd6f4",
+    "theme.bar.menus.menu.bluetooth.label.color": "#89dceb",
+    "theme.bar.menus.menu.bluetooth.border.color": "#313244",
+    "theme.bar.menus.menu.bluetooth.background.color": "#11111b",
+    "theme.bar.menus.menu.bluetooth.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.network.iconbuttons.active": "#cba6f7",
+    "theme.bar.menus.menu.network.iconbuttons.passive": "#cdd6f4",
+    "theme.bar.menus.menu.network.icons.active": "#cba6f7",
+    "theme.bar.menus.menu.network.icons.passive": "#9399b2",
+    "theme.bar.menus.menu.network.listitems.active": "#cba6f6",
+    "theme.bar.menus.menu.network.listitems.passive": "#cdd6f4",
+    "theme.bar.menus.menu.network.status.color": "#6c7086",
+    "theme.bar.menus.menu.network.text": "#cdd6f4",
+    "theme.bar.menus.menu.network.label.color": "#cba6f7",
+    "theme.bar.menus.menu.network.border.color": "#313244",
+    "theme.bar.menus.menu.network.background.color": "#11111b",
+    "theme.bar.menus.menu.network.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.volume.input_slider.puck": "#585b70",
+    "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#45475a",
+    "theme.bar.menus.menu.volume.input_slider.background": "#585b71",
+    "theme.bar.menus.menu.volume.input_slider.primary": "#eba0ac",
+    "theme.bar.menus.menu.volume.audio_slider.puck": "#585b70",
+    "theme.bar.menus.menu.volume.audio_slider.backgroundhover": "#45475a",
+    "theme.bar.menus.menu.volume.audio_slider.background": "#585b71",
+    "theme.bar.menus.menu.volume.audio_slider.primary": "#eba0ac",
+    "theme.bar.menus.menu.volume.icons.active": "#eba0ac",
+    "theme.bar.menus.menu.volume.icons.passive": "#9399b2",
+    "theme.bar.menus.menu.volume.iconbutton.active": "#eba0ac",
+    "theme.bar.menus.menu.volume.iconbutton.passive": "#cdd6f4",
+    "theme.bar.menus.menu.volume.listitems.active": "#eba0ab",
+    "theme.bar.menus.menu.volume.listitems.passive": "#cdd6f4",
+    "theme.bar.menus.menu.volume.text": "#cdd6f4",
+    "theme.bar.menus.menu.volume.label.color": "#eba0ac",
+    "theme.bar.menus.menu.volume.border.color": "#313244",
+    "theme.bar.menus.menu.volume.background.color": "#11111b",
+    "theme.bar.menus.menu.volume.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.media.slider.puck": "#6c7086",
+    "theme.bar.menus.menu.media.slider.backgroundhover": "#45475a",
+    "theme.bar.menus.menu.media.slider.background": "#585b71",
+    "theme.bar.menus.menu.media.slider.primary": "#f5c2e7",
+    "theme.bar.menus.menu.media.buttons.text": "#11111b",
+    "theme.bar.menus.menu.media.buttons.background": "#b4beff",
+    "theme.bar.menus.menu.media.buttons.enabled": "#94e2d4",
+    "theme.bar.menus.menu.media.buttons.inactive": "#585b70",
+    "theme.bar.menus.menu.media.border.color": "#313244",
+    "theme.bar.menus.menu.media.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.media.background.color": "#11111b",
+    "theme.bar.menus.menu.media.album": "#f5c2e8",
+    "theme.bar.menus.menu.media.artist": "#94e2d6",
+    "theme.bar.menus.menu.media.song": "#b4beff",
+    "theme.bar.menus.tooltip.text": "#cdd6f4",
+    "theme.bar.menus.tooltip.background": "#11111b",
+    "theme.bar.menus.dropdownmenu.divider": "#1e1e2e",
+    "theme.bar.menus.dropdownmenu.text": "#cdd6f4",
+    "theme.bar.menus.dropdownmenu.background": "#11111b",
+    "theme.bar.menus.slider.puck": "#6c7086",
+    "theme.bar.menus.slider.backgroundhover": "#45475a",
+    "theme.bar.menus.slider.background": "#585b71",
+    "theme.bar.menus.slider.primary": "#b4befe",
+    "theme.bar.menus.progressbar.background": "#45475a",
+    "theme.bar.menus.progressbar.foreground": "#b4befe",
+    "theme.bar.menus.iconbuttons.active": "#b4beff",
+    "theme.bar.menus.iconbuttons.passive": "#cdd6f3",
+    "theme.bar.menus.buttons.text": "#181824",
+    "theme.bar.menus.buttons.disabled": "#585b71",
+    "theme.bar.menus.buttons.active": "#f5c2e6",
+    "theme.bar.menus.buttons.default": "#b4befe",
+    "theme.bar.menus.check_radio_button.active": "#b4beff",
+    "theme.bar.menus.check_radio_button.background": "#45475a",
+    "theme.bar.menus.switch.puck": "#454759",
+    "theme.bar.menus.switch.disabled": "#313245",
+    "theme.bar.menus.switch.enabled": "#b4befe",
+    "theme.bar.menus.icons.active": "#b4befe",
+    "theme.bar.menus.icons.passive": "#585b70",
+    "theme.bar.menus.listitems.active": "#b4befd",
+    "theme.bar.menus.listitems.passive": "#cdd6f4",
+    "theme.bar.menus.popover.border": "#181824",
+    "theme.bar.menus.popover.background": "#181824",
+    "theme.bar.menus.popover.text": "#b4befe",
+    "theme.bar.menus.label": "#b4befe",
+    "theme.bar.menus.feinttext": "#313244",
+    "theme.bar.menus.dimtext": "#585b70",
+    "theme.bar.menus.text": "#cdd6f4",
+    "theme.bar.menus.border.color": "#313244",
+    "theme.bar.menus.cards": "#1e1e2e",
+    "theme.bar.menus.background": "#11111b",
+    "theme.bar.buttons.modules.power.icon_background": "#f38ba8",
+    "theme.bar.buttons.modules.power.icon": "#f38ba8",
+    "theme.bar.buttons.modules.power.background": "#242438",
+    "theme.bar.buttons.modules.power.border": "#f38ba8",
+    "theme.bar.buttons.modules.weather.icon_background": "#b4befe",
+    "theme.bar.buttons.modules.weather.icon": "#b4befe",
+    "theme.bar.buttons.modules.weather.text": "#b4befe",
+    "theme.bar.buttons.modules.weather.background": "#242438",
+    "theme.bar.buttons.modules.weather.border": "#b4befe",
+    "theme.bar.buttons.modules.updates.icon_background": "#cba6f7",
+    "theme.bar.buttons.modules.updates.icon": "#cba6f7",
+    "theme.bar.buttons.modules.updates.text": "#cba6f7",
+    "theme.bar.buttons.modules.updates.background": "#242438",
+    "theme.bar.buttons.modules.updates.border": "#cba6f7",
+    "theme.bar.buttons.modules.kbLayout.icon_background": "#89dceb",
+    "theme.bar.buttons.modules.kbLayout.icon": "#89dceb",
+    "theme.bar.buttons.modules.kbLayout.text": "#89dceb",
+    "theme.bar.buttons.modules.kbLayout.background": "#242438",
+    "theme.bar.buttons.modules.kbLayout.border": "#89dceb",
+    "theme.bar.buttons.modules.netstat.icon_background": "#a6e3a1",
+    "theme.bar.buttons.modules.netstat.icon": "#a6e3a1",
+    "theme.bar.buttons.modules.netstat.text": "#a6e3a1",
+    "theme.bar.buttons.modules.netstat.background": "#242438",
+    "theme.bar.buttons.modules.netstat.border": "#a6e3a1",
+    "theme.bar.buttons.modules.storage.icon_background": "#f5c2e7",
+    "theme.bar.buttons.modules.storage.icon": "#f5c2e7",
+    "theme.bar.buttons.modules.storage.text": "#f5c2e7",
+    "theme.bar.buttons.modules.storage.background": "#242438",
+    "theme.bar.buttons.modules.storage.border": "#f5c2e7",
+    "theme.bar.buttons.modules.cpu.icon_background": "#f38ba8",
+    "theme.bar.buttons.modules.cpu.icon": "#f38ba8",
+    "theme.bar.buttons.modules.cpu.text": "#f38ba8",
+    "theme.bar.buttons.modules.cpu.background": "#242438",
+    "theme.bar.buttons.modules.cpu.border": "#f38ba8",
+    "theme.bar.buttons.modules.ram.icon_background": "#f9e2af",
+    "theme.bar.buttons.modules.ram.icon": "#f9e2af",
+    "theme.bar.buttons.modules.ram.text": "#f9e2af",
+    "theme.bar.buttons.modules.ram.background": "#242438",
+    "theme.bar.buttons.modules.ram.border": "#f9e2af",
+    "theme.bar.buttons.notifications.total": "#b4befe",
+    "theme.bar.buttons.notifications.icon_background": "#b4befe",
+    "theme.bar.buttons.notifications.icon": "#b4befe",
+    "theme.bar.buttons.notifications.background": "#242438",
+    "theme.bar.buttons.notifications.border": "#b4befe",
+    "theme.bar.buttons.clock.icon_background": "#f5c2e7",
+    "theme.bar.buttons.clock.icon": "#f5c2e7",
+    "theme.bar.buttons.clock.text": "#f5c2e7",
+    "theme.bar.buttons.clock.background": "#242438",
+    "theme.bar.buttons.clock.border": "#f5c2e7",
+    "theme.bar.buttons.battery.icon_background": "#f9e2af",
+    "theme.bar.buttons.battery.icon": "#f9e2af",
+    "theme.bar.buttons.battery.text": "#f9e2af",
+    "theme.bar.buttons.battery.background": "#242438",
+    "theme.bar.buttons.battery.border": "#f9e2af",
+    "theme.bar.buttons.systray.background": "#242438",
+    "theme.bar.buttons.systray.border": "#b4befe",
+    "theme.bar.buttons.bluetooth.icon_background": "#89dbeb",
+    "theme.bar.buttons.bluetooth.icon": "#89dceb",
+    "theme.bar.buttons.bluetooth.text": "#89dceb",
+    "theme.bar.buttons.bluetooth.background": "#242438",
+    "theme.bar.buttons.bluetooth.border": "#89dceb",
+    "theme.bar.buttons.network.icon_background": "#caa6f7",
+    "theme.bar.buttons.network.icon": "#cba6f7",
+    "theme.bar.buttons.network.text": "#cba6f7",
+    "theme.bar.buttons.network.background": "#242438",
+    "theme.bar.buttons.network.border": "#cba6f7",
+    "theme.bar.buttons.volume.icon_background": "#eba0ac",
+    "theme.bar.buttons.volume.icon": "#eba0ac",
+    "theme.bar.buttons.volume.text": "#eba0ac",
+    "theme.bar.buttons.volume.background": "#242438",
+    "theme.bar.buttons.volume.border": "#eba0ac",
+    "theme.bar.buttons.media.icon_background": "#b4befe",
+    "theme.bar.buttons.media.icon": "#b4befe",
+    "theme.bar.buttons.media.text": "#b4befe",
+    "theme.bar.buttons.media.background": "#242438",
+    "theme.bar.buttons.media.border": "#b4befe",
+    "theme.bar.buttons.windowtitle.icon_background": "#f5c2e7",
+    "theme.bar.buttons.windowtitle.icon": "#f5c2e7",
+    "theme.bar.buttons.windowtitle.text": "#f5c2e7",
+    "theme.bar.buttons.windowtitle.border": "#f5c2e7",
+    "theme.bar.buttons.windowtitle.background": "#242438",
+    "theme.bar.buttons.workspaces.numbered_active_underline_color": "#f5c2e7",
+    "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
+    "theme.bar.buttons.workspaces.hover": "#f5c2e7",
+    "theme.bar.buttons.workspaces.active": "#f5c2e7",
+    "theme.bar.buttons.workspaces.occupied": "#f2cdcd",
+    "theme.bar.buttons.workspaces.available": "#89dceb",
+    "theme.bar.buttons.workspaces.border": "#f5c2e7",
+    "theme.bar.buttons.workspaces.background": "#242438",
+    "theme.bar.buttons.dashboard.icon": "#f9e2af",
+    "theme.bar.buttons.dashboard.border": "#f9e2af",
+    "theme.bar.buttons.dashboard.background": "#242438",
+    "theme.bar.buttons.icon": "#b4befe",
+    "theme.bar.buttons.text": "#b4befe",
+    "theme.bar.buttons.hover": "#45475a",
+    "theme.bar.buttons.icon_background": "#242438",
+    "theme.bar.buttons.background": "#242438",
+    "theme.bar.buttons.style": "default",
+    "theme.bar.background": "#11111b",
+    "theme.osd.label": "#b4beff",
+    "theme.osd.icon": "#11111b",
+    "theme.osd.bar_overflow_color": "#f38ba7",
+    "theme.osd.bar_empty_color": "#313244",
+    "theme.osd.bar_color": "#b4beff",
+    "theme.osd.icon_container": "#b4beff",
+    "theme.osd.bar_container": "#11111b",
+    "theme.notification.close_button.label": "#11111b",
+    "theme.notification.close_button.background": "#f38ba7",
+    "theme.notification.labelicon": "#b4befe",
+    "theme.notification.text": "#cdd6f4",
+    "theme.notification.time": "#7f849b",
+    "theme.notification.border": "#313243",
+    "theme.notification.label": "#b4befe",
+    "theme.notification.actions.text": "#181825",
+    "theme.notification.actions.background": "#b4befd",
+    "theme.notification.background": "#181826",
+    "theme.bar.buttons.modules.submap.icon": "#94e2d5",
+    "theme.bar.buttons.modules.submap.background": "#242438",
+    "theme.bar.buttons.modules.submap.icon_background": "#242438",
+    "theme.bar.buttons.modules.submap.text": "#94e2d5",
+    "theme.bar.buttons.modules.submap.border": "#94e2d5"
+}
+
diff --git a/themes/catppuccin_mocha_split.json b/themes/catppuccin_mocha_split.json
index 7bc1ee3..3211324 100644
--- a/themes/catppuccin_mocha_split.json
+++ b/themes/catppuccin_mocha_split.json
@@ -1,336 +1,341 @@
 {
-  "theme.bar.menus.menu.notifications.scrollbar.color": "#b4befe",
-  "theme.bar.menus.menu.notifications.pager.label": "#9399b2",
-  "theme.bar.menus.menu.notifications.pager.button": "#b4befe",
-  "theme.bar.menus.menu.notifications.pager.background": "#11111b",
-  "theme.bar.menus.menu.notifications.switch.puck": "#454759",
-  "theme.bar.menus.menu.notifications.switch.disabled": "#313245",
-  "theme.bar.menus.menu.notifications.switch.enabled": "#b4befe",
-  "theme.bar.menus.menu.notifications.clear": "#f38ba8",
-  "theme.bar.menus.menu.notifications.switch_divider": "#45475a",
-  "theme.bar.menus.menu.notifications.border": "#313244",
-  "theme.bar.menus.menu.notifications.card": "#1e1e2e",
-  "theme.bar.menus.menu.notifications.background": "#11111b",
-  "theme.bar.menus.menu.notifications.no_notifications_label": "#313244",
-  "theme.bar.menus.menu.notifications.label": "#b4befe",
-  "theme.bar.menus.menu.power.buttons.sleep.icon": "#181824",
-  "theme.bar.menus.menu.power.buttons.sleep.text": "#89dceb",
-  "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#89dceb",
-  "theme.bar.menus.menu.power.buttons.sleep.background": "#1e1e2e",
-  "theme.bar.menus.menu.power.buttons.logout.icon": "#181824",
-  "theme.bar.menus.menu.power.buttons.logout.text": "#a6e3a1",
-  "theme.bar.menus.menu.power.buttons.logout.icon_background": "#a6e3a1",
-  "theme.bar.menus.menu.power.buttons.logout.background": "#1e1e2e",
-  "theme.bar.menus.menu.power.buttons.restart.icon": "#181824",
-  "theme.bar.menus.menu.power.buttons.restart.text": "#fab387",
-  "theme.bar.menus.menu.power.buttons.restart.icon_background": "#fab387",
-  "theme.bar.menus.menu.power.buttons.restart.background": "#1e1e2e",
-  "theme.bar.menus.menu.power.buttons.shutdown.icon": "#181824",
-  "theme.bar.menus.menu.power.buttons.shutdown.text": "#f38ba8",
-  "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#f38ba7",
-  "theme.bar.menus.menu.power.buttons.shutdown.background": "#1e1e2e",
-  "theme.bar.menus.menu.power.border.color": "#313244",
-  "theme.bar.menus.menu.power.background.color": "#11111b",
-  "theme.bar.menus.menu.dashboard.monitors.disk.label": "#f5c2e7",
-  "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#f5c2e8",
-  "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#f5c2e7",
-  "theme.bar.menus.menu.dashboard.monitors.gpu.label": "#a6e3a1",
-  "theme.bar.menus.menu.dashboard.monitors.gpu.bar": "#a6e3a2",
-  "theme.bar.menus.menu.dashboard.monitors.gpu.icon": "#a6e3a1",
-  "theme.bar.menus.menu.dashboard.monitors.ram.label": "#f9e2af",
-  "theme.bar.menus.menu.dashboard.monitors.ram.bar": "#f9e2ae",
-  "theme.bar.menus.menu.dashboard.monitors.ram.icon": "#f9e2af",
-  "theme.bar.menus.menu.dashboard.monitors.cpu.label": "#eba0ac",
-  "theme.bar.menus.menu.dashboard.monitors.cpu.bar": "#eba0ad",
-  "theme.bar.menus.menu.dashboard.monitors.cpu.icon": "#eba0ac",
-  "theme.bar.menus.menu.dashboard.monitors.bar_background": "#45475a",
-  "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#b4befe",
-  "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#cba6f7",
-  "theme.bar.menus.menu.dashboard.directories.right.top.color": "#94e2d5",
-  "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#eba0ac",
-  "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#f9e2af",
-  "theme.bar.menus.menu.dashboard.directories.left.top.color": "#f5c2e7",
-  "theme.bar.menus.menu.dashboard.controls.input.text": "#181824",
-  "theme.bar.menus.menu.dashboard.controls.input.background": "#f5c2e7",
-  "theme.bar.menus.menu.dashboard.controls.volume.text": "#181824",
-  "theme.bar.menus.menu.dashboard.controls.volume.background": "#eba0ac",
-  "theme.bar.menus.menu.dashboard.controls.notifications.text": "#181824",
-  "theme.bar.menus.menu.dashboard.controls.notifications.background": "#f9e2af",
-  "theme.bar.menus.menu.dashboard.controls.bluetooth.text": "#181824",
-  "theme.bar.menus.menu.dashboard.controls.bluetooth.background": "#89dceb",
-  "theme.bar.menus.menu.dashboard.controls.wifi.text": "#181824",
-  "theme.bar.menus.menu.dashboard.controls.wifi.background": "#cba6f7",
-  "theme.bar.menus.menu.dashboard.controls.disabled": "#585b70",
-  "theme.bar.menus.menu.dashboard.shortcuts.recording": "#a6e3a1",
-  "theme.bar.menus.menu.dashboard.shortcuts.text": "#181824",
-  "theme.bar.menus.menu.dashboard.shortcuts.background": "#b4befe",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#11111a",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#f38ba8",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#a6e3a1",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#cdd6f4",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#b4befe",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#313244",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#11111b",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#1e1e2e",
-  "theme.bar.menus.menu.dashboard.powermenu.sleep": "#89dceb",
-  "theme.bar.menus.menu.dashboard.powermenu.logout": "#a6e3a1",
-  "theme.bar.menus.menu.dashboard.powermenu.restart": "#fab387",
-  "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#f38ba8",
-  "theme.bar.menus.menu.dashboard.profile.name": "#f5c2e7",
-  "theme.bar.menus.menu.dashboard.border.color": "#313244",
-  "theme.bar.menus.menu.dashboard.background.color": "#11111b",
-  "theme.bar.menus.menu.dashboard.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.clock.weather.hourly.temperature": "#f5c2e7",
-  "theme.bar.menus.menu.clock.weather.hourly.icon": "#f5c2e7",
-  "theme.bar.menus.menu.clock.weather.hourly.time": "#f5c2e7",
-  "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#89dceb",
-  "theme.bar.menus.menu.clock.weather.thermometer.cold": "#89b4fa",
-  "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#b4befe",
-  "theme.bar.menus.menu.clock.weather.thermometer.hot": "#fab387",
-  "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#f38ba8",
-  "theme.bar.menus.menu.clock.weather.stats": "#f5c2e7",
-  "theme.bar.menus.menu.clock.weather.status": "#94e2d5",
-  "theme.bar.menus.menu.clock.weather.temperature": "#cdd6f4",
-  "theme.bar.menus.menu.clock.weather.icon": "#f5c2e7",
-  "theme.bar.menus.menu.clock.calendar.contextdays": "#585b70",
-  "theme.bar.menus.menu.clock.calendar.days": "#cdd6f4",
-  "theme.bar.menus.menu.clock.calendar.currentday": "#f5c2e7",
-  "theme.bar.menus.menu.clock.calendar.paginator": "#f5c2e6",
-  "theme.bar.menus.menu.clock.calendar.weekdays": "#f5c2e7",
-  "theme.bar.menus.menu.clock.calendar.yearmonth": "#94e2d5",
-  "theme.bar.menus.menu.clock.time.timeperiod": "#94e2d5",
-  "theme.bar.menus.menu.clock.time.time": "#f5c2e7",
-  "theme.bar.menus.menu.clock.text": "#cdd6f4",
-  "theme.bar.menus.menu.clock.border.color": "#313244",
-  "theme.bar.menus.menu.clock.background.color": "#11111b",
-  "theme.bar.menus.menu.clock.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.battery.slider.puck": "#6c7086",
-  "theme.bar.menus.menu.battery.slider.backgroundhover": "#45475a",
-  "theme.bar.menus.menu.battery.slider.background": "#585b71",
-  "theme.bar.menus.menu.battery.slider.primary": "#f9e2af",
-  "theme.bar.menus.menu.battery.icons.active": "#f9e2af",
-  "theme.bar.menus.menu.battery.icons.passive": "#9399b2",
-  "theme.bar.menus.menu.battery.listitems.active": "#f9e2af",
-  "theme.bar.menus.menu.battery.listitems.passive": "#cdd6f3",
-  "theme.bar.menus.menu.battery.text": "#cdd6f4",
-  "theme.bar.menus.menu.battery.label.color": "#f9e2af",
-  "theme.bar.menus.menu.battery.border.color": "#313244",
-  "theme.bar.menus.menu.battery.background.color": "#11111b",
-  "theme.bar.menus.menu.battery.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.systray.dropdownmenu.divider": "#1e1e2e",
-  "theme.bar.menus.menu.systray.dropdownmenu.text": "#cdd6f4",
-  "theme.bar.menus.menu.systray.dropdownmenu.background": "#11111b",
-  "theme.bar.menus.menu.bluetooth.iconbutton.active": "#89dceb",
-  "theme.bar.menus.menu.bluetooth.iconbutton.passive": "#cdd6f4",
-  "theme.bar.menus.menu.bluetooth.icons.active": "#89dceb",
-  "theme.bar.menus.menu.bluetooth.icons.passive": "#9399b2",
-  "theme.bar.menus.menu.bluetooth.listitems.active": "#89dcea",
-  "theme.bar.menus.menu.bluetooth.listitems.passive": "#cdd6f4",
-  "theme.bar.menus.menu.bluetooth.switch.puck": "#454759",
-  "theme.bar.menus.menu.bluetooth.switch.disabled": "#313245",
-  "theme.bar.menus.menu.bluetooth.switch.enabled": "#89dceb",
-  "theme.bar.menus.menu.bluetooth.switch_divider": "#45475a",
-  "theme.bar.menus.menu.bluetooth.status": "#6c7086",
-  "theme.bar.menus.menu.bluetooth.text": "#cdd6f4",
-  "theme.bar.menus.menu.bluetooth.label.color": "#89dceb",
-  "theme.bar.menus.menu.bluetooth.border.color": "#313244",
-  "theme.bar.menus.menu.bluetooth.background.color": "#11111b",
-  "theme.bar.menus.menu.bluetooth.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.network.iconbuttons.active": "#cba6f7",
-  "theme.bar.menus.menu.network.iconbuttons.passive": "#cdd6f4",
-  "theme.bar.menus.menu.network.icons.active": "#cba6f7",
-  "theme.bar.menus.menu.network.icons.passive": "#9399b2",
-  "theme.bar.menus.menu.network.listitems.active": "#cba6f6",
-  "theme.bar.menus.menu.network.listitems.passive": "#cdd6f4",
-  "theme.bar.menus.menu.network.status.color": "#6c7086",
-  "theme.bar.menus.menu.network.text": "#cdd6f4",
-  "theme.bar.menus.menu.network.label.color": "#cba6f7",
-  "theme.bar.menus.menu.network.border.color": "#313244",
-  "theme.bar.menus.menu.network.background.color": "#11111b",
-  "theme.bar.menus.menu.network.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.volume.input_slider.puck": "#585b70",
-  "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#45475a",
-  "theme.bar.menus.menu.volume.input_slider.background": "#585b71",
-  "theme.bar.menus.menu.volume.input_slider.primary": "#eba0ac",
-  "theme.bar.menus.menu.volume.audio_slider.puck": "#585b70",
-  "theme.bar.menus.menu.volume.audio_slider.backgroundhover": "#45475a",
-  "theme.bar.menus.menu.volume.audio_slider.background": "#585b71",
-  "theme.bar.menus.menu.volume.audio_slider.primary": "#eba0ac",
-  "theme.bar.menus.menu.volume.icons.active": "#eba0ac",
-  "theme.bar.menus.menu.volume.icons.passive": "#9399b2",
-  "theme.bar.menus.menu.volume.iconbutton.active": "#eba0ac",
-  "theme.bar.menus.menu.volume.iconbutton.passive": "#cdd6f4",
-  "theme.bar.menus.menu.volume.listitems.active": "#eba0ab",
-  "theme.bar.menus.menu.volume.listitems.passive": "#cdd6f4",
-  "theme.bar.menus.menu.volume.text": "#cdd6f4",
-  "theme.bar.menus.menu.volume.label.color": "#eba0ac",
-  "theme.bar.menus.menu.volume.border.color": "#313244",
-  "theme.bar.menus.menu.volume.background.color": "#11111b",
-  "theme.bar.menus.menu.volume.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.media.slider.puck": "#6c7086",
-  "theme.bar.menus.menu.media.slider.backgroundhover": "#45475a",
-  "theme.bar.menus.menu.media.slider.background": "#585b71",
-  "theme.bar.menus.menu.media.slider.primary": "#f5c2e7",
-  "theme.bar.menus.menu.media.buttons.text": "#11111b",
-  "theme.bar.menus.menu.media.buttons.background": "#b4beff",
-  "theme.bar.menus.menu.media.buttons.enabled": "#94e2d4",
-  "theme.bar.menus.menu.media.buttons.inactive": "#585b70",
-  "theme.bar.menus.menu.media.border.color": "#313244",
-  "theme.bar.menus.menu.media.card.color": "#1e1e2e",
-  "theme.bar.menus.menu.media.background.color": "#11111b",
-  "theme.bar.menus.menu.media.album": "#f5c2e8",
-  "theme.bar.menus.menu.media.artist": "#94e2d6",
-  "theme.bar.menus.menu.media.song": "#b4beff",
-  "theme.bar.menus.tooltip.text": "#cdd6f4",
-  "theme.bar.menus.tooltip.background": "#11111b",
-  "theme.bar.menus.dropdownmenu.divider": "#1e1e2e",
-  "theme.bar.menus.dropdownmenu.text": "#cdd6f4",
-  "theme.bar.menus.dropdownmenu.background": "#11111b",
-  "theme.bar.menus.slider.puck": "#6c7086",
-  "theme.bar.menus.slider.backgroundhover": "#45475a",
-  "theme.bar.menus.slider.background": "#585b71",
-  "theme.bar.menus.slider.primary": "#b4befe",
-  "theme.bar.menus.progressbar.background": "#45475a",
-  "theme.bar.menus.progressbar.foreground": "#b4befe",
-  "theme.bar.menus.iconbuttons.active": "#b4beff",
-  "theme.bar.menus.iconbuttons.passive": "#cdd6f3",
-  "theme.bar.menus.buttons.text": "#181824",
-  "theme.bar.menus.buttons.disabled": "#585b71",
-  "theme.bar.menus.buttons.active": "#f5c2e6",
-  "theme.bar.menus.buttons.default": "#b4befe",
-  "theme.bar.menus.check_radio_button.active": "#b4beff",
-  "theme.bar.menus.check_radio_button.background": "#45475a",
-  "theme.bar.menus.switch.puck": "#454759",
-  "theme.bar.menus.switch.disabled": "#313245",
-  "theme.bar.menus.switch.enabled": "#b4befe",
-  "theme.bar.menus.icons.active": "#b4befe",
-  "theme.bar.menus.icons.passive": "#585b70",
-  "theme.bar.menus.listitems.active": "#b4befd",
-  "theme.bar.menus.listitems.passive": "#cdd6f4",
-  "theme.bar.menus.popover.border": "#181824",
-  "theme.bar.menus.popover.background": "#181824",
-  "theme.bar.menus.popover.text": "#b4befe",
-  "theme.bar.menus.label": "#b4befe",
-  "theme.bar.menus.feinttext": "#313244",
-  "theme.bar.menus.dimtext": "#585b70",
-  "theme.bar.menus.text": "#cdd6f4",
-  "theme.bar.menus.border.color": "#313244",
-  "theme.bar.menus.cards": "#1e1e2e",
-  "theme.bar.menus.background": "#11111b",
-  "theme.bar.buttons.modules.power.icon_background": "#f38ba8",
-  "theme.bar.buttons.modules.power.icon": "#181825",
-  "theme.bar.buttons.modules.power.background": "#242438",
-  "theme.bar.buttons.modules.power.border": "#f38ba8",
-  "theme.bar.buttons.modules.weather.icon_background": "#b4befe",
-  "theme.bar.buttons.modules.weather.icon": "#242438",
-  "theme.bar.buttons.modules.weather.text": "#b4befe",
-  "theme.bar.buttons.modules.weather.background": "#242438",
-  "theme.bar.buttons.modules.weather.border": "#b4befe",
-  "theme.bar.buttons.modules.updates.icon_background": "#cba6f7",
-  "theme.bar.buttons.modules.updates.icon": "#181825",
-  "theme.bar.buttons.modules.updates.text": "#cba6f7",
-  "theme.bar.buttons.modules.updates.background": "#242438",
-  "theme.bar.buttons.modules.updates.border": "#cba6f7",
-  "theme.bar.buttons.modules.kbLayout.icon_background": "#89dceb",
-  "theme.bar.buttons.modules.kbLayout.icon": "#181825",
-  "theme.bar.buttons.modules.kbLayout.text": "#89dceb",
-  "theme.bar.buttons.modules.kbLayout.background": "#242438",
-  "theme.bar.buttons.modules.kbLayout.border": "#89dceb",
-  "theme.bar.buttons.modules.netstat.icon_background": "#a6e3a1",
-  "theme.bar.buttons.modules.netstat.icon": "#181825",
-  "theme.bar.buttons.modules.netstat.text": "#a6e3a1",
-  "theme.bar.buttons.modules.netstat.background": "#242438",
-  "theme.bar.buttons.modules.netstat.border": "#a6e3a1",
-  "theme.bar.buttons.modules.storage.icon_background": "#f5c2e7",
-  "theme.bar.buttons.modules.storage.icon": "#181825",
-  "theme.bar.buttons.modules.storage.text": "#f5c2e7",
-  "theme.bar.buttons.modules.storage.background": "#242438",
-  "theme.bar.buttons.modules.storage.border": "#f5c2e7",
-  "theme.bar.buttons.modules.cpu.icon_background": "#f38ba8",
-  "theme.bar.buttons.modules.cpu.icon": "#181825",
-  "theme.bar.buttons.modules.cpu.text": "#f38ba8",
-  "theme.bar.buttons.modules.cpu.background": "#242438",
-  "theme.bar.buttons.modules.cpu.border": "#f38ba8",
-  "theme.bar.buttons.modules.ram.icon_background": "#f9e2af",
-  "theme.bar.buttons.modules.ram.icon": "#181825",
-  "theme.bar.buttons.modules.ram.text": "#f9e2af",
-  "theme.bar.buttons.modules.ram.background": "#242438",
-  "theme.bar.buttons.modules.ram.border": "#f9e2af",
-  "theme.bar.buttons.notifications.total": "#b4befe",
-  "theme.bar.buttons.notifications.icon_background": "#b4befe",
-  "theme.bar.buttons.notifications.icon": "#1e1e2e",
-  "theme.bar.buttons.notifications.background": "#242438",
-  "theme.bar.buttons.notifications.border": "#b4befe",
-  "theme.bar.buttons.clock.icon_background": "#f5c2e7",
-  "theme.bar.buttons.clock.icon": "#232338",
-  "theme.bar.buttons.clock.text": "#f5c2e7",
-  "theme.bar.buttons.clock.background": "#242438",
-  "theme.bar.buttons.clock.border": "#f5c2e7",
-  "theme.bar.buttons.battery.icon_background": "#f9e2af",
-  "theme.bar.buttons.battery.icon": "#242438",
-  "theme.bar.buttons.battery.text": "#f9e2af",
-  "theme.bar.buttons.battery.background": "#242438",
-  "theme.bar.buttons.battery.border": "#f9e2af",
-  "theme.bar.buttons.systray.background": "#242438",
-  "theme.bar.buttons.systray.border": "#b4befe",
-  "theme.bar.buttons.bluetooth.icon_background": "#89dbeb",
-  "theme.bar.buttons.bluetooth.icon": "#1e1e2e",
-  "theme.bar.buttons.bluetooth.text": "#89dceb",
-  "theme.bar.buttons.bluetooth.background": "#242438",
-  "theme.bar.buttons.bluetooth.border": "#89dceb",
-  "theme.bar.buttons.network.icon_background": "#caa6f7",
-  "theme.bar.buttons.network.icon": "#242438",
-  "theme.bar.buttons.network.text": "#cba6f7",
-  "theme.bar.buttons.network.background": "#242438",
-  "theme.bar.buttons.network.border": "#cba6f7",
-  "theme.bar.buttons.volume.icon_background": "#eba0ac",
-  "theme.bar.buttons.volume.icon": "#242438",
-  "theme.bar.buttons.volume.text": "#eba0ac",
-  "theme.bar.buttons.volume.background": "#242438",
-  "theme.bar.buttons.volume.border": "#eba0ac",
-  "theme.bar.buttons.media.icon_background": "#b4befe",
-  "theme.bar.buttons.media.icon": "#1e1e2e",
-  "theme.bar.buttons.media.text": "#b4befe",
-  "theme.bar.buttons.media.background": "#242438",
-  "theme.bar.buttons.media.border": "#b4befe",
-  "theme.bar.buttons.windowtitle.icon_background": "#f5c2e7",
-  "theme.bar.buttons.windowtitle.icon": "#1e1e2e",
-  "theme.bar.buttons.windowtitle.text": "#f5c2e7",
-  "theme.bar.buttons.windowtitle.border": "#f5c2e7",
-  "theme.bar.buttons.windowtitle.background": "#242438",
-  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#f5c2e7",
-  "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
-  "theme.bar.buttons.workspaces.hover": "#f5c2e7",
-  "theme.bar.buttons.workspaces.active": "#f5c2e7",
-  "theme.bar.buttons.workspaces.occupied": "#f2cdcd",
-  "theme.bar.buttons.workspaces.available": "#89dceb",
-  "theme.bar.buttons.workspaces.border": "#f5c2e7",
-  "theme.bar.buttons.workspaces.background": "#242438",
-  "theme.bar.buttons.dashboard.icon": "#1e1e2e",
-  "theme.bar.buttons.dashboard.border": "#f9e2af",
-  "theme.bar.buttons.dashboard.background": "#f9e2af",
-  "theme.bar.buttons.icon": "#b4befe",
-  "theme.bar.buttons.text": "#b4befe",
-  "theme.bar.buttons.hover": "#45475a",
-  "theme.bar.buttons.icon_background": "#242438",
-  "theme.bar.buttons.background": "#242438",
-  "theme.bar.buttons.style": "split",
-  "theme.bar.background": "#11111b",
-  "theme.osd.label": "#b4beff",
-  "theme.osd.icon": "#11111b",
-  "theme.osd.bar_overflow_color": "#f38ba7",
-  "theme.osd.bar_empty_color": "#313244",
-  "theme.osd.bar_color": "#b4beff",
-  "theme.osd.icon_container": "#b4beff",
-  "theme.osd.bar_container": "#11111b",
-  "theme.notification.close_button.label": "#11111b",
-  "theme.notification.close_button.background": "#f38ba7",
-  "theme.notification.labelicon": "#b4befe",
-  "theme.notification.text": "#cdd6f4",
-  "theme.notification.time": "#7f849b",
-  "theme.notification.border": "#313243",
-  "theme.notification.label": "#b4befe",
-  "theme.notification.actions.text": "#181825",
-  "theme.notification.actions.background": "#b4befd",
-  "theme.notification.background": "#181826"
-}
\ No newline at end of file
+    "theme.bar.menus.background": "#11111b",
+    "theme.bar.background": "#11111b",
+    "theme.bar.buttons.media.icon": "#1e1e2e",
+    "theme.bar.buttons.media.text": "#b4befe",
+    "theme.bar.buttons.icon": "#b4befe",
+    "theme.bar.buttons.text": "#b4befe",
+    "theme.bar.buttons.hover": "#45475a",
+    "theme.bar.buttons.background": "#242438",
+    "theme.bar.menus.text": "#cdd6f4",
+    "theme.bar.menus.border.color": "#313244",
+    "theme.bar.buttons.media.background": "#242438",
+    "theme.bar.menus.menu.volume.text": "#cdd6f4",
+    "theme.bar.menus.menu.volume.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.volume.label.color": "#eba0ac",
+    "theme.bar.menus.popover.text": "#b4befe",
+    "theme.bar.menus.popover.background": "#181824",
+    "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#f38ba8",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#f38ba8",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#a6e3a1",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#11111a",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#cdd6f4",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#b4befe",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#313244",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#11111b",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#1e1e2e",
+    "theme.bar.menus.menu.notifications.switch.puck": "#454759",
+    "theme.bar.menus.menu.notifications.switch.disabled": "#313245",
+    "theme.bar.menus.menu.notifications.switch.enabled": "#b4befe",
+    "theme.bar.menus.menu.notifications.clear": "#f38ba8",
+    "theme.bar.menus.menu.notifications.switch_divider": "#45475a",
+    "theme.bar.menus.menu.notifications.border": "#313244",
+    "theme.bar.menus.menu.notifications.card": "#1e1e2e",
+    "theme.bar.menus.menu.notifications.background": "#11111b",
+    "theme.bar.menus.menu.notifications.no_notifications_label": "#313244",
+    "theme.bar.menus.menu.notifications.label": "#b4befe",
+    "theme.bar.menus.menu.dashboard.monitors.disk.label": "#f5c2e7",
+    "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#f5c2e8",
+    "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#f5c2e7",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.label": "#a6e3a1",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.bar": "#a6e3a2",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.icon": "#a6e3a1",
+    "theme.bar.menus.menu.dashboard.monitors.ram.label": "#f9e2af",
+    "theme.bar.menus.menu.dashboard.monitors.ram.bar": "#f9e2ae",
+    "theme.bar.menus.menu.dashboard.monitors.ram.icon": "#f9e2af",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.label": "#eba0ac",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.bar": "#eba0ad",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.icon": "#eba0ac",
+    "theme.bar.menus.menu.dashboard.monitors.bar_background": "#45475a",
+    "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#b4befe",
+    "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#cba6f7",
+    "theme.bar.menus.menu.dashboard.directories.right.top.color": "#94e2d5",
+    "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#eba0ac",
+    "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#f9e2af",
+    "theme.bar.menus.menu.dashboard.directories.left.top.color": "#f5c2e7",
+    "theme.bar.menus.menu.dashboard.controls.input.text": "#181824",
+    "theme.bar.menus.menu.dashboard.controls.input.background": "#f5c2e7",
+    "theme.bar.menus.menu.dashboard.controls.volume.text": "#181824",
+    "theme.bar.menus.menu.dashboard.controls.volume.background": "#eba0ac",
+    "theme.bar.menus.menu.dashboard.controls.notifications.text": "#181824",
+    "theme.bar.menus.menu.dashboard.controls.notifications.background": "#f9e2af",
+    "theme.bar.menus.menu.dashboard.controls.bluetooth.text": "#181824",
+    "theme.bar.menus.menu.dashboard.controls.bluetooth.background": "#89dceb",
+    "theme.bar.menus.menu.dashboard.controls.wifi.text": "#181824",
+    "theme.bar.menus.menu.dashboard.controls.wifi.background": "#cba6f7",
+    "theme.bar.menus.menu.dashboard.controls.disabled": "#585b70",
+    "theme.bar.menus.menu.dashboard.shortcuts.recording": "#a6e3a1",
+    "theme.bar.menus.menu.dashboard.shortcuts.text": "#181824",
+    "theme.bar.menus.menu.dashboard.shortcuts.background": "#b4befe",
+    "theme.bar.menus.menu.dashboard.powermenu.sleep": "#89dceb",
+    "theme.bar.menus.menu.dashboard.powermenu.logout": "#a6e3a1",
+    "theme.bar.menus.menu.dashboard.powermenu.restart": "#fab387",
+    "theme.bar.menus.menu.dashboard.profile.name": "#f5c2e7",
+    "theme.bar.menus.menu.dashboard.border.color": "#313244",
+    "theme.bar.menus.menu.dashboard.background.color": "#11111b",
+    "theme.bar.menus.menu.dashboard.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.clock.weather.hourly.temperature": "#f5c2e7",
+    "theme.bar.menus.menu.clock.weather.hourly.icon": "#f5c2e7",
+    "theme.bar.menus.menu.clock.weather.hourly.time": "#f5c2e7",
+    "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#89dceb",
+    "theme.bar.menus.menu.clock.weather.thermometer.cold": "#89b4fa",
+    "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#b4befe",
+    "theme.bar.menus.menu.clock.weather.thermometer.hot": "#fab387",
+    "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#f38ba8",
+    "theme.bar.menus.menu.clock.weather.stats": "#f5c2e7",
+    "theme.bar.menus.menu.clock.weather.status": "#94e2d5",
+    "theme.bar.menus.menu.clock.weather.temperature": "#cdd6f4",
+    "theme.bar.menus.menu.clock.weather.icon": "#f5c2e7",
+    "theme.bar.menus.menu.clock.calendar.contextdays": "#585b70",
+    "theme.bar.menus.menu.clock.calendar.days": "#cdd6f4",
+    "theme.bar.menus.menu.clock.calendar.currentday": "#f5c2e7",
+    "theme.bar.menus.menu.clock.calendar.paginator": "#f5c2e6",
+    "theme.bar.menus.menu.clock.calendar.weekdays": "#f5c2e7",
+    "theme.bar.menus.menu.clock.calendar.yearmonth": "#94e2d5",
+    "theme.bar.menus.menu.clock.time.timeperiod": "#94e2d5",
+    "theme.bar.menus.menu.clock.time.time": "#f5c2e7",
+    "theme.bar.menus.menu.clock.text": "#cdd6f4",
+    "theme.bar.menus.menu.clock.border.color": "#313244",
+    "theme.bar.menus.menu.clock.background.color": "#11111b",
+    "theme.bar.menus.menu.clock.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.battery.slider.puck": "#6c7086",
+    "theme.bar.menus.menu.battery.slider.backgroundhover": "#45475a",
+    "theme.bar.menus.menu.battery.slider.background": "#585b71",
+    "theme.bar.menus.menu.battery.slider.primary": "#f9e2af",
+    "theme.bar.menus.menu.battery.icons.active": "#f9e2af",
+    "theme.bar.menus.menu.battery.icons.passive": "#9399b2",
+    "theme.bar.menus.menu.battery.listitems.active": "#f9e2af",
+    "theme.bar.menus.menu.battery.listitems.passive": "#cdd6f3",
+    "theme.bar.menus.menu.battery.text": "#cdd6f4",
+    "theme.bar.menus.menu.battery.label.color": "#f9e2af",
+    "theme.bar.menus.menu.battery.border.color": "#313244",
+    "theme.bar.menus.menu.battery.background.color": "#11111b",
+    "theme.bar.menus.menu.battery.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.systray.dropdownmenu.divider": "#1e1e2e",
+    "theme.bar.menus.menu.systray.dropdownmenu.text": "#cdd6f4",
+    "theme.bar.menus.menu.systray.dropdownmenu.background": "#11111b",
+    "theme.bar.menus.menu.bluetooth.iconbutton.active": "#89dceb",
+    "theme.bar.menus.menu.bluetooth.iconbutton.passive": "#cdd6f4",
+    "theme.bar.menus.menu.bluetooth.icons.active": "#89dceb",
+    "theme.bar.menus.menu.bluetooth.icons.passive": "#9399b2",
+    "theme.bar.menus.menu.bluetooth.listitems.active": "#89dcea",
+    "theme.bar.menus.menu.bluetooth.listitems.passive": "#cdd6f4",
+    "theme.bar.menus.menu.bluetooth.switch.puck": "#454759",
+    "theme.bar.menus.menu.bluetooth.switch.disabled": "#313245",
+    "theme.bar.menus.menu.bluetooth.switch.enabled": "#89dceb",
+    "theme.bar.menus.menu.bluetooth.switch_divider": "#45475a",
+    "theme.bar.menus.menu.bluetooth.status": "#6c7086",
+    "theme.bar.menus.menu.bluetooth.text": "#cdd6f4",
+    "theme.bar.menus.menu.bluetooth.label.color": "#89dceb",
+    "theme.bar.menus.menu.bluetooth.border.color": "#313244",
+    "theme.bar.menus.menu.bluetooth.background.color": "#11111b",
+    "theme.bar.menus.menu.bluetooth.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.network.iconbuttons.active": "#cba6f7",
+    "theme.bar.menus.menu.network.iconbuttons.passive": "#cdd6f4",
+    "theme.bar.menus.menu.network.icons.active": "#cba6f7",
+    "theme.bar.menus.menu.network.icons.passive": "#9399b2",
+    "theme.bar.menus.menu.network.listitems.active": "#cba6f6",
+    "theme.bar.menus.menu.network.listitems.passive": "#cdd6f4",
+    "theme.bar.menus.menu.network.status.color": "#6c7086",
+    "theme.bar.menus.menu.network.text": "#cdd6f4",
+    "theme.bar.menus.menu.network.label.color": "#cba6f7",
+    "theme.bar.menus.menu.network.border.color": "#313244",
+    "theme.bar.menus.menu.network.background.color": "#11111b",
+    "theme.bar.menus.menu.network.card.color": "#1e1e2e",
+    "theme.bar.menus.menu.volume.input_slider.puck": "#585b70",
+    "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#45475a",
+    "theme.bar.menus.menu.volume.input_slider.background": "#585b71",
+    "theme.bar.menus.menu.volume.input_slider.primary": "#eba0ac",
+    "theme.bar.menus.menu.volume.audio_slider.puck": "#585b70",
+    "theme.bar.menus.menu.volume.audio_slider.backgroundhover": "#45475a",
+    "theme.bar.menus.menu.volume.audio_slider.background": "#585b71",
+    "theme.bar.menus.menu.volume.audio_slider.primary": "#eba0ac",
+    "theme.bar.menus.menu.volume.icons.active": "#eba0ac",
+    "theme.bar.menus.menu.volume.icons.passive": "#9399b2",
+    "theme.bar.menus.menu.volume.iconbutton.active": "#eba0ac",
+    "theme.bar.menus.menu.volume.iconbutton.passive": "#cdd6f4",
+    "theme.bar.menus.menu.volume.listitems.active": "#eba0ab",
+    "theme.bar.menus.menu.volume.listitems.passive": "#cdd6f4",
+    "theme.bar.menus.menu.volume.border.color": "#313244",
+    "theme.bar.menus.menu.volume.background.color": "#11111b",
+    "theme.bar.menus.menu.media.slider.puck": "#6c7086",
+    "theme.bar.menus.menu.media.slider.backgroundhover": "#45475a",
+    "theme.bar.menus.menu.media.slider.background": "#585b71",
+    "theme.bar.menus.menu.media.slider.primary": "#f5c2e7",
+    "theme.bar.menus.menu.media.buttons.text": "#11111b",
+    "theme.bar.menus.menu.media.buttons.background": "#b4beff",
+    "theme.bar.menus.menu.media.buttons.enabled": "#94e2d4",
+    "theme.bar.menus.menu.media.buttons.inactive": "#585b70",
+    "theme.bar.menus.menu.media.border.color": "#313244",
+    "theme.bar.menus.menu.media.background.color": "#11111b",
+    "theme.bar.menus.menu.media.album": "#f5c2e8",
+    "theme.bar.menus.menu.media.artist": "#94e2d6",
+    "theme.bar.menus.menu.media.song": "#b4beff",
+    "theme.bar.menus.tooltip.text": "#cdd6f4",
+    "theme.bar.menus.tooltip.background": "#11111b",
+    "theme.bar.menus.dropdownmenu.divider": "#1e1e2e",
+    "theme.bar.menus.dropdownmenu.text": "#cdd6f4",
+    "theme.bar.menus.dropdownmenu.background": "#11111b",
+    "theme.bar.menus.slider.puck": "#6c7086",
+    "theme.bar.menus.slider.backgroundhover": "#45475a",
+    "theme.bar.menus.slider.background": "#585b71",
+    "theme.bar.menus.slider.primary": "#b4befe",
+    "theme.bar.menus.progressbar.background": "#45475a",
+    "theme.bar.menus.progressbar.foreground": "#b4befe",
+    "theme.bar.menus.iconbuttons.active": "#b4beff",
+    "theme.bar.menus.iconbuttons.passive": "#cdd6f3",
+    "theme.bar.menus.buttons.text": "#181824",
+    "theme.bar.menus.buttons.disabled": "#585b71",
+    "theme.bar.menus.buttons.active": "#f5c2e6",
+    "theme.bar.menus.buttons.default": "#b4befe",
+    "theme.bar.menus.switch.puck": "#454759",
+    "theme.bar.menus.switch.disabled": "#313245",
+    "theme.bar.menus.switch.enabled": "#b4befe",
+    "theme.bar.menus.icons.active": "#b4befe",
+    "theme.bar.menus.icons.passive": "#585b70",
+    "theme.bar.menus.listitems.active": "#b4befd",
+    "theme.bar.menus.listitems.passive": "#cdd6f4",
+    "theme.bar.menus.label": "#b4befe",
+    "theme.bar.menus.feinttext": "#313244",
+    "theme.bar.menus.dimtext": "#585b70",
+    "theme.bar.menus.cards": "#1e1e2e",
+    "theme.bar.buttons.notifications.total": "#b4befe",
+    "theme.bar.buttons.notifications.icon": "#1e1e2e",
+    "theme.bar.buttons.notifications.background": "#242438",
+    "theme.bar.buttons.clock.icon": "#232338",
+    "theme.bar.buttons.clock.text": "#f5c2e7",
+    "theme.bar.buttons.clock.background": "#242438",
+    "theme.bar.buttons.battery.icon": "#242438",
+    "theme.bar.buttons.battery.text": "#f9e2af",
+    "theme.bar.buttons.battery.background": "#242438",
+    "theme.bar.buttons.systray.background": "#242438",
+    "theme.bar.buttons.bluetooth.icon": "#1e1e2e",
+    "theme.bar.buttons.bluetooth.text": "#89dceb",
+    "theme.bar.buttons.bluetooth.background": "#242438",
+    "theme.bar.buttons.network.icon": "#242438",
+    "theme.bar.buttons.network.text": "#cba6f7",
+    "theme.bar.buttons.network.background": "#242438",
+    "theme.bar.buttons.volume.icon": "#242438",
+    "theme.bar.buttons.volume.text": "#eba0ac",
+    "theme.bar.buttons.volume.background": "#242438",
+    "theme.bar.buttons.windowtitle.icon": "#1e1e2e",
+    "theme.bar.buttons.windowtitle.text": "#f5c2e7",
+    "theme.bar.buttons.windowtitle.background": "#242438",
+    "theme.bar.buttons.workspaces.active": "#f5c2e7",
+    "theme.bar.buttons.workspaces.occupied": "#f2cdcd",
+    "theme.bar.buttons.workspaces.available": "#89dceb",
+    "theme.bar.buttons.workspaces.hover": "#f5c2e7",
+    "theme.bar.buttons.workspaces.background": "#242438",
+    "theme.bar.buttons.dashboard.icon": "#1e1e2e",
+    "theme.bar.buttons.dashboard.background": "#f9e2af",
+    "theme.osd.label": "#b4beff",
+    "theme.osd.icon": "#11111b",
+    "theme.osd.bar_overflow_color": "#f38ba7",
+    "theme.osd.bar_empty_color": "#313244",
+    "theme.osd.bar_color": "#b4beff",
+    "theme.osd.icon_container": "#b4beff",
+    "theme.osd.bar_container": "#11111b",
+    "theme.notification.close_button.label": "#11111b",
+    "theme.notification.close_button.background": "#f38ba7",
+    "theme.notification.labelicon": "#b4befe",
+    "theme.notification.text": "#cdd6f4",
+    "theme.notification.time": "#7f849b",
+    "theme.notification.border": "#313243",
+    "theme.notification.label": "#b4befe",
+    "theme.notification.actions.text": "#181825",
+    "theme.notification.actions.background": "#b4befd",
+    "theme.notification.background": "#181826",
+    "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
+    "theme.bar.buttons.workspaces.numbered_active_underline_color": "#f5c2e7",
+    "theme.bar.menus.menu.media.card.color": "#1e1e2e",
+    "theme.bar.menus.check_radio_button.background": "#45475a",
+    "theme.bar.menus.check_radio_button.active": "#b4beff",
+    "theme.bar.buttons.style": "split",
+    "theme.bar.buttons.icon_background": "#242438",
+    "theme.bar.buttons.volume.icon_background": "#eba0ac",
+    "theme.bar.buttons.network.icon_background": "#caa6f7",
+    "theme.bar.buttons.bluetooth.icon_background": "#89dbeb",
+    "theme.bar.buttons.windowtitle.icon_background": "#f5c2e7",
+    "theme.bar.buttons.media.icon_background": "#b4befe",
+    "theme.bar.buttons.notifications.icon_background": "#b4befe",
+    "theme.bar.buttons.battery.icon_background": "#f9e2af",
+    "theme.bar.buttons.clock.icon_background": "#f5c2e7",
+    "theme.bar.menus.menu.notifications.scrollbar.color": "#b4befe",
+    "theme.bar.menus.menu.notifications.pager.button": "#b4befe",
+    "theme.bar.menus.menu.notifications.pager.label": "#9399b2",
+    "theme.bar.menus.menu.notifications.pager.background": "#11111b",
+    "theme.bar.buttons.modules.ram.icon_background": "#f9e2af",
+    "theme.bar.buttons.modules.ram.icon": "#181825",
+    "theme.bar.buttons.modules.cpu.icon": "#181825",
+    "theme.bar.buttons.modules.cpu.icon_background": "#f38ba8",
+    "theme.bar.buttons.modules.storage.icon": "#181825",
+    "theme.bar.buttons.modules.storage.icon_background": "#f5c2e7",
+    "theme.bar.buttons.modules.netstat.icon": "#181825",
+    "theme.bar.buttons.modules.netstat.icon_background": "#a6e3a1",
+    "theme.bar.buttons.modules.kbLayout.icon_background": "#89dceb",
+    "theme.bar.buttons.modules.kbLayout.icon": "#181825",
+    "theme.bar.buttons.modules.updates.icon_background": "#cba6f7",
+    "theme.bar.buttons.modules.updates.icon": "#181825",
+    "theme.bar.buttons.modules.weather.icon_background": "#b4befe",
+    "theme.bar.buttons.modules.weather.text": "#b4befe",
+    "theme.bar.buttons.modules.weather.icon": "#242438",
+    "theme.bar.buttons.modules.power.icon_background": "#f38ba8",
+    "theme.bar.buttons.modules.power.icon": "#181825",
+    "theme.bar.menus.menu.power.background.color": "#11111b",
+    "theme.bar.menus.menu.power.border.color": "#313244",
+    "theme.bar.menus.menu.power.buttons.shutdown.background": "#1e1e2e",
+    "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#f38ba7",
+    "theme.bar.menus.menu.power.buttons.shutdown.text": "#f38ba8",
+    "theme.bar.menus.menu.power.buttons.shutdown.icon": "#181824",
+    "theme.bar.buttons.modules.netstat.background": "#242438",
+    "theme.bar.buttons.modules.cpu.background": "#242438",
+    "theme.bar.buttons.modules.cpu.text": "#f38ba8",
+    "theme.bar.buttons.modules.storage.text": "#f5c2e7",
+    "theme.bar.menus.popover.border": "#181824",
+    "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#89dceb",
+    "theme.bar.menus.menu.power.buttons.restart.text": "#fab387",
+    "theme.bar.buttons.modules.updates.background": "#242438",
+    "theme.bar.buttons.modules.netstat.text": "#a6e3a1",
+    "theme.bar.buttons.modules.storage.background": "#242438",
+    "theme.bar.menus.menu.power.buttons.logout.icon": "#181824",
+    "theme.bar.menus.menu.power.buttons.restart.icon_background": "#fab387",
+    "theme.bar.menus.menu.power.buttons.restart.icon": "#181824",
+    "theme.bar.menus.menu.power.buttons.sleep.text": "#89dceb",
+    "theme.bar.menus.menu.power.buttons.logout.background": "#1e1e2e",
+    "theme.bar.menus.menu.power.buttons.sleep.background": "#1e1e2e",
+    "theme.bar.buttons.modules.ram.text": "#f9e2af",
+    "theme.bar.menus.menu.power.buttons.logout.text": "#a6e3a1",
+    "theme.bar.buttons.modules.kbLayout.background": "#242438",
+    "theme.bar.buttons.modules.power.background": "#242438",
+    "theme.bar.buttons.modules.weather.background": "#242438",
+    "theme.bar.buttons.modules.ram.background": "#242438",
+    "theme.bar.menus.menu.power.buttons.logout.icon_background": "#a6e3a1",
+    "theme.bar.buttons.modules.updates.text": "#cba6f7",
+    "theme.bar.menus.menu.power.buttons.sleep.icon": "#181824",
+    "theme.bar.menus.menu.power.buttons.restart.background": "#1e1e2e",
+    "theme.bar.buttons.modules.kbLayout.text": "#89dceb",
+    "theme.bar.buttons.windowtitle.border": "#f5c2e7",
+    "theme.bar.buttons.modules.power.border": "#f38ba8",
+    "theme.bar.buttons.modules.weather.border": "#b4befe",
+    "theme.bar.buttons.modules.updates.border": "#cba6f7",
+    "theme.bar.buttons.modules.kbLayout.border": "#89dceb",
+    "theme.bar.buttons.modules.netstat.border": "#a6e3a1",
+    "theme.bar.buttons.modules.storage.border": "#f5c2e7",
+    "theme.bar.buttons.modules.cpu.border": "#f38ba8",
+    "theme.bar.buttons.modules.ram.border": "#f9e2af",
+    "theme.bar.buttons.notifications.border": "#b4befe",
+    "theme.bar.buttons.clock.border": "#f5c2e7",
+    "theme.bar.buttons.battery.border": "#f9e2af",
+    "theme.bar.buttons.systray.border": "#b4befe",
+    "theme.bar.buttons.bluetooth.border": "#89dceb",
+    "theme.bar.buttons.network.border": "#cba6f7",
+    "theme.bar.buttons.volume.border": "#eba0ac",
+    "theme.bar.buttons.media.border": "#b4befe",
+    "theme.bar.buttons.workspaces.border": "#f5c2e7",
+    "theme.bar.buttons.dashboard.border": "#f9e2af",
+    "theme.bar.buttons.modules.submap.icon": "#181825",
+    "theme.bar.buttons.modules.submap.background": "#242438",
+    "theme.bar.buttons.modules.submap.icon_background": "#94e2d5",
+    "theme.bar.buttons.modules.submap.text": "#94e2d5",
+    "theme.bar.buttons.modules.submap.border": "#94e2d5"
+}
diff --git a/themes/cyberpunk.json b/themes/cyberpunk.json
index 8ddbbce..50a6a09 100644
--- a/themes/cyberpunk.json
+++ b/themes/cyberpunk.json
@@ -251,44 +251,35 @@
   "theme.bar.buttons.notifications.total": "#f7d04b",
   "theme.bar.buttons.notifications.icon_background": "#FFD700",
   "theme.bar.buttons.notifications.icon": "#f7d04b",
-  "theme.bar.buttons.notifications.hover": "#303030",
   "theme.bar.buttons.notifications.background": "#121212",
   "theme.bar.buttons.clock.icon_background": "#FF69B4",
   "theme.bar.buttons.clock.icon": "#5bafff",
   "theme.bar.buttons.clock.text": "#5bafff",
-  "theme.bar.buttons.clock.hover": "#303030",
   "theme.bar.buttons.clock.background": "#121212",
   "theme.bar.buttons.battery.icon_background": "#FFD700",
   "theme.bar.buttons.battery.icon": "#f7d04b",
   "theme.bar.buttons.battery.text": "#f7d04b",
-  "theme.bar.buttons.battery.hover": "#303030",
   "theme.bar.buttons.battery.background": "#121212",
-  "theme.bar.buttons.systray.hover": "#303030",
   "theme.bar.buttons.systray.background": "#121212",
   "theme.bar.buttons.bluetooth.icon_background": "#89dbeb",
   "theme.bar.buttons.bluetooth.icon": "#5bafff",
   "theme.bar.buttons.bluetooth.text": "#5bafff",
-  "theme.bar.buttons.bluetooth.hover": "#303030",
   "theme.bar.buttons.bluetooth.background": "#121212",
   "theme.bar.buttons.network.icon_background": "#caa6f7",
   "theme.bar.buttons.network.icon": "#e23fe2",
   "theme.bar.buttons.network.text": "#e23fe2",
-  "theme.bar.buttons.network.hover": "#303030",
   "theme.bar.buttons.network.background": "#121212",
   "theme.bar.buttons.volume.icon_background": "#FF4500",
   "theme.bar.buttons.volume.icon": "#ff3f3f",
   "theme.bar.buttons.volume.text": "#ff3f3f",
-  "theme.bar.buttons.volume.hover": "#303030",
   "theme.bar.buttons.volume.background": "#121212",
   "theme.bar.buttons.media.icon_background": "#FFD700",
   "theme.bar.buttons.media.icon": "#FFD700",
   "theme.bar.buttons.media.text": "#00FFFF",
-  "theme.bar.buttons.media.hover": "#303030",
   "theme.bar.buttons.media.background": "#111111",
   "theme.bar.buttons.windowtitle.icon_background": "#FF69B4",
   "theme.bar.buttons.windowtitle.icon": "#5bafff",
   "theme.bar.buttons.windowtitle.text": "#5bafff",
-  "theme.bar.buttons.windowtitle.hover": "#303030",
   "theme.bar.buttons.windowtitle.background": "#121212",
   "theme.bar.buttons.workspaces.numbered_active_underline_color": "#e23ee2",
   "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#21252b",
@@ -298,7 +289,6 @@
   "theme.bar.buttons.workspaces.hover": "#303030",
   "theme.bar.buttons.workspaces.background": "#121212",
   "theme.bar.buttons.dashboard.icon": "#f7d04b",
-  "theme.bar.buttons.dashboard.hover": "#303030",
   "theme.bar.buttons.dashboard.background": "#121212",
   "theme.bar.buttons.icon": "#FFD700",
   "theme.bar.buttons.text": "#00FFFF",
@@ -342,5 +332,10 @@
   "theme.bar.buttons.media.border": "#FFD700",
   "theme.bar.buttons.windowtitle.border": "#5bafff",
   "theme.bar.buttons.workspaces.border": "#e23ee2",
-  "theme.bar.buttons.dashboard.border": "#f7d04b"
+  "theme.bar.buttons.dashboard.border": "#f7d04b",
+  "theme.bar.buttons.modules.submap.background": "#121212",
+  "theme.bar.buttons.modules.submap.text": "#FF69B4",
+  "theme.bar.buttons.modules.submap.border": "#FF69B4",
+  "theme.bar.buttons.modules.submap.icon": "#FF69B4",
+  "theme.bar.buttons.modules.submap.icon_background": "#121212"
 }
\ No newline at end of file
diff --git a/themes/cyberpunk_split.json b/themes/cyberpunk_split.json
index 4f1c3e2..b7b183a 100644
--- a/themes/cyberpunk_split.json
+++ b/themes/cyberpunk_split.json
@@ -251,44 +251,35 @@
   "theme.bar.buttons.notifications.total": "#f7d04b",
   "theme.bar.buttons.notifications.icon_background": "#f7d04b",
   "theme.bar.buttons.notifications.icon": "#121212",
-  "theme.bar.buttons.notifications.hover": "#303030",
   "theme.bar.buttons.notifications.background": "#121212",
   "theme.bar.buttons.clock.icon_background": "#5bafff",
   "theme.bar.buttons.clock.icon": "#121212",
   "theme.bar.buttons.clock.text": "#5bafff",
-  "theme.bar.buttons.clock.hover": "#303030",
   "theme.bar.buttons.clock.background": "#121212",
   "theme.bar.buttons.battery.icon_background": "#f7d04b",
   "theme.bar.buttons.battery.icon": "#121212",
   "theme.bar.buttons.battery.text": "#f7d04b",
-  "theme.bar.buttons.battery.hover": "#303030",
   "theme.bar.buttons.battery.background": "#121212",
-  "theme.bar.buttons.systray.hover": "#303030",
   "theme.bar.buttons.systray.background": "#121212",
   "theme.bar.buttons.bluetooth.icon_background": "#5bafff",
   "theme.bar.buttons.bluetooth.icon": "#121212",
   "theme.bar.buttons.bluetooth.text": "#5bafff",
-  "theme.bar.buttons.bluetooth.hover": "#303030",
   "theme.bar.buttons.bluetooth.background": "#121212",
   "theme.bar.buttons.network.icon_background": "#e23fe2",
   "theme.bar.buttons.network.icon": "#121212",
   "theme.bar.buttons.network.text": "#e23fe2",
-  "theme.bar.buttons.network.hover": "#303030",
   "theme.bar.buttons.network.background": "#121212",
   "theme.bar.buttons.volume.icon_background": "#ff3f3f",
   "theme.bar.buttons.volume.icon": "#121212",
   "theme.bar.buttons.volume.text": "#ff3f3f",
-  "theme.bar.buttons.volume.hover": "#303030",
   "theme.bar.buttons.volume.background": "#121212",
   "theme.bar.buttons.media.icon_background": "#00ffff",
   "theme.bar.buttons.media.icon": "#121212",
   "theme.bar.buttons.media.text": "#00ffff",
-  "theme.bar.buttons.media.hover": "#303030",
   "theme.bar.buttons.media.background": "#111111",
   "theme.bar.buttons.windowtitle.icon_background": "#5bafff",
   "theme.bar.buttons.windowtitle.icon": "#121212",
   "theme.bar.buttons.windowtitle.text": "#5bafff",
-  "theme.bar.buttons.windowtitle.hover": "#303030",
   "theme.bar.buttons.windowtitle.background": "#121212",
   "theme.bar.buttons.workspaces.numbered_active_underline_color": "#e23ee2",
   "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#e23fe2",
@@ -298,7 +289,6 @@
   "theme.bar.buttons.workspaces.hover": "#e23fe2",
   "theme.bar.buttons.workspaces.background": "#121212",
   "theme.bar.buttons.dashboard.icon": "#121212",
-  "theme.bar.buttons.dashboard.hover": "#303030",
   "theme.bar.buttons.dashboard.background": "#f7d04b",
   "theme.bar.buttons.icon": "#FFD700",
   "theme.bar.buttons.text": "#00FFFF",
@@ -342,5 +332,10 @@
   "theme.bar.buttons.media.border": "#FFD700",
   "theme.bar.buttons.windowtitle.border": "#5bafff",
   "theme.bar.buttons.workspaces.border": "#e23ee2",
-  "theme.bar.buttons.dashboard.border": "#f7d04b"
+  "theme.bar.buttons.dashboard.border": "#f7d04b",
+  "theme.bar.buttons.modules.submap.background": "#121212",
+  "theme.bar.buttons.modules.submap.text": "#FF69B4",
+  "theme.bar.buttons.modules.submap.border": "#FF69B4",
+  "theme.bar.buttons.modules.submap.icon": "#121212",
+  "theme.bar.buttons.modules.submap.icon_background": "#FF69B4"
 }
\ No newline at end of file
diff --git a/themes/dracula.json b/themes/dracula.json
index 6d48f7e..1bada5f 100644
--- a/themes/dracula.json
+++ b/themes/dracula.json
@@ -332,5 +332,10 @@
   "theme.notification.label": "#bd93f9",
   "theme.notification.actions.text": "#282a36",
   "theme.notification.actions.background": "#bd93f9",
-  "theme.notification.background": "#282a36"
+  "theme.notification.background": "#282a36",
+  "theme.bar.buttons.modules.submap.background": "#44475a",
+  "theme.bar.buttons.modules.submap.text": "#8be9fd",
+  "theme.bar.buttons.modules.submap.border": "#8be9fd",
+  "theme.bar.buttons.modules.submap.icon": "#8be9fd",
+  "theme.bar.buttons.modules.submap.icon_background": "#44475a"
 }
\ No newline at end of file
diff --git a/themes/dracula_split.json b/themes/dracula_split.json
index 2f9a01c..5c5263c 100644
--- a/themes/dracula_split.json
+++ b/themes/dracula_split.json
@@ -332,5 +332,10 @@
   "theme.notification.label": "#bd93f9",
   "theme.notification.actions.text": "#282a36",
   "theme.notification.actions.background": "#bd93f9",
-  "theme.notification.background": "#44475a"
+  "theme.notification.background": "#44475a",
+  "theme.bar.buttons.modules.submap.background": "#44475a",
+  "theme.bar.buttons.modules.submap.text": "#8be9fd",
+  "theme.bar.buttons.modules.submap.border": "#8be9fd",
+  "theme.bar.buttons.modules.submap.icon": "#282936",
+  "theme.bar.buttons.modules.submap.icon_background": "#8be9fd"
 }
\ No newline at end of file
diff --git a/themes/everforest.json b/themes/everforest.json
index 706efe3..4789eb4 100644
--- a/themes/everforest.json
+++ b/themes/everforest.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#2f383e",
   "theme.bar.buttons.notifications.total": "#83c092",
   "theme.bar.buttons.notifications.icon": "#83c092",
-  "theme.bar.buttons.notifications.hover": "#454b53",
   "theme.bar.buttons.notifications.background": "#323d43",
   "theme.bar.buttons.clock.icon": "#dbbc7f",
   "theme.bar.buttons.clock.text": "#dbbc7f",
-  "theme.bar.buttons.clock.hover": "#454b53",
   "theme.bar.buttons.clock.background": "#323d43",
   "theme.bar.buttons.battery.icon": "#e69875",
   "theme.bar.buttons.battery.text": "#e69875",
-  "theme.bar.buttons.battery.hover": "#454b53",
   "theme.bar.buttons.battery.background": "#323d43",
-  "theme.bar.buttons.systray.hover": "#454b53",
   "theme.bar.buttons.systray.background": "#323d43",
   "theme.bar.buttons.bluetooth.icon": "#a7c080",
   "theme.bar.buttons.bluetooth.text": "#a7c080",
-  "theme.bar.buttons.bluetooth.hover": "#454b53",
   "theme.bar.buttons.bluetooth.background": "#323d43",
   "theme.bar.buttons.network.icon": "#e69875",
   "theme.bar.buttons.network.text": "#e69875",
-  "theme.bar.buttons.network.hover": "#454b53",
   "theme.bar.buttons.network.background": "#323d43",
   "theme.bar.buttons.volume.icon": "#dbbc7f",
   "theme.bar.buttons.volume.text": "#dbbc7f",
-  "theme.bar.buttons.volume.hover": "#454b53",
   "theme.bar.buttons.volume.background": "#323d43",
-  "theme.bar.buttons.media.hover": "#454b53",
   "theme.bar.buttons.windowtitle.icon": "#dbbc7f",
   "theme.bar.buttons.windowtitle.text": "#dbbc7f",
-  "theme.bar.buttons.windowtitle.hover": "#454b53",
   "theme.bar.buttons.windowtitle.background": "#323d43",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#2b3339",
   "theme.bar.buttons.workspaces.active": "#dbbc7f",
   "theme.bar.buttons.workspaces.occupied": "#e69875",
   "theme.bar.buttons.workspaces.available": "#a7c080",
   "theme.bar.buttons.workspaces.hover": "#454b53",
   "theme.bar.buttons.workspaces.background": "#323d43",
   "theme.bar.buttons.dashboard.icon": "#e69875",
-  "theme.bar.buttons.dashboard.hover": "#454b53",
   "theme.bar.buttons.dashboard.background": "#323d43",
   "theme.osd.label": "#d3c6aa",
   "theme.osd.icon": "#2b3339",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#a7c080",
   "theme.bar.buttons.windowtitle.border": "#dbbc7f",
   "theme.bar.buttons.workspaces.border": "#2b3339",
-  "theme.bar.buttons.dashboard.border": "#e69875"
+  "theme.bar.buttons.dashboard.border": "#e69875",
+  "theme.bar.buttons.modules.submap.background": "#323d43",
+  "theme.bar.buttons.modules.submap.text": "#83c092",
+  "theme.bar.buttons.modules.submap.border": "#83c092",
+  "theme.bar.buttons.modules.submap.icon": "#83c092",
+  "theme.bar.buttons.modules.submap.icon_background": "#323d43"
 }
\ No newline at end of file
diff --git a/themes/everforest_split.json b/themes/everforest_split.json
index 9995806..9f362f4 100644
--- a/themes/everforest_split.json
+++ b/themes/everforest_split.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#2f383e",
   "theme.bar.buttons.notifications.total": "#83c092",
   "theme.bar.buttons.notifications.icon": "#323d43",
-  "theme.bar.buttons.notifications.hover": "#454b53",
   "theme.bar.buttons.notifications.background": "#323d43",
   "theme.bar.buttons.clock.icon": "#323d43",
   "theme.bar.buttons.clock.text": "#dbbc7f",
-  "theme.bar.buttons.clock.hover": "#454b53",
   "theme.bar.buttons.clock.background": "#323d43",
   "theme.bar.buttons.battery.icon": "#323d43",
   "theme.bar.buttons.battery.text": "#e69875",
-  "theme.bar.buttons.battery.hover": "#454b53",
   "theme.bar.buttons.battery.background": "#323d43",
-  "theme.bar.buttons.systray.hover": "#454b53",
   "theme.bar.buttons.systray.background": "#323d43",
   "theme.bar.buttons.bluetooth.icon": "#323d43",
   "theme.bar.buttons.bluetooth.text": "#a7c080",
-  "theme.bar.buttons.bluetooth.hover": "#454b53",
   "theme.bar.buttons.bluetooth.background": "#323d43",
   "theme.bar.buttons.network.icon": "#323d43",
   "theme.bar.buttons.network.text": "#e69875",
-  "theme.bar.buttons.network.hover": "#454b53",
   "theme.bar.buttons.network.background": "#323d43",
   "theme.bar.buttons.volume.icon": "#323d43",
   "theme.bar.buttons.volume.text": "#dbbc7f",
-  "theme.bar.buttons.volume.hover": "#454b53",
   "theme.bar.buttons.volume.background": "#323d43",
-  "theme.bar.buttons.media.hover": "#454b53",
   "theme.bar.buttons.windowtitle.icon": "#323d43",
   "theme.bar.buttons.windowtitle.text": "#dbbc7f",
-  "theme.bar.buttons.windowtitle.hover": "#454b53",
   "theme.bar.buttons.windowtitle.background": "#323d43",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#2b3339",
   "theme.bar.buttons.workspaces.active": "#dbbc7f",
   "theme.bar.buttons.workspaces.occupied": "#e69875",
   "theme.bar.buttons.workspaces.available": "#a7c080",
   "theme.bar.buttons.workspaces.hover": "#dbbc7f",
   "theme.bar.buttons.workspaces.background": "#323d43",
   "theme.bar.buttons.dashboard.icon": "#323d43",
-  "theme.bar.buttons.dashboard.hover": "#454b53",
   "theme.bar.buttons.dashboard.background": "#e69875",
   "theme.osd.label": "#d3c6aa",
   "theme.osd.icon": "#2b3339",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#a7c080",
   "theme.bar.buttons.windowtitle.border": "#dbbc7f",
   "theme.bar.buttons.workspaces.border": "#2b3339",
-  "theme.bar.buttons.dashboard.border": "#e69875"
+  "theme.bar.buttons.dashboard.border": "#e69875",
+  "theme.bar.buttons.modules.submap.background": "#323d43",
+  "theme.bar.buttons.modules.submap.text": "#83c092",
+  "theme.bar.buttons.modules.submap.border": "#83c092",
+  "theme.bar.buttons.modules.submap.icon": "#21252b",
+  "theme.bar.buttons.modules.submap.icon_background": "#83c092"
 }
\ No newline at end of file
diff --git a/themes/gruvbox.json b/themes/gruvbox.json
index dc071ab..b6b4a9d 100644
--- a/themes/gruvbox.json
+++ b/themes/gruvbox.json
@@ -251,44 +251,35 @@
   "theme.bar.buttons.notifications.total": "#83a598",
   "theme.bar.buttons.notifications.icon_background": "#83a598",
   "theme.bar.buttons.notifications.icon": "#83a598",
-  "theme.bar.buttons.notifications.hover": "#504945",
   "theme.bar.buttons.notifications.background": "#282828",
   "theme.bar.buttons.clock.icon_background": "#d3869b",
   "theme.bar.buttons.clock.icon": "#d3869b",
   "theme.bar.buttons.clock.text": "#d3869b",
-  "theme.bar.buttons.clock.hover": "#504945",
   "theme.bar.buttons.clock.background": "#282828",
   "theme.bar.buttons.battery.icon_background": "#fabd2f",
   "theme.bar.buttons.battery.icon": "#fabd2f",
   "theme.bar.buttons.battery.text": "#fabd2f",
-  "theme.bar.buttons.battery.hover": "#504945",
   "theme.bar.buttons.battery.background": "#282828",
-  "theme.bar.buttons.systray.hover": "#504945",
   "theme.bar.buttons.systray.background": "#282828",
   "theme.bar.buttons.bluetooth.icon_background": "#83a598",
   "theme.bar.buttons.bluetooth.icon": "#83a598",
   "theme.bar.buttons.bluetooth.text": "#83a598",
-  "theme.bar.buttons.bluetooth.hover": "#504945",
   "theme.bar.buttons.bluetooth.background": "#282828",
   "theme.bar.buttons.network.icon_background": "#b16286",
   "theme.bar.buttons.network.icon": "#b16286",
   "theme.bar.buttons.network.text": "#b16286",
-  "theme.bar.buttons.network.hover": "#504945",
   "theme.bar.buttons.network.background": "#282828",
   "theme.bar.buttons.volume.icon_background": "#fe8018",
   "theme.bar.buttons.volume.icon": "#fe8018",
   "theme.bar.buttons.volume.text": "#fe8018",
-  "theme.bar.buttons.volume.hover": "#504945",
   "theme.bar.buttons.volume.background": "#282828",
   "theme.bar.buttons.media.icon_background": "#83a598",
   "theme.bar.buttons.media.icon": "#83a598",
   "theme.bar.buttons.media.text": "#83a598",
-  "theme.bar.buttons.media.hover": "#504945",
   "theme.bar.buttons.media.background": "#282828",
   "theme.bar.buttons.windowtitle.icon_background": "#d3869b",
   "theme.bar.buttons.windowtitle.icon": "#d3869b",
   "theme.bar.buttons.windowtitle.text": "#d3869b",
-  "theme.bar.buttons.windowtitle.hover": "#504945",
   "theme.bar.buttons.windowtitle.background": "#282828",
   "theme.bar.buttons.workspaces.numbered_active_underline_color": "#ffffff",
   "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#21252b",
@@ -298,7 +289,6 @@
   "theme.bar.buttons.workspaces.hover": "#504945",
   "theme.bar.buttons.workspaces.background": "#282828",
   "theme.bar.buttons.dashboard.icon": "#fabd2f",
-  "theme.bar.buttons.dashboard.hover": "#504945",
   "theme.bar.buttons.dashboard.background": "#282828",
   "theme.bar.buttons.icon": "#83a598",
   "theme.bar.buttons.text": "#83a598",
@@ -342,5 +332,10 @@
   "theme.bar.buttons.media.border": "#83a598",
   "theme.bar.buttons.windowtitle.border": "#d3869b",
   "theme.bar.buttons.workspaces.border": "#ffffff",
-  "theme.bar.buttons.dashboard.border": "#fabd2f"
+  "theme.bar.buttons.dashboard.border": "#fabd2f",
+  "theme.bar.buttons.modules.submap.background": "#282828",
+  "theme.bar.buttons.modules.submap.text": "#8ec07c",
+  "theme.bar.buttons.modules.submap.border": "#8ec07c",
+  "theme.bar.buttons.modules.submap.icon": "#8ec07c",
+  "theme.bar.buttons.modules.submap.icon_background": "#282828"
 }
\ No newline at end of file
diff --git a/themes/gruvbox_split.json b/themes/gruvbox_split.json
index 8c61370..e41ab29 100644
--- a/themes/gruvbox_split.json
+++ b/themes/gruvbox_split.json
@@ -251,44 +251,35 @@
   "theme.bar.buttons.notifications.total": "#83a598",
   "theme.bar.buttons.notifications.icon_background": "#83a598",
   "theme.bar.buttons.notifications.icon": "#282828",
-  "theme.bar.buttons.notifications.hover": "#504945",
   "theme.bar.buttons.notifications.background": "#282828",
   "theme.bar.buttons.clock.icon_background": "#d3869b",
   "theme.bar.buttons.clock.icon": "#282828",
   "theme.bar.buttons.clock.text": "#d3869b",
-  "theme.bar.buttons.clock.hover": "#504945",
   "theme.bar.buttons.clock.background": "#282828",
   "theme.bar.buttons.battery.icon_background": "#fabd2f",
   "theme.bar.buttons.battery.icon": "#282828",
   "theme.bar.buttons.battery.text": "#fabd2f",
-  "theme.bar.buttons.battery.hover": "#504945",
   "theme.bar.buttons.battery.background": "#282828",
-  "theme.bar.buttons.systray.hover": "#504945",
   "theme.bar.buttons.systray.background": "#282828",
   "theme.bar.buttons.bluetooth.icon_background": "#83a598",
   "theme.bar.buttons.bluetooth.icon": "#282828",
   "theme.bar.buttons.bluetooth.text": "#83a598",
-  "theme.bar.buttons.bluetooth.hover": "#504945",
   "theme.bar.buttons.bluetooth.background": "#282828",
   "theme.bar.buttons.network.icon_background": "#b16286",
   "theme.bar.buttons.network.icon": "#282828",
   "theme.bar.buttons.network.text": "#b16286",
-  "theme.bar.buttons.network.hover": "#504945",
   "theme.bar.buttons.network.background": "#282828",
   "theme.bar.buttons.volume.icon_background": "#fe8018",
   "theme.bar.buttons.volume.icon": "#282828",
   "theme.bar.buttons.volume.text": "#fe8018",
-  "theme.bar.buttons.volume.hover": "#504945",
   "theme.bar.buttons.volume.background": "#282828",
   "theme.bar.buttons.media.icon_background": "#83a598",
   "theme.bar.buttons.media.icon": "#282828",
   "theme.bar.buttons.media.text": "#83a598",
-  "theme.bar.buttons.media.hover": "#504945",
   "theme.bar.buttons.media.background": "#282828",
   "theme.bar.buttons.windowtitle.icon_background": "#d3869b",
   "theme.bar.buttons.windowtitle.icon": "#282828",
   "theme.bar.buttons.windowtitle.text": "#d3869b",
-  "theme.bar.buttons.windowtitle.hover": "#504945",
   "theme.bar.buttons.windowtitle.background": "#282828",
   "theme.bar.buttons.workspaces.numbered_active_underline_color": "#ffffff",
   "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#21252b",
@@ -298,7 +289,6 @@
   "theme.bar.buttons.workspaces.hover": "#d3869b",
   "theme.bar.buttons.workspaces.background": "#282828",
   "theme.bar.buttons.dashboard.icon": "#282828",
-  "theme.bar.buttons.dashboard.hover": "#504945",
   "theme.bar.buttons.dashboard.background": "#fabc2f",
   "theme.bar.buttons.icon": "#83a598",
   "theme.bar.buttons.text": "#83a598",
@@ -342,5 +332,10 @@
   "theme.bar.buttons.media.border": "#83a598",
   "theme.bar.buttons.windowtitle.border": "#d3869b",
   "theme.bar.buttons.workspaces.border": "#ffffff",
-  "theme.bar.buttons.dashboard.border": "#fabd2f"
+  "theme.bar.buttons.dashboard.border": "#fabd2f",
+  "theme.bar.buttons.modules.submap.background": "#282828",
+  "theme.bar.buttons.modules.submap.text": "#8ec07c",
+  "theme.bar.buttons.modules.submap.border": "#8ec07c",
+  "theme.bar.buttons.modules.submap.icon": "#21252b",
+  "theme.bar.buttons.modules.submap.icon_background": "#8ec07c"
 }
\ No newline at end of file
diff --git a/themes/monochrome.json b/themes/monochrome.json
index 46fb203..86cb70b 100644
--- a/themes/monochrome.json
+++ b/themes/monochrome.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#111111",
   "theme.bar.buttons.notifications.total": "#FFFFFF",
   "theme.bar.buttons.notifications.icon": "#FFFFFF",
-  "theme.bar.buttons.notifications.hover": "#444444",
   "theme.bar.buttons.notifications.background": "#090909",
   "theme.bar.buttons.clock.icon": "#FFFFFF",
   "theme.bar.buttons.clock.text": "#FFFFFF",
-  "theme.bar.buttons.clock.hover": "#444444",
   "theme.bar.buttons.clock.background": "#090909",
   "theme.bar.buttons.battery.icon": "#FFFFFF",
   "theme.bar.buttons.battery.text": "#FFFFFF",
-  "theme.bar.buttons.battery.hover": "#444444",
   "theme.bar.buttons.battery.background": "#090909",
-  "theme.bar.buttons.systray.hover": "#444444",
   "theme.bar.buttons.systray.background": "#090909",
   "theme.bar.buttons.bluetooth.icon": "#FFFFFF",
   "theme.bar.buttons.bluetooth.text": "#FFFFFF",
-  "theme.bar.buttons.bluetooth.hover": "#444444",
   "theme.bar.buttons.bluetooth.background": "#090909",
   "theme.bar.buttons.network.icon": "#FFFFFF",
   "theme.bar.buttons.network.text": "#FFFFFF",
-  "theme.bar.buttons.network.hover": "#444444",
   "theme.bar.buttons.network.background": "#090909",
   "theme.bar.buttons.volume.icon": "#FFFFFF",
   "theme.bar.buttons.volume.text": "#FFFFFF",
-  "theme.bar.buttons.volume.hover": "#444444",
   "theme.bar.buttons.volume.background": "#090909",
-  "theme.bar.buttons.media.hover": "#444444",
   "theme.bar.buttons.windowtitle.icon": "#FFFFFF",
   "theme.bar.buttons.windowtitle.text": "#FFFFFF",
-  "theme.bar.buttons.windowtitle.hover": "#444444",
   "theme.bar.buttons.windowtitle.background": "#090909",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#000000",
   "theme.bar.buttons.workspaces.active": "#FFFFFF",
   "theme.bar.buttons.workspaces.occupied": "#FFFFFF",
   "theme.bar.buttons.workspaces.available": "#FFFFFF",
   "theme.bar.buttons.workspaces.hover": "#444444",
   "theme.bar.buttons.workspaces.background": "#090909",
   "theme.bar.buttons.dashboard.icon": "#FFFFFF",
-  "theme.bar.buttons.dashboard.hover": "#444444",
   "theme.bar.buttons.dashboard.background": "#090909",
   "theme.osd.label": "#FFFFFF",
   "theme.osd.icon": "#000000",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#FFFFFF",
   "theme.bar.buttons.windowtitle.border": "#FFFFFF",
   "theme.bar.buttons.workspaces.border": "#FFFFFF",
-  "theme.bar.buttons.dashboard.border": "#FFFFFF"
+  "theme.bar.buttons.dashboard.border": "#FFFFFF",
+  "theme.bar.buttons.modules.submap.background": "#090909",
+  "theme.bar.buttons.modules.submap.text": "#FFFFFF",
+  "theme.bar.buttons.modules.submap.border": "#FFFFFF",
+  "theme.bar.buttons.modules.submap.icon": "#FFFFFF",
+  "theme.bar.buttons.modules.submap.icon_background": "#090909"
 }
\ No newline at end of file
diff --git a/themes/monochrome_split.json b/themes/monochrome_split.json
index 89ae254..111c155 100644
--- a/themes/monochrome_split.json
+++ b/themes/monochrome_split.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#111111",
   "theme.bar.buttons.notifications.total": "#FFFFFF",
   "theme.bar.buttons.notifications.icon": "#090909",
-  "theme.bar.buttons.notifications.hover": "#444444",
   "theme.bar.buttons.notifications.background": "#090909",
   "theme.bar.buttons.clock.icon": "#000000",
   "theme.bar.buttons.clock.text": "#FFFFFF",
-  "theme.bar.buttons.clock.hover": "#444444",
   "theme.bar.buttons.clock.background": "#090909",
   "theme.bar.buttons.battery.icon": "#090909",
   "theme.bar.buttons.battery.text": "#FFFFFF",
-  "theme.bar.buttons.battery.hover": "#444444",
   "theme.bar.buttons.battery.background": "#090909",
-  "theme.bar.buttons.systray.hover": "#444444",
   "theme.bar.buttons.systray.background": "#090909",
   "theme.bar.buttons.bluetooth.icon": "#090909",
   "theme.bar.buttons.bluetooth.text": "#FFFFFF",
-  "theme.bar.buttons.bluetooth.hover": "#444444",
   "theme.bar.buttons.bluetooth.background": "#090909",
   "theme.bar.buttons.network.icon": "#090909",
   "theme.bar.buttons.network.text": "#FFFFFF",
-  "theme.bar.buttons.network.hover": "#444444",
   "theme.bar.buttons.network.background": "#090909",
   "theme.bar.buttons.volume.icon": "#090909",
   "theme.bar.buttons.volume.text": "#FFFFFF",
-  "theme.bar.buttons.volume.hover": "#444444",
   "theme.bar.buttons.volume.background": "#090909",
-  "theme.bar.buttons.media.hover": "#444444",
   "theme.bar.buttons.windowtitle.icon": "#090909",
   "theme.bar.buttons.windowtitle.text": "#FFFFFF",
-  "theme.bar.buttons.windowtitle.hover": "#444444",
   "theme.bar.buttons.windowtitle.background": "#090909",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#000000",
   "theme.bar.buttons.workspaces.active": "#FFFFFF",
   "theme.bar.buttons.workspaces.occupied": "#FFFFFF",
   "theme.bar.buttons.workspaces.available": "#FFFFFF",
   "theme.bar.buttons.workspaces.hover": "#444444",
   "theme.bar.buttons.workspaces.background": "#090909",
   "theme.bar.buttons.dashboard.icon": "#000000",
-  "theme.bar.buttons.dashboard.hover": "#444444",
   "theme.bar.buttons.dashboard.background": "#ffffff",
   "theme.osd.label": "#FFFFFF",
   "theme.osd.icon": "#000000",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#FFFFFF",
   "theme.bar.buttons.windowtitle.border": "#FFFFFF",
   "theme.bar.buttons.workspaces.border": "#FFFFFF",
-  "theme.bar.buttons.dashboard.border": "#FFFFFF"
+  "theme.bar.buttons.dashboard.border": "#FFFFFF",
+  "theme.bar.buttons.modules.submap.background": "#090909",
+  "theme.bar.buttons.modules.submap.text": "#FFFFFF",
+  "theme.bar.buttons.modules.submap.border": "#FFFFFF",
+  "theme.bar.buttons.modules.submap.icon": "#21252b",
+  "theme.bar.buttons.modules.submap.icon_background": "#FFFFFF"
 }
\ No newline at end of file
diff --git a/themes/nord.json b/themes/nord.json
index 5305885..3f9159b 100644
--- a/themes/nord.json
+++ b/themes/nord.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#3b4252",
   "theme.bar.buttons.notifications.total": "#88c0d0",
   "theme.bar.buttons.notifications.icon": "#88c0d0",
-  "theme.bar.buttons.notifications.hover": "#434c53",
   "theme.bar.buttons.notifications.background": "#3b4252",
   "theme.bar.buttons.clock.icon": "#8fbcbb",
   "theme.bar.buttons.clock.text": "#8fbcbb",
-  "theme.bar.buttons.clock.hover": "#434c53",
   "theme.bar.buttons.clock.background": "#3b4252",
   "theme.bar.buttons.battery.icon": "#81a1c1",
   "theme.bar.buttons.battery.text": "#81a1c1",
-  "theme.bar.buttons.battery.hover": "#434c53",
   "theme.bar.buttons.battery.background": "#3b4252",
-  "theme.bar.buttons.systray.hover": "#434c53",
   "theme.bar.buttons.systray.background": "#3b4252",
   "theme.bar.buttons.bluetooth.icon": "#88c0d0",
   "theme.bar.buttons.bluetooth.text": "#88c0d0",
-  "theme.bar.buttons.bluetooth.hover": "#434c53",
   "theme.bar.buttons.bluetooth.background": "#3b4252",
   "theme.bar.buttons.network.icon": "#88c0d0",
   "theme.bar.buttons.network.text": "#88c0d0",
-  "theme.bar.buttons.network.hover": "#434c53",
   "theme.bar.buttons.network.background": "#3b4252",
   "theme.bar.buttons.volume.icon": "#81a1c1",
   "theme.bar.buttons.volume.text": "#81a1c1",
-  "theme.bar.buttons.volume.hover": "#434c53",
   "theme.bar.buttons.volume.background": "#3b4252",
-  "theme.bar.buttons.media.hover": "#434c53",
   "theme.bar.buttons.windowtitle.icon": "#8fbcbb",
   "theme.bar.buttons.windowtitle.text": "#8fbcbb",
-  "theme.bar.buttons.windowtitle.hover": "#434c53",
   "theme.bar.buttons.windowtitle.background": "#3b4252",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#2e3440",
   "theme.bar.buttons.workspaces.active": "#8fbcbb",
   "theme.bar.buttons.workspaces.occupied": "#81a1c1",
   "theme.bar.buttons.workspaces.available": "#88c0d0",
   "theme.bar.buttons.workspaces.hover": "#434c53",
   "theme.bar.buttons.workspaces.background": "#3b4252",
   "theme.bar.buttons.dashboard.icon": "#81a1c1",
-  "theme.bar.buttons.dashboard.hover": "#434c53",
   "theme.bar.buttons.dashboard.background": "#3b4252",
   "theme.osd.label": "#88c0d0",
   "theme.osd.icon": "#2e3440",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#88c0d0",
   "theme.bar.buttons.windowtitle.border": "#8fbcbb",
   "theme.bar.buttons.workspaces.border": "#2e3440",
-  "theme.bar.buttons.dashboard.border": "#81a1c1"
+  "theme.bar.buttons.dashboard.border": "#81a1c1",
+  "theme.bar.buttons.modules.submap.background": "#3b4252",
+  "theme.bar.buttons.modules.submap.text": "#8fbcbb",
+  "theme.bar.buttons.modules.submap.border": "#8fbcbb",
+  "theme.bar.buttons.modules.submap.icon": "#8fbcbb",
+  "theme.bar.buttons.modules.submap.icon_background": "#3b4252"
 }
\ No newline at end of file
diff --git a/themes/nord_split.json b/themes/nord_split.json
index 0a1a7ef..9541e84 100644
--- a/themes/nord_split.json
+++ b/themes/nord_split.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#3b4252",
   "theme.bar.buttons.notifications.total": "#88c0d0",
   "theme.bar.buttons.notifications.icon": "#3b4252",
-  "theme.bar.buttons.notifications.hover": "#434c53",
   "theme.bar.buttons.notifications.background": "#3b4252",
   "theme.bar.buttons.clock.icon": "#3b4252",
   "theme.bar.buttons.clock.text": "#8fbcbb",
-  "theme.bar.buttons.clock.hover": "#434c53",
   "theme.bar.buttons.clock.background": "#3b4252",
   "theme.bar.buttons.battery.icon": "#3b4252",
   "theme.bar.buttons.battery.text": "#81a1c1",
-  "theme.bar.buttons.battery.hover": "#434c53",
   "theme.bar.buttons.battery.background": "#3b4252",
-  "theme.bar.buttons.systray.hover": "#434c53",
   "theme.bar.buttons.systray.background": "#3b4252",
   "theme.bar.buttons.bluetooth.icon": "#3b4252",
   "theme.bar.buttons.bluetooth.text": "#88c0d0",
-  "theme.bar.buttons.bluetooth.hover": "#434c53",
   "theme.bar.buttons.bluetooth.background": "#3b4252",
   "theme.bar.buttons.network.icon": "#3b4252",
   "theme.bar.buttons.network.text": "#88c0d0",
-  "theme.bar.buttons.network.hover": "#434c53",
   "theme.bar.buttons.network.background": "#3b4252",
   "theme.bar.buttons.volume.icon": "#3b4252",
   "theme.bar.buttons.volume.text": "#81a1c1",
-  "theme.bar.buttons.volume.hover": "#434c53",
   "theme.bar.buttons.volume.background": "#3b4252",
-  "theme.bar.buttons.media.hover": "#434c53",
   "theme.bar.buttons.windowtitle.icon": "#3b4252",
   "theme.bar.buttons.windowtitle.text": "#8fbcbb",
-  "theme.bar.buttons.windowtitle.hover": "#434c53",
   "theme.bar.buttons.windowtitle.background": "#3b4252",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#2e3440",
   "theme.bar.buttons.workspaces.active": "#8fbcbb",
   "theme.bar.buttons.workspaces.occupied": "#81a1c1",
   "theme.bar.buttons.workspaces.available": "#88c0d0",
   "theme.bar.buttons.workspaces.hover": "#8fbcbb",
   "theme.bar.buttons.workspaces.background": "#3b4252",
   "theme.bar.buttons.dashboard.icon": "#3b4252",
-  "theme.bar.buttons.dashboard.hover": "#434c53",
   "theme.bar.buttons.dashboard.background": "#81a1c1",
   "theme.osd.label": "#88c0d0",
   "theme.osd.icon": "#2e3440",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#88c0d0",
   "theme.bar.buttons.windowtitle.border": "#8fbcbb",
   "theme.bar.buttons.workspaces.border": "#2e3440",
-  "theme.bar.buttons.dashboard.border": "#81a1c1"
+  "theme.bar.buttons.dashboard.border": "#81a1c1",
+  "theme.bar.buttons.modules.submap.background": "#3b4252",
+  "theme.bar.buttons.modules.submap.text": "#8fbcbb",
+  "theme.bar.buttons.modules.submap.border": "#8fbcbb",
+  "theme.bar.buttons.modules.submap.icon": "#21252b",
+  "theme.bar.buttons.modules.submap.icon_background": "#8fbcbb"
 }
\ No newline at end of file
diff --git a/themes/one_dark.json b/themes/one_dark.json
index f8e02a3..8c58b2a 100644
--- a/themes/one_dark.json
+++ b/themes/one_dark.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#21252b",
   "theme.bar.buttons.notifications.total": "#61afef",
   "theme.bar.buttons.notifications.icon": "#61afef",
-  "theme.bar.buttons.notifications.hover": "#4b5263",
   "theme.bar.buttons.notifications.background": "#21252b",
   "theme.bar.buttons.clock.icon": "#98c379",
   "theme.bar.buttons.clock.text": "#98c379",
-  "theme.bar.buttons.clock.hover": "#4b5263",
   "theme.bar.buttons.clock.background": "#21252b",
   "theme.bar.buttons.battery.icon": "#e5c07b",
   "theme.bar.buttons.battery.text": "#e5c07b",
-  "theme.bar.buttons.battery.hover": "#4b5263",
   "theme.bar.buttons.battery.background": "#21252b",
-  "theme.bar.buttons.systray.hover": "#4b5263",
   "theme.bar.buttons.systray.background": "#21252b",
   "theme.bar.buttons.bluetooth.icon": "#61afef",
   "theme.bar.buttons.bluetooth.text": "#61afef",
-  "theme.bar.buttons.bluetooth.hover": "#4b5263",
   "theme.bar.buttons.bluetooth.background": "#21252b",
   "theme.bar.buttons.network.icon": "#c678dd",
   "theme.bar.buttons.network.text": "#c678dd",
-  "theme.bar.buttons.network.hover": "#4b5263",
   "theme.bar.buttons.network.background": "#21252b",
   "theme.bar.buttons.volume.icon": "#e06c75",
   "theme.bar.buttons.volume.text": "#e06c75",
-  "theme.bar.buttons.volume.hover": "#4b5263",
   "theme.bar.buttons.volume.background": "#21252b",
-  "theme.bar.buttons.media.hover": "#4b5263",
   "theme.bar.buttons.windowtitle.icon": "#98c379",
   "theme.bar.buttons.windowtitle.text": "#98c379",
-  "theme.bar.buttons.windowtitle.hover": "#4b5263",
   "theme.bar.buttons.windowtitle.background": "#21252b",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#282c34",
   "theme.bar.buttons.workspaces.active": "#c678dd",
   "theme.bar.buttons.workspaces.occupied": "#e06c75",
   "theme.bar.buttons.workspaces.available": "#61afef",
   "theme.bar.buttons.workspaces.hover": "#3e4451",
   "theme.bar.buttons.workspaces.background": "#21252b",
   "theme.bar.buttons.dashboard.icon": "#e5c07b",
-  "theme.bar.buttons.dashboard.hover": "#3e4451",
   "theme.bar.buttons.dashboard.background": "#21252b",
   "theme.osd.label": "#61afef",
   "theme.osd.icon": "#282c34",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#61afef",
   "theme.bar.buttons.windowtitle.border": "#98c379",
   "theme.bar.buttons.workspaces.border": "#21252b",
-  "theme.bar.buttons.dashboard.border": "#e5c07b"
+  "theme.bar.buttons.dashboard.border": "#e5c07b",
+  "theme.bar.buttons.modules.submap.background": "#21252b",
+  "theme.bar.buttons.modules.submap.text": "#56b6c2",
+  "theme.bar.buttons.modules.submap.border": "#56b6c2",
+  "theme.bar.buttons.modules.submap.icon": "#56b6c2",
+  "theme.bar.buttons.modules.submap.icon_background": "#21252b"
 }
\ No newline at end of file
diff --git a/themes/one_dark_split.json b/themes/one_dark_split.json
index 666b8bc..7222e05 100644
--- a/themes/one_dark_split.json
+++ b/themes/one_dark_split.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#21252b",
   "theme.bar.buttons.notifications.total": "#61afef",
   "theme.bar.buttons.notifications.icon": "#21252b",
-  "theme.bar.buttons.notifications.hover": "#4b5263",
   "theme.bar.buttons.notifications.background": "#21252b",
   "theme.bar.buttons.clock.icon": "#21252b",
   "theme.bar.buttons.clock.text": "#98c379",
-  "theme.bar.buttons.clock.hover": "#4b5263",
   "theme.bar.buttons.clock.background": "#21252b",
   "theme.bar.buttons.battery.icon": "#21252b",
   "theme.bar.buttons.battery.text": "#e5c07b",
-  "theme.bar.buttons.battery.hover": "#4b5263",
   "theme.bar.buttons.battery.background": "#21252b",
-  "theme.bar.buttons.systray.hover": "#4b5263",
   "theme.bar.buttons.systray.background": "#21252b",
   "theme.bar.buttons.bluetooth.icon": "#21252b",
   "theme.bar.buttons.bluetooth.text": "#61afef",
-  "theme.bar.buttons.bluetooth.hover": "#4b5263",
   "theme.bar.buttons.bluetooth.background": "#21252b",
   "theme.bar.buttons.network.icon": "#21252b",
   "theme.bar.buttons.network.text": "#c678dd",
-  "theme.bar.buttons.network.hover": "#4b5263",
   "theme.bar.buttons.network.background": "#21252b",
   "theme.bar.buttons.volume.icon": "#21252b",
   "theme.bar.buttons.volume.text": "#e06c75",
-  "theme.bar.buttons.volume.hover": "#4b5263",
   "theme.bar.buttons.volume.background": "#21252b",
-  "theme.bar.buttons.media.hover": "#4b5263",
   "theme.bar.buttons.windowtitle.icon": "#21252b",
   "theme.bar.buttons.windowtitle.text": "#98c379",
-  "theme.bar.buttons.windowtitle.hover": "#4b5263",
   "theme.bar.buttons.windowtitle.background": "#21252b",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#282c34",
   "theme.bar.buttons.workspaces.active": "#c678dd",
   "theme.bar.buttons.workspaces.occupied": "#e06c75",
   "theme.bar.buttons.workspaces.available": "#61afef",
   "theme.bar.buttons.workspaces.hover": "#c678dd",
   "theme.bar.buttons.workspaces.background": "#21252b",
   "theme.bar.buttons.dashboard.icon": "#21252b",
-  "theme.bar.buttons.dashboard.hover": "#3e4451",
   "theme.bar.buttons.dashboard.background": "#e5c07b",
   "theme.osd.label": "#61afef",
   "theme.osd.icon": "#282c34",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#61afef",
   "theme.bar.buttons.windowtitle.border": "#98c379",
   "theme.bar.buttons.workspaces.border": "#21252b",
-  "theme.bar.buttons.dashboard.border": "#e5c07b"
+  "theme.bar.buttons.dashboard.border": "#e5c07b",
+  "theme.bar.buttons.modules.submap.background": "#21252b",
+  "theme.bar.buttons.modules.submap.text": "#56b6c2",
+  "theme.bar.buttons.modules.submap.border": "#56b6c2",
+  "theme.bar.buttons.modules.submap.icon": "#21252b",
+  "theme.bar.buttons.modules.submap.icon_background": "#56b6c2"
 }
\ No newline at end of file
diff --git a/themes/rose_pine.json b/themes/rose_pine.json
index 1adb467..9ccd0a0 100644
--- a/themes/rose_pine.json
+++ b/themes/rose_pine.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#21202e",
   "theme.bar.buttons.notifications.total": "#c4a7e7",
   "theme.bar.buttons.notifications.icon": "#c4a7e7",
-  "theme.bar.buttons.notifications.hover": "#26233a",
   "theme.bar.buttons.notifications.background": "#21202e",
   "theme.bar.buttons.clock.icon": "#c4a7e7",
   "theme.bar.buttons.clock.text": "#c4a7e7",
-  "theme.bar.buttons.clock.hover": "#26233a",
   "theme.bar.buttons.clock.background": "#21202e",
   "theme.bar.buttons.battery.icon": "#f6c177",
   "theme.bar.buttons.battery.text": "#f6c177",
-  "theme.bar.buttons.battery.hover": "#26233a",
   "theme.bar.buttons.battery.background": "#21202e",
-  "theme.bar.buttons.systray.hover": "#26233a",
   "theme.bar.buttons.systray.background": "#21202e",
   "theme.bar.buttons.bluetooth.icon": "#9ccfd8",
   "theme.bar.buttons.bluetooth.text": "#9ccfd8",
-  "theme.bar.buttons.bluetooth.hover": "#26233a",
   "theme.bar.buttons.bluetooth.background": "#21202e",
   "theme.bar.buttons.network.icon": "#c4a7e7",
   "theme.bar.buttons.network.text": "#c4a7e7",
-  "theme.bar.buttons.network.hover": "#26233a",
   "theme.bar.buttons.network.background": "#21202e",
   "theme.bar.buttons.volume.icon": "#eb6f92",
   "theme.bar.buttons.volume.text": "#eb6f92",
-  "theme.bar.buttons.volume.hover": "#26233a",
   "theme.bar.buttons.volume.background": "#21202e",
-  "theme.bar.buttons.media.hover": "#26233a",
   "theme.bar.buttons.windowtitle.icon": "#c4a7e7",
   "theme.bar.buttons.windowtitle.text": "#c4a7e7",
-  "theme.bar.buttons.windowtitle.hover": "#26233a",
   "theme.bar.buttons.windowtitle.background": "#21202e",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#1f1d2e",
   "theme.bar.buttons.workspaces.active": "#c4a7e7",
   "theme.bar.buttons.workspaces.occupied": "#eb6f92",
   "theme.bar.buttons.workspaces.available": "#9ccfd8",
   "theme.bar.buttons.workspaces.hover": "#26233a",
   "theme.bar.buttons.workspaces.background": "#21202e",
   "theme.bar.buttons.dashboard.icon": "#f6c177",
-  "theme.bar.buttons.dashboard.hover": "#26233a",
   "theme.bar.buttons.dashboard.background": "#21202e",
   "theme.osd.label": "#c4a7e7",
   "theme.osd.icon": "#191724",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#c4a7e7",
   "theme.bar.buttons.windowtitle.border": "#c4a7e7",
   "theme.bar.buttons.workspaces.border": "#1f1d2e",
-  "theme.bar.buttons.dashboard.border": "#f6c177"
+  "theme.bar.buttons.dashboard.border": "#f6c177",
+  "theme.bar.buttons.modules.submap.background": "#21202e",
+  "theme.bar.buttons.modules.submap.text": "#9ccfd8",
+  "theme.bar.buttons.modules.submap.border": "#9ccfd8",
+  "theme.bar.buttons.modules.submap.icon": "#9ccfd8",
+  "theme.bar.buttons.modules.submap.icon_background": "#21202e"
 }
\ No newline at end of file
diff --git a/themes/rose_pine_moon.json b/themes/rose_pine_moon.json
index b95c6fd..1c0a5ca 100644
--- a/themes/rose_pine_moon.json
+++ b/themes/rose_pine_moon.json
@@ -1,349 +1,341 @@
 {
-    "theme.bar.menus.background": "#232136",
-    "theme.bar.background": "#232136",
-    "theme.bar.buttons.media.icon": "#c4a7e7",
-    "theme.bar.buttons.media.text": "#c4a7e7",
-    "theme.bar.buttons.icon": "#c4a7e7",
-    "theme.bar.buttons.text": "#c4a7e7",
-    "theme.bar.buttons.hover": "#393552",
-    "theme.bar.buttons.background": "#2a283e",
-    "theme.bar.menus.text": "#e0def4",
-    "theme.bar.menus.border.color": "#2a273f",
-    "theme.bar.buttons.media.background": "#2a283e",
-    "theme.bar.menus.menu.volume.text": "#e0def4",
-    "theme.bar.menus.menu.volume.card.color": "#2a283e",
-    "theme.bar.menus.menu.volume.label.color": "#eb6f92",
-    "theme.bar.menus.popover.text": "#c4a7e7",
-    "theme.bar.menus.popover.background": "#2a273f",
-    "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#232136",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#e0def4",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#2a273f",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#232136",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#2a283e",
-    "theme.bar.menus.menu.notifications.switch.puck": "#393552",
-    "theme.bar.menus.menu.notifications.switch.disabled": "#2a273f",
-    "theme.bar.menus.menu.notifications.switch.enabled": "#c4a7e7",
-    "theme.bar.menus.menu.notifications.clear": "#eb6f92",
-    "theme.bar.menus.menu.notifications.switch_divider": "#393552",
-    "theme.bar.menus.menu.notifications.border": "#2a273f",
-    "theme.bar.menus.menu.notifications.card": "#2a283e",
-    "theme.bar.menus.menu.notifications.background": "#232136",
-    "theme.bar.menus.menu.notifications.no_notifications_label": "#2a273f",
-    "theme.bar.menus.menu.notifications.label": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.monitors.disk.label": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.monitors.gpu.label": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.monitors.gpu.bar": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.monitors.gpu.icon": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.monitors.ram.label": "#f6c177",
-    "theme.bar.menus.menu.dashboard.monitors.ram.bar": "#f6c177",
-    "theme.bar.menus.menu.dashboard.monitors.ram.icon": "#f6c177",
-    "theme.bar.menus.menu.dashboard.monitors.cpu.label": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.monitors.cpu.bar": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.monitors.cpu.icon": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.monitors.bar_background": "#393552",
-    "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#3e8eb0",
-    "theme.bar.menus.menu.dashboard.directories.right.top.color": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#f6c177",
-    "theme.bar.menus.menu.dashboard.directories.left.top.color": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.controls.input.text": "#2a273f",
-    "theme.bar.menus.menu.dashboard.controls.input.background": "#3e8eb0",
-    "theme.bar.menus.menu.dashboard.controls.volume.text": "#2a273f",
-    "theme.bar.menus.menu.dashboard.controls.volume.background": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.controls.notifications.text": "#2a273f",
-    "theme.bar.menus.menu.dashboard.controls.notifications.background": "#f6c177",
-    "theme.bar.menus.menu.dashboard.controls.bluetooth.text": "#2a273f",
-    "theme.bar.menus.menu.dashboard.controls.bluetooth.background": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.controls.wifi.text": "#2a273f",
-    "theme.bar.menus.menu.dashboard.controls.wifi.background": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.controls.disabled": "#44415a",
-    "theme.bar.menus.menu.dashboard.shortcuts.recording": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.shortcuts.text": "#2a273f",
-    "theme.bar.menus.menu.dashboard.shortcuts.background": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.powermenu.sleep": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.powermenu.logout": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.powermenu.restart": "#f6c177",
-    "theme.bar.menus.menu.dashboard.profile.name": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.border.color": "#2a273f",
-    "theme.bar.menus.menu.dashboard.background.color": "#232136",
-    "theme.bar.menus.menu.dashboard.card.color": "#2a283e",
-    "theme.bar.menus.menu.clock.weather.hourly.temperature": "#c4a7e7",
-    "theme.bar.menus.menu.clock.weather.hourly.icon": "#c4a7e7",
-    "theme.bar.menus.menu.clock.weather.hourly.time": "#c4a7e7",
-    "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#9ccfd8",
-    "theme.bar.menus.menu.clock.weather.thermometer.cold": "#3e8fb0",
-    "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#c4a7e7",
-    "theme.bar.menus.menu.clock.weather.thermometer.hot": "#f6c177",
-    "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#eb6f92",
-    "theme.bar.menus.menu.clock.weather.stats": "#c4a7e7",
-    "theme.bar.menus.menu.clock.weather.status": "#9ccfd8",
-    "theme.bar.menus.menu.clock.weather.temperature": "#e0def4",
-    "theme.bar.menus.menu.clock.weather.icon": "#c4a7e7",
-    "theme.bar.menus.menu.clock.calendar.contextdays": "#44415a",
-    "theme.bar.menus.menu.clock.calendar.days": "#e0def4",
-    "theme.bar.menus.menu.clock.calendar.currentday": "#c4a7e7",
-    "theme.bar.menus.menu.clock.calendar.paginator": "#c4a7e7",
-    "theme.bar.menus.menu.clock.calendar.weekdays": "#c4a7e7",
-    "theme.bar.menus.menu.clock.calendar.yearmonth": "#9ccfd8",
-    "theme.bar.menus.menu.clock.time.timeperiod": "#9ccfd8",
-    "theme.bar.menus.menu.clock.time.time": "#c4a7e7",
-    "theme.bar.menus.menu.clock.text": "#e0def4",
-    "theme.bar.menus.menu.clock.border.color": "#2a273f",
-    "theme.bar.menus.menu.clock.background.color": "#232136",
-    "theme.bar.menus.menu.clock.card.color": "#2a283e",
-    "theme.bar.menus.menu.battery.slider.puck": "#393552",
-    "theme.bar.menus.menu.battery.slider.backgroundhover": "#393552",
-    "theme.bar.menus.menu.battery.slider.background": "#44415a",
-    "theme.bar.menus.menu.battery.slider.primary": "#f6c177",
-    "theme.bar.menus.menu.battery.icons.active": "#f6c177",
-    "theme.bar.menus.menu.battery.icons.passive": "#56526e",
-    "theme.bar.menus.menu.battery.listitems.active": "#f6c177",
-    "theme.bar.menus.menu.battery.listitems.passive": "#e0def4",
-    "theme.bar.menus.menu.battery.text": "#e0def4",
-    "theme.bar.menus.menu.battery.label.color": "#f6c177",
-    "theme.bar.menus.menu.battery.border.color": "#2a273f",
-    "theme.bar.menus.menu.battery.background.color": "#232136",
-    "theme.bar.menus.menu.battery.card.color": "#2a283e",
-    "theme.bar.menus.menu.systray.dropdownmenu.divider": "#2a283e",
-    "theme.bar.menus.menu.systray.dropdownmenu.text": "#e0def4",
-    "theme.bar.menus.menu.systray.dropdownmenu.background": "#232136",
-    "theme.bar.menus.menu.bluetooth.iconbutton.active": "#9ccfd8",
-    "theme.bar.menus.menu.bluetooth.iconbutton.passive": "#e0def4",
-    "theme.bar.menus.menu.bluetooth.icons.active": "#9ccfd8",
-    "theme.bar.menus.menu.bluetooth.icons.passive": "#56526e",
-    "theme.bar.menus.menu.bluetooth.listitems.active": "#9ccfd8",
-    "theme.bar.menus.menu.bluetooth.listitems.passive": "#e0def4",
-    "theme.bar.menus.menu.bluetooth.switch.puck": "#393552",
-    "theme.bar.menus.menu.bluetooth.switch.disabled": "#2a273f",
-    "theme.bar.menus.menu.bluetooth.switch.enabled": "#9ccfd8",
-    "theme.bar.menus.menu.bluetooth.switch_divider": "#393552",
-    "theme.bar.menus.menu.bluetooth.status": "#393552",
-    "theme.bar.menus.menu.bluetooth.text": "#e0def4",
-    "theme.bar.menus.menu.bluetooth.label.color": "#9ccfd8",
-    "theme.bar.menus.menu.bluetooth.border.color": "#2a273f",
-    "theme.bar.menus.menu.bluetooth.background.color": "#232136",
-    "theme.bar.menus.menu.bluetooth.card.color": "#2a283e",
-    "theme.bar.menus.menu.network.iconbuttons.active": "#c4a7e7",
-    "theme.bar.menus.menu.network.iconbuttons.passive": "#e0def4",
-    "theme.bar.menus.menu.network.icons.active": "#c4a7e7",
-    "theme.bar.menus.menu.network.icons.passive": "#56526e",
-    "theme.bar.menus.menu.network.listitems.active": "#c4a7e7",
-    "theme.bar.menus.menu.network.listitems.passive": "#e0def4",
-    "theme.bar.menus.menu.network.status.color": "#393552",
-    "theme.bar.menus.menu.network.text": "#e0def4",
-    "theme.bar.menus.menu.network.label.color": "#c4a7e7",
-    "theme.bar.menus.menu.network.border.color": "#2a273f",
-    "theme.bar.menus.menu.network.background.color": "#232136",
-    "theme.bar.menus.menu.network.card.color": "#2a283e",
-    "theme.bar.menus.menu.volume.input_slider.puck": "#44415a",
-    "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#393552",
-    "theme.bar.menus.menu.volume.input_slider.background": "#44415a",
-    "theme.bar.menus.menu.volume.input_slider.primary": "#eb6f92",
-    "theme.bar.menus.menu.volume.audio_slider.puck": "#44415a",
-    "theme.bar.menus.menu.volume.audio_slider.backgroundhover": "#393552",
-    "theme.bar.menus.menu.volume.audio_slider.background": "#44415a",
-    "theme.bar.menus.menu.volume.audio_slider.primary": "#eb6f92",
-    "theme.bar.menus.menu.volume.icons.active": "#eb6f92",
-    "theme.bar.menus.menu.volume.icons.passive": "#56526e",
-    "theme.bar.menus.menu.volume.iconbutton.active": "#eb6f92",
-    "theme.bar.menus.menu.volume.iconbutton.passive": "#e0def4",
-    "theme.bar.menus.menu.volume.listitems.active": "#eb6f92",
-    "theme.bar.menus.menu.volume.listitems.passive": "#e0def4",
-    "theme.bar.menus.menu.volume.border.color": "#2a273f",
-    "theme.bar.menus.menu.volume.background.color": "#232136",
-    "theme.bar.menus.menu.media.slider.puck": "#393552",
-    "theme.bar.menus.menu.media.slider.backgroundhover": "#393552",
-    "theme.bar.menus.menu.media.slider.background": "#44415a",
-    "theme.bar.menus.menu.media.slider.primary": "#c4a7e7",
-    "theme.bar.menus.menu.media.buttons.text": "#232136",
-    "theme.bar.menus.menu.media.buttons.background": "#c4a7e7",
-    "theme.bar.menus.menu.media.buttons.enabled": "#9ccfd8",
-    "theme.bar.menus.menu.media.buttons.inactive": "#44415a",
-    "theme.bar.menus.menu.media.border.color": "#2a273f",
-    "theme.bar.menus.menu.media.background.color": "#232136",
-    "theme.bar.menus.menu.media.album": "#c4a7e7",
-    "theme.bar.menus.menu.media.artist": "#9ccfd8",
-    "theme.bar.menus.menu.media.song": "#c4a7e7",
-    "theme.bar.menus.tooltip.text": "#e0def4",
-    "theme.bar.menus.tooltip.background": "#232136",
-    "theme.bar.menus.dropdownmenu.divider": "#2a283e",
-    "theme.bar.menus.dropdownmenu.text": "#e0def4",
-    "theme.bar.menus.dropdownmenu.background": "#232136",
-    "theme.bar.menus.slider.puck": "#393552",
-    "theme.bar.menus.slider.backgroundhover": "#393552",
-    "theme.bar.menus.slider.background": "#44415a",
-    "theme.bar.menus.slider.primary": "#c4a7e7",
-    "theme.bar.menus.progressbar.background": "#393552",
-    "theme.bar.menus.progressbar.foreground": "#c4a7e7",
-    "theme.bar.menus.iconbuttons.active": "#c4a7e7",
-    "theme.bar.menus.iconbuttons.passive": "#e0def4",
-    "theme.bar.menus.buttons.text": "#2a273f",
-    "theme.bar.menus.buttons.disabled": "#44415a",
-    "theme.bar.menus.buttons.active": "#c4a7e7",
-    "theme.bar.menus.buttons.default": "#c4a7e7",
-    "theme.bar.menus.switch.puck": "#393552",
-    "theme.bar.menus.switch.disabled": "#2a273f",
-    "theme.bar.menus.switch.enabled": "#c4a7e7",
-    "theme.bar.menus.icons.active": "#c4a7e7",
-    "theme.bar.menus.icons.passive": "#44415a",
-    "theme.bar.menus.listitems.active": "#c4a7e7",
-    "theme.bar.menus.listitems.passive": "#e0def4",
-    "theme.bar.menus.label": "#c4a7e7",
-    "theme.bar.menus.feinttext": "#2a273f",
-    "theme.bar.menus.dimtext": "#44415a",
-    "theme.bar.menus.cards": "#2a283e",
-    "theme.bar.buttons.notifications.total": "#c4a7e7",
-    "theme.bar.buttons.notifications.icon": "#c4a7e7",
-    "theme.bar.buttons.notifications.hover": "#393552",
-    "theme.bar.buttons.notifications.background": "#2a283e",
-    "theme.bar.buttons.clock.icon": "#c4a7e7",
-    "theme.bar.buttons.clock.text": "#c4a7e7",
-    "theme.bar.buttons.clock.hover": "#393552",
-    "theme.bar.buttons.clock.background": "#2a283e",
-    "theme.bar.buttons.battery.icon": "#f6c177",
-    "theme.bar.buttons.battery.text": "#f6c177",
-    "theme.bar.buttons.battery.hover": "#393552",
-    "theme.bar.buttons.battery.background": "#2a283e",
-    "theme.bar.buttons.systray.hover": "#393552",
-    "theme.bar.buttons.systray.background": "#2a283e",
-    "theme.bar.buttons.bluetooth.icon": "#9ccfd8",
-    "theme.bar.buttons.bluetooth.text": "#9ccfd8",
-    "theme.bar.buttons.bluetooth.hover": "#393552",
-    "theme.bar.buttons.bluetooth.background": "#2a283e",
-    "theme.bar.buttons.network.icon": "#c4a7e7",
-    "theme.bar.buttons.network.text": "#c4a7e7",
-    "theme.bar.buttons.network.hover": "#393552",
-    "theme.bar.buttons.network.background": "#2a283e",
-    "theme.bar.buttons.volume.icon": "#eb6f92",
-    "theme.bar.buttons.volume.text": "#eb6f92",
-    "theme.bar.buttons.volume.hover": "#393552",
-    "theme.bar.buttons.volume.background": "#2a283e",
-    "theme.bar.buttons.media.hover": "#393552",
-    "theme.bar.buttons.windowtitle.icon": "#c4a7e7",
-    "theme.bar.buttons.windowtitle.text": "#c4a7e7",
-    "theme.bar.buttons.windowtitle.hover": "#393552",
-    "theme.bar.buttons.windowtitle.background": "#2a283e",
-    "theme.bar.buttons.workspaces.numbered_active_text_color": "#2a273f",
-    "theme.bar.buttons.workspaces.active": "#c4a7e7",
-    "theme.bar.buttons.workspaces.occupied": "#eb6f92",
-    "theme.bar.buttons.workspaces.available": "#9ccfd8",
-    "theme.bar.buttons.workspaces.hover": "#393552",
-    "theme.bar.buttons.workspaces.background": "#2a283e",
-    "theme.bar.buttons.dashboard.icon": "#f6c177",
-    "theme.bar.buttons.dashboard.hover": "#393552",
-    "theme.bar.buttons.dashboard.background": "#2a283e",
-    "theme.osd.label": "#c4a7e7",
-    "theme.osd.icon": "#232136",
-    "theme.osd.bar_overflow_color": "#eb6f92",
-    "theme.osd.bar_empty_color": "#2a273f",
-    "theme.osd.bar_color": "#c4a7e7",
-    "theme.osd.icon_container": "#c4a7e7",
-    "theme.osd.bar_container": "#232136",
-    "theme.notification.close_button.label": "#232136",
-    "theme.notification.close_button.background": "#eb6f92",
-    "theme.notification.labelicon": "#c4a7e7",
-    "theme.notification.text": "#e0def4",
-    "theme.notification.time": "#56526e",
-    "theme.notification.border": "#2a273f",
-    "theme.notification.label": "#c4a7e7",
-    "theme.notification.actions.text": "#2a273f",
-    "theme.notification.actions.background": "#c4a7e7",
-    "theme.notification.background": "#2a273f",
-    "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
-    "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
-    "theme.bar.menus.menu.media.card.color": "#2a283e",
-    "theme.bar.menus.check_radio_button.background": "#393452",
-    "theme.bar.menus.check_radio_button.active": "#c4a7e7",
-    "theme.bar.buttons.style": "default",
-    "theme.bar.menus.menu.notifications.pager.button": "#c4a7e7",
-    "theme.bar.menus.menu.notifications.scrollbar.color": "#c4a7e7",
-    "theme.bar.menus.menu.notifications.pager.label": "#56526e",
-    "theme.bar.menus.menu.notifications.pager.background": "#232136",
-    "theme.bar.buttons.modules.ram.icon": "#f6c177",
-    "theme.bar.buttons.modules.storage.icon_background": "#2a283e",
-    "theme.bar.menus.menu.power.card.color": "#2a283e",
-    "theme.bar.buttons.modules.storage.icon": "#c4a7e7",
-    "theme.bar.buttons.modules.weather.icon": "#c4a7e7",
-    "theme.bar.buttons.modules.power.icon": "#eb6f92",
-    "theme.bar.menus.menu.power.border.color": "#2a273f",
-    "theme.bar.buttons.modules.power.icon_background": "#2a283e",
-    "theme.bar.buttons.modules.cpu.icon": "#eb6f92",
-    "theme.bar.buttons.modules.kbLayout.icon_background": "#2a283e",
-    "theme.bar.buttons.modules.weather.text": "#c4a7e7",
-    "theme.bar.menus.menu.power.buttons.shutdown.icon": "#2a273f",
-    "theme.bar.buttons.modules.weather.icon_background": "#2a283e",
-    "theme.bar.menus.menu.power.buttons.shutdown.background": "#2a283e",
-    "theme.bar.buttons.modules.kbLayout.icon": "#9ccfd8",
-    "theme.bar.buttons.modules.ram.icon_background": "#2a283e",
-    "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#eb6f92",
-    "theme.bar.menus.menu.power.buttons.shutdown.text": "#eb6f92",
-    "theme.bar.buttons.modules.updates.icon_background": "#2a283e",
-    "theme.bar.menus.menu.power.background.color": "#232136",
-    "theme.bar.buttons.modules.netstat.icon": "#9ccfd8",
-    "theme.bar.buttons.modules.cpu.icon_background": "#2a283e",
-    "theme.bar.buttons.modules.updates.icon": "#3e8eb0",
-    "theme.bar.buttons.modules.netstat.icon_background": "#2a283e",
-    "theme.bar.buttons.clock.icon_background": "#c4a7e7",
-    "theme.bar.menus.popover.border": "#2a273f",
-    "theme.bar.buttons.volume.icon_background": "#eb6f92",
-    "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#9ccfd8",
-    "theme.bar.menus.menu.power.buttons.restart.text": "#f6c177",
-    "theme.bar.buttons.modules.updates.background": "#2a283e",
-    "theme.bar.buttons.modules.netstat.background": "#2a283e",
-    "theme.bar.buttons.modules.netstat.text": "#9ccfd8",
-    "theme.bar.buttons.modules.storage.background": "#2a283e",
-    "theme.bar.buttons.modules.storage.text": "#eb6f92",
-    "theme.bar.buttons.modules.cpu.background": "#2a283e",
-    "theme.bar.buttons.network.icon_background": "#caa6f7",
-    "theme.bar.menus.menu.power.buttons.logout.icon": "#2a273f",
-    "theme.bar.menus.menu.power.buttons.restart.icon_background": "#f6c177",
-    "theme.bar.menus.menu.power.buttons.restart.icon": "#2a273f",
-    "theme.bar.buttons.battery.icon_background": "#f6c177",
-    "theme.bar.menus.menu.power.buttons.sleep.text": "#9ccfd8",
-    "theme.bar.buttons.media.icon_background": "#c4a7e7",
-    "theme.bar.menus.menu.power.buttons.logout.background": "#2a283e",
-    "theme.bar.menus.menu.power.buttons.sleep.background": "#2a283e",
-    "theme.bar.buttons.modules.ram.text": "#f6c177",
-    "theme.bar.menus.menu.power.buttons.logout.text": "#9ccfd8",
-    "theme.bar.buttons.modules.kbLayout.background": "#2a283e",
-    "theme.bar.buttons.modules.power.background": "#2a283e",
-    "theme.bar.buttons.modules.weather.background": "#2a283e",
-    "theme.bar.buttons.icon_background": "#2a283e",
-    "theme.bar.buttons.modules.ram.background": "#2a283e",
-    "theme.bar.buttons.windowtitle.icon_background": "#c4a7e7",
-    "theme.bar.menus.menu.power.buttons.logout.icon_background": "#9ccfd8",
-    "theme.bar.buttons.modules.updates.text": "#3e8eb0",
-    "theme.bar.menus.menu.power.buttons.sleep.icon": "#2a273f",
-    "theme.bar.buttons.bluetooth.icon_background": "#89dbeb",
-    "theme.bar.menus.menu.power.buttons.restart.background": "#2a283e",
-    "theme.bar.buttons.modules.cpu.text": "#eb6f92",
-    "theme.bar.buttons.modules.kbLayout.text": "#9ccfd8",
-    "theme.bar.buttons.notifications.icon_background": "#c4a7e7",
-    "theme.bar.buttons.modules.power.border": "#eb6f92",
-    "theme.bar.buttons.modules.weather.border": "#c4a7e7",
-    "theme.bar.buttons.modules.updates.border": "#30738f",
-    "theme.bar.buttons.modules.kbLayout.border": "#9ccfd8",
-    "theme.bar.buttons.modules.netstat.border": "#9ccfd8",
-    "theme.bar.buttons.modules.storage.border": "#eb6f92",
-    "theme.bar.buttons.modules.cpu.border": "#eb6f92",
-    "theme.bar.buttons.modules.ram.border": "#f6c177",
-    "theme.bar.buttons.notifications.border": "#c4a7e7",
-    "theme.bar.buttons.clock.border": "#c4a7e7",
-    "theme.bar.buttons.battery.border": "#f6c177",
-    "theme.bar.buttons.systray.border": "#26233a",
-    "theme.bar.buttons.bluetooth.border": "#9ccfd8",
-    "theme.bar.buttons.network.border": "#c4a7e7",
-    "theme.bar.buttons.volume.border": "#eb6f92",
-    "theme.bar.buttons.media.border": "#c4a7e7",
-    "theme.bar.buttons.windowtitle.border": "#c4a7e7",
-    "theme.bar.buttons.workspaces.border": "#1f1d2e",
-    "theme.bar.buttons.dashboard.border": "#f6c177"
-}
-
+  "theme.bar.menus.background": "#232136",
+  "theme.bar.background": "#232136",
+  "theme.bar.buttons.media.icon": "#c4a7e7",
+  "theme.bar.buttons.media.text": "#c4a7e7",
+  "theme.bar.buttons.icon": "#c4a7e7",
+  "theme.bar.buttons.text": "#c4a7e7",
+  "theme.bar.buttons.hover": "#393552",
+  "theme.bar.buttons.background": "#2a283e",
+  "theme.bar.menus.text": "#e0def4",
+  "theme.bar.menus.border.color": "#2a273f",
+  "theme.bar.buttons.media.background": "#2a283e",
+  "theme.bar.menus.menu.volume.text": "#e0def4",
+  "theme.bar.menus.menu.volume.card.color": "#2a283e",
+  "theme.bar.menus.menu.volume.label.color": "#eb6f92",
+  "theme.bar.menus.popover.text": "#c4a7e7",
+  "theme.bar.menus.popover.background": "#2a273f",
+  "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#232136",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#e0def4",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#2a273f",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#232136",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#2a283e",
+  "theme.bar.menus.menu.notifications.switch.puck": "#393552",
+  "theme.bar.menus.menu.notifications.switch.disabled": "#2a273f",
+  "theme.bar.menus.menu.notifications.switch.enabled": "#c4a7e7",
+  "theme.bar.menus.menu.notifications.clear": "#eb6f92",
+  "theme.bar.menus.menu.notifications.switch_divider": "#393552",
+  "theme.bar.menus.menu.notifications.border": "#2a273f",
+  "theme.bar.menus.menu.notifications.card": "#2a283e",
+  "theme.bar.menus.menu.notifications.background": "#232136",
+  "theme.bar.menus.menu.notifications.no_notifications_label": "#2a273f",
+  "theme.bar.menus.menu.notifications.label": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.monitors.disk.label": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.monitors.gpu.label": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.monitors.gpu.bar": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.monitors.gpu.icon": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.monitors.ram.label": "#f6c177",
+  "theme.bar.menus.menu.dashboard.monitors.ram.bar": "#f6c177",
+  "theme.bar.menus.menu.dashboard.monitors.ram.icon": "#f6c177",
+  "theme.bar.menus.menu.dashboard.monitors.cpu.label": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.monitors.cpu.bar": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.monitors.cpu.icon": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.monitors.bar_background": "#393552",
+  "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#3e8eb0",
+  "theme.bar.menus.menu.dashboard.directories.right.top.color": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#f6c177",
+  "theme.bar.menus.menu.dashboard.directories.left.top.color": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.controls.input.text": "#2a273f",
+  "theme.bar.menus.menu.dashboard.controls.input.background": "#3e8eb0",
+  "theme.bar.menus.menu.dashboard.controls.volume.text": "#2a273f",
+  "theme.bar.menus.menu.dashboard.controls.volume.background": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.controls.notifications.text": "#2a273f",
+  "theme.bar.menus.menu.dashboard.controls.notifications.background": "#f6c177",
+  "theme.bar.menus.menu.dashboard.controls.bluetooth.text": "#2a273f",
+  "theme.bar.menus.menu.dashboard.controls.bluetooth.background": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.controls.wifi.text": "#2a273f",
+  "theme.bar.menus.menu.dashboard.controls.wifi.background": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.controls.disabled": "#44415a",
+  "theme.bar.menus.menu.dashboard.shortcuts.recording": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.shortcuts.text": "#2a273f",
+  "theme.bar.menus.menu.dashboard.shortcuts.background": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.powermenu.sleep": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.powermenu.logout": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.powermenu.restart": "#f6c177",
+  "theme.bar.menus.menu.dashboard.profile.name": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.border.color": "#2a273f",
+  "theme.bar.menus.menu.dashboard.background.color": "#232136",
+  "theme.bar.menus.menu.dashboard.card.color": "#2a283e",
+  "theme.bar.menus.menu.clock.weather.hourly.temperature": "#c4a7e7",
+  "theme.bar.menus.menu.clock.weather.hourly.icon": "#c4a7e7",
+  "theme.bar.menus.menu.clock.weather.hourly.time": "#c4a7e7",
+  "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#9ccfd8",
+  "theme.bar.menus.menu.clock.weather.thermometer.cold": "#3e8fb0",
+  "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#c4a7e7",
+  "theme.bar.menus.menu.clock.weather.thermometer.hot": "#f6c177",
+  "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#eb6f92",
+  "theme.bar.menus.menu.clock.weather.stats": "#c4a7e7",
+  "theme.bar.menus.menu.clock.weather.status": "#9ccfd8",
+  "theme.bar.menus.menu.clock.weather.temperature": "#e0def4",
+  "theme.bar.menus.menu.clock.weather.icon": "#c4a7e7",
+  "theme.bar.menus.menu.clock.calendar.contextdays": "#44415a",
+  "theme.bar.menus.menu.clock.calendar.days": "#e0def4",
+  "theme.bar.menus.menu.clock.calendar.currentday": "#c4a7e7",
+  "theme.bar.menus.menu.clock.calendar.paginator": "#c4a7e7",
+  "theme.bar.menus.menu.clock.calendar.weekdays": "#c4a7e7",
+  "theme.bar.menus.menu.clock.calendar.yearmonth": "#9ccfd8",
+  "theme.bar.menus.menu.clock.time.timeperiod": "#9ccfd8",
+  "theme.bar.menus.menu.clock.time.time": "#c4a7e7",
+  "theme.bar.menus.menu.clock.text": "#e0def4",
+  "theme.bar.menus.menu.clock.border.color": "#2a273f",
+  "theme.bar.menus.menu.clock.background.color": "#232136",
+  "theme.bar.menus.menu.clock.card.color": "#2a283e",
+  "theme.bar.menus.menu.battery.slider.puck": "#393552",
+  "theme.bar.menus.menu.battery.slider.backgroundhover": "#393552",
+  "theme.bar.menus.menu.battery.slider.background": "#44415a",
+  "theme.bar.menus.menu.battery.slider.primary": "#f6c177",
+  "theme.bar.menus.menu.battery.icons.active": "#f6c177",
+  "theme.bar.menus.menu.battery.icons.passive": "#56526e",
+  "theme.bar.menus.menu.battery.listitems.active": "#f6c177",
+  "theme.bar.menus.menu.battery.listitems.passive": "#e0def4",
+  "theme.bar.menus.menu.battery.text": "#e0def4",
+  "theme.bar.menus.menu.battery.label.color": "#f6c177",
+  "theme.bar.menus.menu.battery.border.color": "#2a273f",
+  "theme.bar.menus.menu.battery.background.color": "#232136",
+  "theme.bar.menus.menu.battery.card.color": "#2a283e",
+  "theme.bar.menus.menu.systray.dropdownmenu.divider": "#2a283e",
+  "theme.bar.menus.menu.systray.dropdownmenu.text": "#e0def4",
+  "theme.bar.menus.menu.systray.dropdownmenu.background": "#232136",
+  "theme.bar.menus.menu.bluetooth.iconbutton.active": "#9ccfd8",
+  "theme.bar.menus.menu.bluetooth.iconbutton.passive": "#e0def4",
+  "theme.bar.menus.menu.bluetooth.icons.active": "#9ccfd8",
+  "theme.bar.menus.menu.bluetooth.icons.passive": "#56526e",
+  "theme.bar.menus.menu.bluetooth.listitems.active": "#9ccfd8",
+  "theme.bar.menus.menu.bluetooth.listitems.passive": "#e0def4",
+  "theme.bar.menus.menu.bluetooth.switch.puck": "#393552",
+  "theme.bar.menus.menu.bluetooth.switch.disabled": "#2a273f",
+  "theme.bar.menus.menu.bluetooth.switch.enabled": "#9ccfd8",
+  "theme.bar.menus.menu.bluetooth.switch_divider": "#393552",
+  "theme.bar.menus.menu.bluetooth.status": "#393552",
+  "theme.bar.menus.menu.bluetooth.text": "#e0def4",
+  "theme.bar.menus.menu.bluetooth.label.color": "#9ccfd8",
+  "theme.bar.menus.menu.bluetooth.border.color": "#2a273f",
+  "theme.bar.menus.menu.bluetooth.background.color": "#232136",
+  "theme.bar.menus.menu.bluetooth.card.color": "#2a283e",
+  "theme.bar.menus.menu.network.iconbuttons.active": "#c4a7e7",
+  "theme.bar.menus.menu.network.iconbuttons.passive": "#e0def4",
+  "theme.bar.menus.menu.network.icons.active": "#c4a7e7",
+  "theme.bar.menus.menu.network.icons.passive": "#56526e",
+  "theme.bar.menus.menu.network.listitems.active": "#c4a7e7",
+  "theme.bar.menus.menu.network.listitems.passive": "#e0def4",
+  "theme.bar.menus.menu.network.status.color": "#393552",
+  "theme.bar.menus.menu.network.text": "#e0def4",
+  "theme.bar.menus.menu.network.label.color": "#c4a7e7",
+  "theme.bar.menus.menu.network.border.color": "#2a273f",
+  "theme.bar.menus.menu.network.background.color": "#232136",
+  "theme.bar.menus.menu.network.card.color": "#2a283e",
+  "theme.bar.menus.menu.volume.input_slider.puck": "#44415a",
+  "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#393552",
+  "theme.bar.menus.menu.volume.input_slider.background": "#44415a",
+  "theme.bar.menus.menu.volume.input_slider.primary": "#eb6f92",
+  "theme.bar.menus.menu.volume.audio_slider.puck": "#44415a",
+  "theme.bar.menus.menu.volume.audio_slider.backgroundhover": "#393552",
+  "theme.bar.menus.menu.volume.audio_slider.background": "#44415a",
+  "theme.bar.menus.menu.volume.audio_slider.primary": "#eb6f92",
+  "theme.bar.menus.menu.volume.icons.active": "#eb6f92",
+  "theme.bar.menus.menu.volume.icons.passive": "#56526e",
+  "theme.bar.menus.menu.volume.iconbutton.active": "#eb6f92",
+  "theme.bar.menus.menu.volume.iconbutton.passive": "#e0def4",
+  "theme.bar.menus.menu.volume.listitems.active": "#eb6f92",
+  "theme.bar.menus.menu.volume.listitems.passive": "#e0def4",
+  "theme.bar.menus.menu.volume.border.color": "#2a273f",
+  "theme.bar.menus.menu.volume.background.color": "#232136",
+  "theme.bar.menus.menu.media.slider.puck": "#393552",
+  "theme.bar.menus.menu.media.slider.backgroundhover": "#393552",
+  "theme.bar.menus.menu.media.slider.background": "#44415a",
+  "theme.bar.menus.menu.media.slider.primary": "#c4a7e7",
+  "theme.bar.menus.menu.media.buttons.text": "#232136",
+  "theme.bar.menus.menu.media.buttons.background": "#c4a7e7",
+  "theme.bar.menus.menu.media.buttons.enabled": "#9ccfd8",
+  "theme.bar.menus.menu.media.buttons.inactive": "#44415a",
+  "theme.bar.menus.menu.media.border.color": "#2a273f",
+  "theme.bar.menus.menu.media.background.color": "#232136",
+  "theme.bar.menus.menu.media.album": "#c4a7e7",
+  "theme.bar.menus.menu.media.artist": "#9ccfd8",
+  "theme.bar.menus.menu.media.song": "#c4a7e7",
+  "theme.bar.menus.tooltip.text": "#e0def4",
+  "theme.bar.menus.tooltip.background": "#232136",
+  "theme.bar.menus.dropdownmenu.divider": "#2a283e",
+  "theme.bar.menus.dropdownmenu.text": "#e0def4",
+  "theme.bar.menus.dropdownmenu.background": "#232136",
+  "theme.bar.menus.slider.puck": "#393552",
+  "theme.bar.menus.slider.backgroundhover": "#393552",
+  "theme.bar.menus.slider.background": "#44415a",
+  "theme.bar.menus.slider.primary": "#c4a7e7",
+  "theme.bar.menus.progressbar.background": "#393552",
+  "theme.bar.menus.progressbar.foreground": "#c4a7e7",
+  "theme.bar.menus.iconbuttons.active": "#c4a7e7",
+  "theme.bar.menus.iconbuttons.passive": "#e0def4",
+  "theme.bar.menus.buttons.text": "#2a273f",
+  "theme.bar.menus.buttons.disabled": "#44415a",
+  "theme.bar.menus.buttons.active": "#c4a7e7",
+  "theme.bar.menus.buttons.default": "#c4a7e7",
+  "theme.bar.menus.switch.puck": "#393552",
+  "theme.bar.menus.switch.disabled": "#2a273f",
+  "theme.bar.menus.switch.enabled": "#c4a7e7",
+  "theme.bar.menus.icons.active": "#c4a7e7",
+  "theme.bar.menus.icons.passive": "#44415a",
+  "theme.bar.menus.listitems.active": "#c4a7e7",
+  "theme.bar.menus.listitems.passive": "#e0def4",
+  "theme.bar.menus.label": "#c4a7e7",
+  "theme.bar.menus.feinttext": "#2a273f",
+  "theme.bar.menus.dimtext": "#44415a",
+  "theme.bar.menus.cards": "#2a283e",
+  "theme.bar.buttons.notifications.total": "#c4a7e7",
+  "theme.bar.buttons.notifications.icon": "#c4a7e7",
+  "theme.bar.buttons.notifications.background": "#2a283e",
+  "theme.bar.buttons.clock.icon": "#c4a7e7",
+  "theme.bar.buttons.clock.text": "#c4a7e7",
+  "theme.bar.buttons.clock.background": "#2a283e",
+  "theme.bar.buttons.battery.icon": "#f6c177",
+  "theme.bar.buttons.battery.text": "#f6c177",
+  "theme.bar.buttons.battery.background": "#2a283e",
+  "theme.bar.buttons.systray.background": "#2a283e",
+  "theme.bar.buttons.bluetooth.icon": "#9ccfd8",
+  "theme.bar.buttons.bluetooth.text": "#9ccfd8",
+  "theme.bar.buttons.bluetooth.background": "#2a283e",
+  "theme.bar.buttons.network.icon": "#c4a7e7",
+  "theme.bar.buttons.network.text": "#c4a7e7",
+  "theme.bar.buttons.network.background": "#2a283e",
+  "theme.bar.buttons.volume.icon": "#eb6f92",
+  "theme.bar.buttons.volume.text": "#eb6f92",
+  "theme.bar.buttons.volume.background": "#2a283e",
+  "theme.bar.buttons.windowtitle.icon": "#c4a7e7",
+  "theme.bar.buttons.windowtitle.text": "#c4a7e7",
+  "theme.bar.buttons.windowtitle.background": "#2a283e",
+  "theme.bar.buttons.workspaces.active": "#c4a7e7",
+  "theme.bar.buttons.workspaces.occupied": "#eb6f92",
+  "theme.bar.buttons.workspaces.available": "#9ccfd8",
+  "theme.bar.buttons.workspaces.hover": "#393552",
+  "theme.bar.buttons.workspaces.background": "#2a283e",
+  "theme.bar.buttons.dashboard.icon": "#f6c177",
+  "theme.bar.buttons.dashboard.background": "#2a283e",
+  "theme.osd.label": "#c4a7e7",
+  "theme.osd.icon": "#232136",
+  "theme.osd.bar_overflow_color": "#eb6f92",
+  "theme.osd.bar_empty_color": "#2a273f",
+  "theme.osd.bar_color": "#c4a7e7",
+  "theme.osd.icon_container": "#c4a7e7",
+  "theme.osd.bar_container": "#232136",
+  "theme.notification.close_button.label": "#232136",
+  "theme.notification.close_button.background": "#eb6f92",
+  "theme.notification.labelicon": "#c4a7e7",
+  "theme.notification.text": "#e0def4",
+  "theme.notification.time": "#56526e",
+  "theme.notification.border": "#2a273f",
+  "theme.notification.label": "#c4a7e7",
+  "theme.notification.actions.text": "#2a273f",
+  "theme.notification.actions.background": "#c4a7e7",
+  "theme.notification.background": "#2a273f",
+  "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
+  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
+  "theme.bar.menus.menu.media.card.color": "#2a283e",
+  "theme.bar.menus.check_radio_button.background": "#393452",
+  "theme.bar.menus.check_radio_button.active": "#c4a7e7",
+  "theme.bar.buttons.style": "default",
+  "theme.bar.menus.menu.notifications.pager.button": "#c4a7e7",
+  "theme.bar.menus.menu.notifications.scrollbar.color": "#c4a7e7",
+  "theme.bar.menus.menu.notifications.pager.label": "#56526e",
+  "theme.bar.menus.menu.notifications.pager.background": "#232136",
+  "theme.bar.buttons.modules.ram.icon": "#f6c177",
+  "theme.bar.buttons.modules.storage.icon_background": "#2a283e",
+  "theme.bar.buttons.modules.storage.icon": "#c4a7e7",
+  "theme.bar.buttons.modules.weather.icon": "#c4a7e7",
+  "theme.bar.buttons.modules.power.icon": "#eb6f92",
+  "theme.bar.menus.menu.power.border.color": "#2a273f",
+  "theme.bar.buttons.modules.power.icon_background": "#2a283e",
+  "theme.bar.buttons.modules.cpu.icon": "#eb6f92",
+  "theme.bar.buttons.modules.kbLayout.icon_background": "#2a283e",
+  "theme.bar.buttons.modules.weather.text": "#c4a7e7",
+  "theme.bar.menus.menu.power.buttons.shutdown.icon": "#2a273f",
+  "theme.bar.buttons.modules.weather.icon_background": "#2a283e",
+  "theme.bar.menus.menu.power.buttons.shutdown.background": "#2a283e",
+  "theme.bar.buttons.modules.kbLayout.icon": "#9ccfd8",
+  "theme.bar.buttons.modules.ram.icon_background": "#2a283e",
+  "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#eb6f92",
+  "theme.bar.menus.menu.power.buttons.shutdown.text": "#eb6f92",
+  "theme.bar.buttons.modules.updates.icon_background": "#2a283e",
+  "theme.bar.menus.menu.power.background.color": "#232136",
+  "theme.bar.buttons.modules.netstat.icon": "#9ccfd8",
+  "theme.bar.buttons.modules.cpu.icon_background": "#2a283e",
+  "theme.bar.buttons.modules.updates.icon": "#3e8eb0",
+  "theme.bar.buttons.modules.netstat.icon_background": "#2a283e",
+  "theme.bar.buttons.clock.icon_background": "#c4a7e7",
+  "theme.bar.menus.popover.border": "#2a273f",
+  "theme.bar.buttons.volume.icon_background": "#eb6f92",
+  "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#9ccfd8",
+  "theme.bar.menus.menu.power.buttons.restart.text": "#f6c177",
+  "theme.bar.buttons.modules.updates.background": "#2a283e",
+  "theme.bar.buttons.modules.netstat.background": "#2a283e",
+  "theme.bar.buttons.modules.netstat.text": "#9ccfd8",
+  "theme.bar.buttons.modules.storage.background": "#2a283e",
+  "theme.bar.buttons.modules.storage.text": "#eb6f92",
+  "theme.bar.buttons.modules.cpu.background": "#2a283e",
+  "theme.bar.buttons.network.icon_background": "#caa6f7",
+  "theme.bar.menus.menu.power.buttons.logout.icon": "#2a273f",
+  "theme.bar.menus.menu.power.buttons.restart.icon_background": "#f6c177",
+  "theme.bar.menus.menu.power.buttons.restart.icon": "#2a273f",
+  "theme.bar.buttons.battery.icon_background": "#f6c177",
+  "theme.bar.menus.menu.power.buttons.sleep.text": "#9ccfd8",
+  "theme.bar.buttons.media.icon_background": "#c4a7e7",
+  "theme.bar.menus.menu.power.buttons.logout.background": "#2a283e",
+  "theme.bar.menus.menu.power.buttons.sleep.background": "#2a283e",
+  "theme.bar.buttons.modules.ram.text": "#f6c177",
+  "theme.bar.menus.menu.power.buttons.logout.text": "#9ccfd8",
+  "theme.bar.buttons.modules.kbLayout.background": "#2a283e",
+  "theme.bar.buttons.modules.power.background": "#2a283e",
+  "theme.bar.buttons.modules.weather.background": "#2a283e",
+  "theme.bar.buttons.icon_background": "#2a283e",
+  "theme.bar.buttons.modules.ram.background": "#2a283e",
+  "theme.bar.buttons.windowtitle.icon_background": "#c4a7e7",
+  "theme.bar.menus.menu.power.buttons.logout.icon_background": "#9ccfd8",
+  "theme.bar.buttons.modules.updates.text": "#3e8eb0",
+  "theme.bar.menus.menu.power.buttons.sleep.icon": "#2a273f",
+  "theme.bar.buttons.bluetooth.icon_background": "#89dbeb",
+  "theme.bar.menus.menu.power.buttons.restart.background": "#2a283e",
+  "theme.bar.buttons.modules.cpu.text": "#eb6f92",
+  "theme.bar.buttons.modules.kbLayout.text": "#9ccfd8",
+  "theme.bar.buttons.notifications.icon_background": "#c4a7e7",
+  "theme.bar.buttons.modules.power.border": "#eb6f92",
+  "theme.bar.buttons.modules.weather.border": "#c4a7e7",
+  "theme.bar.buttons.modules.updates.border": "#30738f",
+  "theme.bar.buttons.modules.kbLayout.border": "#9ccfd8",
+  "theme.bar.buttons.modules.netstat.border": "#9ccfd8",
+  "theme.bar.buttons.modules.storage.border": "#eb6f92",
+  "theme.bar.buttons.modules.cpu.border": "#eb6f92",
+  "theme.bar.buttons.modules.ram.border": "#f6c177",
+  "theme.bar.buttons.notifications.border": "#c4a7e7",
+  "theme.bar.buttons.clock.border": "#c4a7e7",
+  "theme.bar.buttons.battery.border": "#f6c177",
+  "theme.bar.buttons.systray.border": "#26233a",
+  "theme.bar.buttons.bluetooth.border": "#9ccfd8",
+  "theme.bar.buttons.network.border": "#c4a7e7",
+  "theme.bar.buttons.volume.border": "#eb6f92",
+  "theme.bar.buttons.media.border": "#c4a7e7",
+  "theme.bar.buttons.windowtitle.border": "#c4a7e7",
+  "theme.bar.buttons.workspaces.border": "#1f1d2e",
+  "theme.bar.buttons.dashboard.border": "#f6c177",
+  "theme.bar.buttons.modules.submap.background": "#2a283e",
+  "theme.bar.buttons.modules.submap.text": "#9ccfd8",
+  "theme.bar.buttons.modules.submap.border": "#9ccfd8",
+  "theme.bar.buttons.modules.submap.icon": "#9ccfd8",
+  "theme.bar.buttons.modules.submap.icon_background": "#2a283e"
+}
\ No newline at end of file
diff --git a/themes/rose_pine_moon_split.json b/themes/rose_pine_moon_split.json
index cfa934c..bbf84e8 100644
--- a/themes/rose_pine_moon_split.json
+++ b/themes/rose_pine_moon_split.json
@@ -1,348 +1,341 @@
 {
-    "theme.bar.menus.background": "#232136",
-    "theme.bar.background": "#232136",
-    "theme.bar.buttons.media.icon": "#2a283e",
-    "theme.bar.buttons.media.text": "#c4a7e7",
-    "theme.bar.buttons.icon": "#c4a7e7",
-    "theme.bar.buttons.text": "#c4a7e7",
-    "theme.bar.buttons.hover": "#393552",
-    "theme.bar.buttons.background": "#2a283e",
-    "theme.bar.menus.text": "#e0def4",
-    "theme.bar.menus.border.color": "#2a273f",
-    "theme.bar.buttons.media.background": "#2a283e",
-    "theme.bar.menus.menu.volume.text": "#e0def4",
-    "theme.bar.menus.menu.volume.card.color": "#2a283e",
-    "theme.bar.menus.menu.volume.label.color": "#eb6f92",
-    "theme.bar.menus.popover.text": "#c4a7e7",
-    "theme.bar.menus.popover.background": "#2a273f",
-    "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#232136",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#e0def4",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#2a273f",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#232136",
-    "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#2a283e",
-    "theme.bar.menus.menu.notifications.switch.puck": "#393552",
-    "theme.bar.menus.menu.notifications.switch.disabled": "#2a273f",
-    "theme.bar.menus.menu.notifications.switch.enabled": "#c4a7e7",
-    "theme.bar.menus.menu.notifications.clear": "#eb6f92",
-    "theme.bar.menus.menu.notifications.switch_divider": "#393552",
-    "theme.bar.menus.menu.notifications.border": "#2a273f",
-    "theme.bar.menus.menu.notifications.card": "#2a283e",
-    "theme.bar.menus.menu.notifications.background": "#232136",
-    "theme.bar.menus.menu.notifications.no_notifications_label": "#2a273f",
-    "theme.bar.menus.menu.notifications.label": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.monitors.disk.label": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.monitors.gpu.label": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.monitors.gpu.bar": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.monitors.gpu.icon": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.monitors.ram.label": "#f6c177",
-    "theme.bar.menus.menu.dashboard.monitors.ram.bar": "#f6c177",
-    "theme.bar.menus.menu.dashboard.monitors.ram.icon": "#f6c177",
-    "theme.bar.menus.menu.dashboard.monitors.cpu.label": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.monitors.cpu.bar": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.monitors.cpu.icon": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.monitors.bar_background": "#393552",
-    "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#3e8eb0",
-    "theme.bar.menus.menu.dashboard.directories.right.top.color": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#f6c177",
-    "theme.bar.menus.menu.dashboard.directories.left.top.color": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.controls.input.text": "#2a273f",
-    "theme.bar.menus.menu.dashboard.controls.input.background": "#3e8eb0",
-    "theme.bar.menus.menu.dashboard.controls.volume.text": "#2a273f",
-    "theme.bar.menus.menu.dashboard.controls.volume.background": "#eb6f92",
-    "theme.bar.menus.menu.dashboard.controls.notifications.text": "#2a273f",
-    "theme.bar.menus.menu.dashboard.controls.notifications.background": "#f6c177",
-    "theme.bar.menus.menu.dashboard.controls.bluetooth.text": "#2a273f",
-    "theme.bar.menus.menu.dashboard.controls.bluetooth.background": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.controls.wifi.text": "#2a273f",
-    "theme.bar.menus.menu.dashboard.controls.wifi.background": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.controls.disabled": "#44415a",
-    "theme.bar.menus.menu.dashboard.shortcuts.recording": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.shortcuts.text": "#2a273f",
-    "theme.bar.menus.menu.dashboard.shortcuts.background": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.powermenu.sleep": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.powermenu.logout": "#9ccfd8",
-    "theme.bar.menus.menu.dashboard.powermenu.restart": "#f6c177",
-    "theme.bar.menus.menu.dashboard.profile.name": "#c4a7e7",
-    "theme.bar.menus.menu.dashboard.border.color": "#2a273f",
-    "theme.bar.menus.menu.dashboard.background.color": "#232136",
-    "theme.bar.menus.menu.dashboard.card.color": "#2a283e",
-    "theme.bar.menus.menu.clock.weather.hourly.temperature": "#c4a7e7",
-    "theme.bar.menus.menu.clock.weather.hourly.icon": "#c4a7e7",
-    "theme.bar.menus.menu.clock.weather.hourly.time": "#c4a7e7",
-    "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#9ccfd8",
-    "theme.bar.menus.menu.clock.weather.thermometer.cold": "#3e8fb0",
-    "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#c4a7e7",
-    "theme.bar.menus.menu.clock.weather.thermometer.hot": "#f6c177",
-    "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#eb6f92",
-    "theme.bar.menus.menu.clock.weather.stats": "#c4a7e7",
-    "theme.bar.menus.menu.clock.weather.status": "#9ccfd8",
-    "theme.bar.menus.menu.clock.weather.temperature": "#e0def4",
-    "theme.bar.menus.menu.clock.weather.icon": "#c4a7e7",
-    "theme.bar.menus.menu.clock.calendar.contextdays": "#44415a",
-    "theme.bar.menus.menu.clock.calendar.days": "#e0def4",
-    "theme.bar.menus.menu.clock.calendar.currentday": "#c4a7e7",
-    "theme.bar.menus.menu.clock.calendar.paginator": "#c4a7e7",
-    "theme.bar.menus.menu.clock.calendar.weekdays": "#c4a7e7",
-    "theme.bar.menus.menu.clock.calendar.yearmonth": "#9ccfd8",
-    "theme.bar.menus.menu.clock.time.timeperiod": "#9ccfd8",
-    "theme.bar.menus.menu.clock.time.time": "#c4a7e7",
-    "theme.bar.menus.menu.clock.text": "#e0def4",
-    "theme.bar.menus.menu.clock.border.color": "#2a273f",
-    "theme.bar.menus.menu.clock.background.color": "#232136",
-    "theme.bar.menus.menu.clock.card.color": "#2a283e",
-    "theme.bar.menus.menu.battery.slider.puck": "#393552",
-    "theme.bar.menus.menu.battery.slider.backgroundhover": "#393552",
-    "theme.bar.menus.menu.battery.slider.background": "#44415a",
-    "theme.bar.menus.menu.battery.slider.primary": "#f6c177",
-    "theme.bar.menus.menu.battery.icons.active": "#f6c177",
-    "theme.bar.menus.menu.battery.icons.passive": "#56526e",
-    "theme.bar.menus.menu.battery.listitems.active": "#f6c177",
-    "theme.bar.menus.menu.battery.listitems.passive": "#e0def4",
-    "theme.bar.menus.menu.battery.text": "#e0def4",
-    "theme.bar.menus.menu.battery.label.color": "#f6c177",
-    "theme.bar.menus.menu.battery.border.color": "#2a273f",
-    "theme.bar.menus.menu.battery.background.color": "#232136",
-    "theme.bar.menus.menu.battery.card.color": "#2a283e",
-    "theme.bar.menus.menu.systray.dropdownmenu.divider": "#2a283e",
-    "theme.bar.menus.menu.systray.dropdownmenu.text": "#e0def4",
-    "theme.bar.menus.menu.systray.dropdownmenu.background": "#232136",
-    "theme.bar.menus.menu.bluetooth.iconbutton.active": "#9ccfd8",
-    "theme.bar.menus.menu.bluetooth.iconbutton.passive": "#e0def4",
-    "theme.bar.menus.menu.bluetooth.icons.active": "#9ccfd8",
-    "theme.bar.menus.menu.bluetooth.icons.passive": "#56526e",
-    "theme.bar.menus.menu.bluetooth.listitems.active": "#9ccfd8",
-    "theme.bar.menus.menu.bluetooth.listitems.passive": "#e0def4",
-    "theme.bar.menus.menu.bluetooth.switch.puck": "#393552",
-    "theme.bar.menus.menu.bluetooth.switch.disabled": "#2a273f",
-    "theme.bar.menus.menu.bluetooth.switch.enabled": "#9ccfd8",
-    "theme.bar.menus.menu.bluetooth.switch_divider": "#393552",
-    "theme.bar.menus.menu.bluetooth.status": "#393552",
-    "theme.bar.menus.menu.bluetooth.text": "#e0def4",
-    "theme.bar.menus.menu.bluetooth.label.color": "#9ccfd8",
-    "theme.bar.menus.menu.bluetooth.border.color": "#2a273f",
-    "theme.bar.menus.menu.bluetooth.background.color": "#232136",
-    "theme.bar.menus.menu.bluetooth.card.color": "#2a283e",
-    "theme.bar.menus.menu.network.iconbuttons.active": "#c4a7e7",
-    "theme.bar.menus.menu.network.iconbuttons.passive": "#e0def4",
-    "theme.bar.menus.menu.network.icons.active": "#c4a7e7",
-    "theme.bar.menus.menu.network.icons.passive": "#56526e",
-    "theme.bar.menus.menu.network.listitems.active": "#c4a7e7",
-    "theme.bar.menus.menu.network.listitems.passive": "#e0def4",
-    "theme.bar.menus.menu.network.status.color": "#393552",
-    "theme.bar.menus.menu.network.text": "#e0def4",
-    "theme.bar.menus.menu.network.label.color": "#c4a7e7",
-    "theme.bar.menus.menu.network.border.color": "#2a273f",
-    "theme.bar.menus.menu.network.background.color": "#232136",
-    "theme.bar.menus.menu.network.card.color": "#2a283e",
-    "theme.bar.menus.menu.volume.input_slider.puck": "#44415a",
-    "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#393552",
-    "theme.bar.menus.menu.volume.input_slider.background": "#44415a",
-    "theme.bar.menus.menu.volume.input_slider.primary": "#eb6f92",
-    "theme.bar.menus.menu.volume.audio_slider.puck": "#44415a",
-    "theme.bar.menus.menu.volume.audio_slider.backgroundhover": "#393552",
-    "theme.bar.menus.menu.volume.audio_slider.background": "#44415a",
-    "theme.bar.menus.menu.volume.audio_slider.primary": "#eb6f92",
-    "theme.bar.menus.menu.volume.icons.active": "#eb6f92",
-    "theme.bar.menus.menu.volume.icons.passive": "#56526e",
-    "theme.bar.menus.menu.volume.iconbutton.active": "#eb6f92",
-    "theme.bar.menus.menu.volume.iconbutton.passive": "#e0def4",
-    "theme.bar.menus.menu.volume.listitems.active": "#eb6f92",
-    "theme.bar.menus.menu.volume.listitems.passive": "#e0def4",
-    "theme.bar.menus.menu.volume.border.color": "#2a273f",
-    "theme.bar.menus.menu.volume.background.color": "#232136",
-    "theme.bar.menus.menu.media.slider.puck": "#393552",
-    "theme.bar.menus.menu.media.slider.backgroundhover": "#393552",
-    "theme.bar.menus.menu.media.slider.background": "#44415a",
-    "theme.bar.menus.menu.media.slider.primary": "#c4a7e7",
-    "theme.bar.menus.menu.media.buttons.text": "#232136",
-    "theme.bar.menus.menu.media.buttons.background": "#c4a7e7",
-    "theme.bar.menus.menu.media.buttons.enabled": "#9ccfd8",
-    "theme.bar.menus.menu.media.buttons.inactive": "#44415a",
-    "theme.bar.menus.menu.media.border.color": "#2a273f",
-    "theme.bar.menus.menu.media.background.color": "#232136",
-    "theme.bar.menus.menu.media.album": "#c4a7e7",
-    "theme.bar.menus.menu.media.artist": "#9ccfd8",
-    "theme.bar.menus.menu.media.song": "#c4a7e7",
-    "theme.bar.menus.tooltip.text": "#e0def4",
-    "theme.bar.menus.tooltip.background": "#232136",
-    "theme.bar.menus.dropdownmenu.divider": "#2a283e",
-    "theme.bar.menus.dropdownmenu.text": "#e0def4",
-    "theme.bar.menus.dropdownmenu.background": "#232136",
-    "theme.bar.menus.slider.puck": "#393552",
-    "theme.bar.menus.slider.backgroundhover": "#393552",
-    "theme.bar.menus.slider.background": "#44415a",
-    "theme.bar.menus.slider.primary": "#c4a7e7",
-    "theme.bar.menus.progressbar.background": "#393552",
-    "theme.bar.menus.progressbar.foreground": "#c4a7e7",
-    "theme.bar.menus.iconbuttons.active": "#c4a7e7",
-    "theme.bar.menus.iconbuttons.passive": "#e0def4",
-    "theme.bar.menus.buttons.text": "#2a273f",
-    "theme.bar.menus.buttons.disabled": "#44415a",
-    "theme.bar.menus.buttons.active": "#c4a7e7",
-    "theme.bar.menus.buttons.default": "#c4a7e7",
-    "theme.bar.menus.switch.puck": "#393552",
-    "theme.bar.menus.switch.disabled": "#2a273f",
-    "theme.bar.menus.switch.enabled": "#c4a7e7",
-    "theme.bar.menus.icons.active": "#c4a7e7",
-    "theme.bar.menus.icons.passive": "#44415a",
-    "theme.bar.menus.listitems.active": "#c4a7e7",
-    "theme.bar.menus.listitems.passive": "#e0def4",
-    "theme.bar.menus.label": "#c4a7e7",
-    "theme.bar.menus.feinttext": "#2a273f",
-    "theme.bar.menus.dimtext": "#44415a",
-    "theme.bar.menus.cards": "#2a283e",
-    "theme.bar.buttons.notifications.total": "#c4a7e7",
-    "theme.bar.buttons.notifications.icon": "#2a283e",
-    "theme.bar.buttons.notifications.hover": "#393552",
-    "theme.bar.buttons.notifications.background": "#2a283e",
-    "theme.bar.buttons.clock.icon": "#2a283e",
-    "theme.bar.buttons.clock.text": "#c4a7e7",
-    "theme.bar.buttons.clock.hover": "#393552",
-    "theme.bar.buttons.clock.background": "#2a283e",
-    "theme.bar.buttons.battery.icon": "#2a283e",
-    "theme.bar.buttons.battery.text": "#f6c177",
-    "theme.bar.buttons.battery.hover": "#393552",
-    "theme.bar.buttons.battery.background": "#2a283e",
-    "theme.bar.buttons.systray.hover": "#393552",
-    "theme.bar.buttons.systray.background": "#2a283e",
-    "theme.bar.buttons.bluetooth.icon": "#2a283e",
-    "theme.bar.buttons.bluetooth.text": "#9ccfd8",
-    "theme.bar.buttons.bluetooth.hover": "#393552",
-    "theme.bar.buttons.bluetooth.background": "#2a283e",
-    "theme.bar.buttons.network.icon": "#2a283e",
-    "theme.bar.buttons.network.text": "#c4a7e7",
-    "theme.bar.buttons.network.hover": "#393552",
-    "theme.bar.buttons.network.background": "#2a283e",
-    "theme.bar.buttons.volume.icon": "#2a283e",
-    "theme.bar.buttons.volume.text": "#eb6f92",
-    "theme.bar.buttons.volume.hover": "#393552",
-    "theme.bar.buttons.volume.background": "#2a283e",
-    "theme.bar.buttons.media.hover": "#393552",
-    "theme.bar.buttons.windowtitle.icon": "#2a283e",
-    "theme.bar.buttons.windowtitle.text": "#c4a7e7",
-    "theme.bar.buttons.windowtitle.hover": "#393552",
-    "theme.bar.buttons.windowtitle.background": "#2a283e",
-    "theme.bar.buttons.workspaces.numbered_active_text_color": "#2a273f",
-    "theme.bar.buttons.workspaces.active": "#c4a7e7",
-    "theme.bar.buttons.workspaces.occupied": "#eb6f92",
-    "theme.bar.buttons.workspaces.available": "#9ccfd8",
-    "theme.bar.buttons.workspaces.hover": "#c4a7e7",
-    "theme.bar.buttons.workspaces.background": "#2a283e",
-    "theme.bar.buttons.dashboard.icon": "#2a283e",
-    "theme.bar.buttons.dashboard.hover": "#393552",
-    "theme.bar.buttons.dashboard.background": "#f6c177",
-    "theme.osd.label": "#c4a7e7",
-    "theme.osd.icon": "#232136",
-    "theme.osd.bar_overflow_color": "#eb6f92",
-    "theme.osd.bar_empty_color": "#2a273f",
-    "theme.osd.bar_color": "#c4a7e7",
-    "theme.osd.icon_container": "#c4a7e7",
-    "theme.osd.bar_container": "#232136",
-    "theme.notification.close_button.label": "#232136",
-    "theme.notification.close_button.background": "#eb6f92",
-    "theme.notification.labelicon": "#c4a7e7",
-    "theme.notification.text": "#e0def4",
-    "theme.notification.time": "#56526e",
-    "theme.notification.border": "#2a273f",
-    "theme.notification.label": "#c4a7e7",
-    "theme.notification.actions.text": "#2a273f",
-    "theme.notification.actions.background": "#c4a7e7",
-    "theme.notification.background": "#2a273f",
-    "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
-    "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
-    "theme.bar.menus.menu.media.card.color": "#2a283e",
-    "theme.bar.menus.check_radio_button.background": "#393452",
-    "theme.bar.menus.check_radio_button.active": "#c4a7e7",
-    "theme.bar.buttons.style": "split",
-    "theme.bar.buttons.icon_background": "#242438",
-    "theme.bar.buttons.volume.icon_background": "#eb6f92",
-    "theme.bar.buttons.network.icon_background": "#c4a7e7",
-    "theme.bar.buttons.bluetooth.icon_background": "#9ccfd8",
-    "theme.bar.buttons.windowtitle.icon_background": "#c4a7e7",
-    "theme.bar.buttons.media.icon_background": "#c4a7e7",
-    "theme.bar.buttons.notifications.icon_background": "#c4a7e7",
-    "theme.bar.buttons.battery.icon_background": "#f6c177",
-    "theme.bar.buttons.clock.icon_background": "#c4a7e7",
-    "theme.bar.menus.menu.notifications.pager.button": "#c4a7e7",
-    "theme.bar.menus.menu.notifications.scrollbar.color": "#c4a7e7",
-    "theme.bar.menus.menu.notifications.pager.label": "#56526e",
-    "theme.bar.menus.menu.notifications.pager.background": "#232136",
-    "theme.bar.buttons.modules.ram.icon": "#181825",
-    "theme.bar.buttons.modules.storage.icon_background": "#eb6f92",
-    "theme.bar.menus.popover.border": "#2a273f",
-    "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#9ccfd8",
-    "theme.bar.menus.menu.power.buttons.restart.text": "#f6c177",
-    "theme.bar.buttons.modules.updates.background": "#2a283e",
-    "theme.bar.buttons.modules.storage.icon": "#181825",
-    "theme.bar.buttons.modules.netstat.background": "#2a283e",
-    "theme.bar.buttons.modules.weather.icon": "#2a283e",
-    "theme.bar.buttons.modules.netstat.text": "#9ccfd8",
-    "theme.bar.buttons.modules.storage.background": "#2a283e",
-    "theme.bar.buttons.modules.power.icon": "#181825",
-    "theme.bar.buttons.modules.storage.text": "#eb6f92",
-    "theme.bar.buttons.modules.cpu.background": "#2a283e",
-    "theme.bar.menus.menu.power.border.color": "#2a273f",
-    "theme.bar.buttons.modules.power.icon_background": "#eb6f92",
-    "theme.bar.menus.menu.power.buttons.logout.icon": "#2a273f",
-    "theme.bar.menus.menu.power.buttons.restart.icon_background": "#f6c177",
-    "theme.bar.menus.menu.power.buttons.restart.icon": "#2a273f",
-    "theme.bar.buttons.modules.cpu.icon": "#181825",
-    "theme.bar.buttons.modules.kbLayout.icon_background": "#9ccfd8",
-    "theme.bar.buttons.modules.weather.text": "#c4a7e7",
-    "theme.bar.menus.menu.power.buttons.shutdown.icon": "#2a273f",
-    "theme.bar.menus.menu.power.buttons.sleep.text": "#9ccfd8",
-    "theme.bar.buttons.modules.weather.icon_background": "#c4a7e7",
-    "theme.bar.menus.menu.power.buttons.shutdown.background": "#2a283e",
-    "theme.bar.menus.menu.power.buttons.logout.background": "#2a283e",
-    "theme.bar.buttons.modules.kbLayout.icon": "#181825",
-    "theme.bar.buttons.modules.ram.icon_background": "#f6c177",
-    "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#eb6f92",
-    "theme.bar.menus.menu.power.buttons.shutdown.text": "#eb6f92",
-    "theme.bar.menus.menu.power.buttons.sleep.background": "#2a283e",
-    "theme.bar.buttons.modules.ram.text": "#f6c177",
-    "theme.bar.menus.menu.power.buttons.logout.text": "#9ccfd8",
-    "theme.bar.buttons.modules.updates.icon_background": "#3e8eb0",
-    "theme.bar.buttons.modules.kbLayout.background": "#2a283e",
-    "theme.bar.buttons.modules.power.background": "#2a283e",
-    "theme.bar.buttons.modules.weather.background": "#2a283e",
-    "theme.bar.menus.menu.power.background.color": "#232136",
-    "theme.bar.buttons.modules.ram.background": "#2a283e",
-    "theme.bar.buttons.modules.netstat.icon": "#181825",
-    "theme.bar.buttons.modules.cpu.icon_background": "#eb6f92",
-    "theme.bar.menus.menu.power.buttons.logout.icon_background": "#9ccfd8",
-    "theme.bar.buttons.modules.updates.text": "#3e8eb0",
-    "theme.bar.menus.menu.power.buttons.sleep.icon": "#2a273f",
-    "theme.bar.menus.menu.power.buttons.restart.background": "#2a283e",
-    "theme.bar.buttons.modules.updates.icon": "#181825",
-    "theme.bar.buttons.modules.cpu.text": "#eb6f92",
-    "theme.bar.buttons.modules.netstat.icon_background": "#9ccfd8",
-    "theme.bar.buttons.modules.kbLayout.text": "#9ccfd8",
-    "theme.bar.buttons.modules.power.border": "#eb6f92",
-    "theme.bar.buttons.modules.weather.border": "#c4a7e7",
-    "theme.bar.buttons.modules.updates.border": "#30738f",
-    "theme.bar.buttons.modules.kbLayout.border": "#9ccfd8",
-    "theme.bar.buttons.modules.netstat.border": "#9ccfd8",
-    "theme.bar.buttons.modules.storage.border": "#eb6f92",
-    "theme.bar.buttons.modules.cpu.border": "#eb6f92",
-    "theme.bar.buttons.modules.ram.border": "#f6c177",
-    "theme.bar.buttons.notifications.border": "#c4a7e7",
-    "theme.bar.buttons.clock.border": "#c4a7e7",
-    "theme.bar.buttons.battery.border": "#f6c177",
-    "theme.bar.buttons.systray.border": "#26233a",
-    "theme.bar.buttons.bluetooth.border": "#9ccfd8",
-    "theme.bar.buttons.network.border": "#c4a7e7",
-    "theme.bar.buttons.volume.border": "#eb6f92",
-    "theme.bar.buttons.media.border": "#c4a7e7",
-    "theme.bar.buttons.windowtitle.border": "#c4a7e7",
-    "theme.bar.buttons.workspaces.border": "#1f1d2e",
-    "theme.bar.buttons.dashboard.border": "#f6c177"
-}
-
+  "theme.bar.menus.background": "#232136",
+  "theme.bar.background": "#232136",
+  "theme.bar.buttons.media.icon": "#2a283e",
+  "theme.bar.buttons.media.text": "#c4a7e7",
+  "theme.bar.buttons.icon": "#c4a7e7",
+  "theme.bar.buttons.text": "#c4a7e7",
+  "theme.bar.buttons.hover": "#393552",
+  "theme.bar.buttons.background": "#2a283e",
+  "theme.bar.menus.text": "#e0def4",
+  "theme.bar.menus.border.color": "#2a273f",
+  "theme.bar.buttons.media.background": "#2a283e",
+  "theme.bar.menus.menu.volume.text": "#e0def4",
+  "theme.bar.menus.menu.volume.card.color": "#2a283e",
+  "theme.bar.menus.menu.volume.label.color": "#eb6f92",
+  "theme.bar.menus.popover.text": "#c4a7e7",
+  "theme.bar.menus.popover.background": "#2a273f",
+  "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#232136",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#e0def4",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#2a273f",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#232136",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#2a283e",
+  "theme.bar.menus.menu.notifications.switch.puck": "#393552",
+  "theme.bar.menus.menu.notifications.switch.disabled": "#2a273f",
+  "theme.bar.menus.menu.notifications.switch.enabled": "#c4a7e7",
+  "theme.bar.menus.menu.notifications.clear": "#eb6f92",
+  "theme.bar.menus.menu.notifications.switch_divider": "#393552",
+  "theme.bar.menus.menu.notifications.border": "#2a273f",
+  "theme.bar.menus.menu.notifications.card": "#2a283e",
+  "theme.bar.menus.menu.notifications.background": "#232136",
+  "theme.bar.menus.menu.notifications.no_notifications_label": "#2a273f",
+  "theme.bar.menus.menu.notifications.label": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.monitors.disk.label": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.monitors.gpu.label": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.monitors.gpu.bar": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.monitors.gpu.icon": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.monitors.ram.label": "#f6c177",
+  "theme.bar.menus.menu.dashboard.monitors.ram.bar": "#f6c177",
+  "theme.bar.menus.menu.dashboard.monitors.ram.icon": "#f6c177",
+  "theme.bar.menus.menu.dashboard.monitors.cpu.label": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.monitors.cpu.bar": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.monitors.cpu.icon": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.monitors.bar_background": "#393552",
+  "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#3e8eb0",
+  "theme.bar.menus.menu.dashboard.directories.right.top.color": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#f6c177",
+  "theme.bar.menus.menu.dashboard.directories.left.top.color": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.controls.input.text": "#2a273f",
+  "theme.bar.menus.menu.dashboard.controls.input.background": "#3e8eb0",
+  "theme.bar.menus.menu.dashboard.controls.volume.text": "#2a273f",
+  "theme.bar.menus.menu.dashboard.controls.volume.background": "#eb6f92",
+  "theme.bar.menus.menu.dashboard.controls.notifications.text": "#2a273f",
+  "theme.bar.menus.menu.dashboard.controls.notifications.background": "#f6c177",
+  "theme.bar.menus.menu.dashboard.controls.bluetooth.text": "#2a273f",
+  "theme.bar.menus.menu.dashboard.controls.bluetooth.background": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.controls.wifi.text": "#2a273f",
+  "theme.bar.menus.menu.dashboard.controls.wifi.background": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.controls.disabled": "#44415a",
+  "theme.bar.menus.menu.dashboard.shortcuts.recording": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.shortcuts.text": "#2a273f",
+  "theme.bar.menus.menu.dashboard.shortcuts.background": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.powermenu.sleep": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.powermenu.logout": "#9ccfd8",
+  "theme.bar.menus.menu.dashboard.powermenu.restart": "#f6c177",
+  "theme.bar.menus.menu.dashboard.profile.name": "#c4a7e7",
+  "theme.bar.menus.menu.dashboard.border.color": "#2a273f",
+  "theme.bar.menus.menu.dashboard.background.color": "#232136",
+  "theme.bar.menus.menu.dashboard.card.color": "#2a283e",
+  "theme.bar.menus.menu.clock.weather.hourly.temperature": "#c4a7e7",
+  "theme.bar.menus.menu.clock.weather.hourly.icon": "#c4a7e7",
+  "theme.bar.menus.menu.clock.weather.hourly.time": "#c4a7e7",
+  "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#9ccfd8",
+  "theme.bar.menus.menu.clock.weather.thermometer.cold": "#3e8fb0",
+  "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#c4a7e7",
+  "theme.bar.menus.menu.clock.weather.thermometer.hot": "#f6c177",
+  "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#eb6f92",
+  "theme.bar.menus.menu.clock.weather.stats": "#c4a7e7",
+  "theme.bar.menus.menu.clock.weather.status": "#9ccfd8",
+  "theme.bar.menus.menu.clock.weather.temperature": "#e0def4",
+  "theme.bar.menus.menu.clock.weather.icon": "#c4a7e7",
+  "theme.bar.menus.menu.clock.calendar.contextdays": "#44415a",
+  "theme.bar.menus.menu.clock.calendar.days": "#e0def4",
+  "theme.bar.menus.menu.clock.calendar.currentday": "#c4a7e7",
+  "theme.bar.menus.menu.clock.calendar.paginator": "#c4a7e7",
+  "theme.bar.menus.menu.clock.calendar.weekdays": "#c4a7e7",
+  "theme.bar.menus.menu.clock.calendar.yearmonth": "#9ccfd8",
+  "theme.bar.menus.menu.clock.time.timeperiod": "#9ccfd8",
+  "theme.bar.menus.menu.clock.time.time": "#c4a7e7",
+  "theme.bar.menus.menu.clock.text": "#e0def4",
+  "theme.bar.menus.menu.clock.border.color": "#2a273f",
+  "theme.bar.menus.menu.clock.background.color": "#232136",
+  "theme.bar.menus.menu.clock.card.color": "#2a283e",
+  "theme.bar.menus.menu.battery.slider.puck": "#393552",
+  "theme.bar.menus.menu.battery.slider.backgroundhover": "#393552",
+  "theme.bar.menus.menu.battery.slider.background": "#44415a",
+  "theme.bar.menus.menu.battery.slider.primary": "#f6c177",
+  "theme.bar.menus.menu.battery.icons.active": "#f6c177",
+  "theme.bar.menus.menu.battery.icons.passive": "#56526e",
+  "theme.bar.menus.menu.battery.listitems.active": "#f6c177",
+  "theme.bar.menus.menu.battery.listitems.passive": "#e0def4",
+  "theme.bar.menus.menu.battery.text": "#e0def4",
+  "theme.bar.menus.menu.battery.label.color": "#f6c177",
+  "theme.bar.menus.menu.battery.border.color": "#2a273f",
+  "theme.bar.menus.menu.battery.background.color": "#232136",
+  "theme.bar.menus.menu.battery.card.color": "#2a283e",
+  "theme.bar.menus.menu.systray.dropdownmenu.divider": "#2a283e",
+  "theme.bar.menus.menu.systray.dropdownmenu.text": "#e0def4",
+  "theme.bar.menus.menu.systray.dropdownmenu.background": "#232136",
+  "theme.bar.menus.menu.bluetooth.iconbutton.active": "#9ccfd8",
+  "theme.bar.menus.menu.bluetooth.iconbutton.passive": "#e0def4",
+  "theme.bar.menus.menu.bluetooth.icons.active": "#9ccfd8",
+  "theme.bar.menus.menu.bluetooth.icons.passive": "#56526e",
+  "theme.bar.menus.menu.bluetooth.listitems.active": "#9ccfd8",
+  "theme.bar.menus.menu.bluetooth.listitems.passive": "#e0def4",
+  "theme.bar.menus.menu.bluetooth.switch.puck": "#393552",
+  "theme.bar.menus.menu.bluetooth.switch.disabled": "#2a273f",
+  "theme.bar.menus.menu.bluetooth.switch.enabled": "#9ccfd8",
+  "theme.bar.menus.menu.bluetooth.switch_divider": "#393552",
+  "theme.bar.menus.menu.bluetooth.status": "#393552",
+  "theme.bar.menus.menu.bluetooth.text": "#e0def4",
+  "theme.bar.menus.menu.bluetooth.label.color": "#9ccfd8",
+  "theme.bar.menus.menu.bluetooth.border.color": "#2a273f",
+  "theme.bar.menus.menu.bluetooth.background.color": "#232136",
+  "theme.bar.menus.menu.bluetooth.card.color": "#2a283e",
+  "theme.bar.menus.menu.network.iconbuttons.active": "#c4a7e7",
+  "theme.bar.menus.menu.network.iconbuttons.passive": "#e0def4",
+  "theme.bar.menus.menu.network.icons.active": "#c4a7e7",
+  "theme.bar.menus.menu.network.icons.passive": "#56526e",
+  "theme.bar.menus.menu.network.listitems.active": "#c4a7e7",
+  "theme.bar.menus.menu.network.listitems.passive": "#e0def4",
+  "theme.bar.menus.menu.network.status.color": "#393552",
+  "theme.bar.menus.menu.network.text": "#e0def4",
+  "theme.bar.menus.menu.network.label.color": "#c4a7e7",
+  "theme.bar.menus.menu.network.border.color": "#2a273f",
+  "theme.bar.menus.menu.network.background.color": "#232136",
+  "theme.bar.menus.menu.network.card.color": "#2a283e",
+  "theme.bar.menus.menu.volume.input_slider.puck": "#44415a",
+  "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#393552",
+  "theme.bar.menus.menu.volume.input_slider.background": "#44415a",
+  "theme.bar.menus.menu.volume.input_slider.primary": "#eb6f92",
+  "theme.bar.menus.menu.volume.audio_slider.puck": "#44415a",
+  "theme.bar.menus.menu.volume.audio_slider.backgroundhover": "#393552",
+  "theme.bar.menus.menu.volume.audio_slider.background": "#44415a",
+  "theme.bar.menus.menu.volume.audio_slider.primary": "#eb6f92",
+  "theme.bar.menus.menu.volume.icons.active": "#eb6f92",
+  "theme.bar.menus.menu.volume.icons.passive": "#56526e",
+  "theme.bar.menus.menu.volume.iconbutton.active": "#eb6f92",
+  "theme.bar.menus.menu.volume.iconbutton.passive": "#e0def4",
+  "theme.bar.menus.menu.volume.listitems.active": "#eb6f92",
+  "theme.bar.menus.menu.volume.listitems.passive": "#e0def4",
+  "theme.bar.menus.menu.volume.border.color": "#2a273f",
+  "theme.bar.menus.menu.volume.background.color": "#232136",
+  "theme.bar.menus.menu.media.slider.puck": "#393552",
+  "theme.bar.menus.menu.media.slider.backgroundhover": "#393552",
+  "theme.bar.menus.menu.media.slider.background": "#44415a",
+  "theme.bar.menus.menu.media.slider.primary": "#c4a7e7",
+  "theme.bar.menus.menu.media.buttons.text": "#232136",
+  "theme.bar.menus.menu.media.buttons.background": "#c4a7e7",
+  "theme.bar.menus.menu.media.buttons.enabled": "#9ccfd8",
+  "theme.bar.menus.menu.media.buttons.inactive": "#44415a",
+  "theme.bar.menus.menu.media.border.color": "#2a273f",
+  "theme.bar.menus.menu.media.background.color": "#232136",
+  "theme.bar.menus.menu.media.album": "#c4a7e7",
+  "theme.bar.menus.menu.media.artist": "#9ccfd8",
+  "theme.bar.menus.menu.media.song": "#c4a7e7",
+  "theme.bar.menus.tooltip.text": "#e0def4",
+  "theme.bar.menus.tooltip.background": "#232136",
+  "theme.bar.menus.dropdownmenu.divider": "#2a283e",
+  "theme.bar.menus.dropdownmenu.text": "#e0def4",
+  "theme.bar.menus.dropdownmenu.background": "#232136",
+  "theme.bar.menus.slider.puck": "#393552",
+  "theme.bar.menus.slider.backgroundhover": "#393552",
+  "theme.bar.menus.slider.background": "#44415a",
+  "theme.bar.menus.slider.primary": "#c4a7e7",
+  "theme.bar.menus.progressbar.background": "#393552",
+  "theme.bar.menus.progressbar.foreground": "#c4a7e7",
+  "theme.bar.menus.iconbuttons.active": "#c4a7e7",
+  "theme.bar.menus.iconbuttons.passive": "#e0def4",
+  "theme.bar.menus.buttons.text": "#2a273f",
+  "theme.bar.menus.buttons.disabled": "#44415a",
+  "theme.bar.menus.buttons.active": "#c4a7e7",
+  "theme.bar.menus.buttons.default": "#c4a7e7",
+  "theme.bar.menus.switch.puck": "#393552",
+  "theme.bar.menus.switch.disabled": "#2a273f",
+  "theme.bar.menus.switch.enabled": "#c4a7e7",
+  "theme.bar.menus.icons.active": "#c4a7e7",
+  "theme.bar.menus.icons.passive": "#44415a",
+  "theme.bar.menus.listitems.active": "#c4a7e7",
+  "theme.bar.menus.listitems.passive": "#e0def4",
+  "theme.bar.menus.label": "#c4a7e7",
+  "theme.bar.menus.feinttext": "#2a273f",
+  "theme.bar.menus.dimtext": "#44415a",
+  "theme.bar.menus.cards": "#2a283e",
+  "theme.bar.buttons.notifications.total": "#c4a7e7",
+  "theme.bar.buttons.notifications.icon": "#2a283e",
+  "theme.bar.buttons.notifications.background": "#2a283e",
+  "theme.bar.buttons.clock.icon": "#2a283e",
+  "theme.bar.buttons.clock.text": "#c4a7e7",
+  "theme.bar.buttons.clock.background": "#2a283e",
+  "theme.bar.buttons.battery.icon": "#2a283e",
+  "theme.bar.buttons.battery.text": "#f6c177",
+  "theme.bar.buttons.battery.background": "#2a283e",
+  "theme.bar.buttons.systray.background": "#2a283e",
+  "theme.bar.buttons.bluetooth.icon": "#2a283e",
+  "theme.bar.buttons.bluetooth.text": "#9ccfd8",
+  "theme.bar.buttons.bluetooth.background": "#2a283e",
+  "theme.bar.buttons.network.icon": "#2a283e",
+  "theme.bar.buttons.network.text": "#c4a7e7",
+  "theme.bar.buttons.network.background": "#2a283e",
+  "theme.bar.buttons.volume.icon": "#2a283e",
+  "theme.bar.buttons.volume.text": "#eb6f92",
+  "theme.bar.buttons.volume.background": "#2a283e",
+  "theme.bar.buttons.windowtitle.icon": "#2a283e",
+  "theme.bar.buttons.windowtitle.text": "#c4a7e7",
+  "theme.bar.buttons.windowtitle.background": "#2a283e",
+  "theme.bar.buttons.workspaces.active": "#c4a7e7",
+  "theme.bar.buttons.workspaces.occupied": "#eb6f92",
+  "theme.bar.buttons.workspaces.available": "#9ccfd8",
+  "theme.bar.buttons.workspaces.hover": "#c4a7e7",
+  "theme.bar.buttons.workspaces.background": "#2a283e",
+  "theme.bar.buttons.dashboard.icon": "#2a283e",
+  "theme.bar.buttons.dashboard.background": "#f6c177",
+  "theme.osd.label": "#c4a7e7",
+  "theme.osd.icon": "#232136",
+  "theme.osd.bar_overflow_color": "#eb6f92",
+  "theme.osd.bar_empty_color": "#2a273f",
+  "theme.osd.bar_color": "#c4a7e7",
+  "theme.osd.icon_container": "#c4a7e7",
+  "theme.osd.bar_container": "#232136",
+  "theme.notification.close_button.label": "#232136",
+  "theme.notification.close_button.background": "#eb6f92",
+  "theme.notification.labelicon": "#c4a7e7",
+  "theme.notification.text": "#e0def4",
+  "theme.notification.time": "#56526e",
+  "theme.notification.border": "#2a273f",
+  "theme.notification.label": "#c4a7e7",
+  "theme.notification.actions.text": "#2a273f",
+  "theme.notification.actions.background": "#c4a7e7",
+  "theme.notification.background": "#2a273f",
+  "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
+  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
+  "theme.bar.menus.menu.media.card.color": "#2a283e",
+  "theme.bar.menus.check_radio_button.background": "#393452",
+  "theme.bar.menus.check_radio_button.active": "#c4a7e7",
+  "theme.bar.buttons.style": "split",
+  "theme.bar.buttons.icon_background": "#242438",
+  "theme.bar.buttons.volume.icon_background": "#eb6f92",
+  "theme.bar.buttons.network.icon_background": "#c4a7e7",
+  "theme.bar.buttons.bluetooth.icon_background": "#9ccfd8",
+  "theme.bar.buttons.windowtitle.icon_background": "#c4a7e7",
+  "theme.bar.buttons.media.icon_background": "#c4a7e7",
+  "theme.bar.buttons.notifications.icon_background": "#c4a7e7",
+  "theme.bar.buttons.battery.icon_background": "#f6c177",
+  "theme.bar.buttons.clock.icon_background": "#c4a7e7",
+  "theme.bar.menus.menu.notifications.pager.button": "#c4a7e7",
+  "theme.bar.menus.menu.notifications.scrollbar.color": "#c4a7e7",
+  "theme.bar.menus.menu.notifications.pager.label": "#56526e",
+  "theme.bar.menus.menu.notifications.pager.background": "#232136",
+  "theme.bar.buttons.modules.ram.icon": "#181825",
+  "theme.bar.buttons.modules.storage.icon_background": "#eb6f92",
+  "theme.bar.menus.popover.border": "#2a273f",
+  "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#9ccfd8",
+  "theme.bar.menus.menu.power.buttons.restart.text": "#f6c177",
+  "theme.bar.buttons.modules.updates.background": "#2a283e",
+  "theme.bar.buttons.modules.storage.icon": "#181825",
+  "theme.bar.buttons.modules.netstat.background": "#2a283e",
+  "theme.bar.buttons.modules.weather.icon": "#2a283e",
+  "theme.bar.buttons.modules.netstat.text": "#9ccfd8",
+  "theme.bar.buttons.modules.storage.background": "#2a283e",
+  "theme.bar.buttons.modules.power.icon": "#181825",
+  "theme.bar.buttons.modules.storage.text": "#eb6f92",
+  "theme.bar.buttons.modules.cpu.background": "#2a283e",
+  "theme.bar.menus.menu.power.border.color": "#2a273f",
+  "theme.bar.buttons.modules.power.icon_background": "#eb6f92",
+  "theme.bar.menus.menu.power.buttons.logout.icon": "#2a273f",
+  "theme.bar.menus.menu.power.buttons.restart.icon_background": "#f6c177",
+  "theme.bar.menus.menu.power.buttons.restart.icon": "#2a273f",
+  "theme.bar.buttons.modules.cpu.icon": "#181825",
+  "theme.bar.buttons.modules.kbLayout.icon_background": "#9ccfd8",
+  "theme.bar.buttons.modules.weather.text": "#c4a7e7",
+  "theme.bar.menus.menu.power.buttons.shutdown.icon": "#2a273f",
+  "theme.bar.menus.menu.power.buttons.sleep.text": "#9ccfd8",
+  "theme.bar.buttons.modules.weather.icon_background": "#c4a7e7",
+  "theme.bar.menus.menu.power.buttons.shutdown.background": "#2a283e",
+  "theme.bar.menus.menu.power.buttons.logout.background": "#2a283e",
+  "theme.bar.buttons.modules.kbLayout.icon": "#181825",
+  "theme.bar.buttons.modules.ram.icon_background": "#f6c177",
+  "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#eb6f92",
+  "theme.bar.menus.menu.power.buttons.shutdown.text": "#eb6f92",
+  "theme.bar.menus.menu.power.buttons.sleep.background": "#2a283e",
+  "theme.bar.buttons.modules.ram.text": "#f6c177",
+  "theme.bar.menus.menu.power.buttons.logout.text": "#9ccfd8",
+  "theme.bar.buttons.modules.updates.icon_background": "#3e8eb0",
+  "theme.bar.buttons.modules.kbLayout.background": "#2a283e",
+  "theme.bar.buttons.modules.power.background": "#2a283e",
+  "theme.bar.buttons.modules.weather.background": "#2a283e",
+  "theme.bar.menus.menu.power.background.color": "#232136",
+  "theme.bar.buttons.modules.ram.background": "#2a283e",
+  "theme.bar.buttons.modules.netstat.icon": "#181825",
+  "theme.bar.buttons.modules.cpu.icon_background": "#eb6f92",
+  "theme.bar.menus.menu.power.buttons.logout.icon_background": "#9ccfd8",
+  "theme.bar.buttons.modules.updates.text": "#3e8eb0",
+  "theme.bar.menus.menu.power.buttons.sleep.icon": "#2a273f",
+  "theme.bar.menus.menu.power.buttons.restart.background": "#2a283e",
+  "theme.bar.buttons.modules.updates.icon": "#181825",
+  "theme.bar.buttons.modules.cpu.text": "#eb6f92",
+  "theme.bar.buttons.modules.netstat.icon_background": "#9ccfd8",
+  "theme.bar.buttons.modules.kbLayout.text": "#9ccfd8",
+  "theme.bar.buttons.modules.power.border": "#eb6f92",
+  "theme.bar.buttons.modules.weather.border": "#c4a7e7",
+  "theme.bar.buttons.modules.updates.border": "#30738f",
+  "theme.bar.buttons.modules.kbLayout.border": "#9ccfd8",
+  "theme.bar.buttons.modules.netstat.border": "#9ccfd8",
+  "theme.bar.buttons.modules.storage.border": "#eb6f92",
+  "theme.bar.buttons.modules.cpu.border": "#eb6f92",
+  "theme.bar.buttons.modules.ram.border": "#f6c177",
+  "theme.bar.buttons.notifications.border": "#c4a7e7",
+  "theme.bar.buttons.clock.border": "#c4a7e7",
+  "theme.bar.buttons.battery.border": "#f6c177",
+  "theme.bar.buttons.systray.border": "#26233a",
+  "theme.bar.buttons.bluetooth.border": "#9ccfd8",
+  "theme.bar.buttons.network.border": "#c4a7e7",
+  "theme.bar.buttons.volume.border": "#eb6f92",
+  "theme.bar.buttons.media.border": "#c4a7e7",
+  "theme.bar.buttons.windowtitle.border": "#c4a7e7",
+  "theme.bar.buttons.workspaces.border": "#1f1d2e",
+  "theme.bar.buttons.dashboard.border": "#f6c177",
+  "theme.bar.buttons.modules.submap.background": "#2a283e",
+  "theme.bar.buttons.modules.submap.text": "#9ccfd8",
+  "theme.bar.buttons.modules.submap.border": "#9ccfd8",
+  "theme.bar.buttons.modules.submap.icon": "#181825",
+  "theme.bar.buttons.modules.submap.icon_background": "#9ccfd8"
+}
\ No newline at end of file
diff --git a/themes/rose_pine_split.json b/themes/rose_pine_split.json
index 0f208e8..404693c 100644
--- a/themes/rose_pine_split.json
+++ b/themes/rose_pine_split.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#21202e",
   "theme.bar.buttons.notifications.total": "#c4a7e7",
   "theme.bar.buttons.notifications.icon": "#21202e",
-  "theme.bar.buttons.notifications.hover": "#26233a",
   "theme.bar.buttons.notifications.background": "#21202e",
   "theme.bar.buttons.clock.icon": "#21202e",
   "theme.bar.buttons.clock.text": "#c4a7e7",
-  "theme.bar.buttons.clock.hover": "#26233a",
   "theme.bar.buttons.clock.background": "#21202e",
   "theme.bar.buttons.battery.icon": "#21202e",
   "theme.bar.buttons.battery.text": "#f6c177",
-  "theme.bar.buttons.battery.hover": "#26233a",
   "theme.bar.buttons.battery.background": "#21202e",
-  "theme.bar.buttons.systray.hover": "#26233a",
   "theme.bar.buttons.systray.background": "#21202e",
   "theme.bar.buttons.bluetooth.icon": "#26233a",
   "theme.bar.buttons.bluetooth.text": "#9ccfd8",
-  "theme.bar.buttons.bluetooth.hover": "#26233a",
   "theme.bar.buttons.bluetooth.background": "#21202e",
   "theme.bar.buttons.network.icon": "#21202e",
   "theme.bar.buttons.network.text": "#c4a7e7",
-  "theme.bar.buttons.network.hover": "#26233a",
   "theme.bar.buttons.network.background": "#21202e",
   "theme.bar.buttons.volume.icon": "#21202e",
   "theme.bar.buttons.volume.text": "#eb6f92",
-  "theme.bar.buttons.volume.hover": "#26233a",
   "theme.bar.buttons.volume.background": "#21202e",
-  "theme.bar.buttons.media.hover": "#26233a",
   "theme.bar.buttons.windowtitle.icon": "#21202e",
   "theme.bar.buttons.windowtitle.text": "#c4a7e7",
-  "theme.bar.buttons.windowtitle.hover": "#26233a",
   "theme.bar.buttons.windowtitle.background": "#21202e",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#1f1d2e",
   "theme.bar.buttons.workspaces.active": "#c4a7e7",
   "theme.bar.buttons.workspaces.occupied": "#eb6f92",
   "theme.bar.buttons.workspaces.available": "#9ccfd8",
   "theme.bar.buttons.workspaces.hover": "#c4a7e7",
   "theme.bar.buttons.workspaces.background": "#21202e",
   "theme.bar.buttons.dashboard.icon": "#21202e",
-  "theme.bar.buttons.dashboard.hover": "#26233a",
   "theme.bar.buttons.dashboard.background": "#f6c177",
   "theme.osd.label": "#c4a7e7",
   "theme.osd.icon": "#191724",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#c4a7e7",
   "theme.bar.buttons.windowtitle.border": "#c4a7e7",
   "theme.bar.buttons.workspaces.border": "#1f1d2e",
-  "theme.bar.buttons.dashboard.border": "#f6c177"
+  "theme.bar.buttons.dashboard.border": "#f6c177",
+  "theme.bar.buttons.modules.submap.background": "#21202e",
+  "theme.bar.buttons.modules.submap.text": "#9ccfd8",
+  "theme.bar.buttons.modules.submap.border": "#9ccfd8",
+  "theme.bar.buttons.modules.submap.icon": "#181825",
+  "theme.bar.buttons.modules.submap.icon_background": "#9ccfd8"
 }
\ No newline at end of file
diff --git a/themes/tokyo_night.json b/themes/tokyo_night.json
index 07620cd..01e63c8 100644
--- a/themes/tokyo_night.json
+++ b/themes/tokyo_night.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#24283b",
   "theme.bar.buttons.notifications.total": "#bb9af7",
   "theme.bar.buttons.notifications.icon": "#bb9af7",
-  "theme.bar.buttons.notifications.hover": "#414868",
   "theme.bar.buttons.notifications.background": "#272a3d",
   "theme.bar.buttons.clock.icon": "#f7768e",
   "theme.bar.buttons.clock.text": "#f7768e",
-  "theme.bar.buttons.clock.hover": "#414868",
   "theme.bar.buttons.clock.background": "#272a3d",
   "theme.bar.buttons.battery.icon": "#e0af68",
   "theme.bar.buttons.battery.text": "#e0af68",
-  "theme.bar.buttons.battery.hover": "#414868",
   "theme.bar.buttons.battery.background": "#272a3d",
-  "theme.bar.buttons.systray.hover": "#414868",
   "theme.bar.buttons.systray.background": "#272a3d",
   "theme.bar.buttons.bluetooth.icon": "#7dcfff",
   "theme.bar.buttons.bluetooth.text": "#7dcfff",
-  "theme.bar.buttons.bluetooth.hover": "#414868",
   "theme.bar.buttons.bluetooth.background": "#272a3d",
   "theme.bar.buttons.network.icon": "#bb9af7",
   "theme.bar.buttons.network.text": "#bb9af7",
-  "theme.bar.buttons.network.hover": "#414868",
   "theme.bar.buttons.network.background": "#272a3d",
   "theme.bar.buttons.volume.icon": "#f7768e",
   "theme.bar.buttons.volume.text": "#f7768e",
-  "theme.bar.buttons.volume.hover": "#414868",
   "theme.bar.buttons.volume.background": "#272a3d",
-  "theme.bar.buttons.media.hover": "#414868",
   "theme.bar.buttons.windowtitle.icon": "#f7768e",
   "theme.bar.buttons.windowtitle.text": "#f7768e",
-  "theme.bar.buttons.windowtitle.hover": "#414868",
   "theme.bar.buttons.windowtitle.background": "#272a3d",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#24283b",
   "theme.bar.buttons.workspaces.active": "#f7768e",
   "theme.bar.buttons.workspaces.occupied": "#f7768e",
   "theme.bar.buttons.workspaces.available": "#7dcfff",
   "theme.bar.buttons.workspaces.hover": "#414868",
   "theme.bar.buttons.workspaces.background": "#272a3d",
   "theme.bar.buttons.dashboard.icon": "#e0af68",
-  "theme.bar.buttons.dashboard.hover": "#414868",
   "theme.bar.buttons.dashboard.background": "#272a3d",
   "theme.osd.label": "#bb9af7",
   "theme.osd.icon": "#1a1b26",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#bb9af7",
   "theme.bar.buttons.windowtitle.border": "#f7768e",
   "theme.bar.buttons.workspaces.border": "#f7768e",
-  "theme.bar.buttons.dashboard.border": "#e0af68"
+  "theme.bar.buttons.dashboard.border": "#e0af68",
+  "theme.bar.buttons.modules.submap.background": "#272a3d",
+  "theme.bar.buttons.modules.submap.text": "#73daca",
+  "theme.bar.buttons.modules.submap.border": "#73daca",
+  "theme.bar.buttons.modules.submap.icon": "#73daca",
+  "theme.bar.buttons.modules.submap.icon_background": "#272a3d"
 }
\ No newline at end of file
diff --git a/themes/tokyo_night_split.json b/themes/tokyo_night_split.json
index 83416a1..c4c51ca 100644
--- a/themes/tokyo_night_split.json
+++ b/themes/tokyo_night_split.json
@@ -201,43 +201,32 @@
   "theme.bar.menus.cards": "#24283b",
   "theme.bar.buttons.notifications.total": "#bb9af7",
   "theme.bar.buttons.notifications.icon": "#272a3d",
-  "theme.bar.buttons.notifications.hover": "#414868",
   "theme.bar.buttons.notifications.background": "#272a3d",
   "theme.bar.buttons.clock.icon": "#272a3d",
   "theme.bar.buttons.clock.text": "#f7768e",
-  "theme.bar.buttons.clock.hover": "#414868",
   "theme.bar.buttons.clock.background": "#272a3d",
   "theme.bar.buttons.battery.icon": "#272a3d",
   "theme.bar.buttons.battery.text": "#e0af68",
-  "theme.bar.buttons.battery.hover": "#414868",
   "theme.bar.buttons.battery.background": "#272a3d",
-  "theme.bar.buttons.systray.hover": "#414868",
   "theme.bar.buttons.systray.background": "#272a3d",
   "theme.bar.buttons.bluetooth.icon": "#272a3d",
   "theme.bar.buttons.bluetooth.text": "#7dcfff",
-  "theme.bar.buttons.bluetooth.hover": "#414868",
   "theme.bar.buttons.bluetooth.background": "#272a3d",
   "theme.bar.buttons.network.icon": "#272a3d",
   "theme.bar.buttons.network.text": "#bb9af7",
-  "theme.bar.buttons.network.hover": "#414868",
   "theme.bar.buttons.network.background": "#272a3d",
   "theme.bar.buttons.volume.icon": "#272a3d",
   "theme.bar.buttons.volume.text": "#f7768e",
-  "theme.bar.buttons.volume.hover": "#414868",
   "theme.bar.buttons.volume.background": "#272a3d",
-  "theme.bar.buttons.media.hover": "#414868",
   "theme.bar.buttons.windowtitle.icon": "#272a3d",
   "theme.bar.buttons.windowtitle.text": "#f7768e",
-  "theme.bar.buttons.windowtitle.hover": "#414868",
   "theme.bar.buttons.windowtitle.background": "#272a3d",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#24283b",
   "theme.bar.buttons.workspaces.active": "#f7768e",
   "theme.bar.buttons.workspaces.occupied": "#f7768e",
   "theme.bar.buttons.workspaces.available": "#7dcfff",
   "theme.bar.buttons.workspaces.hover": "#f7768e",
   "theme.bar.buttons.workspaces.background": "#272a3d",
   "theme.bar.buttons.dashboard.icon": "#272a3d",
-  "theme.bar.buttons.dashboard.hover": "#414868",
   "theme.bar.buttons.dashboard.background": "#e0af68",
   "theme.osd.label": "#bb9af7",
   "theme.osd.icon": "#1a1b26",
@@ -343,5 +332,10 @@
   "theme.bar.buttons.media.border": "#bb9af7",
   "theme.bar.buttons.windowtitle.border": "#f7768e",
   "theme.bar.buttons.workspaces.border": "#f7768e",
-  "theme.bar.buttons.dashboard.border": "#e0af68"
+  "theme.bar.buttons.dashboard.border": "#e0af68",
+  "theme.bar.buttons.modules.submap.background": "#272a3d",
+  "theme.bar.buttons.modules.submap.text": "#73daca",
+  "theme.bar.buttons.modules.submap.border": "#73daca",
+  "theme.bar.buttons.modules.submap.icon": "#181825",
+  "theme.bar.buttons.modules.submap.icon_background": "#73daca"
 }
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 0b2bd6c..f2567fd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,7 @@
         "module": "ES2022",
         "lib": ["ES2022"],
         "allowJs": true,
-        "checkJs": true,
+        "checkJs": false,
         "strict": true,
         "noImplicitAny": true,
         "strictNullChecks": true,
diff --git a/widget/settings/pages/config/general/index.ts b/widget/settings/pages/config/general/index.ts
index 3dc6c4a..86f6748 100644
--- a/widget/settings/pages/config/general/index.ts
+++ b/widget/settings/pages/config/general/index.ts
@@ -48,6 +48,20 @@ export const BarGeneral = (): Scrollable<Child, Attribute> => {
                         "Enabling this will change all overlays (Notifications, OSDs, Bar) to the 'top' layer instead the 'overlay' layer.",
                     type: 'boolean',
                 }),
+                Option({
+                    opt: options.menus.transition,
+                    title: 'Menu Transition',
+                    type: 'enum',
+                    enums: ['none', 'crossfade'],
+                }),
+                Option({
+                    opt: options.menus.transitionTime,
+                    title: 'Menu Transition Duration',
+                    type: 'number',
+                    min: 100,
+                    max: 10000,
+                    increment: 100,
+                }),
 
                 Header('Scaling'),
                 Option({