diff --git a/waybar/config b/waybar/config
index 60929e4..326466d 100644
--- a/waybar/config
+++ b/waybar/config
@@ -35,6 +35,6 @@
         "tooltip": false
     },
     "memory": {
-        "format": "  {}%"
+        "format": " {}%"
     }
 }
diff --git a/waybar/style.css b/waybar/style.css
index 99f94fc..7318966 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,123 +1,52 @@
-@import "colors.css"; 
+@import "colors.css";
 
 * {
-    font-family: "JetBrainsMono Nerd Font";
-    font-size: 18px;
+    font-family: "Iosevka Nerd Font Propo";
+    font-size: 22px;
     min-height: 0;
-    font-weight: bold;
+    font-weight: normal;
 }
 
 window#waybar {
-    background: transparent;
-    background-color: @mantle;
-    color: @overlay0;
-    transition-property: background-color;
-    transition-duration: 0.1s;
-}
-
-#window {
-    margin: 8px;
-    padding-left: 8;
-    padding-right: 8;
+    color: @text;
+    background: @mantle;
 }
 
+/* Workspace buttons */
 button {
-    /*box-shadow: inset 0 -3px transparent;*/
+    color: @blue;
+    box-shadow: inset 0 3px transparent;
     border: none;
-    padding-bottom: 2px;
     border-radius: 0;
 }
 
-#workspaces button:hover,
-#workspaces button.active,
-#workspaces button.focused {
-    /*background: inherit;*/
-    color: @blue;
-    padding-bottom: 3px;
-    border-top: 3px solid @blue;
+button:hover,
+button.active,
+button.focused {
+    background: inherit;
+    box-shadow: inset 0 3px @blue;
 }
 
-#workspaces button {
-    padding: 0 8px;
+.modules-right {
+    margin-right: 1em;
 }
 
-#workspaces button.active,
-#workspaces button.focused {
-    background-color: rgba(0, 0, 0, 0.3);
+.modules-right > widget > * {
+    padding: 0 .4em;
 }
 
-#workspaces button.urgent {
-    background-color: @red;
-}
-
-#pulseaudio,
-#clock,
-#battery,
-#cpu,
-#memory,
-#disk,
-#temperature,
-#backlight,
-#wireplumber,
-#tray,
-#network,
-#mode,
-#scratchpad {
-    margin-bottom: 2px;
-    margin-left: 8px;
-    margin-right: 8px;
-    padding-left: 8px;
-    padding-right: 8px;
-}
-
-#clock {
-    color: @mauve;
-    border-bottom: 2px solid @mauve;
-}
-
-#clock.date {
-    color: @mauve;
-}
-
-#pulseaudio {
-    color: @blue;
-}
-
-#network {
-    color: @yellow;
+.modules-right > widget:not(:last-child) > * {
+    margin-right: .4em;
 }
 
 #cpu {
     color: @sky;
-    border-bottom: 2px solid @sapphire;
 }
 
 #memory {
     color: @peach;
-    border-bottom: 2px solid @peach;
 }
 
-#idle_inhibitor {
-    margin-right: 12px;
-    color: @green;
+#clock {
+    color: @mauve;
 }
-
-#idle_inhibitor.activated {
-    color: @red;
-}
-
-#battery {
-    color: @green;
-    border-bottom: 2px solid @green;
-}
-
-/* If workspaces is the leftmost module, omit left margin */
-.modules-left>widget:first-child>#workspaces {
-    margin-left: 0;
-}
-
-/* If workspaces is the rightmost module, omit right margin */
-.modules-right>widget:last-child>#workspaces {
-    margin-right: 0;
-}
-