diff --git a/.config/sway/.gitignore b/.config/sway/.gitignore
index ef034e6..402c2fa 100644
--- a/.config/sway/.gitignore
+++ b/.config/sway/.gitignore
@@ -1,2 +1,3 @@
 config.d/idle.conf
-scripts/lock.sh
+config.d/background.conf
+config.d/lock.conf
diff --git a/.config/sway/config b/.config/sway/config
index f99af3e..7705224 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -153,7 +153,7 @@ bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'Do you wish to logout?' -B 'Yes' 'i3-msg exit'"
+bindsym $mod+Shift+e exec "swaynag -t warning -m 'Do you wish to logout?' -B 'Yes' 'swaymsg exit'"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {
@@ -185,11 +185,11 @@ mode "resize" {
 
 ### Custom
 #bindsym Ctrl+Mod1+l exec --no-startup-id loginctl lock-session
-bindsym Ctrl+Mod1+l exec --no-startup-id ~/.config/sway/scripts/lock.sh
+bindsym Ctrl+Mod1+l exec --no-startup-id $lock_command
 #bindsym Ctrl+Mod1+l exec --no-startup-id betterlockscreen -l -t "${USER}@${HOSTNAME}" --off 10
 
 # Background
-output "*" bg ~/Pictures/orion-nebula-5120x2880-hubble-space-telescope-nasa-hd-5k-1933.jpg fill
+output "*" bg $background fill
 
 # Move workspace over to neighboring monitors
 bindsym $mod+Ctrl+Left move workspace to output left