Index: ps/trunk/binaries/data/config/default.cfg
===================================================================
--- ps/trunk/binaries/data/config/default.cfg
+++ ps/trunk/binaries/data/config/default.cfg
@@ -187,7 +187,7 @@
 follow = "F"                                  ; Follow the first unit in the selection
 rallypointfocus = unused                      ; Focus the camera on the rally point of the selected building
 zoom.in = Plus, Equals, NumPlus               ; Zoom camera in (continuous control)
-zoom.out = Minus, NumMinus                    ; Zoom camera out (continuous control)
+zoom.out = Minus, Underscore, NumMinus        ; Zoom camera out (continuous control)
 zoom.wheel.in = WheelUp                       ; Zoom camera in (stepped control)
 zoom.wheel.out = WheelDown                    ; Zoom camera out (stepped control)
 rotate.up = "Ctrl+UpArrow", "Ctrl+W"          ; Rotate camera to look upwards
@@ -238,50 +238,50 @@
 toggle = "Ctrl+F11"          ; Enable/disable HTTP/GPU modes for new profiler
 
 [hotkey.selection]
-add = Shift                  ; Add units to selection
-militaryonly = Alt           ; Add only military units to the selection
-nonmilitaryonly = "Alt+Y"    ; Add only non-military units to the selection
-idleonly = "I"               ; Select only idle units
-woundedonly = "O"            ; Select only wounded units
-remove = Ctrl                ; Remove units from selection
-cancel = Esc                 ; Un-select all units and cancel building placement
-idleworker = Period          ; Select next idle worker
-idlewarrior = ForwardSlash   ; Select next idle warrior
-idleunit = BackSlash         ; Select next idle unit
-offscreen = Alt              ; Include offscreen units in selection
+add = Shift                             ; Add units to selection
+militaryonly = Alt                      ; Add only military units to the selection
+nonmilitaryonly = "Alt+Y"               ; Add only non-military units to the selection
+idleonly = "I"                          ; Select only idle units
+woundedonly = "O"                       ; Select only wounded units
+remove = Ctrl                           ; Remove units from selection
+cancel = Esc                            ; Un-select all units and cancel building placement
+idleworker = Period, NumPoint           ; Select next idle worker
+idlewarrior = ForwardSlash, NumDivide   ; Select next idle warrior
+idleunit = BackSlash                    ; Select next idle unit
+offscreen = Alt                         ; Include offscreen units in selection
 [hotkey.selection.group.add]
-0 = "Shift+0"
-1 = "Shift+1"
-2 = "Shift+2"
-3 = "Shift+3"
-4 = "Shift+4"
-5 = "Shift+5"
-6 = "Shift+6"
-7 = "Shift+7"
-8 = "Shift+8"
-9 = "Shift+9"
+0 = "Shift+0", "Shift+Num0"
+1 = "Shift+1", "Shift+Num1"
+2 = "Shift+2", "Shift+Num2"
+3 = "Shift+3", "Shift+Num3"
+4 = "Shift+4", "Shift+Num4"
+5 = "Shift+5", "Shift+Num5"
+6 = "Shift+6", "Shift+Num6"
+7 = "Shift+7", "Shift+Num7"
+8 = "Shift+8", "Shift+Num8"
+9 = "Shift+9", "Shift+Num9"
 [hotkey.selection.group.save]
-0 = "Ctrl+0"
-1 = "Ctrl+1"
-2 = "Ctrl+2"
-3 = "Ctrl+3"
-4 = "Ctrl+4"
-5 = "Ctrl+5"
-6 = "Ctrl+6"
-7 = "Ctrl+7"
-8 = "Ctrl+8"
-9 = "Ctrl+9"
+0 = "Ctrl+0", "Ctrl+Num0"
+1 = "Ctrl+1", "Ctrl+Num1"
+2 = "Ctrl+2", "Ctrl+Num2"
+3 = "Ctrl+3", "Ctrl+Num3"
+4 = "Ctrl+4", "Ctrl+Num4"
+5 = "Ctrl+5", "Ctrl+Num5"
+6 = "Ctrl+6", "Ctrl+Num6"
+7 = "Ctrl+7", "Ctrl+Num7"
+8 = "Ctrl+8", "Ctrl+Num8"
+9 = "Ctrl+9", "Ctrl+Num9"
 [hotkey.selection.group.select]
-0 = 0
-1 = 1
-2 = 2
-3 = 3
-4 = 4
-5 = 5
-6 = 6
-7 = 7
-8 = 8
-9 = 9
+0 = 0, Num0
+1 = 1, Num1
+2 = 2, Num2
+3 = 3, Num3
+4 = 4, Num4
+5 = 5, Num5
+6 = 6, Num6
+7 = 7, Num7
+8 = 8, Num8
+9 = 9, Num9
 
 [hotkey.session]
 kill = Delete                ; Destroy selected units