diff --git a/modules/wm/hyprland/config/waybar/style.css b/modules/wm/hyprland/config/waybar/style.css
index d6638bb..ef287a5 100644
--- a/modules/wm/hyprland/config/waybar/style.css
+++ b/modules/wm/hyprland/config/waybar/style.css
@@ -53,6 +53,9 @@
 
 #waybar {
   background: transparent;
+}
+
+* {
   font-family: "Hasklug Nerd Font";
 }
 
diff --git a/modules/wm/hyprland/waybar.nix b/modules/wm/hyprland/waybar.nix
index 4f9a0c2..0901aed 100644
--- a/modules/wm/hyprland/waybar.nix
+++ b/modules/wm/hyprland/waybar.nix
@@ -28,6 +28,11 @@ in {
               format = "󰥔 {:%H:%M:%S}";
               format-alt = " {:%a %d %b %Y}";
             };
+            "battery" = {
+              format = "{icon} {capacity}%";
+              format-critical = "{icon} {time}";
+              format-time = "{H}h {M}s";
+            };
             "cpu" = {
               format = " {usage}%";
             };
@@ -52,6 +57,11 @@ in {
               format = "{:%H\n%M\n%S}";
               format-alt = "{:%d\n%m\n%y}";
             };
+            "battery" = {
+              format = "{icon} {capacity}";
+              format-critical = "{icon} {time}";
+              format-time = "{m}m";
+            };
             "cpu" = {
               format = " {usage}";
             };
@@ -103,7 +113,10 @@ in {
 
           "battery" = {
             interval = 3;
-            # TODO This needs to be fixed
+            format-icons = ["󰁻" "󰁽" "󰁿" "󰂁" "󰁹"];
+            states = {
+              critical = 15;
+            };
           };
 
           "hyprland/workspaces" = {