diff --git a/.config/X11/xmodmap b/.config/X11/xmodmap
index a57deb1..b46ae0f 100644
--- a/.config/X11/xmodmap
+++ b/.config/X11/xmodmap
@@ -1,16 +1,9 @@
-! Bind Caps_Lock on Escape key, Ctrl_R on Caps_Lock key and Escape on Control_R
-! The Caps_Lock key is also used for Escape through xcape
-remove Control = Control_R
+! Bind Caps_Lock to Escape
 remove Lock = Caps_Lock
 
-keycode 9 =
-keycode 9 = Caps_Lock
-
 keycode 66 =
-keycode 66 = Control_R
+keycode 66 = Escape
 
-keycode 105 =
-keycode 105 = Escape
-
-add Control = Control_R
-add Lock = Caps_Lock
+! Bind both Shift keys together to Caps_Lock
+keycode 50 = Shift_L Caps_Lock
+keycode 62 = Shift_R Caps_Lock
diff --git a/.config/i3/config b/.config/i3/config
index 9877a96..9d190b9 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -153,7 +153,6 @@ mode "resize" {
 
         # back to normal: Enter or Escape
         bindsym Return mode "default"
-        bindsym Caps_Lock mode "default"
         bindsym Escape mode "default"
         bindsym $mod+r mode "default"
 }
diff --git a/.xinitrc b/.xinitrc
index 18e2d4f..6c64b73 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -30,7 +30,7 @@ fi
 unset {sys,user}{resources,modmap,xinitrcd}
 
 # <right-CTRL> acts as <ESC> when pressed alone and shortly.
-xcape -t 250 -e 'Control_R=Escape'
+# xcape -t 250 -e 'Control_R=Escape'
 # Key repeat rate
 xset r rate 400 35