diff --git a/hosts/wim/config/ags/.stylelintrc.yml b/hosts/wim/config/ags/.stylelintrc.yml
index 079949e3..e1f7d160 100644
--- a/hosts/wim/config/ags/.stylelintrc.yml
+++ b/hosts/wim/config/ags/.stylelintrc.yml
@@ -10,3 +10,5 @@ rules:
   scss/operator-no-unspaced: null
   scss/no-global-function-names: null
   scss/dollar-variable-empty-line-before: null
+  no-invalid-position-at-import-rule: null
+  font-family-no-missing-generic-family-keyword: null
diff --git a/hosts/wim/config/ags/scss/common.scss b/hosts/wim/config/ags/scss/common.scss
index af55b13d..ad49ecbe 100644
--- a/hosts/wim/config/ags/scss/common.scss
+++ b/hosts/wim/config/ags/scss/common.scss
@@ -1,19 +1,19 @@
 $darkbg: #0b0d16;
 $bg: rgba(40, 42, 54, 0.8); // rgba(69, 71, 90, 0.3); #0d0f18;
 $bgfull: rgb(40, 42, 54);
-$contrastbg: rgba(189, 147, 249, 0.8);
-$bgSecondary: rgba(#382c4a, 0.8);
-$bgSecondaryAlt: #a5b6cf;
+$contrast-bg: rgba(189, 147, 249, 0.8);
+$bg-secondary: rgba(#382c4a, 0.8);
+$bg-secondary-alt: #a5b6cf;
 $fg: #a5b6cf;
-$fgDim: #a5b6cf;
+$fg-dim: #a5b6cf;
 $watermelon: #dd6777;
 
 // Aliases
 $background: $bg;
-$backgroundSecondary: $bgSecondary;
-$backgroundSecondaryAlt: $bgSecondaryAlt;
+$background-secondary: $bg-secondary;
+$background-secondary-alt: $bg-secondary-alt;
 $foreground: $fg;
-$foregroundDim: $fgDim;
+$foreground-dim: $fg-dim;
 
 $black: #151720;
 $dimblack: #1a1c25;
@@ -28,5 +28,5 @@ $green: #90ceaa;
 $aquamarine: #90ceaa;
 $yellow: #ecd3a0;
 $accent: $blue;
-$javacafeMagenta: #c296eb;
-$javacafeBlue: #86aaec;
+$javacafe-magenta: #c296eb;
+$javacafe-blue: #86aaec;
diff --git a/hosts/wim/config/ags/scss/main.scss b/hosts/wim/config/ags/scss/main.scss
index a0f3b5ac..b6ecc256 100644
--- a/hosts/wim/config/ags/scss/main.scss
+++ b/hosts/wim/config/ags/scss/main.scss
@@ -8,16 +8,16 @@ undershoot {
   all: unset;
 }
 
-@import "./common.scss";
-@import "./widgets/powermenu.scss";
-@import "./widgets/traybuttons.scss";
-@import "./widgets/workspaces.scss";
-@import "./widgets/systray.scss";
-@import "./widgets/notification-center.scss";
-@import "./widgets/notification.scss";
-@import "./widgets/date.scss";
-@import "./widgets/quick-settings.scss";
-@import "./widgets/player.scss";
-@import "./widgets/overview.scss";
-@import "./widgets/applauncher.scss";
-@import "./widgets/corners.scss";
+@import "./common";
+@import "./widgets/powermenu";
+@import "./widgets/traybuttons";
+@import "./widgets/workspaces";
+@import "./widgets/systray";
+@import "./widgets/notification-center";
+@import "./widgets/notification";
+@import "./widgets/date";
+@import "./widgets/quick-settings";
+@import "./widgets/player";
+@import "./widgets/overview";
+@import "./widgets/applauncher";
+@import "./widgets/corners";
diff --git a/hosts/wim/config/ags/scss/widgets/applauncher.scss b/hosts/wim/config/ags/scss/widgets/applauncher.scss
index e2faf854..f3f688f9 100644
--- a/hosts/wim/config/ags/scss/widgets/applauncher.scss
+++ b/hosts/wim/config/ags/scss/widgets/applauncher.scss
@@ -2,7 +2,7 @@
   all: unset;
   box-shadow: 0 0 4.5px 0 rgba(0, 0, 0, 0.6);
   margin: 9px;
-  border: 2px solid $contrastbg;
+  border: 2px solid $contrast-bg;
   border-radius: 25px;
   background-color: $bg;
   color: #f8f8f2;
@@ -76,7 +76,7 @@
     padding: 9px;
 
     &:active {
-      background-color: rgba($contrastbg, 0.5);
+      background-color: rgba($contrast-bg, 0.5);
       border-radius: 9px;
       box-shadow: inset 0 0 0 3px rgba(238, 238, 238, 0.03);
 
@@ -87,11 +87,11 @@
 
     &:hover, &:focus {
       .title {
-        color: $contrastbg;
+        color: $contrast-bg;
       }
 
       image {
-        -gtk-icon-shadow: 2px 2px $contrastbg;
+        -gtk-icon-shadow: 2px 2px $contrast-bg;
       }
     }
 
diff --git a/hosts/wim/config/ags/scss/widgets/date.scss b/hosts/wim/config/ags/scss/widgets/date.scss
index 6ed3e585..050b15ad 100644
--- a/hosts/wim/config/ags/scss/widgets/date.scss
+++ b/hosts/wim/config/ags/scss/widgets/date.scss
@@ -3,7 +3,7 @@
   color: $fg;
   border-radius: 30px;
   border-top-right-radius: 0;
-  border: 2px solid $contrastbg;
+  border: 2px solid $contrast-bg;
 }
 
 .timebox {
@@ -32,8 +32,8 @@
   padding: 0 1rem .2rem;
   color: $fg;
   background-color: $bgfull;
-  border-bottom: 2px solid $contrastbg;
-  border-top: 2px solid $contrastbg;
+  border-bottom: 2px solid $contrast-bg;
+  border-top: 2px solid $contrast-bg;
   margin: 0 12px 18px;
 
   .cal {
diff --git a/hosts/wim/config/ags/scss/widgets/notification-center.scss b/hosts/wim/config/ags/scss/widgets/notification-center.scss
index 9f5ec35f..b4c87b1e 100644
--- a/hosts/wim/config/ags/scss/widgets/notification-center.scss
+++ b/hosts/wim/config/ags/scss/widgets/notification-center.scss
@@ -3,9 +3,9 @@
   min-width: 524px;
   background: $bg;
   border-radius: 30px;
-  border-top-right-radius: 0px;
-  border: 2px solid $contrastbg;
-  padding: 0px;
+  border-top-right-radius: 0;
+  border: 2px solid $contrast-bg;
+  padding: 0;
   box-shadow: 0 0 4.5px 0 rgba(0, 0, 0, 0.6);
 
   * {
@@ -16,9 +16,11 @@
     padding: 10px;
     margin-top: 22px;
     margin-bottom: 9px;
+
     label {
       font-size: 22px;
     }
+
     button {
       all: unset;
       transition: 200ms;
@@ -33,11 +35,13 @@
         background-color: rgba(238, 238, 238, 0.154);
         color: #f1f1f1;
       }
+
       &:disabled {
         box-shadow: none;
         background-color: rgba(#664C90, 0.3);
         color: rgba(238, 238, 238, 0.3);
       }
+
       label {
         font-size: 1.2em;
       }
@@ -46,34 +50,41 @@
 
   .notification-list-box {
     background: $bgfull;
-    padding: 0 12px 0 12px;
+    padding: 0 12px;
     border-radius: 30px;
-    border-top: 2px solid $contrastbg;
+    border-top: 2px solid $contrast-bg;
     box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.5);
+
     scrollbar {
       all: unset;
       border-radius: 8px;
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
+
       * {
         all: unset;
       }
+
       &:hover {
         border-radius: 8px;
         border-top-left-radius: 0;
         border-bottom-left-radius: 0;
       }
     }
+
     scrollbar.vertical {
       transition: 200ms;
       background-color: rgba(23, 23, 23, 0.3);
+
       &:hover {
         background-color: rgba(23, 23, 23, 0.7);
+
         slider {
           background-color: rgba(238, 238, 238, 0.7);
           min-width: .6em;
         }
       }
+
       slider {
         background-color: rgba(238, 238, 238, 0.5);
         border-radius: 9px;
@@ -86,11 +97,13 @@
 
   .placeholder {
     color: white;
+
     image {
       font-size: 7em;
       text-shadow: 2px 2px 2px rgba(0, 0, 0, 0.6);
       -gtk-icon-shadow: 2px 2px 2px rgba(0, 0, 0, 0.6);
     }
+
     label {
       font-size: 1.2em;
       text-shadow: 2px 2px 2px rgba(0, 0, 0, 0.6);
diff --git a/hosts/wim/config/ags/scss/widgets/notification.scss b/hosts/wim/config/ags/scss/widgets/notification.scss
index 280c2455..ee79e9d6 100644
--- a/hosts/wim/config/ags/scss/widgets/notification.scss
+++ b/hosts/wim/config/ags/scss/widgets/notification.scss
@@ -1,177 +1,209 @@
-$background-color_1: rgba(238, 238, 238, 0.154);
-$background-color_2: rgba(230, 112, 144, 0.5);
-$background-color_3: rgba(238, 238, 238, 0.06);
-$background-color_4: #51a4e7;
-$background-color_5: transparent;
-$background-color_6: #171717;
-$background-color_7: rgba(23, 23, 23, 0.3);
-$background-color_8: rgba(23, 23, 23, 0.7);
-$background-color_9: rgba(238, 238, 238, 0.7);
-$background-color_10: rgba(238, 238, 238, 0.5);
+$background-color-1: rgba(238, 238, 238, 0.154);
+$background-color-2: rgba(230, 112, 144, 0.5);
+$background-color-3: rgba(238, 238, 238, 0.06);
+$background-color-4: #51a4e7;
+$background-color-5: transparent;
+$background-color-6: #171717;
+$background-color-7: rgba(23, 23, 23, 0.3);
+$background-color-8: rgba(23, 23, 23, 0.7);
+$background-color-9: rgba(238, 238, 238, 0.7);
+$background-color-10: rgba(238, 238, 238, 0.5);
 
 .notification.critical {
   >box {
     box-shadow: inset 0 0 0.5em 0 #e67090;
   }
 }
+
 .notification {
   >box {
     all: unset;
     box-shadow: 0 0 4.5px 0 rgba(0, 0, 0, 0.4);
-    margin: 9px 9px 0 9px;
-    border: 2px solid $contrastbg;
+    margin: 9px 9px 0;
+    border: 2px solid $contrast-bg;
     border-radius: 15px;
     background-color: $bg;
     padding: 16.2px;
+
     * {
       font-size: 16px;
     }
   }
+
   &:hover {
     .close-button {
       box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03);
-      background-color: $background-color_1;
-      background-color: $background-color_2;
+      background-color: $background-color-1;
+      background-color: $background-color-2;
     }
   }
+
   .title {
     margin-right: 9px;
     font-size: 1.1em;
   }
+
   .description {
     font-size: .9em;
     min-width: 350px;
   }
+
   .icon {
     border-radius: 7.2px;
     margin-right: 9px;
   }
+
   .icon.img {
     border: 1px solid rgba(238, 238, 238, 0.03);
   }
+
   .actions {
     button {
       all: unset;
       transition: all 500ms;
-      border-radius: 9px;
-      background-color: $background-color_3;
+      background-color: $background-color-3;
       box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03);
       border-radius: 7.2px;
       font-size: 1.2em;
       padding: 4.5px 9px;
       margin: 9px 4.5px 0;
+
       * {
         font-size: 16px;
       }
+
       &:focus {
         box-shadow: inset 0 0 0 1px #51a4e7;
-        background-color: $background-color_1;
+        background-color: $background-color-1;
       }
+
       &:hover {
         box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03);
-        background-color: $background-color_1;
+        background-color: $background-color-1;
       }
+
       &:active {
         box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03);
         background-image: linear-gradient(to right, #51a4e7, #6cb2eb);
-        background-color: $background-color_4;
+        background-color: $background-color-4;
+
         &:hover {
           box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03), inset 0 0 0 99px rgba(238, 238, 238, 0.154);
         }
       }
+
       &:checked {
         box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03);
         background-image: linear-gradient(to right, #51a4e7, #6cb2eb);
-        background-color: $background-color_4;
+        background-color: $background-color-4;
+
         &:hover {
           box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03), inset 0 0 0 99px rgba(238, 238, 238, 0.154);
         }
       }
+
       &:disabled {
         box-shadow: none;
-        background-color: $background-color_5;
+        background-color: $background-color-5;
       }
+
       &:first-child {
         margin-left: 0;
       }
+
       &:last-child {
         margin-right: 0;
       }
     }
+
     button.on {
       box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03);
       background-image: linear-gradient(to right, #51a4e7, #6cb2eb);
-      background-color: $background-color_4;
+      background-color: $background-color-4;
+
       &:hover {
         box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03), inset 0 0 0 99px rgba(238, 238, 238, 0.154);
       }
     }
+
     button.active {
       box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03);
       background-image: linear-gradient(to right, #51a4e7, #6cb2eb);
-      background-color: $background-color_4;
+      background-color: $background-color-4;
+
       &:hover {
         box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03), inset 0 0 0 99px rgba(238, 238, 238, 0.154);
       }
     }
   }
+
   button.close-button {
     all: unset;
     transition: all 500ms;
-    border-radius: 9px;
-    background-color: $background-color_5;
+    background-color: $background-color-5;
     background-image: none;
     box-shadow: none;
     margin-left: 9px;
     border-radius: 7.2px;
     min-width: 1.2em;
     min-height: 1.2em;
+
     * {
       font-size: 16px;
     }
+
     &:focus {
       box-shadow: inset 0 0 0 1px #51a4e7;
-      background-color: $background-color_1;
+      background-color: $background-color-1;
     }
+
     &:hover {
       box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03);
-      background-color: $background-color_1;
-      background-color: $background-color_2;
+      background-color: $background-color-1;
+      background-color: $background-color-2;
     }
+
     &:active {
       box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03);
-      background-image: linear-gradient(to right, #51a4e7, #6cb2eb);
-      background-color: $background-color_4;
+      background-color: $background-color-4;
       background-image: linear-gradient(#e67090, #e67090);
+
       &:hover {
         box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03), inset 0 0 0 99px rgba(238, 238, 238, 0.154);
       }
     }
+
     &:checked {
       box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03);
       background-image: linear-gradient(to right, #51a4e7, #6cb2eb);
-      background-color: $background-color_4;
+      background-color: $background-color-4;
+
       &:hover {
         box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03), inset 0 0 0 99px rgba(238, 238, 238, 0.154);
       }
     }
+
     &:disabled {
       box-shadow: none;
-      background-color: $background-color_5;
+      background-color: $background-color-5;
     }
   }
+
   button.close-button.on {
     box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03);
     background-image: linear-gradient(to right, #51a4e7, #6cb2eb);
-    background-color: $background-color_4;
+    background-color: $background-color-4;
+
     &:hover {
       box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03), inset 0 0 0 99px rgba(238, 238, 238, 0.154);
     }
   }
+
   button.close-button.active {
     box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03);
     background-image: linear-gradient(to right, #51a4e7, #6cb2eb);
-    background-color: $background-color_4;
+    background-color: $background-color-4;
+
     &:hover {
       box-shadow: inset 0 0 0 1px rgba(238, 238, 238, 0.03), inset 0 0 0 99px rgba(238, 238, 238, 0.154);
     }
diff --git a/hosts/wim/config/ags/scss/widgets/overview.scss b/hosts/wim/config/ags/scss/widgets/overview.scss
index 218938a4..d7a8bd16 100644
--- a/hosts/wim/config/ags/scss/widgets/overview.scss
+++ b/hosts/wim/config/ags/scss/widgets/overview.scss
@@ -1,7 +1,6 @@
 .overview {
-
   .workspace {
-    padding: 4px 15px 4px 0px;
+    padding: 4px 15px 4px 0;
     border: 2px solid transparent;
     border-radius: 10px;
 
@@ -25,7 +24,6 @@
     margin-bottom: 5px;
 
     .workspace {
-
       .window {
         border: 2px solid #411C6C;
 
@@ -35,10 +33,9 @@
       }
     }
   }
+
   .special {
-
     .workspace {
-
       .window {
         border: 2px solid lighten($color: black, $amount: 20);
 
diff --git a/hosts/wim/config/ags/scss/widgets/player.scss b/hosts/wim/config/ags/scss/widgets/player.scss
index ab734c75..ea435c82 100644
--- a/hosts/wim/config/ags/scss/widgets/player.scss
+++ b/hosts/wim/config/ags/scss/widgets/player.scss
@@ -13,23 +13,27 @@
   min-width: 400px;
   min-height: 200px;
   border-radius: 30px;
-  border-top: 2px solid $contrastbg;
-  border-bottom: 2px solid $contrastbg;
+  border-top: 2px solid $contrast-bg;
+  border-bottom: 2px solid $contrast-bg;
   transition: background 250ms;
+
   .top {
     font-size: 23px;
   }
+
   .metadata {
     .title{
       font-weight: 500;
       transition: text 250ms;
     }
+
     .artist{
       font-weight: 400;
       font-size: 15px;
       transition: text 250ms;
     }
   }
+
   .bottom {
     font-size: 30px;
   }
@@ -54,6 +58,7 @@
     border-radius: 26px;
     padding: 4px 4px 4px 10px;
   }
+
   button label {
     min-width: 35px;
   }
@@ -63,7 +68,7 @@
   min-width: 18px;
   margin: 7px;
   background-color: rgba(255, 255, 255, 0.7);
-  box-shadow: 0 0 5px 0px rgba(255, 255, 255, 0.3);
+  box-shadow: 0 0 5px 0 rgba(255, 255, 255, 0.3);
   border-radius: 100%;
 }
 
@@ -73,6 +78,7 @@
 .loop {
   border-radius: 100%;
   transition: color 200ms;
+
   &:hover {
     border-radius: 100%;
     background-color: rgba(127, 132, 156, 0.4);
@@ -88,7 +94,7 @@
 
 .position-slider {
   highlight {
-    margin: 0px;
+    margin: 0;
     border-radius: 2em;
   }
 
@@ -101,9 +107,10 @@
     margin: -8px;
     min-height: 20px;
     border-radius: 10px;
-    box-shadow: rgba(0, 0, 0, 0.25) 0px 54px 55px, rgba(0, 0, 0, 0.12) 0px -12px 30px, rgba(0, 0, 0, 0.12) 0px 4px 6px, rgba(0, 0, 0, 0.17) 0px 12px 13px, rgba(0, 0, 0, 0.09) 0px -3px 5px;
+    box-shadow: rgba(0, 0, 0, 0.25) 0 54px 55px, rgba(0, 0, 0, 0.12) 0 -12px 30px, rgba(0, 0, 0, 0.12) 0 4px 6px, rgba(0, 0, 0, 0.17) 0 12px 13px, rgba(0, 0, 0, 0.09) 0 -3px 5px;
     transition: background-color 0.5s ease-in-out;
   }
+
   slider:hover {
     transition: background-color 0.5s ease-in-out;
   }
diff --git a/hosts/wim/config/ags/scss/widgets/powermenu.scss b/hosts/wim/config/ags/scss/widgets/powermenu.scss
index 9d875edd..6f993816 100644
--- a/hosts/wim/config/ags/scss/widgets/powermenu.scss
+++ b/hosts/wim/config/ags/scss/widgets/powermenu.scss
@@ -2,28 +2,29 @@
   background-color: $bg;
   color: $fg;
   padding: 10px;
-  font-family: MesloLGS NF;
-  /*font-family: Iosevka Nerd Font;*/
+  font-family: "MesloLGS NF";
+
+  /* font-family: Iosevka Nerd Font; */
   font-size: 70px;
   border-radius: 30px;
-  border: 2px solid $contrastbg;
+  border: 2px solid $contrast-bg;
+
   label {
     min-width: 140px;
     min-height: 130px;
   }
+
   button {
-    margin-right: 10px;
-    margin-left: 10px;
-    margin-top: 5px;
-    margin-bottom: 5px;
+    margin: 5px 10px;
     border-radius: 12px;
     min-width: 80px;
     transition: all ease .2s;
-    &:hover { background-color: $bgSecondary; }
-    &:active { background-color: $bgSecondary; }
+    &:hover { background-color: $bg-secondary; }
+    &:active { background-color: $bg-secondary; }
+
     .content {
       border-radius: 4px;
-      padding: 0px 15px 0px 15px;
+      padding: 0 15px;
     }
   }
   .shutdown { color: $red; }
diff --git a/hosts/wim/config/ags/scss/widgets/quick-settings.scss b/hosts/wim/config/ags/scss/widgets/quick-settings.scss
index cd7add9a..b4018732 100644
--- a/hosts/wim/config/ags/scss/widgets/quick-settings.scss
+++ b/hosts/wim/config/ags/scss/widgets/quick-settings.scss
@@ -1,10 +1,10 @@
 .quick-settings {
   font-size: 30px;
   min-width: 500px;
-  padding: 0px 0px 0px 0px;
+  padding: 0;
   background-color: $bg;
   border-radius: 30px 0 30px 30px;
-  border: 2px solid $contrastbg;
+  border: 2px solid $contrast-bg;
 }
 
 .title {
@@ -23,22 +23,20 @@
   font-size: 14px;
   margin-top: -10px;
   margin-left: 31px;
+
   &:nth-child(1) {
     margin-left: 25px;
   }
   margin-bottom: 10px;
   padding: 3px;
-  border: 2px solid $contrastbg;
-  border-top-right-radius: 20px;
-  border-top-left-radius: 10px;
-  border-bottom-left-radius: 10px;
-  border-bottom-right-radius: 20px;
+  border: 2px solid $contrast-bg;
+  border-radius: 10px 20px 20px 10px;
   min-width: 106px;
   background: #1b1b1b;
 }
 
 .grid-chev {
-  margin-left: 0px;
+  margin-left: 0;
 
   font-size: 40px;
   margin-right: 5px;
@@ -49,8 +47,8 @@
   min-height: 160px;
   min-width: 470px;
   background-color: $bgfull;
-  border-top: 2px solid $contrastbg;
-  border-bottom: 2px solid $contrastbg;
+  border-top: 2px solid $contrast-bg;
+  border-bottom: 2px solid $contrast-bg;
   border-radius: 15px;
   margin-top: 30px;
 }
@@ -66,6 +64,7 @@
   min-width: 70px;
   margin: 5px;
   margin-left: 22px;
+
   &:nth-child(1) {
     margin-left: 5px;
   }
@@ -75,9 +74,9 @@
   background: #1b1b1b;
   border-top-left-radius: 15px;
   border-bottom-left-radius: 15px;
-  border-left: 2px solid $contrastbg;
-  border-top: 2px solid $contrastbg;
-  border-bottom: 2px solid $contrastbg;
+  border-left: 2px solid $contrast-bg;
+  border-top: 2px solid $contrast-bg;
+  border-bottom: 2px solid $contrast-bg;
   transition: all 0.5s ease-in-out;
 }
 
@@ -85,23 +84,23 @@
   background: #1b1b1b;
   border-top-right-radius: 30px;
   border-bottom-right-radius: 30px;
-  border-right: 2px solid $contrastbg;
-  border-top: 2px solid $contrastbg;
-  border-bottom: 2px solid $contrastbg;
+  border-right: 2px solid $contrast-bg;
+  border-top: 2px solid $contrast-bg;
+  border-bottom: 2px solid $contrast-bg;
   transition: all 0.5s ease-in-out;
 }
 
 .right-part:hover, .right-part:active {
-  color: $contrastbg;
-  border: 2px solid $contrastbg;
+  color: $contrast-bg;
+  border: 2px solid $contrast-bg;
   border-top-left-radius: 7px;
   border-bottom-left-radius: 7px;
   transition: all 0.5s ease-in-out;
 }
 
 .left-part:hover, .left-part:active {
-  color: $contrastbg;
-  border: 2px solid $contrastbg;
+  color: $contrast-bg;
+  border: 2px solid $contrast-bg;
   border-top-right-radius: 7px;
   border-bottom-right-radius: 7px;
   transition: all 0.5s ease-in-out;
@@ -117,8 +116,8 @@
   min-height: 100px;
   min-width: 470px;
   background-color: $bgfull;
-  border-top: 2px solid $contrastbg;
-  border-bottom: 2px solid $contrastbg;
+  border-top: 2px solid $contrast-bg;
+  border-bottom: 2px solid $contrast-bg;
   border-radius: 15px;
   margin-top: 30px;
   margin-bottom: 20px;
@@ -136,7 +135,7 @@
     margin-right: 20px;
 
     highlight {
-      margin: 0px;
+      margin: 0;
       background-color: #79659f;
       border-radius: 2em;
     }
@@ -152,9 +151,10 @@
       min-height: 20px;
       background: #3e4153;
       border-radius: 100%;
-      box-shadow: rgba(0, 0, 0, 0.25) 0px 54px 55px, rgba(0, 0, 0, 0.12) 0px -12px 30px, rgba(0, 0, 0, 0.12) 0px 4px 6px, rgba(0, 0, 0, 0.17) 0px 12px 13px, rgba(0, 0, 0, 0.09) 0px -3px 5px;
+      box-shadow: rgba(0, 0, 0, 0.25) 0 54px 55px, rgba(0, 0, 0, 0.12) 0 -12px 30px, rgba(0, 0, 0, 0.12) 0 4px 6px, rgba(0, 0, 0, 0.17) 0 12px 13px, rgba(0, 0, 0, 0.09) 0 -3px 5px;
       transition: background-color 0.5s ease-in-out;
     }
+
     slider:hover {
       background-color: #303240;
       transition: background-color 0.5s ease-in-out;
diff --git a/hosts/wim/config/ags/scss/widgets/systray.scss b/hosts/wim/config/ags/scss/widgets/systray.scss
index 5299d8aa..2f2e3f95 100644
--- a/hosts/wim/config/ags/scss/widgets/systray.scss
+++ b/hosts/wim/config/ags/scss/widgets/systray.scss
@@ -2,14 +2,14 @@
   padding: 5px;
   background-color: $bg;
   border-radius: 80px;
-  border: 2px solid $bgSecondary;
+  border: 2px solid $bg-secondary;
   transition: background-color 0.5s ease-in-out,
               border 0.5s ease-in-out;
 
   .tray-item {
     image { color: #CBA6F7; }
     background-color: transparent;
-    padding: 0px 2px 0px 2px;
+    padding: 0 2px;
     border-radius: 100%;
     transition: all 0.5s ease-in-out;
 
diff --git a/hosts/wim/config/ags/scss/widgets/traybuttons.scss b/hosts/wim/config/ags/scss/widgets/traybuttons.scss
index e11a18e1..8291edbb 100644
--- a/hosts/wim/config/ags/scss/widgets/traybuttons.scss
+++ b/hosts/wim/config/ags/scss/widgets/traybuttons.scss
@@ -15,14 +15,11 @@
   border-radius: 80px;
   min-height: 37px;
   min-width: 105px;
-  padding: 1px 0px 1px 5px;
+  padding: 1px 0 1px 5px;
 
   .toggle-on {
-    border-top-left-radius: 22px;
-    border-top-right-radius: 22px;
-    border-bottom-left-radius: 0px;
-    border-bottom-right-radius: 0px;
-    border-bottom: 0px solid $bg;
+    border-radius: 22px 22px 0 0;
+    border-bottom: 0 solid $bg;
   }
 }
 
@@ -38,7 +35,7 @@
   background-color: $bg;
   color: #CBA6F7;
   border-radius: 80px;
-  border: 2px solid $bgSecondary;
+  border: 2px solid $bg-secondary;
   transition: background-color 0.5s ease-in-out,
               border 0.5s ease-in-out;
 }
@@ -47,7 +44,7 @@
   background-color: $bg;
   color: #CBA6F7;
   border-radius: 80px;
-  border: 2px solid $contrastbg;
+  border: 2px solid $contrast-bg;
   transition: background-color 0.5s ease-in-out,
               border 0.5s ease-in-out;
 }
@@ -66,27 +63,38 @@
 }
 
 .audio {
-  padding: 0 10px 0 10px;
+  padding: 0 10px;
   font-size: 20px;
 }
 
 .battery {
-  padding: 0 10px 0 10px;
+  padding: 0 10px;
   font-size: 20px;
 
   .battery-indicator {
     &.charging {
       color: green;
     }
-    &.charged {}
+
+    &.charged {
+      // TODO: charged battery style
+    }
+
     &.low {
       color: red;
     }
   }
+
   icon {
-    .charging {}
-    .discharging {}
+    .charging {
+      // TODO: charging battery style
+    }
+
+    .discharging {
+      // TODO: discharging battery style
+    }
   }
+
   .label {
     font-size: 20px;
   }
@@ -95,6 +103,7 @@
 .brightness {
   trough {
     margin-right: -50px;
+
     progress {
       margin-right: 50px;
       margin-top: -30px;
diff --git a/hosts/wim/config/ags/scss/widgets/workspaces.scss b/hosts/wim/config/ags/scss/widgets/workspaces.scss
index 38af8f53..d935554d 100644
--- a/hosts/wim/config/ags/scss/widgets/workspaces.scss
+++ b/hosts/wim/config/ags/scss/widgets/workspaces.scss
@@ -1,11 +1,8 @@
 .workspaces {
   background-color: $bg;
   border-radius: 80px;
-  border: 2px solid $bgSecondary;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 12px;
-  padding-right: 12px;
+  border: 2px solid $bg-secondary;
+  padding: 3px 12px;
 
   .button {
     margin: 2px;
@@ -18,11 +15,13 @@
     border: none;
     transition: border-color 0.25s linear;
   }
+
   .occupied {
     border: 2px solid $bg;
-    background: $contrastbg;
+    background: $contrast-bg;
     transition: border-color 0.25s linear;
   }
+
   .active {
     border: 2px solid #50fa7b;
     transition: border-color 0.25s linear;