diff --git a/README.md b/README.md
index a9e4751..b878286 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,6 @@ My niri setup depends on the following additional packages:
 ```bash
 paru -S \
   swayidle \
-  swaybg \
   yazi \
   btop \
   bluetui \
@@ -115,7 +114,6 @@ By default CachyOS uses niri's auto-start feature for launching waybar and other
 systemctl --user add-wants niri.service plasma-polkit-agent.service
 systemctl --user add-wants niri.service mako.service
 systemctl --user add-wants niri.service waybar.service
-systemctl --user add-wants niri.service swaybg.service
 systemctl --user add-wants niri.service swayidle.service
 ```
 
diff --git a/dot_config/swaybg/background.jpg b/dot_config/niri/background.jpg
similarity index 100%
rename from dot_config/swaybg/background.jpg
rename to dot_config/niri/background.jpg
diff --git a/dot_config/niri/config.kdl b/dot_config/niri/config.kdl
index ef00172..ca6339c 100644
--- a/dot_config/niri/config.kdl
+++ b/dot_config/niri/config.kdl
@@ -41,7 +41,7 @@ binds {
     MOD+RETURN                          hotkey-overlay-title="Open Terminal: alacritty" { spawn-sh "alacritty"; }
     MOD+SPACE                           hotkey-overlay-title="Open App Launcher: wofi" { spawn-sh "wofi"; }
     MOD+B                               hotkey-overlay-title="Open Browser: brave" { spawn-sh "brave"; }
-    MOD+ALT+L                           hotkey-overlay-title="Lock Screen: swaylock" { spawn-sh "swaylock"; }
+    MOD+ALT+L                           hotkey-overlay-title="Lock Screen: loginctl" { spawn-sh "loginctl lock-session"; }
     
     // Please choose your own file manager
     MOD+E                             hotkey-overlay-title="File Manager: yazi" { spawn-sh "alacritty -e yazi"; }
@@ -165,6 +165,10 @@ binds {
 // ────────────── Startup Applications ──────────────
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Miscellaneous#spawn-sh-at-startup
 
+
+    spawn-sh-at-startup "swww-daemon" // Wallpaper daemon
+    spawn-sh-at-startup "swww img ~/.config/niri/background.jpg" // Set wallpaper
+
     prefer-no-csd // Disable program decorations
     screenshot-path null // Disable screenshot saving
 
diff --git a/dot_config/swaylock/config b/dot_config/swaylock/config
index 85084d3..adf3d24 100644
--- a/dot_config/swaylock/config
+++ b/dot_config/swaylock/config
@@ -1,7 +1,5 @@
-ignore-empty-password
 disable-caps-lock-text
 font=Cantarelle Regular
-#font-size=9
 
 screenshots
 effect-blur=7x5
diff --git a/dot_config/systemd/user/swaybg.service b/dot_config/systemd/user/swaybg.service
deleted file mode 100644
index 5d4989d..0000000
--- a/dot_config/systemd/user/swaybg.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-PartOf=graphical-session.target
-After=graphical-session.target
-Requisite=graphical-session.target
-
-[Service]
-ExecStart=/usr/bin/swaybg -m fill -i "%h/.config/swaybg/background.jpg"
-Restart=on-failure
diff --git a/dot_config/systemd/user/swayidle.service b/dot_config/systemd/user/swayidle.service
index 314e05b..7720142 100644
--- a/dot_config/systemd/user/swayidle.service
+++ b/dot_config/systemd/user/swayidle.service
@@ -4,5 +4,5 @@ After=graphical-session.target
 Requisite=graphical-session.target
 
 [Service]
-ExecStart=/usr/bin/swayidle -w timeout 601 'niri msg action power-off-monitors' timeout 600 'swaylock -f' before-sleep 'swaylock -f'
+ExecStart=/usr/bin/swayidle -w timeout 601 'niri msg action power-off-monitors' timeout 600 'loginctl lock-session' before-sleep 'loginctl lock-session' lock 'swaylock -f'
 Restart=on-failure
diff --git a/dot_config/wlogout/layout b/dot_config/wlogout/layout
index 293d0b1..8557c78 100644
--- a/dot_config/wlogout/layout
+++ b/dot_config/wlogout/layout
@@ -1,6 +1,6 @@
 {
     "label" : "lock",
-    "action" : "swaylock",
+    "action" : "loginctl lock-session",
     "text" : "Lock",
     "keybind" : "l"
 }