diff --git a/dotfiles/bashrc b/dotfiles/bashrc
index 2efbbb2..2ddcd4d 100755
--- a/dotfiles/bashrc
+++ b/dotfiles/bashrc
@@ -15,6 +15,7 @@ alias dotdrop="~/dotfiles/dotdrop.sh --cfg=~/dotfiles/config.yaml"
 alias ..="cd .."
 alias ll="ls -l"
 alias la="ls -la"
+alias rm="rm -i"
 
 # Source global definitions
 if [ -f /etc/bashrc ]; then
diff --git a/dotfiles/config/i3/config b/dotfiles/config/i3/config
index 2e60a63..23a0f51 100644
--- a/dotfiles/config/i3/config
+++ b/dotfiles/config/i3/config
@@ -180,14 +180,10 @@ bar {
         status_command i3status
 }
 
-mode "lock-screen" {
-	bindsym $mod+b exec "xlock -mode blank -startCmd /opt/genua/bin/isweg - endCmd /opt/genua/bin/isda"
-	bindsym $mod+d exec "xlock -mode matrix"
-	bindsym Return mode "default"
-	bindsym Escape mode "default"
-	bindsym $mod+Shift+d mode "default"
-}
+bindsym $mod+Shift+b exec "xlock -mode blank -startCmd /opt/genua/bin/isweg -endCmd /opt/genua/bin/isda"
+bindsym $mod+Shift+d exec "xlock -mode matrix"
 
-	bindsym $mod+Shift+d mode "lock-screen"
+bindsym Ctrl+Shift+1 exec --no-startup-id setxkbmap us
+bindsym Ctrl+Shift+2 exec --no-startup-id setxkbmap de
 
-exec "setxkbmap -layout us"
+new_window 1pixel