diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index f4a998c1..0818bcc9 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -17,20 +17,21 @@
       "modules-left" = [ "hyprland/window" "mpris" ];
       "modules-center" = [ "hyprland/workspaces" ];
       "modules-right" = [
-        "battery"
         "pulseaudio"
         "clock"
         "custom/notification"
         "custom/separator"
+        "battery"
         "tray"
       ];
       # Module config
       "custom/separator" = { format = "|"; };
       "hyprland/window" = {
-        "format" = "> {title}";
+        "format" = "{title}";
         # TODO workspace rewrites
         "rewrite" = {
           "(.*) - GNU Emacs at (.*)" = "  $1 [$2]";
+          "foot" = " ";
           "(.*) — Mozilla Firefox" = "󰈹  $1";
           "(.*) - Thunar" = "󰝰  $1";
         };
@@ -47,7 +48,7 @@
         sort-by = "id";
       };
       mpris = {
-        "format" = "󰝚 : {player_icon} {player}";
+        "format" = "> {player_icon} {player}";
         "tooltip-format" = "{player_icon} ({player}) {dynamic}";
         "interval" = 1;
         "dynamic-order" = [ "album" "artist" "title" "position" "length" ];
@@ -68,7 +69,7 @@
         scroll-step = 5;
         format = "{format_source} {icon} {volume}%";
         format-muted = "{format_source} 󰝟 ";
-        format-source = "󰍬 {volume}%";
+        format-source = "󰍬";
         format-source-muted = "󰍭";
         format-icons = {
           car = "󰄍";
@@ -100,8 +101,8 @@
         format-icons = [ "󱃃" "󰔏" "󱃂" ];
       };
       clock = {
-        format = "{:󰃭 %Y-%m-%d 󰥔 %R}";
-        format-alt = "{:󰥔 %R}";
+        format = "{:󰥔 %R}";
+        format-alt = "{:󰃭 %Y-%m-%d 󰥔 %R}";
         tooltip-format = "<tt><small>{calendar}</small></tt>";
         calendar = {
           mode = "month";
diff --git a/home/hyprland/waybar/style.css b/home/hyprland/waybar/style.css
index f2670359..9eee6f4c 100644
--- a/home/hyprland/waybar/style.css
+++ b/home/hyprland/waybar/style.css
@@ -74,10 +74,6 @@ tooltip {
 #mpris,
 #pulseaudio,
 #battery,
-#disk,
-#cpu,
-#memory,
-#temperature,
 #clock,
 #custom-notification,
 #tray {
@@ -109,24 +105,15 @@ tooltip {
 	color: @red;
 }
 
-#battery {
+#pulseaudio {
 	color: @red;
 }
-#pulseaudio {
-	color: @peach;
-}
-#disk {
-	color: @yellow;
-}
-#cpu {
+#clock {
 	color: @green;
 }
-#memory {
-	color: @sapphire;
-}
-#clock {
-	color: @mauve;
-}
 #custom-notification {
+	color: @blue;
+}
+#battery {
 	color: @lavender;
 }