diff --git a/flake.nix b/flake.nix
index 940a219b..fcb0e85b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,7 +61,7 @@
       framework-server = libx.mkHost { hostname = "framework-server"; };
       nuc-server       = libx.mkHost { hostname = "nuc-server"; };
       nixos-desktop    = libx.mkHost { hostname = "nixos-desktop";   unfree = true; desktop = "hyprland"; theme = "tokyo-night"; };
-      nixos-framework  = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "hyprland"; theme = "sakura-night"; };
+      nixos-framework  = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "hyprland"; theme = "forest"; };
       backups-rpi4     = libx.mkHost { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; };
       piaware-rpi4     = libx.mkHost { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; };
       quitman-rpi4     = libx.mkHost { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; };
@@ -71,7 +71,7 @@
       "albert@framework-server" = libx.mkHome { hostname = "framework-server"; };
       "albert@nuc-server"       = libx.mkHome { hostname = "nuc-server"; };
       "albert@nixos-desktop"    = libx.mkHome { hostname = "nixos-desktop";   desktop = "hyprland"; theme = "tokyo-night"; };
-      "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "sakura-night"; };
+      "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "forest"; };
       "albert@backups-rpi4"     = libx.mkHome { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; };
       "albert@piaware-rpi4"     = libx.mkHome { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; };
       "albert@quitman-rpi4"     = libx.mkHome { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; };
diff --git a/home-manager/common/desktops/hyprland/components/waybar.nix b/home-manager/common/desktops/hyprland/components/waybar.nix
index 7707c7a8..9190bc0a 100644
--- a/home-manager/common/desktops/hyprland/components/waybar.nix
+++ b/home-manager/common/desktops/hyprland/components/waybar.nix
@@ -129,9 +129,9 @@
                     warning = 35;
                     critical = 20;
                 };
-                format = "{icon}  {capacity}%";
-                format-charging = "󰂄 {capacity}%";
-                format-plugged = "  {capacity}%";
+                format = "{icon}   {capacity}%";
+                format-charging = "󰂄  {capacity}%";
+                format-plugged  = "   {capacity}%";
                 format-icons = [ "" "" "" "" "" ];
             };
         };