diff --git a/customModules/config.ts b/customModules/config.ts
index 5e72214..e698805 100644
--- a/customModules/config.ts
+++ b/customModules/config.ts
@@ -32,6 +32,11 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
                  ************************************
                  */
                 Header('RAM'),
+                Option({
+                    opt: options.theme.bar.buttons.modules.ram.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.customModules.ram.label,
                     title: 'Show Label',
@@ -83,6 +88,11 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
                  ************************************
                  */
                 Header('CPU'),
+                Option({
+                    opt: options.theme.bar.buttons.modules.cpu.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.customModules.cpu.label,
                     title: 'Show Label',
@@ -138,6 +148,11 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
                  ************************************
                  */
                 Header('Storage'),
+                Option({
+                    opt: options.theme.bar.buttons.modules.storage.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.customModules.storage.icon,
                     title: 'Storage Icon',
@@ -195,6 +210,11 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
                  ************************************
                  */
                 Header('Netstat'),
+                Option({
+                    opt: options.theme.bar.buttons.modules.netstat.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.customModules.netstat.networkInterface,
                     title: 'Network Interface',
@@ -265,6 +285,11 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
                  ************************************
                  */
                 Header('Keyboard Layout'),
+                Option({
+                    opt: options.theme.bar.buttons.modules.kbLayout.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.customModules.kbLayout.icon,
                     title: 'kbLayout Icon',
@@ -319,6 +344,11 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
                  ************************************
                  */
                 Header('Updates'),
+                Option({
+                    opt: options.theme.bar.buttons.modules.updates.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.customModules.updates.updateCommand,
                     title: 'Check Updates Command',
@@ -386,6 +416,11 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
                  ************************************
                  */
                 Header('Weather'),
+                Option({
+                    opt: options.theme.bar.buttons.modules.weather.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.customModules.weather.label,
                     title: 'Show Label',
@@ -434,6 +469,11 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
                  ************************************
                  */
                 Header('Power'),
+                Option({
+                    opt: options.theme.bar.buttons.modules.power.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.theme.bar.buttons.modules.power.spacing,
                     title: 'Spacing',
diff --git a/customModules/theme.ts b/customModules/theme.ts
index 3e3008f..dfa1463 100644
--- a/customModules/theme.ts
+++ b/customModules/theme.ts
@@ -29,6 +29,7 @@ export const CustomModuleTheme = (): Scrollable<GtkWidget, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.modules.ram.border, title: 'Border', type: 'color' }),
 
                 Header('CPU'),
                 Option({ opt: options.theme.bar.buttons.modules.cpu.text, title: 'Text', type: 'color' }),
@@ -45,6 +46,7 @@ export const CustomModuleTheme = (): Scrollable<GtkWidget, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.modules.cpu.border, title: 'Border', type: 'color' }),
 
                 Header('Storage'),
                 Option({ opt: options.theme.bar.buttons.modules.storage.text, title: 'Text', type: 'color' }),
@@ -61,6 +63,7 @@ export const CustomModuleTheme = (): Scrollable<GtkWidget, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.modules.storage.border, title: 'Border', type: 'color' }),
 
                 Header('Netstat'),
                 Option({ opt: options.theme.bar.buttons.modules.netstat.text, title: 'Text', type: 'color' }),
@@ -77,6 +80,7 @@ export const CustomModuleTheme = (): Scrollable<GtkWidget, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.modules.netstat.border, title: 'Border', type: 'color' }),
 
                 Header('Keyboard Layout'),
                 Option({ opt: options.theme.bar.buttons.modules.kbLayout.text, title: 'Text', type: 'color' }),
@@ -93,6 +97,7 @@ export const CustomModuleTheme = (): Scrollable<GtkWidget, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.modules.kbLayout.border, title: 'Border', type: 'color' }),
 
                 Header('Updates'),
                 Option({ opt: options.theme.bar.buttons.modules.updates.text, title: 'Text', type: 'color' }),
@@ -109,6 +114,7 @@ export const CustomModuleTheme = (): Scrollable<GtkWidget, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.modules.updates.border, title: 'Border', type: 'color' }),
 
                 Header('Weather'),
                 Option({ opt: options.theme.bar.buttons.modules.weather.icon, title: 'Icon', type: 'color' }),
@@ -125,6 +131,7 @@ export const CustomModuleTheme = (): Scrollable<GtkWidget, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.modules.weather.border, title: 'Border', type: 'color' }),
 
                 Header('Power'),
                 Option({ opt: options.theme.bar.buttons.modules.power.icon, title: 'Icon', type: 'color' }),
@@ -140,6 +147,7 @@ export const CustomModuleTheme = (): Scrollable<GtkWidget, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.modules.power.border, title: 'Border', type: 'color' }),
             ],
         }),
     });
diff --git a/modules/bar/battery/index.ts b/modules/bar/battery/index.ts
index 9579911..42e9980 100644
--- a/modules/bar/battery/index.ts
+++ b/modules/bar/battery/index.ts
@@ -54,7 +54,7 @@ const BatteryLabel = (): BarBoxChild => {
                         wave: 'style3',
                         wave2: 'style3',
                     };
-                    return `battery ${styleMap[style]} ${!showLabel ? 'no-label' : ''}`;
+                    return `battery-container ${styleMap[style]} ${!showLabel ? 'no-label' : ''}`;
                 },
             ),
             visible: battery.bind('available'),
diff --git a/modules/bar/bluetooth/index.ts b/modules/bar/bluetooth/index.ts
index 5aa5e9b..55381a3 100644
--- a/modules/bar/bluetooth/index.ts
+++ b/modules/bar/bluetooth/index.ts
@@ -33,7 +33,7 @@ const Bluetooth = (): BarBoxChild => {
                         wave: 'style3',
                         wave2: 'style3',
                     };
-                    return `bluetooth ${styleMap[style]} ${!showLabel ? 'no-label' : ''}`;
+                    return `bluetooth-container ${styleMap[style]} ${!showLabel ? 'no-label' : ''}`;
                 },
             ),
             children: options.bar.bluetooth.label.bind('value').as((showLabel) => {
diff --git a/modules/bar/clock/index.ts b/modules/bar/clock/index.ts
index 3518685..0b2fe21 100644
--- a/modules/bar/clock/index.ts
+++ b/modules/bar/clock/index.ts
@@ -39,7 +39,7 @@ const Clock = (): BarBoxChild => {
                         wave2: 'style3',
                     };
 
-                    return `bluetooth ${styleMap[btnStyle]} ${!shwLbl ? 'no-label' : ''} ${!shwIcn ? 'no-icon' : ''}`;
+                    return `clock-container ${styleMap[btnStyle]} ${!shwLbl ? 'no-label' : ''} ${!shwIcn ? 'no-icon' : ''}`;
                 },
             ),
             children: Utils.merge([showIcon.bind('value'), showTime.bind('value')], (shIcn, shTm) => {
diff --git a/modules/bar/media/index.ts b/modules/bar/media/index.ts
index 1b981ba..5892d7b 100644
--- a/modules/bar/media/index.ts
+++ b/modules/bar/media/index.ts
@@ -75,7 +75,7 @@ const Media = (): BarBoxChild => {
                             wave: 'style3',
                             wave2: 'style3',
                         };
-                        return `media ${styleMap[style]}`;
+                        return `media-container ${styleMap[style]}`;
                     },
                 ),
                 child: Widget.Box({
diff --git a/modules/bar/network/index.ts b/modules/bar/network/index.ts
index 1a33e59..056f455 100644
--- a/modules/bar/network/index.ts
+++ b/modules/bar/network/index.ts
@@ -31,12 +31,12 @@ const Network = (): BarBoxChild => {
                         wave: 'style3',
                         wave2: 'style3',
                     };
-                    return `network ${styleMap[style]}${!showLabel ? ' no-label' : ''}`;
+                    return `network-container ${styleMap[style]}${!showLabel ? ' no-label' : ''}`;
                 },
             ),
             children: [
                 Widget.Icon({
-                    class_name: 'bar-button-icon network',
+                    class_name: 'bar-button-icon network-icon',
                     icon: Utils.merge(
                         [network.bind('primary'), network.bind('wifi'), network.bind('wired')],
                         (pmry, wfi, wrd) => {
@@ -48,7 +48,6 @@ const Network = (): BarBoxChild => {
                     ),
                 }),
                 Widget.Box({
-                    vpack: 'center',
                     child: Utils.merge(
                         [
                             network.bind('primary'),
@@ -63,12 +62,12 @@ const Network = (): BarBoxChild => {
                             }
                             if (pmry === 'wired') {
                                 return Widget.Label({
-                                    class_name: 'bar-button-label network',
+                                    class_name: 'bar-button-label network-label',
                                     label: 'Wired'.substring(0, tSize),
                                 });
                             }
                             return Widget.Label({
-                                class_name: 'bar-button-label network',
+                                class_name: 'bar-button-label network-label',
                                 label: wfi.ssid ? `${trunc ? wfi.ssid.substring(0, tSize) : wfi.ssid}` : '--',
                             });
                         },
diff --git a/modules/bar/notifications/index.ts b/modules/bar/notifications/index.ts
index c3717b6..818f4ed 100644
--- a/modules/bar/notifications/index.ts
+++ b/modules/bar/notifications/index.ts
@@ -25,7 +25,7 @@ export const Notifications = (): BarBoxChild => {
                         wave: 'style3',
                         wave2: 'style3',
                     };
-                    return `notifications ${styleMap[style]} ${!showTotal ? 'no-label' : ''}`;
+                    return `notifications-container ${styleMap[style]} ${!showTotal ? 'no-label' : ''}`;
                 },
             ),
             child: Widget.Box({
diff --git a/modules/bar/systray/index.ts b/modules/bar/systray/index.ts
index 0f204c1..b6fece3 100644
--- a/modules/bar/systray/index.ts
+++ b/modules/bar/systray/index.ts
@@ -31,7 +31,7 @@ const SysTray = (): BarBoxChild => {
 
     return {
         component: Widget.Box({
-            class_name: 'systray',
+            class_name: 'systray-container',
             children: items,
         }),
         isVisible: true,
diff --git a/modules/bar/volume/index.ts b/modules/bar/volume/index.ts
index 32fe8dc..e85dc52 100644
--- a/modules/bar/volume/index.ts
+++ b/modules/bar/volume/index.ts
@@ -65,7 +65,7 @@ const Volume = (): BarBoxChild => {
                         wave: 'style3',
                         wave2: 'style3',
                     };
-                    return `volume ${styleMap[style]} ${!showLabel ? 'no-label' : ''}`;
+                    return `volume-container ${styleMap[style]} ${!showLabel ? 'no-label' : ''}`;
                 },
             ),
             children: options.bar.volume.label.bind('value').as((showLabel) => {
diff --git a/modules/bar/window_title/index.ts b/modules/bar/window_title/index.ts
index d5de870..ddfd44b 100644
--- a/modules/bar/window_title/index.ts
+++ b/modules/bar/window_title/index.ts
@@ -170,7 +170,7 @@ const ClientTitle = (): BarBoxChild => {
                         wave: 'style3',
                         wave2: 'style3',
                     };
-                    return `windowtitle ${styleMap[style]} ${!showLabel ? 'no-label' : ''}`;
+                    return `windowtitle-container ${styleMap[style]} ${!showLabel ? 'no-label' : ''}`;
                 },
             ),
             children: Utils.merge(
diff --git a/modules/bar/workspaces/index.ts b/modules/bar/workspaces/index.ts
index 161d292..caba353 100644
--- a/modules/bar/workspaces/index.ts
+++ b/modules/bar/workspaces/index.ts
@@ -15,7 +15,7 @@ const Workspaces = (monitor = -1): BarBoxChild => {
 
     return {
         component: Widget.Box({
-            class_name: 'workspaces',
+            class_name: 'workspaces-box-container',
             child: options.bar.workspaces.hideUnoccupied
                 .bind('value')
                 .as((hideUnoccupied) => (hideUnoccupied ? occupiedWses(monitor) : defaultWses(monitor))),
diff --git a/options.ts b/options.ts
index 5b96f25..6e601e3 100644
--- a/options.ts
+++ b/options.ts
@@ -162,6 +162,8 @@ const options = mkOptions(OPTIONS, {
             background: opt(colors.crust),
             buttons: {
                 style: opt<BarButtonStyles>('default'),
+                enableBorders: opt(false),
+                borderSize: opt('0.1em'),
                 monochrome: opt(false),
                 spacing: opt('0.25em'),
                 padding_x: opt('0.7rem'),
@@ -178,16 +180,19 @@ const options = mkOptions(OPTIONS, {
                 icon: opt(colors.lavender),
                 dashboard: {
                     background: opt(colors.base2),
-                    hover: opt(colors.surface1),
+                    enableBorder: opt(false),
+                    border: opt(colors.yellow),
                     icon: opt(colors.yellow),
                     spacing: opt('0.5em'),
                 },
                 workspaces: {
                     background: opt(colors.base2),
-                    hover: opt(colors.pink),
+                    enableBorder: opt(false),
+                    border: opt(colors.pink),
                     available: opt(colors.sky),
                     occupied: opt(colors.flamingo),
                     active: opt(colors.pink),
+                    hover: opt(colors.pink),
                     numbered_active_highlight_border: opt('0.2em'),
                     numbered_active_highlight_padding: opt('0.2em'),
                     numbered_active_highlighted_text_color: opt(colors.mantle),
@@ -197,68 +202,77 @@ const options = mkOptions(OPTIONS, {
                 },
                 windowtitle: {
                     background: opt(colors.base2),
-                    hover: opt(colors.surface1),
+                    enableBorder: opt(false),
+                    border: opt(colors.pink),
                     text: opt(colors.pink),
                     icon: opt(colors.pink),
                     icon_background: opt(colors.base2),
                     spacing: opt('0.5em'),
                 },
                 media: {
+                    enableBorder: opt(false),
+                    border: opt(colors.lavender),
                     background: opt(colors.base2),
-                    hover: opt(colors.surface1),
                     text: opt(colors.lavender),
                     icon: opt(colors.lavender),
                     icon_background: opt(colors.base2),
                     spacing: opt('0.5em'),
                 },
                 volume: {
+                    enableBorder: opt(false),
+                    border: opt(colors.maroon),
                     background: opt(colors.base2),
-                    hover: opt(colors.surface1),
                     text: opt(colors.maroon),
                     icon: opt(colors.maroon),
                     icon_background: opt(colors.base2),
                     spacing: opt('0.5em'),
                 },
                 network: {
+                    enableBorder: opt(false),
+                    border: opt(colors.mauve),
                     background: opt(colors.base2),
-                    hover: opt(colors.surface1),
                     text: opt(colors.mauve),
                     icon: opt(colors.mauve),
                     icon_background: opt(colors.base2),
                     spacing: opt('0.5em'),
                 },
                 bluetooth: {
+                    enableBorder: opt(false),
+                    border: opt(colors.sky),
                     background: opt(colors.base2),
-                    hover: opt(colors.surface1),
                     text: opt(colors.sky),
                     icon: opt(colors.sky),
                     icon_background: opt(colors.base2),
                     spacing: opt('0.5em'),
                 },
                 systray: {
+                    enableBorder: opt(false),
+                    border: opt(colors.lavender),
                     background: opt(colors.base2),
-                    hover: opt(colors.surface1),
                     spacing: opt('0.5em'),
                 },
                 battery: {
+                    enableBorder: opt(false),
+                    border: opt(colors.yellow),
                     background: opt(colors.base2),
-                    hover: opt(colors.surface1),
                     text: opt(colors.yellow),
                     icon: opt(colors.yellow),
                     icon_background: opt(colors.base2),
                     spacing: opt('0.5em'),
                 },
                 clock: {
+                    enableBorder: opt(false),
+                    border: opt(colors.pink),
                     background: opt(colors.base2),
-                    hover: opt(colors.surface1),
                     text: opt(colors.pink),
                     icon: opt(colors.pink),
                     icon_background: opt(colors.base2),
                     spacing: opt('0.5em'),
                 },
                 notifications: {
+                    enableBorder: opt(false),
+                    border: opt(colors.lavender),
                     background: opt(colors.base2),
-                    hover: opt(colors.surface1),
                     icon: opt(colors.lavender),
                     icon_background: opt(colors.base2),
                     total: opt(colors.lavender),
@@ -266,6 +280,8 @@ const options = mkOptions(OPTIONS, {
                 },
                 modules: {
                     ram: {
+                        enableBorder: opt(false),
+                        border: opt(colors.yellow),
                         background: opt(colors.base2),
                         text: opt(colors.yellow),
                         icon: opt(colors.yellow),
@@ -273,6 +289,8 @@ const options = mkOptions(OPTIONS, {
                         spacing: opt('0.45em'),
                     },
                     cpu: {
+                        enableBorder: opt(false),
+                        border: opt(colors.red),
                         background: opt(colors.base2),
                         text: opt(colors.red),
                         icon: opt(colors.red),
@@ -280,6 +298,8 @@ const options = mkOptions(OPTIONS, {
                         spacing: opt('0.5em'),
                     },
                     storage: {
+                        enableBorder: opt(false),
+                        border: opt(colors.pink),
                         background: opt(colors.base2),
                         text: opt(colors.pink),
                         icon: opt(colors.pink),
@@ -287,6 +307,8 @@ const options = mkOptions(OPTIONS, {
                         spacing: opt('0.45em'),
                     },
                     netstat: {
+                        enableBorder: opt(false),
+                        border: opt(colors.green),
                         background: opt(colors.base2),
                         text: opt(colors.green),
                         icon: opt(colors.green),
@@ -294,6 +316,8 @@ const options = mkOptions(OPTIONS, {
                         spacing: opt('0.45em'),
                     },
                     kbLayout: {
+                        enableBorder: opt(false),
+                        border: opt(colors.sky),
                         background: opt(colors.base2),
                         text: opt(colors.sky),
                         icon: opt(colors.sky),
@@ -301,6 +325,8 @@ const options = mkOptions(OPTIONS, {
                         spacing: opt('0.45em'),
                     },
                     updates: {
+                        enableBorder: opt(false),
+                        border: opt(colors.mauve),
                         background: opt(colors.base2),
                         text: opt(colors.mauve),
                         icon: opt(colors.mauve),
@@ -308,6 +334,8 @@ const options = mkOptions(OPTIONS, {
                         spacing: opt('0.45em'),
                     },
                     weather: {
+                        enableBorder: opt(false),
+                        border: opt(colors.lavender),
                         background: opt(colors.base2),
                         text: opt(colors.lavender),
                         icon: opt(colors.lavender),
@@ -315,6 +343,8 @@ const options = mkOptions(OPTIONS, {
                         spacing: opt('0.45em'),
                     },
                     power: {
+                        enableBorder: opt(false),
+                        border: opt(colors.red),
                         background: opt(colors.base2),
                         icon: opt(colors.red),
                         icon_background: opt(colors.base2),
diff --git a/scss/options_trackers.ts b/scss/optionsTrackers.ts
similarity index 100%
rename from scss/options_trackers.ts
rename to scss/optionsTrackers.ts
diff --git a/scss/style.ts b/scss/style.ts
index ebfb935..221ee08 100644
--- a/scss/style.ts
+++ b/scss/style.ts
@@ -1,7 +1,7 @@
 import options from 'options';
 import { bash, dependencies } from 'lib/utils';
 import { MatugenColors, RecursiveOptionsObject } from 'lib/types/options';
-import { initializeTrackers } from './options_trackers';
+import { initializeTrackers } from './optionsTrackers';
 import { generateMatugenColors, replaceHexValues } from '../services/matugen/index';
 
 const deps = ['font', 'theme', 'bar.flatButtons', 'bar.position', 'bar.battery.charging', 'bar.battery.blocks'];
diff --git a/scss/style/bar/audio.scss b/scss/style/bar/audio.scss
index adbee22..10e1a9d 100644
--- a/scss/style/bar/audio.scss
+++ b/scss/style/bar/audio.scss
@@ -1,28 +1,59 @@
 .bar-button-icon.volume {
-  font-size: 1.3em;
-  color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-volume-icon);
+    font-size: 1.3em;
+    color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-volume-icon);
 }
 
 .bar-button-label.volume {
-  color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-volume-text);
-  min-width: 2.2em;
-  margin-left: $bar-buttons-volume-spacing;
+    color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-volume-text);
+    min-width: 2.2em;
+    margin-left: $bar-buttons-volume-spacing;
 }
 
 .style2 {
-  .bar-button-icon.volume {
-    border-top-left-radius: $bar-buttons-radius;
-    border-bottom-left-radius: $bar-buttons-radius;
-    background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-volume-icon_background);
-    padding: $bar-buttons-padding_y 0em;
-    padding-left: $bar-buttons-padding_x;
-    padding-right: $bar-buttons-volume-spacing;
-  }
+    .bar-button-icon.volume {
+        border-top-left-radius: $bar-buttons-radius;
+        border-bottom-left-radius: $bar-buttons-radius;
+        background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-volume-icon_background);
+        padding: $bar-buttons-padding_y 0em;
+        padding-left: $bar-buttons-padding_x;
+        padding-right: $bar-buttons-volume-spacing;
+        border-top-left-radius: if(
+            $bar-buttons-volume-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+        border-bottom-left-radius: if(
+            $bar-buttons-volume-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+    }
 
-  .bar-button-label.volume {
-    padding: $bar-buttons-padding_y 0em;
-    padding-right: $bar-buttons-padding_x;
-    padding-left: $bar-buttons-volume-spacing;
-    margin-left: 0em;
-  }
+    .bar-button-label.volume {
+        padding: $bar-buttons-padding_y 0em;
+        padding-right: $bar-buttons-padding_x;
+        padding-left: $bar-buttons-volume-spacing;
+        margin-left: 0em;
+    }
+    &.no-label.volume-container {
+        .bar-button-icon.volume {
+            border-top-right-radius: if(
+                $bar-buttons-volume-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+            border-bottom-right-radius: if(
+                $bar-buttons-volume-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+        }
+    }
+}
+.bar_item_box_visible.volume {
+    border: if(
+        $bar-buttons-volume-enableBorder or $bar-buttons-enableBorders,
+        $bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-volume-border),
+        0em
+    );
 }
diff --git a/scss/style/bar/bar.scss b/scss/style/bar/bar.scss
index a94b30a..2930d15 100644
--- a/scss/style/bar/bar.scss
+++ b/scss/style/bar/bar.scss
@@ -1,22 +1,21 @@
 .bar {
-  * {
-    font-size: $font-size * $bar-scaling * 0.01;
-  }
+    * {
+        font-size: $font-size * $bar-scaling * 0.01;
+    }
 
-  .bar-panel-container {
-    margin-top: if($bar-floating, $bar-margin_top, 0em);
-    margin-bottom: if($bar-floating, $bar-margin_bottom, 0em);
-    margin-left: if($bar-floating, $bar-margin_sides, 0em);
-    margin-right: if($bar-floating, $bar-margin_sides, 0em);
-  }
+    .bar-panel-container {
+        margin-top: if($bar-floating, $bar-margin_top, 0em);
+        margin-bottom: if($bar-floating, $bar-margin_bottom, 0em);
+        margin-left: if($bar-floating, $bar-margin_sides, 0em);
+        margin-right: if($bar-floating, $bar-margin_sides, 0em);
+    }
 
-
-  .bar-panel {
-    $bar-opacity-ratio: $bar-opacity * 0.01;
-    $transparency-value: 1 - $bar-opacity-ratio;
-    background: if($bar-transparent, transparent, transparentize($bar-background, $transparency-value));
-    border-radius: if($bar-floating, $bar-border_radius, 0em);
-  }
+    .bar-panel {
+        $bar-opacity-ratio: $bar-opacity * 0.01;
+        $transparency-value: 1 - $bar-opacity-ratio;
+        background: if($bar-transparent, transparent, transparentize($bar-background, $transparency-value));
+        border-radius: if($bar-floating, $bar-border_radius, 0em);
+    }
 }
 
 $bar-button-background-opacity-ratio: $bar-buttons-background_opacity * 0.01;
@@ -26,186 +25,132 @@ $bar-button-background-hover-opacity-ratio: $bar-buttons-background_hover_opacit
 $transparency-value-hover: 1 - $bar-button-background-hover-opacity-ratio;
 
 .bar_item_box_visible {
-  background-color: transparentize($bar-buttons-background, $transparency-value);
-  border-radius: $bar-buttons-radius;
-  margin: $bar-buttons-y_margins $bar-buttons-spacing;
-  opacity: $bar-buttons-opacity * 0.01;
-  padding: $bar-buttons-padding_y $bar-buttons-padding_x;
+    background-color: transparentize($bar-buttons-background, $transparency-value);
+    border-radius: $bar-buttons-radius;
+    margin: $bar-buttons-y_margins $bar-buttons-spacing;
+    opacity: $bar-buttons-opacity * 0.01;
+    padding: $bar-buttons-padding_y $bar-buttons-padding_x;
 
-  &.style3 {
-    border-bottom-left-radius: 1.3em;
-    border-top-right-radius: 1.3em;
-  }
-
-  &.style4 {
-    border-bottom-right-radius: 1.3em;
-    border-top-left-radius: 1.3em;
-  }
-
-  &:hover {
-    background: transparentize($bar-buttons-hover, $transparency-value-hover);
-  }
-
-  &.battery {
-    background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-battery-background), $transparency-value);
-
-    &:hover {
-      background: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-battery-hover), $transparency-value-hover);
-    }
-  }
-
-  &.bluetooth {
-    background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-bluetooth-background), $transparency-value);
-
-    &:hover {
-      background: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-bluetooth-hover), $transparency-value-hover);
-    }
-  }
-
-  &.clock {
-    background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-clock-background), $transparency-value);
-
-    &:hover {
-      background: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-clock-hover), $transparency-value-hover);
-    }
-  }
-
-  &.media {
-    background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-media-background), $transparency-value);
-
-    &:hover {
-      background: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-media-hover), $transparency-value-hover);
-    }
-  }
-
-  &.dashboard {
-    background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-dashboard-background), $transparency-value);
-
-    &:hover {
-      background: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-dashboard-hover), $transparency-value-hover);
-    }
-  }
-
-  &.network {
-    background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-network-background), $transparency-value);
-
-    &:hover {
-      background: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-network-hover), $transparency-value-hover);
-    }
-  }
-
-  &.notifications {
-    background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-notifications-background), $transparency-value);
-
-    &:hover {
-      background: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-notifications-hover), $transparency-value-hover);
-    }
-  }
-
-  &.systray {
-    background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-systray-background), $transparency-value);
-
-    &:hover {
-      background: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-systray-hover), $transparency-value-hover);
-    }
-  }
-
-  &.volume {
-    background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-volume-background), $transparency-value);
-
-    &:hover {
-      background: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-volume-hover), $transparency-value-hover);
-    }
-  }
-
-  &.windowtitle {
-    background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-windowtitle-background), $transparency-value);
-
-    &:hover {
-      background: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-windowtitle-hover), $transparency-value-hover);
-    }
-  }
-
-  &.workspaces {
-    background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-workspaces-background), $transparency-value);
-  }
-
-  &.style2 {
-    padding: 0em;
-
-
-    &:hover {
-      .dashboard .bar-button_icon {
-        color: $bar-buttons-dashboard_background;
-      }
+    &.style3 {
+        border-bottom-left-radius: 1.3em;
+        border-top-right-radius: 1.3em;
     }
 
-    &:hover .no-label {
-      .battery .bar-button-icon {
-        background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-battery-hover), $transparency-value);
-        color: $bar-buttons-battery-icon_background;
-      }
+    &.style4 {
+        border-bottom-right-radius: 1.3em;
+        border-top-left-radius: 1.3em;
+    }
 
-      .bluetooth.bar-button-icon {
-        background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-bluetooth-hover), $transparency-value);
-        color: $bar-buttons-bluetooth-icon_background;
-      }
-
-      .media.bar-button-icon {
-        background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-media-hover), $transparency-value);
-        color: $bar-buttons-media-icon_background;
-      }
-
-      .network.bar-button-icon {
-        background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-network-hover), $transparency-value);
-        color: $bar-buttons-network-icon_background;
-      }
-
-      .notifications.bar-button-icon {
-        background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-notifications-hover), $transparency-value);
-        color: $bar-buttons-notifications-icon_background;
-      }
-
-      .volume.bar-button-icon {
-        background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-volume-hover), $transparency-value);
-        color: $bar-buttons-volume-icon_background;
-      }
-
-      .windowtitle.bar-button-icon {
-        background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-windowtitle-hover), $transparency-value);
-        color: $bar-buttons-windowtitle-icon_background;
-      }
-
-      .clock.bar-button-icon {
-        background-color: transparentize(if($bar-buttons-monochrome, $bar-buttons-hover, $bar-buttons-clock-hover), $transparency-value);
-        color: $bar-buttons-clock-icon_background;
-      }
-
-      .bar-button-icon {
+    &:hover {
         opacity: 0.5;
-      }
     }
-  }
+
+    &.battery {
+        background-color: transparentize(
+            if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-battery-background),
+            $transparency-value
+        );
+    }
+
+    &.bluetooth {
+        background-color: transparentize(
+            if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-bluetooth-background),
+            $transparency-value
+        );
+    }
+
+    &.clock {
+        background-color: transparentize(
+            if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-clock-background),
+            $transparency-value
+        );
+    }
+
+    &.media {
+        background-color: transparentize(
+            if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-media-background),
+            $transparency-value
+        );
+    }
+
+    &.dashboard {
+        background-color: transparentize(
+            if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-dashboard-background),
+            $transparency-value
+        );
+    }
+
+    &.network {
+        background-color: transparentize(
+            if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-network-background),
+            $transparency-value
+        );
+    }
+
+    &.notifications {
+        background-color: transparentize(
+            if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-notifications-background),
+            $transparency-value
+        );
+    }
+
+    &.systray {
+        background-color: transparentize(
+            if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-systray-background),
+            $transparency-value
+        );
+        &:hover {
+            opacity: 1;
+        }
+    }
+
+    &.volume {
+        background-color: transparentize(
+            if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-volume-background),
+            $transparency-value
+        );
+    }
+
+    &.windowtitle {
+        background-color: transparentize(
+            if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-windowtitle-background),
+            $transparency-value
+        );
+    }
+
+    &.workspaces {
+        background-color: transparentize(
+            if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-workspaces-background),
+            $transparency-value
+        );
+        &:hover {
+            opacity: 1;
+        }
+    }
+
+    &.style2 {
+        padding: 0em;
+    }
 }
 
 .no-label.style2 {
-  .bar-button-icon {
-    border-top-right-radius: $bar-buttons-radius;
-    border-bottom-right-radius: $bar-buttons-radius;
-  }
+    .bar-button-icon {
+        border-top-right-radius: $bar-buttons-radius;
+        border-bottom-right-radius: $bar-buttons-radius;
+    }
 }
 
 .bar_item_box_hidden {
-  background: none;
-  border-radius: 0rem;
-  padding: 0rem 0rem 0rem 0rem;
-  margin: 0rem 0rem 0rem 0rem;
+    background: none;
+    border-radius: 0rem;
+    padding: 0rem 0rem 0rem 0rem;
+    margin: 0rem 0rem 0rem 0rem;
 }
 
 .box-left {
-  margin-left: $bar-outer_spacing;
+    margin-left: $bar-outer_spacing;
 }
 
 .box-right {
-  margin-right: $bar-outer_spacing;
+    margin-right: $bar-outer_spacing;
 }
diff --git a/scss/style/bar/battery.scss b/scss/style/bar/battery.scss
index d690c2b..7f1df89 100644
--- a/scss/style/bar/battery.scss
+++ b/scss/style/bar/battery.scss
@@ -1,26 +1,58 @@
 .bar-button-label.battery {
-  color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-battery-text);
-  margin-left: $bar-buttons-battery-spacing;
+    color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-battery-text);
+    margin-left: $bar-buttons-battery-spacing;
 }
 
 .bar-button-icon.battery {
-  color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-battery-icon);
+    color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-battery-icon);
 }
 
 .style2 {
-  .bar-button-icon.battery {
-    border-top-left-radius: $bar-buttons-radius;
-    border-bottom-left-radius: $bar-buttons-radius;
-    background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-battery-icon_background);
-    padding: $bar-buttons-padding_y 0em;
-    padding-left: $bar-buttons-padding_x;
-    padding-right: $bar-buttons-battery-spacing;
-  }
+    .bar-button-icon.battery {
+        border-top-left-radius: $bar-buttons-radius;
+        border-bottom-left-radius: $bar-buttons-radius;
+        background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-battery-icon_background);
+        padding: $bar-buttons-padding_y 0em;
+        padding-left: $bar-buttons-padding_x;
+        padding-right: $bar-buttons-battery-spacing;
+        border-top-left-radius: if(
+            $bar-buttons-battery-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+        border-bottom-left-radius: if(
+            $bar-buttons-battery-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+    }
 
-  .bar-button-label.battery {
-    padding: $bar-buttons-padding_y 0em;
-    padding-right: $bar-buttons-padding_x;
-    padding-left: $bar-buttons-battery-spacing;
-    margin-left: 0em;
-  }
+    .bar-button-label.battery {
+        padding: $bar-buttons-padding_y 0em;
+        padding-right: $bar-buttons-padding_x;
+        padding-left: $bar-buttons-battery-spacing;
+        margin-left: 0em;
+    }
+    &.no-label.battery-container {
+        .bar-button-icon.battery {
+            border-top-right-radius: if(
+                $bar-buttons-battery-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+            border-bottom-right-radius: if(
+                $bar-buttons-battery-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+        }
+    }
+}
+
+.bar_item_box_visible.battery {
+    border: if(
+        $bar-buttons-battery-enableBorder or $bar-buttons-enableBorders,
+        $bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-battery-border),
+        0em
+    );
 }
diff --git a/scss/style/bar/bluetooth.scss b/scss/style/bar/bluetooth.scss
index ac9ac21..f641765 100644
--- a/scss/style/bar/bluetooth.scss
+++ b/scss/style/bar/bluetooth.scss
@@ -1,38 +1,70 @@
 .bar-button-icon.bluetooth {
-  font-size: 1.15em;
-  color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-bluetooth-icon);
+    font-size: 1.15em;
+    color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-bluetooth-icon);
 }
 
 .bar-button-label.bluetooth {
-  color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-bluetooth-text);
-  margin-left: $bar-buttons-bluetooth-spacing;
+    color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-bluetooth-text);
+    margin-left: $bar-buttons-bluetooth-spacing;
 }
 
 .bluetooth-disabled-menu {
-  font-weight: bold;
-  font-size: 1.1rem;
-  color: $surface2;
-  margin: 6rem 0rem;
+    font-weight: bold;
+    font-size: 1.1rem;
+    color: $surface2;
+    margin: 6rem 0rem;
 }
 
 .menu-button-isactive {
-  color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-bluetooth-text);
+    color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-bluetooth-text);
 }
 
 .style2 {
-  .bar-button-icon.bluetooth {
-    border-top-left-radius: $bar-buttons-radius;
-    border-bottom-left-radius: $bar-buttons-radius;
-    background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-bluetooth-icon_background);
-    padding: $bar-buttons-padding_y 0em;
-    padding-left: $bar-buttons-padding_x;
-    padding-right: $bar-buttons-bluetooth-spacing;
-  }
+    .bar-button-icon.bluetooth {
+        border-top-left-radius: $bar-buttons-radius;
+        border-bottom-left-radius: $bar-buttons-radius;
+        background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-bluetooth-icon_background);
+        padding: $bar-buttons-padding_y 0em;
+        padding-left: $bar-buttons-padding_x;
+        padding-right: $bar-buttons-bluetooth-spacing;
+        border-top-left-radius: if(
+            $bar-buttons-bluetooth-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+        border-bottom-left-radius: if(
+            $bar-buttons-bluetooth-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+    }
 
-  .bar-button-label.bluetooth {
-    padding: $bar-buttons-padding_y 0em;
-    padding-right: $bar-buttons-padding_x;
-    padding-left: $bar-buttons-bluetooth-spacing;
-    margin-left: 0em;
-  }
+    .bar-button-label.bluetooth {
+        padding: $bar-buttons-padding_y 0em;
+        padding-right: $bar-buttons-padding_x;
+        padding-left: $bar-buttons-bluetooth-spacing;
+        margin-left: 0em;
+    }
+    &.no-label.bluetooth-container {
+        .bar-button-icon.bluetooth {
+            border-top-right-radius: if(
+                $bar-buttons-bluetooth-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+            border-bottom-right-radius: if(
+                $bar-buttons-bluetooth-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+        }
+    }
+}
+
+.bar_item_box_visible.bluetooth {
+    border: if(
+        $bar-buttons-bluetooth-enableBorder or $bar-buttons-enableBorders,
+        $bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-bluetooth-border),
+        0em
+    );
 }
diff --git a/scss/style/bar/clock.scss b/scss/style/bar/clock.scss
index 7931651..c861ce7 100644
--- a/scss/style/bar/clock.scss
+++ b/scss/style/bar/clock.scss
@@ -1,27 +1,59 @@
 .bar-button-label.clock {
-  color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-clock-text);
-  margin-left: $bar-buttons-clock-spacing;
+    color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-clock-text);
+    margin-left: $bar-buttons-clock-spacing;
 }
 
 .bar-button-icon.clock {
-  font-size: 1.2em;
-  color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-clock-icon);
+    font-size: 1.2em;
+    color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-clock-icon);
 }
 
 .style2 {
-  .bar-button-icon.clock {
-    border-top-left-radius: $bar-buttons-radius;
-    border-bottom-left-radius: $bar-buttons-radius;
-    background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-clock-icon_background);
-    padding: $bar-buttons-padding_y 0em;
-    padding-left: $bar-buttons-padding_x;
-    padding-right: $bar-buttons-media-spacing;
-  }
+    .bar-button-icon.clock {
+        border-top-left-radius: $bar-buttons-radius;
+        border-bottom-left-radius: $bar-buttons-radius;
+        background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-clock-icon_background);
+        padding: $bar-buttons-padding_y 0em;
+        padding-left: $bar-buttons-padding_x;
+        padding-right: $bar-buttons-clock-spacing;
+        border-top-left-radius: if(
+            $bar-buttons-clock-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+        border-bottom-left-radius: if(
+            $bar-buttons-clock-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+    }
 
-  .bar-button-label.clock {
-    padding: $bar-buttons-padding_y 0em;
-    padding-right: $bar-buttons-padding_x;
-    padding-left: $bar-buttons-clock-spacing;
-    margin-left: 0em;
-  }
+    .bar-button-label.clock {
+        padding: $bar-buttons-padding_y 0em;
+        padding-right: $bar-buttons-padding_x;
+        padding-left: $bar-buttons-clock-spacing;
+        margin-left: 0em;
+    }
+    &.no-label.clock-container {
+        .bar-button-icon.clock {
+            border-top-right-radius: if(
+                $bar-buttons-clock-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+            border-bottom-right-radius: if(
+                $bar-buttons-clock-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+        }
+    }
+}
+
+.bar_item_box_visible.clock {
+    border: if(
+        $bar-buttons-clock-enableBorder or $bar-buttons-enableBorders,
+        $bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-clock-border),
+        0em
+    );
 }
diff --git a/scss/style/bar/media.scss b/scss/style/bar/media.scss
index 3db1919..95e8b49 100644
--- a/scss/style/bar/media.scss
+++ b/scss/style/bar/media.scss
@@ -1,27 +1,43 @@
 .bar-button-label.media {
-  color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-media-text);
-  margin-left: $bar-buttons-media-spacing;
+    color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-media-text);
+    margin-left: $bar-buttons-media-spacing;
 }
 
 .bar-button-icon.media {
-  font-size: 1.2em;
-  color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-media-icon);
+    font-size: 1.2em;
+    color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-media-icon);
 }
 
 .style2 {
-  .bar-button-icon.media {
-    border-top-left-radius: $bar-buttons-radius;
-    border-bottom-left-radius: $bar-buttons-radius;
-    background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-media-icon_background);
-    padding: $bar-buttons-padding_y 0em;
-    padding-left: $bar-buttons-padding_x;
-    padding-right: $bar-buttons-media-spacing;
-  }
+    .bar-button-icon.media {
+        background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-media-icon_background);
+        padding: $bar-buttons-padding_y 0em;
+        padding-left: $bar-buttons-padding_x;
+        padding-right: $bar-buttons-media-spacing;
+        border-top-left-radius: if(
+            $bar-buttons-media-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+        border-bottom-left-radius: if(
+            $bar-buttons-media-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+    }
 
-  .bar-button-label.media {
-    padding: $bar-buttons-padding_y 0em;
-    padding-right: $bar-buttons-padding_x;
-    padding-left: $bar-buttons-media-spacing;
-    margin-left: 0em;
-  }
+    .bar-button-label.media {
+        padding: $bar-buttons-padding_y 0em;
+        padding-right: $bar-buttons-padding_x;
+        padding-left: $bar-buttons-media-spacing;
+        margin-left: 0em;
+    }
+}
+
+.bar_item_box_visible.media {
+    border: if(
+        $bar-buttons-media-enableBorder or $bar-buttons-enableBorders,
+        $bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-media-border),
+        0em
+    );
 }
diff --git a/scss/style/bar/menu.scss b/scss/style/bar/menu.scss
index 8f38671..224956e 100644
--- a/scss/style/bar/menu.scss
+++ b/scss/style/bar/menu.scss
@@ -1,24 +1,25 @@
 .bar-menu_label {
-  color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-dashboard-icon);
-  font-size: 1.3em;
+    color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-dashboard-icon);
+    font-size: 1.3em;
+    border-radius: $bar-buttons-radius;
 }
 
 .bar_item_box_visible.style2.dashboard {
-  background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-dashboard-background);
-
-  .bar-menu_label {
-    color: if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-dashboard-icon);
-  }
-
-  &:hover {
-    background: if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-dashboard-icon);
+    background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-dashboard-background);
 
     .bar-menu_label {
-      color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-dashboard-background);
+        color: if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-dashboard-icon);
     }
-  }
 }
 
 .style2 .bar-menu_label {
-  padding: $bar-buttons-padding_y $bar-buttons-padding_x;
+    padding: $bar-buttons-padding_y $bar-buttons-padding_x;
+}
+
+.bar_item_box_visible.dashboard {
+    border: if(
+        $bar-buttons-dashboard-enableBorder or $bar-buttons-enableBorders,
+        $bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-dashboard-border),
+        0em
+    );
 }
diff --git a/scss/style/bar/network.scss b/scss/style/bar/network.scss
index 7476b86..a2b02c4 100644
--- a/scss/style/bar/network.scss
+++ b/scss/style/bar/network.scss
@@ -1,26 +1,58 @@
-.bar-button-label.network {
-  color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-network-text);
-  margin-left: $bar-buttons-network-spacing;
+.bar-button-label.network-label {
+    color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-network-text);
+    margin-left: $bar-buttons-network-spacing;
 }
 
-.bar-button-icon.network {
-  color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-network-icon);
+.bar-button-icon.network-icon {
+    color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-network-icon);
 }
 
 .style2 {
-  .bar-button-icon.network {
-    border-top-left-radius: $bar-buttons-radius;
-    border-bottom-left-radius: $bar-buttons-radius;
-    background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-network-icon_background);
-    padding: $bar-buttons-padding_y 0em;
-    padding-left: $bar-buttons-padding_x;
-    padding-right: $bar-buttons-network-spacing;
-  }
+    .bar-button-icon.network-icon {
+        border-top-left-radius: $bar-buttons-radius;
+        border-bottom-left-radius: $bar-buttons-radius;
+        background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-network-icon_background);
+        padding: $bar-buttons-padding_y 0em;
+        padding-left: $bar-buttons-padding_x;
+        padding-right: $bar-buttons-network-spacing;
+        border-top-left-radius: if(
+            $bar-buttons-network-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+        border-bottom-left-radius: if(
+            $bar-buttons-network-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+    }
 
-  .bar-button-label.network {
-    padding: $bar-buttons-padding_y 0em;
-    padding-right: $bar-buttons-padding_x;
-    padding-left: $bar-buttons-network-spacing;
-    margin-left: 0em;
-  }
+    .bar-button-label.network-label {
+        padding: $bar-buttons-padding_y 0em;
+        padding-right: $bar-buttons-padding_x;
+        padding-left: $bar-buttons-network-spacing;
+        margin-left: 0em;
+    }
+    &.no-label.network-container {
+        .bar-button-icon.network-icon {
+            border-top-right-radius: if(
+                $bar-buttons-network-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+            border-bottom-right-radius: if(
+                $bar-buttons-network-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+        }
+    }
+}
+
+.bar_item_box_visible.network {
+    border: if(
+        $bar-buttons-network-enableBorder or $bar-buttons-enableBorders,
+        $bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-network-border),
+        0em
+    );
 }
diff --git a/scss/style/bar/notifications.scss b/scss/style/bar/notifications.scss
index 03bd9cf..56e500a 100644
--- a/scss/style/bar/notifications.scss
+++ b/scss/style/bar/notifications.scss
@@ -1,28 +1,61 @@
 .bar-button-icon.notifications {
-  color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-notifications-icon);
-  font-size: 1.3em;
+    color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-notifications-icon);
+    font-size: 1.3em;
 }
 
 .bar-button-label.notifications {
-  color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-notifications-total);
-  margin-left: $bar-buttons-notifications-spacing;
-  min-width: 1em;
+    color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-notifications-total);
+    margin-left: $bar-buttons-notifications-spacing;
+    min-width: 1em;
 }
 
 .style2 {
-  .bar-button-icon.notifications {
-    border-top-left-radius: $bar-buttons-radius;
-    border-bottom-left-radius: $bar-buttons-radius;
-    background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-notifications-icon_background);
-    padding: $bar-buttons-padding_y 0em;
-    padding-left: $bar-buttons-padding_x;
-    padding-right: $bar-buttons-notifications-spacing;
-  }
+    .bar-button-icon.notifications {
+        border-top-left-radius: $bar-buttons-radius;
+        border-bottom-left-radius: $bar-buttons-radius;
+        background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-notifications-icon_background);
+        padding: $bar-buttons-padding_y 0em;
+        padding-left: $bar-buttons-padding_x;
+        padding-right: $bar-buttons-notifications-spacing;
+        border-top-left-radius: if(
+            $bar-buttons-notifications-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+        border-bottom-left-radius: if(
+            $bar-buttons-notifications-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+    }
 
-  .bar-button-label.notifications {
-    padding: $bar-buttons-padding_y 0em;
-    padding-right: $bar-buttons-padding_x;
-    padding-left: $bar-buttons-notifications-spacing;
-    margin-left: 0em;
-  }
+    .bar-button-label.notifications {
+        padding: $bar-buttons-padding_y 0em;
+        padding-right: $bar-buttons-padding_x;
+        padding-left: $bar-buttons-notifications-spacing;
+        margin-left: 0em;
+    }
+
+    &.no-label.notifications-container {
+        .bar-button-icon.notifications {
+            border-top-right-radius: if(
+                $bar-buttons-notifications-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+            border-bottom-right-radius: if(
+                $bar-buttons-notifications-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+        }
+    }
+}
+
+.bar_item_box_visible.notifications {
+    border: if(
+        $bar-buttons-notifications-enableBorder or $bar-buttons-enableBorders,
+        $bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-notifications-border),
+        0em
+    );
 }
diff --git a/scss/style/bar/systray.scss b/scss/style/bar/systray.scss
index 838207c..f135d24 100644
--- a/scss/style/bar/systray.scss
+++ b/scss/style/bar/systray.scss
@@ -9,3 +9,11 @@
 .style2.systray {
     padding: $bar-buttons-padding_y $bar-buttons-padding_x;
 }
+
+.bar_item_box_visible.systray {
+    border: if(
+        $bar-buttons-systray-enableBorder or $bar-buttons-enableBorders,
+        $bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-systray-border),
+        0em
+    );
+}
diff --git a/scss/style/bar/window_title.scss b/scss/style/bar/window_title.scss
index 92bee80..0fd422c 100644
--- a/scss/style/bar/window_title.scss
+++ b/scss/style/bar/window_title.scss
@@ -1,30 +1,66 @@
 .bar-button-icon.windowtitle {
-  color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-windowtitle-icon);
+    color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-windowtitle-icon);
 }
 
 .bar-button-label.windowtitle {
-  color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-windowtitle-text);
-  margin-left: $bar-buttons-windowtitle-spacing;
+    color: if($bar-buttons-monochrome, $bar-buttons-text, $bar-buttons-windowtitle-text);
+    margin-left: $bar-buttons-windowtitle-spacing;
 
-  &.no-icon {
-    margin-left: 0;
-  }
+    &.no-icon {
+        margin-left: 0;
+    }
 }
 
 .style2 {
-  .bar-button-icon.windowtitle {
-    border-top-left-radius: $bar-buttons-radius;
-    border-bottom-left-radius: $bar-buttons-radius;
-    background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-windowtitle-icon_background);
-    padding: $bar-buttons-padding_y 0em;
-    padding-left: $bar-buttons-padding_x;
-    padding-right: $bar-buttons-windowtitle-spacing;
-  }
+    .bar-button-icon.windowtitle {
+        border-top-left-radius: $bar-buttons-radius;
+        border-bottom-left-radius: $bar-buttons-radius;
+        background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-windowtitle-icon_background);
+        padding: $bar-buttons-padding_y 0em;
+        padding-left: $bar-buttons-padding_x;
+        padding-right: $bar-buttons-windowtitle-spacing;
+        border-top-left-radius: if(
+            $bar-buttons-windowtitle-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+        border-bottom-left-radius: if(
+            $bar-buttons-windowtitle-enableBorder or $bar-buttons-enableBorders,
+            $bar-buttons-radius * 0.4,
+            $bar-buttons-radius
+        );
+    }
 
-  .bar-button-label.windowtitle {
-    padding: $bar-buttons-padding_y 0em;
-    padding-right: $bar-buttons-padding_x;
-    padding-left: $bar-buttons-windowtitle-spacing;
-    margin-left: 0em;
-  }
+    .bar-button-label.windowtitle {
+        padding: $bar-buttons-padding_y 0em;
+        padding-right: $bar-buttons-padding_x;
+        padding-left: $bar-buttons-windowtitle-spacing;
+        margin-left: 0em;
+
+        &.no-icon {
+            padding-left: $bar-buttons-padding_x;
+        }
+    }
+    &.no-label.windowtitle-container {
+        .bar-button-icon.windowtitle {
+            border-top-right-radius: if(
+                $bar-buttons-windowtitle-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+            border-bottom-right-radius: if(
+                $bar-buttons-windowtitle-enableBorder or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+        }
+    }
+}
+
+.bar_item_box_visible.windowtitle {
+    border: if(
+        $bar-buttons-windowtitle-enableBorder or $bar-buttons-enableBorders,
+        $bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-windowtitle-border),
+        0em
+    );
 }
diff --git a/scss/style/bar/workspace.scss b/scss/style/bar/workspace.scss
index 3480e87..07562e0 100644
--- a/scss/style/bar/workspace.scss
+++ b/scss/style/bar/workspace.scss
@@ -80,3 +80,11 @@
 .style2.workspaces {
     padding: $bar-buttons-padding_y $bar-buttons-padding_x;
 }
+
+.bar_item_box_visible.workspaces {
+    border: if(
+        $bar-buttons-workspaces-enableBorder or $bar-buttons-enableBorders,
+        $bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-workspaces-border),
+        0em
+    );
+}
diff --git a/scss/style/customModules/style.scss b/scss/style/customModules/style.scss
index c67d2a2..69bd0d6 100644
--- a/scss/style/customModules/style.scss
+++ b/scss/style/customModules/style.scss
@@ -4,31 +4,31 @@
  * #################################
  */
 .bar-button-label {
-  margin-left: 0.5em;
-  color: $text;
+    margin-left: 0.5em;
+    color: $text;
 }
 
 .module-icon {
-  font-size: 1em;
+    font-size: 1em;
 }
 
 .style2 {
-  .bar-button-icon {
-    border-top-left-radius: $bar-buttons-radius;
-    border-bottom-left-radius: $bar-buttons-radius;
-    padding: $bar-buttons-padding_y 0em;
-    padding-left: $bar-buttons-padding_x;
-    padding-right: 0.5em;
-    background: $text;
-    color: $bar-background;
-  }
+    .bar-button-icon {
+        border-top-left-radius: $bar-buttons-radius;
+        border-bottom-left-radius: $bar-buttons-radius;
+        padding: $bar-buttons-padding_y 0em;
+        padding-left: $bar-buttons-padding_x;
+        padding-right: 0.5em;
+        background: $text;
+        color: $bar-background;
+    }
 
-  .bar-button-label {
-    padding: $bar-buttons-padding_y 0em;
-    padding-right: $bar-buttons-padding_x;
-    padding-left: 0.5em;
-    margin-left: 0em;
-  }
+    .bar-button-label {
+        padding: $bar-buttons-padding_y 0em;
+        padding-right: $bar-buttons-padding_x;
+        padding-left: 0.5em;
+        margin-left: 0em;
+    }
 }
 
 /* 
@@ -36,48 +36,86 @@
  * #        Styling Function       #
  * #################################
  */
-@mixin styleModule($class, $textColor, $iconColor, $iconBackground, $labelBackground, $spacing, $fontSize: 1em) {
-  .bar_item_box_visible {
-    &.#{$class} {
-      background: $labelBackground;
+@mixin styleModule(
+    $class,
+    $textColor,
+    $iconColor,
+    $iconBackground,
+    $labelBackground,
+    $spacing,
+    $borderEnabled,
+    $borderColor,
+    $fontSize: 1em
+) {
+    .bar_item_box_visible {
+        &.#{$class} {
+            background: $labelBackground;
+            border: if(
+                $borderEnabled or $bar-buttons-enableBorders,
+                $bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $borderColor),
+                0em
+            );
 
-      &.style2 {
-        background: transparent;
-      }
+            &.style2 {
+                background: transparent;
+            }
 
-      &:hover {
-        opacity: 0.5;
-      }
-    }
-  }
-
-
-  .module-label.#{$class} {
-    color: if($bar-buttons-monochrome, $bar-buttons-text, $textColor);
-    margin-left: $spacing;
-    border-radius: $bar-buttons-radius;
-  }
-
-  .module-icon.#{$class} {
-    color: if($bar-buttons-monochrome, $bar-buttons-icon, $iconColor);
-    font-size: if($fontSize, $fontSize, 1em);
-  }
-
-  .style2 {
-    .module-icon.#{$class} {
-      background: if($bar-buttons-monochrome, $bar-buttons-icon, $iconBackground);
-      padding-right: $spacing;
-      color: if($bar-buttons-monochrome, $bar-buttons-background, $iconColor);
+            &:hover {
+                opacity: 0.5;
+            }
+        }
     }
 
     .module-label.#{$class} {
-      background: $labelBackground;
-      padding-left: $spacing * 1.5;
-      margin-left: 0em;
-      border-top-left-radius: 0em;
-      border-bottom-left-radius: 0em;
+        color: if($bar-buttons-monochrome, $bar-buttons-text, $textColor);
+        margin-left: $spacing;
+        border-radius: $bar-buttons-radius;
+    }
+
+    .module-icon.#{$class} {
+        color: if($bar-buttons-monochrome, $bar-buttons-icon, $iconColor);
+        font-size: if($fontSize, $fontSize, 1em);
+    }
+
+    .style2 {
+        .module-icon.#{$class} {
+            background: if($bar-buttons-monochrome, $bar-buttons-icon, $iconBackground);
+            padding-right: $spacing;
+            color: if($bar-buttons-monochrome, $bar-buttons-background, $iconColor);
+            border-top-left-radius: if(
+                $borderEnabled or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+            border-bottom-left-radius: if(
+                $borderEnabled or $bar-buttons-enableBorders,
+                $bar-buttons-radius * 0.4,
+                $bar-buttons-radius
+            );
+        }
+
+        .module-label.#{$class} {
+            background: $labelBackground;
+            padding-left: $spacing * 1.5;
+            margin-left: 0em;
+            border-top-left-radius: 0em;
+            border-bottom-left-radius: 0em;
+        }
+        &.no-label.#{$class} {
+            .module-icon {
+                border-top-right-radius: if(
+                    $borderEnabled or $bar-buttons-enableBorders,
+                    $bar-buttons-radius * 0.4,
+                    $bar-buttons-radius
+                );
+                border-bottom-right-radius: if(
+                    $borderEnabled or $bar-buttons-enableBorders,
+                    $bar-buttons-radius * 0.4,
+                    $bar-buttons-radius
+                );
+            }
+        }
     }
-  }
 }
 
 /* 
@@ -85,19 +123,25 @@
  * #      Ram Module Styling       #
  * #################################
  */
-@include styleModule( //
-  // class name
-  'ram',
-  // label color
-  $bar-buttons-modules-ram-text,
-  // icon color
-  $bar-buttons-modules-ram-icon,
-  // icon background if split style is used
-  $bar-buttons-modules-ram-icon_background,
-  // label background
-  $bar-buttons-modules-ram-background,
-  // inner spacing
-  $bar-buttons-modules-ram-spacing //
+@include styleModule(
+    //
+    // class name
+    'ram',
+    // label color
+    $bar-buttons-modules-ram-text,
+    // icon color
+    $bar-buttons-modules-ram-icon,
+    // icon background if split style is used
+    $bar-buttons-modules-ram-icon_background,
+    // label background
+    $bar-buttons-modules-ram-background,
+    // inner spacing
+    $bar-buttons-modules-ram-spacing,
+    //
+    // if border enabled
+    $bar-buttons-modules-ram-enableBorder,
+    // border color
+    $bar-buttons-modules-ram-border
 );
 
 /* 
@@ -105,21 +149,26 @@
  * #      Cpu Module Styling       #
  * #################################
  */
-@include styleModule( //
-  // class name
-  'cpu',
-  // label color
-  $bar-buttons-modules-cpu-text,
-  // icon color
-  $bar-buttons-modules-cpu-icon,
-  // icon background if split style is used
-  $bar-buttons-modules-cpu-icon_background,
-  // label background
-  $bar-buttons-modules-cpu-background,
-  // inner spacing
-  $bar-buttons-modules-cpu-spacing,
-  // custom font size
-  1.05em //
+@include styleModule(
+    //
+    // class name
+    'cpu',
+    // label color
+    $bar-buttons-modules-cpu-text,
+    // icon color
+    $bar-buttons-modules-cpu-icon,
+    // icon background if split style is used
+    $bar-buttons-modules-cpu-icon_background,
+    // label background
+    $bar-buttons-modules-cpu-background,
+    // inner spacing
+    $bar-buttons-modules-cpu-spacing,
+    // if border enabled
+    $bar-buttons-modules-cpu-enableBorder,
+    // border color
+    $bar-buttons-modules-cpu-border,
+    // custom font size
+    1.05em //
 );
 
 /* 
@@ -127,21 +176,26 @@
  * #    Storage Module Styling     #
  * #################################
  */
-@include styleModule( //
-  // class name
-  'storage',
-  // label color
-  $bar-buttons-modules-storage-text,
-  // icon color
-  $bar-buttons-modules-storage-icon,
-  // icon background if split style is used
-  $bar-buttons-modules-storage-icon_background,
-  // label background
-  $bar-buttons-modules-storage-background,
-  // inner spacing
-  $bar-buttons-modules-storage-spacing,
-  // custom font size
-  1.3em //
+@include styleModule(
+    //
+    // class name
+    'storage',
+    // label color
+    $bar-buttons-modules-storage-text,
+    // icon color
+    $bar-buttons-modules-storage-icon,
+    // icon background if split style is used
+    $bar-buttons-modules-storage-icon_background,
+    // label background
+    $bar-buttons-modules-storage-background,
+    // inner spacing
+    $bar-buttons-modules-storage-spacing,
+    // if border enabled
+    $bar-buttons-modules-storage-enableBorder,
+    // border color
+    $bar-buttons-modules-storage-border,
+    // custom font size
+    1.3em //
 );
 
 /* 
@@ -149,21 +203,26 @@
  * #    Netstat Module Styling     #
  * #################################
  */
-@include styleModule( //
-  // class name
-  'netstat',
-  // label color
-  $bar-buttons-modules-netstat-text,
-  // icon color
-  $bar-buttons-modules-netstat-icon,
-  // icon background if split style is used
-  $bar-buttons-modules-netstat-icon_background,
-  // label background
-  $bar-buttons-modules-netstat-background,
-  // inner spacing
-  $bar-buttons-modules-netstat-spacing,
-  // custom font size
-  1.2em //
+@include styleModule(
+    //
+    // class name
+    'netstat',
+    // label color
+    $bar-buttons-modules-netstat-text,
+    // icon color
+    $bar-buttons-modules-netstat-icon,
+    // icon background if split style is used
+    $bar-buttons-modules-netstat-icon_background,
+    // label background
+    $bar-buttons-modules-netstat-background,
+    // inner spacing
+    $bar-buttons-modules-netstat-spacing,
+    // if border enabled
+    $bar-buttons-modules-netstat-enableBorder,
+    // border color
+    $bar-buttons-modules-netstat-border,
+    // custom font size
+    1.2em //
 );
 
 /* 
@@ -171,21 +230,26 @@
  * #    KB Layout Module Styling   #
  * #################################
  */
-@include styleModule( //
-  // class name
-  'kblayout',
-  // label color
-  $bar-buttons-modules-kbLayout-text,
-  // icon color
-  $bar-buttons-modules-kbLayout-icon,
-  // icon background if split style is used
-  $bar-buttons-modules-kbLayout-icon_background,
-  // label background
-  $bar-buttons-modules-kbLayout-background,
-  // inner spacing
-  $bar-buttons-modules-kbLayout-spacing,
-  // custom font size
-  1.2em //
+@include styleModule(
+    //
+    // class name
+    'kblayout',
+    // label color
+    $bar-buttons-modules-kbLayout-text,
+    // icon color
+    $bar-buttons-modules-kbLayout-icon,
+    // icon background if split style is used
+    $bar-buttons-modules-kbLayout-icon_background,
+    // label background
+    $bar-buttons-modules-kbLayout-background,
+    // inner spacing
+    $bar-buttons-modules-kbLayout-spacing,
+    // if border enabled
+    $bar-buttons-modules-kbLayout-enableBorder,
+    // border color
+    $bar-buttons-modules-kbLayout-border,
+    // custom font size
+    1.2em //
 );
 
 /* 
@@ -193,21 +257,26 @@
  * #    Updates Module Styling     #
  * #################################
  */
-@include styleModule( //
-  // class name
-  'updates',
-  // label color
-  $bar-buttons-modules-updates-text,
-  // icon color
-  $bar-buttons-modules-updates-icon,
-  // icon background if split style is used
-  $bar-buttons-modules-updates-icon_background,
-  // label background
-  $bar-buttons-modules-updates-background,
-  // inner spacing
-  $bar-buttons-modules-updates-spacing,
-  // custom font size
-  1.2em //
+@include styleModule(
+    //
+    // class name
+    'updates',
+    // label color
+    $bar-buttons-modules-updates-text,
+    // icon color
+    $bar-buttons-modules-updates-icon,
+    // icon background if split style is used
+    $bar-buttons-modules-updates-icon_background,
+    // label background
+    $bar-buttons-modules-updates-background,
+    // inner spacing
+    $bar-buttons-modules-updates-spacing,
+    // if border enabled
+    $bar-buttons-modules-updates-enableBorder,
+    // border color
+    $bar-buttons-modules-updates-border,
+    // custom font size
+    1.2em //
 );
 
 /* 
@@ -215,21 +284,26 @@
  * #    Weather Module Styling     #
  * #################################
  */
-@include styleModule( //
-  // class name
-  'weather-custom',
-  // label color
-  $bar-buttons-modules-weather-text,
-  // icon color
-  $bar-buttons-modules-weather-icon,
-  // icon background if split style is used
-  $bar-buttons-modules-weather-icon_background,
-  // label background
-  $bar-buttons-modules-weather-background,
-  // inner spacing
-  $bar-buttons-modules-weather-spacing,
-  // custom font size
-  1.2em //
+@include styleModule(
+    //
+    // class name
+    'weather-custom',
+    // label color
+    $bar-buttons-modules-weather-text,
+    // icon color
+    $bar-buttons-modules-weather-icon,
+    // icon background if split style is used
+    $bar-buttons-modules-weather-icon_background,
+    // label background
+    $bar-buttons-modules-weather-background,
+    // inner spacing
+    $bar-buttons-modules-weather-spacing,
+    // if border enabled
+    $bar-buttons-modules-weather-enableBorder,
+    // border color
+    $bar-buttons-modules-weather-border,
+    // custom font size
+    1.2em //
 );
 
 /* 
@@ -237,19 +311,24 @@
  * #    Power Module Styling       #
  * #################################
  */
-@include styleModule( //
-  // class name
-  'powermodule',
-  // label color
-  $red,
-  // icon color
-  $bar-buttons-modules-power-icon,
-  // icon background if split style is used
-  $bar-buttons-modules-power-icon_background,
-  // label background
-  $bar-buttons-modules-power-background,
-  // inner spacing
-  $bar-buttons-modules-power-spacing,
-  // custom font size
-  1.3em //
+@include styleModule(
+    //
+    // class name
+    'powermodule',
+    // label color
+    $red,
+    // icon color
+    $bar-buttons-modules-power-icon,
+    // icon background if split style is used
+    $bar-buttons-modules-power-icon_background,
+    // label background
+    $bar-buttons-modules-power-background,
+    // inner spacing
+    $bar-buttons-modules-power-spacing,
+    // if border enabled
+    $bar-buttons-modules-power-enableBorder,
+    // border color
+    $bar-buttons-modules-power-border,
+    // custom font size
+    1.3em //
 );
diff --git a/themes/catppuccin_frappe.json b/themes/catppuccin_frappe.json
index a3d975a..6656935 100644
--- a/themes/catppuccin_frappe.json
+++ b/themes/catppuccin_frappe.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.cpu.text": "#e78284",
   "theme.bar.buttons.modules.netstat.icon_background": "#a6d189",
   "theme.bar.buttons.modules.kbLayout.text": "#99d1db",
-  "theme.bar.buttons.notifications.icon_background": "#babbf1"
-}
+  "theme.bar.buttons.notifications.icon_background": "#babbf1",
+  "theme.bar.buttons.modules.power.border": "#e78284",
+  "theme.bar.buttons.modules.weather.border": "#babbf1",
+  "theme.bar.buttons.modules.updates.border": "#ca9ee6",
+  "theme.bar.buttons.modules.kbLayout.border": "#99d1db",
+  "theme.bar.buttons.modules.netstat.border": "#a6d189",
+  "theme.bar.buttons.modules.storage.border": "#e78284",
+  "theme.bar.buttons.modules.cpu.border": "#e78284",
+  "theme.bar.buttons.modules.ram.border": "#e5c890",
+  "theme.bar.buttons.notifications.border": "#babbf1",
+  "theme.bar.buttons.clock.border": "#f4b8e4",
+  "theme.bar.buttons.battery.border": "#e5c890",
+  "theme.bar.buttons.systray.border": "#51576d",
+  "theme.bar.buttons.bluetooth.border": "#99d1db",
+  "theme.bar.buttons.network.border": "#ca9ee6",
+  "theme.bar.buttons.volume.border": "#ea999c",
+  "theme.bar.buttons.media.border": "#babbf1",
+  "theme.bar.buttons.windowtitle.border": "#f4b8e4",
+  "theme.bar.buttons.workspaces.border": "#232634",
+  "theme.bar.buttons.dashboard.border": "#e5c890"
+}
\ No newline at end of file
diff --git a/themes/catppuccin_frappe_split.json b/themes/catppuccin_frappe_split.json
index 52a2e90..385a838 100644
--- a/themes/catppuccin_frappe_split.json
+++ b/themes/catppuccin_frappe_split.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.updates.icon": "#181825",
   "theme.bar.buttons.modules.cpu.text": "#e78284",
   "theme.bar.buttons.modules.netstat.icon_background": "#a6d189",
-  "theme.bar.buttons.modules.kbLayout.text": "#99d1db"
-}
+  "theme.bar.buttons.modules.kbLayout.text": "#99d1db",
+  "theme.bar.buttons.modules.power.border": "#e78284",
+  "theme.bar.buttons.modules.weather.border": "#babbf1",
+  "theme.bar.buttons.modules.updates.border": "#ca9ee6",
+  "theme.bar.buttons.modules.kbLayout.border": "#99d1db",
+  "theme.bar.buttons.modules.netstat.border": "#a6d189",
+  "theme.bar.buttons.modules.storage.border": "#e78284",
+  "theme.bar.buttons.modules.cpu.border": "#e78284",
+  "theme.bar.buttons.modules.ram.border": "#e5c890",
+  "theme.bar.buttons.notifications.border": "#babbf1",
+  "theme.bar.buttons.clock.border": "#f4b8e4",
+  "theme.bar.buttons.battery.border": "#e5c890",
+  "theme.bar.buttons.systray.border": "#51576d",
+  "theme.bar.buttons.bluetooth.border": "#99d1db",
+  "theme.bar.buttons.network.border": "#ca9ee6",
+  "theme.bar.buttons.volume.border": "#ea999c",
+  "theme.bar.buttons.media.border": "#babbf1",
+  "theme.bar.buttons.windowtitle.border": "#f4b8e4",
+  "theme.bar.buttons.workspaces.border": "#232634",
+  "theme.bar.buttons.dashboard.border": "#e5c890"
+}
\ No newline at end of file
diff --git a/themes/catppuccin_latte.json b/themes/catppuccin_latte.json
index fa5a94d..1360c73 100644
--- a/themes/catppuccin_latte.json
+++ b/themes/catppuccin_latte.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.cpu.text": "#d20f39",
   "theme.bar.buttons.modules.netstat.icon_background": "#40a02b",
   "theme.bar.buttons.modules.kbLayout.text": "#04a5e5",
-  "theme.bar.buttons.notifications.icon_background": "#7287fd"
-}
+  "theme.bar.buttons.notifications.icon_background": "#7287fd",
+  "theme.bar.buttons.modules.power.border": "#d20f39",
+  "theme.bar.buttons.modules.weather.border": "#7287fd",
+  "theme.bar.buttons.modules.updates.border": "#8839ef",
+  "theme.bar.buttons.modules.kbLayout.border": "#04a5e5",
+  "theme.bar.buttons.modules.netstat.border": "#40a02b",
+  "theme.bar.buttons.modules.storage.border": "#d20f39",
+  "theme.bar.buttons.modules.cpu.border": "#d20f39",
+  "theme.bar.buttons.modules.ram.border": "#df8e1d",
+  "theme.bar.buttons.notifications.border": "#7287fd",
+  "theme.bar.buttons.clock.border": "#ea76cb",
+  "theme.bar.buttons.battery.border": "#df8e1d",
+  "theme.bar.buttons.systray.border": "#bcc0cc",
+  "theme.bar.buttons.bluetooth.border": "#04a5e5",
+  "theme.bar.buttons.network.border": "#8839ef",
+  "theme.bar.buttons.volume.border": "#e64553",
+  "theme.bar.buttons.media.border": "#7287fd",
+  "theme.bar.buttons.windowtitle.border": "#ea76cb",
+  "theme.bar.buttons.workspaces.border": "#dce0e8",
+  "theme.bar.buttons.dashboard.border": "#df8e1d"
+}
\ No newline at end of file
diff --git a/themes/catppuccin_latte_split.json b/themes/catppuccin_latte_split.json
index 6faf07b..17755b5 100644
--- a/themes/catppuccin_latte_split.json
+++ b/themes/catppuccin_latte_split.json
@@ -1,29 +1,8 @@
 {
-  "theme.bar.menus.background": "#eff1f5",
-  "theme.bar.background": "#eff1f5",
-  "theme.bar.buttons.media.icon": "#dcdee8",
-  "theme.bar.buttons.media.text": "#7287fd",
-  "theme.bar.buttons.icon": "#7287fd",
-  "theme.bar.buttons.text": "#7287fd",
-  "theme.bar.buttons.hover": "#bcc0cc",
-  "theme.bar.buttons.background": "#e6e9ef",
-  "theme.bar.menus.text": "#4c4f69",
-  "theme.bar.menus.border.color": "#ccd0da",
-  "theme.bar.buttons.media.background": "#dcdfe8",
-  "theme.bar.menus.menu.volume.text": "#4c4f69",
-  "theme.bar.menus.menu.volume.card.color": "#dcdfe8",
-  "theme.bar.menus.menu.volume.label.color": "#e64553",
-  "theme.bar.menus.popover.text": "#7287fd",
-  "theme.bar.menus.popover.background": "#dce0e8",
-  "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#d20f39",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#d20f39",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#40a02b",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#dce0e8",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#4c4f69",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#7287fd",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#ccd0da",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#dce0e8",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#eff1f5",
+  "theme.bar.menus.menu.notifications.scrollbar.color": "#7287fd",
+  "theme.bar.menus.menu.notifications.pager.label": "#7c7f93",
+  "theme.bar.menus.menu.notifications.pager.button": "#7287fd",
+  "theme.bar.menus.menu.notifications.pager.background": "#eff1f5",
   "theme.bar.menus.menu.notifications.switch.puck": "#bcc0cc",
   "theme.bar.menus.menu.notifications.switch.disabled": "#ccd0da",
   "theme.bar.menus.menu.notifications.switch.enabled": "#7287fd",
@@ -34,6 +13,24 @@
   "theme.bar.menus.menu.notifications.background": "#eff1f5",
   "theme.bar.menus.menu.notifications.no_notifications_label": "#ccd0da",
   "theme.bar.menus.menu.notifications.label": "#7287fd",
+  "theme.bar.menus.menu.power.buttons.sleep.icon": "#dce0e8",
+  "theme.bar.menus.menu.power.buttons.sleep.text": "#04a5e5",
+  "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#04a5e5",
+  "theme.bar.menus.menu.power.buttons.sleep.background": "#dcdfe8",
+  "theme.bar.menus.menu.power.buttons.logout.icon": "#dce0e8",
+  "theme.bar.menus.menu.power.buttons.logout.text": "#40a02b",
+  "theme.bar.menus.menu.power.buttons.logout.icon_background": "#40a02b",
+  "theme.bar.menus.menu.power.buttons.logout.background": "#dcdfe8",
+  "theme.bar.menus.menu.power.buttons.restart.icon": "#dce0e8",
+  "theme.bar.menus.menu.power.buttons.restart.text": "#fe640b",
+  "theme.bar.menus.menu.power.buttons.restart.icon_background": "#fe640b",
+  "theme.bar.menus.menu.power.buttons.restart.background": "#dcdfe8",
+  "theme.bar.menus.menu.power.buttons.shutdown.icon": "#dce0e8",
+  "theme.bar.menus.menu.power.buttons.shutdown.text": "#d20f39",
+  "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#d20f39",
+  "theme.bar.menus.menu.power.buttons.shutdown.background": "#dcdfe8",
+  "theme.bar.menus.menu.power.border.color": "#ccd0da",
+  "theme.bar.menus.menu.power.background.color": "#eff1f5",
   "theme.bar.menus.menu.dashboard.monitors.disk.label": "#ea76cb",
   "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#ea76cb",
   "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#ea76cb",
@@ -67,9 +64,18 @@
   "theme.bar.menus.menu.dashboard.shortcuts.recording": "#40a02b",
   "theme.bar.menus.menu.dashboard.shortcuts.text": "#dce0e8",
   "theme.bar.menus.menu.dashboard.shortcuts.background": "#7287fd",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#dce0e8",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#d20f39",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#40a02b",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#4c4f69",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#7287fd",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#ccd0da",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#dce0e8",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#eff1f5",
   "theme.bar.menus.menu.dashboard.powermenu.sleep": "#04a5e5",
   "theme.bar.menus.menu.dashboard.powermenu.logout": "#40a02b",
   "theme.bar.menus.menu.dashboard.powermenu.restart": "#fe640b",
+  "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#d20f39",
   "theme.bar.menus.menu.dashboard.profile.name": "#ea76cb",
   "theme.bar.menus.menu.dashboard.border.color": "#ccd0da",
   "theme.bar.menus.menu.dashboard.background.color": "#eff1f5",
@@ -156,8 +162,11 @@
   "theme.bar.menus.menu.volume.iconbutton.passive": "#4c4f69",
   "theme.bar.menus.menu.volume.listitems.active": "#e64553",
   "theme.bar.menus.menu.volume.listitems.passive": "#4c4f69",
+  "theme.bar.menus.menu.volume.text": "#4c4f69",
+  "theme.bar.menus.menu.volume.label.color": "#e64553",
   "theme.bar.menus.menu.volume.border.color": "#ccd0da",
   "theme.bar.menus.menu.volume.background.color": "#e6e9ef",
+  "theme.bar.menus.menu.volume.card.color": "#dcdfe8",
   "theme.bar.menus.menu.media.slider.puck": "#9ca0b0",
   "theme.bar.menus.menu.media.slider.backgroundhover": "#bcc0cc",
   "theme.bar.menus.menu.media.slider.background": "#acb0be",
@@ -167,6 +176,7 @@
   "theme.bar.menus.menu.media.buttons.enabled": "#179299",
   "theme.bar.menus.menu.media.buttons.inactive": "#acb0be",
   "theme.bar.menus.menu.media.border.color": "#ccd0da",
+  "theme.bar.menus.menu.media.card.color": "#dcdfe8",
   "theme.bar.menus.menu.media.background.color": "#eff1f5",
   "theme.bar.menus.menu.media.album": "#ea76cb",
   "theme.bar.menus.menu.media.artist": "#179299",
@@ -188,6 +198,8 @@
   "theme.bar.menus.buttons.disabled": "#acb0be",
   "theme.bar.menus.buttons.active": "#ea76cb",
   "theme.bar.menus.buttons.default": "#7287fd",
+  "theme.bar.menus.check_radio_button.active": "#7186fd",
+  "theme.bar.menus.check_radio_button.background": "#dcdfe8",
   "theme.bar.menus.switch.puck": "#bcc0cc",
   "theme.bar.menus.switch.disabled": "#ccd0da",
   "theme.bar.menus.switch.enabled": "#7287fd",
@@ -195,50 +207,115 @@
   "theme.bar.menus.icons.passive": "#acb0be",
   "theme.bar.menus.listitems.active": "#7287fd",
   "theme.bar.menus.listitems.passive": "#4c4f69",
+  "theme.bar.menus.popover.border": "#dce0e8",
+  "theme.bar.menus.popover.background": "#dce0e8",
+  "theme.bar.menus.popover.text": "#7287fd",
   "theme.bar.menus.label": "#7287fd",
   "theme.bar.menus.feinttext": "#ccd0da",
   "theme.bar.menus.dimtext": "#acb0be",
+  "theme.bar.menus.text": "#4c4f69",
+  "theme.bar.menus.border.color": "#ccd0da",
   "theme.bar.menus.cards": "#dce0e8",
+  "theme.bar.menus.background": "#eff1f5",
+  "theme.bar.buttons.modules.power.icon_background": "#d20f39",
+  "theme.bar.buttons.modules.power.icon": "#181825",
+  "theme.bar.buttons.modules.power.background": "#dcdfe8",
+  "theme.bar.buttons.modules.power.border": "#d20f39",
+  "theme.bar.buttons.modules.weather.icon_background": "#7287fd",
+  "theme.bar.buttons.modules.weather.icon": "#dcdfe8",
+  "theme.bar.buttons.modules.weather.text": "#7287fd",
+  "theme.bar.buttons.modules.weather.background": "#dcdfe8",
+  "theme.bar.buttons.modules.weather.border": "#7287fd",
+  "theme.bar.buttons.modules.updates.icon_background": "#8839ef",
+  "theme.bar.buttons.modules.updates.icon": "#181825",
+  "theme.bar.buttons.modules.updates.text": "#8839ef",
+  "theme.bar.buttons.modules.updates.background": "#dcdfe8",
+  "theme.bar.buttons.modules.updates.border": "#8839ef",
+  "theme.bar.buttons.modules.kbLayout.icon_background": "#04a5e5",
+  "theme.bar.buttons.modules.kbLayout.icon": "#181825",
+  "theme.bar.buttons.modules.kbLayout.text": "#04a5e5",
+  "theme.bar.buttons.modules.kbLayout.background": "#dcdfe8",
+  "theme.bar.buttons.modules.kbLayout.border": "#04a5e5",
+  "theme.bar.buttons.modules.netstat.icon_background": "#40a02b",
+  "theme.bar.buttons.modules.netstat.icon": "#181825",
+  "theme.bar.buttons.modules.netstat.text": "#40a02b",
+  "theme.bar.buttons.modules.netstat.background": "#dcdfe8",
+  "theme.bar.buttons.modules.netstat.border": "#40a02b",
+  "theme.bar.buttons.modules.storage.icon_background": "#d20f39",
+  "theme.bar.buttons.modules.storage.icon": "#181825",
+  "theme.bar.buttons.modules.storage.text": "#d20f39",
+  "theme.bar.buttons.modules.storage.background": "#dcdfe8",
+  "theme.bar.buttons.modules.storage.border": "#d20f39",
+  "theme.bar.buttons.modules.cpu.icon_background": "#d20f39",
+  "theme.bar.buttons.modules.cpu.icon": "#181825",
+  "theme.bar.buttons.modules.cpu.text": "#d20f39",
+  "theme.bar.buttons.modules.cpu.background": "#dcdfe8",
+  "theme.bar.buttons.modules.cpu.border": "#d20f39",
+  "theme.bar.buttons.modules.ram.icon_background": "#df8e1d",
+  "theme.bar.buttons.modules.ram.icon": "#181825",
+  "theme.bar.buttons.modules.ram.text": "#df8e1d",
+  "theme.bar.buttons.modules.ram.background": "#dcdfe8",
+  "theme.bar.buttons.modules.ram.border": "#df8e1d",
   "theme.bar.buttons.notifications.total": "#7287fd",
+  "theme.bar.buttons.notifications.icon_background": "#7287fd",
   "theme.bar.buttons.notifications.icon": "#dcdee8",
-  "theme.bar.buttons.notifications.hover": "#bcc0cc",
   "theme.bar.buttons.notifications.background": "#dcdfe8",
+  "theme.bar.buttons.notifications.border": "#7287fd",
+  "theme.bar.buttons.clock.icon_background": "#ea76cb",
   "theme.bar.buttons.clock.icon": "#dcdee8",
   "theme.bar.buttons.clock.text": "#ea76cb",
-  "theme.bar.buttons.clock.hover": "#bcc0cc",
   "theme.bar.buttons.clock.background": "#dcdfe8",
+  "theme.bar.buttons.clock.border": "#ea76cb",
+  "theme.bar.buttons.battery.icon_background": "#df8e1d",
   "theme.bar.buttons.battery.icon": "#dcdee8",
   "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.battery.border": "#df8e1d",
   "theme.bar.buttons.systray.background": "#dcdfe8",
+  "theme.bar.buttons.systray.border": "#bcc0cc",
+  "theme.bar.buttons.bluetooth.icon_background": "#04a5e5",
   "theme.bar.buttons.bluetooth.icon": "#dcdee8",
   "theme.bar.buttons.bluetooth.text": "#04a5e5",
-  "theme.bar.buttons.bluetooth.hover": "#bcc0cc",
   "theme.bar.buttons.bluetooth.background": "#dcdfe8",
+  "theme.bar.buttons.bluetooth.border": "#04a5e5",
+  "theme.bar.buttons.network.icon_background": "#8839ef",
   "theme.bar.buttons.network.icon": "#dcdee8",
   "theme.bar.buttons.network.text": "#8839ef",
-  "theme.bar.buttons.network.hover": "#bcc0cc",
   "theme.bar.buttons.network.background": "#dcdfe8",
+  "theme.bar.buttons.network.border": "#8839ef",
+  "theme.bar.buttons.volume.icon_background": "#e64553",
   "theme.bar.buttons.volume.icon": "#dcdee8",
   "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.volume.border": "#e64553",
+  "theme.bar.buttons.media.icon_background": "#7287fd",
+  "theme.bar.buttons.media.icon": "#dcdee8",
+  "theme.bar.buttons.media.text": "#7287fd",
+  "theme.bar.buttons.media.background": "#dcdfe8",
+  "theme.bar.buttons.media.border": "#7287fd",
+  "theme.bar.buttons.windowtitle.icon_background": "#ea76cb",
   "theme.bar.buttons.windowtitle.icon": "#dcdee8",
   "theme.bar.buttons.windowtitle.text": "#ea76cb",
-  "theme.bar.buttons.windowtitle.hover": "#bcc0cc",
+  "theme.bar.buttons.windowtitle.border": "#ea76cb",
   "theme.bar.buttons.windowtitle.background": "#dcdfe8",
-  "theme.bar.buttons.workspaces.numbered_active_text_color": "#dce0e8",
+  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#f5c2e7",
+  "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
+  "theme.bar.buttons.workspaces.hover": "#bcc0cc",
   "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.border": "#dce0e8",
   "theme.bar.buttons.workspaces.background": "#dcdfe8",
   "theme.bar.buttons.dashboard.icon": "#dcdee8",
-  "theme.bar.buttons.dashboard.hover": "#bcc0cc",
+  "theme.bar.buttons.dashboard.border": "#df8e1d",
   "theme.bar.buttons.dashboard.background": "#df8e1d",
+  "theme.bar.buttons.icon": "#7287fd",
+  "theme.bar.buttons.text": "#7287fd",
+  "theme.bar.buttons.hover": "#bcc0cc",
+  "theme.bar.buttons.icon_background": "#242438",
+  "theme.bar.buttons.background": "#e6e9ef",
+  "theme.bar.buttons.style": "split",
+  "theme.bar.background": "#eff1f5",
   "theme.osd.label": "#7287fd",
   "theme.osd.icon": "#ccd0da",
   "theme.osd.bar_overflow_color": "#d20f39",
@@ -255,74 +332,5 @@
   "theme.notification.label": "#7287fd",
   "theme.notification.actions.text": "#dce0e8",
   "theme.notification.actions.background": "#7287fd",
-  "theme.notification.background": "#ccd0da",
-  "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": "#dcdfe8",
-  "theme.bar.menus.check_radio_button.background": "#dcdfe8",
-  "theme.bar.menus.check_radio_button.active": "#7186fd",
-  "theme.bar.buttons.style": "split",
-  "theme.bar.buttons.icon_background": "#242438",
-  "theme.bar.buttons.volume.icon_background": "#e64553",
-  "theme.bar.buttons.network.icon_background": "#8839ef",
-  "theme.bar.buttons.bluetooth.icon_background": "#04a5e5",
-  "theme.bar.buttons.windowtitle.icon_background": "#ea76cb",
-  "theme.bar.buttons.media.icon_background": "#7287fd",
-  "theme.bar.buttons.notifications.icon_background": "#7287fd",
-  "theme.bar.buttons.battery.icon_background": "#df8e1d",
-  "theme.bar.buttons.clock.icon_background": "#ea76cb",
-  "theme.bar.menus.menu.notifications.pager.button": "#7287fd",
-  "theme.bar.menus.menu.notifications.scrollbar.color": "#7287fd",
-  "theme.bar.menus.menu.notifications.pager.label": "#7c7f93",
-  "theme.bar.menus.menu.notifications.pager.background": "#eff1f5",
-  "theme.bar.buttons.modules.ram.icon": "#181825",
-  "theme.bar.buttons.modules.storage.icon_background": "#d20f39",
-  "theme.bar.menus.popover.border": "#dce0e8",
-  "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#04a5e5",
-  "theme.bar.menus.menu.power.buttons.restart.text": "#fe640b",
-  "theme.bar.buttons.modules.updates.background": "#dcdfe8",
-  "theme.bar.buttons.modules.storage.icon": "#181825",
-  "theme.bar.buttons.modules.netstat.background": "#dcdfe8",
-  "theme.bar.buttons.modules.weather.icon": "#dcdfe8",
-  "theme.bar.buttons.modules.netstat.text": "#40a02b",
-  "theme.bar.buttons.modules.storage.background": "#dcdfe8",
-  "theme.bar.buttons.modules.power.icon": "#181825",
-  "theme.bar.buttons.modules.storage.text": "#d20f39",
-  "theme.bar.buttons.modules.cpu.background": "#dcdfe8",
-  "theme.bar.menus.menu.power.border.color": "#ccd0da",
-  "theme.bar.buttons.modules.power.icon_background": "#d20f39",
-  "theme.bar.menus.menu.power.buttons.logout.icon": "#dce0e8",
-  "theme.bar.menus.menu.power.buttons.restart.icon_background": "#fe640b",
-  "theme.bar.menus.menu.power.buttons.restart.icon": "#dce0e8",
-  "theme.bar.buttons.modules.cpu.icon": "#181825",
-  "theme.bar.buttons.modules.kbLayout.icon_background": "#04a5e5",
-  "theme.bar.buttons.modules.weather.text": "#7287fd",
-  "theme.bar.menus.menu.power.buttons.shutdown.icon": "#dce0e8",
-  "theme.bar.menus.menu.power.buttons.sleep.text": "#04a5e5",
-  "theme.bar.buttons.modules.weather.icon_background": "#7287fd",
-  "theme.bar.menus.menu.power.buttons.shutdown.background": "#dcdfe8",
-  "theme.bar.menus.menu.power.buttons.logout.background": "#dcdfe8",
-  "theme.bar.buttons.modules.kbLayout.icon": "#181825",
-  "theme.bar.buttons.modules.ram.icon_background": "#df8e1d",
-  "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#d20f39",
-  "theme.bar.menus.menu.power.buttons.shutdown.text": "#d20f39",
-  "theme.bar.menus.menu.power.buttons.sleep.background": "#dcdfe8",
-  "theme.bar.buttons.modules.ram.text": "#df8e1d",
-  "theme.bar.menus.menu.power.buttons.logout.text": "#40a02b",
-  "theme.bar.buttons.modules.updates.icon_background": "#8839ef",
-  "theme.bar.buttons.modules.kbLayout.background": "#dcdfe8",
-  "theme.bar.buttons.modules.power.background": "#dcdfe8",
-  "theme.bar.buttons.modules.weather.background": "#dcdfe8",
-  "theme.bar.menus.menu.power.background.color": "#eff1f5",
-  "theme.bar.buttons.modules.ram.background": "#dcdfe8",
-  "theme.bar.buttons.modules.netstat.icon": "#181825",
-  "theme.bar.buttons.modules.cpu.icon_background": "#d20f39",
-  "theme.bar.menus.menu.power.buttons.logout.icon_background": "#40a02b",
-  "theme.bar.buttons.modules.updates.text": "#8839ef",
-  "theme.bar.menus.menu.power.buttons.sleep.icon": "#dce0e8",
-  "theme.bar.menus.menu.power.buttons.restart.background": "#dcdfe8",
-  "theme.bar.buttons.modules.updates.icon": "#181825",
-  "theme.bar.buttons.modules.cpu.text": "#d20f39",
-  "theme.bar.buttons.modules.netstat.icon_background": "#40a02b",
-  "theme.bar.buttons.modules.kbLayout.text": "#04a5e5"
-}
+  "theme.notification.background": "#ccd0da"
+}
\ No newline at end of file
diff --git a/themes/catppuccin_macchiato.json b/themes/catppuccin_macchiato.json
index f716133..e62b348 100644
--- a/themes/catppuccin_macchiato.json
+++ b/themes/catppuccin_macchiato.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.cpu.text": "#ed8796",
   "theme.bar.buttons.modules.netstat.icon_background": "#a6da95",
   "theme.bar.buttons.modules.kbLayout.text": "#91d7e3",
-  "theme.bar.buttons.notifications.icon_background": "#b7bdf8"
-}
+  "theme.bar.buttons.notifications.icon_background": "#b7bdf8",
+  "theme.bar.buttons.modules.power.border": "#ed8796",
+  "theme.bar.buttons.modules.weather.border": "#b7bdf8",
+  "theme.bar.buttons.modules.updates.border": "#c6a0f6",
+  "theme.bar.buttons.modules.kbLayout.border": "#91d7e3",
+  "theme.bar.buttons.modules.netstat.border": "#a6da95",
+  "theme.bar.buttons.modules.storage.border": "#ed8796",
+  "theme.bar.buttons.modules.cpu.border": "#ed8796",
+  "theme.bar.buttons.modules.ram.border": "#eed49f",
+  "theme.bar.buttons.notifications.border": "#b7bdf8",
+  "theme.bar.buttons.clock.border": "#f5bde6",
+  "theme.bar.buttons.battery.border": "#eed49f",
+  "theme.bar.buttons.systray.border": "#494d64",
+  "theme.bar.buttons.bluetooth.border": "#91d7e3",
+  "theme.bar.buttons.network.border": "#c6a0f6",
+  "theme.bar.buttons.volume.border": "#ee99a0",
+  "theme.bar.buttons.media.border": "#b7bdf8",
+  "theme.bar.buttons.windowtitle.border": "#f5bde6",
+  "theme.bar.buttons.workspaces.border": "#181926",
+  "theme.bar.buttons.dashboard.border": "#eed49f"
+}
\ No newline at end of file
diff --git a/themes/catppuccin_macchiato_split.json b/themes/catppuccin_macchiato_split.json
index f56af83..7cf1273 100644
--- a/themes/catppuccin_macchiato_split.json
+++ b/themes/catppuccin_macchiato_split.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.updates.icon": "#181825",
   "theme.bar.buttons.modules.cpu.text": "#ed8796",
   "theme.bar.buttons.modules.netstat.icon_background": "#a6da95",
-  "theme.bar.buttons.modules.kbLayout.text": "#91d7e3"
-}
+  "theme.bar.buttons.modules.kbLayout.text": "#91d7e3",
+  "theme.bar.buttons.modules.power.border": "#ed8796",
+  "theme.bar.buttons.modules.weather.border": "#b7bdf8",
+  "theme.bar.buttons.modules.updates.border": "#c6a0f6",
+  "theme.bar.buttons.modules.kbLayout.border": "#91d7e3",
+  "theme.bar.buttons.modules.netstat.border": "#a6da95",
+  "theme.bar.buttons.modules.storage.border": "#ed8796",
+  "theme.bar.buttons.modules.cpu.border": "#ed8796",
+  "theme.bar.buttons.modules.ram.border": "#eed49f",
+  "theme.bar.buttons.notifications.border": "#b7bdf8",
+  "theme.bar.buttons.clock.border": "#f5bde6",
+  "theme.bar.buttons.battery.border": "#eed49f",
+  "theme.bar.buttons.systray.border": "#494d64",
+  "theme.bar.buttons.bluetooth.border": "#91d7e3",
+  "theme.bar.buttons.network.border": "#c6a0f6",
+  "theme.bar.buttons.volume.border": "#ee99a0",
+  "theme.bar.buttons.media.border": "#b7bdf8",
+  "theme.bar.buttons.windowtitle.border": "#f5bde6",
+  "theme.bar.buttons.workspaces.border": "#181926",
+  "theme.bar.buttons.dashboard.border": "#eed49f"
+}
\ No newline at end of file
diff --git a/themes/catppuccin_mocha.json b/themes/catppuccin_mocha.json
index db3097a..6d6857f 100644
--- a/themes/catppuccin_mocha.json
+++ b/themes/catppuccin_mocha.json
@@ -220,85 +220,94 @@
   "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.storage.icon_background": "#f38ba8",
-  "theme.bar.buttons.modules.storage.icon": "#f38ba8",
-  "theme.bar.buttons.modules.storage.text": "#f38ba8",
+  "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.hover": "#45475a",
   "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.hover": "#45475a",
   "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.hover": "#45475a",
   "theme.bar.buttons.battery.background": "#242438",
-  "theme.bar.buttons.systray.hover": "#45475a",
+  "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.hover": "#45475a",
   "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.hover": "#45475a",
   "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.hover": "#45475a",
   "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.hover": "#45475a",
   "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.hover": "#45475a",
+  "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.hover": "#f5c2e7",
+  "theme.bar.buttons.workspaces.border": "#f5c2e7",
   "theme.bar.buttons.workspaces.background": "#242438",
   "theme.bar.buttons.dashboard.icon": "#f9e2af",
-  "theme.bar.buttons.dashboard.hover": "#45475a",
+  "theme.bar.buttons.dashboard.border": "#f9e2af",
   "theme.bar.buttons.dashboard.background": "#242438",
   "theme.bar.buttons.icon": "#b4befe",
   "theme.bar.buttons.text": "#b4befe",
diff --git a/themes/catppuccin_mocha_split.json b/themes/catppuccin_mocha_split.json
index 24a0982..7bc1ee3 100644
--- a/themes/catppuccin_mocha_split.json
+++ b/themes/catppuccin_mocha_split.json
@@ -220,85 +220,94 @@
   "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.storage.icon_background": "#f38ba8",
+  "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": "#f38ba8",
+  "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.hover": "#45475a",
   "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.hover": "#45475a",
   "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.hover": "#45475a",
   "theme.bar.buttons.battery.background": "#242438",
-  "theme.bar.buttons.systray.hover": "#45475a",
+  "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.hover": "#45475a",
   "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.hover": "#45475a",
   "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.hover": "#45475a",
   "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.hover": "#45475a",
   "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.hover": "#45475a",
+  "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.hover": "#f5c2e7",
+  "theme.bar.buttons.workspaces.border": "#f5c2e7",
   "theme.bar.buttons.workspaces.background": "#242438",
   "theme.bar.buttons.dashboard.icon": "#1e1e2e",
-  "theme.bar.buttons.dashboard.hover": "#45475a",
+  "theme.bar.buttons.dashboard.border": "#f9e2af",
   "theme.bar.buttons.dashboard.background": "#f9e2af",
   "theme.bar.buttons.icon": "#b4befe",
   "theme.bar.buttons.text": "#b4befe",
diff --git a/themes/cyberpunk.json b/themes/cyberpunk.json
index d84376d..8ddbbce 100644
--- a/themes/cyberpunk.json
+++ b/themes/cyberpunk.json
@@ -323,5 +323,24 @@
   "theme.notification.label": "#5bafff",
   "theme.notification.actions.text": "#0a0a0a",
   "theme.notification.actions.background": "#5bafff",
-  "theme.notification.background": "#0a0a0a"
+  "theme.notification.background": "#0a0a0a",
+  "theme.bar.buttons.modules.power.border": "#FF4500",
+  "theme.bar.buttons.modules.weather.border": "#FFD700",
+  "theme.bar.buttons.modules.updates.border": "#FFD700",
+  "theme.bar.buttons.modules.kbLayout.border": "#00FFFF",
+  "theme.bar.buttons.modules.netstat.border": "#32CD32",
+  "theme.bar.buttons.modules.storage.border": "#FF4500",
+  "theme.bar.buttons.modules.cpu.border": "#FF4500",
+  "theme.bar.buttons.modules.ram.border": "#FFD700",
+  "theme.bar.buttons.notifications.border": "#f7d04b",
+  "theme.bar.buttons.clock.border": "#5bafff",
+  "theme.bar.buttons.battery.border": "#f7d04b",
+  "theme.bar.buttons.systray.border": "#303030",
+  "theme.bar.buttons.bluetooth.border": "#5bafff",
+  "theme.bar.buttons.network.border": "#e23fe2",
+  "theme.bar.buttons.volume.border": "#ff3f3f",
+  "theme.bar.buttons.media.border": "#FFD700",
+  "theme.bar.buttons.windowtitle.border": "#5bafff",
+  "theme.bar.buttons.workspaces.border": "#e23ee2",
+  "theme.bar.buttons.dashboard.border": "#f7d04b"
 }
\ No newline at end of file
diff --git a/themes/cyberpunk_split.json b/themes/cyberpunk_split.json
index ec85eec..4f1c3e2 100644
--- a/themes/cyberpunk_split.json
+++ b/themes/cyberpunk_split.json
@@ -323,5 +323,24 @@
   "theme.notification.label": "#5bafff",
   "theme.notification.actions.text": "#0a0a0a",
   "theme.notification.actions.background": "#5bafff",
-  "theme.notification.background": "#0a0a0a"
+  "theme.notification.background": "#0a0a0a",
+  "theme.bar.buttons.modules.power.border": "#FF4500",
+  "theme.bar.buttons.modules.weather.border": "#FFD700",
+  "theme.bar.buttons.modules.updates.border": "#FFD700",
+  "theme.bar.buttons.modules.kbLayout.border": "#00FFFF",
+  "theme.bar.buttons.modules.netstat.border": "#32CD32",
+  "theme.bar.buttons.modules.storage.border": "#FF4500",
+  "theme.bar.buttons.modules.cpu.border": "#FF4500",
+  "theme.bar.buttons.modules.ram.border": "#FFD700",
+  "theme.bar.buttons.notifications.border": "#f7d04b",
+  "theme.bar.buttons.clock.border": "#5bafff",
+  "theme.bar.buttons.battery.border": "#f7d04b",
+  "theme.bar.buttons.systray.border": "#303030",
+  "theme.bar.buttons.bluetooth.border": "#5bafff",
+  "theme.bar.buttons.network.border": "#e23fe2",
+  "theme.bar.buttons.volume.border": "#ff3f3f",
+  "theme.bar.buttons.media.border": "#FFD700",
+  "theme.bar.buttons.windowtitle.border": "#5bafff",
+  "theme.bar.buttons.workspaces.border": "#e23ee2",
+  "theme.bar.buttons.dashboard.border": "#f7d04b"
 }
\ No newline at end of file
diff --git a/themes/dracula.json b/themes/dracula.json
index 50c46f9..6d48f7e 100644
--- a/themes/dracula.json
+++ b/themes/dracula.json
@@ -220,85 +220,94 @@
   "theme.bar.buttons.modules.power.icon_background": "#bd93f9",
   "theme.bar.buttons.modules.power.icon": "#ff5454",
   "theme.bar.buttons.modules.power.background": "#44475a",
+  "theme.bar.buttons.modules.power.border": "#bd93f9",
   "theme.bar.buttons.modules.weather.icon_background": "#ffb86c",
   "theme.bar.buttons.modules.weather.icon": "#ffb86c",
   "theme.bar.buttons.modules.weather.text": "#ffb86c",
   "theme.bar.buttons.modules.weather.background": "#44475a",
+  "theme.bar.buttons.modules.weather.border": "#ffb86c",
   "theme.bar.buttons.modules.updates.icon_background": "#bd93f9",
   "theme.bar.buttons.modules.updates.icon": "#bd93f9",
   "theme.bar.buttons.modules.updates.text": "#bd93f9",
   "theme.bar.buttons.modules.updates.background": "#44475a",
+  "theme.bar.buttons.modules.updates.border": "#bd93f9",
   "theme.bar.buttons.modules.kbLayout.icon_background": "#8be9fd",
   "theme.bar.buttons.modules.kbLayout.icon": "#8be9fd",
   "theme.bar.buttons.modules.kbLayout.text": "#8be9fd",
   "theme.bar.buttons.modules.kbLayout.background": "#44475a",
+  "theme.bar.buttons.modules.kbLayout.border": "#8be9fd",
   "theme.bar.buttons.modules.netstat.icon_background": "#50fa7b",
   "theme.bar.buttons.modules.netstat.icon": "#50fa7b",
   "theme.bar.buttons.modules.netstat.text": "#50fa7b",
   "theme.bar.buttons.modules.netstat.background": "#44475a",
+  "theme.bar.buttons.modules.netstat.border": "#50fa7b",
   "theme.bar.buttons.modules.storage.icon_background": "#bd93f9",
   "theme.bar.buttons.modules.storage.icon": "#bd93f9",
   "theme.bar.buttons.modules.storage.text": "#bd93f9",
   "theme.bar.buttons.modules.storage.background": "#44475a",
+  "theme.bar.buttons.modules.storage.border": "#bd93f9",
   "theme.bar.buttons.modules.cpu.icon_background": "#ff79c6",
   "theme.bar.buttons.modules.cpu.icon": "#ff79c6",
   "theme.bar.buttons.modules.cpu.text": "#ff79c6",
   "theme.bar.buttons.modules.cpu.background": "#44475a",
+  "theme.bar.buttons.modules.cpu.border": "#ff79c6",
   "theme.bar.buttons.modules.ram.icon_background": "#f1fa8c",
   "theme.bar.buttons.modules.ram.icon": "#f1fa8c",
   "theme.bar.buttons.modules.ram.text": "#f1fa8c",
   "theme.bar.buttons.modules.ram.background": "#44475a",
+  "theme.bar.buttons.modules.ram.border": "#f1fa8c",
   "theme.bar.buttons.notifications.total": "#bd93f9",
   "theme.bar.buttons.notifications.icon_background": "#bd93f9",
   "theme.bar.buttons.notifications.icon": "#bd93f9",
-  "theme.bar.buttons.notifications.hover": "#6272a4",
   "theme.bar.buttons.notifications.background": "#44475a",
+  "theme.bar.buttons.notifications.border": "#bd93f9",
   "theme.bar.buttons.clock.icon_background": "#ff79c6",
   "theme.bar.buttons.clock.icon": "#ff79c6",
   "theme.bar.buttons.clock.text": "#ff79c6",
-  "theme.bar.buttons.clock.hover": "#6272a4",
   "theme.bar.buttons.clock.background": "#44475a",
+  "theme.bar.buttons.clock.border": "#ff79c6",
   "theme.bar.buttons.battery.icon_background": "#f1fa8c",
   "theme.bar.buttons.battery.icon": "#f1fa8c",
   "theme.bar.buttons.battery.text": "#f1fa8c",
-  "theme.bar.buttons.battery.hover": "#6272a4",
   "theme.bar.buttons.battery.background": "#44475a",
-  "theme.bar.buttons.systray.hover": "#6272a4",
+  "theme.bar.buttons.battery.border": "#f1fa8c",
   "theme.bar.buttons.systray.background": "#44475a",
+  "theme.bar.buttons.systray.border": "#6272a4",
   "theme.bar.buttons.bluetooth.icon_background": "#89dbeb",
   "theme.bar.buttons.bluetooth.icon": "#8be9fd",
   "theme.bar.buttons.bluetooth.text": "#8be9fd",
-  "theme.bar.buttons.bluetooth.hover": "#6272a4",
   "theme.bar.buttons.bluetooth.background": "#44475a",
+  "theme.bar.buttons.bluetooth.border": "#8be9fd",
   "theme.bar.buttons.network.icon_background": "#caa6f7",
   "theme.bar.buttons.network.icon": "#bd93f9",
   "theme.bar.buttons.network.text": "#bd93f9",
-  "theme.bar.buttons.network.hover": "#6272a4",
   "theme.bar.buttons.network.background": "#44475a",
+  "theme.bar.buttons.network.border": "#bd93f9",
   "theme.bar.buttons.volume.icon_background": "#ffb86c",
   "theme.bar.buttons.volume.icon": "#ffb86c",
   "theme.bar.buttons.volume.text": "#ffb86c",
-  "theme.bar.buttons.volume.hover": "#6272a4",
   "theme.bar.buttons.volume.background": "#44475a",
+  "theme.bar.buttons.volume.border": "#ffb86c",
   "theme.bar.buttons.media.icon_background": "#bd93f9",
   "theme.bar.buttons.media.icon": "#bd93f9",
   "theme.bar.buttons.media.text": "#bd93f9",
-  "theme.bar.buttons.media.hover": "#6272a4",
   "theme.bar.buttons.media.background": "#44475a",
+  "theme.bar.buttons.media.border": "#bd93f9",
   "theme.bar.buttons.windowtitle.icon_background": "#ff79c6",
   "theme.bar.buttons.windowtitle.icon": "#f1fa8c",
   "theme.bar.buttons.windowtitle.text": "#f1fa8c",
-  "theme.bar.buttons.windowtitle.hover": "#6272a4",
+  "theme.bar.buttons.windowtitle.border": "#f1fa8c",
   "theme.bar.buttons.windowtitle.background": "#44475a",
   "theme.bar.buttons.workspaces.numbered_active_underline_color": "#e23ee2",
   "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#21252b",
+  "theme.bar.buttons.workspaces.hover": "#44475a",
   "theme.bar.buttons.workspaces.active": "#ff79c6",
   "theme.bar.buttons.workspaces.occupied": "#ffb86c",
   "theme.bar.buttons.workspaces.available": "#8be9fd",
-  "theme.bar.buttons.workspaces.hover": "#44475a",
+  "theme.bar.buttons.workspaces.border": "#44475a",
   "theme.bar.buttons.workspaces.background": "#44475a",
   "theme.bar.buttons.dashboard.icon": "#8be8fd",
-  "theme.bar.buttons.dashboard.hover": "#6272a4",
+  "theme.bar.buttons.dashboard.border": "#8be8fd",
   "theme.bar.buttons.dashboard.background": "#44475a",
   "theme.bar.buttons.icon": "#bd93f9",
   "theme.bar.buttons.text": "#bd93f9",
diff --git a/themes/dracula_split.json b/themes/dracula_split.json
index 9910129..2f9a01c 100644
--- a/themes/dracula_split.json
+++ b/themes/dracula_split.json
@@ -220,85 +220,94 @@
   "theme.bar.buttons.modules.power.icon_background": "#ff5454",
   "theme.bar.buttons.modules.power.icon": "#282936",
   "theme.bar.buttons.modules.power.background": "#44475a",
+  "theme.bar.buttons.modules.power.border": "#bd93f9",
   "theme.bar.buttons.modules.weather.icon_background": "#ffb86c",
   "theme.bar.buttons.modules.weather.icon": "#282936",
   "theme.bar.buttons.modules.weather.text": "#ffb86c",
   "theme.bar.buttons.modules.weather.background": "#44475a",
+  "theme.bar.buttons.modules.weather.border": "#ffb86c",
   "theme.bar.buttons.modules.updates.icon_background": "#bd93f9",
   "theme.bar.buttons.modules.updates.icon": "#282936",
   "theme.bar.buttons.modules.updates.text": "#bd93f9",
   "theme.bar.buttons.modules.updates.background": "#44475a",
+  "theme.bar.buttons.modules.updates.border": "#bd93f9",
   "theme.bar.buttons.modules.kbLayout.icon_background": "#8be9fd",
   "theme.bar.buttons.modules.kbLayout.icon": "#282936",
   "theme.bar.buttons.modules.kbLayout.text": "#8be9fd",
   "theme.bar.buttons.modules.kbLayout.background": "#44475a",
+  "theme.bar.buttons.modules.kbLayout.border": "#8be9fd",
   "theme.bar.buttons.modules.netstat.icon_background": "#50fa7b",
   "theme.bar.buttons.modules.netstat.icon": "#282936",
   "theme.bar.buttons.modules.netstat.text": "#50fa7b",
   "theme.bar.buttons.modules.netstat.background": "#44475a",
+  "theme.bar.buttons.modules.netstat.border": "#50fa7b",
   "theme.bar.buttons.modules.storage.icon_background": "#bd93f9",
   "theme.bar.buttons.modules.storage.icon": "#282936",
   "theme.bar.buttons.modules.storage.text": "#bd93f9",
   "theme.bar.buttons.modules.storage.background": "#44475a",
+  "theme.bar.buttons.modules.storage.border": "#bd93f9",
   "theme.bar.buttons.modules.cpu.icon_background": "#ff79c6",
   "theme.bar.buttons.modules.cpu.icon": "#282936",
   "theme.bar.buttons.modules.cpu.text": "#ff79c6",
   "theme.bar.buttons.modules.cpu.background": "#44475a",
+  "theme.bar.buttons.modules.cpu.border": "#ff79c6",
   "theme.bar.buttons.modules.ram.icon_background": "#f1fa8c",
   "theme.bar.buttons.modules.ram.icon": "#282936",
   "theme.bar.buttons.modules.ram.text": "#f1fa8c",
   "theme.bar.buttons.modules.ram.background": "#44475a",
+  "theme.bar.buttons.modules.ram.border": "#f1fa8c",
   "theme.bar.buttons.notifications.total": "#bd93f9",
   "theme.bar.buttons.notifications.icon_background": "#bd93f9",
   "theme.bar.buttons.notifications.icon": "#44475a",
-  "theme.bar.buttons.notifications.hover": "#6272a4",
   "theme.bar.buttons.notifications.background": "#44475a",
+  "theme.bar.buttons.notifications.border": "#bd93f9",
   "theme.bar.buttons.clock.icon_background": "#ff79c6",
   "theme.bar.buttons.clock.icon": "#44475a",
   "theme.bar.buttons.clock.text": "#ff79c6",
-  "theme.bar.buttons.clock.hover": "#6272a4",
   "theme.bar.buttons.clock.background": "#44475a",
+  "theme.bar.buttons.clock.border": "#ff79c6",
   "theme.bar.buttons.battery.icon_background": "#f1fa8c",
   "theme.bar.buttons.battery.icon": "#44475a",
   "theme.bar.buttons.battery.text": "#f1fa8c",
-  "theme.bar.buttons.battery.hover": "#6272a4",
   "theme.bar.buttons.battery.background": "#44475a",
-  "theme.bar.buttons.systray.hover": "#6272a4",
+  "theme.bar.buttons.battery.border": "#f1fa8c",
   "theme.bar.buttons.systray.background": "#44475a",
+  "theme.bar.buttons.systray.border": "#6272a4",
   "theme.bar.buttons.bluetooth.icon_background": "#8be9fd",
   "theme.bar.buttons.bluetooth.icon": "#44475a",
   "theme.bar.buttons.bluetooth.text": "#8be9fd",
-  "theme.bar.buttons.bluetooth.hover": "#6272a4",
   "theme.bar.buttons.bluetooth.background": "#44475a",
+  "theme.bar.buttons.bluetooth.border": "#8be9fd",
   "theme.bar.buttons.network.icon_background": "#bd93f9",
   "theme.bar.buttons.network.icon": "#44475a",
   "theme.bar.buttons.network.text": "#bd93f9",
-  "theme.bar.buttons.network.hover": "#6272a4",
   "theme.bar.buttons.network.background": "#44475a",
+  "theme.bar.buttons.network.border": "#bd93f9",
   "theme.bar.buttons.volume.icon_background": "#ffb86c",
   "theme.bar.buttons.volume.icon": "#44475a",
   "theme.bar.buttons.volume.text": "#ffb86c",
-  "theme.bar.buttons.volume.hover": "#6272a4",
   "theme.bar.buttons.volume.background": "#44475a",
+  "theme.bar.buttons.volume.border": "#ffb86c",
   "theme.bar.buttons.media.icon_background": "#bd93f9",
   "theme.bar.buttons.media.icon": "#44475a",
   "theme.bar.buttons.media.text": "#bd93f9",
-  "theme.bar.buttons.media.hover": "#6272a4",
   "theme.bar.buttons.media.background": "#44475a",
+  "theme.bar.buttons.media.border": "#bd93f9",
   "theme.bar.buttons.windowtitle.icon_background": "#f1fa8c",
   "theme.bar.buttons.windowtitle.icon": "#44475a",
   "theme.bar.buttons.windowtitle.text": "#f1fa8c",
-  "theme.bar.buttons.windowtitle.hover": "#6272a4",
+  "theme.bar.buttons.windowtitle.border": "#f1fa8c",
   "theme.bar.buttons.windowtitle.background": "#44475a",
   "theme.bar.buttons.workspaces.numbered_active_underline_color": "#ff79c6",
   "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#ff79c6",
+  "theme.bar.buttons.workspaces.hover": "#ff79c6",
   "theme.bar.buttons.workspaces.active": "#ff79c6",
   "theme.bar.buttons.workspaces.occupied": "#ffb86c",
   "theme.bar.buttons.workspaces.available": "#8be9fd",
-  "theme.bar.buttons.workspaces.hover": "#ff79c6",
+  "theme.bar.buttons.workspaces.border": "#44475a",
   "theme.bar.buttons.workspaces.background": "#44475a",
   "theme.bar.buttons.dashboard.icon": "#44475a",
-  "theme.bar.buttons.dashboard.hover": "#6272a4",
+  "theme.bar.buttons.dashboard.border": "#8be8fd",
   "theme.bar.buttons.dashboard.background": "#8be8fd",
   "theme.bar.buttons.icon": "#bd93f9",
   "theme.bar.buttons.text": "#bd93f9",
diff --git a/themes/everforest.json b/themes/everforest.json
index 98dede5..706efe3 100644
--- a/themes/everforest.json
+++ b/themes/everforest.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.cpu.text": "#e67e80",
   "theme.bar.buttons.modules.netstat.icon_background": "#a7c080",
   "theme.bar.buttons.modules.kbLayout.text": "#83c092",
-  "theme.bar.buttons.notifications.icon_background": "#a7c080"
-}
+  "theme.bar.buttons.notifications.icon_background": "#a7c080",
+  "theme.bar.buttons.modules.power.border": "#e67e80",
+  "theme.bar.buttons.modules.weather.border": "#a7c080",
+  "theme.bar.buttons.modules.updates.border": "#83c092",
+  "theme.bar.buttons.modules.kbLayout.border": "#83c092",
+  "theme.bar.buttons.modules.netstat.border": "#a7c080",
+  "theme.bar.buttons.modules.storage.border": "#e67e80",
+  "theme.bar.buttons.modules.cpu.border": "#e67e80",
+  "theme.bar.buttons.modules.ram.border": "#dbbc7f",
+  "theme.bar.buttons.notifications.border": "#83c092",
+  "theme.bar.buttons.clock.border": "#dbbc7f",
+  "theme.bar.buttons.battery.border": "#e69875",
+  "theme.bar.buttons.systray.border": "#454b53",
+  "theme.bar.buttons.bluetooth.border": "#a7c080",
+  "theme.bar.buttons.network.border": "#e69875",
+  "theme.bar.buttons.volume.border": "#dbbc7f",
+  "theme.bar.buttons.media.border": "#a7c080",
+  "theme.bar.buttons.windowtitle.border": "#dbbc7f",
+  "theme.bar.buttons.workspaces.border": "#2b3339",
+  "theme.bar.buttons.dashboard.border": "#e69875"
+}
\ No newline at end of file
diff --git a/themes/everforest_split.json b/themes/everforest_split.json
index a2ba5c3..9995806 100644
--- a/themes/everforest_split.json
+++ b/themes/everforest_split.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.updates.icon": "#21252b",
   "theme.bar.buttons.modules.cpu.text": "#e67e80",
   "theme.bar.buttons.modules.netstat.icon_background": "#a7c080",
-  "theme.bar.buttons.modules.kbLayout.text": "#83c092"
-}
+  "theme.bar.buttons.modules.kbLayout.text": "#83c092",
+  "theme.bar.buttons.modules.power.border": "#e67e80",
+  "theme.bar.buttons.modules.weather.border": "#a7c080",
+  "theme.bar.buttons.modules.updates.border": "#83c092",
+  "theme.bar.buttons.modules.kbLayout.border": "#83c092",
+  "theme.bar.buttons.modules.netstat.border": "#a7c080",
+  "theme.bar.buttons.modules.storage.border": "#e67e80",
+  "theme.bar.buttons.modules.cpu.border": "#e67e80",
+  "theme.bar.buttons.modules.ram.border": "#dbbc7f",
+  "theme.bar.buttons.notifications.border": "#83c092",
+  "theme.bar.buttons.clock.border": "#dbbc7f",
+  "theme.bar.buttons.battery.border": "#e69875",
+  "theme.bar.buttons.systray.border": "#454b53",
+  "theme.bar.buttons.bluetooth.border": "#a7c080",
+  "theme.bar.buttons.network.border": "#e69875",
+  "theme.bar.buttons.volume.border": "#dbbc7f",
+  "theme.bar.buttons.media.border": "#a7c080",
+  "theme.bar.buttons.windowtitle.border": "#dbbc7f",
+  "theme.bar.buttons.workspaces.border": "#2b3339",
+  "theme.bar.buttons.dashboard.border": "#e69875"
+}
\ No newline at end of file
diff --git a/themes/gruvbox.json b/themes/gruvbox.json
index d1f8905..dc071ab 100644
--- a/themes/gruvbox.json
+++ b/themes/gruvbox.json
@@ -323,5 +323,24 @@
   "theme.notification.label": "#83a598",
   "theme.notification.actions.text": "#32302f",
   "theme.notification.actions.background": "#83a598",
-  "theme.notification.background": "#32302f"
-}
+  "theme.notification.background": "#32302f",
+  "theme.bar.buttons.modules.power.border": "#282828",
+  "theme.bar.buttons.modules.weather.border": "#fe8017",
+  "theme.bar.buttons.modules.updates.border": "#b16286",
+  "theme.bar.buttons.modules.kbLayout.border": "#83a598",
+  "theme.bar.buttons.modules.netstat.border": "#b8bb26",
+  "theme.bar.buttons.modules.storage.border": "#83a598",
+  "theme.bar.buttons.modules.cpu.border": "#d3869b",
+  "theme.bar.buttons.modules.ram.border": "#fabd2f",
+  "theme.bar.buttons.notifications.border": "#83a598",
+  "theme.bar.buttons.clock.border": "#d3869b",
+  "theme.bar.buttons.battery.border": "#fabd2f",
+  "theme.bar.buttons.systray.border": "#504945",
+  "theme.bar.buttons.bluetooth.border": "#83a598",
+  "theme.bar.buttons.network.border": "#b16286",
+  "theme.bar.buttons.volume.border": "#fe8018",
+  "theme.bar.buttons.media.border": "#83a598",
+  "theme.bar.buttons.windowtitle.border": "#d3869b",
+  "theme.bar.buttons.workspaces.border": "#ffffff",
+  "theme.bar.buttons.dashboard.border": "#fabd2f"
+}
\ No newline at end of file
diff --git a/themes/gruvbox_split.json b/themes/gruvbox_split.json
index 16eb2d2..8c61370 100644
--- a/themes/gruvbox_split.json
+++ b/themes/gruvbox_split.json
@@ -323,5 +323,24 @@
   "theme.notification.label": "#83a598",
   "theme.notification.actions.text": "#32302f",
   "theme.notification.actions.background": "#83a598",
-  "theme.notification.background": "#32302f"
+  "theme.notification.background": "#32302f",
+  "theme.bar.buttons.modules.power.border": "#282828",
+  "theme.bar.buttons.modules.weather.border": "#fe8017",
+  "theme.bar.buttons.modules.updates.border": "#b16286",
+  "theme.bar.buttons.modules.kbLayout.border": "#83a598",
+  "theme.bar.buttons.modules.netstat.border": "#b8bb26",
+  "theme.bar.buttons.modules.storage.border": "#83a598",
+  "theme.bar.buttons.modules.cpu.border": "#d3869b",
+  "theme.bar.buttons.modules.ram.border": "#fabd2f",
+  "theme.bar.buttons.notifications.border": "#83a598",
+  "theme.bar.buttons.clock.border": "#d3869b",
+  "theme.bar.buttons.battery.border": "#fabd2f",
+  "theme.bar.buttons.systray.border": "#504945",
+  "theme.bar.buttons.bluetooth.border": "#83a598",
+  "theme.bar.buttons.network.border": "#b16286",
+  "theme.bar.buttons.volume.border": "#fe8018",
+  "theme.bar.buttons.media.border": "#83a598",
+  "theme.bar.buttons.windowtitle.border": "#d3869b",
+  "theme.bar.buttons.workspaces.border": "#ffffff",
+  "theme.bar.buttons.dashboard.border": "#fabd2f"
 }
\ No newline at end of file
diff --git a/themes/monochrome.json b/themes/monochrome.json
index 8234006..46fb203 100644
--- a/themes/monochrome.json
+++ b/themes/monochrome.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.cpu.text": "#ffffff",
   "theme.bar.buttons.modules.netstat.icon_background": "#ffffff",
   "theme.bar.buttons.modules.kbLayout.text": "#ffffff",
-  "theme.bar.buttons.notifications.icon_background": "#FFFFFF"
-}
+  "theme.bar.buttons.notifications.icon_background": "#FFFFFF",
+  "theme.bar.buttons.modules.power.border": "#ffffff",
+  "theme.bar.buttons.modules.weather.border": "#FFFFFF",
+  "theme.bar.buttons.modules.updates.border": "#FFFFFF",
+  "theme.bar.buttons.modules.kbLayout.border": "#ffffff",
+  "theme.bar.buttons.modules.netstat.border": "#ffffff",
+  "theme.bar.buttons.modules.storage.border": "#ffffff",
+  "theme.bar.buttons.modules.cpu.border": "#ffffff",
+  "theme.bar.buttons.modules.ram.border": "#ffffff",
+  "theme.bar.buttons.notifications.border": "#FFFFFF",
+  "theme.bar.buttons.clock.border": "#FFFFFF",
+  "theme.bar.buttons.battery.border": "#FFFFFF",
+  "theme.bar.buttons.systray.border": "#444444",
+  "theme.bar.buttons.bluetooth.border": "#FFFFFF",
+  "theme.bar.buttons.network.border": "#FFFFFF",
+  "theme.bar.buttons.volume.border": "#FFFFFF",
+  "theme.bar.buttons.media.border": "#FFFFFF",
+  "theme.bar.buttons.windowtitle.border": "#FFFFFF",
+  "theme.bar.buttons.workspaces.border": "#FFFFFF",
+  "theme.bar.buttons.dashboard.border": "#FFFFFF"
+}
\ No newline at end of file
diff --git a/themes/monochrome_split.json b/themes/monochrome_split.json
index 00cc224..89ae254 100644
--- a/themes/monochrome_split.json
+++ b/themes/monochrome_split.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.updates.icon": "#21252b",
   "theme.bar.buttons.modules.cpu.text": "#ffffff",
   "theme.bar.buttons.modules.netstat.icon_background": "#ffffff",
-  "theme.bar.buttons.modules.kbLayout.text": "#ffffff"
-}
+  "theme.bar.buttons.modules.kbLayout.text": "#ffffff",
+  "theme.bar.buttons.modules.power.border": "#ffffff",
+  "theme.bar.buttons.modules.weather.border": "#FFFFFF",
+  "theme.bar.buttons.modules.updates.border": "#FFFFFF",
+  "theme.bar.buttons.modules.kbLayout.border": "#ffffff",
+  "theme.bar.buttons.modules.netstat.border": "#ffffff",
+  "theme.bar.buttons.modules.storage.border": "#ffffff",
+  "theme.bar.buttons.modules.cpu.border": "#ffffff",
+  "theme.bar.buttons.modules.ram.border": "#ffffff",
+  "theme.bar.buttons.notifications.border": "#FFFFFF",
+  "theme.bar.buttons.clock.border": "#FFFFFF",
+  "theme.bar.buttons.battery.border": "#FFFFFF",
+  "theme.bar.buttons.systray.border": "#444444",
+  "theme.bar.buttons.bluetooth.border": "#FFFFFF",
+  "theme.bar.buttons.network.border": "#FFFFFF",
+  "theme.bar.buttons.volume.border": "#FFFFFF",
+  "theme.bar.buttons.media.border": "#FFFFFF",
+  "theme.bar.buttons.windowtitle.border": "#FFFFFF",
+  "theme.bar.buttons.workspaces.border": "#FFFFFF",
+  "theme.bar.buttons.dashboard.border": "#FFFFFF"
+}
\ No newline at end of file
diff --git a/themes/nord.json b/themes/nord.json
index d7b04d3..5305885 100644
--- a/themes/nord.json
+++ b/themes/nord.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.cpu.text": "#8fbcbb",
   "theme.bar.buttons.modules.netstat.icon_background": "#8fbcbb",
   "theme.bar.buttons.modules.kbLayout.text": "#88c0d0",
-  "theme.bar.buttons.notifications.icon_background": "#88c0d0"
-}
+  "theme.bar.buttons.notifications.icon_background": "#88c0d0",
+  "theme.bar.buttons.modules.power.border": "#8fbcbb",
+  "theme.bar.buttons.modules.weather.border": "#88c0d0",
+  "theme.bar.buttons.modules.updates.border": "#88c0d0",
+  "theme.bar.buttons.modules.kbLayout.border": "#88c0d0",
+  "theme.bar.buttons.modules.netstat.border": "#8fbcbb",
+  "theme.bar.buttons.modules.storage.border": "#8fbcbb",
+  "theme.bar.buttons.modules.cpu.border": "#8fbcbb",
+  "theme.bar.buttons.modules.ram.border": "#81a1c1",
+  "theme.bar.buttons.notifications.border": "#88c0d0",
+  "theme.bar.buttons.clock.border": "#8fbcbb",
+  "theme.bar.buttons.battery.border": "#81a1c1",
+  "theme.bar.buttons.systray.border": "#434c53",
+  "theme.bar.buttons.bluetooth.border": "#88c0d0",
+  "theme.bar.buttons.network.border": "#88c0d0",
+  "theme.bar.buttons.volume.border": "#81a1c1",
+  "theme.bar.buttons.media.border": "#88c0d0",
+  "theme.bar.buttons.windowtitle.border": "#8fbcbb",
+  "theme.bar.buttons.workspaces.border": "#2e3440",
+  "theme.bar.buttons.dashboard.border": "#81a1c1"
+}
\ No newline at end of file
diff --git a/themes/nord_split.json b/themes/nord_split.json
index b0a1660..0a1a7ef 100644
--- a/themes/nord_split.json
+++ b/themes/nord_split.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.updates.icon": "#21252b",
   "theme.bar.buttons.modules.cpu.text": "#8fbcbb",
   "theme.bar.buttons.modules.netstat.icon_background": "#8fbcbb",
-  "theme.bar.buttons.modules.kbLayout.text": "#88c0d0"
-}
+  "theme.bar.buttons.modules.kbLayout.text": "#88c0d0",
+  "theme.bar.buttons.modules.power.border": "#8fbcbb",
+  "theme.bar.buttons.modules.weather.border": "#88c0d0",
+  "theme.bar.buttons.modules.updates.border": "#88c0d0",
+  "theme.bar.buttons.modules.kbLayout.border": "#88c0d0",
+  "theme.bar.buttons.modules.netstat.border": "#8fbcbb",
+  "theme.bar.buttons.modules.storage.border": "#8fbcbb",
+  "theme.bar.buttons.modules.cpu.border": "#8fbcbb",
+  "theme.bar.buttons.modules.ram.border": "#81a1c1",
+  "theme.bar.buttons.notifications.border": "#88c0d0",
+  "theme.bar.buttons.clock.border": "#8fbcbb",
+  "theme.bar.buttons.battery.border": "#81a1c1",
+  "theme.bar.buttons.systray.border": "#434c53",
+  "theme.bar.buttons.bluetooth.border": "#88c0d0",
+  "theme.bar.buttons.network.border": "#88c0d0",
+  "theme.bar.buttons.volume.border": "#81a1c1",
+  "theme.bar.buttons.media.border": "#88c0d0",
+  "theme.bar.buttons.windowtitle.border": "#8fbcbb",
+  "theme.bar.buttons.workspaces.border": "#2e3440",
+  "theme.bar.buttons.dashboard.border": "#81a1c1"
+}
\ No newline at end of file
diff --git a/themes/one_dark.json b/themes/one_dark.json
index 2407d9e..f8e02a3 100644
--- a/themes/one_dark.json
+++ b/themes/one_dark.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.cpu.text": "#e06c75",
   "theme.bar.buttons.modules.netstat.icon_background": "#98c379",
   "theme.bar.buttons.modules.kbLayout.text": "#56b6c2",
-  "theme.bar.buttons.notifications.icon_background": "#61afef"
-}
+  "theme.bar.buttons.notifications.icon_background": "#61afef",
+  "theme.bar.buttons.modules.power.border": "#e06c75",
+  "theme.bar.buttons.modules.weather.border": "#61afef",
+  "theme.bar.buttons.modules.updates.border": "#c678dd",
+  "theme.bar.buttons.modules.kbLayout.border": "#56b6c2",
+  "theme.bar.buttons.modules.netstat.border": "#98c379",
+  "theme.bar.buttons.modules.storage.border": "#e06c75",
+  "theme.bar.buttons.modules.cpu.border": "#e06c75",
+  "theme.bar.buttons.modules.ram.border": "#e5c07b",
+  "theme.bar.buttons.notifications.border": "#61afef",
+  "theme.bar.buttons.clock.border": "#98c379",
+  "theme.bar.buttons.battery.border": "#e5c07b",
+  "theme.bar.buttons.systray.border": "#4b5263",
+  "theme.bar.buttons.bluetooth.border": "#61afef",
+  "theme.bar.buttons.network.border": "#c678dd",
+  "theme.bar.buttons.volume.border": "#e06c75",
+  "theme.bar.buttons.media.border": "#61afef",
+  "theme.bar.buttons.windowtitle.border": "#98c379",
+  "theme.bar.buttons.workspaces.border": "#21252b",
+  "theme.bar.buttons.dashboard.border": "#e5c07b"
+}
\ No newline at end of file
diff --git a/themes/one_dark_split.json b/themes/one_dark_split.json
index ec4f262..666b8bc 100644
--- a/themes/one_dark_split.json
+++ b/themes/one_dark_split.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.updates.icon": "#21252b",
   "theme.bar.buttons.modules.cpu.text": "#e06c75",
   "theme.bar.buttons.modules.netstat.icon_background": "#98c379",
-  "theme.bar.buttons.modules.kbLayout.text": "#56b6c2"
-}
+  "theme.bar.buttons.modules.kbLayout.text": "#56b6c2",
+  "theme.bar.buttons.modules.power.border": "#e06c75",
+  "theme.bar.buttons.modules.weather.border": "#61afef",
+  "theme.bar.buttons.modules.updates.border": "#c678dd",
+  "theme.bar.buttons.modules.kbLayout.border": "#56b6c2",
+  "theme.bar.buttons.modules.netstat.border": "#98c379",
+  "theme.bar.buttons.modules.storage.border": "#e06c75",
+  "theme.bar.buttons.modules.cpu.border": "#e06c75",
+  "theme.bar.buttons.modules.ram.border": "#e5c07b",
+  "theme.bar.buttons.notifications.border": "#61afef",
+  "theme.bar.buttons.clock.border": "#98c379",
+  "theme.bar.buttons.battery.border": "#e5c07b",
+  "theme.bar.buttons.systray.border": "#4b5263",
+  "theme.bar.buttons.bluetooth.border": "#61afef",
+  "theme.bar.buttons.network.border": "#c678dd",
+  "theme.bar.buttons.volume.border": "#e06c75",
+  "theme.bar.buttons.media.border": "#61afef",
+  "theme.bar.buttons.windowtitle.border": "#98c379",
+  "theme.bar.buttons.workspaces.border": "#21252b",
+  "theme.bar.buttons.dashboard.border": "#e5c07b"
+}
\ No newline at end of file
diff --git a/themes/rose_pine.json b/themes/rose_pine.json
index 8ceae42..1adb467 100644
--- a/themes/rose_pine.json
+++ b/themes/rose_pine.json
@@ -324,5 +324,24 @@
   "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.notifications.icon_background": "#c4a7e7"
-}
+  "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"
+}
\ No newline at end of file
diff --git a/themes/rose_pine_moon.json b/themes/rose_pine_moon.json
index c107219..b95c6fd 100644
--- a/themes/rose_pine_moon.json
+++ b/themes/rose_pine_moon.json
@@ -1,329 +1,349 @@
 {
-  "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.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"
 }
+
diff --git a/themes/rose_pine_moon_split.json b/themes/rose_pine_moon_split.json
index 0e91d05..cfa934c 100644
--- a/themes/rose_pine_moon_split.json
+++ b/themes/rose_pine_moon_split.json
@@ -1,328 +1,348 @@
 {
-  "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.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"
 }
+
diff --git a/themes/rose_pine_split.json b/themes/rose_pine_split.json
index 846facf..0f208e8 100644
--- a/themes/rose_pine_split.json
+++ b/themes/rose_pine_split.json
@@ -324,5 +324,24 @@
   "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.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"
+}
\ No newline at end of file
diff --git a/themes/tokyo_night.json b/themes/tokyo_night.json
index 817eae6..07620cd 100644
--- a/themes/tokyo_night.json
+++ b/themes/tokyo_night.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.cpu.text": "#f7768e",
   "theme.bar.buttons.modules.netstat.icon_background": "#9ece6a",
   "theme.bar.buttons.modules.kbLayout.text": "#7dcfff",
-  "theme.bar.buttons.notifications.icon_background": "#bb9af7"
-}
+  "theme.bar.buttons.notifications.icon_background": "#bb9af7",
+  "theme.bar.buttons.modules.power.border": "#f7768e",
+  "theme.bar.buttons.modules.weather.border": "#bb9af7",
+  "theme.bar.buttons.modules.updates.border": "#bb9af7",
+  "theme.bar.buttons.modules.kbLayout.border": "#7dcfff",
+  "theme.bar.buttons.modules.netstat.border": "#9ece6a",
+  "theme.bar.buttons.modules.storage.border": "#f7768e",
+  "theme.bar.buttons.modules.cpu.border": "#f7768e",
+  "theme.bar.buttons.modules.ram.border": "#e0af68",
+  "theme.bar.buttons.notifications.border": "#bb9af7",
+  "theme.bar.buttons.clock.border": "#f7768e",
+  "theme.bar.buttons.battery.border": "#e0af68",
+  "theme.bar.buttons.systray.border": "#414868",
+  "theme.bar.buttons.bluetooth.border": "#7dcfff",
+  "theme.bar.buttons.network.border": "#bb9af7",
+  "theme.bar.buttons.volume.border": "#f7768e",
+  "theme.bar.buttons.media.border": "#bb9af7",
+  "theme.bar.buttons.windowtitle.border": "#f7768e",
+  "theme.bar.buttons.workspaces.border": "#f7768e",
+  "theme.bar.buttons.dashboard.border": "#e0af68"
+}
\ No newline at end of file
diff --git a/themes/tokyo_night_split.json b/themes/tokyo_night_split.json
index a916916..83416a1 100644
--- a/themes/tokyo_night_split.json
+++ b/themes/tokyo_night_split.json
@@ -324,5 +324,24 @@
   "theme.bar.buttons.modules.updates.icon": "#181825",
   "theme.bar.buttons.modules.cpu.text": "#f7768e",
   "theme.bar.buttons.modules.netstat.icon_background": "#9ece6a",
-  "theme.bar.buttons.modules.kbLayout.text": "#7dcfff"
-}
+  "theme.bar.buttons.modules.kbLayout.text": "#7dcfff",
+  "theme.bar.buttons.modules.power.border": "#f7768e",
+  "theme.bar.buttons.modules.weather.border": "#bb9af7",
+  "theme.bar.buttons.modules.updates.border": "#bb9af7",
+  "theme.bar.buttons.modules.kbLayout.border": "#7dcfff",
+  "theme.bar.buttons.modules.netstat.border": "#9ece6a",
+  "theme.bar.buttons.modules.storage.border": "#f7768e",
+  "theme.bar.buttons.modules.cpu.border": "#f7768e",
+  "theme.bar.buttons.modules.ram.border": "#e0af68",
+  "theme.bar.buttons.notifications.border": "#bb9af7",
+  "theme.bar.buttons.clock.border": "#f7768e",
+  "theme.bar.buttons.battery.border": "#e0af68",
+  "theme.bar.buttons.systray.border": "#414868",
+  "theme.bar.buttons.bluetooth.border": "#7dcfff",
+  "theme.bar.buttons.network.border": "#bb9af7",
+  "theme.bar.buttons.volume.border": "#f7768e",
+  "theme.bar.buttons.media.border": "#bb9af7",
+  "theme.bar.buttons.windowtitle.border": "#f7768e",
+  "theme.bar.buttons.workspaces.border": "#f7768e",
+  "theme.bar.buttons.dashboard.border": "#e0af68"
+}
\ No newline at end of file
diff --git a/widget/settings/pages/config/bar/index.ts b/widget/settings/pages/config/bar/index.ts
index 134c441..3b88553 100644
--- a/widget/settings/pages/config/bar/index.ts
+++ b/widget/settings/pages/config/bar/index.ts
@@ -40,7 +40,18 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                     type: 'enum',
                     enums: ['top', 'bottom'],
                 }),
-
+                Option({
+                    opt: options.theme.bar.buttons.enableBorders,
+                    title: 'Enable Button Borders',
+                    subtitle: 'Enables button borders for all buttons in the bar.',
+                    type: 'boolean',
+                }),
+                Option({
+                    opt: options.theme.bar.buttons.borderSize,
+                    title: 'Button Border Size',
+                    subtitle: 'Button border for the individual modules must be enabled first',
+                    type: 'string',
+                }),
                 /*
                  ******************************
                  *          SPACING           *
@@ -142,6 +153,11 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                     title: 'Dashboard Menu Icon',
                     type: 'string',
                 }),
+                Option({
+                    opt: options.theme.bar.buttons.dashboard.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.launcher.rightClick,
                     title: 'Right Click',
@@ -169,6 +185,11 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                  ******************************
                  */
                 Header('Workspaces'),
+                Option({
+                    opt: options.theme.bar.buttons.workspaces.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.theme.bar.buttons.workspaces.fontSize,
                     title: 'Indicator Size',
@@ -283,6 +304,11 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                  ******************************
                  */
                 Header('Window Titles'),
+                Option({
+                    opt: options.theme.bar.buttons.windowtitle.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.windowtitle.custom_title,
                     title: 'Use Custom Title',
@@ -363,6 +389,11 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                  ******************************
                  */
                 Header('Volume'),
+                Option({
+                    opt: options.theme.bar.buttons.volume.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.volume.label,
                     title: 'Show Volume Percentage',
@@ -401,6 +432,11 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                  ******************************
                  */
                 Header('Network'),
+                Option({
+                    opt: options.theme.bar.buttons.network.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.network.label,
                     title: 'Show Network Name',
@@ -450,6 +486,11 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                  ******************************
                  */
                 Header('Bluetooth'),
+                Option({
+                    opt: options.theme.bar.buttons.bluetooth.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.bluetooth.label,
                     title: 'Show Bluetooth Label',
@@ -488,6 +529,11 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                  ******************************
                  */
                 Header('Battery'),
+                Option({
+                    opt: options.theme.bar.buttons.battery.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.battery.label,
                     title: 'Show Battery Percentage',
@@ -526,6 +572,11 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                  ******************************
                  */
                 Header('System Tray'),
+                Option({
+                    opt: options.theme.bar.buttons.systray.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.systray.ignore,
                     title: 'Ignore List',
@@ -542,6 +593,11 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                  ******************************
                  */
                 Header('Clock'),
+                Option({
+                    opt: options.theme.bar.buttons.clock.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.clock.format,
                     title: 'Clock Format',
@@ -595,6 +651,11 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                  ******************************
                  */
                 Header('Media'),
+                Option({
+                    opt: options.theme.bar.buttons.media.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.theme.bar.buttons.media.spacing,
                     title: 'Inner Spacing',
@@ -647,6 +708,11 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                  ******************************
                  */
                 Header('Notifications'),
+                Option({
+                    opt: options.theme.bar.buttons.notifications.enableBorder,
+                    title: 'Button Border',
+                    type: 'boolean',
+                }),
                 Option({
                     opt: options.bar.notifications.show_total,
                     title: 'Show Total # of notifications',
diff --git a/widget/settings/pages/theme/bar/index.ts b/widget/settings/pages/theme/bar/index.ts
index b67836b..0fb513d 100644
--- a/widget/settings/pages/theme/bar/index.ts
+++ b/widget/settings/pages/theme/bar/index.ts
@@ -74,8 +74,8 @@ export const BarTheme = (): Scrollable<Child, Attribute> => {
 
                 Header('Dashboard Button'),
                 Option({ opt: options.theme.bar.buttons.dashboard.background, title: 'Background', type: 'color' }),
-                Option({ opt: options.theme.bar.buttons.dashboard.hover, title: 'Hover', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.dashboard.icon, title: 'Icon', type: 'color' }),
+                Option({ opt: options.theme.bar.buttons.dashboard.border, title: 'Border', type: 'color' }),
 
                 Header('Workspaces'),
                 Option({ opt: options.theme.bar.buttons.workspaces.background, title: 'Background', type: 'color' }),
@@ -109,10 +109,10 @@ export const BarTheme = (): Scrollable<Child, Attribute> => {
                     title: 'Workspace Underline Color',
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.workspaces.border, title: 'Border', type: 'color' }),
 
                 Header('Window Title'),
                 Option({ opt: options.theme.bar.buttons.windowtitle.background, title: 'Background', type: 'color' }),
-                Option({ opt: options.theme.bar.buttons.windowtitle.hover, title: 'Hover', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.windowtitle.text, title: 'Text', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.windowtitle.icon, title: 'Icon', type: 'color' }),
                 Option({
@@ -122,10 +122,10 @@ export const BarTheme = (): Scrollable<Child, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.windowtitle.border, title: 'Border', type: 'color' }),
 
                 Header('Media'),
                 Option({ opt: options.theme.bar.buttons.media.background, title: 'Background', type: 'color' }),
-                Option({ opt: options.theme.bar.buttons.media.hover, title: 'Hover', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.media.text, title: 'Text', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.media.icon, title: 'Icon', type: 'color' }),
                 Option({
@@ -135,10 +135,10 @@ export const BarTheme = (): Scrollable<Child, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.media.border, title: 'Border', type: 'color' }),
 
                 Header('Volume'),
                 Option({ opt: options.theme.bar.buttons.volume.background, title: 'Background', type: 'color' }),
-                Option({ opt: options.theme.bar.buttons.volume.hover, title: 'Hover', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.volume.text, title: 'Text', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.volume.icon, title: 'Icon', type: 'color' }),
                 Option({
@@ -148,10 +148,10 @@ export const BarTheme = (): Scrollable<Child, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.volume.border, title: 'Border', type: 'color' }),
 
                 Header('Network'),
                 Option({ opt: options.theme.bar.buttons.network.background, title: 'Background', type: 'color' }),
-                Option({ opt: options.theme.bar.buttons.network.hover, title: 'Hover', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.network.text, title: 'Text', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.network.icon, title: 'Icon', type: 'color' }),
                 Option({
@@ -161,10 +161,10 @@ export const BarTheme = (): Scrollable<Child, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.network.border, title: 'Border', type: 'color' }),
 
                 Header('Bluetooth'),
                 Option({ opt: options.theme.bar.buttons.bluetooth.background, title: 'Background', type: 'color' }),
-                Option({ opt: options.theme.bar.buttons.bluetooth.hover, title: 'Hover', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.bluetooth.text, title: 'Text', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.bluetooth.icon, title: 'Icon', type: 'color' }),
                 Option({
@@ -174,14 +174,13 @@ export const BarTheme = (): Scrollable<Child, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.bluetooth.border, title: 'Border', type: 'color' }),
 
                 Header('System Tray'),
                 Option({ opt: options.theme.bar.buttons.systray.background, title: 'Background', type: 'color' }),
-                Option({ opt: options.theme.bar.buttons.systray.hover, title: 'Hover', type: 'color' }),
 
                 Header('Battery'),
                 Option({ opt: options.theme.bar.buttons.battery.background, title: 'Background', type: 'color' }),
-                Option({ opt: options.theme.bar.buttons.battery.hover, title: 'Hover', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.battery.text, title: 'Text', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.battery.icon, title: 'Icon', type: 'color' }),
                 Option({
@@ -191,10 +190,10 @@ export const BarTheme = (): Scrollable<Child, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.battery.border, title: 'Border', type: 'color' }),
 
                 Header('Clock'),
                 Option({ opt: options.theme.bar.buttons.clock.background, title: 'Background', type: 'color' }),
-                Option({ opt: options.theme.bar.buttons.clock.hover, title: 'Hover', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.clock.text, title: 'Text', type: 'color' }),
                 Option({ opt: options.theme.bar.buttons.clock.icon, title: 'Icon', type: 'color' }),
                 Option({
@@ -204,10 +203,10 @@ export const BarTheme = (): Scrollable<Child, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.clock.border, title: 'Border', type: 'color' }),
 
                 Header('Notifications'),
                 Option({ opt: options.theme.bar.buttons.notifications.background, title: 'Background', type: 'color' }),
-                Option({ opt: options.theme.bar.buttons.notifications.hover, title: 'Hover', type: 'color' }),
                 Option({
                     opt: options.theme.bar.buttons.notifications.total,
                     title: 'Notification Count',
@@ -221,6 +220,7 @@ export const BarTheme = (): Scrollable<Child, Attribute> => {
                         "Applies a background color to the icon section of the button.\nRequires 'split' button styling.",
                     type: 'color',
                 }),
+                Option({ opt: options.theme.bar.buttons.notifications.border, title: 'Border', type: 'color' }),
             ],
         }),
     });