diff --git a/home/waybar.nix b/home/waybar.nix
index 0ee653f..f3cd360 100644
--- a/home/waybar.nix
+++ b/home/waybar.nix
@@ -229,50 +229,40 @@ SSID: {essid} {frequency}'';
     };
   };
   workspace-style = ''
-/* And now modules themselves in their respective order */
-.rounded_button {
-	padding-left: 0.3em;
-	padding-right: 0.3em;
-  border-radius: 0.5em;
-  margin-left: 0.2em;
-  margin-right: 0.2em;
-  margin-bottom: 0.2em;
-}
-
 /* Workspaces stuff */
 #workspaces button {
   color: ${theme.extra.white};
-  background: ${theme.background};
+  background: ${theme.extra.black};
 
-	padding-left: 0.3em;
-	padding-right: 0.3em;
-  border-radius: 0.5em;
-  margin-left: 0.2em;
-  margin-right: 0.2em;
-  margin-bottom: 0.2em;
+	padding-left: 5pt;
+	padding-right: 5pt;
+  border-radius: 5pt;
+  margin-left: 2pt;
+  margin-right: 2pt;
+  margin-bottom: 2pt;
 }
 
 /* Inactive (on unfocused output) */
 #workspaces button.visible {
 	color: ${theme.extra.white};
-	background: ${theme.extra.purple};
+	background: ${theme.bright.magenta};
 }
 
 /* Active (on focused output) */
 #workspaces button.focused {
 	color: ${theme.extra.black};
-	background: ${theme.extra.aqua};
+	background: ${theme.bright.cyan};
 }
 
 /* Contains an urgent window */
 #workspaces button.urgent {
-	color: ${theme.extra.black};
-	background: ${theme.bright.red};
+	color: ${theme.bright.red};
+	background: ${theme.extra.black};
 }
 
 /* Style when cursor is on the button */
 #workspaces button:hover {
-	background: ${theme.extra.black};
+	background: ${theme.bright.black};
 	color: ${theme.extra.white};
 }
 
@@ -298,6 +288,7 @@ in {
     };
 
     style = ''
+/* Reset all styles */
 * {
   border: none;
   border-radius: 0;
@@ -310,7 +301,7 @@ in {
 #waybar {
   background: rgba(40, 40, 40, 0.3);
   color: #ffffff;
-  font-family: "sans-serif";
+  font-family: SF Compact Rounded;
   font-size: 12pt;
   font-weight: 500;
 }