diff --git a/config/scripts.cfg b/config/scripts.cfg
index cf05cbae..a58c3077 100644
--- a/config/scripts.cfg
+++ b/config/scripts.cfg
@@ -1,5 +1,8 @@
 // CubeScript placed in this file is automatically executed on each startup.
 
+const MODES "tdm coop dm surv ts ctf pf btdm bdm lss osok tosok bosok htf tktf ktf tpf tlss bpf blss bts btosok"
+const MODEALIASES "map lms vip sendmap"
+
 // "editent" command:
 // This command collects all the attributes of the nearest entity, and then
 // prompts that into a handy command that allows you to edit that entities
@@ -68,8 +71,8 @@ const run [ exec (concatword config/ $arg1 .cfg) ]
 
 // Auto-completions
 const mapcomplete [complete $arg1 "packages/maps/official packages/maps" cgz]
-const mapcommands "map tdm coop dm surv lms ts ctf pf lss osok tosok htf vip tktf ktf sendmap"
-loop i (listlen $mapcommands) [ mapcomplete (at $mapcommands $i) ]
+//const mapcommands "map tdm coop dm surv lms ts ctf pf lss osok tosok htf vip tktf ktf sendmap"
+loop i (listlen (concat $MODES $MODEALIASES)) [ mapcomplete (at (concat $MODES $MODEALIASES) $i) ]
 complete demo "demos" dmo
 const entcomplete [ listcomplete $arg1 "light playerstart pistol ammobox grenades health armour akimbo mapmodel ladder ctf-flag sound clip plclip helmet" ]
 entcomplete newent; entcomplete clearents; entcomplete closestenttype
@@ -105,7 +108,6 @@ const changeteam [ if (< (curteam) 4) [ team (at "RVSF CLA RVSF-SPECT CLA-SPECT"
 
 const WEAPONS "KNIFE PISTOL CARBINE SHOTGUN SMG SNIPER AR CPISTOL GRENADES AKIMBO"
 const NUM_WEAPONS (listlen $WEAPONS)
-const MODES "tdm coop dm surv ts ctf pf btdm bdm lss osok tosok bosok htf tktf ktf tpf tlss bpf blss bts btosok"
 const NUM_MODES (listlen $MODES)
 const PUNCTUATION "QUOTES BRACKETS PARENTHESIS _$_ QUOTE PERCENT"
 const MAX_BOT_MATCH_LENGTH 60