diff --git a/config/defaults.cfg b/config/defaults.cfg
index f4ebc4cf..3ee80eb3 100644
--- a/config/defaults.cfg
+++ b/config/defaults.cfg
@@ -10,10 +10,6 @@ autoreload 1	   // reload the guns automatically
 
 alias maxmusicvol 120 // set higher if you want (max 255)
 
-bind F6 showmip
-bind F5 toggleocull
-bind F11 toggleconsole
-
 // example WASD
 
 bind W forward
@@ -111,7 +107,9 @@ bind Z [ domodifier 2 ]
 bind X [ domodifier 3 ]
 
 alias universaldelta [
-  if $editing [ alias s "edit" ] [ alias s "game" ]
+  if $editing [ alias s "edit" ] [ 
+    if (alive) [ alias s "game" ] [ alias s "spect" ]
+  ]
   concatword delta _ $s _ $modifier
   s
 ]
@@ -128,6 +126,8 @@ 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"
 
diff --git a/config/keymap.cfg b/config/keymap.cfg
index 5a840956..5d40099e 100755
--- a/config/keymap.cfg
+++ b/config/keymap.cfg
@@ -2,9 +2,9 @@
 
 keymap -1 MOUSE1 "attack"
 keymap -3 MOUSE2 "jump"
-keymap -2 MOUSE3 "weapon"
-keymap -4 MOUSE4 "weapon 2 3 1"
-keymap -5 MOUSE5 "weapon 4 1 2"
+keymap -2 MOUSE3 ""
+keymap -4 MOUSE4 ""
+keymap -5 MOUSE5 ""
 keymap 8 BACKSPACE "dropflag"
 keymap 9 TAB "showscores"
 keymap 12 CLEAR ""
@@ -106,13 +106,13 @@ keymap 282 F1 "vote 1"
 keymap 283 F2 "vote 2"
 keymap 284 F3 ""
 keymap 285 F4 ""
-keymap 286 F5 ""
-keymap 287 F6 ""
+keymap 286 F5 "toggleocull"
+keymap 287 F6 "showmip"
 keymap 288 F7 ""
 keymap 289 F8 ""
 keymap 290 F9 ""
 keymap 291 F10 ""
-keymap 292 F11 ""
+keymap 292 F11 "toggleconsole"
 keymap 293 F12 "screenshot"
 keymap 294 F13 ""
 keymap 295 F14 ""