diff --git a/forge-gui/res/tokenscripts/g_3_3_dinosaur.txt b/forge-gui/res/tokenscripts/g_3_3_dinosaur.txt
index ce4a505df56..cab882eb3f0 100644
--- a/forge-gui/res/tokenscripts/g_3_3_dinosaur.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_dinosaur.txt
@@ -1,6 +1,6 @@
 Name:Dinosaur Token
 ManaCost:no cost
-Types:Creature Dinosaur
 Colors:green
+Types:Creature Dinosaur
 PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_3_3_dinosaur_trample.txt b/forge-gui/res/tokenscripts/g_3_3_dinosaur_trample.txt
index 1eb3fdfcd8e..ff0d9971726 100644
--- a/forge-gui/res/tokenscripts/g_3_3_dinosaur_trample.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_dinosaur_trample.txt
@@ -1,7 +1,7 @@
 Name:Dinosaur Token
 ManaCost:no cost
-Types:Creature Dinosaur
 Colors:green
+Types:Creature Dinosaur
 PT:3/3
 K:Trample
 Oracle:Trample (This creature can deal excess combat damage to the player or planeswalker it's attacking.)
diff --git a/forge-gui/res/tokenscripts/g_3_3_e_centaur.txt b/forge-gui/res/tokenscripts/g_3_3_e_centaur.txt
index c1a65823166..f4fc5db6d87 100644
--- a/forge-gui/res/tokenscripts/g_3_3_e_centaur.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_e_centaur.txt
@@ -1,6 +1,6 @@
 Name:Centaur Token
 ManaCost:no cost
-Types:Enchantment Creature Centaur
 Colors:green
+Types:Enchantment Creature Centaur
 PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_3_3_hippo.txt b/forge-gui/res/tokenscripts/g_3_3_hippo.txt
index cfade5d9e48..6c0d0c4b9ff 100644
--- a/forge-gui/res/tokenscripts/g_3_3_hippo.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_hippo.txt
@@ -1,6 +1,6 @@
 Name:Hippo Token
 ManaCost:no cost
-Types:Creature Hippo
 Colors:green
+Types:Creature Hippo
 PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_3_3_insect.txt b/forge-gui/res/tokenscripts/g_3_3_insect.txt
index 17f34350496..2a6313d4a4a 100644
--- a/forge-gui/res/tokenscripts/g_3_3_insect.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_insect.txt
@@ -1,6 +1,6 @@
 Name:Insect Token
 ManaCost:no cost
-Types:Creature Insect
 Colors:green
+Types:Creature Insect
 PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_3_3_mutant_deathtouch.txt b/forge-gui/res/tokenscripts/g_3_3_mutant_deathtouch.txt
index 1381b52a327..b934f88f93c 100644
--- a/forge-gui/res/tokenscripts/g_3_3_mutant_deathtouch.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_mutant_deathtouch.txt
@@ -1,7 +1,7 @@
 Name:Mutant Token
 ManaCost:no cost
-Types:Creature Mutant
 Colors:green
+Types:Creature Mutant
 PT:3/3
 K:Deathtouch
 Oracle:Deathtouch
diff --git a/forge-gui/res/tokenscripts/g_3_3_ooze.txt b/forge-gui/res/tokenscripts/g_3_3_ooze.txt
index 95f7c5c0cb0..33a64d75ba7 100644
--- a/forge-gui/res/tokenscripts/g_3_3_ooze.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_ooze.txt
@@ -1,6 +1,6 @@
 Name:Ooze Token
 ManaCost:no cost
-Types:Creature Ooze
 Colors:green
+Types:Creature Ooze
 PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_3_3_raccoon.txt b/forge-gui/res/tokenscripts/g_3_3_raccoon.txt
index c7a968b9bea..6567f705319 100644
--- a/forge-gui/res/tokenscripts/g_3_3_raccoon.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_raccoon.txt
@@ -1,6 +1,6 @@
 Name:Raccoon Token
 ManaCost:no cost
+Colors:green
 Types:Creature Raccoon
 PT:3/3
-Colors:green
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_3_3_tyranid_warrior_trample.txt b/forge-gui/res/tokenscripts/g_3_3_tyranid_warrior_trample.txt
index 9b40dd714ce..bebe0429a34 100644
--- a/forge-gui/res/tokenscripts/g_3_3_tyranid_warrior_trample.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_tyranid_warrior_trample.txt
@@ -1,7 +1,7 @@
 Name:Tyranid Warrior Token
 ManaCost:no cost
-Types:Creature Tyranid Warrior
 Colors:green
+Types:Creature Tyranid Warrior
 PT:3/3
 K:Trample
 Oracle:Trample
diff --git a/forge-gui/res/tokenscripts/g_5_4_snake.txt b/forge-gui/res/tokenscripts/g_5_4_snake.txt
index 11905a44255..d7c49d4dc37 100644
--- a/forge-gui/res/tokenscripts/g_5_4_snake.txt
+++ b/forge-gui/res/tokenscripts/g_5_4_snake.txt
@@ -1,6 +1,6 @@
 Name:Snake Token
 ManaCost:no cost
-Types:Creature Snake
 Colors:green
+Types:Creature Snake
 PT:5/4
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_x_x_elephant_resurgence.txt b/forge-gui/res/tokenscripts/g_x_x_elephant_resurgence.txt
index f540fc3a56b..2b8c1a970e7 100644
--- a/forge-gui/res/tokenscripts/g_x_x_elephant_resurgence.txt
+++ b/forge-gui/res/tokenscripts/g_x_x_elephant_resurgence.txt
@@ -1,7 +1,7 @@
 Name:Elephant Token
 ManaCost:no cost
-Types:Creature Elephant
 Colors:green
+Types:Creature Elephant
 PT:*/*
 S:Mode$ Continuous | SetPower$ ResurgenceX | SetToughness$ ResurgenceX | EffectZone$ Battlefield | CharacteristicDefining$ True | Description$ CARDNAME's power and toughness are each equal to the number of creature cards in its controller's graveyard.
 SVar:ResurgenceX:Count$TypeInYourYard.Creature
diff --git a/forge-gui/res/tokenscripts/g_x_x_ooze.txt b/forge-gui/res/tokenscripts/g_x_x_ooze.txt
index d567d747c7c..c70f4bdd86c 100644
--- a/forge-gui/res/tokenscripts/g_x_x_ooze.txt
+++ b/forge-gui/res/tokenscripts/g_x_x_ooze.txt
@@ -1,6 +1,6 @@
 Name:Ooze Token
 ManaCost:no cost
-Types:Creature Ooze
 Colors:green
+Types:Creature Ooze
 PT:*/*
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_x_x_ooze_gutter_grime.txt b/forge-gui/res/tokenscripts/g_x_x_ooze_gutter_grime.txt
index dcd54e755aa..9f9fcafb04f 100644
--- a/forge-gui/res/tokenscripts/g_x_x_ooze_gutter_grime.txt
+++ b/forge-gui/res/tokenscripts/g_x_x_ooze_gutter_grime.txt
@@ -1,7 +1,7 @@
 Name:Ooze Token
 ManaCost:no cost
-Types:Creature Ooze
 Colors:green
+Types:Creature Ooze
 PT:*/*
 S:Mode$ Continuous | SetPower$ GutterGrimePT | SetToughness$ GutterGrimePT | CharacteristicDefining$ True | Description$ This creature's power and toughness are each equal to the number of slime counters on Gutter Grime.
 SVar:GutterGrimePT:Remembered$CardCounters.SLIME
diff --git a/forge-gui/res/tokenscripts/g_x_x_phyrexian_horror.txt b/forge-gui/res/tokenscripts/g_x_x_phyrexian_horror.txt
index 6ff223f2f15..0797f397411 100644
--- a/forge-gui/res/tokenscripts/g_x_x_phyrexian_horror.txt
+++ b/forge-gui/res/tokenscripts/g_x_x_phyrexian_horror.txt
@@ -1,6 +1,6 @@
 Name:Phyrexian Horror Token
 ManaCost:no cost
-Types:Creature Phyrexian Horror
 Colors:green
+Types:Creature Phyrexian Horror
 PT:*/*
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_x_x_saproling_burst.txt b/forge-gui/res/tokenscripts/g_x_x_saproling_burst.txt
index 381aac92e86..9bd2314b8de 100644
--- a/forge-gui/res/tokenscripts/g_x_x_saproling_burst.txt
+++ b/forge-gui/res/tokenscripts/g_x_x_saproling_burst.txt
@@ -1,7 +1,7 @@
 Name:Saproling Token
 ManaCost:no cost
-Types:Creature Saproling
 Colors:green
+Types:Creature Saproling
 PT:*/*
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ TokenX | SetToughness$ TokenX | Description$ This creature's power and toughness are each equal to the number of fade counters on Saproling Burst.
 SVar:TokenX:Remembered$CardCounters.FADE
diff --git a/forge-gui/res/tokenscripts/g_x_x_spirit.txt b/forge-gui/res/tokenscripts/g_x_x_spirit.txt
index 6c816fa9f7c..ab4e41f1932 100644
--- a/forge-gui/res/tokenscripts/g_x_x_spirit.txt
+++ b/forge-gui/res/tokenscripts/g_x_x_spirit.txt
@@ -1,6 +1,6 @@
 Name:Spirit Token
 ManaCost:no cost
-Types:Creature Spirit
 Colors:green
+Types:Creature Spirit
 PT:*/*
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_x_x_treefolk.txt b/forge-gui/res/tokenscripts/g_x_x_treefolk.txt
index 1a991e94fd1..5dc11a512f1 100644
--- a/forge-gui/res/tokenscripts/g_x_x_treefolk.txt
+++ b/forge-gui/res/tokenscripts/g_x_x_treefolk.txt
@@ -1,6 +1,6 @@
 Name:Treefolk Token
 ManaCost:no cost
-Types:Creature Treefolk
 Colors:green
+Types:Creature Treefolk
 PT:*/*
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_x_x_treefolk_reach_total_lands.txt b/forge-gui/res/tokenscripts/g_x_x_treefolk_reach_total_lands.txt
index 46e60946d33..05288bc3730 100644
--- a/forge-gui/res/tokenscripts/g_x_x_treefolk_reach_total_lands.txt
+++ b/forge-gui/res/tokenscripts/g_x_x_treefolk_reach_total_lands.txt
@@ -1,7 +1,7 @@
 Name:Treefolk Token
 ManaCost:no cost
-Types:Creature Treefolk
 Colors:green
+Types:Creature Treefolk
 PT:*/*
 K:Reach
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ This creature's power and toughness are each equal to the number of lands you control.
diff --git a/forge-gui/res/tokenscripts/g_x_x_treefolk_warrior_total_forests.txt b/forge-gui/res/tokenscripts/g_x_x_treefolk_warrior_total_forests.txt
index 136c3e3133a..fedc56b6ecb 100644
--- a/forge-gui/res/tokenscripts/g_x_x_treefolk_warrior_total_forests.txt
+++ b/forge-gui/res/tokenscripts/g_x_x_treefolk_warrior_total_forests.txt
@@ -1,7 +1,7 @@
 Name:Treefolk Warrior Token
 ManaCost:no cost
-Types:Creature Treefolk Warrior
 Colors:green
+Types:Creature Treefolk Warrior
 PT:*/*
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of Forests you control.
 SVar:X:Count$Valid Forest.YouCtrl
diff --git a/forge-gui/res/tokenscripts/g_x_y_ooze_types_graveyard.txt b/forge-gui/res/tokenscripts/g_x_y_ooze_types_graveyard.txt
index dc6c64395f2..402c11a77af 100644
--- a/forge-gui/res/tokenscripts/g_x_y_ooze_types_graveyard.txt
+++ b/forge-gui/res/tokenscripts/g_x_y_ooze_types_graveyard.txt
@@ -1,7 +1,7 @@
 Name:Ooze Token
 ManaCost:no cost
-Types:Creature Ooze
 Colors:green
+Types:Creature Ooze
 PT:*/*+1
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ Y | Description$ This creature's power is equal to the number of card types among cards in your graveyard and its toughness is equal to that number plus 1.
 SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
diff --git a/forge-gui/res/tokenscripts/gw_1_1_alien_insect_flying.txt b/forge-gui/res/tokenscripts/gw_1_1_alien_insect_flying.txt
index 6e45edd962d..013cc7053f3 100644
--- a/forge-gui/res/tokenscripts/gw_1_1_alien_insect_flying.txt
+++ b/forge-gui/res/tokenscripts/gw_1_1_alien_insect_flying.txt
@@ -1,7 +1,7 @@
 Name:Alien Insect Token
 ManaCost:no cost
-Types:Creature Alien Insect
 Colors:green,white
+Types:Creature Alien Insect
 PT:1/1
 K:Flying
 Oracle:Flying
diff --git a/forge-gui/res/tokenscripts/gw_1_1_citizen.txt b/forge-gui/res/tokenscripts/gw_1_1_citizen.txt
index 760a60b4b40..a0efd66b731 100644
--- a/forge-gui/res/tokenscripts/gw_1_1_citizen.txt
+++ b/forge-gui/res/tokenscripts/gw_1_1_citizen.txt
@@ -1,6 +1,6 @@
 Name:Citizen Token
 ManaCost:no cost
-Types:Creature Citizen
 Colors:green,white
+Types:Creature Citizen
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/gw_1_1_elf_warrior.txt b/forge-gui/res/tokenscripts/gw_1_1_elf_warrior.txt
index 2d9ba3947d1..9bf41b80a44 100644
--- a/forge-gui/res/tokenscripts/gw_1_1_elf_warrior.txt
+++ b/forge-gui/res/tokenscripts/gw_1_1_elf_warrior.txt
@@ -1,6 +1,6 @@
 Name:Elf Warrior Token
 ManaCost:no cost
-Types:Creature Elf Warrior
 Colors:green,white
+Types:Creature Elf Warrior
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/gw_1_1_human_soldier_training.txt b/forge-gui/res/tokenscripts/gw_1_1_human_soldier_training.txt
index 834b540f625..1ef5bb4516f 100644
--- a/forge-gui/res/tokenscripts/gw_1_1_human_soldier_training.txt
+++ b/forge-gui/res/tokenscripts/gw_1_1_human_soldier_training.txt
@@ -1,7 +1,7 @@
 Name:Human Soldier Token
 ManaCost:no cost
-Types:Creature Human Soldier
 Colors:white,green
+Types:Creature Human Soldier
 PT:1/1
 K:Training
 Oracle:Training (Whenever this creature attacks with another creature with greater power, put a +1/+1 counter on this creature.)
diff --git a/forge-gui/res/tokenscripts/gw_2_2_elf_knight_vigilance.txt b/forge-gui/res/tokenscripts/gw_2_2_elf_knight_vigilance.txt
index 20ae2aa4c68..d1fe5a483d9 100644
--- a/forge-gui/res/tokenscripts/gw_2_2_elf_knight_vigilance.txt
+++ b/forge-gui/res/tokenscripts/gw_2_2_elf_knight_vigilance.txt
@@ -1,7 +1,7 @@
 Name:Elf Knight Token
 ManaCost:no cost
-Types:Creature Elf Knight
 Colors:white,green
+Types:Creature Elf Knight
 PT:2/2
 K:Vigilance
 Oracle:Vigilance
diff --git a/forge-gui/res/tokenscripts/gw_3_3_phyrexian_hydra_lifelink.txt b/forge-gui/res/tokenscripts/gw_3_3_phyrexian_hydra_lifelink.txt
index d0af145bbe3..9ec9766d67d 100644
--- a/forge-gui/res/tokenscripts/gw_3_3_phyrexian_hydra_lifelink.txt
+++ b/forge-gui/res/tokenscripts/gw_3_3_phyrexian_hydra_lifelink.txt
@@ -1,7 +1,7 @@
 Name:Phyrexian Hydra Token
 ManaCost:no cost
-Types:Creature Phyrexian Hydra
 Colors:white,green
+Types:Creature Phyrexian Hydra
 PT:3/3
 K:Lifelink
 Oracle:Lifelink
diff --git a/forge-gui/res/tokenscripts/gw_3_3_phyrexian_hydra_reach.txt b/forge-gui/res/tokenscripts/gw_3_3_phyrexian_hydra_reach.txt
index 842e44f3272..9fdc86ba6e3 100644
--- a/forge-gui/res/tokenscripts/gw_3_3_phyrexian_hydra_reach.txt
+++ b/forge-gui/res/tokenscripts/gw_3_3_phyrexian_hydra_reach.txt
@@ -1,7 +1,7 @@
 Name:Phyrexian Hydra Token
 ManaCost:no cost
-Types:Creature Phyrexian Hydra
 Colors:white,green
+Types:Creature Phyrexian Hydra
 PT:3/3
 K:Reach
 Oracle:Reach
diff --git a/forge-gui/res/tokenscripts/gw_8_8_elemental_vigilance.txt b/forge-gui/res/tokenscripts/gw_8_8_elemental_vigilance.txt
index baac697c3c7..11474555499 100644
--- a/forge-gui/res/tokenscripts/gw_8_8_elemental_vigilance.txt
+++ b/forge-gui/res/tokenscripts/gw_8_8_elemental_vigilance.txt
@@ -1,7 +1,7 @@
 Name:Elemental Token
 ManaCost:no cost
-Types:Creature Elemental
 Colors:green,white
+Types:Creature Elemental
 PT:8/8
 K:Vigilance
 Oracle:Vigilance
diff --git a/forge-gui/res/tokenscripts/gw_x_x_elemental_total_creatures.txt b/forge-gui/res/tokenscripts/gw_x_x_elemental_total_creatures.txt
index 87f6bec3e66..b35c1a8cf3d 100644
--- a/forge-gui/res/tokenscripts/gw_x_x_elemental_total_creatures.txt
+++ b/forge-gui/res/tokenscripts/gw_x_x_elemental_total_creatures.txt
@@ -1,7 +1,7 @@
 Name:Elemental Token
 ManaCost:no cost
-Types:Creature Elemental
 Colors:green,white
+Types:Creature Elemental
 PT:*/*
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ TokenX | SetToughness$ TokenX | Description$ CARDNAME's power and toughness are each equal to the number of creatures you control.
 SVar:TokenX:Count$Valid Creature.YouCtrl
diff --git a/forge-gui/res/tokenscripts/hornet.txt b/forge-gui/res/tokenscripts/hornet.txt
index deb8b87414e..5da7fbe8ffa 100644
--- a/forge-gui/res/tokenscripts/hornet.txt
+++ b/forge-gui/res/tokenscripts/hornet.txt
@@ -1,7 +1,7 @@
 Name:Hornet
 ManaCost:no cost
-Types:Artifact Creature Insect
 Colors:colorless
+Types:Artifact Creature Insect
 PT:1/1
 K:Flying
 K:Haste
diff --git a/forge-gui/res/tokenscripts/icingdeath_frost_tongue.txt b/forge-gui/res/tokenscripts/icingdeath_frost_tongue.txt
index 5bf6a257a0e..5ead85e3c8a 100644
--- a/forge-gui/res/tokenscripts/icingdeath_frost_tongue.txt
+++ b/forge-gui/res/tokenscripts/icingdeath_frost_tongue.txt
@@ -1,7 +1,7 @@
 Name:Icingdeath, Frost Tongue
 ManaCost:no cost
-Types:Legendary Artifact Equipment
 Colors:white
+Types:Legendary Artifact Equipment
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 0 | Description$ Equipped creature gets +2/+0.
 T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigTap | TriggerDescription$ Whenever equipped creature attacks, tap target creature defending player controls.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.ControlledBy TriggeredDefendingPlayer | TgtPrompt$ Select target creature defending player controls
diff --git a/forge-gui/res/tokenscripts/icy_manalith.txt b/forge-gui/res/tokenscripts/icy_manalith.txt
index ba8c74c14ae..ee955d78115 100644
--- a/forge-gui/res/tokenscripts/icy_manalith.txt
+++ b/forge-gui/res/tokenscripts/icy_manalith.txt
@@ -1,6 +1,6 @@
 Name:Icy Manalith
 ManaCost:no cost
-Types:Snow Artifact
 Colors:colorless
+Types:Snow Artifact
 A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 Oracle:{T}: Add one mana of any color.
diff --git a/forge-gui/res/tokenscripts/kaldra.txt b/forge-gui/res/tokenscripts/kaldra.txt
index 6f42ea096fc..da9fd1025dd 100644
--- a/forge-gui/res/tokenscripts/kaldra.txt
+++ b/forge-gui/res/tokenscripts/kaldra.txt
@@ -1,5 +1,5 @@
 Name:Kaldra
 ManaCost:no cost
-PT:4/4
 Types:Legendary Creature Avatar
+PT:4/4
 Oracle:
diff --git a/forge-gui/res/tokenscripts/kelp.txt b/forge-gui/res/tokenscripts/kelp.txt
index d38afd59de4..aded6542c4b 100644
--- a/forge-gui/res/tokenscripts/kelp.txt
+++ b/forge-gui/res/tokenscripts/kelp.txt
@@ -1,7 +1,7 @@
 Name:Kelp
 ManaCost:no cost
-Types:Creature Plant Wall
 Colors:blue
+Types:Creature Plant Wall
 PT:0/1
 K:Defender
 Oracle:Defender
diff --git a/forge-gui/res/tokenscripts/kobolds_of_kher_keep.txt b/forge-gui/res/tokenscripts/kobolds_of_kher_keep.txt
index 97d8c451dfe..a04f26c6deb 100644
--- a/forge-gui/res/tokenscripts/kobolds_of_kher_keep.txt
+++ b/forge-gui/res/tokenscripts/kobolds_of_kher_keep.txt
@@ -1,6 +1,6 @@
 Name:Kobolds of Kher Keep
 ManaCost:no cost
 Colors:red
-PT:0/1
 Types:Creature Kobold
+PT:0/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/komas_coil.txt b/forge-gui/res/tokenscripts/komas_coil.txt
index 7818f2bac65..1e6ad39b06b 100644
--- a/forge-gui/res/tokenscripts/komas_coil.txt
+++ b/forge-gui/res/tokenscripts/komas_coil.txt
@@ -1,6 +1,6 @@
 Name:Koma's Coil
 ManaCost:no cost
+Colors:blue
 Types:Creature Serpent
 PT:3/3
-Colors:blue
 Oracle:
diff --git a/forge-gui/res/tokenscripts/lightning_rager.txt b/forge-gui/res/tokenscripts/lightning_rager.txt
index 97e39a89e1d..d26f050a905 100644
--- a/forge-gui/res/tokenscripts/lightning_rager.txt
+++ b/forge-gui/res/tokenscripts/lightning_rager.txt
@@ -1,7 +1,7 @@
 Name:Lightning Rager
 ManaCost:no cost
-Types:Creature Elemental
 Colors:red
+Types:Creature Elemental
 PT:5/1
 K:Trample
 K:Haste
diff --git a/forge-gui/res/tokenscripts/llanowar_elves.txt b/forge-gui/res/tokenscripts/llanowar_elves.txt
index c83ba004d7c..509be0bf2c9 100644
--- a/forge-gui/res/tokenscripts/llanowar_elves.txt
+++ b/forge-gui/res/tokenscripts/llanowar_elves.txt
@@ -1,7 +1,7 @@
 Name:Llanowar Elves
 ManaCost:no cost
-Types:Creature Elf Druid
 Colors:green
+Types:Creature Elf Druid
 PT:1/1
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 Oracle:{T}: Add {G}.
diff --git a/forge-gui/res/tokenscripts/mowu.txt b/forge-gui/res/tokenscripts/mowu.txt
index 9019ae80f57..d00ffe29360 100644
--- a/forge-gui/res/tokenscripts/mowu.txt
+++ b/forge-gui/res/tokenscripts/mowu.txt
@@ -1,6 +1,6 @@
 Name:Mowu
 ManaCost:no cost
-Types:Legendary Creature Dog
 Colors:green
+Types:Legendary Creature Dog
 PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/ornithopter.txt b/forge-gui/res/tokenscripts/ornithopter.txt
index 4229458063e..fb235f67651 100644
--- a/forge-gui/res/tokenscripts/ornithopter.txt
+++ b/forge-gui/res/tokenscripts/ornithopter.txt
@@ -1,6 +1,6 @@
 Name:Ornithopter
 ManaCost:no cost
-PT:0/2
 Types:Artifact Creature Thopter
+PT:0/2
 K:Flying
 Oracle:Flying
diff --git a/forge-gui/res/tokenscripts/plaguebearer_of_nurgle.txt b/forge-gui/res/tokenscripts/plaguebearer_of_nurgle.txt
index e24d9ffdc70..dcb2dccb4b9 100644
--- a/forge-gui/res/tokenscripts/plaguebearer_of_nurgle.txt
+++ b/forge-gui/res/tokenscripts/plaguebearer_of_nurgle.txt
@@ -1,6 +1,6 @@
 Name:Plaguebearer of Nurgle
 ManaCost:no cost
-Types:Creature Demon
 Colors:black
+Types:Creature Demon
 PT:1/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_0_0_a_gremlin.txt b/forge-gui/res/tokenscripts/r_0_0_a_gremlin.txt
index 6326ed2862f..61451fd224a 100644
--- a/forge-gui/res/tokenscripts/r_0_0_a_gremlin.txt
+++ b/forge-gui/res/tokenscripts/r_0_0_a_gremlin.txt
@@ -1,6 +1,6 @@
 Name:Gremlin Token
 ManaCost:no cost
-PT:0/0
 Colors:red
 Types:Artifact Creature Gremlin
+PT:0/0
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_0_1_elemental_rekindling_phoenix.txt b/forge-gui/res/tokenscripts/r_0_1_elemental_rekindling_phoenix.txt
index f0a3941c29e..77c46ad772e 100644
--- a/forge-gui/res/tokenscripts/r_0_1_elemental_rekindling_phoenix.txt
+++ b/forge-gui/res/tokenscripts/r_0_1_elemental_rekindling_phoenix.txt
@@ -1,7 +1,7 @@
 Name:Elemental Token
 ManaCost:no cost
-Types:Creature Elemental
 Colors:red
+Types:Creature Elemental
 PT:0/1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ RekindlingPhoenixTrigSac | TriggerDescription$ At the beginning of your upkeep, sacrifice this creature and return target card named Rekindling Phoenix from your graveyard to the battlefield. It gains haste until end of turn.
 SVar:RekindlingPhoenixTrigSac:DB$ Sacrifice | SacValid$ Self | SubAbility$ RekindlingPhoenixDBChangeZone
diff --git a/forge-gui/res/tokenscripts/r_0_2_dragon_egg_defender_hatches_dragon.txt b/forge-gui/res/tokenscripts/r_0_2_dragon_egg_defender_hatches_dragon.txt
index 28668a2f50a..d7826dfa0ec 100644
--- a/forge-gui/res/tokenscripts/r_0_2_dragon_egg_defender_hatches_dragon.txt
+++ b/forge-gui/res/tokenscripts/r_0_2_dragon_egg_defender_hatches_dragon.txt
@@ -1,7 +1,7 @@
 Name:Dragon Egg Token
 ManaCost:no cost
-Types:Creature Dragon Egg
 Colors:red
+Types:Creature Dragon Egg
 PT:0/2
 K:Defender
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a 2/2 red Dragon creature token with flying. It has "{R}: This creature gets +1/+0 until end of turn".
diff --git a/forge-gui/res/tokenscripts/r_1_1_balloon_flying.txt b/forge-gui/res/tokenscripts/r_1_1_balloon_flying.txt
index 6e93f167640..85471aa3f84 100644
--- a/forge-gui/res/tokenscripts/r_1_1_balloon_flying.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_balloon_flying.txt
@@ -1,7 +1,7 @@
 Name:Balloon Token
 ManaCost:no cost
-Types:Creature Balloon
 Colors:red
+Types:Creature Balloon
 PT:1/1
 K:Flying
 Oracle:Flying
diff --git a/forge-gui/res/tokenscripts/r_1_1_brainiac.txt b/forge-gui/res/tokenscripts/r_1_1_brainiac.txt
index 73f10edb691..050ef4b669e 100644
--- a/forge-gui/res/tokenscripts/r_1_1_brainiac.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_brainiac.txt
@@ -1,6 +1,6 @@
 Name:Brainiac Token
 ManaCost:no cost
-Types:Creature Brainiac
 Colors:red
+Types:Creature Brainiac
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_1_1_devil_burn.txt b/forge-gui/res/tokenscripts/r_1_1_devil_burn.txt
index 57c66513beb..66ec642786d 100644
--- a/forge-gui/res/tokenscripts/r_1_1_devil_burn.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_devil_burn.txt
@@ -1,7 +1,7 @@
 Name:Devil Token
 ManaCost:no cost
-Types:Creature Devil
 Colors:red
+Types:Creature Devil
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ DevilTrigDamage | TriggerDescription$ When this creature dies, it deals 1 damage to any target.
 SVar:DevilTrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 1
diff --git a/forge-gui/res/tokenscripts/r_1_1_dinosaur_haste.txt b/forge-gui/res/tokenscripts/r_1_1_dinosaur_haste.txt
index d5174806bd3..c8b01210ca2 100644
--- a/forge-gui/res/tokenscripts/r_1_1_dinosaur_haste.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_dinosaur_haste.txt
@@ -1,7 +1,7 @@
 Name:Dinosaur Token
 ManaCost:no cost
-Types:Creature Dinosaur
 Colors:red
+Types:Creature Dinosaur
 PT:1/1
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_1_1_dwarf.txt b/forge-gui/res/tokenscripts/r_1_1_dwarf.txt
index f28138dbcf3..c44f60340f9 100644
--- a/forge-gui/res/tokenscripts/r_1_1_dwarf.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_dwarf.txt
@@ -1,6 +1,6 @@
 Name:Dwarf Token
 ManaCost:no cost
-Types:Creature Dwarf
 Colors:red
+Types:Creature Dwarf
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_1_1_elemental.txt b/forge-gui/res/tokenscripts/r_1_1_elemental.txt
index 8509bdaf955..7e6b76410f1 100644
--- a/forge-gui/res/tokenscripts/r_1_1_elemental.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_elemental.txt
@@ -1,6 +1,6 @@
 Name:Elemental Token
 ManaCost:no cost
-Types:Creature Elemental
 Colors:red
+Types:Creature Elemental
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_1_1_elemental_cat_haste.txt b/forge-gui/res/tokenscripts/r_1_1_elemental_cat_haste.txt
index bbb4bb8f3fb..ead22ba71f2 100644
--- a/forge-gui/res/tokenscripts/r_1_1_elemental_cat_haste.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_elemental_cat_haste.txt
@@ -1,7 +1,7 @@
 Name:Elemental Cat Token
 ManaCost:no cost
-Types:Creature Elemental Cat
 Colors:red
+Types:Creature Elemental Cat
 PT:1/1
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_1_1_elemental_haste.txt b/forge-gui/res/tokenscripts/r_1_1_elemental_haste.txt
index 37ff90c6f46..8182283f3c1 100644
--- a/forge-gui/res/tokenscripts/r_1_1_elemental_haste.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_elemental_haste.txt
@@ -1,7 +1,7 @@
 Name:Elemental Token
 ManaCost:no cost
-Types:Creature Elemental
 Colors:red
+Types:Creature Elemental
 PT:1/1
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_1_1_elemental_ping.txt b/forge-gui/res/tokenscripts/r_1_1_elemental_ping.txt
index b04d2e8834a..288d7e287a8 100644
--- a/forge-gui/res/tokenscripts/r_1_1_elemental_ping.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_elemental_ping.txt
@@ -1,7 +1,7 @@
 Name:Elemental Token
 ManaCost:no cost
-Types:Creature Elemental
 Colors:red
+Types:Creature Elemental
 PT:1/1
 T:Mode$ Taps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever this creature becomes tapped, it deals 1 damage to target player.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Player | NumDmg$ 1
diff --git a/forge-gui/res/tokenscripts/r_1_1_employee.txt b/forge-gui/res/tokenscripts/r_1_1_employee.txt
index e30f62b55ce..7855f987d66 100644
--- a/forge-gui/res/tokenscripts/r_1_1_employee.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_employee.txt
@@ -1,6 +1,6 @@
 Name:Employee Token
 ManaCost:no cost
-Types:Creature Employee
 Colors:red
+Types:Creature Employee
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_1_1_goblin.txt b/forge-gui/res/tokenscripts/r_1_1_goblin.txt
index 5d50b83b61f..4d7a3c1ceca 100644
--- a/forge-gui/res/tokenscripts/r_1_1_goblin.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_goblin.txt
@@ -1,6 +1,6 @@
 Name:Goblin Token
 ManaCost:no cost
-Types:Creature Goblin
 Colors:red
+Types:Creature Goblin
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_1_1_goblin_all_attack.txt b/forge-gui/res/tokenscripts/r_1_1_goblin_all_attack.txt
index 20a6a38efc7..e009d5eb6e7 100644
--- a/forge-gui/res/tokenscripts/r_1_1_goblin_all_attack.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_goblin_all_attack.txt
@@ -1,7 +1,7 @@
 Name:Goblin Token
 ManaCost:no cost
-Types:Creature Goblin
 Colors:red
+Types:Creature Goblin
 PT:1/1
 S:Mode$ MustAttack | ValidCreature$ Creature.YouCtrl | Description$ Creatures you control attack each combat if able.
 Oracle:Creatures you control attack each combat if able.
diff --git a/forge-gui/res/tokenscripts/r_1_1_goblin_haste.txt b/forge-gui/res/tokenscripts/r_1_1_goblin_haste.txt
index 6b92f749fb0..761d69188c6 100644
--- a/forge-gui/res/tokenscripts/r_1_1_goblin_haste.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_goblin_haste.txt
@@ -1,7 +1,7 @@
 Name:Goblin Token
 ManaCost:no cost
-Types:Creature Goblin
 Colors:red
+Types:Creature Goblin
 PT:1/1
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_1_1_goblin_noblock.txt b/forge-gui/res/tokenscripts/r_1_1_goblin_noblock.txt
index 2bb0fca11dc..e93dce5fc26 100644
--- a/forge-gui/res/tokenscripts/r_1_1_goblin_noblock.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_goblin_noblock.txt
@@ -1,7 +1,7 @@
 Name:Goblin Token
 ManaCost:no cost
-Types:Creature Goblin
 Colors:red
+Types:Creature Goblin
 PT:1/1
 S:Mode$ CantBlockBy | ValidBlocker$ Creature.Self | Description$ CARDNAME can't block.
 Oracle:This creature can't block.
diff --git a/forge-gui/res/tokenscripts/r_1_1_goblin_scout_mountainwalk.txt b/forge-gui/res/tokenscripts/r_1_1_goblin_scout_mountainwalk.txt
index 40b22ee1dd9..b6a56eb3606 100644
--- a/forge-gui/res/tokenscripts/r_1_1_goblin_scout_mountainwalk.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_goblin_scout_mountainwalk.txt
@@ -1,7 +1,7 @@
 Name:Goblin Scout Token
 ManaCost:no cost
-Types:Creature Goblin Scout
 Colors:red
+Types:Creature Goblin Scout
 PT:1/1
 K:Landwalk:Mountain
 Oracle:Mountainwalk
diff --git a/forge-gui/res/tokenscripts/r_1_1_goblin_wizard_prowess.txt b/forge-gui/res/tokenscripts/r_1_1_goblin_wizard_prowess.txt
index 11c7f1bebf5..af9681a01de 100644
--- a/forge-gui/res/tokenscripts/r_1_1_goblin_wizard_prowess.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_goblin_wizard_prowess.txt
@@ -1,7 +1,7 @@
 Name:Goblin Wizard Token
 ManaCost:no cost
-Types:Creature Goblin Wizard
 Colors:red
+Types:Creature Goblin Wizard
 PT:1/1
 K:Prowess
 Oracle:Prowess
diff --git a/forge-gui/res/tokenscripts/r_1_1_gremlin.txt b/forge-gui/res/tokenscripts/r_1_1_gremlin.txt
index b4711354c11..cc065bb5219 100644
--- a/forge-gui/res/tokenscripts/r_1_1_gremlin.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_gremlin.txt
@@ -1,6 +1,6 @@
 Name:Gremlin Token
 ManaCost:no cost
-Types:Creature Gremlin
 Colors:red
+Types:Creature Gremlin
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_1_1_hamster.txt b/forge-gui/res/tokenscripts/r_1_1_hamster.txt
index 02789876aff..27c76fe58c5 100644
--- a/forge-gui/res/tokenscripts/r_1_1_hamster.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_hamster.txt
@@ -1,6 +1,6 @@
 Name:Hamster Token
 ManaCost:no cost
-Types:Creature Hamster
 Colors:red
+Types:Creature Hamster
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_1_1_human.txt b/forge-gui/res/tokenscripts/r_1_1_human.txt
index 82924738a0a..35c30c8b3fc 100644
--- a/forge-gui/res/tokenscripts/r_1_1_human.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_human.txt
@@ -1,6 +1,6 @@
 Name:Human Token
 ManaCost:no cost
-Types:Creature Human
 Colors:red
+Types:Creature Human
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_1_1_human_haste.txt b/forge-gui/res/tokenscripts/r_1_1_human_haste.txt
index 0398746c2b9..242bdb18ce9 100644
--- a/forge-gui/res/tokenscripts/r_1_1_human_haste.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_human_haste.txt
@@ -1,7 +1,7 @@
 Name:Human Token
 ManaCost:no cost
-Types:Creature Human
 Colors:red
+Types:Creature Human
 PT:1/1
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_1_1_mercenary_tappump.txt b/forge-gui/res/tokenscripts/r_1_1_mercenary_tappump.txt
index 85a7dec78c8..b2c28903d51 100644
--- a/forge-gui/res/tokenscripts/r_1_1_mercenary_tappump.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_mercenary_tappump.txt
@@ -1,7 +1,7 @@
 Name:Mercenary Token
 ManaCost:no cost
-Types:Creature Mercenary
 Colors:red
+Types:Creature Mercenary
 PT:1/1
 A:AB$ Pump | Cost$ T | NumAtt$ 1 | ValidTgts$ Creature.YouCtrl | SorcerySpeed$ True | TgtPrompt$ Select target creature you control | SpellDescription$ Target creature you control gets +1/+0 until end of turn. Activate only as a sorcery.
 Oracle:{T}: Target creature you control gets +1/+0 until end of turn. Activate only as a sorcery.
diff --git a/forge-gui/res/tokenscripts/r_1_1_monk_prowess.txt b/forge-gui/res/tokenscripts/r_1_1_monk_prowess.txt
index 2ed6a5b1108..0285f369c9a 100644
--- a/forge-gui/res/tokenscripts/r_1_1_monk_prowess.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_monk_prowess.txt
@@ -1,7 +1,7 @@
 Name:Monk Token
 ManaCost:no cost
-Types:Creature Monk
 Colors:red
+Types:Creature Monk
 PT:1/1
 K:Prowess
 Oracle:Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)
diff --git a/forge-gui/res/tokenscripts/r_1_1_phyrexian_goblin.txt b/forge-gui/res/tokenscripts/r_1_1_phyrexian_goblin.txt
index 750a6a17022..f7b55bed371 100644
--- a/forge-gui/res/tokenscripts/r_1_1_phyrexian_goblin.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_phyrexian_goblin.txt
@@ -1,6 +1,6 @@
 Name:Phyrexian Goblin Token
 ManaCost:no cost
-Types:Creature Phyrexian Goblin
 Colors:red
+Types:Creature Phyrexian Goblin
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_1_1_phyrexian_goblin_haste.txt b/forge-gui/res/tokenscripts/r_1_1_phyrexian_goblin_haste.txt
index 59dec950af0..b53bfdb5da2 100644
--- a/forge-gui/res/tokenscripts/r_1_1_phyrexian_goblin_haste.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_phyrexian_goblin_haste.txt
@@ -1,7 +1,7 @@
 Name:Phyrexian Goblin Token
 ManaCost:no cost
-Types:Creature Phyrexian Goblin
 Colors:red
+Types:Creature Phyrexian Goblin
 PT:1/1
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_1_1_pirate_menace_haste.txt b/forge-gui/res/tokenscripts/r_1_1_pirate_menace_haste.txt
index a5dfffd275c..0fa316b2056 100644
--- a/forge-gui/res/tokenscripts/r_1_1_pirate_menace_haste.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_pirate_menace_haste.txt
@@ -1,7 +1,7 @@
 Name:Pirate Token
 ManaCost:no cost
-Types:Creature Pirate
 Colors:red
+Types:Creature Pirate
 PT:1/1
 K:Menace
 K:Haste
diff --git a/forge-gui/res/tokenscripts/r_1_1_pirate_noblock_all_attack.txt b/forge-gui/res/tokenscripts/r_1_1_pirate_noblock_all_attack.txt
index 9f91d686ef7..83fb3108253 100644
--- a/forge-gui/res/tokenscripts/r_1_1_pirate_noblock_all_attack.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_pirate_noblock_all_attack.txt
@@ -1,7 +1,7 @@
 Name:Pirate Token
 ManaCost:no cost
-Types:Creature Pirate
 Colors:red
+Types:Creature Pirate
 PT:1/1
 S:Mode$ CantBlockBy | ValidBlocker$ Creature.Self | Description$ CARDNAME can't block.
 S:Mode$ MustAttack | ValidCreature$ Creature.YouCtrl | Description$ Creatures you control attack each combat if able.
diff --git a/forge-gui/res/tokenscripts/r_1_1_satyr_noblock.txt b/forge-gui/res/tokenscripts/r_1_1_satyr_noblock.txt
index 2a9daf4f9ce..7bf663ac079 100644
--- a/forge-gui/res/tokenscripts/r_1_1_satyr_noblock.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_satyr_noblock.txt
@@ -1,7 +1,7 @@
 Name:Satyr Token
 ManaCost:no cost
-Types:Creature Satyr
 Colors:red
+Types:Creature Satyr
 PT:1/1
 S:Mode$ CantBlockBy | ValidBlocker$ Creature.Self | Description$ CARDNAME can't block.
 Oracle:This creature can't block.
diff --git a/forge-gui/res/tokenscripts/r_1_1_soldier_haste.txt b/forge-gui/res/tokenscripts/r_1_1_soldier_haste.txt
index 80098aefb6c..4804a4bea76 100644
--- a/forge-gui/res/tokenscripts/r_1_1_soldier_haste.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_soldier_haste.txt
@@ -1,7 +1,7 @@
 Name:Soldier Token
 ManaCost:no cost
-Types:Creature Soldier
 Colors:red
+Types:Creature Soldier
 PT:1/1
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_1_1_survivor.txt b/forge-gui/res/tokenscripts/r_1_1_survivor.txt
index 154326515e0..b549425302a 100644
--- a/forge-gui/res/tokenscripts/r_1_1_survivor.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_survivor.txt
@@ -1,6 +1,6 @@
 Name:Survivor Token
 ManaCost:no cost
-Types:Creature Survivor
 Colors:red
+Types:Creature Survivor
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_1_1_warrior.txt b/forge-gui/res/tokenscripts/r_1_1_warrior.txt
index 16115010784..ee2bd9afe2b 100644
--- a/forge-gui/res/tokenscripts/r_1_1_warrior.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_warrior.txt
@@ -1,6 +1,6 @@
 Name:Warrior Token
 ManaCost:no cost
-Types:Creature Warrior
 Colors:red
+Types:Creature Warrior
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_1_1_wizard_mana_restrict.txt b/forge-gui/res/tokenscripts/r_1_1_wizard_mana_restrict.txt
index 91152772677..d1e31a53569 100644
--- a/forge-gui/res/tokenscripts/r_1_1_wizard_mana_restrict.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_wizard_mana_restrict.txt
@@ -1,7 +1,7 @@
 Name:Wizard Token
 ManaCost:no cost
-Types:Creature Wizard
 Colors:red
+Types:Creature Wizard
 PT:1/1
 A:AB$ Mana | Cost$ T | Produced$ R | RestrictValid$ Spell.Planeswalker | SpellDescription$ Add {R}. Spend this mana only to cast a planeswalker spell.
 Oracle:{T}: Add {R}. Spend this mana only to cast a planeswalker spell.
diff --git a/forge-gui/res/tokenscripts/r_2_1_dwarf_berserker.txt b/forge-gui/res/tokenscripts/r_2_1_dwarf_berserker.txt
index 97ef32476cf..fe09c433117 100644
--- a/forge-gui/res/tokenscripts/r_2_1_dwarf_berserker.txt
+++ b/forge-gui/res/tokenscripts/r_2_1_dwarf_berserker.txt
@@ -1,6 +1,6 @@
 Name:Dwarf Berserker Token
 ManaCost:no cost
-Types:Creature Dwarf Berserker
 Colors:red
+Types:Creature Dwarf Berserker
 PT:2/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_2_1_goblin_haste.txt b/forge-gui/res/tokenscripts/r_2_1_goblin_haste.txt
index 233f397490a..3df1290d5dc 100644
--- a/forge-gui/res/tokenscripts/r_2_1_goblin_haste.txt
+++ b/forge-gui/res/tokenscripts/r_2_1_goblin_haste.txt
@@ -1,7 +1,7 @@
 Name:Goblin Token
 ManaCost:no cost
-Types:Creature Goblin
 Colors:red
+Types:Creature Goblin
 PT:2/1
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_2_1_human_wizard.txt b/forge-gui/res/tokenscripts/r_2_1_human_wizard.txt
index d393574edc6..5be61e57cd4 100644
--- a/forge-gui/res/tokenscripts/r_2_1_human_wizard.txt
+++ b/forge-gui/res/tokenscripts/r_2_1_human_wizard.txt
@@ -1,6 +1,6 @@
 Name:Human Wizard Token
 ManaCost:no cost
-Types:Creature Human Wizard
 Colors:red
+Types:Creature Human Wizard
 PT:2/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_2_2_alien_warrior.txt b/forge-gui/res/tokenscripts/r_2_2_alien_warrior.txt
index 4305ee3dc95..5e5646cac4a 100644
--- a/forge-gui/res/tokenscripts/r_2_2_alien_warrior.txt
+++ b/forge-gui/res/tokenscripts/r_2_2_alien_warrior.txt
@@ -1,6 +1,6 @@
 Name:Alien Warrior Token
 ManaCost:no cost
-Types:Creature Alien Warrior
 Colors:red
+Types:Creature Alien Warrior
 PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_2_2_dragon_flying_firebreathing.txt b/forge-gui/res/tokenscripts/r_2_2_dragon_flying_firebreathing.txt
index fe25764217c..688879b0365 100644
--- a/forge-gui/res/tokenscripts/r_2_2_dragon_flying_firebreathing.txt
+++ b/forge-gui/res/tokenscripts/r_2_2_dragon_flying_firebreathing.txt
@@ -1,7 +1,7 @@
 Name:Dragon Token
 ManaCost:no cost
-Types:Creature Dragon
 Colors:red
+Types:Creature Dragon
 PT:2/2
 K:Flying
 A:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
diff --git a/forge-gui/res/tokenscripts/r_2_2_goblin_shaman_treasure.txt b/forge-gui/res/tokenscripts/r_2_2_goblin_shaman_treasure.txt
index 7146956f028..95f497ff7f5 100644
--- a/forge-gui/res/tokenscripts/r_2_2_goblin_shaman_treasure.txt
+++ b/forge-gui/res/tokenscripts/r_2_2_goblin_shaman_treasure.txt
@@ -1,7 +1,7 @@
 Name:Goblin Shaman Token
 ManaCost:no cost
-Types:Creature Goblin Shaman
 Colors:red
+Types:Creature Goblin Shaman
 PT:2/2
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever this creature attacks, create a Treasure token.
 SVar:TrigToken:DB$ Token | TokenScript$ c_a_treasure_sac
diff --git a/forge-gui/res/tokenscripts/r_2_2_gremlin.txt b/forge-gui/res/tokenscripts/r_2_2_gremlin.txt
index bd05e347fb8..e85fbcc8ba1 100644
--- a/forge-gui/res/tokenscripts/r_2_2_gremlin.txt
+++ b/forge-gui/res/tokenscripts/r_2_2_gremlin.txt
@@ -1,6 +1,6 @@
 Name:Gremlin Token
 ManaCost:no cost
-PT:2/2
 Colors:red
 Types:Creature Gremlin
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_2_2_human_knight_trample_haste.txt b/forge-gui/res/tokenscripts/r_2_2_human_knight_trample_haste.txt
index 970471794ba..862df458fd0 100644
--- a/forge-gui/res/tokenscripts/r_2_2_human_knight_trample_haste.txt
+++ b/forge-gui/res/tokenscripts/r_2_2_human_knight_trample_haste.txt
@@ -1,7 +1,7 @@
 Name:Human Knight Token
 ManaCost:no cost
-Types:Creature Human Knight
 Colors:red
+Types:Creature Human Knight
 PT:2/2
 K:Trample
 K:Haste
diff --git a/forge-gui/res/tokenscripts/r_2_2_imp_burn_opp.txt b/forge-gui/res/tokenscripts/r_2_2_imp_burn_opp.txt
index 5372b62878a..216a54edc19 100644
--- a/forge-gui/res/tokenscripts/r_2_2_imp_burn_opp.txt
+++ b/forge-gui/res/tokenscripts/r_2_2_imp_burn_opp.txt
@@ -1,7 +1,7 @@
 Name:Imp Token
 ManaCost:no cost
-Types:Creature Imp
 Colors:red
+Types:Creature Imp
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ ImpTrigDamage | TriggerDescription$ When this creature dies, it deals 2 damage to each opponent.
 SVar:ImpTrigDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ 2
diff --git a/forge-gui/res/tokenscripts/r_2_2_rebel.txt b/forge-gui/res/tokenscripts/r_2_2_rebel.txt
index 5e36f0f18dd..395745c2dc9 100644
--- a/forge-gui/res/tokenscripts/r_2_2_rebel.txt
+++ b/forge-gui/res/tokenscripts/r_2_2_rebel.txt
@@ -1,6 +1,6 @@
 Name:Rebel Token
 ManaCost:no cost
-PT:2/2
 Colors:red
 Types:Creature Rebel
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_2_3_demon_berserker_menace.txt b/forge-gui/res/tokenscripts/r_2_3_demon_berserker_menace.txt
index 02fe639f443..431a0b2c7e3 100644
--- a/forge-gui/res/tokenscripts/r_2_3_demon_berserker_menace.txt
+++ b/forge-gui/res/tokenscripts/r_2_3_demon_berserker_menace.txt
@@ -1,7 +1,7 @@
 Name:Demon Berserker Token
 ManaCost:no cost
-Types:Creature Demon Berserker
 Colors:red
+Types:Creature Demon Berserker
 PT:2/3
 K:Menace
 Oracle:Menace
diff --git a/forge-gui/res/tokenscripts/r_2_3_minotaur.txt b/forge-gui/res/tokenscripts/r_2_3_minotaur.txt
index d8d39d76a25..ad448d59a38 100644
--- a/forge-gui/res/tokenscripts/r_2_3_minotaur.txt
+++ b/forge-gui/res/tokenscripts/r_2_3_minotaur.txt
@@ -1,6 +1,6 @@
 Name:Minotaur Token
 ManaCost:no cost
-Types:Creature Minotaur
 Colors:red
+Types:Creature Minotaur
 PT:2/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_2_3_minotaur_haste.txt b/forge-gui/res/tokenscripts/r_2_3_minotaur_haste.txt
index d8505805b9b..925cee25234 100644
--- a/forge-gui/res/tokenscripts/r_2_3_minotaur_haste.txt
+++ b/forge-gui/res/tokenscripts/r_2_3_minotaur_haste.txt
@@ -1,7 +1,7 @@
 Name:Minotaur Token
 ManaCost:no cost
-Types:Creature Minotaur
 Colors:red
+Types:Creature Minotaur
 PT:2/3
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_3_1_a_construct_haste.txt b/forge-gui/res/tokenscripts/r_3_1_a_construct_haste.txt
index 6d46bc9fd5f..08c9ed534fe 100644
--- a/forge-gui/res/tokenscripts/r_3_1_a_construct_haste.txt
+++ b/forge-gui/res/tokenscripts/r_3_1_a_construct_haste.txt
@@ -1,7 +1,7 @@
 Name:Construct Token
 ManaCost:no cost
-Types:Artifact Creature Construct
 Colors:red
+Types:Artifact Creature Construct
 PT:3/1
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_3_1_dinosaur.txt b/forge-gui/res/tokenscripts/r_3_1_dinosaur.txt
index e05f6fbbfd7..eb63de58400 100644
--- a/forge-gui/res/tokenscripts/r_3_1_dinosaur.txt
+++ b/forge-gui/res/tokenscripts/r_3_1_dinosaur.txt
@@ -1,6 +1,6 @@
 Name:Dinosaur Token
 ManaCost:no cost
-Types:Creature Dinosaur
 Colors:red
+Types:Creature Dinosaur
 PT:3/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_3_1_e_elemental_haste.txt b/forge-gui/res/tokenscripts/r_3_1_e_elemental_haste.txt
index df6426405aa..6240a6585f7 100644
--- a/forge-gui/res/tokenscripts/r_3_1_e_elemental_haste.txt
+++ b/forge-gui/res/tokenscripts/r_3_1_e_elemental_haste.txt
@@ -1,7 +1,7 @@
 Name:Elemental Token
 ManaCost:no cost
-Types:Enchantment Creature Elemental
 Colors:red
+Types:Enchantment Creature Elemental
 PT:3/1
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_3_1_elemental.txt b/forge-gui/res/tokenscripts/r_3_1_elemental.txt
index 13c98c088e8..6eb17696f68 100644
--- a/forge-gui/res/tokenscripts/r_3_1_elemental.txt
+++ b/forge-gui/res/tokenscripts/r_3_1_elemental.txt
@@ -1,6 +1,6 @@
 Name:Elemental Token
 ManaCost:no cost
-Types:Creature Elemental
 Colors:red
+Types:Creature Elemental
 PT:3/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_3_1_elemental_haste.txt b/forge-gui/res/tokenscripts/r_3_1_elemental_haste.txt
index ddfa4f90103..759bf3af9f2 100644
--- a/forge-gui/res/tokenscripts/r_3_1_elemental_haste.txt
+++ b/forge-gui/res/tokenscripts/r_3_1_elemental_haste.txt
@@ -1,7 +1,7 @@
 Name:Elemental Token
 ManaCost:no cost
-Types:Creature Elemental
 Colors:red
+Types:Creature Elemental
 PT:3/1
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_3_1_elemental_shaman.txt b/forge-gui/res/tokenscripts/r_3_1_elemental_shaman.txt
index 64b30cc7567..d4958db01f5 100644
--- a/forge-gui/res/tokenscripts/r_3_1_elemental_shaman.txt
+++ b/forge-gui/res/tokenscripts/r_3_1_elemental_shaman.txt
@@ -1,6 +1,6 @@
 Name:Elemental Shaman Token
 ManaCost:no cost
-Types:Creature Elemental Shaman
 Colors:red
+Types:Creature Elemental Shaman
 PT:3/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_3_1_elemental_shaman_haste.txt b/forge-gui/res/tokenscripts/r_3_1_elemental_shaman_haste.txt
index 280acaf329e..cd9aebd1b8a 100644
--- a/forge-gui/res/tokenscripts/r_3_1_elemental_shaman_haste.txt
+++ b/forge-gui/res/tokenscripts/r_3_1_elemental_shaman_haste.txt
@@ -1,7 +1,7 @@
 Name:Elemental Shaman Token
 ManaCost:no cost
-Types:Creature Elemental Shaman
 Colors:red
+Types:Creature Elemental Shaman
 PT:3/1
 K:Haste
 Oracle:Haste
diff --git a/forge-gui/res/tokenscripts/r_3_1_elemental_trample_haste.txt b/forge-gui/res/tokenscripts/r_3_1_elemental_trample_haste.txt
index 50e24c5e7a6..29972e72cff 100644
--- a/forge-gui/res/tokenscripts/r_3_1_elemental_trample_haste.txt
+++ b/forge-gui/res/tokenscripts/r_3_1_elemental_trample_haste.txt
@@ -1,7 +1,7 @@
 Name:Elemental Token
 ManaCost:no cost
-Types:Creature Elemental
 Colors:red
+Types:Creature Elemental
 PT:3/1
 K:Trample
 K:Haste
diff --git a/forge-gui/res/tokenscripts/r_3_1_knight.txt b/forge-gui/res/tokenscripts/r_3_1_knight.txt
index 9f8845a9b56..66027c25db3 100644
--- a/forge-gui/res/tokenscripts/r_3_1_knight.txt
+++ b/forge-gui/res/tokenscripts/r_3_1_knight.txt
@@ -1,6 +1,6 @@
 Name:Knight Token
 ManaCost:no cost
-Types:Creature Knight
 Colors:red
+Types:Creature Knight
 PT:3/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_3_2_wolf.txt b/forge-gui/res/tokenscripts/r_3_2_wolf.txt
index ce3d9515ddb..33eae87ca6e 100644
--- a/forge-gui/res/tokenscripts/r_3_2_wolf.txt
+++ b/forge-gui/res/tokenscripts/r_3_2_wolf.txt
@@ -1,6 +1,6 @@
 Name:Wolf Token
 ManaCost:no cost
-PT:3/2
 Colors:red
 Types:Creature Wolf
+PT:3/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_3_3_elemental.txt b/forge-gui/res/tokenscripts/r_3_3_elemental.txt
index 4a2dfa71d90..c759a3dfad8 100644
--- a/forge-gui/res/tokenscripts/r_3_3_elemental.txt
+++ b/forge-gui/res/tokenscripts/r_3_3_elemental.txt
@@ -1,6 +1,6 @@
 Name:Elemental Token
 ManaCost:no cost
-Types:Creature Elemental
 Colors:red
+Types:Creature Elemental
 PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/r_3_3_fighter_first_strike.txt b/forge-gui/res/tokenscripts/r_3_3_fighter_first_strike.txt
index 6a8163deeda..85e06f30d9c 100644
--- a/forge-gui/res/tokenscripts/r_3_3_fighter_first_strike.txt
+++ b/forge-gui/res/tokenscripts/r_3_3_fighter_first_strike.txt
@@ -1,7 +1,7 @@
 Name:Fighter Token
 ManaCost:no cost
-Types:Creature Fighter
 Colors:red
+Types:Creature Fighter
 PT:3/3
 K:First Strike
 Oracle:First strike