diff --git a/i3/config b/i3/config
index b016bd0..2be7a26 100644
--- a/i3/config
+++ b/i3/config
@@ -179,7 +179,7 @@ client.unfocused        #888888 #2b2b2b #ffffff #2b2b2b
 client.urgent           #900000 #900000 #ffffff #2b2b2b
 
 #exec --no-startup-id i3-msg 'exec xcompmgr -c -f -n &'
-exec --no-startup-id i3-msg 'exec xscreensaver -no-splash &'
+exec --no-startup-id i3-msg 'exec xautolock -time 5 -locker ~/Bin/lock.sh -detectsleep &'
 exec --no-startup-id i3-msg 'exec blueman-applet &'
 exec --no-startup-id i3-msg 'exec pasystray &'
 exec --no-startup-id i3-msg 'exec nm-applet &'
@@ -195,7 +195,7 @@ exec --no-startup-id feh --bg-fill `tail -n 1 .fluxbox/lastwallpaper|cut -d'|' -
 workspace_layout tabbed
 
 # Screen lock
-bindsym $mod+l exec "xscreensaver-command -lock"
+bindsym $mod+l exec "~/Bin/lock.sh"
 
 # Open term
 bindsym $mod+x exec urxvt