diff --git a/common.nix b/common.nix
index 735f78f..7cfbe3b 100644
--- a/common.nix
+++ b/common.nix
@@ -20,6 +20,8 @@ rec {
     options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT
   };
 
+  monitor1 = ""; # Empty matches all
+
   username = "martin";
 
   # This value determines the NixOS release from which the default
diff --git a/configuration.nix b/configuration.nix
index 259c05d..cfb8e61 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -39,6 +39,7 @@ in
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    brightnessctl
     wget
     xdg-utils
     xdg-desktop-portal
diff --git a/home-manager/hyprland/hypridle/default.nix b/home-manager/hyprland/hypridle/default.nix
index 111fea1..75c25c1 100644
--- a/home-manager/hyprland/hypridle/default.nix
+++ b/home-manager/hyprland/hypridle/default.nix
@@ -5,6 +5,7 @@ let
   suspendAfter = 7200;
 in
 {
+  wayland.windowManager.hyprland.settings.exec-once = [ "hypridle" ];
   services.hypridle = {
     enable = true;
     settings = {
diff --git a/home-manager/hyprland/hyprpaper.nix b/home-manager/hyprland/hyprpaper.nix
index 68f7ac5..bcb8c54 100644
--- a/home-manager/hyprland/hyprpaper.nix
+++ b/home-manager/hyprland/hyprpaper.nix
@@ -1,6 +1,9 @@
 # Wallpapers
 { pkgs, ... }:
 
+let
+  common = import ../../common.nix;
+in
 {
   home.packages = with pkgs; [
     hyprpaper
@@ -12,7 +15,6 @@
       let
         wallpaperDir = ../../wallpapers;
         monitor1 = "${wallpaperDir}/nixos_waves.png";
-        monitor2 = "${wallpaperDir}/ekg_v2.png";
       in
       {
         ipc = "on";
@@ -21,12 +23,10 @@
 
         preload = [
           monitor1
-          monitor2
         ];
 
         wallpaper = [
-          "DP-1,${monitor1}"
-          "DP-3,${monitor2}"
+          "${common.monitor1},${monitor1}"
         ];
       };
   };
diff --git a/home-manager/hyprland/settings.nix b/home-manager/hyprland/settings.nix
index cd3de98..81efeb0 100644
--- a/home-manager/hyprland/settings.nix
+++ b/home-manager/hyprland/settings.nix
@@ -7,16 +7,15 @@ in
 {
   wayland.windowManager.hyprland.settings = {
     monitor = [
-      ", 1920x1080@60.05, 0x0, 1"
+      "${common.monitor1}, 1920x1080@60.05, 0x0, 1"
     ];
 
     # Autostart
     exec-once = [
       app.browser
       app.terminal
-      "hypridle"
       "systemctl --user start hyprpolkitagent"
-      "waypaper --restore"
+      "hyprsunset -t 5000" # Set blue light filter
     ];
 
     env = [
diff --git a/modules/battery.nix b/modules/battery.nix
new file mode 100644
index 0000000..1aab014
--- /dev/null
+++ b/modules/battery.nix
@@ -0,0 +1,3 @@
+{
+  services.upower.enable = true;
+}
diff --git a/modules/default.nix b/modules/default.nix
index 7830ab7..1c9a18d 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./battery.nix
     ./development.nix
     ./fonts.nix
     ./gnome
diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
index 64f7865..966d285 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland/default.nix
@@ -6,6 +6,7 @@
     xdg-desktop-portal-hyprland
     hyprpolkitagent # Auth deamon providing modals for password auth
     hyprshot # Screenshots
+    hyprsunset # Blue light filter
     # unstable.hyprsysteminfo TODO requires flake update
   ];