diff --git a/config/defaults.cfg b/config/defaults.cfg
index 3ee80eb3..8b78691c 100644
--- a/config/defaults.cfg
+++ b/config/defaults.cfg
@@ -74,7 +74,7 @@ alias zoom [
 ]
 
 //bind MOUSE2 [ zoom 1; onrelease [ zoom 0 ] ]
-bind MOUSE2 [ altaction ]
+bind MOUSE2 altaction
 
 // alternative zoom toggle
 //alias ztoggle 0
@@ -102,9 +102,9 @@ alias tosok [ votemap 11 $arg1 ]
 alias modifier 0
 alias domodifier [ alias modifier $arg1; onrelease [ alias modifier 0 ] ]
 
-bind Q [ domodifier 1 ]
-bind Z [ domodifier 2 ]
-bind X [ domodifier 3 ]
+bind Q "domodifier 1"
+bind Z "domodifier 2"
+bind X "domodifier 3"
 
 alias universaldelta [
   if $editing [ alias s "edit" ] [ 
@@ -114,8 +114,8 @@ alias universaldelta [
   s
 ]
 
-bind MOUSE4 [ universaldelta  1 ]
-bind MOUSE5 [ universaldelta -1 ]
+bind MOUSE4 "universaldelta  1"
+bind MOUSE5 "universaldelta -1"
 
 alias delta_edit_0 [ editheight $flrceil $arg1 ]
 alias delta_edit_1 [ if $flrceil [ vdelta $arg1 ] [ vdelta (- 0 $arg1) ] ]
@@ -123,14 +123,9 @@ alias delta_edit_2 [ edittex $flrceil $arg1 ]
 alias delta_edit_3 [ edittex (+ $flrceil 1) $arg1 ]
 alias delta_edit_4 [ equalize $flrceil ]
 alias delta_edit_5 [ entproperty 0 $arg1 ]  // and the others
-
 alias delta_game_0 [ if (= $arg1 1) [ shiftweapon 1 ] [ shiftweapon -1 ] ]
-
 alias delta_spect_0 [ followplayer $arg1 ]
 
-bind KP_MINUS "conskip 1"
-bind KP_PLUS "conskip -1000"
-
 // alternative weapon switching, no more 1-2-3-4 /wheel cycling no finger ever leaving WASD
 //uncomment lines (remove the //) below to activate
 
@@ -139,7 +134,7 @@ bind KP_PLUS "conskip -1000"
 //bind lalt "melee"
 
 alias timeremain [ echo time remaining: ($minutesremaining) ]
-
+alias toggleshowmap [ showmap 1; onrelease [ showmap 0 ] ]
 
 music ac.ogg
 musicvol 0
@@ -150,3 +145,4 @@ alias start_intermission [
     fade 0
     sleep 10000 [ fade 1 ]
 ]
+
diff --git a/config/keymap.cfg b/config/keymap.cfg
index 5d40099e..1a8cf3e2 100755
--- a/config/keymap.cfg
+++ b/config/keymap.cfg
@@ -73,7 +73,7 @@ keymap 117 U "undo"
 keymap 118 V "paste"
 keymap 119 W ""
 keymap 120 X "delent"
-keymap 121 Y ""
+keymap 121 Y "saycommand %"
 keymap 122 Z ""
 keymap 127 DELETE "edittex 0 -1"
 keymap 256 KP0 "weapon 4 1"
@@ -125,7 +125,7 @@ keymap 304 LSHIFT "crouch"
 keymap 305 RCTRL "jump"
 keymap 306 LCTRL "jump"
 keymap 307 RALT ""
-keymap 308 LALT [ showmap 1; onrelease [ showmap 0 ] ]
+keymap 308 LALT "toggleshowmap"
 keymap 309 RMETA ""
 keymap 310 LMETA ""
 keymap 311 LSUPER ""
diff --git a/config/menus.cfg b/config/menus.cfg
index e18c6794..9c6a2fa1 100755
--- a/config/menus.cfg
+++ b/config/menus.cfg
@@ -14,113 +14,6 @@ menuitem "About"			        "showmenu about"
 menuitem "Quit"						"quit"
 
 
-newmenu "quick setup"
-
-menuitemtextinput "nickname: " "unnamed" [
-    if (= $arg1 0) [ alias new_name $arg2 ] []
-]
-menuitemtextinput "screen width: " "$scr_w" [
-    if (= $arg1 0) [ alias new_scr_w $arg2 ] []
-]
-menuitemtextinput "screen height: " "$scr_h" [
-    if (= $arg1 0) [ alias new_scr_h $arg2 ] []
-]
-menuitemslider "mouse sensitivity: "2 100 "($sensitivity)" 2 "" [
-    if (= $arg1 0) [] [ alias new_sensitivity $arg3 ]
-]
-menuitemslider "graphics quality: " 1 4 "(getgfxq; $gfxq)" 1 "low medium good awesome" [
-    if (= $arg1 0) [] [ alias new_gfx_quality $arg3 ]
-]
-menuitemslider "sound quality: " 1 3 "(getsoundq; $soundq)" 1 "low medium good" [
-    if (= $arg1 0) [] [ alias new_sound_quality $arg3 ]
-]
-
-alias getgfxq [
-    if (= $minlod 200) [ alias gfxq 4 ] [
-        if (= $minlod 100) [ alias gfxq 3 ] [
-            if (= $minlod 60) [ alias gfxq 2 ] [ alias gfxq 1 ]
-        ]
-    ]
-]
-
-alias getsoundq [
-    if (= $soundchans 64) [ alias soundq 3 ] [
-        if (= $soundbufferlen 1024) [ alias soundq 2 ] [ alias soundq 1 ]
-    ]
-]
-
-menuitem "OK" [
-    name $new_name
-    sensitivity $new_sensitivity
-
-    scr_w $new_scr_w
-    scr_h $new_scr_h    
-
-    if (= $new_gfx_quality 4) [ // awesome gfx quality
-        minlod 200
-        fpsrange 100 1000
-        watersubdiv 2
-        dynlight 16
-        waterrefract 1
-        dynshadow 40
-        lighterror 1
-        fsaa 16
-    ] [
-        if (= $new_gfx_quality 3) [ // high
-            minlod 100
-            fpsrange 60 60
-            watersubdiv 2
-            dynlight 16
-            waterrefract 1
-            dynshadow 40
-            lighterror 4
-            fsaa 4
-        ] [
-            if (= $new_gfx_quality 2) [ // medium
-                minlod 60
-                fpsrange 30 40
-                watersubdiv 4
-                dynlight 16
-                waterrefract 1
-                dynshadow 40
-                lighterror 4
-                fsaa 0
-            ] [                 // poor
-                minlod 25
-                fpsrange 20 25
-                watersubdiv 16
-                dynlight 0
-                waterrefract 0
-                dynshadow 0
-                lighterror 10
-                fsaa 0
-            ]
-        ]
-    ]
-        
-    if (= $new_sound_quality 3) [ // high sound
-        soundchans 64
-        maxsoundsatonce 15
-        soundbufferlen 1024
-    ] [
-        if (= $new_sound_quality 2) [ // medium
-            soundchans 32
-            maxsoundsatonce 5
-            soundbufferlen 1024
-        ] [                         // low
-            soundchans 32
-            maxsoundsatonce 5
-            soundbufferlen 2048 // causes sound lag while reducing cpu load
-        ]
-    ]
-    
-    showmenu restart
-]
-
-newmenu restart
-menuitem "You need to restart AssaultCube" "quit"
-
-
 // menumdl path anim rotation-speed{0..100} scale{0..100}
 // chmenumdl menuname newpath
 
@@ -545,6 +438,8 @@ menuitem "V-19 Combat Shotgun"			"nextprimary 2;echo V-19 Combat Shotgun chosen"
 
 newmenu options
 
+menuitem "quick setup.."                                            [showmenu "quick setup"]
+menuitem "keyboard/mouse controls"                                  "showmenu controls"
 menuitem "tweak minlod.. (higher = less popup, possibly lower fps)" "showmenu minlod"
 menuitem "tweak fpsrange.. (higher = possibly more popup)"          "showmenu fpsrange"
 menuitem "tweak water subdivision"                                  "showmenu watersubdiv"
@@ -554,6 +449,140 @@ menuitem "tweak dynamic player shadows"                             [showmenu "p
 menuitem "tweak gamma"                                              "showmenu gamma"
 
 
+
+newmenu "quick setup"
+
+menuitemtextinput "nickname: " "unnamed" [
+    if (= $arg1 0) [ alias new_name $arg2 ] []
+]
+menuitemtextinput "screen width: " "$scr_w" [
+    if (= $arg1 0) [ alias new_scr_w $arg2 ] []
+]
+menuitemtextinput "screen height: " "$scr_h" [
+    if (= $arg1 0) [ alias new_scr_h $arg2 ] []
+]
+menuitemslider "mouse sensitivity: "2 100 "($sensitivity)" 2 "" [
+    if (= $arg1 0) [] [ alias new_sensitivity $arg3 ]
+]
+menuitemslider "graphics quality: " 1 4 "(getgfxq; $gfxq)" 1 "low medium good awesome" [
+    if (= $arg1 0) [] [ alias new_gfx_quality $arg3 ]
+]
+menuitemslider "sound quality: " 1 3 "(getsoundq; $soundq)" 1 "low medium good" [
+    if (= $arg1 0) [] [ alias new_sound_quality $arg3 ]
+]
+
+alias getgfxq [
+    if (= $minlod 200) [ alias gfxq 4 ] [
+        if (= $minlod 100) [ alias gfxq 3 ] [
+            if (= $minlod 60) [ alias gfxq 2 ] [ alias gfxq 1 ]
+        ]
+    ]
+]
+
+alias getsoundq [
+    if (= $soundchans 64) [ alias soundq 3 ] [
+        if (= $soundbufferlen 1024) [ alias soundq 2 ] [ alias soundq 1 ]
+    ]
+]
+
+menuitem "OK" [
+    name $new_name
+    sensitivity $new_sensitivity
+
+    scr_w $new_scr_w
+    scr_h $new_scr_h    
+
+    if (= $new_gfx_quality 4) [ // awesome gfx quality
+        minlod 200
+        fpsrange 100 1000
+        watersubdiv 2
+        dynlight 16
+        waterrefract 1
+        dynshadow 40
+        lighterror 1
+        fsaa 16
+    ] [
+        if (= $new_gfx_quality 3) [ // high
+            minlod 100
+            fpsrange 60 60
+            watersubdiv 2
+            dynlight 16
+            waterrefract 1
+            dynshadow 40
+            lighterror 4
+            fsaa 4
+        ] [
+            if (= $new_gfx_quality 2) [ // medium
+                minlod 60
+                fpsrange 30 40
+                watersubdiv 4
+                dynlight 16
+                waterrefract 1
+                dynshadow 40
+                lighterror 4
+                fsaa 0
+            ] [                 // poor
+                minlod 25
+                fpsrange 20 25
+                watersubdiv 16
+                dynlight 0
+                waterrefract 0
+                dynshadow 0
+                lighterror 10
+                fsaa 0
+            ]
+        ]
+    ]
+        
+    if (= $new_sound_quality 3) [ // high sound
+        soundchans 64
+        maxsoundsatonce 15
+        soundbufferlen 1024
+    ] [
+        if (= $new_sound_quality 2) [ // medium
+            soundchans 32
+            maxsoundsatonce 5
+            soundbufferlen 1024
+        ] [                         // low
+            soundchans 32
+            maxsoundsatonce 5
+            soundbufferlen 2048 // causes sound lag while reducing cpu load
+        ]
+    ]
+    
+    showmenu restart
+]
+
+newmenu restart
+menuitem "You need to restart AssaultCube" "quit"
+
+
+newmenu controls
+
+menuitem "Select an action and press ENTER to set a new key-binding"
+menuitem ""
+menuitemkeyinput "forward: "        forward
+menuitemkeyinput "left: "           left
+menuitemkeyinput "backward: "       backward
+menuitemkeyinput "right: "          right
+menuitemkeyinput "attack: "         attack
+menuitemkeyinput "special action: " altaction
+menuitemkeyinput "jump: "           jump
+menuitemkeyinput "crouch: "         crouch
+menuitemkeyinput "reload: "         reload
+menuitemkeyinput "weapon menu: "    "showmenu weapons"
+menuitemkeyinput "next weapon: "     "universaldelta  1"
+menuitemkeyinput "previous weapon: " "universaldelta -1"
+menuitemkeyinput "show scores: "    showscores
+menuitemkeyinput "chat: "           saycommand
+menuitemkeyinput "team chat: "      "saycommand %"
+menuitemkeyinput "commandline: "    "saycommand /"
+menuitemkeyinput "console output: " toggleconsole
+menuitemkeyinput "screenshot: "     screenshot
+menuitemkeyinput "map overview: "   toggleshowmap
+menuitemkeyinput "drop CTF flag: "  dropflag
+
+
 newmenu gamma
 
 menuitem "gamma 50"