diff --git a/i3/config b/i3/config
index 0fa6fad..1173366 100644
--- a/i3/config
+++ b/i3/config
@@ -21,6 +21,7 @@ font xft:URWGothic-Book 11
 
 floating_modifier $mod
 
+# Default terminal
 bindsym $mod+Return exec --no-startup-id terminator 
 
 # Window kill command
@@ -33,7 +34,7 @@ bindsym $mod+d exec --no-startup-id rofi -show run
 bindsym $mod+z exec --no-startup-id morc_menu
 
 # Setup lockscreen
-bindsym $mod+p exec --no-startup-id i3lock-fancy -- scrot -z
+bindsym $mod+p exec --no-startup-id i3lock-fancy -p
 
 # Random wallpaper
 exec --no-startup-id $i3_path/wallpaper.sh&
@@ -198,6 +199,7 @@ for_window [class="(?i)virtualbox"] floating enable border normal
 for_window [class="Xfburn"] floating enable
 for_window [class="feh"] floating enable
 for_window [class="steamwebhelper"] floating enable
+for_window [class="terminator"] floating enable sticky enable
 
 # switch to workspace with urgent window automatically
 for_window [urgent=latest] focus
@@ -215,7 +217,7 @@ bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcu
 bindsym $mod+0 mode "$mode_system"
 set $mode_system (l)ock, (e)xit, switch_(u)ser, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutdown
 mode "$mode_system" {
-    #bindsym l exec --no-startup-id i3exit lock, mode "default"
+    bindsym l exec --no-startup-id i3lock-fancy -p
     bindsym s exec --no-startup-id i3exit suspend, mode "default"
     bindsym u exec --no-startup-id i3exit switch_user, mode "default"
     bindsym e exec --no-startup-id i3exit logout, mode "default"
@@ -264,7 +266,7 @@ exec_always --no-startup-id fix_xcursor
 exec --no-startup-id start_conky_mia
 
 # Timeout to activate screensaver/lockscreen
-exec --no-startup-id xautolock -time 30 -locker i3blur
+exec --no-startup-id xautolock -time 30 -locker i3lock-fancy -p
 
 # Composition Manager (Transparency)
 #exec --no-startup-id xcompmgr -c -f -n