diff --git a/waybar/style.css b/waybar/style.css
index c95e194..24a44e3 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -5,11 +5,11 @@
 }
 
 /*
-* General 
+* General
 */
+@import url('./styles/module-groups.css');
+@import url('./styles/modules.css');
 @import url('./styles/waybar.css');
-@import url('./styles/animations.css');
-@import url('./styles/common.css');
 
 /*
 * Modules 
@@ -25,10 +25,3 @@
 @import url('./styles/modules/wireplumber.css');
 @import url('./styles/modules/workspaces.css');
 
-@keyframes blink {
-  to {
-    background-color: #ffffff;
-    color: #000000;
-  }
-}
-
diff --git a/waybar/styles/animations.css b/waybar/styles/animations.css
deleted file mode 100644
index e69de29..0000000
diff --git a/waybar/styles/common.css b/waybar/styles/common.css
deleted file mode 100644
index 052029e..0000000
--- a/waybar/styles/common.css
+++ /dev/null
@@ -1,18 +0,0 @@
-
-button {
-  /* Use box-shadow instead of border so the text isn't offset */
-  box-shadow: inset 0 -3px transparent;
-  /* Avoid rounded borders under each button name */
-  border: none;
-}
-
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-button:hover {
-  background: inherit;
-  box-shadow: inset 0 -1px #5e81ac;
-}
-
-.module {
-  padding: 0 10px;
-  color: #ddd
-}
diff --git a/waybar/styles/module-groups.css b/waybar/styles/module-groups.css
new file mode 100644
index 0000000..ff4b83c
--- /dev/null
+++ b/waybar/styles/module-groups.css
@@ -0,0 +1,44 @@
+/*
+* Modules groups
+*/
+.modules-left {
+  padding: 0 2px 0 2px;
+  border-radius: 5px;
+  background: rgba(0, 0, 0, 0.66);
+  margin-left: 15px;
+}
+
+.modules-center {
+  padding: 0 2px 0 2px;
+  border-radius: 5px;
+  background: rgba(0, 0, 0, 0.66);
+}
+
+.modules-right {
+  padding: 0 2px 0 2px;
+  border-radius: 5px;
+  background: rgba(0, 0, 0, 0.66);
+  margin-right: 15px;
+}
+
+/*
+* Module widgets
+*/
+.modules-left > widget {
+}
+
+.modules-left > widget:first-child {
+}
+
+.modules-left > widget:last-child {
+}
+.modules-right > widget {
+}
+
+.modules-right > widget:first-child {
+}
+
+.modules-right > widget:last-child {
+}
+
+
diff --git a/waybar/styles/modules.css b/waybar/styles/modules.css
new file mode 100644
index 0000000..fa9abea
--- /dev/null
+++ b/waybar/styles/modules.css
@@ -0,0 +1,9 @@
+label.module {
+    padding: 0 10px;
+    box-shadow: inset 0 -3px;
+}
+
+box.module {
+  padding: 0 10px;
+}
+
diff --git a/waybar/styles/modules/idle.css b/waybar/styles/modules/idle.css
index 2d35e61..1f6c219 100644
--- a/waybar/styles/modules/idle.css
+++ b/waybar/styles/modules/idle.css
@@ -1,10 +1,7 @@
 #idle_inhibitor {
-  border-radius: 9999px;
-  background-color: #2d3436;
 }
 
 #idle_inhibitor.activated {
-  background-color: #ecf0f1;
-  color: #2d3436;
+  background-color: #555;
 }
 
diff --git a/waybar/styles/modules/tray.css b/waybar/styles/modules/tray.css
index 25d82ec..9389d9d 100644
--- a/waybar/styles/modules/tray.css
+++ b/waybar/styles/modules/tray.css
@@ -1,5 +1,5 @@
 #tray {
-  background-color: #2980b9;
+  padding: 0 10px;
 }
 
 #tray > .passive {
@@ -11,3 +11,12 @@
   background-color: #eb4d4b;
 }
 
+#tray button {
+  border-radius: 0px;
+  box-shadow: inset 0 -3px transparent;
+}
+
+#tray button:hover {
+  box-shadow: inset 0 -3px #5e81ac;
+}
+
diff --git a/waybar/styles/modules/workspaces.css b/waybar/styles/modules/workspaces.css
index ac6d617..b017484 100644
--- a/waybar/styles/modules/workspaces.css
+++ b/waybar/styles/modules/workspaces.css
@@ -1,12 +1,13 @@
 
 #workspaces {
-  padding-right: 5px;
+  padding-right: 0px;
 }
 
 #workspaces button {
   padding: 0 5px;
-  background-color: transparent;
-  color: #ddd;
+  border: none;
+  border-radius: 0px;
+  box-shadow: inset 0 -3px transparent;
 }
 
 #workspaces button.active {
@@ -15,24 +16,14 @@
 
 #workspaces button:hover {
   background: rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0 -3px #5e81ac;
 }
 
 #workspaces button.focused {
   background-color: #64727d;
-  box-shadow: inset 0 -3px #ffffff;
 }
 
 #workspaces button.urgent {
   background-color: #eb4d4b;
 }
 
-/* If workspaces is the leftmost module, omit left margin */
-.modules-left > widget:first-child > #workspaces {
-  margin-left: 8px;
-}
-
-/* If workspaces is the rightmost module, omit right margin */
-.modules-right > widget:last-child > #workspaces {
-  margin-right: 0;
-}
-
diff --git a/waybar/styles/waybar.css b/waybar/styles/waybar.css
index 4298687..e40ff01 100644
--- a/waybar/styles/waybar.css
+++ b/waybar/styles/waybar.css
@@ -1,58 +1,7 @@
 window#waybar {
-  background-color: rgba(0, 0, 0, 0.2);
+  background-color: transparent;
 }
 
 window#waybar.hidden {
   opacity: 0.2;
 }
-
-window#waybar.termite {
-  background-color: #3f3f3f;
-}
-
-window#waybar.chromium {
-  background-color: #000000;
-  border: none;
-}
-
-.modules-left {
-  background-color: rgba(43, 48, 59, 0.5);
-  border-bottom: 2px solid rgba(100, 114, 125, 0.5);
-  border-left: 2px solid white;
-  border-radius: 5px;
-  color: #ffffff;
-  padding: 0 2px 0 2px;
-  transition-property: background-color;
-  transition-duration: 0.5s;
-}
-
-.moadules-left:first-child {
-  border-right: none;
-}
-
-.modules-center {
-  background-color: rgba(43, 48, 59, 0.5);
-  border-bottom: 2px solid rgba(100, 114, 125, 0.5);
-  border-radius: 5px;
-  color: #ffffff;
-  padding: 0 2px 0 2px;
-  transition-property: background-color;
-  transition-duration: 0.5s;
-
-}
-
-.modules-right {
-  background-color: rgba(43, 48, 59, 0.5);
-  border-bottom: 2px solid rgba(100, 114, 125, 0.5);
-  border-radius: 5px;
-  color: #ffffff;
-  padding: 0 2px 0 2px;
-  transition-property: background-color;
-  transition-duration: 0.5s;
-
-}
-
-.modules-right:last-child {
-  border-right: none;
-}
-