diff --git a/home/modules/gui/waybar.nix b/home/modules/gui/waybar.nix
index e7ed2aa..0703447 100644
--- a/home/modules/gui/waybar.nix
+++ b/home/modules/gui/waybar.nix
@@ -26,51 +26,59 @@ in {
             "clock"
           ];
 
-          modules-right =
-            [
-              "privacy"
-              "cpu"
-              "memory"
-              "disk"
-              "temperature"
-              "keyboard-state"
-              "tray"
-            ]
-            ++ lists.optionals laptop [
-              "battery"
-            ];
-          "battery" = mkIf laptop {
+          modules-right = [
+            "keyboard-state"
+            "privacy"
+            "cpu"
+            "memory"
+            "disk"
+            "temperature"
+            "tray"
+          ]
+          ++ lists.optionals laptop [
+            "battery"
+          ];
+          battery = mkIf laptop {
             format = "{capacity}% {icon}";
-            format-icons = ["" "" "" "" ""];
+            format-plugged = "{capacity}% 󱐥{icon}";
+            format-icons = [ "󰂃" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
+            states = {
+              warning = 20;
+              critical = 10;
+            };
           };
-          "keyboard-state" = {
-            numlock = true;
+          keyboard-state = {
             capslock = true;
+            format.capslock = "{icon}";
+            format-icons = {
+              locked = "󰘲 ";
+              unlocked = "";
+            };
           };
-          "tray" = {
+          tray = {
             icon-size = 13;
             spacing = 8;
           };
-          "clock" = {
+          clock = {
             interval = 60;
             format = "{:%A %B %d %Y %H:%M}";
             tooltip = false;
           };
-          "cpu" = {
+          cpu = {
             format = " {usage}%";
             tooltip = false;
           };
-          "memory" = {
+          memory = {
             format = " {percentage}%";
             tooltip = true;
             tooltip-format = "{used}/{total}";
           };
-          "disk" = {
+          disk = {
             format = " {specific_used:0.0f}/{specific_total:0.0f}";
             unit = "GiB";
             tooltip = false;
           };
-          "privacy" = {
+          privacy = {
             icon-size = 12;
           };
         };
@@ -159,9 +167,9 @@ in {
         }
 
         /* States (battery, network, audio) */
-        #battery.charging { color: #c9ffbf; }
-        #battery.warning:not(.charging) { color: #ffd29a; }
-        #battery.critical:not(.charging) { color: #ff9a9a; }
+        #battery.charging { color: #27f902; }
+        #battery.warning:not(.charging) { color: #fc8b02; }
+        #battery.critical:not(.charging) { color: #fc0000; }
 
         #network.disconnected { color: #ffb4b4; }
         #pulseaudio.muted    { color: #9aa0a6; }
diff --git a/sys/modules/users.nix b/sys/modules/users.nix
index dee9340..e54d38e 100644
--- a/sys/modules/users.nix
+++ b/sys/modules/users.nix
@@ -54,7 +54,7 @@ in {
           shell = pkgs.zsh;
           extraGroups =
             ["users" "networkmanager"]
-            ++ optionals (v.admin) ["wheel" "libvirtd" "dialout" "adbusers" "video"];
+            ++ optionals (v.admin) ["wheel" "libvirtd" "dialout" "adbusers" "video" "input"];
           openssh.authorizedKeys.keyFiles = v.sshKeyPublicFile;
         })
         enabledUsers;