diff --git a/modules/home/wms/default.nix b/modules/home/wms/default.nix
index e202772..a137fc5 100644
--- a/modules/home/wms/default.nix
+++ b/modules/home/wms/default.nix
@@ -1,7 +1,6 @@
 { ... }:
 {
   imports = [
-    ./hyprland
     ./niri
     ./programs
     ./sway
diff --git a/modules/home/wms/hyprland/autostart/default.nix b/modules/home/wms/hyprland/autostart/default.nix
deleted file mode 100644
index 28652ba..0000000
--- a/modules/home/wms/hyprland/autostart/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ pkgs, ... }:
-{
-  wayland.windowManager.hyprland.settings.exec-once = [
-    "waybar"
-
-    # Scratchpads
-    "foot -a btop -T Gotop btop"
-    "foot -a music -T Music ncmpcpp"
-    "foot -a sound -T Sound pulsemixer"
-
-    # Deamons and tray
-    "hyprpaper"
-    "wl-paste -t text --watch clipman store -P"
-    "wl-copy"
-    "mako"
-    "sunshine"
-    "rot8"
-    "wlsunset -s 22:30 -S 06:30"
-    "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
-
-    # Foreground
-    "librewolf -P Misc --name=MiscBrowser"
-    "thunderbird"
-    "vesktop"
-    "fractal"
-    "telegram-desktop"
-  ];
-}
diff --git a/modules/home/wms/hyprland/default.nix b/modules/home/wms/hyprland/default.nix
deleted file mode 100644
index f3e063f..0000000
--- a/modules/home/wms/hyprland/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, pkgs, ... }:
-{
-  imports = [
-    ./autostart
-    ./hotkeys
-    ./inputs
-    ./outputs
-    ./plugins
-    ./programs
-    ./rules
-    ./theme
-  ];
-
-  wayland.windowManager.hyprland = {
-    enable = true;
-    plugins = with pkgs.hyprlandPlugins; [ hy3 ];
-  };
-}
diff --git a/modules/home/wms/hyprland/hotkeys/README.md b/modules/home/wms/hyprland/hotkeys/README.md
deleted file mode 100644
index e81f67b..0000000
--- a/modules/home/wms/hyprland/hotkeys/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# Sway Window Manager Hotkeys
-
-## Application Launchers
-| Key Combination      | Action                                    |
-|----------------------|-------------------------------------------|
-| Win + F1             | Launch **LibreWolf** (Jim profile)        |
-| Win + F2             | Launch **LibreWolf** (Alt profile)        |
-| Win + F3             | Launch **LibreWolf** (Misc profile)       |
-| Win + F4             | Launch **Discord**                        |
-| Win + F5             | Launch **Steam**                          |
-| Win + F6             | Launch **Heroic Games**                   |
-| Win + F7             | Launch **Looking Glass** VM Client        |
-| Win + F10            | Launch **Virt-Manager**                   |
-| Win + F11            | Open **Rofi Scratchpads**                 |
-| Win + F12            | Open **NixOS Configuration Files**        |
-
-## Window Management
-| Key Combination      | Action                                    |
-|----------------------|-------------------------------------------|
-| Win + Arrows         | Focus in the specified direction          |
-| Win + Shift + Arrows | Move window in the specified direction    |
-| Win + Shift + Space  | Toggle window floating                    |
-| Win + Space          | Switch focus between floating/tiled       |
-| Win + Shift + {1-9}  | Move window to a workspace and focus      |
-| Win + {1-9}          | Switch to specified workspace             |
-| Win + 0              | Pin window and toggle border              |
-| Win + F              | Toggle fullscreen                         |
-| Win + Shift + R      | Reload configuration                      |
-| Win + Q              | Close the current window                  |
-
-## Layout Management
-| Key Combination      | Action                                    |
-|----------------------|-------------------------------------------|
-| Win + W              | Toggle split layout                       |
-| Win + E              | Toggle tabbed/stacking layout             |
-| Win + H/V            | Split window horizontally/vertically      |
-| Win + A/D            | Focus parent/child container              |
-
-## Volume and Media Controls
-| Key Combination      | Action                                    |
-|----------------------|-------------------------------------------|
-| XF86AudioRaiseVolume | Raise system volume                       |
-| XF86AudioLowerVolume | Lower system volume                       |
-| XF86AudioMute        | Mute/unmute audio                         |
-| XF86AudioPlay        | Toggle media playback                     |
-| XF86AudioNext        | Skip to the next track                    |
-| XF86AudioPrev        | Go to the previous track                  |
-
-## Screenshot and Brightness Controls
-| Key Combination      | Action                                    |
-|----------------------|-------------------------------------------|
-| Print                | Take a screenshot                         |
-| Shift + Print        | Screenshot of the current window          |
-| Brightness Up + Down | Change screen brightness                  |
-
-## Scratchpads
-| Key Combination      | Action                                    |
-|----------------------|-------------------------------------------|
-| Ctrl + Shift + Escape | Open **Gotop** (monitoring)              |
-| Win + Shift + M      | Open **Music** scratchpad                 |
-| Win + Shift + V      | Open **Sound Settings** scratchpad        |
-| Win + Shift + Backslash | Open **EasyEffects** scratchpad        |
-
-## Special Sway Tools
-| Key Combination      | Action                                    |
-|----------------------|-------------------------------------------|
-| Win + Escape         | **Kill** selected window                  |
-| Win + Ctrl + X       | **Inspect** window properties             |
-| Win + Ctrl + Prior/Next | Switch OBS scene to **Main**/**Guest** |
-
-## Miscellaneous
-| Key Combination      | Action                                    |
-|----------------------|-------------------------------------------|
-| Win + Return         | Open **Foot terminal**                    |
-| Win + S              | Open **Rofi (run commands)**              |
-| Win + C              | Open **Clipman (clipboard manager)**      |
-| Win + X              | Open **Power Menu**                       |
-| Win + B              | Show/Hide **Waybar**                      |
-
-## Workspaces (Alternate)
-| Key Combination      | Action                                    |
-|----------------------|-------------------------------------------|
-| Alt + F1-F9          | Switch to alternate workspace             |
-| Alt + Shift + F1-F9  | Move window to alt workspace and focus    |
diff --git a/modules/home/wms/hyprland/hotkeys/default.nix b/modules/home/wms/hyprland/hotkeys/default.nix
deleted file mode 100644
index 9213cb0..0000000
--- a/modules/home/wms/hyprland/hotkeys/default.nix
+++ /dev/null
@@ -1,164 +0,0 @@
-{ pkgs, config, ... }:
-{
-  wayland.windowManager.hyprland.settings = let
-    # Set default modifier and variables
-    primeMod = "Super";
-    secMod = "Alt";
-    resizeAmount = "55";
-  in {
-    bind = [
-      ## Launchers
-      
-      # Browser
-      ''${primeMod}, F1, exec, librewolf -p Main --name MainBrowser | notify-send "Main Browser"''
-      ''${primeMod}, F2, exec, librewolf -p Alt --name AltBrowser | notify-send "Alternate Browser"''
-      ''${primeMod}, F3, exec, librewolf -p Misc --name MiscBrowser | notify-send "Miscellaneous Browser"''
-      
-      # Virtual machines
-      ''${primeMod}, F4, exec, virt-manager | notify-send "Virtual Machines"''
-      ''${primeMod}, F5, exec, looking-glass-client input:rawMouse=yes | notify-send "Looking Glass"''
-      
-      # Prime + key
-      "${primeMod}, s, exec, rofi -show run -p Command"
-      "${primeMod}, c, exec, clipman pick -t rofi"
-      "${primeMod}, x, exec, rofipower"
-      "${primeMod}, b, exec, pkill -USR1 waybar"
-      "${primeMod}, Return, exec, foot"
-      
-      # Prime + shift + key
-      "${primeMod} Shift, s, exec, rofi -show drun -modi drun -drun-display-format {name} -show-icons -disable-history"
-      "${primeMod} Shift, t, exec, pcmanfm"
-      "${primeMod} Shift, e, exec, bemoji -n -P 0"
-      "${primeMod} Shift, b, exec, rofi-bluetooth"
-      "${primeMod} Shift, Return, exec, foot ranger"
-      
-      # Prime + ctrl + key
-      "${primeMod} Ctrl, s, exec, rofiscratch"
-      ''${primeMod} Ctrl, c, exec, wlpicker && notify-send "Color copied to clipboard"''
-      
-      ## Media
-      
-      # Volume
-      "${secMod}, j, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
-      "${secMod}, k, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
-      
-      # MPD
-      "${primeMod}, Backslash, exec, mpc toggle"
-      "${secMod} Shift, h, exec, mpc prev"
-      "${secMod} Shift, j, exec, mpc volume -3"
-      "${secMod} Shift, k, exec, mpc volume +3"
-      "${secMod} Shift, l, exec, mpc next"
-      
-      ## Miscellaneous
-      
-      # Notifications
-      "${primeMod}, n, exec, makotoggle"
-      "${primeMod} Shift, n, exec, makoctl restore"
-      "${primeMod} Ctrl, n, exec, makoctl dismiss -a"
-      
-      # Screenshots
-      ''${secMod}, f, exec, XDG_SCREENSHOTS_DIR="$HOME/Pictures/Screenshots" SLURP_ARGS="-w 3 -c 3823C4 -B 00000066 -b 00000099" grimblast --freeze --notify copysave area''
-      "${secMod} Shift, f, exec, grimblast --notify copysave output"
-      "${secMod} Ctrl, f, exec, grimblast --notify copysave active"
-      
-      # Screenshots
-      
-      # Display and keyboard brightness
-      "${primeMod}, equal, exec, brightnessctl s 5%+"
-      "${primeMod}, minus, exec, brightnessctl s 5%-"
-      "${primeMod} Shift, equal, exec, brightnessctl s 1%+"
-      "${primeMod} Shift, minus, exec, brightnessctl s 1%-"
-      
-      ## Window manager
-      "${primeMod}, q, killactive,"
-      
-      # Switch to workspaces
-      "${primeMod}, grave, workspace, name:0"
-      "${primeMod}, 1, workspace, name:${config.ws.w1}"
-      "${primeMod}, 2, workspace, name:${config.ws.w2}"
-      "${primeMod}, 3, workspace, name:${config.ws.w3}"
-      "${primeMod}, 4, workspace, name:${config.ws.w4}"
-      "${primeMod}, 5, workspace, name:${config.ws.w5}"
-      "${primeMod}, 6, workspace, name:${config.ws.w6}"
-      "${primeMod}, 7, workspace, name:${config.ws.w7}"
-      "${primeMod}, 8, workspace, name:${config.ws.w8}"
-      "${primeMod}, 9, workspace, name:${config.ws.w9}"
-      
-      # Switch to alternate workspaces
-      "${secMod}, F1, workspace, name:${config.ws.w1a}"
-      "${secMod}, F2, workspace, name:${config.ws.w2a}"
-      "${secMod}, F3, workspace, name:${config.ws.w3a}"
-      "${secMod}, F4, workspace, name:${config.ws.w4a}"
-      "${secMod}, F5, workspace, name:${config.ws.w5a}"
-      "${secMod}, F6, workspace, name:${config.ws.w6a}"
-      "${secMod}, F7, workspace, name:${config.ws.w7a}"
-      "${secMod}, F8, workspace, name:${config.ws.w8a}"
-      "${secMod}, F9, workspace, name:${config.ws.w9a}"
-      
-      # Move window to and focus workspace
-      "${primeMod} Shift, grave, movetoworkspace, name:${config.ws.w0}"
-      "${primeMod} Shift, 1, movetoworkspace, name:${config.ws.w1}"
-      "${primeMod} Shift, 2, movetoworkspace, name:${config.ws.w2}"
-      "${primeMod} Shift, 3, movetoworkspace, name:${config.ws.w3}"
-      "${primeMod} Shift, 4, movetoworkspace, name:${config.ws.w4}"
-      "${primeMod} Shift, 5, movetoworkspace, name:${config.ws.w5}"
-      "${primeMod} Shift, 6, movetoworkspace, name:${config.ws.w6}"
-      "${primeMod} Shift, 7, movetoworkspace, name:${config.ws.w7}"
-      "${primeMod} Shift, 8, movetoworkspace, name:${config.ws.w8}"
-      "${primeMod} Shift, 9, movetoworkspace, name:${config.ws.w9}"
-      
-      # Move window to and focus alternate workspace
-      "${secMod} Shift, F1, movetoworkspace, name:${config.ws.w1a}"
-      "${secMod} Shift, F2, movetoworkspace, name:${config.ws.w2a}"
-      "${secMod} Shift, F3, movetoworkspace, name:${config.ws.w3a}"
-      "${secMod} Shift, F4, movetoworkspace, name:${config.ws.w4a}"
-      "${secMod} Shift, F5, movetoworkspace, name:${config.ws.w5a}"
-      "${secMod} Shift, F6, movetoworkspace, name:${config.ws.w6a}"
-      "${secMod} Shift, F7, movetoworkspace, name:${config.ws.w7a}"
-      "${secMod} Shift, F8, movetoworkspace, name:${config.ws.w8a}"
-      "${secMod} Shift, F9, movetoworkspace, name:${config.ws.w9a}"
-      
-      # Change focused window
-      "${primeMod}, h, hy3:movefocus, l"
-      "${primeMod}, j, hy3:movefocus, d"
-      "${primeMod}, k, hy3:movefocus, u"
-      "${primeMod}, l, hy3:movefocus, r"
-      
-      # Move focused window
-      "${primeMod} Shift, h, hy3:movewindow, l"
-      "${primeMod} Shift, j, hy3:movewindow, d"
-      "${primeMod} Shift, k, hy3:movewindow, u"
-      "${primeMod} Shift, l, hy3:movewindow, r"
-      
-      # Resize window
-      "${primeMod} ${secMod}, h, resizeactive, -${resizeAmount} 0"
-      "${primeMod} ${secMod}, j, resizeactive, 0 -${resizeAmount}"
-      "${primeMod} ${secMod}, k, resizeactive, 0 ${resizeAmount}"
-      "${primeMod} ${secMod}, l, resizeactive, ${resizeAmount} 0"
-      
-      # Floating
-      "${primeMod}, Space, hy3:togglefocuslayer"
-      "${primeMod} Shift, Space, togglefloating"
-      
-      # Change layout
-      "${primeMod}, f, fullscreen"
-      "${primeMod}, w, hy3:changegroup, opposite"
-      "${primeMod}, v, hy3:makegroup, v"
-      "${primeMod}, e, hy3:changegroup, toggletab"
-      
-      ## Scratchpads
-      "${primeMod} Shift, Backslash, togglespecialworkspace, btop"
-      "${primeMod} Shift, m, togglespecialworkspace, music"
-      "${primeMod} Shift, v, togglespecialworkspace, sound"
-    ];
-
-    # Mouse
-    bindm = [
-      "${primeMod}, mouse:272, movewindow"
-      "${primeMod}, mouse:273, resizewindow"
-    ];
-    bindn = [
-      ",mouse:272, hy3:focustab, mouse"
-    ];
-  };
-}
diff --git a/modules/home/wms/hyprland/inputs/default.nix b/modules/home/wms/hyprland/inputs/default.nix
deleted file mode 100644
index c7140ff..0000000
--- a/modules/home/wms/hyprland/inputs/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, ... }:
-{
-  wayland.windowManager.hyprland.settings = {
-    input = {
-      follow_mouse = 1;
-      accel_profile = "flat";
-      scroll_factor = 0.8;
-      touchpad.natural_scroll = false;
-    };
-    gestures.workspace_swipe = false;
-    device = {
-      name = "sinowealth-game-mouse";
-      sensitivity = "-0.9";
-    };
-  };
-}
diff --git a/modules/home/wms/hyprland/outputs/default.nix b/modules/home/wms/hyprland/outputs/default.nix
deleted file mode 100644
index 0c4937a..0000000
--- a/modules/home/wms/hyprland/outputs/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ config, ... }:
-{
-  # Monitors
-  wayland.windowManager.hyprland.settings = {
-    monitor = [
-      "${config.displays.d1},1920x1080@143.980, 3840x405, 1"
-      "${config.displays.d2},1920x1080@60, 1920x405, 1"
-      "${config.displays.d3},1680x1050@59.883, 5760x0, 1, transform, 1"
-      "${config.displays.d4},1920x1080@60, 0x405, 1"
-    ];
-
-    workspace = [
-      "name:${config.ws.w1}, monitor:${config.displays.d1}, default:true"
-      "name:${config.ws.w2}, monitor:${config.displays.d1}"
-      "name:${config.ws.w3}, monitor:${config.displays.d1}"
-      "name:${config.ws.w1a}, monitor:${config.displays.d1}"
-      "name:${config.ws.w2a}, monitor:${config.displays.d1}"
-      "name:${config.ws.w3a}, monitor:${config.displays.d1}"
-
-      "name:${config.ws.w4}, monitor:${config.displays.d2}, default:true"
-      "name:${config.ws.w5}, monitor:${config.displays.d2}"
-      "name:${config.ws.w6}, monitor:${config.displays.d2}"
-      "name:${config.ws.w4a}, monitor:${config.displays.d2}"
-      "name:${config.ws.w5a}, monitor:${config.displays.d2}"
-
-      "name:${config.ws.w7}, monitor:${config.displays.d3}, default:true"
-      "name:${config.ws.w8}, monitor:${config.displays.d3}"
-      "name:${config.ws.w9}, monitor:${config.displays.d3}"
-      "name:${config.ws.w7a}, monitor:${config.displays.d3}"
-      "name:${config.ws.w8a}, monitor:${config.displays.d3}"
-
-      "name:${config.ws.w6a}, monitor:${config.displays.d4}, default:true"
-      "name:${config.ws.w9a}, monitor:${config.displays.d4}"
-    ];
-  };
-}
diff --git a/modules/home/wms/hyprland/plugins/default.nix b/modules/home/wms/hyprland/plugins/default.nix
deleted file mode 100644
index 43f3bdc..0000000
--- a/modules/home/wms/hyprland/plugins/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, ... }:
-{
-  wayland.windowManager.hyprland.settings.plugin = {
-    hy3 = {
-      no_gaps_when_only = 0;
-      node_collapse_policy = 0;
-      group_inset = 5;
-      tabs = {
-        text_font = config.look.fonts.main;
-        text_height = 10;
-        height = 17;
-        padding = 0;
-        rounding = 0;
-        "col.active" = "rgba(${config.look.colors.prime}FF)";
-        "col.inactive" = "rgba(${config.look.colors.split}FF)";
-        "col.urgent" = "rgba(${config.look.colors.urgent}FF)";
-        "col.text.active" = "rgba(${config.look.colors.text}FF)";
-        "col.text.inactive" = "rgba(${config.look.colors.text}FF)";
-      };
-    };
-  };
-}
diff --git a/modules/home/wms/hyprland/programs/default.nix b/modules/home/wms/hyprland/programs/default.nix
deleted file mode 100644
index 1527533..0000000
--- a/modules/home/wms/hyprland/programs/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-  ];
-}
diff --git a/modules/home/wms/hyprland/rules/default.nix b/modules/home/wms/hyprland/rules/default.nix
deleted file mode 100644
index 0e26e53..0000000
--- a/modules/home/wms/hyprland/rules/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ config, ... }:
-{
-  wayland.windowManager.hyprland.settings = {
-    windowrulev2 = [
-      # Scratchpads
-      "workspace special:btop silent, class:^(btop)$"
-      "workspace special:music silent, class:^(music)$"
-      "workspace special:sound silent, class:^(sound)$"
-
-      # Browsers
-      "workspace name:${config.ws.w1} silent, class:(MainBrowser)"
-      "workspace name:${config.ws.w1a} silent, class:(AltBrowser)"
-
-      # Communication
-      "workspace name:${config.ws.w7} silent, class:(MiscBrowser)"
-      "workspace name:${config.ws.w7} silent, class:(vesktop)"
-      "workspace name:${config.ws.w8} silent, class:(org.gnome.Fractal)"
-      "workspace name:${config.ws.w8} silent, class:(org.telegram.desktop)"
-      "workspace name:${config.ws.w9} silent, class:(thunderbird)"
-
-      # Etc
-      "workspace name:${config.ws.w2} silent, class:(steam)"
-      "workspace name:${config.ws.w2} silent, class:(heroic)"
-      "workspace name:${config.ws.w2a} silent, class:(looking-glass-client)"
-      "workspace name:${config.ws.w4a} silent, class:(com.obsproject.Studio)"
-
-      # Borderless single window part 1
-      "bordersize 0, floating:0, onworkspace:w[tv1]"
-    ];
-
-    # Borderless on single window part 2
-    workspace = [ "w[tv1], gapsout:0, gapsin:0" ];
-
-    # Borderless screenshots
-    layerrule = "noanim, selection";
-  };
-}
diff --git a/modules/home/wms/hyprland/theme/default.nix b/modules/home/wms/hyprland/theme/default.nix
deleted file mode 100644
index 82d0083..0000000
--- a/modules/home/wms/hyprland/theme/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ config, ... }:
-{
-  wayland.windowManager.hyprland.settings = {
-    general = {
-      "col.active_border" = "rgba(${config.look.colors.prime}FF)";
-      "col.inactive_border" = "rgba(${config.look.colors.split}FF)";
-      gaps_in = 4;
-      gaps_out = 10;
-      border_size = config.look.border.string;
-      allow_tearing = true;
-      layout = "hy3";
-    };
-
-    misc = {
-      disable_hyprland_logo = true;
-      font_family = config.look.fonts.main;
-      middle_click_paste = false;
-      vrr = 2;
-    };
-
-    decoration.blur.enabled = false;
-
-    animations = {
-      bezier = [
-        "easeOutQuint,0.23,1,0.32,1"
-        "easeInOutCubic,0.65,0.05,0.36,1"
-        "linear,0,0,1,1"
-        "almostLinear,0.5,0.5,0.75,1.0"
-        "quick,0.15,0,0.1,1"
-      ];
-      animation = [
-        "global, 1, 10, default"
-        "border, 1, 5.39, easeOutQuint"
-        "windows, 1, 4.79, easeOutQuint"
-        "windowsIn, 1, 4.1, easeOutQuint, popin 87%"
-        "windowsOut, 1, 1.49, linear, popin 87%"
-        "fadeIn, 1, 1.73, almostLinear"
-        "fadeOut, 1, 1.46, almostLinear"
-        "fade, 1, 3.03, quick"
-        "layers, 1, 3.81, easeOutQuint"
-        "layersIn, 1, 4, easeOutQuint, fade"
-        "layersOut, 1, 1.5, linear, fade"
-        "fadeLayersIn, 1, 1.79, almostLinear"
-        "fadeLayersOut, 1, 1.39, almostLinear"
-        "workspaces, 1, 1.94, almostLinear, fade"
-        "workspacesIn, 1, 1.21, almostLinear, fade"
-        "workspacesOut, 1, 1.94, almostLinear, fade"
-      ];
-    };
-  };
-}
diff --git a/modules/home/wms/niri/autostart/default.nix b/modules/home/wms/niri/autostart/default.nix
index 982aab6..6bf598b 100644
--- a/modules/home/wms/niri/autostart/default.nix
+++ b/modules/home/wms/niri/autostart/default.nix
@@ -4,7 +4,7 @@
     spawn-at-startup "waybar"
     
     // Daemons and tray
-    spawn-at-startup "hyprpaper"
+    spawn-at-startup "wpaperd"
     spawn-at-startup "wl-paste" "-t" "text" "--watch" "clipman" "store" "-P"
     spawn-at-startup "wl-copy"
     spawn-at-startup "mako"
diff --git a/modules/home/wms/niri/programs/default.nix b/modules/home/wms/niri/programs/default.nix
index 018f7aa..a2e10a8 100644
--- a/modules/home/wms/niri/programs/default.nix
+++ b/modules/home/wms/niri/programs/default.nix
@@ -1,6 +1,4 @@
 { pkgs, ... }:
 {
-  imports = [
-    ./sleep-niri
-  ];
+  imports = [ ./sleep-niri ];
 }
diff --git a/modules/home/wms/programs/default.nix b/modules/home/wms/programs/default.nix
index 8147730..6972de2 100644
--- a/modules/home/wms/programs/default.nix
+++ b/modules/home/wms/programs/default.nix
@@ -2,21 +2,24 @@
 {
   imports = [
     ./grimedit
-    ./hyprpaper
     ./mako
     ./swappy
     ./swaylock
     ./waybar
     ./wlpicker
+    ./wpaperd
   ];
 
   home.packages = with pkgs; [
     brightnessctl
     clipman
+    grim
+    hyprpicker
     libnotify
     rot8
+    slurp
+    wdisplays
     wl-clipboard
     wlsunset
-    wdisplays
   ];
 }
diff --git a/modules/home/wms/programs/grimedit/default.nix b/modules/home/wms/programs/grimedit/default.nix
index b98da64..2d1a197 100644
--- a/modules/home/wms/programs/grimedit/default.nix
+++ b/modules/home/wms/programs/grimedit/default.nix
@@ -3,17 +3,17 @@
   home.packages = with pkgs; [
     (pkgs.writeScriptBin "grimedit" ''
       # Freeze the screen using hyprpicker
-      ${pkgs.hyprpicker}/bin/hyprpicker -r -z &
+      hyprpicker -r -z &
       HYPRPICKER_PID=$!
       sleep 0.1
       
       # Select area
-      GEOM=$(${pkgs.slurp}/bin/slurp -w 3 -c ${config.look.colors.prime} -B 00000066 -b 00000099)
+      GEOM=$(slurp -w 3 -c ${config.look.colors.prime} -B 00000066 -b 00000099)
       
       # Check selection is canceled
       if [ -z "$GEOM" ]; then
         kill $HYPRPICKER_PID 2>/dev/null
-        notify-send -t 3000 -a grimblast "Error" "No area selected."
+        notify-send -t 3000 -a grim "Error" "No area selected."
         exit 1
       fi
       
diff --git a/modules/home/wms/programs/hyprpaper/default.nix b/modules/home/wms/programs/hyprpaper/default.nix
deleted file mode 100644
index fd700a4..0000000
--- a/modules/home/wms/programs/hyprpaper/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, config, ... }:
-{
-  home.packages = with pkgs; [ hyprpaper ];
-
-  services.hyprpaper = {
-    enable = true;
-    settings = {
-      splash = false;
-      preload = [
-        "~/.assets/wallpapers/1.png"
-        "~/.assets/wallpapers/2.png"
-        "~/.assets/wallpapers/3.png"
-      ];
-      wallpaper = [
-        ",~/.assets/wallpapers/1.png"
-        "${config.displays.d2},~/.assets/wallpapers/2.png"
-        "${config.displays.d3},~/.assets/wallpapers/3.png"
-      ];
-    };
-  };
-}
diff --git a/modules/home/wms/programs/mako/makotoggle/default.nix b/modules/home/wms/programs/mako/makotoggle/default.nix
index 522a9ad..53a69a1 100644
--- a/modules/home/wms/programs/mako/makotoggle/default.nix
+++ b/modules/home/wms/programs/mako/makotoggle/default.nix
@@ -2,18 +2,15 @@
 {
   home.packages = with pkgs; [ 
     (pkgs.writeScriptBin "makotoggle" ''
-      # Run makoctl mode and store the output in a variable
       mode_output=$(makoctl mode)
 
       # Extract the second line after "default"
       mode_line=$(echo "$mode_output" | sed -n '/default/{n;p}')
 
       if [[ "$mode_line" == "do-not-disturb" ]]; then
-        # Notifications are disabled, so we enable them
         makoctl mode -r do-not-disturb
         notify-send 'Notifications Enabled'
       else
-        # Notifications are enabled, so we disable them
         notify-send 'Notifications Disabled'
         sleep 2
         makoctl mode -a do-not-disturb
diff --git a/modules/home/wms/programs/wlpicker/default.nix b/modules/home/wms/programs/wlpicker/default.nix
index 65c3ecb..ecc23c0 100644
--- a/modules/home/wms/programs/wlpicker/default.nix
+++ b/modules/home/wms/programs/wlpicker/default.nix
@@ -9,7 +9,7 @@
       sleep 1
       
       # Store the hex color value using imagemagick
-      grim -g "$position" -t png - | convert - -format '%[pixel:p{0,0}]' txt:- | tail -n 1 | cut -d ' ' -f 4 | wl-copy -n
+      grim -g "$position" -t png - | magick - -format '%[pixel:p{0,0}]' txt:- | tail -n 1 | cut -d ' ' -f 4 | wl-copy -n
     '')
   ];
 }
diff --git a/modules/home/wms/programs/wpaperd/default.nix b/modules/home/wms/programs/wpaperd/default.nix
new file mode 100644
index 0000000..fb55007
--- /dev/null
+++ b/modules/home/wms/programs/wpaperd/default.nix
@@ -0,0 +1,11 @@
+{ config, ... }:
+{
+  programs.wpaperd = {
+    enable = true;
+    settings = {
+      any.path = "~/.assets/wallpapers/1.png";
+      "${config.displays.d2}".path = "~/.assets/wallpapers/2.png";
+      "${config.displays.d3}".path = "~/.assets/wallpapers/3.png";
+    };
+  };
+}
diff --git a/modules/home/wms/sway/autostart/default.nix b/modules/home/wms/sway/autostart/default.nix
index 03ac3ce..4d99ec5 100644
--- a/modules/home/wms/sway/autostart/default.nix
+++ b/modules/home/wms/sway/autostart/default.nix
@@ -10,7 +10,7 @@
       { command = "foot -a sound -T Sound pulsemixer"; }
 
       # Daemons and tray
-      { command = "hyprpaper"; }
+      { command = "wpaperd"; }
       { command = "wl-paste -t text --watch clipman store -P"; }
       { command = "wl-copy"; }
       { command = "mako"; }
diff --git a/modules/system/programs/desktops/default.nix b/modules/system/programs/desktops/default.nix
index 5cc0e36..0b9839d 100644
--- a/modules/system/programs/desktops/default.nix
+++ b/modules/system/programs/desktops/default.nix
@@ -4,7 +4,6 @@
     programs = {
       sway.enable = true;
       niri.enable = true;
-      hyprland.enable = true;
       xwayland.enable = lib.mkForce true;
     };
 
diff --git a/modules/system/services/general/displaymanager/default.nix b/modules/system/services/general/displaymanager/default.nix
index 5b74aeb..3b14992 100644
--- a/modules/system/services/general/displaymanager/default.nix
+++ b/modules/system/services/general/displaymanager/default.nix
@@ -20,11 +20,6 @@
         Name=Niri
         Exec=niri-session
       '';
-      "greetd/environments/hyprland.desktop".text = ''
-        [Desktop Entry]
-        Name=Hyprland
-        Exec=Hyprland
-      '';
     };
   };
 }