diff --git a/sway/autostart b/sway/autostart
index e06d503ee..6ce7f1208 100644
--- a/sway/autostart
+++ b/sway/autostart
@@ -4,13 +4,17 @@
 # Background utilities
 ################################################################################
 
+# Custom SwayIdle script
+#exec swayidle -w timeout 500 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' &
+exec ${HOME}/scripts/sway/idle.sh start &
+
 # SSH Add - Should be started by profile instead
 # exec eval `ssh-agent -a ${SSH_AUTH_SOCK}`
 exec ssh-add &
 
 # Automatically restore last used output configuration
 # TODO: Need to add fail-safe to script in case the outputs are unavailable
-#exec $HOME/scripts/sway/displays.pl &
+exec $HOME/scripts/sway/displays.pl &
 
 # Enable automatic color temperature change
 exec ${HOME}/scripts/sway/gammastep.pl &
diff --git a/sway/bindings b/sway/bindings
index ee50093c1..86e46bd95 100644
--- a/sway/bindings
+++ b/sway/bindings
@@ -264,10 +264,10 @@ bindsym $mod+Shift+Backspace move container to workspace back_and_forth
 
 ### Function row
 
-# Escape: Blank screen
-bindsym $mod+Escape exec /usr/bin/sh -c 'sleep 1 ; /usr/bin/kill -USR1 swayidle'
-# Add Shift: Lock
-#bindsym $mod+Escape exec ~/.config/sway/swaylock.sh
+# Escape: Lock
+bindsym $mod+Escape swaylock -c 000000
+# Add Shift: Blank screen
+bindsym $mod+Shift+Escape exec /usr/bin/sh -c "sleep 1 ; /usr/bin/kill -USR1 $(pgrep swayidle)"
 
 # F1: Mute Audio
 bindsym $mod+F1 $HOME/scripts/audio/mute.sh
diff --git a/sway/config b/sway/config
index 059c2e7b6..7dd61e21a 100755
--- a/sway/config
+++ b/sway/config
@@ -89,9 +89,6 @@ include $HOME/.dotfiles/sway/bindings
 # Behaviour
 ################################################################################
 
-# Custom SwayIdle script
-exec swayidle -w timeout 500 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' &
-
 # Allow movement of floating windows with Left Click+Drag
 floating_modifier $mod