diff --git a/.config/waybar/old.txt b/.config/waybar/old.txt
new file mode 100644
index 00000000..ff10348a
--- /dev/null
+++ b/.config/waybar/old.txt
@@ -0,0 +1,86 @@
+
+* {
+  border: none;
+  font-size: 12px;
+  font-family: "JetBrainsMono Nerd Font,JetBrainsMono NF";
+  /* min-height: 25px; */
+}
+
+window#waybar {
+  background: @bg;
+  margin: 5px;
+}
+
+#custom-logo {
+  padding: 0 10px;
+}
+
+.modules-right {
+  padding-left: 5px;
+  border-radius: 15px 0 0 15px;
+  margin-top: 2px;
+  /* background: #000000; */
+}
+
+.modules-center {
+  padding: 0 15px;
+  margin-top: 2px;
+  border-radius: 15px 15px 15px 15px;
+  /* background: #000000; */
+}
+
+.modules-left {
+  border-radius: 0 15px 15px 0;
+  margin-top: 2px;
+  /* background: #000000; */
+}
+
+#battery,
+#custom-clipboard,
+#custom-colorpicker,
+#custom-powerDraw,
+#bluetooth,
+#pulseaudio,
+#network,
+#disk,
+#memory,
+#backlight,
+#cpu,
+#temperature,
+#custom-weather,
+#idle_inhibitor,
+#jack,
+#tray,
+#window,
+#workspaces,
+#clock {
+  padding: 0 5px;
+}
+#pulseaudio {
+  padding-top: 3px;
+}
+
+#temperature.critical,
+#pulseaudio.muted {
+  color: @red_ember;
+  /* padding-top: 0; */
+}
+
+#clock {
+  color: @orange_glow;
+}
+
+#battery.charging {
+  color: @fg;
+  background-color: @green;
+}
+
+#battery.warning:not(.charging) {
+  background-color: @orange_smolder;
+  color: black;
+}
+
+#battery.critical:not(.charging) {
+  background-color: @red_ember;
+  color: @fg;
+}
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 262b0ad5..92cf3870 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -6,88 +6,98 @@
 @define-color orange_blaze #C4693D;
 @define-color orange_smolder #E49A44;
 @define-color green #629c7d;
+
 * {
   border: none;
-  font-size: 12px;
-  font-family: "JetBrainsMono Nerd Font,JetBrainsMono NF";
-  /* min-height: 25px; */
+  border-radius: 0;
+  min-height: 0;
+  font-family: "iosevka nerd font";
+  font-weight: 500;
+  font-size: 14px;
+  padding: 0;
 }
 
 window#waybar {
   background: @bg;
-  margin: 5px;
+  border: 2px solid #3c3836;
 }
 
-#custom-logo {
-  padding: 0 10px;
+tooltip {
+  background-color: @bg;
+  border: 2px solid #3c3836;
 }
 
-.modules-right {
-  padding-left: 5px;
-  border-radius: 15px 0 0 15px;
-  margin-top: 2px;
-  /* background: #000000; */
-}
-
-.modules-center {
-  padding: 0 15px;
-  margin-top: 2px;
-  border-radius: 15px 15px 15px 15px;
-  /* background: #000000; */
-}
-
-.modules-left {
-  border-radius: 0 15px 15px 0;
-  margin-top: 2px;
-  /* background: #000000; */
-}
-
-#battery,
-#custom-clipboard,
-#custom-colorpicker,
-#custom-powerDraw,
-#bluetooth,
-#pulseaudio,
-#network,
-#disk,
-#memory,
-#backlight,
-#cpu,
-#temperature,
-#custom-weather,
-#idle_inhibitor,
-#jack,
+#clock,
 #tray,
-#window,
-#workspaces,
-#clock {
-  padding: 0 5px;
-}
+#cpu,
+#memory,
+#battery,
+#network,
 #pulseaudio {
-  padding-top: 3px;
+  margin: 6px 6px 6px 0px;
+  padding: 2px 8px;
 }
 
-#temperature.critical,
-#pulseaudio.muted {
-  color: @red_ember;
-  /* padding-top: 0; */
+#workspaces {
+  background-color: @bg;
+  margin: 6px 0px 6px 6px;
+  /* border: 2px solid #434a4c; */
+}
+
+#workspaces button {
+  all: initial;
+  min-width: 0;
+  box-shadow: inset 0 -3px transparent;
+  padding: 2px 4px;
+  color: @fg;
+}
+
+#workspaces button.focused {
+  /* color: #ddc7a1; */
+  border: 2px solid @red_ember;
+}
+
+#workspaces button.urgent {
+  background-color: #e78a4e;
 }
 
 #clock {
-  color: @orange_glow;
+  background-color: #303536;
+  border: 2px solid #434a4c;
+  color: #d4be98;
 }
 
-#battery.charging {
-  color: @fg;
-  background-color: @green;
+#tray {
+  background-color: #d4be98;
+  border: 2px solid #c7ab7a;
 }
 
-#battery.warning:not(.charging) {
-  background-color: @orange_smolder;
-  color: black;
+#battery {
+  background-color: #a9b665;
+  border: 2px solid #c7ab7a;
+  color: #6c782e;
 }
 
-#battery.critical:not(.charging) {
-  background-color: @red_ember;
-  color: @fg;
+#cpu,
+#memory,
+#network,
+#pulseaudio {
+  background-color: #ddc7a1;
+  border: 2px solid #c7ab7a;
+  color: #1d2021;
+}
+
+#cpu.critical,
+#memory.critical {
+  background-color: #ddc7a1;
+  border: 2px solid #c7ab7a;
+  color: #c14a4a;
+}
+
+#battery.warning,
+#battery.critical,
+#battery.urgent {
+  background-color: #ddc7a1;
+  border: 2px solid #c7ab7a;
+  color: #c14a4a;
 }