diff --git a/hosts/froidmpa-laptop/default.nix b/hosts/froidmpa-laptop/default.nix
index c3edb6a..c85eb81 100644
--- a/hosts/froidmpa-laptop/default.nix
+++ b/hosts/froidmpa-laptop/default.nix
@@ -25,6 +25,10 @@
     apps = { newsboat.enable = true; };
   };
 
+  # Monitor backlight control
+  programs.light.enable = true;
+  users.users.${config.user.name}.extraGroups = [ "video" ];
+
   home-manager.users.${config.user.name} = { pkgs, config, ... }: {
     services.network-manager-applet.enable = true;
     services.blueman-applet.enable = true;
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index b7a2a78..c9c62fa 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -141,7 +141,6 @@ in {
         };
 
         packages = with pkgs.unstable; [
-          xorg.xbacklight
           xorg.xinit
           xorg.xwininfo
           xorg.xkill
diff --git a/modules/desktop/files/xmonad.hs b/modules/desktop/files/xmonad.hs
index bbc43e5..82a0fa8 100644
--- a/modules/desktop/files/xmonad.hs
+++ b/modules/desktop/files/xmonad.hs
@@ -110,8 +110,8 @@ myAdditionalKeys = [
     ("<XF86AudioLowerVolume>"        ,spawn "pulsemixer --change-volume -1"),
     ("<XF86AudioRaiseVolume>"        ,spawn "pulsemixer --change-volume +1"),
     ("<XF86AudioMute>"               ,spawn "pulsemixer --toggle-mute"),
-    ("<XF86MonBrightnessDown>"       ,spawn "xbacklight -dec 5"),
-    ("<XF86MonBrightnessUp>"         ,spawn "xbacklight -inc 5"),
+    ("<XF86MonBrightnessDown>"       ,spawn "light -U 5"),
+    ("<XF86MonBrightnessUp>"         ,spawn "light -A 5"),
     ("<XF86AudioPlay>"               ,spawn "mpc toggle"),
     ("M-p"                           ,spawn "mpc toggle"),
     ("<XF86AudioPrev>"               ,spawn "mpc prev"),
diff --git a/modules/services/docker.nix b/modules/services/docker.nix
index 9ad948f..d6ebf58 100644
--- a/modules/services/docker.nix
+++ b/modules/services/docker.nix
@@ -17,7 +17,7 @@ in {
       };
     };
 
-    users.users.froidmpa.extraGroups = [ "docker" ];
+    users.users.${config.user.name}.extraGroups = [ "docker" ];
 
     environment.systemPackages = with pkgs; [ docker-compose ];
 
diff --git a/modules/services/libvirt.nix b/modules/services/libvirt.nix
index 3c7007d..672838c 100644
--- a/modules/services/libvirt.nix
+++ b/modules/services/libvirt.nix
@@ -13,7 +13,8 @@ in {
       libvirtd.enable = true;
       spiceUSBRedirection.enable = true;
     };
-    users.users.froidmpa.extraGroups = [ "libvirtd" ];
+
+    users.users.${config.user.name}.extraGroups = [ "libvirtd" ];
 
     environment.systemPackages = with pkgs; [ virt-manager ];
   };