diff --git a/hosts/pleione/default.nix b/hosts/pleione/default.nix
index 288323de..8cf679c5 100644
--- a/hosts/pleione/default.nix
+++ b/hosts/pleione/default.nix
@@ -59,6 +59,8 @@
   };
 
   programs = {
+    light.enable = true;
+
     gamemode.enable = true;
 
     # Use GPG as SSH
@@ -97,7 +99,7 @@
   # My user info
   users.users.misterio = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" ];
+    extraGroups = [ "wheel" "networkmanager" "video" ];
     shell = pkgs.fish;
     passwordFile = "/data/home/misterio/.password";
     openssh.authorizedKeys.keys = [
diff --git a/users/misterio/features/desktop-sway/sway.nix b/users/misterio/features/desktop-sway/sway.nix
index 1f8b8cad..24e5fae6 100644
--- a/users/misterio/features/desktop-sway/sway.nix
+++ b/users/misterio/features/desktop-sway/sway.nix
@@ -187,16 +187,15 @@ in rec {
 
         # Volume
         "XF86AudioRaiseVolume" =
-          "exec ${pactl} set-sink-volume @DEFAULT_SINK@ +1%";
-        "XF86AudioLowerVolume" =
-          "exec ${pactl} set-sink-volume @DEFAULT_SINK@ -1%";
-        "Shift+XF86AudioRaiseVolume" =
           "exec ${pactl} set-sink-volume @DEFAULT_SINK@ +5%";
-        "Shift+XF86AudioLowerVolume" =
+        "XF86AudioLowerVolume" =
           "exec ${pactl} set-sink-volume @DEFAULT_SINK@ -5%";
         "XF86AudioMute" = "exec ${pactl} set-sink-mute @DEFAULT_SINK@ toggle";
         "Shift+XF86AudioMute" =
           "exec ${pactl} set-source-mute @DEFAULT_SOURCE@ toggle";
+        # Brightness
+        "XF86MonBrightnessUp" = "exec ${light} -A 10";
+        "XF86MonBrightnessDown" = "exec ${light} -U 10";
 
         # Media
         "XF86AudioNext" =
diff --git a/users/misterio/features/desktop-sway/waybar.nix b/users/misterio/features/desktop-sway/waybar.nix
index 6161213c..ad510a35 100644
--- a/users/misterio/features/desktop-sway/waybar.nix
+++ b/users/misterio/features/desktop-sway/waybar.nix
@@ -21,6 +21,7 @@ in {
         "custom/gamemode"
         "custom/ethminer"
         "custom/theme"
+        "battery"
         "pulseaudio"
         "cpu"
         "custom/gpu"
@@ -53,6 +54,16 @@ in {
           };
           on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
         };
+        battery = {
+          bat = "BAT0";
+          interval = 40;
+          states = {
+            warning = 30;
+            critical = 16;
+            format-icons = ["" "" "" "" ""];
+          };
+          format = "{capacity}% {icon}";
+        };
         "sway/window" = { max-length = 50; };
         "sway/workspaces" = {
           format = "{icon} {name}";