diff --git a/home-manager/features/hypr/hyprland.nix b/home-manager/features/hypr/hyprland.nix
index 3583d1e..ff5353a 100644
--- a/home-manager/features/hypr/hyprland.nix
+++ b/home-manager/features/hypr/hyprland.nix
@@ -48,7 +48,6 @@
 
     # Disable systemd because it conflicts with UWSM
     systemd.enable = false;
-
   };
 
   programs.hyprlock = {
diff --git a/home-manager/features/hyprpaper.nix b/home-manager/features/hyprpaper.nix
new file mode 100644
index 0000000..886e968
--- /dev/null
+++ b/home-manager/features/hyprpaper.nix
@@ -0,0 +1,15 @@
+monitors: _: {
+  services.hyprpaper = {
+    enable = true;
+    settings = {
+      wallpaper = map (mon: {
+        monitor = mon;
+        # Each monitor gets a folder under wallpaper that containes the current images.
+        path = "~/Pictures/Wallpaper/${mon}";
+        timeout = 3600;
+        recursive = true;
+        fit_mode = "cover";
+      }) monitors;
+    };
+  };
+}
diff --git a/home-manager/features/wallpaper.nix b/home-manager/features/wpaperd.nix
similarity index 62%
rename from home-manager/features/wallpaper.nix
rename to home-manager/features/wpaperd.nix
index 074e56f..0e176a1 100644
--- a/home-manager/features/wallpaper.nix
+++ b/home-manager/features/wpaperd.nix
@@ -1,11 +1,6 @@
-monitors:
-{ ... }:
-{
-  # TODO: Merge into hyprland
-  # wayland.windowManager.hyprland.settings.exec-once = [
-  #   "wpaperd"
-  # ];
-
+monitors: _: {
+  # NOTE: Wpaperd displays wallpaper upside-down on 90´ ccw rotated
+  # monitors as of 26.05
   services.wpaperd = {
     enable = true;
     settings =
@@ -13,7 +8,8 @@ monitors:
         map (mon: {
           name = mon;
           value = {
-            # Each monitor gets a folder under wallpaper that containes the current images.
+            # Each monitor gets a folder under wallpaper that
+            # containes the current images.
             path = "~/Pictures/Wallpaper/${mon}";
           };
         }) monitors
diff --git a/system/hosts/altair/drew.nix b/system/hosts/altair/drew.nix
index 5a787cb..08ab9ef 100644
--- a/system/hosts/altair/drew.nix
+++ b/system/hosts/altair/drew.nix
@@ -26,7 +26,7 @@ in
       "/features/3d-printing.nix"
     ]
     ++ [
-      (import ../../../home-manager/features/wallpaper.nix monitors)
+      (import ../../../home-manager/features/hyprpaper.nix monitors)
     ];
 
   home = {
diff --git a/system/hosts/vega/drew.nix b/system/hosts/vega/drew.nix
index bdebc6f..c87d5f3 100644
--- a/system/hosts/vega/drew.nix
+++ b/system/hosts/vega/drew.nix
@@ -15,7 +15,7 @@
       "/features/notes.nix"
     ]
     ++ [
-      (import ../../../home-manager/features/wallpaper.nix [ "HDMI-A-1" ])
+      (import ../../../home-manager/features/hyprpaper.nix [ "HDMI-A-1" ])
     ];
 
   home.packages = with pkgs; [