diff --git a/.config/i3/config.base b/.config/i3/config.base
index c152bd1..54c659e 100644
--- a/.config/i3/config.base
+++ b/.config/i3/config.base
@@ -88,8 +88,8 @@ bindsym $mod+Shift+8 move container to workspace 8
 bindsym $mod+Shift+9 move container to workspace 9
 bindsym $mod+Shift+0 move container to workspace 10
 
-# reload the configuration file
-bindsym $mod+Shift+c reload
+# rebuild and reload the configuration file
+bindsym $mod+Shift+c exec "j4-make-config -r -a $HOSTNAME.config archlinux"
 # 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)
@@ -126,7 +126,8 @@ bindsym $mod+Shift+b border toggle
 bindsym $mod+m move workspace to output left
 
 # Ctrl+Alt+L to lock the screen
-bindsym Mod1+Control+l exec i3lock -b -d -c 000000 -e -f 
+# Locker is set in ~/.xinitrc
+bindsym Mod1+Control+l exec "xautolock -locknow"
 
 # Start all windows with no border. Still able to toggle through them with $mod+Shift+B
 new_window none