--- a/.xmodmaprc	Fri Jan 27 22:47:14 2017 +0200
+++ b/.xmodmaprc	Sat Jan 28 01:45:34 2017 +0200
@@ -6,13 +6,13 @@
 ! keycode 135 = Menu
 clear mod3
 clear mod4
-add mod3 = Hyper_L
-add mod4 = Super_L
+add mod3 = Super_L
+add mod4 = Hyper_L
 
 ! Delete CapsLock (map to Ctrl).
 clear Lock
 clear Control
-add Control = Control_L
-add Control = Control_R
-add Control = Caps_Lock
+keycode 66 = Caps_Lock
+keysym Caps_Lock = Control_L
+add Control = Control_L Control_R