--- a/.xmodmaprc	Thu Jan 26 14:55:51 2017 +0200
+++ b/.xmodmaprc	Fri Jan 27 22:47:14 2017 +0200
@@ -1,20 +1,18 @@
 ! To load this config run:
 !   $ xmodmap .xmodmaprc
 
-! Win key.
+keycode 133 = Super_L
+keycode 134 = Hyper_L
+! keycode 135 = Menu
 clear mod3
 clear mod4
-
-keycode 133 = Super_L
-! keycode 134 = Multi_key
-! keycode 134 = Super_R
-keycode 134 = Hyper_R
-add mod3 = Super_L
-add mod4 = Hyper_R
+add mod3 = Hyper_L
+add mod4 = Super_L
 
 ! Delete CapsLock (map to Ctrl).
-remove Lock = Caps_Lock
-keysym Caps_Lock = Control_L
+clear Lock
+clear Control
 add Control = Control_L
+add Control = Control_R
 add Control = Caps_Lock