diff --git a/.config/ags/config.js b/.config/ags/config.js
index 4e09423df..74ebdae56 100644
--- a/.config/ags/config.js
+++ b/.config/ags/config.js
@@ -4,7 +4,7 @@ import { App, Utils } from './imports.js';
 // Widgets
 import Bar from './widgets/bar/main.js';
 import Cheatsheet from './widgets/cheatsheet/main.js';
-import DesktopBackground from './widgets/desktopbackground/main.js';
+// import DesktopBackground from './widgets/desktopbackground/main.js';
 import Dock from './widgets/dock/main.js';
 import { CornerTopleft, CornerTopright, CornerBottomleft, CornerBottomright } from './widgets/screencorners/main.js';
 import Indicator from './widgets/indicators/main.js';
@@ -39,12 +39,11 @@ export default {
         'osk': CLOSE_ANIM_TIME,
     },
     windows: [
-        // Bar() is below
         CornerTopleft(),
         CornerTopright(),
         CornerBottomleft(),
         CornerBottomright(),
-        DesktopBackground(),
+        // DesktopBackground(),
         Dock(), // Buggy
         Overview(),
         Indicator(),
@@ -53,6 +52,6 @@ export default {
         SideRight(),
         Osk(), // On-screen keyboard
         Session(), // Power menu, if that's what you like to call it
-        Bar()
+        Bar(),
     ],
 };
diff --git a/.config/ags/lib/notification.js b/.config/ags/lib/notification.js
index b79cb3be9..e3adcc62c 100644
--- a/.config/ags/lib/notification.js
+++ b/.config/ags/lib/notification.js
@@ -57,7 +57,7 @@ const NotificationIcon = (notifObject) => {
                         const styleContext = self.get_parent().get_style_context();
                         const width = styleContext.get_property('min-width', Gtk.StateFlags.NORMAL);
                         const height = styleContext.get_property('min-height', Gtk.StateFlags.NORMAL);
-                        self.size = Math.max(width * 0.9, height * 0.9, 1); // im too lazy to add another box lol
+                        self.size = Math.max(width * 0.7, height * 0.7, 1); // im too lazy to add another box lol
                     }),
                 })
                 :
@@ -185,7 +185,7 @@ export default ({
                 child: NotificationIcon(notifObject),
                 overlays: isPopup ? [AnimatedCircProg({
                     className: `notif-circprog-${notifObject.urgency}`,
-                    valign: Gtk.Align.CENTER,
+                    vpack: 'center', hpack: 'center',
                     initFrom: (isPopup ? 100 : 0),
                     initTo: 0,
                     initAnimTime: popupTimeout,
@@ -245,7 +245,7 @@ export default ({
                 notifTextPreview.revealChild = true;
                 notifTextExpanded.revealChild = false;
                 self.child.label = 'expand_more';
-                expanded = true;
+                expanded = false;
             }
         },
         child: MaterialIcon('expand_more', 'norm', {
@@ -338,7 +338,7 @@ export default ({
 
                 if (widget.window)
                     widget.window.set_cursor(Gdk.Cursor.new_from_name(display, 'grabbing'));
-                
+
                 if (initDirVertical == 1 && offset_y > MOVE_THRESHOLD && !expanded) {
                     notifTextPreview.revealChild = false;
                     notifTextExpanded.revealChild = true;
diff --git a/.config/ags/scripts/templates/gradience/preset.json b/.config/ags/scripts/templates/gradience/preset.json
index d3205c0c1..8591b87f8 100644
--- a/.config/ags/scripts/templates/gradience/preset.json
+++ b/.config/ags/scripts/templates/gradience/preset.json
@@ -87,9 +87,9 @@
         "BLACK_500": "#393634",
         "BLACK_700": "#33302F",
         "BLACK_900": "#2B2928",
-        "accent_bg_color": "#d8baff",
-        "accent_fg_color": "#3e1b6f",
-        "accent_color": "#d8baff",
+        "accent_bg_color": "#ffabf1",
+        "accent_fg_color": "#551251",
+        "accent_color": "#ffabf1",
         "destructive_bg_color": "#ffb4a9",
         "destructive_fg_color": "#680003",
         "destructive_color": "#ffb4a9",
@@ -99,22 +99,22 @@
         "warning_fg_color": "rgba(0, 0, 0, 0.87)",
         "error_bg_color": "#ffb4a9",
         "error_fg_color": "#680003",
-        "window_bg_color": "#111012",
-        "window_fg_color": "#e7e1e6",
-        "view_bg_color": "#1d1b1e",
-        "view_fg_color": "#e7e1e6",
+        "window_bg_color": "#120F11",
+        "window_fg_color": "#eae0e4",
+        "view_bg_color": "#1f1a1d",
+        "view_fg_color": "#eae0e4",
         "headerbar_bg_color": "mix(@dialog_bg_color, @window_bg_color, 0.5)",
-        "headerbar_fg_color": "#eaddf7",
-        "headerbar_border_color": "#4b4357",
+        "headerbar_fg_color": "#f8daee",
+        "headerbar_border_color": "#554050",
         "headerbar_backdrop_color": "@headerbar_bg_color",
         "headerbar_shade_color": "rgba(0, 0, 0, 0.09)",
-        "card_bg_color": "#111012",
-        "card_fg_color": "#eaddf7",
+        "card_bg_color": "#120F11",
+        "card_fg_color": "#f8daee",
         "card_shade_color": "rgba(0, 0, 0, 0.09)",
-        "dialog_bg_color": "#4b4357",
-        "dialog_fg_color": "#eaddf7",
-        "popover_bg_color": "#4b4357",
-        "popover_fg_color": "#eaddf7",
+        "dialog_bg_color": "#554050",
+        "dialog_fg_color": "#f8daee",
+        "popover_bg_color": "#554050",
+        "popover_fg_color": "#f8daee",
         "thumbnail_bg_color": "#1a1b26",
         "thumbnail_fg_color": "#AEE5FA",
         "shade_color": "rgba(0, 0, 0, 0.36)",
diff --git a/.config/ags/scss/_bar.scss b/.config/ags/scss/_bar.scss
index b1bbd4378..d0e2a7892 100644
--- a/.config/ags/scss/_bar.scss
+++ b/.config/ags/scss/_bar.scss
@@ -1,27 +1,16 @@
 // Made to be pixel-perfect with 11pt font size
 // 1rem = 11pt = 14.6666666667px
 
-// Init
 $black: black;
 $white: white;
-$notchSecondaryContainer: $secondaryContainer;
-$notchOnSecondaryContainer: $onSecondaryContainer;
-$notchPrimary: $primary;
-$notchOnPrimary: $onPrimary;
+$bar_ws_width: 1.774rem;
 
-// Check dark mode. Set colors accordingly for the fake snotch that's always black
-@if $darkmode ==true {
-    $notchSecondaryContainer: $secondaryContainer;
-    $notchOnSecondaryContainer: $onSecondaryContainer;
-    $notchPrimary: $primary;
-    $notchOnPrimary: $onPrimary;
+@mixin bar-group-rounding {
+    @include small-rounding;
 }
 
-@else {
-    $notchSecondaryContainer: $onSecondaryContainer;
-    $notchOnSecondaryContainer: $secondaryContainer;
-    $notchPrimary: $primaryContainer;
-    $notchOnPrimary: $onPrimaryContainer;
+.bar-height {
+    min-height: 2.727rem;
 }
 
 .bar-bg {
@@ -34,31 +23,16 @@ $notchOnPrimary: $onPrimary;
 }
 
 .bar-group-margin {
-    padding: 0.2rem;
+    padding: 0.273rem 0rem;
 }
 
 .bar-group {
-    // @include elevation-border;
-    background-color: $t_surface;
-}
-
-.bar-group-center {
-    border-bottom-left-radius: 1.364rem;
-    border-bottom-right-radius: 1.364rem;
-    padding: 0.2rem;
-    // background-color: $t_surface;
-    background-color: $black; // Hard code: fake notch
-}
-
-.corner-bar-group {
-    border-radius: 1.364rem; // Half of bar height
-    border-width: 0.068rem;
-    // background-color: $t_surface;
-    background-color: $black; // Hard code: fake notch
+    background-color: $l_l_t_surfaceVariant;
 }
 
 .bar-group-pad {
-    padding: 0rem 1.023rem;
+    // padding: 0rem 1.023rem;
+    padding: 0.205rem;
 }
 
 .bar-group-pad-less {
@@ -94,7 +68,7 @@ $notchOnPrimary: $onPrimary;
 }
 
 .bar-group-standalone {
-    border-radius: 1.364rem;
+    @include bar-group-rounding;
     -gtk-outline-radius: 1.364rem;
 }
 
@@ -123,7 +97,28 @@ $notchOnPrimary: $onPrimary;
 }
 
 .bar-ws-width {
-    min-width: 18.614rem;
+    min-width: 18.341rem;
+}
+
+.bar-ws {
+    min-width: $bar_ws_width;
+    color: mix($onBackground, $background, 40%);
+    @if $darkmode ==true {
+        color: mix($onBackground, $background, 45%);
+    }
+}
+
+.bar-ws-active {
+    background-color: $secondaryContainer;
+    color: $onSecondaryContainer;
+}
+
+.bar-ws-occupied {
+    background-color: mix($surfaceVariant, $primary, 89%);
+    @if $darkmode ==true {
+        background-color: $surfaceVariant;
+    }
+    color: $onSurfaceVariant;
 }
 
 .bar-separator {
@@ -146,95 +141,12 @@ $notchOnPrimary: $onPrimary;
     color: $onBackground;
 }
 
-.bar-ws {
-    min-height: 1.636rem;
-    min-width: 1.772rem;
-    font-size: 1.091rem;
-    @include mainfont;
-    border-top: 0.068rem solid;
-    border-bottom: 0.068rem solid;
-    border-color: transparent;
-    color: $white;
-}
-
-.bar-ws-active-box {
-    transition: 100ms cubic-bezier(0.05, 0.7, 0.1, 1);
-}
-
-.bar-ws-active {
-    min-height: 1.5rem;
-    min-width: 1.5rem;
-    font-size: 1.091rem;
-    @include mainfont;
-
-    background-color: $notchPrimary;
-    color: $notchOnPrimary;
-    border-radius: 999px;
-    margin: 0.068rem;
-    // background-color: red;
-}
-
-.bar-ws-active-middledecor {
-    min-width: 0.682rem;
-    min-height: 0.682rem;
-    border-radius: 9999px;
-    background-color: $black;
-    margin: 0rem 0.409rem;
-}
-
-.bar-ws-occupied {
-    background-color: $notchSecondaryContainer;
-    color: $notchOnSecondaryContainer;
-    min-width: 1.772rem;
-    border-top: 0.068rem solid $notchOnSecondaryContainer;
-    border-bottom: 0.068rem solid $notchOnSecondaryContainer;
-}
-
-.bar-ws-occupied-left {
-    background-color: $notchSecondaryContainer;
-    color: $notchOnSecondaryContainer;
-    min-width: 1.704rem;
-    border-top-left-radius: 999px;
-    border-bottom-left-radius: 999px;
-
-    border-left: 0.068rem solid $notchOnSecondaryContainer;
-    border-top: 0.068rem solid $notchOnSecondaryContainer;
-    border-bottom: 0.068rem solid $notchOnSecondaryContainer;
-    border-right: 0px solid transparent;
-}
-
-.bar-ws-occupied-right {
-    background-color: $notchSecondaryContainer;
-    color: $notchOnSecondaryContainer;
-    min-width: 1.704rem;
-    border-top-right-radius: 999px;
-    border-bottom-right-radius: 999px;
-
-    border-right: 0.068rem solid $notchOnSecondaryContainer;
-    border-top: 0.068rem solid $notchOnSecondaryContainer;
-    border-bottom: 0.068rem solid $notchOnSecondaryContainer;
-    border-left: 0px solid transparent;
-}
-
-.bar-ws-occupied-left-right {
-    @include full-rounding;
-    background-color: $notchSecondaryContainer;
-    color: $notchOnSecondaryContainer;
-    min-width: 1.636rem;
-    border: 0.068rem solid $notchOnSecondaryContainer;
-}
-
-.bar-ws-empty {
-    color: $onBackground;
-    border-color: transparent;
-}
-
 .bar-batt {
     @include full-rounding;
     padding: 0rem 0.341rem;
     background-color: $t_secondaryContainer;
     color: $t_onSecondaryContainer;
-    // border: 1px solid $onSecondaryContainer;
+    // border: 0.068rem solid $outline;
 }
 
 .bar-sidemodule {
@@ -262,8 +174,8 @@ $notchOnPrimary: $onPrimary;
 }
 
 .bar-music-playstate {
-    min-height: 1.770rem;
-    min-width: 1.770rem;
+    min-height: 1.77rem;
+    min-width: 1.77rem;
     border-radius: 10rem;
     background-color: $secondaryContainer;
     color: $onSecondaryContainer;
@@ -272,15 +184,15 @@ $notchOnPrimary: $onPrimary;
 .bar-music-circprog {
     @include fluent_decel_long;
     min-width: 0.068rem; // line width
-    min-height: 1.770rem;
+    min-height: 1.636rem;
     padding: 0rem;
     background-color: $secondaryContainer;
     color: $onSecondaryContainer;
 }
 
 .bar-music-playstate-playing {
-    min-height: 1.770rem;
-    min-width: 1.770rem;
+    min-height: 1.77rem;
+    min-width: 1.77rem;
     border-radius: 10rem;
     background-color: $secondaryContainer;
     color: $onSecondaryContainer;
@@ -363,8 +275,8 @@ $notchOnPrimary: $onPrimary;
     }
 
     progress {
-        min-height: 0.680rem;
-        min-width: 0.680rem;
+        min-height: 0.68rem;
+        min-width: 0.68rem;
         margin: 0rem 0.137rem;
         border-radius: 10rem;
         background-color: $t_onSecondaryContainer;
@@ -424,7 +336,7 @@ $notchOnPrimary: $onPrimary;
 }
 
 .corner-black {
-    background-color: $black; // Hard code because fake screen corner
+    background-color: $black; // Hard code: fake screen corner
     @include large-rounding;
 }
 
@@ -438,17 +350,17 @@ $notchOnPrimary: $onPrimary;
     padding: 0.341rem;
 }
 
-.bar-space-button>box:first-child {
+.bar-space-button > box:first-child {
     @include full-rounding;
     padding: 0rem 0.682rem;
 }
 
-.bar-space-button:hover>box:first-child,
-.bar-space-button:focus>box:first-child {
+.bar-space-button:hover > box:first-child,
+.bar-space-button:focus > box:first-child {
     background-color: $hovercolor;
 }
 
-.bar-space-button:active>box:first-child {
+.bar-space-button:active > box:first-child {
     background-color: $activecolor;
 }
 
@@ -458,7 +370,7 @@ $notchOnPrimary: $onPrimary;
     }
 }
 
-.bar-space-area-rightmost>box {
+.bar-space-area-rightmost > box {
     padding-right: 2.386rem;
 }
 
@@ -477,7 +389,7 @@ $notchOnPrimary: $onPrimary;
 .bar-statusicons {
     @include full-rounding;
     @include menu_decel;
-    margin: 0.2rem;
+    margin: 0.273rem;
     padding: 0rem 0.614rem;
 }
 
@@ -487,4 +399,4 @@ $notchOnPrimary: $onPrimary;
 
 .bar-statusicons-active {
     background-color: mix($t_background, $t_onBackground, 80%);
-}
\ No newline at end of file
+}
diff --git a/.config/ags/scss/_colors.scss b/.config/ags/scss/_colors.scss
index 5a510350d..ffe3c4ad9 100755
--- a/.config/ags/scss/_colors.scss
+++ b/.config/ags/scss/_colors.scss
@@ -5,15 +5,18 @@ $transparency_enabled: false;
 
 @if $transparency_enabled ==false {
     @if $darkmode ==true {
+        $primary: mix($primary, white, 70%);
+        $primaryContainer: mix($primaryContainer, white, 90%);
         $background: mix(mix($background, $primary, 94%), #000000, 50%);
         $surface: mix($surface, $primaryContainer, 98%);
-        $surfaceVariant: mix($surfaceVariant, #000000, 55%);
+        $surfaceVariant: mix($surfaceVariant, #000000, 75%);
+        // $secondaryContainer: mix($secondaryContainer, $primaryContainer, 90%);
     }
 
     @if $darkmode ==false {
         $background: mix($background, $primary, 87%);
         $surface: mix($surface, $primary, 93%);
-        $surfaceVariant: mix($surfaceVariant, #FFFFFF, 55%);
+        $surfaceVariant: mix($surfaceVariant, #FFFFFF, 25%);
     }
 }
 
diff --git a/.config/ags/scss/_lib_classes.scss b/.config/ags/scss/_lib_classes.scss
index 791a7a1c7..10b817da1 100644
--- a/.config/ags/scss/_lib_classes.scss
+++ b/.config/ags/scss/_lib_classes.scss
@@ -254,6 +254,14 @@
     margin-bottom: 0rem;
 }
 
+.spacing-h-4>* {
+    margin-right: 0.273rem;
+}
+
+.spacing-h-4>*:last-child {
+    margin-right: 0rem;
+}
+
 .spacing-h-5>* {
     margin-right: 0.341rem;
 }
diff --git a/.config/ags/scss/_material.scss b/.config/ags/scss/_material.scss
index e76adf207..4b1ab4eee 100755
--- a/.config/ags/scss/_material.scss
+++ b/.config/ags/scss/_material.scss
@@ -1,29 +1,29 @@
 $darkmode: true;
-$primary: #d8baff;
-$onPrimary: #3e1b6f;
-$primaryContainer: #563587;
-$onPrimaryContainer: #eedcff;
-$secondary: #cec2da;
-$onSecondary: #352d40;
-$secondaryContainer: #4b4357;
-$onSecondaryContainer: #eaddf7;
-$tertiary: #f1b7c2;
-$onTertiary: #4a252e;
-$tertiaryContainer: #643b44;
-$onTertiaryContainer: #ffd9e1;
+$primary: #ffabf1;
+$onPrimary: #551251;
+$primaryContainer: #702c69;
+$onPrimaryContainer: #ffd6f5;
+$secondary: #dbbed2;
+$onSecondary: #3d2b39;
+$secondaryContainer: #554050;
+$onSecondaryContainer: #f8daee;
+$tertiary: #f5b9a6;
+$onTertiary: #4c2619;
+$tertiaryContainer: #663c2e;
+$onTertiaryContainer: #ffdbcf;
 $error: #ffb4a9;
 $onError: #680003;
 $errorContainer: #930006;
 $onErrorContainer: #ffb4a9;
-$colorbarbg: #111012;
-$background: #111012;
-$onBackground: #e7e1e6;
-$surface: #1d1b1e;
-$onSurface: #e7e1e6;
-$surfaceVariant: #4a454e;
-$onSurfaceVariant: #cbc4ce;
-$outline: #958f99;
+$colorbarbg: #120F11;
+$background: #120F11;
+$onBackground: #eae0e4;
+$surface: #1f1a1d;
+$onSurface: #eae0e4;
+$surfaceVariant: #4e444b;
+$onSurfaceVariant: #d1c2cb;
+$outline: #9a8d95;
 $shadow: #000000;
-$inverseSurface: #e7e1e6;
-$inverseOnSurface: #323033;
-$inversePrimary: #6e4da1;
+$inverseSurface: #eae0e4;
+$inverseOnSurface: #342f32;
+$inversePrimary: #8c4483;
diff --git a/.config/ags/scss/_music.scss b/.config/ags/scss/_music.scss
index 8f98091c2..d96441c99 100644
--- a/.config/ags/scss/_music.scss
+++ b/.config/ags/scss/_music.scss
@@ -4,11 +4,11 @@
 @import './musicwal';
 @import './colors';
 @import './lib_mixins';
-$music_gradient1: mix($color1, $background, 30%);
+$music_gradient1: mix($color1, $background, 50%);
 
-@if $darkmode ==true {
-    $music_gradient1: mix($color1, $background, 30%);
-}
+// @if $darkmode ==true {
+//     $music_gradient1: mix($color1, $background, 30%);
+// }
 
 $music_gradient2: $color3;
 $music_gradient3: $color5;
@@ -17,6 +17,9 @@ $music_extra_transparentize: 0.15;
 
 $secondaryContainer: transparentize(mix(mix($background, $color2, 50%), $color6, 80%), 0.5);
 $onSecondaryContainer: mix($color7, $color2, 90%);
+@if $darkmode ==false {
+    $onSecondaryContainer: mix($onSecondaryContainer, black, 50%);
+}
 
 .osd-music {
     @include menu_decel;
diff --git a/.config/ags/scss/_musicmaterial.scss b/.config/ags/scss/_musicmaterial.scss
index 441be992d..8b1378917 100755
--- a/.config/ags/scss/_musicmaterial.scss
+++ b/.config/ags/scss/_musicmaterial.scss
@@ -1,29 +1 @@
-$darkmode: true;
-$primary: #c4c0ff;
-$onPrimary: #251a8c;
-$primaryContainer: #3c36a1;
-$onPrimaryContainer: #e3dfff;
-$secondary: #c7c4dd;
-$onSecondary: #2f2e42;
-$secondaryContainer: #464559;
-$onSecondaryContainer: #e3dff9;
-$tertiary: #eab9d1;
-$onTertiary: #472639;
-$tertiaryContainer: #603c50;
-$onTertiaryContainer: #ffd8eb;
-$error: #ffb4a9;
-$onError: #680003;
-$errorContainer: #930006;
-$onErrorContainer: #ffb4a9;
-$colorbarbg: #101012;
-$background: #101012;
-$onBackground: #e5e1e6;
-$surface: #1c1b1f;
-$onSurface: #e5e1e6;
-$surfaceVariant: #47464f;
-$onSurfaceVariant: #c8c5d0;
-$outline: #928f9a;
-$shadow: #000000;
-$inverseSurface: #e5e1e6;
-$inverseOnSurface: #313033;
-$inversePrimary: #5550bb;
+
diff --git a/.config/ags/scss/_musicwal.scss b/.config/ags/scss/_musicwal.scss
index 6656696fd..8b1378917 100644
--- a/.config/ags/scss/_musicwal.scss
+++ b/.config/ags/scss/_musicwal.scss
@@ -1,26 +1 @@
-// SCSS Variables
-// Generated by 'wal'
-$wallpaper: "/home/end/.cache/ags/media/375d6eb3358763763a73710dca3bbfad1a5434d8";
 
-// Special
-$background: #0a0919;
-$foreground: #bfacd9;
-$cursor: #bfacd9;
-
-// Colors
-$color0: #0a0919;
-$color1: #2E2693;
-$color2: #382FA6;
-$color3: #4C2F99;
-$color4: #4839B3;
-$color5: #5A49B4;
-$color6: #5C4CC7;
-$color7: #bfacd9;
-$color8: #857897;
-$color9: #2E2693;
-$color10: #382FA6;
-$color11: #4C2F99;
-$color12: #4839B3;
-$color13: #5A49B4;
-$color14: #5C4CC7;
-$color15: #bfacd9;
diff --git a/.config/ags/scss/_notifications.scss b/.config/ags/scss/_notifications.scss
index 84726aa85..40bb15fa6 100644
--- a/.config/ags/scss/_notifications.scss
+++ b/.config/ags/scss/_notifications.scss
@@ -134,7 +134,7 @@ $notif_surface: $t_background;
 .notif-circprog-low {
     transition: 0ms linear;
     min-width: 0.136rem; // line width
-    min-height: 3.409rem;
+    min-height: 3.136rem;
     padding: 0rem;
     color: $onSecondaryContainer;
 }
@@ -142,7 +142,7 @@ $notif_surface: $t_background;
 .notif-circprog-normal {
     transition: 0ms linear;
     min-width: 0.136rem; // line width
-    min-height: 3.409rem;
+    min-height: 3.136rem;
     padding: 0rem;
     color: $onSecondaryContainer;
 }
@@ -150,7 +150,7 @@ $notif_surface: $t_background;
 .notif-circprog-critical {
     transition: 0ms linear;
     min-width: 0.136rem; // line width
-    min-height: 3.409rem;
+    min-height: 3.136rem;
     padding: 0rem;
     color: $secondaryContainer;
 }
@@ -164,43 +164,43 @@ $notif_surface: $t_background;
 }
 
 .notif-action-low {
-    background-color: $l_t_surfaceVariant;
+    background-color: mix($t_onSurfaceVariant, $t_surface, 10%);
     color: $onSurfaceVariant;
 }
 
 .notif-action-low:focus,
 .notif-action-low:hover {
-    background-color: mix($t_onSurfaceVariant, $l_t_surfaceVariant, 10%);
+    background-color: mix($t_onSurfaceVariant, $t_surface, 18%);
 }
 
 .notif-action-low:active {
-    background-color: mix($t_onSurfaceVariant, $l_t_surfaceVariant, 15%);
+    background-color: mix($t_onSurfaceVariant, $t_surface, 23%);
 }
 
 .notif-action-normal {
-    background-color: $l_t_surfaceVariant;
+    background-color: mix($t_onSurfaceVariant, $t_surface, 10%);
     color: $onSurfaceVariant;
 }
 
 .notif-action-normal:focus,
 .notif-action-normal:hover {
-    background-color: mix($t_onSurfaceVariant, $l_t_surfaceVariant, 10%);
+    background-color: mix($t_onSurfaceVariant, $t_surface, 18%);
 }
 
 .notif-action-normal:active {
-    background-color: mix($t_onSurfaceVariant, $l_t_surfaceVariant, 15%);
+    background-color: mix($t_onSurfaceVariant, $t_surface, 23%);
 }
 
 .notif-action-critical {
-    background-color: $t_onSurfaceVariant;
+    background-color: mix($t_onSecondaryContainer, $t_secondaryContainer, 10%);
     color: $onSurfaceVariant;
 }
 
 .notif-action-critical:focus,
 .notif-action-critical:hover {
-    background-color: mix($t_onSurfaceVariant, $l_t_surfaceVariant, 10%);
+    background-color: mix($t_onSecondaryContainer, $t_secondaryContainer, 18%);
 }
 
 .notif-action-critical:active {
-    background-color: mix($t_onSurfaceVariant, $l_t_surfaceVariant, 15%);
+    background-color: mix($t_onSecondaryContainer, $t_secondaryContainer, 23%);
 }
diff --git a/.config/ags/style.css b/.config/ags/style.css
index b6ffc2c55..b4240dc61 100644
--- a/.config/ags/style.css
+++ b/.config/ags/style.css
@@ -41,13 +41,13 @@
   transition: 0ms; }
 
 .txt {
-  color: #e7e1e6; }
+  color: #eae0e4; }
 
 .txt-primary {
-  color: #d8baff; }
+  color: #ffc4f5; }
 
 .txt-onSecondaryContainer {
-  color: #eaddf7; }
+  color: #f8daee; }
 
 .txt-shadow {
   text-shadow: 1px 2px 8px rgba(0, 0, 0, 0.69);
@@ -101,10 +101,10 @@
   font-size: 0px; }
 
 .txt-subtext {
-  color: #a6a1a6; }
+  color: #a9a1a4; }
 
 .txt-action {
-  color: #c7c1c6; }
+  color: #c9c0c4; }
 
 .txt-semibold {
   font-weight: 500; }
@@ -130,7 +130,7 @@
 .separator-circle {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
-  background-color: #e7e1e6;
+  background-color: #eae0e4;
   margin: 0rem 0.682rem;
   min-width: 0.545rem;
   min-height: 0.545rem; }
@@ -189,6 +189,12 @@
 .spacing-v-5-revealer > scrolledwindow:last-child > * {
   margin-bottom: 0rem; }
 
+.spacing-h-4 > * {
+  margin-right: 0.273rem; }
+
+.spacing-h-4 > *:last-child {
+  margin-right: 0rem; }
+
 .spacing-h-5 > * {
   margin-right: 0.341rem; }
 
@@ -361,10 +367,10 @@
   transition: 300ms cubic-bezier(0.85, 0, 0.15, 1); }
 
 * {
-  caret-color: #d8baff; }
+  caret-color: #ffc4f5; }
   * selection {
-    background-color: #cec2da;
-    color: #352d40; }
+    background-color: #dbbed2;
+    color: #3d2b39; }
 
 @keyframes appear {
   from {
@@ -379,13 +385,13 @@ tooltip {
   animation-iteration-count: 1; }
 
 menu {
-  border-top: 1px solid rgba(59, 57, 61, 0.121);
-  border-left: 1px solid rgba(59, 57, 61, 0.121);
-  border-right: 1px solid rgba(45, 43, 47, 0.1105);
-  border-bottom: 1px solid rgba(45, 43, 47, 0.1105);
+  border-top: 1px solid rgba(62, 56, 60, 0.121);
+  border-left: 1px solid rgba(62, 56, 60, 0.121);
+  border-right: 1px solid rgba(48, 42, 46, 0.1105);
+  border-bottom: 1px solid rgba(48, 42, 46, 0.1105);
   padding: 0.681rem;
-  background: #29262b;
-  color: #cbc4ce;
+  background: #3b3338;
+  color: #d1c2cb;
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
   animation-name: appear;
@@ -408,53 +414,53 @@ menu > menuitem {
 
 menu > menuitem:hover,
 menu > menuitem:focus {
-  background-color: #39363b; }
+  background-color: #4a4147; }
 
 .separator-line {
-  background-color: #29262b;
+  background-color: #3b3338;
   min-width: 0.068rem;
   min-height: 0.068rem; }
 
 tooltip {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
-  background-color: #29262b;
-  color: #cbc4ce;
-  border: 1px solid #cbc4ce; }
+  background-color: #3b3338;
+  color: #d1c2cb;
+  border: 1px solid #d1c2cb; }
 
 .configtoggle-box {
   padding: 0.205rem 0.341rem;
   border: 0.136rem solid transparent; }
 
 .configtoggle-box:focus {
-  border: 0.136rem solid #6e6b6f; }
+  border: 0.136rem solid #716a6e; }
 
 .switch-bg {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
-  background-color: #171518;
-  border: 0.136rem solid #e7e1e6;
+  background-color: #191418;
+  border: 0.136rem solid #eae0e4;
   min-width: 2.864rem;
   min-height: 1.637rem; }
 
 .switch-bg-true {
-  background-color: #d8baff;
-  border: 0.136rem solid #d8baff; }
+  background-color: #ffc4f5;
+  border: 0.136rem solid #ffc4f5; }
 
 .switch-fg {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
-  background-color: #e7e1e6;
-  color: #1e1c20;
+  background-color: #eae0e4;
+  color: #211b1f;
   min-width: 0.819rem;
   min-height: 0.819rem;
   margin-left: 0.477rem; }
 
 .switch-fg-true {
-  background-color: #3e1b6f;
-  color: #d8baff;
+  background-color: #551251;
+  color: #ffc4f5;
   min-width: 1.431rem;
   min-height: 1.431rem;
   margin-left: 1.431rem; }
@@ -467,14 +473,14 @@ tooltip {
 .segment-container {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
-  border: 0.068rem solid #958f99; }
+  border: 0.068rem solid #9a8d95; }
 
 .segment-container > *:first-child {
   border-top-left-radius: 9999px;
   border-bottom-left-radius: 9999px; }
 
 .segment-container > * {
-  border-right: 0.068rem solid #958f99;
+  border-right: 0.068rem solid #9a8d95;
   padding: 0.341rem 0.682rem; }
 
 .segment-container > *:last-child {
@@ -483,21 +489,21 @@ tooltip {
   border-bottom-right-radius: 9999px; }
 
 .segment-btn {
-  color: #e7e1e6; }
+  color: #eae0e4; }
 
 .segment-btn:focus,
 .segment-btn:hover {
-  background-color: #29262b;
-  color: #cbc4ce; }
+  background-color: #3b3338;
+  color: #d1c2cb; }
 
 .segment-btn-enabled {
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .segment-btn-enabled:hover,
 .segment-btn-enabled:focus {
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .gap-v-5 {
   min-height: 0.341rem; }
@@ -517,32 +523,24 @@ tooltip {
 .gap-h-15 {
   min-width: 1.023rem; }
 
+.bar-height {
+  min-height: 2.727rem; }
+
 .bar-bg {
-  background-color: #0f0d10;
+  background-color: #100d10;
   min-height: 2.727rem; }
 
 .bar-sidespace {
   min-width: 1.5rem; }
 
 .bar-group-margin {
-  padding: 0.2rem; }
+  padding: 0.273rem 0rem; }
 
 .bar-group {
-  background-color: rgba(30, 28, 32, 0.31); }
-
-.bar-group-center {
-  border-bottom-left-radius: 1.364rem;
-  border-bottom-right-radius: 1.364rem;
-  padding: 0.2rem;
-  background-color: black; }
-
-.corner-bar-group {
-  border-radius: 1.364rem;
-  border-width: 0.068rem;
-  background-color: black; }
+  background-color: rgba(59, 51, 56, 0.45); }
 
 .bar-group-pad {
-  padding: 0rem 1.023rem; }
+  padding: 0.205rem; }
 
 .bar-group-pad-less {
   padding: 0rem 0.681rem; }
@@ -570,7 +568,8 @@ tooltip {
   padding-right: 0.681rem; }
 
 .bar-group-standalone {
-  border-radius: 1.364rem;
+  border-radius: 0.818rem;
+  -gtk-outline-radius: 0.818rem;
   -gtk-outline-radius: 1.364rem; }
 
 .bar-group-round {
@@ -594,103 +593,46 @@ tooltip {
   border-bottom-right-radius: 1.364rem; }
 
 .bar-ws-width {
-  min-width: 18.614rem; }
+  min-width: 18.341rem; }
+
+.bar-ws {
+  min-width: 1.774rem;
+  color: #676165;
+  color: #726c6f; }
+
+.bar-ws-active {
+  background-color: #554050;
+  color: #f8daee; }
+
+.bar-ws-occupied {
+  background-color: #51434d;
+  background-color: #3b3338;
+  color: #d1c2cb; }
 
 .bar-separator {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
   min-width: 0.341rem;
   min-height: 0.341rem;
-  background-color: rgba(50, 48, 52, 0.31);
+  background-color: rgba(53, 47, 51, 0.31);
   margin: 0rem 0.341rem; }
 
 .bar-clock {
   font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif;
   font-size: 1.2727rem;
-  color: #e7e1e6; }
+  color: #eae0e4; }
 
 .bar-date {
   font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif;
   font-size: 1rem;
-  color: #e7e1e6; }
-
-.bar-ws {
-  min-height: 1.636rem;
-  min-width: 1.772rem;
-  font-size: 1.091rem;
-  font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif;
-  border-top: 0.068rem solid;
-  border-bottom: 0.068rem solid;
-  border-color: transparent;
-  color: white; }
-
-.bar-ws-active-box {
-  transition: 100ms cubic-bezier(0.05, 0.7, 0.1, 1); }
-
-.bar-ws-active {
-  min-height: 1.5rem;
-  min-width: 1.5rem;
-  font-size: 1.091rem;
-  font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif;
-  background-color: #d8baff;
-  color: #3e1b6f;
-  border-radius: 999px;
-  margin: 0.068rem; }
-
-.bar-ws-active-middledecor {
-  min-width: 0.682rem;
-  min-height: 0.682rem;
-  border-radius: 9999px;
-  background-color: black;
-  margin: 0rem 0.409rem; }
-
-.bar-ws-occupied {
-  background-color: #4b4357;
-  color: #eaddf7;
-  min-width: 1.772rem;
-  border-top: 0.068rem solid #eaddf7;
-  border-bottom: 0.068rem solid #eaddf7; }
-
-.bar-ws-occupied-left {
-  background-color: #4b4357;
-  color: #eaddf7;
-  min-width: 1.704rem;
-  border-top-left-radius: 999px;
-  border-bottom-left-radius: 999px;
-  border-left: 0.068rem solid #eaddf7;
-  border-top: 0.068rem solid #eaddf7;
-  border-bottom: 0.068rem solid #eaddf7;
-  border-right: 0px solid transparent; }
-
-.bar-ws-occupied-right {
-  background-color: #4b4357;
-  color: #eaddf7;
-  min-width: 1.704rem;
-  border-top-right-radius: 999px;
-  border-bottom-right-radius: 999px;
-  border-right: 0.068rem solid #eaddf7;
-  border-top: 0.068rem solid #eaddf7;
-  border-bottom: 0.068rem solid #eaddf7;
-  border-left: 0px solid transparent; }
-
-.bar-ws-occupied-left-right {
-  border-radius: 9999px;
-  -gtk-outline-radius: 9999px;
-  background-color: #4b4357;
-  color: #eaddf7;
-  min-width: 1.636rem;
-  border: 0.068rem solid #eaddf7; }
-
-.bar-ws-empty {
-  color: #e7e1e6;
-  border-color: transparent; }
+  color: #eae0e4; }
 
 .bar-batt {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
   padding: 0rem 0.341rem;
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .bar-sidemodule {
   min-width: 26rem; }
@@ -712,26 +654,26 @@ tooltip {
   color: #d1e9d6; }
 
 .bar-music-playstate {
-  min-height: 1.770rem;
-  min-width: 1.770rem;
+  min-height: 1.77rem;
+  min-width: 1.77rem;
   border-radius: 10rem;
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .bar-music-circprog {
   transition: 1000ms cubic-bezier(0.1, 1, 0, 1);
   min-width: 0.068rem;
-  min-height: 1.770rem;
+  min-height: 1.636rem;
   padding: 0rem;
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .bar-music-playstate-playing {
-  min-height: 1.770rem;
-  min-width: 1.770rem;
+  min-height: 1.77rem;
+  min-width: 1.77rem;
   border-radius: 10rem;
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .bar-music-playstate-txt {
   transition: 100ms cubic-bezier(0.05, 0.7, 0.1, 1);
@@ -795,11 +737,11 @@ tooltip {
     min-width: 0.068rem;
     border-radius: 10rem; }
   .bar-prog-batt progress {
-    min-height: 0.680rem;
-    min-width: 0.680rem;
+    min-height: 0.68rem;
+    min-width: 0.68rem;
     margin: 0rem 0.137rem;
     border-radius: 10rem;
-    background-color: #eaddf7; }
+    background-color: #f8daee; }
 
 .bar-prog-batt-low progress {
   background-color: #930006; }
@@ -815,15 +757,15 @@ tooltip {
   border-radius: 10rem;
   min-width: 0.681rem;
   min-height: 0.681rem;
-  background-color: #eaddf7;
-  color: #4b4357; }
+  background-color: #f8daee;
+  color: #554050; }
 
 .bar-batt-chargestate-charging-smaller {
   border-radius: 10rem;
   min-width: 0.409rem;
   min-height: 0.409rem;
-  background-color: #eaddf7;
-  color: #4b4357; }
+  background-color: #f8daee;
+  color: #554050; }
 
 .bar-batt-chargestate-low {
   background-color: #930006; }
@@ -837,7 +779,7 @@ tooltip {
   font-weight: 500; }
 
 .corner {
-  background-color: #0f0d10;
+  background-color: #100d10;
   border-radius: 1.705rem;
   -gtk-outline-radius: 1.705rem; }
 
@@ -849,7 +791,7 @@ tooltip {
 .bar-topdesc {
   margin-top: -0.136rem;
   margin-bottom: -0.341rem;
-  color: #a6a1a6; }
+  color: #a9a1a4; }
 
 .bar-space-button {
   padding: 0.341rem; }
@@ -888,26 +830,26 @@ tooltip {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
-  margin: 0.2rem;
+  margin: 0.273rem;
   padding: 0rem 0.614rem; }
 
 .bar-statusicons-hover {
-  background-color: #252225; }
+  background-color: #262225; }
 
 .bar-statusicons-active {
-  background-color: #3a373b; }
+  background-color: #3c373a; }
 
 .cheatsheet-bg {
   border-radius: 1.705rem;
   -gtk-outline-radius: 1.705rem;
-  border-top: 1px solid rgba(166, 162, 166, 0.19);
-  border-left: 1px solid rgba(166, 162, 166, 0.19);
-  border-right: 1px solid rgba(131, 127, 131, 0.145);
-  border-bottom: 1px solid rgba(131, 127, 131, 0.145);
+  border-top: 1px solid rgba(169, 161, 165, 0.19);
+  border-left: 1px solid rgba(169, 161, 165, 0.19);
+  border-right: 1px solid rgba(134, 126, 130, 0.145);
+  border-bottom: 1px solid rgba(134, 126, 130, 0.145);
   box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45);
   margin: 0.476rem;
   margin-bottom: 0.682rem;
-  background-color: #0f0d10;
+  background-color: #100d10;
   padding: 1.364rem; }
 
 .cheatsheet-key {
@@ -918,16 +860,16 @@ tooltip {
   padding: 0.136rem 0.205rem;
   border-radius: 0.409rem;
   -gtk-outline-radius: 0.409rem;
-  color: #d8baff;
-  border: 0.068rem solid #d8baff;
-  box-shadow: 0rem 0.136rem 0rem #d8baff;
+  color: #ffc4f5;
+  border: 0.068rem solid #ffc4f5;
+  box-shadow: 0rem 0.136rem 0rem #ffc4f5;
   font-weight: 500; }
 
 .cheatsheet-key-notkey {
   min-height: 1.364rem;
   padding: 0.136rem 0.205rem;
   margin: 0.17rem;
-  color: #eedcff; }
+  color: #ffd6f5; }
 
 .cheatsheet-closebtn {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
@@ -938,10 +880,10 @@ tooltip {
 
 .cheatsheet-closebtn:hover,
 .cheatsheet-closebtn:focus {
-  background-color: #29262b; }
+  background-color: #3b3338; }
 
 .cheatsheet-closebtn:active {
-  background-color: #5a555c; }
+  background-color: #685e64; }
 
 .cheatsheet-category-title {
   font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif;
@@ -956,12 +898,12 @@ tooltip {
 .bg-time-clock {
   font-family: 'Gabarito';
   font-size: 5.795rem;
-  color: #e7e1e6; }
+  color: #eae0e4; }
 
 .bg-time-date {
   font-family: 'Gabarito';
   font-size: 2.591rem;
-  color: #e7e1e6; }
+  color: #eae0e4; }
 
 .bg-distro-box {
   border-radius: 1.705rem;
@@ -972,12 +914,12 @@ tooltip {
 .bg-distro-txt {
   font-family: 'Gabarito';
   font-size: 1.432rem;
-  color: #e7e1e6; }
+  color: #eae0e4; }
 
 .bg-distro-name {
   font-family: 'Gabarito';
   font-size: 1.432rem;
-  color: #eaddf7; }
+  color: #f8daee; }
 
 .bg-graph {
   color: rgba(255, 255, 255, 0.5);
@@ -986,25 +928,25 @@ tooltip {
 
 .bg-quicklaunch-title {
   font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif;
-  color: #cbc4ce; }
+  color: #d1c2cb; }
 
 .bg-quicklaunch-btn {
   font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif;
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
-  background-color: #29262b;
-  color: #cbc4ce;
-  border: 0.068rem solid #a6a1a6;
+  background-color: #3b3338;
+  color: #d1c2cb;
+  border: 0.068rem solid #a9a1a4;
   min-width: 4.432rem;
   min-height: 2.045rem;
   padding: 0.273rem 0.682rem; }
 
 .bg-quicklaunch-btn:hover,
 .bg-quicklaunch-btn:focus {
-  background-color: #312e33; }
+  background-color: #433a3f; }
 
 .bg-quicklaunch-btn:active {
-  background-color: #39363b; }
+  background-color: #4a4147; }
 
 .bg-system-bg {
   border-radius: 1.159rem;
@@ -1016,14 +958,14 @@ tooltip {
   min-height: 4.091rem;
   font-size: 0px;
   padding: 0rem;
-  background-color: #29262b; }
+  background-color: #3b3338; }
 
 .dock-bg {
   border-radius: 1.705rem;
   -gtk-outline-radius: 1.705rem;
   box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45);
   margin: 0.476rem;
-  background-color: #0f0d10;
+  background-color: #100d10;
   padding: 0.682rem; }
 
 .dock-app-btn {
@@ -1033,10 +975,10 @@ tooltip {
 
 .dock-app-btn:hover,
 .dock-app-btn:focus {
-  background-color: rgba(40, 38, 42, 0.31); }
+  background-color: rgba(43, 37, 41, 0.31); }
 
 .dock-app-btn:active {
-  background-color: rgba(60, 58, 62, 0.31); }
+  background-color: rgba(63, 57, 61, 0.31); }
 
 .dock-app-icon {
   min-width: 3.409rem;
@@ -1044,20 +986,20 @@ tooltip {
 
 .dock-separator {
   min-width: 0.068rem;
-  background-color: #29262b; }
+  background-color: #3b3338; }
 
 .osd-bg {
   min-width: 8.864rem;
   min-height: 3.409rem; }
 
 .osd-value {
-  border-top: 1px solid rgba(166, 162, 166, 0.19);
-  border-left: 1px solid rgba(166, 162, 166, 0.19);
-  border-right: 1px solid rgba(131, 127, 131, 0.145);
-  border-bottom: 1px solid rgba(131, 127, 131, 0.145);
+  border-top: 1px solid rgba(169, 161, 165, 0.19);
+  border-left: 1px solid rgba(169, 161, 165, 0.19);
+  border-right: 1px solid rgba(134, 126, 130, 0.145);
+  border-bottom: 1px solid rgba(134, 126, 130, 0.145);
   box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45);
   margin: 0.476rem;
-  background-color: #0f0d10;
+  background-color: #100d10;
   border-radius: 1.023rem;
   padding: 0.625rem 1.023rem;
   padding-top: 0.313rem;
@@ -1073,36 +1015,36 @@ tooltip {
     min-height: 0.954rem;
     min-width: 0.068rem;
     border-radius: 10rem;
-    background-color: #4b4357; }
+    background-color: #554050; }
   .osd-progress progress {
     transition: 200ms cubic-bezier(0.1, 1, 0, 1);
     min-height: 0.680rem;
     min-width: 0.680rem;
     margin: 0rem 0.137rem;
     border-radius: 10rem;
-    background-color: #eaddf7; }
+    background-color: #f8daee; }
 
 .osd-icon {
-  color: #eedcff; }
+  color: #ffd6f5; }
 
 .osd-label {
   font-size: 1.023rem;
   font-weight: 500;
-  color: #e7e1e6;
+  color: #eae0e4;
   margin-top: 0.341rem; }
 
 .osd-value-txt {
   font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif;
   font-size: 1.688rem;
   font-weight: 500;
-  color: #e7e1e6; }
+  color: #eae0e4; }
 
 .osd-notifs {
   padding-top: 0.313rem; }
 
 .osd-colorscheme {
   border-radius: 1.023rem;
-  background-color: #0f0d10;
+  background-color: #100d10;
   padding: 1.023rem;
   box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45);
   margin: 0.476rem; }
@@ -1120,46 +1062,46 @@ tooltip {
     margin: 0.409rem; }
 
 .osd-color-primary {
-  background-color: #d8baff;
-  color: #3e1b6f; }
+  background-color: #ffc4f5;
+  color: #551251; }
   .osd-color-primary box {
-    background-color: #3e1b6f; }
+    background-color: #551251; }
 
 .osd-color-primaryContainer {
-  background-color: #563587;
-  color: #eedcff; }
+  background-color: #7e4178;
+  color: #ffd6f5; }
   .osd-color-primaryContainer box {
-    background-color: #eedcff; }
+    background-color: #ffd6f5; }
 
 .osd-color-secondary {
-  background-color: #cec2da;
-  color: #352d40; }
+  background-color: #dbbed2;
+  color: #3d2b39; }
   .osd-color-secondary box {
-    background-color: #352d40; }
+    background-color: #3d2b39; }
 
 .osd-color-secondaryContainer {
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
   .osd-color-secondaryContainer box {
-    background-color: #eaddf7; }
+    background-color: #f8daee; }
 
 .osd-color-surfaceVariant {
-  background-color: #29262b;
-  color: #cbc4ce; }
+  background-color: #3b3338;
+  color: #d1c2cb; }
   .osd-color-surfaceVariant box {
-    background-color: #cbc4ce; }
+    background-color: #d1c2cb; }
 
 .osd-color-surface {
-  background-color: #1e1c20;
-  color: #e7e1e6; }
+  background-color: #211b1f;
+  color: #eae0e4; }
   .osd-color-surface box {
-    background-color: #e7e1e6; }
+    background-color: #eae0e4; }
 
 .osd-color-background {
-  background-color: #0f0d10;
-  color: #e7e1e6; }
+  background-color: #100d10;
+  color: #eae0e4; }
   .osd-color-background box {
-    background-color: #e7e1e6; }
+    background-color: #eae0e4; }
 
 .osd-show {
   transition: 200ms cubic-bezier(0.1, 1, 0, 1); }
@@ -1174,29 +1116,29 @@ tooltip {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
   border-radius: 1.705rem;
   -gtk-outline-radius: 1.705rem;
-  border-top: 1px solid rgba(166, 162, 166, 0.19);
-  border-left: 1px solid rgba(166, 162, 166, 0.19);
-  border-right: 1px solid rgba(131, 127, 131, 0.145);
-  border-bottom: 1px solid rgba(131, 127, 131, 0.145);
+  border-top: 1px solid rgba(169, 161, 165, 0.19);
+  border-left: 1px solid rgba(169, 161, 165, 0.19);
+  border-right: 1px solid rgba(134, 126, 130, 0.145);
+  border-bottom: 1px solid rgba(134, 126, 130, 0.145);
   box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45);
   margin: 0.476rem;
   min-width: 13.636rem;
   min-height: 3.409rem;
   padding: 0rem 1.364rem;
   padding-right: 2.864rem;
-  background-color: #0f0d10;
-  color: #e7e1e6;
+  background-color: #100d10;
+  color: #eae0e4;
   caret-color: transparent; }
   .overview-search-box selection {
-    background-color: #cec2da;
-    color: #352d40; }
+    background-color: #dbbed2;
+    color: #3d2b39; }
 
 .overview-search-box-extended {
   min-width: 25.909rem;
-  caret-color: #eaddf7; }
+  caret-color: #f8daee; }
 
 .overview-search-prompt {
-  color: #a6a1a6; }
+  color: #a9a1a4; }
 
 .overview-search-icon {
   margin: 0rem 1.023rem; }
@@ -1212,16 +1154,16 @@ tooltip {
 .overview-search-results {
   border-radius: 1.705rem;
   -gtk-outline-radius: 1.705rem;
-  border-top: 1px solid rgba(166, 162, 166, 0.19);
-  border-left: 1px solid rgba(166, 162, 166, 0.19);
-  border-right: 1px solid rgba(131, 127, 131, 0.145);
-  border-bottom: 1px solid rgba(131, 127, 131, 0.145);
+  border-top: 1px solid rgba(169, 161, 165, 0.19);
+  border-left: 1px solid rgba(169, 161, 165, 0.19);
+  border-right: 1px solid rgba(134, 126, 130, 0.145);
+  border-bottom: 1px solid rgba(134, 126, 130, 0.145);
   box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45);
   margin: 0.476rem;
   min-width: 28.773rem;
   padding: 0.682rem;
-  background-color: #0f0d10;
-  color: #e7e1e6; }
+  background-color: #100d10;
+  color: #eae0e4; }
 
 .overview-search-results-icon {
   margin: 0rem 0.682rem;
@@ -1255,43 +1197,43 @@ tooltip {
 .overview-tasks {
   border-radius: 1.705rem;
   -gtk-outline-radius: 1.705rem;
-  border-top: 1px solid rgba(166, 162, 166, 0.19);
-  border-left: 1px solid rgba(166, 162, 166, 0.19);
-  border-right: 1px solid rgba(131, 127, 131, 0.145);
-  border-bottom: 1px solid rgba(131, 127, 131, 0.145);
+  border-top: 1px solid rgba(169, 161, 165, 0.19);
+  border-left: 1px solid rgba(169, 161, 165, 0.19);
+  border-right: 1px solid rgba(134, 126, 130, 0.145);
+  border-bottom: 1px solid rgba(134, 126, 130, 0.145);
   box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45);
   margin: 0.476rem;
   padding: 0.341rem;
-  background-color: #0f0d10;
-  color: #e7e1e6; }
+  background-color: #100d10;
+  color: #eae0e4; }
 
 .overview-tasks-workspace {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
   margin: 0.341rem;
-  background-color: rgba(51, 48, 52, 0.1147); }
+  background-color: rgba(54, 47, 51, 0.1147); }
 
 .overview-tasks-workspace-number {
   font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif;
-  color: rgba(217, 211, 216, 0.31); }
+  color: rgba(220, 210, 214, 0.31); }
 
 .overview-tasks-window {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
-  background-color: rgba(75, 67, 87, 0.5);
-  color: #eaddf7;
-  border: 0.068rem solid rgba(234, 221, 247, 0.07); }
+  background-color: rgba(85, 64, 80, 0.5);
+  color: #f8daee;
+  border: 0.068rem solid rgba(248, 218, 238, 0.07); }
 
 .overview-tasks-window:hover,
 .overview-tasks-window:focus {
-  background-color: rgba(94, 83, 110, 0.525); }
+  background-color: rgba(108, 82, 103, 0.525); }
 
 .overview-tasks-window:active {
-  background-color: rgba(110, 97, 129, 0.55); }
+  background-color: rgba(128, 97, 121, 0.55); }
 
 .overview-tasks-window-selected {
-  background-color: rgba(110, 97, 129, 0.55); }
+  background-color: rgba(128, 97, 121, 0.55); }
 
 .overview-tasks-window-dragging {
   opacity: 0.2; }
@@ -1299,13 +1241,13 @@ tooltip {
 .osk-window {
   border-radius: 1.705rem;
   -gtk-outline-radius: 1.705rem;
-  border-top: 1px solid rgba(166, 162, 166, 0.19);
-  border-left: 1px solid rgba(166, 162, 166, 0.19);
-  border-right: 1px solid rgba(131, 127, 131, 0.145);
-  border-bottom: 1px solid rgba(131, 127, 131, 0.145);
+  border-top: 1px solid rgba(169, 161, 165, 0.19);
+  border-left: 1px solid rgba(169, 161, 165, 0.19);
+  border-right: 1px solid rgba(134, 126, 130, 0.145);
+  border-bottom: 1px solid rgba(134, 126, 130, 0.145);
   box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45);
   margin: 0.476rem;
-  background-color: #0f0d10; }
+  background-color: #100d10; }
 
 .osk-body {
   padding: 1.023rem;
@@ -1322,7 +1264,7 @@ tooltip {
 .osk-dragline {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
-  background-color: #29262b;
+  background-color: #3b3338;
   min-height: 0.273rem;
   min-width: 10.227rem;
   margin-top: 0.545rem;
@@ -1330,22 +1272,22 @@ tooltip {
 
 .osk-key {
   border-radius: 0.682rem;
-  background-color: rgba(41, 38, 43, 0.31);
-  color: #cbc4ce;
+  background-color: rgba(59, 51, 56, 0.31);
+  color: #d1c2cb;
   padding: 0.188rem;
   font-weight: 500;
   font-size: 1.091rem; }
 
 .osk-key:hover,
 .osk-key:focus {
-  background-color: rgba(57, 54, 59, 0.31); }
+  background-color: rgba(74, 65, 71, 0.31); }
 
 .osk-key:active {
-  background-color: rgba(90, 85, 92, 0.31);
+  background-color: rgba(104, 94, 100, 0.31);
   font-size: 1.091rem; }
 
 .osk-key-active {
-  background-color: rgba(90, 85, 92, 0.31); }
+  background-color: rgba(104, 94, 100, 0.31); }
 
 .osk-key-normal {
   min-width: 2.5rem;
@@ -1373,31 +1315,31 @@ tooltip {
 
 .osk-control-button {
   border-radius: 0.682rem;
-  background-color: rgba(41, 38, 43, 0.31);
-  color: #cbc4ce;
+  background-color: rgba(59, 51, 56, 0.31);
+  color: #d1c2cb;
   font-weight: 500;
   font-size: 1.091rem;
   padding: 0.682rem; }
 
 .osk-control-button:hover,
 .osk-control-button:focus {
-  background-color: rgba(57, 54, 59, 0.31); }
+  background-color: rgba(74, 65, 71, 0.31); }
 
 .osk-control-button:active {
-  background-color: rgba(90, 85, 92, 0.31);
+  background-color: rgba(104, 94, 100, 0.31);
   font-size: 1.091rem; }
 
 .sidebar-right {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
-  border-top: 1px solid rgba(166, 162, 166, 0.19);
-  border-left: 1px solid rgba(166, 162, 166, 0.19);
-  border-right: 1px solid rgba(131, 127, 131, 0.145);
-  border-bottom: 1px solid rgba(131, 127, 131, 0.145);
+  border-top: 1px solid rgba(169, 161, 165, 0.19);
+  border-left: 1px solid rgba(169, 161, 165, 0.19);
+  border-right: 1px solid rgba(134, 126, 130, 0.145);
+  border-bottom: 1px solid rgba(134, 126, 130, 0.145);
   box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45);
   margin: 0.476rem;
   border-radius: 1.297rem;
   min-width: 27.818rem;
-  background-color: #0f0d10;
+  background-color: #100d10;
   padding: 1.023rem; }
 
 .sideright-show {
@@ -1409,15 +1351,15 @@ tooltip {
 
 .sidebar-left {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
-  border-top: 1px solid rgba(166, 162, 166, 0.19);
-  border-left: 1px solid rgba(166, 162, 166, 0.19);
-  border-right: 1px solid rgba(131, 127, 131, 0.145);
-  border-bottom: 1px solid rgba(131, 127, 131, 0.145);
+  border-top: 1px solid rgba(169, 161, 165, 0.19);
+  border-left: 1px solid rgba(169, 161, 165, 0.19);
+  border-right: 1px solid rgba(134, 126, 130, 0.145);
+  border-bottom: 1px solid rgba(134, 126, 130, 0.145);
   box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45);
   margin: 0.476rem;
   border-radius: 1.297rem;
   min-width: 27.818rem;
-  background-color: #0f0d10;
+  background-color: #100d10;
   padding: 1.023rem; }
 
 .sideleft-show {
@@ -1431,12 +1373,12 @@ tooltip {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
   padding: 0.341rem;
-  background-color: rgba(30, 28, 32, 0.31); }
+  background-color: rgba(33, 27, 31, 0.31); }
 
 .sidebar-group-nopad {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
-  background-color: rgba(30, 28, 32, 0.31); }
+  background-color: rgba(33, 27, 31, 0.31); }
 
 .sidebar-group-invisible {
   padding: 0.341rem; }
@@ -1448,47 +1390,47 @@ tooltip {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
   padding: 0.341rem;
-  background-color: rgba(30, 28, 32, 0.31); }
+  background-color: rgba(33, 27, 31, 0.31); }
 
 .sidebar-iconbutton {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
-  color: #e7e1e6;
+  color: #eae0e4;
   min-width: 2.727rem;
   min-height: 2.727rem; }
 
 .sidebar-iconbutton:hover,
 .sidebar-iconbutton:focus {
-  background-color: #6b6277; }
+  background-color: #765f70; }
 
 .sidebar-iconbutton:active {
-  background-color: #8b8197; }
+  background-color: #967e8f; }
 
 .sidebar-button {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
   padding: 0rem 0.818rem;
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .sidebar-button-nopad {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .sidebar-button:hover,
 .sidebar-button:focus {
-  background-color: #6b6277; }
+  background-color: #765f70; }
 
 .sidebar-button:active {
-  background-color: #8b8197; }
+  background-color: #967e8f; }
 
 .sidebar-button-nopad:hover,
 .sidebar-button-nopad:focus {
-  background-color: #6b6277; }
+  background-color: #765f70; }
 
 .sidebar-button-nopad:active {
-  background-color: #8b8197; }
+  background-color: #967e8f; }
 
 .sidebar-button-left {
   border-top-left-radius: 0.818rem;
@@ -1507,20 +1449,20 @@ tooltip {
   -gtk-outline-radius: 0.818rem; }
 
 .sidebar-button-active {
-  background-color: #d8baff;
-  color: #3e1b6f; }
+  background-color: #ffc4f5;
+  color: #551251; }
 
 .sidebar-button-active:hover,
 .sidebar-button-active:focus {
-  background-color: rgba(214, 185, 253, 0.93); }
+  background-color: rgba(253, 195, 243, 0.93); }
 
 .sidebar-button-active:active {
-  background-color: rgba(210, 182, 246, 0.79); }
+  background-color: rgba(246, 191, 237, 0.79); }
 
 .sidebar-buttons-separator {
   min-width: 0.068rem;
   min-height: 0.068rem;
-  background-color: #cbc4ce; }
+  background-color: #d1c2cb; }
 
 .sidebar-navrail {
   padding: 0rem 1.159rem; }
@@ -1532,19 +1474,19 @@ tooltip {
 
 .sidebar-navrail-btn:hover > box > label:first-child,
 .sidebar-navrail-btn:focus > box > label:first-child {
-  background-color: rgba(102, 98, 104, 0.379); }
+  background-color: rgba(116, 105, 111, 0.379); }
 
 .sidebar-navrail-btn:active > box > label:first-child {
-  background-color: #524e54; }
+  background-color: #61575d; }
 
 .sidebar-navrail-btn-active > box > label:first-child {
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .sidebar-navrail-btn-active:hover > box > label:first-child,
 .sidebar-navrail-btn-active:focus > box > label:first-child {
-  background-color: rgba(76, 68, 88, 0.93);
-  color: rgba(232, 219, 245, 0.93); }
+  background-color: rgba(86, 65, 81, 0.93);
+  color: rgba(246, 216, 236, 0.93); }
 
 .sidebar-sysinfo-grouppad {
   padding: 1.159rem; }
@@ -1554,8 +1496,8 @@ tooltip {
   min-width: 0.818rem;
   min-height: 4.091rem;
   padding: 0.409rem;
-  background-color: #4b4357;
-  color: #eaddf7;
+  background-color: #554050;
+  color: #f8daee;
   font-size: 0px; }
 
 .sidebar-memory-swap-circprog {
@@ -1564,16 +1506,16 @@ tooltip {
   min-height: 2.255rem;
   padding: 0.409rem;
   margin: 0.918rem;
-  background-color: #4b4357;
-  color: #eaddf7;
+  background-color: #554050;
+  color: #f8daee;
   font-size: 0px; }
 
 .sidebar-cpu-circprog {
   min-width: 0.818rem;
   min-height: 3.409rem;
   padding: 0.409rem;
-  background-color: #4b4357;
-  color: #eaddf7;
+  background-color: #554050;
+  color: #f8daee;
   transition: 1000ms cubic-bezier(0.1, 1, 0, 1);
   font-size: 0px; }
 
@@ -1588,14 +1530,14 @@ tooltip {
   -gtk-outline-radius: 9999px;
   min-width: 0.273rem;
   min-height: 2.045rem;
-  background-color: rgba(203, 196, 206, 0.31); }
+  background-color: rgba(209, 194, 203, 0.31); }
 
 .sidebar-scrollbar slider:hover,
 .sidebar-scrollbar slider:focus {
-  background-color: rgba(203, 196, 206, 0.448); }
+  background-color: rgba(209, 194, 203, 0.448); }
 
 .sidebar-scrollbar slider:active {
-  background-color: #7a757d; }
+  background-color: #867b82; }
 
 .sidebar-calendar-btn {
   border-radius: 9999px;
@@ -1603,7 +1545,7 @@ tooltip {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
   min-height: 2.523rem;
   min-width: 2.523rem;
-  color: #e7e1e6; }
+  color: #eae0e4; }
 
 .sidebar-calendar-btn:hover,
 .sidebar-calendar-btn:focus {
@@ -1617,18 +1559,18 @@ tooltip {
   margin-right: -10.341rem; }
 
 .sidebar-calendar-btn-today {
-  background-color: #d8baff;
-  color: #3e1b6f; }
+  background-color: #ffc4f5;
+  color: #551251; }
 
 .sidebar-calendar-btn-today:hover,
 .sidebar-calendar-btn-today:focus {
-  background-color: rgba(214, 185, 253, 0.93); }
+  background-color: rgba(253, 195, 243, 0.93); }
 
 .sidebar-calendar-btn-today:active {
-  background-color: rgba(210, 182, 246, 0.79); }
+  background-color: rgba(246, 191, 237, 0.79); }
 
 .sidebar-calendar-btn-othermonth {
-  color: #837f83; }
+  color: #867e82; }
 
 .sidebar-calendar-header {
   margin: 0.341rem; }
@@ -1637,50 +1579,50 @@ tooltip {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
   padding: 0rem 0.682rem;
-  background-color: rgba(41, 38, 43, 0.31);
-  color: #cbc4ce; }
+  background-color: rgba(59, 51, 56, 0.31);
+  color: #d1c2cb; }
 
 .sidebar-calendar-monthyear-btn:hover,
 .sidebar-calendar-monthyear-btn:focus {
-  background-color: rgba(77, 73, 79, 0.3445);
-  color: #c3bcc6; }
+  background-color: rgba(92, 83, 89, 0.3445);
+  color: #cabbc4; }
 
 .sidebar-calendar-monthyear-btn:active {
-  background-color: #413e43;
-  color: #b3acb6; }
+  background-color: #52484e;
+  color: #bbadb5; }
 
 .sidebar-calendar-monthshift-btn {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
   min-width: 2.045rem;
   min-height: 2.045rem;
-  background-color: rgba(41, 38, 43, 0.31);
-  color: #cbc4ce; }
+  background-color: rgba(59, 51, 56, 0.31);
+  color: #d1c2cb; }
 
 .sidebar-calendar-monthshift-btn:hover {
-  background-color: rgba(77, 73, 79, 0.3445);
-  color: #c3bcc6; }
+  background-color: rgba(92, 83, 89, 0.3445);
+  color: #cabbc4; }
 
 .sidebar-calendar-monthshift-btn:active {
-  background-color: #413e43;
-  color: #b3acb6; }
+  background-color: #52484e;
+  color: #bbadb5; }
 
 .sidebar-selector-tab {
   border-radius: 0.818rem;
   -gtk-outline-radius: 0.818rem;
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
   min-height: 2.5rem;
-  color: #e7e1e6; }
+  color: #eae0e4; }
 
 .sidebar-selector-tab:hover,
 .sidebar-selector-tab:focus {
-  background-color: rgba(102, 98, 104, 0.379); }
+  background-color: rgba(116, 105, 111, 0.379); }
 
 .sidebar-selector-tab:active {
-  background-color: #524e54; }
+  background-color: #61575d; }
 
 .sidebar-selector-tab-active > box > label {
-  color: #d8baff; }
+  color: #ffc4f5; }
 
 .sidebar-selector-highlight-offset {
   margin-top: -0.205rem;
@@ -1688,14 +1630,14 @@ tooltip {
 
 .sidebar-selector-highlight {
   transition: 180ms ease-in-out;
-  color: #d8baff;
+  color: #ffc4f5;
   min-height: 0.205rem; }
 
 .sidebar-todo-item {
   padding-right: 0.545rem; }
 
 .sidebar-todo-item-even {
-  background-color: rgba(41, 38, 43, 0.1); }
+  background-color: rgba(59, 51, 56, 0.1); }
 
 .sidebar-todo-item-action {
   border-radius: 9999px;
@@ -1704,17 +1646,17 @@ tooltip {
 
 .sidebar-todo-item-action:hover,
 .sidebar-todo-item-action:focus {
-  background-color: rgba(70, 67, 72, 0.31); }
+  background-color: rgba(73, 66, 70, 0.31); }
 
 .sidebar-todo-item-action:active {
-  background-color: rgba(100, 97, 101, 0.31); }
+  background-color: rgba(103, 96, 100, 0.31); }
 
 .sidebar-todo-crosser {
   transition: margin 200ms cubic-bezier(0.1, 1, 0, 1), background-color 0ms;
   min-width: 0rem; }
 
 .sidebar-todo-crosser-crossed {
-  background-color: #e7e1e6; }
+  background-color: #eae0e4; }
 
 .sidebar-todo-crosser-removed {
   background-color: #ffb4a9; }
@@ -1723,30 +1665,30 @@ tooltip {
   border-radius: 0.818rem;
   min-height: 2.045rem;
   padding: 0.341rem;
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .sidebar-clipboard-item:hover,
 .sidebar-clipboard-item:focus {
-  background-color: #5b5267; }
+  background-color: #654f60; }
 
 .sidebar-clipboard-item:active {
-  background-color: #6b6277; }
+  background-color: #765f70; }
 
 .sidebar-todo-new {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
-  color: #eaddf7;
+  color: #f8daee;
   margin: 0.341rem;
   padding: 0.205rem 0.545rem;
-  border: 0.068rem solid #e7e1e6; }
+  border: 0.068rem solid #eae0e4; }
 
 .sidebar-todo-new:hover,
 .sidebar-todo-new:focus {
-  background-color: #50485c; }
+  background-color: #5a4555; }
 
 .sidebar-todo-new:active {
-  background-color: #6b6277; }
+  background-color: #765f70; }
 
 .sidebar-todo-add {
   border-radius: 9999px;
@@ -1754,15 +1696,15 @@ tooltip {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
   min-width: 1.705rem;
   min-height: 1.705rem;
-  color: #eaddf7;
-  border: 0.068rem solid #e7e1e6; }
+  color: #f8daee;
+  border: 0.068rem solid #eae0e4; }
 
 .sidebar-todo-add:hover,
 .sidebar-todo-add:focus {
-  background-color: #50485c; }
+  background-color: #5a4555; }
 
 .sidebar-todo-add:active {
-  background-color: #6b6277; }
+  background-color: #765f70; }
 
 .sidebar-todo-add-available {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
@@ -1770,44 +1712,44 @@ tooltip {
   -gtk-outline-radius: 9999px;
   min-width: 1.705rem;
   min-height: 1.705rem;
-  background-color: #d8baff;
-  color: #3e1b6f;
-  border: 0.068rem solid #d8baff; }
+  background-color: #ffc4f5;
+  color: #551251;
+  border: 0.068rem solid #ffc4f5; }
 
 .sidebar-todo-add-available:hover,
 .sidebar-todo-add-available:focus {
-  background-color: #d3b5fb; }
+  background-color: #fabff0; }
 
 .sidebar-todo-add-available:active {
-  background-color: #b99ae2; }
+  background-color: #dda0d4; }
 
 .sidebar-todo-entry {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
   border-radius: 0.818rem;
   -gtk-outline-radius: 0.818rem;
-  background-color: #29262b;
-  color: #cbc4ce;
-  caret-color: #cbc4ce;
+  background-color: #3b3338;
+  color: #d1c2cb;
+  caret-color: #d1c2cb;
   margin: 0rem 0.341rem;
   min-height: 1.773rem;
   min-width: 0rem;
   padding: 0.205rem 0.682rem;
-  border: 0.068rem solid #7a757d; }
+  border: 0.068rem solid #867b82; }
 
 .sidebar-todo-entry:focus {
-  border: 0.068rem solid #bbb4be; }
+  border: 0.068rem solid #c2b4bc; }
 
 .sidebar-module {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
   padding: 0.341rem;
-  background-color: rgba(30, 28, 32, 0.31); }
+  background-color: rgba(33, 27, 31, 0.31); }
 
 .sidebar-module-btn-arrow {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
   font-family: 'Material Symbols Rounded', 'Material Symbols Outlined', 'Material Symbols Sharp';
-  background-color: rgba(41, 38, 43, 0.31);
+  background-color: rgba(59, 51, 56, 0.31);
   min-width: 1.705rem;
   min-height: 1.705rem; }
 
@@ -1815,7 +1757,7 @@ tooltip {
   border-radius: 9999px;
   -gtk-outline-radius: 9999px;
   padding: 0.341rem;
-  background-color: rgba(30, 28, 32, 0.31); }
+  background-color: rgba(33, 27, 31, 0.31); }
 
 .sidebar-chat-apiswitcher-icon {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
@@ -1823,11 +1765,11 @@ tooltip {
   -gtk-outline-radius: 9999px;
   min-width: 2.182rem;
   min-height: 2.182rem;
-  color: #e7e1e6; }
+  color: #eae0e4; }
 
 .sidebar-chat-apiswitcher-icon-enabled {
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .sidebar-chat-viewport {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
@@ -1836,12 +1778,12 @@ tooltip {
 .sidebar-chat-textarea {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
-  border: 0.068rem solid #6a656c;
+  border: 0.068rem solid #776c73;
   padding: 0.682rem; }
 
 .sidebar-chat-entry {
-  color: #cbc4ce;
-  caret-color: #cbc4ce;
+  color: #d1c2cb;
+  caret-color: #d1c2cb;
   min-height: 1.773rem;
   min-width: 0rem; }
 
@@ -1850,25 +1792,25 @@ tooltip {
   min-width: 1.705rem;
   min-height: 1.705rem;
   border-radius: 0.478rem;
-  background-color: #6a656c; }
+  background-color: #776c73; }
 
 .sidebar-chat-send:hover,
 .sidebar-chat-send:focus {
-  background-color: #6e6970; }
+  background-color: #7b6f77; }
 
 .sidebar-chat-send:active {
-  background-color: #847d88; }
+  background-color: #91828c; }
 
 .sidebar-chat-send-available {
-  background-color: #d8baff;
-  color: #3e1b6f; }
+  background-color: #ffc4f5;
+  color: #551251; }
 
 .sidebar-chat-send-available:hover,
 .sidebar-chat-send-available:focus {
-  background-color: #d3b5fb; }
+  background-color: #fabff0; }
 
 .sidebar-chat-send-available:active {
-  background-color: #b99ae2; }
+  background-color: #dda0d4; }
 
 .sidebar-chat-message {
   margin: 0.682rem; }
@@ -1879,13 +1821,13 @@ tooltip {
   min-width: 0.136rem; }
 
 .sidebar-chat-indicator-user {
-  background-color: #e7e1e6; }
+  background-color: #eae0e4; }
 
 .sidebar-chat-indicator-bot {
-  background-color: #d8baff; }
+  background-color: #ffc4f5; }
 
 .sidebar-chat-indicator-System {
-  background-color: #cec2da; }
+  background-color: #dbbed2; }
 
 .sidebar-chat-name {
   font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif;
@@ -1905,19 +1847,19 @@ tooltip {
 .sidebar-chat-codeblock {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
-  background-color: rgba(73, 70, 76, 0.31);
-  color: #cbc4ce;
+  background-color: rgba(89, 80, 85, 0.31);
+  color: #d1c2cb;
   margin: 0rem 0.682rem;
-  border: 0.068rem solid rgba(234, 221, 247, 0.07); }
+  border: 0.068rem solid rgba(248, 218, 238, 0.07); }
 
 .sidebar-chat-codeblock-topbar {
   font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif;
   margin: 0.273rem;
   margin-bottom: 0rem;
-  background-color: #4b4357;
-  color: #eaddf7;
+  background-color: #554050;
+  color: #f8daee;
   border-radius: 0.886rem;
-  border: 0.068rem solid #5b5267;
+  border: 0.068rem solid #654f60;
   border-top-left-radius: 0.886rem;
   border-top-right-radius: 0.886rem;
   padding: 0.341rem 0.477rem; }
@@ -1934,10 +1876,10 @@ tooltip {
 
 .sidebar-chat-codeblock-topbar-btn:hover,
 .sidebar-chat-codeblock-topbar-btn:focus {
-  background-color: #6b6277; }
+  background-color: #765f70; }
 
 .sidebar-chat-codeblock-topbar-btn:active {
-  background-color: #8b8197; }
+  background-color: #967e8f; }
 
 .sidebar-chat-codeblock-code {
   font-family: 'JetBrains Mono NF', 'JetBrains Mono Nerd Font', 'JetBrains Mono NL', 'SpaceMono NF', 'SpaceMono Nerd Font', monospace;
@@ -1945,7 +1887,7 @@ tooltip {
 
 .sidebar-chat-divider {
   min-height: 1px;
-  background-color: #6a656c;
+  background-color: #776c73;
   margin: 0rem 0.545rem; }
 
 .sidebar-chat-welcome-txt {
@@ -1976,19 +1918,19 @@ tooltip {
   padding: 0.341rem 0.477rem; }
 
 .sidebar-chat-chip-action {
-  border: 0.068rem solid #6a656c; }
+  border: 0.068rem solid #776c73; }
 
 .sidebar-chat-chip-action:hover,
 .sidebar-chat-chip-action:focus {
-  background-color: #6a656c; }
+  background-color: #776c73; }
 
 .sidebar-chat-chip-action:active {
-  background-color: #878289;
-  color: #575259; }
+  background-color: #92868d;
+  color: #655b61; }
 
 .sidebar-chat-chip-action-active {
-  color: #6a656c;
-  border: 0.068rem solid #6a656c; }
+  color: #776c73;
+  border: 0.068rem solid #776c73; }
 
 .sidebar-pin {
   border-radius: 0.818rem;
@@ -1996,47 +1938,47 @@ tooltip {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
   min-height: 2.386rem;
   min-width: 2.386rem;
-  color: #e7e1e6; }
+  color: #eae0e4; }
 
 .sidebar-pin:hover,
 .sidebar-pin:focus {
-  background-color: rgba(102, 98, 104, 0.379); }
+  background-color: rgba(116, 105, 111, 0.379); }
 
 .sidebar-pin:active {
-  background-color: #524e54; }
+  background-color: #61575d; }
 
 .sidebar-pin-enabled {
-  background-color: #d8baff; }
+  background-color: #ffc4f5; }
   .sidebar-pin-enabled label {
-    color: #3e1b6f; }
+    color: #551251; }
 
 .sidebar-pin-enabled:hover,
 .sidebar-pin-enabled:focus {
-  background-color: #c9aaf1; }
+  background-color: #eeb2e5; }
 
 .sidebar-pin-enabled:active {
-  background-color: #b99ae2; }
+  background-color: #dda0d4; }
 
 .session-bg {
   margin-top: -2.727rem;
-  background-color: rgba(15, 13, 16, 0.64); }
+  background-color: rgba(16, 13, 16, 0.64); }
 
 .session-button {
   border-radius: 1.705rem;
   -gtk-outline-radius: 1.705rem;
   min-width: 8.182rem;
   min-height: 8.182rem;
-  background-color: #29262b;
-  color: #cbc4ce;
+  background-color: #3b3338;
+  color: #d1c2cb;
   font-size: 3rem; }
 
 .session-button-focused {
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .session-button-desc {
-  background-color: #242126;
-  color: #d9d3da;
+  background-color: #2e272c;
+  color: #ded1d8;
   border-bottom-left-radius: 1.705rem;
   border-bottom-right-radius: 1.705rem;
   padding: 0.205rem 0.341rem;
@@ -2047,31 +1989,31 @@ tooltip {
   -gtk-outline-radius: 1.705rem;
   min-width: 8.182rem;
   min-height: 5.455rem;
-  background-color: #29262b;
-  color: #cbc4ce;
+  background-color: #3b3338;
+  color: #d1c2cb;
   font-size: 3rem; }
 
 .notif-low {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
-  background-color: rgba(41, 38, 43, 0.45);
-  color: #cbc4ce;
+  background-color: rgba(59, 51, 56, 0.45);
+  color: #d1c2cb;
   padding: 0.818rem;
   padding-right: 1.363rem; }
 
 .notif-normal {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
-  background-color: rgba(41, 38, 43, 0.45);
-  color: #cbc4ce;
+  background-color: rgba(59, 51, 56, 0.45);
+  color: #d1c2cb;
   padding: 0.818rem;
   padding-right: 1.363rem; }
 
 .notif-critical {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
-  background-color: #4b4357;
-  color: #eaddf7;
+  background-color: #554050;
+  color: #f8daee;
   padding: 0.818rem;
   padding-right: 1.363rem; }
 
@@ -2079,8 +2021,8 @@ tooltip {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
   min-width: 30.682rem;
-  background-color: #0f0d10;
-  color: #cbc4ce;
+  background-color: #100d10;
+  color: #d1c2cb;
   padding: 0.818rem;
   padding-right: 1.363rem; }
 
@@ -2088,8 +2030,8 @@ tooltip {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
   min-width: 30.682rem;
-  background-color: #0f0d10;
-  color: #cbc4ce;
+  background-color: #100d10;
+  color: #d1c2cb;
   padding: 0.818rem;
   padding-right: 1.363rem; }
 
@@ -2097,19 +2039,19 @@ tooltip {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
   min-width: 30.682rem;
-  background-color: #4b4357;
-  color: #eaddf7;
+  background-color: #554050;
+  color: #f8daee;
   padding: 0.818rem;
   padding-right: 1.363rem; }
 
 .notif-body-low {
-  color: #969098; }
+  color: #a0939a; }
 
 .notif-body-normal {
-  color: #969098; }
+  color: #a0939a; }
 
 .notif-body-critical {
-  color: #b6aac2; }
+  color: #c2a7ba; }
 
 .notif-icon {
   border-radius: 9999px;
@@ -2118,20 +2060,20 @@ tooltip {
   min-height: 3.409rem; }
 
 .notif-icon-material {
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .notif-icon-material-low {
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .notif-icon-material-normal {
-  background-color: #4b4357;
-  color: #eaddf7; }
+  background-color: #554050;
+  color: #f8daee; }
 
 .notif-icon-material-critical {
-  background-color: #eaddf7;
-  color: #4b4357; }
+  background-color: #f8daee;
+  color: #554050; }
 
 .notif-expand-btn {
   border-radius: 1.159rem;
@@ -2161,29 +2103,29 @@ tooltip {
 .osd-notif {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
-  background-color: rgba(15, 13, 16, 0.46);
+  background-color: rgba(16, 13, 16, 0.46);
   min-width: 30.682rem; }
 
 .notif-circprog-low {
   transition: 0ms linear;
   min-width: 0.136rem;
-  min-height: 3.409rem;
+  min-height: 3.136rem;
   padding: 0rem;
-  color: #eaddf7; }
+  color: #f8daee; }
 
 .notif-circprog-normal {
   transition: 0ms linear;
   min-width: 0.136rem;
-  min-height: 3.409rem;
+  min-height: 3.136rem;
   padding: 0rem;
-  color: #eaddf7; }
+  color: #f8daee; }
 
 .notif-circprog-critical {
   transition: 0ms linear;
   min-width: 0.136rem;
-  min-height: 3.409rem;
+  min-height: 3.136rem;
   padding: 0rem;
-  color: #4b4357; }
+  color: #554050; }
 
 .notif-actions {
   min-height: 2.045rem; }
@@ -2193,37 +2135,37 @@ tooltip {
   -gtk-outline-radius: 0.818rem; }
 
 .notif-action-low {
-  background-color: rgba(41, 38, 43, 0.5);
-  color: #cbc4ce; }
+  background-color: rgba(51, 44, 48, 0.31);
+  color: #d1c2cb; }
 
 .notif-action-low:focus,
 .notif-action-low:hover {
-  background-color: rgba(52, 49, 54, 0.481); }
+  background-color: rgba(65, 57, 62, 0.31); }
 
 .notif-action-low:active {
-  background-color: rgba(58, 55, 60, 0.4715); }
+  background-color: rgba(73, 65, 71, 0.31); }
 
 .notif-action-normal {
-  background-color: rgba(41, 38, 43, 0.5);
-  color: #cbc4ce; }
+  background-color: rgba(51, 44, 48, 0.31);
+  color: #d1c2cb; }
 
 .notif-action-normal:focus,
 .notif-action-normal:hover {
-  background-color: rgba(52, 49, 54, 0.481); }
+  background-color: rgba(65, 57, 62, 0.31); }
 
 .notif-action-normal:active {
-  background-color: rgba(58, 55, 60, 0.4715); }
+  background-color: rgba(73, 65, 71, 0.31); }
 
 .notif-action-critical {
-  background-color: rgba(203, 196, 206, 0.31);
-  color: #cbc4ce; }
+  background-color: #654f60;
+  color: #d1c2cb; }
 
 .notif-action-critical:focus,
 .notif-action-critical:hover {
-  background-color: rgba(52, 49, 54, 0.481); }
+  background-color: #725c6c; }
 
 .notif-action-critical:active {
-  background-color: rgba(58, 55, 60, 0.4715); }
+  background-color: #7a6374; }
 
 .osd-music {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
@@ -2233,9 +2175,9 @@ tooltip {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
   min-width: 29.659rem;
-  background-color: #0f0d10;
+  background-color: #100d10;
   padding: 0rem 1.023rem;
-  background: linear-gradient(127deg, rgba(33, 30, 35, 0.7), rgba(33, 30, 35, 0.55) 70.71%), linear-gradient(217deg, rgba(74, 69, 78, 0.7), rgba(74, 69, 78, 0.55) 70.71%), radial-gradient(circle at 0% 100%, #4b4357 13%, rgba(0, 0, 0, 0) 100%), linear-gradient(336deg, rgba(75, 67, 87, 0.7), rgba(75, 67, 87, 0.55) 70.71%), linear-gradient(#0f0d10, #0f0d10); }
+  background: linear-gradient(127deg, rgba(47, 41, 46, 0.7), rgba(47, 41, 46, 0.55) 70.71%), linear-gradient(217deg, rgba(78, 68, 75, 0.7), rgba(78, 68, 75, 0.55) 70.71%), radial-gradient(circle at 0% 100%, #554050 13%, rgba(0, 0, 0, 0) 100%), linear-gradient(336deg, rgba(85, 64, 80, 0.7), rgba(85, 64, 80, 0.55) 70.71%), linear-gradient(#100d10, #100d10); }
 
 .osd-music-cover-fallback {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
@@ -2243,8 +2185,8 @@ tooltip {
   -gtk-outline-radius: 0.818rem;
   min-width: 7.5rem;
   min-height: 7.5rem;
-  background-color: rgba(30, 28, 32, 0.31);
-  color: #d7d1d7; }
+  background-color: rgba(33, 27, 31, 0.31);
+  color: #dad0d5; }
 
 .osd-music-cover {
   border-radius: 0.818rem;
@@ -2270,13 +2212,13 @@ tooltip {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
   font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif;
   font-size: 1.364rem;
-  color: #d7d1d7; }
+  color: #dad0d5; }
 
 .osd-music-artists {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
   font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif;
   font-size: 0.955rem;
-  color: rgba(202, 196, 203, 0.9); }
+  color: rgba(205, 196, 201, 0.9); }
 
 .osd-music-pill {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
@@ -2285,8 +2227,8 @@ tooltip {
   font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif;
   min-width: 1.833rem;
   padding: 0.273rem 0.682rem;
-  background-color: rgba(51, 46, 55, 0.5);
-  color: #d7d1d7; }
+  background-color: rgba(55, 46, 53, 0.5);
+  color: #dad0d5; }
 
 .osd-music-controls {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
@@ -2295,8 +2237,8 @@ tooltip {
   font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif;
   min-width: 1.833rem;
   padding: 0.205rem;
-  background-color: rgba(51, 46, 55, 0.5);
-  color: #d7d1d7; }
+  background-color: rgba(55, 46, 53, 0.5);
+  color: #dad0d5; }
 
 .osd-music-controlbtn {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
@@ -2307,10 +2249,10 @@ tooltip {
 
 .osd-music-controlbtn:hover,
 .osd-music-controlbtn:focus {
-  background-color: rgba(92, 87, 95, 0.55); }
+  background-color: rgba(96, 87, 93, 0.55); }
 
 .osd-music-controlbtn:active {
-  background-color: rgba(108, 102, 110, 0.575); }
+  background-color: rgba(111, 102, 108, 0.575); }
 
 .osd-music-controlbtn-txt {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
@@ -2324,15 +2266,15 @@ tooltip {
   min-width: 0.409rem;
   min-height: 3.068rem;
   padding: 0.273rem;
-  color: #d7d1d7; }
+  color: #dad0d5; }
 
 .osd-music-playstate {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
   min-height: 3.068rem;
   min-width: 3.068rem;
   border-radius: 10rem;
-  background-color: rgba(51, 46, 55, 0.5);
-  color: #d7d1d7; }
+  background-color: rgba(55, 46, 53, 0.5);
+  color: #dad0d5; }
 
 .osd-music-playstate-btn > label {
   transition: 50ms cubic-bezier(0.05, 0.7, 0.1, 1);
diff --git a/.config/ags/widgets/bar/main.js b/.config/ags/widgets/bar/main.js
index 25e5405d4..aefc3a173 100644
--- a/.config/ags/widgets/bar/main.js
+++ b/.config/ags/widgets/bar/main.js
@@ -6,19 +6,19 @@ import { ModuleLeftSpace } from "./leftspace.js";
 import { ModuleMusic } from "./music.js";
 import { ModuleRightSpace } from "./rightspace.js";
 import { ModuleSystem } from "./system.js";
-import { ModuleWorkspaces } from "./workspaces.js";
+import ModuleWorkspaces from "./workspaces.js";
 import { RoundedCorner } from "../../lib/roundedcorner.js";
 
 const left = Widget.Box({
     className: 'bar-sidemodule',
-    children: [ModuleMusic()],
+    children: [
+        ModuleMusic()
+    ],
 });
 
 const center = Widget.Box({
     children: [
-        RoundedCorner('topright', { className: 'corner-bar-group' }),
         ModuleWorkspaces(),
-        RoundedCorner('topleft', { className: 'corner-bar-group' }),
     ],
 });
 
@@ -36,7 +36,7 @@ export default () => Widget.Window({
         className: 'bar-bg',
         startWidget: ModuleLeftSpace(),
         centerWidget: Widget.Box({
-            className: 'spacing-h--20',
+            className: 'spacing-h-4',
             children: [
                 left,
                 center,
diff --git a/.config/ags/widgets/bar/music.js b/.config/ags/widgets/bar/music.js
index 32b4a6888..3d2389c53 100644
--- a/.config/ags/widgets/bar/music.js
+++ b/.config/ags/widgets/bar/music.js
@@ -14,7 +14,7 @@ const TrackProgress = () => {
     }
     return AnimatedCircProg({
         className: 'bar-music-circprog',
-        vpack: 'center',
+        vpack: 'center', hpack: 'center',
         connections: [ // Update on change/once every 3 seconds
             [Mpris, _updateProgress],
             [3000, _updateProgress]
diff --git a/.config/ags/widgets/bar/tray.js b/.config/ags/widgets/bar/tray.js
index 98ca3681d..34720765a 100644
--- a/.config/ags/widgets/bar/tray.js
+++ b/.config/ags/widgets/bar/tray.js
@@ -25,7 +25,7 @@ const SysTrayItem = item => Button({
 
 export const Tray = (props = {}) => {
     const trayContent = Box({
-        className: 'bar-systray bar-group spacing-h-10',
+        className: 'bar-systray spacing-h-10',
         properties: [
             ['items', new Map()],
             ['onAdded', (box, id) => {
diff --git a/.config/ags/widgets/bar/workspaces.js b/.config/ags/widgets/bar/workspaces.js
index 6719f5fc6..cd0573a8f 100644
--- a/.config/ags/widgets/bar/workspaces.js
+++ b/.config/ags/widgets/bar/workspaces.js
@@ -1,98 +1,165 @@
 const { GLib, Gdk, Gtk } = imports.gi;
+const Lang = imports.lang;
+const Cairo = imports.cairo;
+const Pango = imports.gi.Pango;
+const PangoCairo = imports.gi.PangoCairo;
 import { App, Service, Utils, Widget } from '../../imports.js';
+const { Box, DrawingArea, EventBox } = Widget;
 import Hyprland from 'resource:///com/github/Aylur/ags/service/hyprland.js';
 
-const WORKSPACE_SIDE_PAD = 0.546; // rem
 const NUM_OF_WORKSPACES = 10;
-let lastWorkspace = 0;
+const dummyWs = Box({ className: 'bar-ws' }); // Not shown. Only for getting size props
+const dummyActiveWs = Box({ className: 'bar-ws bar-ws-active' }); // Not shown. Only for getting size props
+const dummyOccupiedWs = Box({ className: 'bar-ws bar-ws-occupied' }); // Not shown. Only for getting size props
 
-const activeWorkspaceIndicator = Widget.Box({
-    css: `
-        padding: 0rem ${WORKSPACE_SIDE_PAD}rem;
-    `,
-    children: [
-        Widget.Box({
-            vpack: 'center',
-            hpack: 'start',
-            className: 'bar-ws-active-box',
-            setup: (self) => self.hook(Hyprland.active.workspace, (box) => {
-                const ws = Hyprland.active.workspace.id;
-                box.setCss(`
-                        margin-left: ${1.774 * (ws - 1) + 0.068}rem;
-                    `);
-                lastWorkspace = ws;
-            }),
-            children: [
-                Widget.Label({
-                    vpack: 'center',
-                    className: 'bar-ws-active',
-                    label: `•`,
-                })
-            ]
-        })
-    ]
-});
+// Font size = workspace id
+const WorkspaceContents = (count = 10) => {
+    return DrawingArea({
+        properties: [
+            ['workspaceMask', 0],
+        ],
+        css: `transition: 500ms cubic-bezier(0.1, 1, 0, 1);`,
+        setup: (area) => area
+            .hook(Hyprland.active.workspace, (area) =>
+                area.setCss(`font-size: ${Hyprland.active.workspace.id}px;`)
+            )
+            .hook(Hyprland, (area) => {
+                const workspaces = Hyprland.workspaces;
+                let workspaceMask = 0;
+                for (let i = 0; i < workspaces.length; i++) {
+                    const ws = workspaces[i];
+                    if (ws.id < 0) continue; // Ignore scratchpads
+                    if (ws.id > count) return; // Not rendered
+                    if (workspaces[i].windows > 0) {
+                        workspaceMask |= (1 << ws.id);
+                    }
+                }
+                area._workspaceMask = workspaceMask;
+            }, 'notify::workspaces')
+            .on('draw', Lang.bind(area, (area, cr) => {
+                const allocation = area.get_allocation();
+                const { width, height } = allocation;
 
-export const ModuleWorkspaces = () => Widget.EventBox({
-    onScrollUp: () => Utils.execAsync(['bash', '-c', 'hyprctl dispatch workspace -1 &']),
-    onScrollDown: () => Utils.execAsync(['bash', '-c', 'hyprctl dispatch workspace +1 &']),
+                const workspaceStyleContext = dummyWs.get_style_context();
+                const workspaceDiameter = workspaceStyleContext.get_property('min-width', Gtk.StateFlags.NORMAL);
+                const workspaceRadius = workspaceDiameter / 2;
+                const workspaceFontSize = workspaceStyleContext.get_property('font-size', Gtk.StateFlags.NORMAL) / 4 * 3;
+                const workspaceFontFamily = workspaceStyleContext.get_property('font-family', Gtk.StateFlags.NORMAL);
+                const wsbg = workspaceStyleContext.get_property('background-color', Gtk.StateFlags.NORMAL);
+                const wsfg = workspaceStyleContext.get_property('color', Gtk.StateFlags.NORMAL);
+
+                const occupiedWorkspaceStyleContext = dummyOccupiedWs.get_style_context();
+                const occupiedbg = occupiedWorkspaceStyleContext.get_property('background-color', Gtk.StateFlags.NORMAL);
+                const occupiedfg = occupiedWorkspaceStyleContext.get_property('color', Gtk.StateFlags.NORMAL);
+
+                const activeWorkspaceStyleContext = dummyActiveWs.get_style_context();
+                const activebg = activeWorkspaceStyleContext.get_property('background-color', Gtk.StateFlags.NORMAL);
+                const activefg = activeWorkspaceStyleContext.get_property('color', Gtk.StateFlags.NORMAL);
+                area.set_size_request(workspaceDiameter * count, -1);
+                const widgetStyleContext = area.get_style_context();
+                const activeWs = widgetStyleContext.get_property('font-size', Gtk.StateFlags.NORMAL);
+
+                const activeWsCenterX = -(workspaceDiameter / 2) + (workspaceDiameter * activeWs);
+                const activeWsCenterY = height / 2;
+
+                // Font
+                const layout = PangoCairo.create_layout(cr);
+                const fontDesc = Pango.font_description_from_string(`${workspaceFontFamily[0]} ${workspaceFontSize}`);
+                layout.set_font_description(fontDesc);
+                // Get kinda min radius for number indicators
+                layout.set_text("0".repeat(count.toString().length), -1);
+                const [layoutWidth, layoutHeight] = layout.get_pixel_size();
+                const indicatorRadius = Math.max(layoutWidth, layoutHeight) / 2 * 1.2; // a bit smaller than sqrt(2)*radius
+                const indicatorGap = workspaceRadius - indicatorRadius;
+
+                // Draw workspace numbers
+                for (let i = 1; i <= count; i++) {
+                    if (area._workspaceMask & (1 << i)) {
+                        // Draw bg highlight
+                        cr.setSourceRGBA(occupiedbg.red, occupiedbg.green, occupiedbg.blue, occupiedbg.alpha);
+                        const wsCenterX = -(workspaceRadius) + (workspaceDiameter * i);
+                        const wsCenterY = height / 2;
+                        if (!(area._workspaceMask & (1 << (i - 1)))) { // Left
+                            cr.arc(wsCenterX, wsCenterY, workspaceRadius, 0.5 * Math.PI, 1.5 * Math.PI);
+                            cr.fill();
+                        }
+                        else {
+                            cr.rectangle(wsCenterX - workspaceRadius , wsCenterY - workspaceRadius, workspaceRadius , workspaceRadius * 2)
+                            cr.fill();
+                        }
+                        if (!(area._workspaceMask & (1 << (i + 1)))) { // Right
+                            cr.arc(wsCenterX, wsCenterY, workspaceRadius, -0.5 * Math.PI, 0.5 * Math.PI);
+                            cr.fill();
+                        }
+                        else {
+                            cr.rectangle(wsCenterX, wsCenterY - workspaceRadius, workspaceRadius , workspaceRadius * 2)
+                            cr.fill();
+                        }
+
+                        // Set color for text
+                        cr.setSourceRGBA(occupiedfg.red, occupiedfg.green, occupiedfg.blue, occupiedfg.alpha);
+                    }
+                    else
+                        cr.setSourceRGBA(wsfg.red, wsfg.green, wsfg.blue, wsfg.alpha);
+                    layout.set_text(`${i}`, -1);
+                    const [layoutWidth, layoutHeight] = layout.get_pixel_size();
+                    const x = -workspaceRadius + (workspaceDiameter * i) - (layoutWidth / 2);
+                    const y = (height - layoutHeight) / 2;
+                    cr.moveTo(x, y);
+                    // cr.showText(text);
+                    PangoCairo.show_layout(cr, layout);
+                    cr.stroke();
+                }
+
+                // Draw active ws
+                // base
+                cr.setSourceRGBA(activebg.red, activebg.green, activebg.blue, activebg.alpha);
+                cr.arc(activeWsCenterX, activeWsCenterY, indicatorRadius, 0, 2 * Math.PI);
+                cr.fill();
+                // inner decor
+                cr.setSourceRGBA(activefg.red, activefg.green, activefg.blue, activefg.alpha);
+                cr.arc(activeWsCenterX, activeWsCenterY, indicatorRadius * 0.19, 0, 2 * Math.PI);
+                cr.fill();
+            }))
+        ,
+    })
+}
+
+export default () => EventBox({
+    onScrollUp: () => Hyprland.sendMessage(`dispatch workspace -1`),
+    onScrollDown: () => Hyprland.sendMessage(`dispatch workspace +1`),
     onMiddleClickRelease: () => App.toggleWindow('overview'),
     onSecondaryClickRelease: () => App.toggleWindow('osk'),
-    child: Widget.Box({
+    properties: [
+        ['clicked', false],
+    ],
+    child: Box({
         homogeneous: true,
-        className: 'bar-ws-width',
-        children: [
-            Widget.Overlay({
-                passThrough: true,
-                child: Widget.Box({
-                    homogeneous: true,
-                    className: 'bar-group-center',
-                    children: [Widget.Box({
-                        className: 'bar-group-standalone bar-group-pad',
-                    })]
-                }),
-                overlays: [
-                    Widget.Overlay({
-                        setup: (self) => self.set_overlay_pass_through(self.get_children()[1], true),
-                        child: Widget.Box({
-                            hpack: 'center',
-                            css: `
-                                padding: 0rem ${WORKSPACE_SIDE_PAD}rem;
-                            `,
-                            // homogeneous: true,
-                            children: Array.from({ length: NUM_OF_WORKSPACES }, (_, i) => i + 1).map(i => Widget.Button({
-                                onPrimaryClick: () => Utils.execAsync(['bash', '-c', `hyprctl dispatch workspace ${i} &`]).catch(print),
-                                child: Widget.Label({
-                                    vpack: 'center',
-                                    label: `${i}`,
-                                    className: 'bar-ws txt',
-                                }),
-                            })),
-                            setup: (self) => self.hook(Hyprland, (box) => {
-                                // console.log('update');
-                                const kids = box.children;
-                                for (let i = 0; i < kids.length; i++) {
-                                    const child = kids[i];
-                                    child.child.toggleClassName('bar-ws-occupied', false);
-                                    child.child.toggleClassName('bar-ws-occupied-left', false);
-                                    child.child.toggleClassName('bar-ws-occupied-right', false);
-                                    child.child.toggleClassName('bar-ws-occupied-left-right', false);
-                                }
-
-                                const occupied = Array.from({ length: NUM_OF_WORKSPACES }, (_, i) => Hyprland.getWorkspace(i + 1)?.windows > 0);
-                                for (let i = 0; i < occupied.length; i++) {
-                                    if (!occupied[i]) continue;
-                                    const child = kids[i];
-                                    child.child.toggleClassName(`bar-ws-occupied${!occupied[i - 1] ? '-left' : ''}${!occupied[i + 1] ? '-right' : ''}`, true);
-                                }
-                            }, 'notify::workspaces'),
-                        }),
-                        overlays: [
-                            activeWorkspaceIndicator,
-                        ]
-                    })
-                ],
-            })
-        ]
-    })
-});
+        className: 'bar-group-margin',
+        children: [Box({
+            className: 'bar-group bar-group-standalone bar-group-pad',
+            css: 'min-width: 2px;',
+            children: [
+                WorkspaceContents(10),
+            ]
+        })]
+    }),
+    setup: (self) => {
+        self.add_events(Gdk.EventMask.POINTER_MOTION_MASK);
+        self.on('motion-notify-event', (self, event) => {
+            if (!self._clicked) return;
+            const [_, cursorX, cursorY] = event.get_coords();
+            const widgetWidth = self.get_allocation().width;
+            const wsId = Math.ceil(cursorX * NUM_OF_WORKSPACES / widgetWidth);
+            Hyprland.sendMessage(`dispatch workspace ${wsId}`)
+        })
+        self.on('button-press-event', (self, event) => {
+            self._clicked = true;
+            const [_, cursorX, cursorY] = event.get_coords();
+            const widgetWidth = self.get_allocation().width;
+            const wsId = Math.ceil(cursorX * NUM_OF_WORKSPACES / widgetWidth);
+            Hyprland.sendMessage(`dispatch workspace ${wsId}`);
+        })
+        self.on('button-release-event', (self) => self._clicked = false);
+    }
+})
diff --git a/.config/ags/widgets/overview/overview.js b/.config/ags/widgets/overview/overview.js
index aca13a286..f4deac393 100644
--- a/.config/ags/widgets/overview/overview.js
+++ b/.config/ags/widgets/overview/overview.js
@@ -330,7 +330,8 @@ const OverviewRow = ({ startWorkspace, workspaces, windowName = 'overview' }) =>
 export const SearchAndWindows = () => {
     var _appSearchResults = [];
 
-    const clickOutsideToClose = Widget.EventBox({
+    const ClickToClose = ({ ...props }) => Widget.EventBox({
+        ...props,
         onPrimaryClick: () => App.closeWindow('overview'),
         onSecondaryClick: () => App.closeWindow('overview'),
         onMiddleClick: () => App.closeWindow('overview'),
@@ -506,9 +507,12 @@ export const SearchAndWindows = () => {
 
     return Widget.Box({
         vertical: true,
-        className: 'overview-window',
         children: [
-            clickOutsideToClose,
+            ClickToClose({ // Top margin. Also works as a click-outside-to-close thing
+                child: Widget.Box({
+                    className: 'bar-height',
+                })
+            }),
             Widget.Box({
                 hpack: 'center',
                 children: [