diff --git a/config/scripts.cfg b/config/scripts.cfg
index e94e2f32..99705a62 100644
--- a/config/scripts.cfg
+++ b/config/scripts.cfg
@@ -107,8 +107,12 @@ const spectate [ if $connected [ suicide; sleep 500 [ team SPECTATOR ] ] ]
 const NUM_WEAPONS 10
 const NUM_MODES 22
 
-loop d $NUM_WEAPONS [ const (at "KNIFE PISTOL CARBINE SHOTGUN SMG SNIPER AR CPISTOL GRENADES AKIMBO" $d) $d ]
-loop r $NUM_MODES [ const (at "tdm coop dm surv ts ctf pf btdm bdm lss osok tosok bosok htf tktf ktf tpf tlss bpf blss bts btosok" $r) (addpunct (concat votemap $r (addpunct arg1 3)) 2) ]
+const WEAPONS "KNIFE PISTOL CARBINE SHOTGUN SMG SNIPER AR CPISTOL GRENADES AKIMBO"
+const MODES "tdm coop dm surv ts ctf pf btdm bdm lss osok tosok bosok htf tktf ktf tpf tlss bpf blss bts btosok"
+
+loop d $NUM_WEAPONS [ const (at $WEAPONS $d) $d ]
+loop r $NUM_MODES [ const (at $MODES $r) (addpunct (concat votemap $r (addpunct arg1 3)) 2) ]
+loop f $NUM_MODES [ const (toupper (at $MODES $f)) $f ]
 
 // Mode/map-setting aliases.
 const votemap [ mode $arg1; map $arg2 ]