diff --git a/.config/waybar/colors.css b/.config/waybar/colors.css
new file mode 100644
index 0000000..1f4b202
--- /dev/null
+++ b/.config/waybar/colors.css
@@ -0,0 +1 @@
+@import url("/home/niklas/.cache/wal/waybar.css");
diff --git a/.config/waybar/config b/.config/waybar/config
index 51f22a4..1dd14cc 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -25,8 +25,7 @@
       "modules":[
         "clock",
         "tray",
-        "custom/swaync"
-      ]
+        "custom/swaync" ]
     },
     "tray": {
         // "icon-size": 21,
@@ -78,8 +77,7 @@
       "exec-if": "which swaync-client",
       "exec": "swaync-client -swb",
       "on-click": "swaync-client -t -sw",
-      "on-click-right": "swaync-client -d -sw",
-      "escape": true
+      "on-click-right": "swaync-client -d -sw"
     }
 }
 
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 72f97d3..cb33ed8 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,19 +1,15 @@
-@define-color color0 #2e3440;
-@define-color bg #2e3440;
-@define-color fg #323f2d;
-@define-color focus #3b5631;
-@define-color text #ffffff;
-@define-color border #f4d9e1;
+@import url("colors.css");
 
 * {
   font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
   font-size: 13px;
-  border-radius: 24px;
+  /*border-radius: 24px;*/
   min-height: 0;
 }
 
 window#waybar {
   background-color: @bg;
+  /*border-radius: 24px;*/ /* Have bar itself rounded */
   color: @text;
 }
 
@@ -23,8 +19,8 @@ window#waybar.hidden {
 
 /*--- Workspaces ---*/
 #workspaces{
+  border-radius: 24px;
   border: solid 1px @border;
-
   margin-top: 2px;
   margin-bottom: 2px;
 }
@@ -67,7 +63,7 @@ window#waybar.hidden {
   border-radius: 24px;
   margin-top: 2px;
   margin-bottom: 2px;
-
+  background-color: @focus;
 }
 
 /*--- Each module ---*/
@@ -109,76 +105,7 @@ window#waybar.hidden {
 }
 */
 
-/*
-#window,
-#workspaces {
-    margin: 0 4px;
-}
-*/
-/* Module style */
 
-/*
-#clock {
-    background-color: #64727D;
-}
-
-
-label:focus {
-    background-color: #000000;
-}
-
-#pulseaudio {
-    background-color: #f1c40f;
-    color: #000000;
-}
-
-#pulseaudio.muted {
-    background-color: #90b1b1;
-    color: #2a5c45;
-}
-
-#wireplumber {
-    background-color: #fff0f5;
-    color: #000000;
-}
-
-#wireplumber.muted {
-    background-color: #f53c3c;
-}
-
-#custom-media {
-    background-color: #66cc99;
-    color: #2a5c45;
-    min-width: 100px;
-}
-
-#custom-media.custom-spotify {
-    background-color: #66cc99;
-}
-
-#tray {
-    background-color: #2980b9;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #eb4d4b;
-}
-
-#idle_inhibitor {
-    background-color: #2d3436;
-}
-
-#idle_inhibitor.activated {
-    background-color: #ecf0f1;
-    color: #2d3436;
-}
-
-#custom-playerctl {
-  padding: 0 10px;
-  background-color: #1DB954; 
-}
-*/
 #tray > .passive {
     -gtk-icon-effect: dim;
 }