diff --git a/home/Xmodmap b/home/Xmodmap
index 6ddda7b..666b414 100644
--- a/home/Xmodmap
+++ b/home/Xmodmap
@@ -1,6 +1,2 @@
-! Use win key as compose
-keycode 133 = Multi_key Multi_key
-
-! Turn caps lock into escape
-clear lock
-keycode 66 = Escape Caps_Lock
+remove control = Control_R
+keysym Control_R = dead_greek
diff --git a/home/xinitrc b/home/xinitrc
index ffa171e..12addde 100644
--- a/home/xinitrc
+++ b/home/xinitrc
@@ -1,5 +1,5 @@
 xset s off -dpms
-xmodmap ~/.Xmodmap
+customkeys
 xdg-mime default mupdf.desktop application/pdf
 xdg-mime default feh.desktop image/png
 xdg-mime default feh.desktop image/jpg
diff --git a/local/bin/customkeys b/local/bin/customkeys
new file mode 100755
index 0000000..1851cfe
--- /dev/null
+++ b/local/bin/customkeys
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Compose key: windows key
+setxkbmap -option compose:lwin
+
+# Caps turned into escape
+setxkbmap -option caps:escape_shifted_capslock
+
+# dead_greek as control right
+xmodmap ~/.Xmodmap