diff --git a/sway/config b/sway/config
index 4692084..e6f8489 100644
--- a/sway/config
+++ b/sway/config
@@ -131,14 +131,14 @@ bar {
 }
 
 # Shutdown, reboot, lock srceen
-set $mode_system System (b) blank, (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
+set $mode_system System (b) blank, (l) lock, (e) logout, (s) suspend, (Shift+h) hibernate, (Shift+r) reboot, (Shift+s) shutdown
 mode "$mode_system" {
     bindsym b exec 'sleep 1 && killall -s SIGUSR1 swayidle', mode "default"
-    bindsym l exec '$locker', mode "default"
+    bindsym l exec 'loginctl lock-session && sleep 1 && killall -s SIGUSR1 swayidle', mode "default"
     bindsym e exec swaymsg exit, mode "default"
-    bindsym s exec '$locker && systemctl suspend', mode "default"
-    bindsym h exec '$locker && systemctl hibernate', mode "default"
-    bindsym r exec systemctl reboot, mode "default"
+    bindsym s exec 'systemctl suspend', mode "default"
+    bindsym Shift+h exec 'systemctl hibernate', mode "default"
+    bindsym Shift+r exec systemctl reboot, mode "default"
     bindsym Shift+s exec systemctl poweroff -i, mode "default"
     bindsym Return mode "default"
     bindsym mod3+Return mode "default"
@@ -148,8 +148,7 @@ mode "$mode_system" {
 bindcode $mod+Shift+55 mode "$mode_system"
 
 # Systemd environment
-exec systemctl --user import-environment
-exec systemctl --user start sway-session.target
+exec "systemctl --user import-environment; systemctl --user start sway-session.target"
 
 # Device specific configuration
 include device