diff --git a/symlinks/config/sway/conf.d/20_lockconfig b/symlinks/config/sway/conf.d/20_lockconfig
index a8b1b31..79ae1b4 100644
--- a/symlinks/config/sway/conf.d/20_lockconfig
+++ b/symlinks/config/sway/conf.d/20_lockconfig
@@ -1,11 +1,10 @@
 # Define locker script
-set $locker 'swaylock'
-bindsym $alt+L exec $locker
+bindsym $alt+L exec 'swaylock'
 
 # IDLE CONFIG
 exec swayidle -w \
-         timeout 300 $locker \
-         timeout 330 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+         timeout 300 'swaylock' \
+         timeout 330 'swaymsg "output * dpms off"' \
+				 resume 'swaymsg "output * dpms on"' \
          timeout 600 'systemctl suspend' \
-         before-sleep $locker \
-         before-sleep 'playerctl pause'
+         before-sleep 'swaylock; playerctl pause'
diff --git a/symlinks/config/sway/conf.d/71_system_menu b/symlinks/config/sway/conf.d/71_system_menu
index 9d3fe95..adab552 100644
--- a/symlinks/config/sway/conf.d/71_system_menu
+++ b/symlinks/config/sway/conf.d/71_system_menu
@@ -3,10 +3,10 @@ set $mode_system "System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) r
 
 # System mode - system menu
 mode $mode_system {
-    bindsym l exec --no-startup-id $locker, mode "default"
+    bindsym l exec --no-startup-id swaylock, mode "default"
     bindsym e exec --no-startup-id swaymsg exit, mode "default"
-    bindsym s exec --no-startup-id $locker && systemctl suspend, mode "default"
-    bindsym h exec --no-startup-id $locker && systemctl hibernate, mode "default"
+    bindsym s exec --no-startup-id swaylock && systemctl suspend, mode "default"
+    bindsym h exec --no-startup-id swaylock && systemctl hibernate, mode "default"
     bindsym r exec --no-startup-id systemctl reboot, mode "default"
     bindsym Shift+s exec --no-startup-id systemctl poweroff -i, mode "default"