diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index a903eb53..e47eac6e 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -1,86 +1,92 @@
 { config, pkgs, ... }:
 
 {
-    # Packages that should be installed to the user profile.
-    home.packages = with pkgs; [
-      overskride
-      pavucontrol
-    ];
+  # Packages that should be installed to the user profile.
+  home.packages = with pkgs; [ overskride pavucontrol ];
 
-    xdg.configFile."waybar/style.css".source = ./waybar.css;
+  xdg.configFile."waybar/style.css".source = ./waybar.css;
 
-    programs.waybar.enable = true;
-    programs.waybar.settings = {
-        mainBar = {
-            layer = "top";
-            position = "top";
-            height = 36;
-            output = [
-                "eDP-1"
-                "HDMI-A-1"
-            ];
-            modules-left = [ "hyprland/workspaces" "hyprland/submap" ];
-            modules-center = [ "hyprland/window" ];
-            modules-right = [ "tray" "bluetooth" "network" "pulseaudio" "battery" "power-profiles-daemon" "clock"];
+  programs.waybar.enable = true;
+  programs.waybar.settings = {
+    mainBar = {
+      layer = "top";
+      position = "top";
+      height = 36;
+      output = [ "eDP-1" "DP-1" "HDMI-A-1" ];
+      modules-left = [ "hyprland/workspaces" "hyprland/submap" ];
+      modules-center = [ "hyprland/window" ];
+      modules-right = [
+        "tray"
+        "bluetooth"
+        "network"
+        "pulseaudio"
+        "battery"
+        "power-profiles-daemon"
+        "clock"
+      ];
 
-            "hyprland/workspaces" = {
-                "all-outputs" = true;
-            };
-            "hyprland/window" = {
-                "max-length" = 150;
-            };
-            "clock" = {
-                "tooltip-format" = "{:%Y-%m-%d | %H:%M}";
-                "interval" = 60;
-                "format" = "{:%I:%M%p}";
-            };
-            "battery" = {
-                "states" = {
-                    "critical" = 20;
-                };
-                "format" = "{icon}";
-                "format-icons" = ["󰁺" "󰁼" "󰁿" "󰂁" "󰁹"];
-            };
-            "bluetooth" = {
-                "format" = "󰂯　{status}";
-                "format-disabled" = ""; # an empty format will hide the module
-                "format-connected" = "󰂯　{num_connections} connected";
-                "tooltip-format" = "{controller_alias}\t{controller_address}";
-                "tooltip-format-connected" = "{controller_alias}\t{controller_address}\n\n{device_enumerate}";
-                "tooltip-format-enumerate-connected" = "{device_alias}\t{device_address}";
-                "on-click" = "overskride";
-            };
-            "pulseaudio" = {
-                "format" = "　{volume}%";
-                 "format-bluetooth" = "{volume}% {icon}󰂯";
-                 "format-muted" = "";
-                 "format-icons"=  {
-                     "headphones" = "󰋋";
-                     "handsfree" = "󰋎";
-                     "headset" = "󰋎";
-                 };
-                "on-click" = "pavucontrol";
-            };
-            "network" = {
-                "format-wifi" = "󰣾　{signalStrength}%";
-                "format-disconnected" = "⚠";
-                "tooltip-format" = "{ifname} via {gwaddr} 󰊗";
-                "tooltip-format-wifi" = "{essid} ({signalStrength}%) 󰣾";
-                "tooltip-format-ethernet" = "{ifname} ";
-                "tooltip-format-disconnected" = "Disconnected";
-                "on-click" = "alacritty -e nmtui";
-            };
-            "power-profiles-daemon" = {
-                "format" = "{icon}";
-                "tooltip-format" = "Power profile: {profile}\nDriver: {driver}";
-                "tooltip" = true;
-                "format-icons" = {
-                    "default" = "󱐌";
-                    "performance" = "󱐌";
-                    "balanced" = "󰗑";
-                    "power-saver" = "󰌪";
-                };
-            };
+      "hyprland/workspaces" = { "all-outputs" = true; };
+      "hyprland/window" = { "max-length" = 100; };
+      "clock" = {
+        "tooltip-format" = "{:%Y-%m-%d | %H:%M}";
+        "interval" = 60;
+        "format" = "{:%I:%M%p}";
+      };
+      "battery" = {
+        "states" = {
+          "critical" = 20;
+          "normal" = 90;
+          "full" = 100;
         };
+        "format" = "{icon}";
+        "format-icons" = [ "󰁺" "󰁼" "󰁿" "󰂁" "󰁹" ];
+      };
+      "bluetooth" = {
+        "format" = "󰂯　{status}";
+        "format-disabled" = ""; # an empty format will hide the module
+        "format-connected" = "󰂯　{num_connections} connected";
+        "tooltip-format" = "{controller_alias}	{controller_address}";
+        "tooltip-format-connected" = ''
+          {controller_alias}	{controller_address}
+
+          {device_enumerate}'';
+        "tooltip-format-enumerate-connected" =
+          "{device_alias}	{device_address}";
+        "on-click" = "overskride";
+      };
+      "pulseaudio" = {
+        "format" = "　{volume}%";
+        "format-bluetooth" = "{volume}% {icon}󰂯";
+        "format-muted" = "";
+        "format-icons" = {
+          "headphones" = "󰋋";
+          "handsfree" = "󰋎";
+          "headset" = "󰋎";
+        };
+        "on-click" = "pavucontrol";
+      };
+      "network" = {
+        "format-wifi" = "󰣾　{signalStrength}%";
+        "format-disconnected" = "⚠";
+        "tooltip-format" = "{ifname} via {gwaddr} 󰊗";
+        "tooltip-format-wifi" = "{essid} ({signalStrength}%) 󰣾";
+        "tooltip-format-ethernet" = "{ifname} ";
+        "tooltip-format-disconnected" = "Disconnected";
+        "on-click" = "alacritty -e nmtui";
+      };
+      "power-profiles-daemon" = {
+        "format" = "{icon}";
+        "tooltip-format" = ''
+          Power profile: {profile}
+          Driver: {driver}'';
+        "tooltip" = true;
+        "format-icons" = {
+          "default" = "󱐌";
+          "performance" = "󱐌";
+          "balanced" = "󰗑";
+          "power-saver" = "󰌪";
+        };
+      };
     };
+  };
 }
diff --git a/home/waybar/waybar.css b/home/waybar/waybar.css
index 6af365d6..f418560e 100644
--- a/home/waybar/waybar.css
+++ b/home/waybar/waybar.css
@@ -1,7 +1,7 @@
 * {
     border: none;
     border-radius: 0;
-    font-family: "DroidSansM Nerd Font Mono";
+    font-family: "Noto Nerd Font Sans Mono";
     font-size: 14px;
 }
 window#waybar {
@@ -13,8 +13,14 @@ window#waybar {
     background: #000;
     color: #FFFFFF;
 }
+#workspaces button.active {
+    color: green;
+}
 #clock, #battery, #pulseaudio, #bluetooth, #network, #tray, #power-profiles-daemon {
     padding: 0 10px;
     margin: 0 5px;
 }
-#battery.critical { color: red; }
\ No newline at end of file
+#battery.critical { color: red; }
+#battery.full { color: green; }
+#battery.normal { color: #FFFFFF; }
+