diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg
index 50f8bbd9fa..da9252085d 100644
--- a/binaries/data/config/default.cfg
+++ b/binaries/data/config/default.cfg
@@ -230,7 +230,7 @@ paste = "Ctrl+V"                      ; Paste from clipboard
 cut = "Ctrl+X"                        ; Cut selected text and copy to the clipboard
 
 ; > CONSOLE SETTINGS
-console.toggle = BackQuote, F9        ; Open/close console
+console.toggle = F9        ; Open/close console
 
 ; > OVERLAY KEYS
 fps.toggle = "Alt+F"                  ; Toggle frame counter
@@ -251,7 +251,7 @@ quickload = "Shift+F8"
 reset = "R"                                   ; Reset camera rotation to default.
 follow = ""                                   ; Follow the first unit in the selection
 rallypointfocus = ""                          ; Focus the camera on the rally point of the selected building
-lastattackfocus = "Space"                     ; Focus the camera on the last notified attack
+lastattackfocus = BackQuote                   ; Focus the camera on the last notified attack
 togglebirdseyeview = "Shift+Tab"              ; Toggle bird's eye view
 zoom.in = Plus, NumPlus                       ; Zoom camera in (continuous control)
 zoom.out = Minus, NumMinus                    ; Zoom camera out (continuous control)
@@ -268,12 +268,12 @@ left = A, LeftArrow                           ; Scroll or rotate left
 right = D, RightArrow                         ; Scroll or rotate right
 up = W, UpArrow                               ; Scroll or rotate up/forwards
 down = S, DownArrow                           ; Scroll or rotate down/backwards
-scroll.speed.increase = "Ctrl+Shift+S"        ; Increase scroll speed
-scroll.speed.decrease = "Ctrl+Alt+S"          ; Decrease scroll speed
-rotate.speed.increase = "Ctrl+Shift+R"        ; Increase rotation speed
-rotate.speed.decrease = "Ctrl+Alt+R"          ; Decrease rotation speed
-zoom.speed.increase = "Ctrl+Shift+Z"          ; Increase zoom speed
-zoom.speed.decrease = "Ctrl+Alt+Z"            ; Decrease zoom speed
+scroll.speed.increase = "Ctrl+Plus"           ; Increase scroll speed
+scroll.speed.decrease = "Ctrl+Minus"          ; Decrease scroll speed
+rotate.speed.increase = "Alt+Plus"            ; Increase rotation speed
+rotate.speed.decrease = "Alt+Minus"           ; Decrease rotation speed
+zoom.speed.increase = "Shift+Plus"            ; Increase zoom speed
+zoom.speed.decrease = "Shift+Minus"           ; Decrease zoom speed
 
 [hotkey.camera.jump]
 1 = F5                       ; Jump to position N
@@ -318,6 +318,12 @@ idlewarrior = Slash, NumDivide          ; Select next idle warrior
 idleunit = BackSlash                    ; Select next idle unit
 offscreen = Alt                         ; Include offscreen units in selection
 singleselection = "" ; Modifier to select units individually, opposed to per formation.
+; Select all units of specific class
+[hotkey.selection.unit]
+cavalry = Alt+E
+infantry = Alt+X
+civilian = Alt+A
+hero = Alt+Z
 [hotkey.selection.group.add]
 1 = "Shift+1", "Shift+Num1"
 2 = "Shift+2", "Shift+Num2"
@@ -351,6 +357,27 @@ singleselection = "" ; Modifier to select units individually, opposed to per for
 8 = 8, Num8
 9 = 9, Num9
 10 = 0, Num0
+[hotkey.selection.structures]
+barracks = "Ctrl+X"
+stable = "Ctrl+Z"
+civil_centre = "Ctrl+C"
+
+[hotkey.structures.place]
+house = "Space+H"
+storehouse = "Space+S"
+farmstead = "Space+G"
+field = "Space+F"
+corral = "Space+J"
+barracks = "Space+B"
+stable = "Space+V"
+temple = "Space+T"
+arsenal = "Space+A"
+fortress = "Space+F"
+forge = "Space+K"
+sentry_tower = "Space+Q"
+defense_tower = "Space+W"
+market = "Space+M"
+dock = "Space+D"
 
 [hotkey.gamesetup]
 mapbrowser.open = "M"
@@ -392,14 +419,14 @@ flareactivate = ""           ; Modifier to activate the mode to send a flare to
 calltoarms = ""              ; Modifier to call the selected units to the arms.
 focusfire = "F"              ; Modifier to control exclusively a building's arrows if it can attack
 ; Overlays
-showstatusbars = ""          ; Toggle display of status bars
-devcommands.toggle = "Alt+D" ; Toggle developer commands panel
-highlightguarding = PageDown ; Toggle highlight of guarding units
-highlightguarded = PageUp    ; Toggle highlight of guarded units
-diplomacycolors = "Alt+X"    ; Toggle diplomacy colors
-toggleattackrange = "Alt+C"  ; Toggle display of attack range overlays of selected defensive structures
-toggleaurasrange = "Alt+V"   ; Toggle display of aura range overlays of selected units and structures
-togglehealrange = "Alt+B"    ; Toggle display of heal range overlays of selected units
+showstatusbars = ""             ; Toggle display of status bars
+devcommands.toggle = "Shift+F9" ; Toggle developer commands panel
+highlightguarding = PageDown    ; Toggle highlight of guarding units
+highlightguarded = PageUp       ; Toggle highlight of guarded units
+diplomacycolors = "Alt+V"       ; Toggle diplomacy colors
+toggleattackrange = ""			; Toggle display of attack range overlays of selected defensive structures
+toggleaurasrange = ""			; Toggle display of aura range overlays of selected units and structures
+togglehealrange = ""			; Toggle display of heal range overlays of selected units
 
 [hotkey.session.gui]
 toggle = "Alt+G"             ; Toggle visibility of session GUI