diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 826002d..f17b9bc 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -13,7 +13,7 @@ set $mod Mod4
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
-font pango:Cantarell Bold 11
+font pango: DejaVu Sans 11
 
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
@@ -28,8 +28,11 @@ font pango:Cantarell Bold 11
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
+# start urxvt daemon
+exec urxvtd -q -f -o
+
 # start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
+bindsym $mod+Return exec urxvtc
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -93,14 +96,11 @@ bindsym $mod+space focus mode_toggle
 bindsym $mod+a focus parent
 
 # focus the child container
-#bindsym $mod+d focus child
-
-# Workspaces
-set $workspace2 "2: Firefox "
+bindsym $mod+x focus child
 
 # switch to workspace
 bindsym $mod+1 workspace 1
-bindsym $mod+2 workspace $workspace2
+bindsym $mod+2 workspace 2
 bindsym $mod+3 workspace 3
 bindsym $mod+4 workspace 4
 bindsym $mod+5 workspace 5
@@ -112,7 +112,7 @@ bindsym $mod+0 workspace 10
 
 # move focused container to workspace
 bindsym $mod+Shift+1 move container to workspace 1
-bindsym $mod+Shift+2 move container to workspace $workspace2
+bindsym $mod+Shift+2 move container to workspace 2
 bindsym $mod+Shift+3 move container to workspace 3
 bindsym $mod+Shift+4 move container to workspace 4
 bindsym $mod+Shift+5 move container to workspace 5
@@ -208,18 +208,35 @@ bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
 
-# Lock and power settings
-bindsym $mod+u exec --no-startup-id lock.sh
-bindsym $mod+i exec --no-startup-id lock.sh && sleep 2 && systemctl suspend
-bindsym $mod+p exec --no-startup-id systemctl poweroff
-bindsym $mod+z exec --no-startup-id systemctl reboot
+# power settings
+set $mode_power Power: [s]uspend [r]eboot [p]oweroff
+mode "$mode_power" {
+	# These bindings trigger as soon as you enter the power mode
+
+        # Pressing r will reboot
+        # Pressing p will poweroff
+        # Pressing s will leave power binding mode and suspend
+        bindsym r exec --no-startup-id systemctl reboot
+        bindsym p exec --no-startup-id systemctl poweroff
+        bindsym s exec --no-startup-id i3-msg mode "default" && systemctl suspend
+
+        # back to normal: Enter or Escape
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+
+bindsym $mod+p mode "$mode_power"
+
+# lock settings
+exec --no-startup-id light-locker --lock-on-suspend
+bindsym $mod+u exec --no-startup-id light-locker-command -l
 
 # Brightness
 bindsym XF86MonBrightnessDown exec --no-startup-id brightness decrease 50
 bindsym XF86MonBrightnessUp exec --no-startup-id brightness increase 50
 
 # Lock screen on inactivity
-exec --no-startup-id xautolock -locker lock.sh -time 5 -detectsleep
+exec --no-startup-id xautolock -locker 'light-locker-command -l' -time 5 -detectsleep
 
 # Wallpaper
 exec_always --no-startup-id nitrogen --restore