diff --git a/forge-gui/res/tokenscripts/br_7_7_demon.txt b/forge-gui/res/tokenscripts/br_7_7_demon.txt
index 9c1bf6b6fe4..602e617ee1c 100644
--- a/forge-gui/res/tokenscripts/br_7_7_demon.txt
+++ b/forge-gui/res/tokenscripts/br_7_7_demon.txt
@@ -1,6 +1,6 @@
 Name:Demon Token
 ManaCost:no cost
-Types:Creature Demon
 Colors:black,red
+Types:Creature Demon
 PT:7/7
 Oracle:
diff --git a/forge-gui/res/tokenscripts/brg_3_3_cat_dragon_flying.txt b/forge-gui/res/tokenscripts/brg_3_3_cat_dragon_flying.txt
index c8d9f81aca0..fff520f80ab 100644
--- a/forge-gui/res/tokenscripts/brg_3_3_cat_dragon_flying.txt
+++ b/forge-gui/res/tokenscripts/brg_3_3_cat_dragon_flying.txt
@@ -1,7 +1,7 @@
 Name:Cat Dragon Token
 ManaCost:no cost
-Types:Creature Cat Dragon
 Colors:black,red,green
+Types:Creature Cat Dragon
 PT:3/3
 K:Flying
 Oracle:Flying
diff --git a/forge-gui/res/tokenscripts/butterfly.txt b/forge-gui/res/tokenscripts/butterfly.txt
index 64c048c3068..5cdf9929aa3 100644
--- a/forge-gui/res/tokenscripts/butterfly.txt
+++ b/forge-gui/res/tokenscripts/butterfly.txt
@@ -1,7 +1,7 @@
 Name:Butterfly
 ManaCost:no cost
-PT:1/1
 Colors:green
 Types:Creature Insect
+PT:1/1
 K:Flying
 Oracle:Flying
diff --git a/forge-gui/res/tokenscripts/c_0_0_a_construct_total_artifacts.txt b/forge-gui/res/tokenscripts/c_0_0_a_construct_total_artifacts.txt
index ba7959637e5..082b939caff 100644
--- a/forge-gui/res/tokenscripts/c_0_0_a_construct_total_artifacts.txt
+++ b/forge-gui/res/tokenscripts/c_0_0_a_construct_total_artifacts.txt
@@ -1,7 +1,7 @@
 Name:Construct Token
 ManaCost:no cost
-PT:0/0
 Types:Artifact Creature Construct
+PT:0/0
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ This creature gets +1/+1 for each artifact you control.
 SVar:X:Count$Valid Artifact.YouCtrl
 Oracle:This creature gets +1/+1 for each artifact you control.
diff --git a/forge-gui/res/tokenscripts/c_0_0_a_thopter_flying.txt b/forge-gui/res/tokenscripts/c_0_0_a_thopter_flying.txt
index 993a580a7a6..2c92eda46b3 100644
--- a/forge-gui/res/tokenscripts/c_0_0_a_thopter_flying.txt
+++ b/forge-gui/res/tokenscripts/c_0_0_a_thopter_flying.txt
@@ -1,7 +1,7 @@
 Name:Thopter Token
 ManaCost:no cost
-Types:Artifact Creature Thopter
 Colors:colorless
+Types:Artifact Creature Thopter
 PT:0/0
 K:Flying
 Oracle:Flying
diff --git a/forge-gui/res/tokenscripts/c_0_1_a_egg.txt b/forge-gui/res/tokenscripts/c_0_1_a_egg.txt
index f30b59fe618..2b1aa47dfee 100644
--- a/forge-gui/res/tokenscripts/c_0_1_a_egg.txt
+++ b/forge-gui/res/tokenscripts/c_0_1_a_egg.txt
@@ -1,5 +1,5 @@
 Name:Egg Token
 ManaCost:no cost
-PT:0/1
 Types:Artifact Creature Egg
+PT:0/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_0_1_a_goblin_construct_noblock_ping.txt b/forge-gui/res/tokenscripts/c_0_1_a_goblin_construct_noblock_ping.txt
index d30a50564b8..47be6ab632f 100644
--- a/forge-gui/res/tokenscripts/c_0_1_a_goblin_construct_noblock_ping.txt
+++ b/forge-gui/res/tokenscripts/c_0_1_a_goblin_construct_noblock_ping.txt
@@ -1,7 +1,7 @@
 Name:Goblin Construct Token
 ManaCost:no cost
-PT:0/1
 Types:Artifact Creature Goblin Construct
+PT:0/1
 S:Mode$ CantBlockBy | ValidBlocker$ Creature.Self | Description$ CARDNAME can't block.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 1 damage to you.
 SVar:TrigDealDamage:DB$ DealDamage | Defined$ You | NumDmg$ 1
diff --git a/forge-gui/res/tokenscripts/c_0_1_a_pest.txt b/forge-gui/res/tokenscripts/c_0_1_a_pest.txt
index 9625eef8b10..0af36916a54 100644
--- a/forge-gui/res/tokenscripts/c_0_1_a_pest.txt
+++ b/forge-gui/res/tokenscripts/c_0_1_a_pest.txt
@@ -1,5 +1,5 @@
 Name:Pest Token
 ManaCost:no cost
-PT:0/1
 Types:Artifact Creature Pest
+PT:0/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_0_1_a_prism.txt b/forge-gui/res/tokenscripts/c_0_1_a_prism.txt
index db82f662200..f5b876483b5 100644
--- a/forge-gui/res/tokenscripts/c_0_1_a_prism.txt
+++ b/forge-gui/res/tokenscripts/c_0_1_a_prism.txt
@@ -1,5 +1,5 @@
 Name:Prism Token
 ManaCost:no cost
-PT:0/1
 Types:Artifact Creature Prism
+PT:0/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_0_1_eldrazi_spawn_sac.txt b/forge-gui/res/tokenscripts/c_0_1_eldrazi_spawn_sac.txt
index 8f8ec8354e0..fbcd967d1a5 100644
--- a/forge-gui/res/tokenscripts/c_0_1_eldrazi_spawn_sac.txt
+++ b/forge-gui/res/tokenscripts/c_0_1_eldrazi_spawn_sac.txt
@@ -1,6 +1,6 @@
 Name:Eldrazi Spawn Token
 ManaCost:no cost
-PT:0/1
 Types:Creature Eldrazi Spawn
+PT:0/1
 A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 Oracle:Sacrifice this creature: Add {C}.
diff --git a/forge-gui/res/tokenscripts/c_0_2_a_wall_defender.txt b/forge-gui/res/tokenscripts/c_0_2_a_wall_defender.txt
index a946bebc5f0..7cb338390f0 100644
--- a/forge-gui/res/tokenscripts/c_0_2_a_wall_defender.txt
+++ b/forge-gui/res/tokenscripts/c_0_2_a_wall_defender.txt
@@ -1,6 +1,6 @@
 Name:Wall Token
 ManaCost:no cost
-PT:0/2
 Types:Artifact Creature Wall
+PT:0/2
 K:Defender
 Oracle:Defender
diff --git a/forge-gui/res/tokenscripts/c_10_10_eldrazi.txt b/forge-gui/res/tokenscripts/c_10_10_eldrazi.txt
index 72c7cffe385..2740705e836 100644
--- a/forge-gui/res/tokenscripts/c_10_10_eldrazi.txt
+++ b/forge-gui/res/tokenscripts/c_10_10_eldrazi.txt
@@ -1,5 +1,5 @@
 Name:Eldrazi Token
 ManaCost:no cost
-PT:10/10
 Types:Creature Eldrazi
+PT:10/10
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_1_1_a_construct.txt b/forge-gui/res/tokenscripts/c_1_1_a_construct.txt
index ac9c60040bb..6ab61ce87fa 100644
--- a/forge-gui/res/tokenscripts/c_1_1_a_construct.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_a_construct.txt
@@ -1,5 +1,5 @@
 Name:Construct Token
 ManaCost:no cost
-PT:1/1
 Types:Artifact Creature Construct
+PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_1_1_a_construct_defender.txt b/forge-gui/res/tokenscripts/c_1_1_a_construct_defender.txt
index 5e1fa23b513..c5f248e27bb 100644
--- a/forge-gui/res/tokenscripts/c_1_1_a_construct_defender.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_a_construct_defender.txt
@@ -1,6 +1,6 @@
 Name:Construct Token
 ManaCost:no cost
-PT:1/1
 Types:Artifact Creature Construct
+PT:1/1
 K:Defender
 Oracle:Defender
diff --git a/forge-gui/res/tokenscripts/c_1_1_a_gnome.txt b/forge-gui/res/tokenscripts/c_1_1_a_gnome.txt
index d9b087fb497..a928ce8627f 100644
--- a/forge-gui/res/tokenscripts/c_1_1_a_gnome.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_a_gnome.txt
@@ -1,5 +1,5 @@
 Name:Gnome Token
 ManaCost:no cost
-PT:1/1
 Types:Artifact Creature Gnome
+PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_1_1_a_myr.txt b/forge-gui/res/tokenscripts/c_1_1_a_myr.txt
index 48c0fc748f2..255955f4009 100644
--- a/forge-gui/res/tokenscripts/c_1_1_a_myr.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_a_myr.txt
@@ -1,5 +1,5 @@
 Name:Myr Token
 ManaCost:no cost
-PT:1/1
 Types:Artifact Creature Myr
+PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_1_1_a_phyrexian_myr.txt b/forge-gui/res/tokenscripts/c_1_1_a_phyrexian_myr.txt
index 23a59cf480c..8bf331c20bc 100644
--- a/forge-gui/res/tokenscripts/c_1_1_a_phyrexian_myr.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_a_phyrexian_myr.txt
@@ -1,5 +1,5 @@
 Name:Phyrexian Myr Token
 ManaCost:no cost
-PT:1/1
 Types:Artifact Creature Phyrexian Myr
+PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_1_1_a_soldier.txt b/forge-gui/res/tokenscripts/c_1_1_a_soldier.txt
index 6ff3e737030..b61db17f6ab 100644
--- a/forge-gui/res/tokenscripts/c_1_1_a_soldier.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_a_soldier.txt
@@ -1,5 +1,5 @@
 Name:Soldier Token
 ManaCost:no cost
-PT:1/1
 Types:Artifact Creature Soldier
+PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_1_1_a_thopter_flying.txt b/forge-gui/res/tokenscripts/c_1_1_a_thopter_flying.txt
index 719482701b2..65272c63ca8 100644
--- a/forge-gui/res/tokenscripts/c_1_1_a_thopter_flying.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_a_thopter_flying.txt
@@ -1,7 +1,7 @@
 Name:Thopter Token
 ManaCost:no cost
-Types:Artifact Creature Thopter
 Colors:colorless
+Types:Artifact Creature Thopter
 PT:1/1
 K:Flying
 Oracle:Flying
diff --git a/forge-gui/res/tokenscripts/c_1_1_a_triskelavite_flying_ammo.txt b/forge-gui/res/tokenscripts/c_1_1_a_triskelavite_flying_ammo.txt
index f3e64b77b98..519054bec9f 100644
--- a/forge-gui/res/tokenscripts/c_1_1_a_triskelavite_flying_ammo.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_a_triskelavite_flying_ammo.txt
@@ -1,7 +1,7 @@
 Name:Triskelavite Token
 ManaCost:no cost
 Types:Artifact Creature Triskelavite
-K:Flying
 PT:1/1
+K:Flying
 A:AB$ DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Any | NumDmg$ 1 | SpellDescription$ It deals 1 damage to any target.
 Oracle:Flying\nSacrifice this creature: It deals 1 damage to any target.
diff --git a/forge-gui/res/tokenscripts/c_1_1_e_shrine.txt b/forge-gui/res/tokenscripts/c_1_1_e_shrine.txt
index 272f0e53601..f0eaebdf19d 100644
--- a/forge-gui/res/tokenscripts/c_1_1_e_shrine.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_e_shrine.txt
@@ -1,6 +1,6 @@
 Name:Shrine Token
 ManaCost:no cost
-Types:Enchantment Creature Shrine
 Colors:colorless
+Types:Enchantment Creature Shrine
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_1_1_eldrazi_scion_sac.txt b/forge-gui/res/tokenscripts/c_1_1_eldrazi_scion_sac.txt
index f7e61a3f3a7..f813702512b 100644
--- a/forge-gui/res/tokenscripts/c_1_1_eldrazi_scion_sac.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_eldrazi_scion_sac.txt
@@ -1,6 +1,6 @@
 Name:Eldrazi Scion Token
 ManaCost:no cost
-PT:1/1
 Types:Creature Eldrazi Scion
+PT:1/1
 A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 Oracle:Sacrifice this creature: Add {C}.
diff --git a/forge-gui/res/tokenscripts/c_1_1_eldrazi_sliver_sac.txt b/forge-gui/res/tokenscripts/c_1_1_eldrazi_sliver_sac.txt
index 5c29fa4d756..81510da567c 100644
--- a/forge-gui/res/tokenscripts/c_1_1_eldrazi_sliver_sac.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_eldrazi_sliver_sac.txt
@@ -1,6 +1,6 @@
 Name:Eldrazi Sliver Token
 ManaCost:no cost
-PT:1/1
 Types:Creature Eldrazi Sliver
+PT:1/1
 A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 Oracle:Sacrifice this creature: Add {C}.
diff --git a/forge-gui/res/tokenscripts/c_2_2_a_assembly_worker.txt b/forge-gui/res/tokenscripts/c_2_2_a_assembly_worker.txt
index ac35d897be6..6f92eb2b2f9 100644
--- a/forge-gui/res/tokenscripts/c_2_2_a_assembly_worker.txt
+++ b/forge-gui/res/tokenscripts/c_2_2_a_assembly_worker.txt
@@ -1,5 +1,5 @@
 Name:Assembly-Worker Token
 ManaCost:no cost
-PT:2/2
 Types:Artifact Creature Assembly-Worker
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_2_2_a_construct.txt b/forge-gui/res/tokenscripts/c_2_2_a_construct.txt
index 91c3e92ab89..e4d5b1a6700 100644
--- a/forge-gui/res/tokenscripts/c_2_2_a_construct.txt
+++ b/forge-gui/res/tokenscripts/c_2_2_a_construct.txt
@@ -1,5 +1,5 @@
 Name:Construct Token
 ManaCost:no cost
-PT:2/2
 Types:Artifact Creature Construct
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_2_2_a_spawn.txt b/forge-gui/res/tokenscripts/c_2_2_a_spawn.txt
index d8bcb6d9bf8..20acb8f4f9b 100644
--- a/forge-gui/res/tokenscripts/c_2_2_a_spawn.txt
+++ b/forge-gui/res/tokenscripts/c_2_2_a_spawn.txt
@@ -1,5 +1,5 @@
 Name:Spawn Token
 ManaCost:no cost
-PT:2/2
 Types:Artifact Creature Spawn
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_2_2_homunculus.txt b/forge-gui/res/tokenscripts/c_2_2_homunculus.txt
index d1f22966344..482827cbf06 100644
--- a/forge-gui/res/tokenscripts/c_2_2_homunculus.txt
+++ b/forge-gui/res/tokenscripts/c_2_2_homunculus.txt
@@ -1,5 +1,5 @@
 Name:Homunculus Token
 ManaCost:no cost
-PT:2/2
 Types:Creature Homunculus
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_2_2_pincher.txt b/forge-gui/res/tokenscripts/c_2_2_pincher.txt
index d3db77c290a..5d34cd05497 100644
--- a/forge-gui/res/tokenscripts/c_2_2_pincher.txt
+++ b/forge-gui/res/tokenscripts/c_2_2_pincher.txt
@@ -1,5 +1,5 @@
 Name:Pincher Token
 ManaCost:no cost
-PT:2/2
 Types:Creature Pincher
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_3_2_eldrazi_horror.txt b/forge-gui/res/tokenscripts/c_3_2_eldrazi_horror.txt
index aac7ffe0789..c1a46883502 100644
--- a/forge-gui/res/tokenscripts/c_3_2_eldrazi_horror.txt
+++ b/forge-gui/res/tokenscripts/c_3_2_eldrazi_horror.txt
@@ -1,5 +1,5 @@
 Name:Eldrazi Horror Token
 ManaCost:no cost
-PT:3/2
 Types:Creature Eldrazi Horror
+PT:3/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_3_3_a_golem.txt b/forge-gui/res/tokenscripts/c_3_3_a_golem.txt
index f7cc1967961..1f79b681b46 100644
--- a/forge-gui/res/tokenscripts/c_3_3_a_golem.txt
+++ b/forge-gui/res/tokenscripts/c_3_3_a_golem.txt
@@ -1,5 +1,5 @@
 Name:Golem Token
 ManaCost:no cost
-PT:3/3
 Types:Artifact Creature Golem
+PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_3_3_a_golem_flying.txt b/forge-gui/res/tokenscripts/c_3_3_a_golem_flying.txt
index ddf827aae1f..e5055df4ecc 100644
--- a/forge-gui/res/tokenscripts/c_3_3_a_golem_flying.txt
+++ b/forge-gui/res/tokenscripts/c_3_3_a_golem_flying.txt
@@ -1,6 +1,6 @@
 Name:Golem Token
 ManaCost:no cost
-PT:3/3
 Types:Artifact Creature Golem
+PT:3/3
 K:Flying
 Oracle:Flying
diff --git a/forge-gui/res/tokenscripts/c_3_3_a_golem_trample.txt b/forge-gui/res/tokenscripts/c_3_3_a_golem_trample.txt
index 7384342b1b2..be3d49a3052 100644
--- a/forge-gui/res/tokenscripts/c_3_3_a_golem_trample.txt
+++ b/forge-gui/res/tokenscripts/c_3_3_a_golem_trample.txt
@@ -1,6 +1,6 @@
 Name:Golem Token
 ManaCost:no cost
-PT:3/3
 Types:Artifact Creature Golem
+PT:3/3
 K:Trample
 Oracle:Trample
diff --git a/forge-gui/res/tokenscripts/c_3_3_a_golem_vigilance.txt b/forge-gui/res/tokenscripts/c_3_3_a_golem_vigilance.txt
index 9ed254f8ca0..7ddfb5ba467 100644
--- a/forge-gui/res/tokenscripts/c_3_3_a_golem_vigilance.txt
+++ b/forge-gui/res/tokenscripts/c_3_3_a_golem_vigilance.txt
@@ -1,6 +1,6 @@
 Name:Golem Token
 ManaCost:no cost
-PT:3/3
 Types:Artifact Creature Golem
+PT:3/3
 K:Vigilance
 Oracle:Vigilance
diff --git a/forge-gui/res/tokenscripts/c_3_3_a_phyrexian_golem.txt b/forge-gui/res/tokenscripts/c_3_3_a_phyrexian_golem.txt
index 3c866824b7d..727c4fe009e 100644
--- a/forge-gui/res/tokenscripts/c_3_3_a_phyrexian_golem.txt
+++ b/forge-gui/res/tokenscripts/c_3_3_a_phyrexian_golem.txt
@@ -1,5 +1,5 @@
 Name:Phyrexian Golem Token
 ManaCost:no cost
-PT:3/3
 Types:Artifact Creature Phyrexian Golem
+PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_3_3_a_robot.txt b/forge-gui/res/tokenscripts/c_3_3_a_robot.txt
index 0387683dad1..0b91121b54f 100644
--- a/forge-gui/res/tokenscripts/c_3_3_a_robot.txt
+++ b/forge-gui/res/tokenscripts/c_3_3_a_robot.txt
@@ -1,5 +1,5 @@
 Name:Robot Token
 ManaCost:no cost
-PT:3/3
 Types:Artifact Creature Robot
+PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_3_3_a_zombie.txt b/forge-gui/res/tokenscripts/c_3_3_a_zombie.txt
index 4da3da60b8b..d51384d9b87 100644
--- a/forge-gui/res/tokenscripts/c_3_3_a_zombie.txt
+++ b/forge-gui/res/tokenscripts/c_3_3_a_zombie.txt
@@ -1,5 +1,5 @@
 Name:Zombie Token
 ManaCost:no cost
-PT:3/3
 Types:Artifact Creature Zombie
+PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_3_3_e_a_golem.txt b/forge-gui/res/tokenscripts/c_3_3_e_a_golem.txt
index b45c2573eb9..d159725dd58 100644
--- a/forge-gui/res/tokenscripts/c_3_3_e_a_golem.txt
+++ b/forge-gui/res/tokenscripts/c_3_3_e_a_golem.txt
@@ -1,5 +1,5 @@
 Name:Golem Token
 ManaCost:no cost
-PT:3/3
 Types:Enchantment Artifact Creature Golem
+PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_4_4_a_construct.txt b/forge-gui/res/tokenscripts/c_4_4_a_construct.txt
index 37e1729344c..0f0544785b7 100644
--- a/forge-gui/res/tokenscripts/c_4_4_a_construct.txt
+++ b/forge-gui/res/tokenscripts/c_4_4_a_construct.txt
@@ -1,5 +1,5 @@
 Name:Construct Token
 ManaCost:no cost
-PT:4/4
 Types:Artifact Creature Construct
+PT:4/4
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_4_4_a_golem.txt b/forge-gui/res/tokenscripts/c_4_4_a_golem.txt
index e6b004a7787..b4053e33dec 100644
--- a/forge-gui/res/tokenscripts/c_4_4_a_golem.txt
+++ b/forge-gui/res/tokenscripts/c_4_4_a_golem.txt
@@ -1,5 +1,5 @@
 Name:Golem Token
 ManaCost:no cost
-PT:4/4
 Types:Artifact Creature Golem
+PT:4/4
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_4_4_a_scarecrow_vigilance.txt b/forge-gui/res/tokenscripts/c_4_4_a_scarecrow_vigilance.txt
index e8f70620ce5..07a5529413b 100644
--- a/forge-gui/res/tokenscripts/c_4_4_a_scarecrow_vigilance.txt
+++ b/forge-gui/res/tokenscripts/c_4_4_a_scarecrow_vigilance.txt
@@ -1,6 +1,6 @@
 Name:Scarecrow Token
 ManaCost:no cost
-PT:4/4
 Types:Artifact Creature Scarecrow
+PT:4/4
 K:Vigilance
 Oracle:Vigilance
diff --git a/forge-gui/res/tokenscripts/c_4_4_dragon_flying.txt b/forge-gui/res/tokenscripts/c_4_4_dragon_flying.txt
index ed1f0fec137..41459fcffc0 100644
--- a/forge-gui/res/tokenscripts/c_4_4_dragon_flying.txt
+++ b/forge-gui/res/tokenscripts/c_4_4_dragon_flying.txt
@@ -1,6 +1,6 @@
 Name:Dragon Token
 ManaCost:no cost
 Types:Creature Dragon
-K:Flying
 PT:4/4
+K:Flying
 Oracle:Flying
diff --git a/forge-gui/res/tokenscripts/c_4_6_a_golem.txt b/forge-gui/res/tokenscripts/c_4_6_a_golem.txt
index c695331e66f..870c5428d41 100644
--- a/forge-gui/res/tokenscripts/c_4_6_a_golem.txt
+++ b/forge-gui/res/tokenscripts/c_4_6_a_golem.txt
@@ -1,5 +1,5 @@
 Name:Golem Token
 ManaCost:no cost
-PT:4/6
 Types:Artifact Creature Golem
+PT:4/6
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_6_12_a_construct_trample.txt b/forge-gui/res/tokenscripts/c_6_12_a_construct_trample.txt
index 8b178ae896e..0d3ee99a247 100644
--- a/forge-gui/res/tokenscripts/c_6_12_a_construct_trample.txt
+++ b/forge-gui/res/tokenscripts/c_6_12_a_construct_trample.txt
@@ -1,6 +1,6 @@
 Name:Construct Token
 ManaCost:no cost
 Types:Artifact Creature Construct
-K:Trample
 PT:6/12
+K:Trample
 Oracle:Trample
diff --git a/forge-gui/res/tokenscripts/c_6_6_a_beast.txt b/forge-gui/res/tokenscripts/c_6_6_a_beast.txt
index 6481fb594d5..c7a7c4a4027 100644
--- a/forge-gui/res/tokenscripts/c_6_6_a_beast.txt
+++ b/forge-gui/res/tokenscripts/c_6_6_a_beast.txt
@@ -1,5 +1,5 @@
 Name:Beast Token
 ManaCost:no cost
-PT:6/6
 Types:Artifact Creature Beast
+PT:6/6
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_9_9_a_golem.txt b/forge-gui/res/tokenscripts/c_9_9_a_golem.txt
index fdd27bf3484..22bd9a3c373 100644
--- a/forge-gui/res/tokenscripts/c_9_9_a_golem.txt
+++ b/forge-gui/res/tokenscripts/c_9_9_a_golem.txt
@@ -1,5 +1,5 @@
 Name:Golem Token
 ManaCost:no cost
-PT:9/9
 Types:Artifact Creature Golem
+PT:9/9
 Oracle:
diff --git a/forge-gui/res/tokenscripts/c_a_powerstone.txt b/forge-gui/res/tokenscripts/c_a_powerstone.txt
index 9aa3d0cdf8e..69df785598e 100644
--- a/forge-gui/res/tokenscripts/c_a_powerstone.txt
+++ b/forge-gui/res/tokenscripts/c_a_powerstone.txt
@@ -1,6 +1,6 @@
 Name:Powerstone Token
 ManaCost:no cost
-Types:Artifact Powerstone
 Colors:colorless
+Types:Artifact Powerstone
 A:AB$ Mana | Cost$ T | Produced$ C | RestrictValid$ CantCastNonArtifactSpells | SpellDescription$ Add {C}. This mana can't be spent to cast a nonartifact spell.
 Oracle:{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.
diff --git a/forge-gui/res/tokenscripts/carnivore.txt b/forge-gui/res/tokenscripts/carnivore.txt
index e22db3d3258..eadd19e5d71 100644
--- a/forge-gui/res/tokenscripts/carnivore.txt
+++ b/forge-gui/res/tokenscripts/carnivore.txt
@@ -1,6 +1,6 @@
 Name:Carnivore
 ManaCost:no cost
-PT:3/1
 Colors:red
 Types:Creature Beast
+PT:3/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/cherubael.txt b/forge-gui/res/tokenscripts/cherubael.txt
index 9209ba5bf0f..205e01efd55 100644
--- a/forge-gui/res/tokenscripts/cherubael.txt
+++ b/forge-gui/res/tokenscripts/cherubael.txt
@@ -1,7 +1,7 @@
 Name:Cherubael
 ManaCost:no cost
-Types:Legendary Creature Demon
 Colors:black
+Types:Legendary Creature Demon
 PT:4/4
 K:Flying
 Oracle:Flying
diff --git a/forge-gui/res/tokenscripts/colossal_dreadmaw.txt b/forge-gui/res/tokenscripts/colossal_dreadmaw.txt
index f3eb7200cca..f3b12085a60 100644
--- a/forge-gui/res/tokenscripts/colossal_dreadmaw.txt
+++ b/forge-gui/res/tokenscripts/colossal_dreadmaw.txt
@@ -1,7 +1,7 @@
 Name:Colossal Dreadmaw
 ManaCost:no cost
-Types:Creature Dinosaur
 Colors:green
+Types:Creature Dinosaur
 PT:6/6
 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/feather.txt b/forge-gui/res/tokenscripts/feather.txt
index beadc105649..8a27ad5c651 100644
--- a/forge-gui/res/tokenscripts/feather.txt
+++ b/forge-gui/res/tokenscripts/feather.txt
@@ -1,6 +1,6 @@
 Name:Feather
 ManaCost:no cost
-Types:Artifact
 Colors:red
+Types:Artifact
 A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | TgtPrompt$ Choose target Phoenix card in your graveyard | ValidTgts$ Phoenix.YouOwn | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | SpellDescription$ Return target Phoenix card from your graveyard to the battlefield tapped.
 Oracle:{1}, {T}, Sacrifice this artifact: Return target Phoenix card from your graveyard to the battlefield tapped.
diff --git a/forge-gui/res/tokenscripts/first_mate_ragavan.txt b/forge-gui/res/tokenscripts/first_mate_ragavan.txt
index 0751873432e..4429d0e7050 100644
--- a/forge-gui/res/tokenscripts/first_mate_ragavan.txt
+++ b/forge-gui/res/tokenscripts/first_mate_ragavan.txt
@@ -1,6 +1,6 @@
 Name:First Mate Ragavan
 ManaCost:no cost
-Types:Legendary Creature Monkey
 Colors:red
+Types:Legendary Creature Monkey
 PT:2/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_0_0_ooze_trample.txt b/forge-gui/res/tokenscripts/g_0_0_ooze_trample.txt
index c4e96053a0f..acc58a30600 100644
--- a/forge-gui/res/tokenscripts/g_0_0_ooze_trample.txt
+++ b/forge-gui/res/tokenscripts/g_0_0_ooze_trample.txt
@@ -1,7 +1,7 @@
 Name:Ooze Token
 ManaCost:no cost
-Types:Creature Ooze
 Colors:green
+Types:Creature Ooze
 PT:0/0
 K:Trample
 Oracle:Trample
diff --git a/forge-gui/res/tokenscripts/g_0_1_dinosaur_egg.txt b/forge-gui/res/tokenscripts/g_0_1_dinosaur_egg.txt
index f6c225ed866..234f5b781d3 100644
--- a/forge-gui/res/tokenscripts/g_0_1_dinosaur_egg.txt
+++ b/forge-gui/res/tokenscripts/g_0_1_dinosaur_egg.txt
@@ -1,6 +1,6 @@
 Name:Dinosaur Egg Token
 ManaCost:no cost
-Types:Creature Dinosaur Egg
 Colors:green
+Types:Creature Dinosaur Egg
 PT:0/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_0_1_egg_defender.txt b/forge-gui/res/tokenscripts/g_0_1_egg_defender.txt
index 40163bfca0c..9d39746d750 100644
--- a/forge-gui/res/tokenscripts/g_0_1_egg_defender.txt
+++ b/forge-gui/res/tokenscripts/g_0_1_egg_defender.txt
@@ -1,7 +1,7 @@
 Name:Egg Token
 ManaCost:no cost
-Types:Creature Egg
 Colors:green
+Types:Creature Egg
 PT:0/1
 K:Defender
 Oracle:Defender
diff --git a/forge-gui/res/tokenscripts/g_0_1_plant.txt b/forge-gui/res/tokenscripts/g_0_1_plant.txt
index 10e5b900179..a5a3d8afdf5 100644
--- a/forge-gui/res/tokenscripts/g_0_1_plant.txt
+++ b/forge-gui/res/tokenscripts/g_0_1_plant.txt
@@ -1,6 +1,6 @@
 Name:Plant Token
 ManaCost:no cost
-Types:Creature Plant
 Colors:green
+Types:Creature Plant
 PT:0/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_0_1_sheep.txt b/forge-gui/res/tokenscripts/g_0_1_sheep.txt
index 081beb2f17d..18a65dd8223 100644
--- a/forge-gui/res/tokenscripts/g_0_1_sheep.txt
+++ b/forge-gui/res/tokenscripts/g_0_1_sheep.txt
@@ -1,6 +1,6 @@
 Name:Sheep Token
 ManaCost:no cost
-PT:0/1
 Colors:green
 Types:Creature Sheep
+PT:0/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_0_2_plant_defender.txt b/forge-gui/res/tokenscripts/g_0_2_plant_defender.txt
index f491f922e24..c3b428ab72c 100644
--- a/forge-gui/res/tokenscripts/g_0_2_plant_defender.txt
+++ b/forge-gui/res/tokenscripts/g_0_2_plant_defender.txt
@@ -1,7 +1,7 @@
 Name:Plant Token
 ManaCost:no cost
-Types:Creature Plant
 Colors:green
+Types:Creature Plant
 PT:0/2
 K:Defender
 Oracle:Defender
diff --git a/forge-gui/res/tokenscripts/g_1_1_ape.txt b/forge-gui/res/tokenscripts/g_1_1_ape.txt
index ceea718887e..98bece5818e 100644
--- a/forge-gui/res/tokenscripts/g_1_1_ape.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_ape.txt
@@ -1,6 +1,6 @@
 Name:Ape Token
 ManaCost:no cost
-Types:Creature Ape
 Colors:green
+Types:Creature Ape
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_boar_food.txt b/forge-gui/res/tokenscripts/g_1_1_boar_food.txt
index 410865c6a06..6b92e94e415 100644
--- a/forge-gui/res/tokenscripts/g_1_1_boar_food.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_boar_food.txt
@@ -1,7 +1,7 @@
 Name:Boar Token
 ManaCost:no cost
-Types:Creature Boar
 Colors:green
+Types:Creature Boar
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature dies, create a Food token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
diff --git a/forge-gui/res/tokenscripts/g_1_1_cat.txt b/forge-gui/res/tokenscripts/g_1_1_cat.txt
index 23a5b76ddb6..a85d29dcf35 100644
--- a/forge-gui/res/tokenscripts/g_1_1_cat.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_cat.txt
@@ -1,6 +1,6 @@
 Name:Cat Token
 ManaCost:no cost
-Types:Creature Cat
 Colors:green
+Types:Creature Cat
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_dog.txt b/forge-gui/res/tokenscripts/g_1_1_dog.txt
index 85b7979f92c..ee17b4a9abf 100644
--- a/forge-gui/res/tokenscripts/g_1_1_dog.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_dog.txt
@@ -1,6 +1,6 @@
 Name:Dog Token
 ManaCost:no cost
-PT:1/1
 Colors:green
 Types:Creature Dog
+PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_elf_druid_g.txt b/forge-gui/res/tokenscripts/g_1_1_elf_druid_g.txt
index 1866507c108..7c896966968 100644
--- a/forge-gui/res/tokenscripts/g_1_1_elf_druid_g.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_elf_druid_g.txt
@@ -1,7 +1,7 @@
 Name:Elf Druid Token
 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/g_1_1_elf_g.txt b/forge-gui/res/tokenscripts/g_1_1_elf_g.txt
index ce33e030e5b..efe025df11c 100644
--- a/forge-gui/res/tokenscripts/g_1_1_elf_g.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_elf_g.txt
@@ -1,7 +1,7 @@
 Name:Elf Token
 ManaCost:no cost
-Types:Creature Elf
 Colors:green
+Types:Creature Elf
 PT:1/1
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 Oracle:{T}: Add {G}.
diff --git a/forge-gui/res/tokenscripts/g_1_1_elf_warrior.txt b/forge-gui/res/tokenscripts/g_1_1_elf_warrior.txt
index ab3204ab73b..1b23ecba9bf 100644
--- a/forge-gui/res/tokenscripts/g_1_1_elf_warrior.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_elf_warrior.txt
@@ -1,6 +1,6 @@
 Name:Elf Warrior Token
 ManaCost:no cost
-Types:Creature Elf Warrior
 Colors:green
+Types:Creature Elf Warrior
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_forest_dryad.txt b/forge-gui/res/tokenscripts/g_1_1_forest_dryad.txt
index af13d310f93..896c5d4bbd1 100644
--- a/forge-gui/res/tokenscripts/g_1_1_forest_dryad.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_forest_dryad.txt
@@ -1,6 +1,6 @@
 Name:Forest Dryad Token
 ManaCost:no cost
-Types:Land Creature Forest Dryad
 Colors:green
+Types:Land Creature Forest Dryad
 PT:1/1
 Oracle:({T}: Add {G}.)
diff --git a/forge-gui/res/tokenscripts/g_1_1_hippo.txt b/forge-gui/res/tokenscripts/g_1_1_hippo.txt
index 794d0712d26..007dd4d7666 100644
--- a/forge-gui/res/tokenscripts/g_1_1_hippo.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_hippo.txt
@@ -1,6 +1,6 @@
 Name:Hippo Token
 ManaCost:no cost
-Types:Creature Hippo
 Colors:green
+Types:Creature Hippo
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_human_monk_g.txt b/forge-gui/res/tokenscripts/g_1_1_human_monk_g.txt
index 67530c2da14..b2096f0742e 100644
--- a/forge-gui/res/tokenscripts/g_1_1_human_monk_g.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_human_monk_g.txt
@@ -1,7 +1,7 @@
 Name:Human Monk Token
 ManaCost:no cost
-Types:Creature Human Monk
 Colors:green
+Types:Creature Human Monk
 PT:1/1
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 Oracle:{T}: Add {G}.
diff --git a/forge-gui/res/tokenscripts/g_1_1_insect.txt b/forge-gui/res/tokenscripts/g_1_1_insect.txt
index 907a511fa6e..7a488c72282 100644
--- a/forge-gui/res/tokenscripts/g_1_1_insect.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_insect.txt
@@ -1,6 +1,6 @@
 Name:Insect Token
 ManaCost:no cost
-PT:1/1
 Colors:green
 Types:Creature Insect
+PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_insect_flying_deathtouch.txt b/forge-gui/res/tokenscripts/g_1_1_insect_flying_deathtouch.txt
index a6448a305e6..706ecb486ec 100644
--- a/forge-gui/res/tokenscripts/g_1_1_insect_flying_deathtouch.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_insect_flying_deathtouch.txt
@@ -1,8 +1,8 @@
 Name:Insect Token
 ManaCost:no cost
-PT:1/1
 Colors:green
 Types:Creature Insect
+PT:1/1
 K:Flying
 K:Deathtouch
 Oracle:Flying, deathtouch
diff --git a/forge-gui/res/tokenscripts/g_1_1_ooze.txt b/forge-gui/res/tokenscripts/g_1_1_ooze.txt
index 95a68b9c8a3..e1b15eb2cb2 100644
--- a/forge-gui/res/tokenscripts/g_1_1_ooze.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_ooze.txt
@@ -1,6 +1,6 @@
 Name:Ooze Token
 ManaCost:no cost
-Types:Creature Ooze
 Colors:green
+Types:Creature Ooze
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_phyrexian_insect_infect.txt b/forge-gui/res/tokenscripts/g_1_1_phyrexian_insect_infect.txt
index c7b2e2ac5f8..af85adcf6dc 100644
--- a/forge-gui/res/tokenscripts/g_1_1_phyrexian_insect_infect.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_phyrexian_insect_infect.txt
@@ -1,7 +1,7 @@
 Name:Phyrexian Insect Token
 ManaCost:no cost
-PT:1/1
 Colors:green
 Types:Creature Phyrexian Insect
+PT:1/1
 K:Infect
 Oracle:Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
diff --git a/forge-gui/res/tokenscripts/g_1_1_phyrexian_saproling.txt b/forge-gui/res/tokenscripts/g_1_1_phyrexian_saproling.txt
index c0a4afab27a..8821e46bc3a 100644
--- a/forge-gui/res/tokenscripts/g_1_1_phyrexian_saproling.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_phyrexian_saproling.txt
@@ -1,6 +1,6 @@
 Name:Phyrexian Saproling Token
 ManaCost:no cost
-Types:Creature Phyrexian Saproling
 Colors:green
+Types:Creature Phyrexian Saproling
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_plant.txt b/forge-gui/res/tokenscripts/g_1_1_plant.txt
index 39b141dd1e1..a180e938987 100644
--- a/forge-gui/res/tokenscripts/g_1_1_plant.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_plant.txt
@@ -1,6 +1,6 @@
 Name:Plant Token
 ManaCost:no cost
-Types:Creature Plant
 Colors:green
+Types:Creature Plant
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_saproling.txt b/forge-gui/res/tokenscripts/g_1_1_saproling.txt
index f721ca4b7b0..20d354bf170 100644
--- a/forge-gui/res/tokenscripts/g_1_1_saproling.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_saproling.txt
@@ -1,6 +1,6 @@
 Name:Saproling Token
 ManaCost:no cost
-Types:Creature Saproling
 Colors:green
+Types:Creature Saproling
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_snake.txt b/forge-gui/res/tokenscripts/g_1_1_snake.txt
index 85efd1a2606..717b0877a37 100644
--- a/forge-gui/res/tokenscripts/g_1_1_snake.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_snake.txt
@@ -1,6 +1,6 @@
 Name:Snake Token
 ManaCost:no cost
-Types:Creature Snake
 Colors:green
+Types:Creature Snake
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_snake_deathtouch.txt b/forge-gui/res/tokenscripts/g_1_1_snake_deathtouch.txt
index e743a77c835..a1b3bc5f6c5 100644
--- a/forge-gui/res/tokenscripts/g_1_1_snake_deathtouch.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_snake_deathtouch.txt
@@ -1,7 +1,7 @@
 Name:Snake Token
 ManaCost:no cost
-Types:Creature Snake
 Colors:green
+Types:Creature Snake
 PT:1/1
 K:Deathtouch
 Oracle:Deathtouch
diff --git a/forge-gui/res/tokenscripts/g_1_1_spike.txt b/forge-gui/res/tokenscripts/g_1_1_spike.txt
index 5444cda69d2..cadfa6c4638 100644
--- a/forge-gui/res/tokenscripts/g_1_1_spike.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_spike.txt
@@ -1,6 +1,6 @@
 Name:Spike Token
 ManaCost:no cost
-Types:Creature Spike
 Colors:green
+Types:Creature Spike
 PT:1/1
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_squirrel.txt b/forge-gui/res/tokenscripts/g_1_1_squirrel.txt
index b092e423e19..2b1f57ea6b4 100644
--- a/forge-gui/res/tokenscripts/g_1_1_squirrel.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_squirrel.txt
@@ -1,6 +1,6 @@
 Name:Squirrel Token
 ManaCost:no cost
+Colors:green
 Types:Creature Squirrel
 PT:1/1
-Colors:green
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_tyranid.txt b/forge-gui/res/tokenscripts/g_1_1_tyranid.txt
index b8c4a6a73be..6bc2312fcb4 100644
--- a/forge-gui/res/tokenscripts/g_1_1_tyranid.txt
+++ b/forge-gui/res/tokenscripts/g_1_1_tyranid.txt
@@ -1,6 +1,6 @@
 Name:Tyranid Token
 ManaCost:no cost
+Colors:green
 Types:Creature Tyranid
 PT:1/1
-Colors:green
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_2_spider_reach.txt b/forge-gui/res/tokenscripts/g_1_2_spider_reach.txt
index ae4131fba2c..8ccd6f50d8f 100644
--- a/forge-gui/res/tokenscripts/g_1_2_spider_reach.txt
+++ b/forge-gui/res/tokenscripts/g_1_2_spider_reach.txt
@@ -1,7 +1,7 @@
 Name:Spider Token
 ManaCost:no cost
+Colors:green
 Types:Creature Spider
 PT:1/2
-Colors:green
 K:Reach
 Oracle:Reach
diff --git a/forge-gui/res/tokenscripts/g_1_3_e_spider_reach.txt b/forge-gui/res/tokenscripts/g_1_3_e_spider_reach.txt
index ad0d5dda10e..26f35dfa606 100644
--- a/forge-gui/res/tokenscripts/g_1_3_e_spider_reach.txt
+++ b/forge-gui/res/tokenscripts/g_1_3_e_spider_reach.txt
@@ -1,7 +1,7 @@
 Name:Spider Token
 ManaCost:no cost
+Colors:green
 Types:Enchantment Creature Spider
 PT:1/3
-Colors:green
 K:Reach
 Oracle:Reach (This creature can block creatures with flying.)
diff --git a/forge-gui/res/tokenscripts/g_2_1_varmint.txt b/forge-gui/res/tokenscripts/g_2_1_varmint.txt
index 6a75a0c89fc..b41a04132b7 100644
--- a/forge-gui/res/tokenscripts/g_2_1_varmint.txt
+++ b/forge-gui/res/tokenscripts/g_2_1_varmint.txt
@@ -1,6 +1,6 @@
 Name:Varmint Token
 ManaCost:no cost
+Colors:green
 Types:Creature Varmint
 PT:2/1
-Colors:green
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_2_2_alien_salamander_islandwalk.txt b/forge-gui/res/tokenscripts/g_2_2_alien_salamander_islandwalk.txt
index f736128c909..143ff99103a 100644
--- a/forge-gui/res/tokenscripts/g_2_2_alien_salamander_islandwalk.txt
+++ b/forge-gui/res/tokenscripts/g_2_2_alien_salamander_islandwalk.txt
@@ -1,7 +1,7 @@
 Name:Alien Salamander Token
 ManaCost:no cost
-Types:Creature Alien Salamander
 Colors:green
+Types:Creature Alien Salamander
 PT:2/2
 K:Landwalk:Island
 Oracle:Islandwalk
diff --git a/forge-gui/res/tokenscripts/g_2_2_bear.txt b/forge-gui/res/tokenscripts/g_2_2_bear.txt
index 905e64122bf..777946ef170 100644
--- a/forge-gui/res/tokenscripts/g_2_2_bear.txt
+++ b/forge-gui/res/tokenscripts/g_2_2_bear.txt
@@ -1,6 +1,6 @@
 Name:Bear Token
 ManaCost:no cost
-PT:2/2
 Colors:green
 Types:Creature Bear
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_2_2_beast.txt b/forge-gui/res/tokenscripts/g_2_2_beast.txt
index a0357a9d9f6..f57b0527535 100644
--- a/forge-gui/res/tokenscripts/g_2_2_beast.txt
+++ b/forge-gui/res/tokenscripts/g_2_2_beast.txt
@@ -1,6 +1,6 @@
 Name:Beast Token
 ManaCost:no cost
-PT:2/2
 Colors:green
 Types:Creature Beast
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_2_2_boar.txt b/forge-gui/res/tokenscripts/g_2_2_boar.txt
index 7beac13f444..e3dcecbae91 100644
--- a/forge-gui/res/tokenscripts/g_2_2_boar.txt
+++ b/forge-gui/res/tokenscripts/g_2_2_boar.txt
@@ -1,6 +1,6 @@
 Name:Boar Token
 ManaCost:no cost
-PT:2/2
 Colors:green
 Types:Creature Boar
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_2_2_cat_warrior_forestwalk.txt b/forge-gui/res/tokenscripts/g_2_2_cat_warrior_forestwalk.txt
index 4b99c17db0e..e46a733191b 100644
--- a/forge-gui/res/tokenscripts/g_2_2_cat_warrior_forestwalk.txt
+++ b/forge-gui/res/tokenscripts/g_2_2_cat_warrior_forestwalk.txt
@@ -1,7 +1,7 @@
 Name:Cat Warrior Token
 ManaCost:no cost
-Types:Creature Cat Warrior
 Colors:green
+Types:Creature Cat Warrior
 PT:2/2
 K:Landwalk:Forest
 Oracle:Forestwalk
diff --git a/forge-gui/res/tokenscripts/g_2_2_gorilla.txt b/forge-gui/res/tokenscripts/g_2_2_gorilla.txt
index 26ba71b12b7..769d139dac6 100644
--- a/forge-gui/res/tokenscripts/g_2_2_gorilla.txt
+++ b/forge-gui/res/tokenscripts/g_2_2_gorilla.txt
@@ -1,6 +1,6 @@
 Name:Gorilla Token
 ManaCost:no cost
-PT:2/2
 Colors:green
 Types:Creature Gorilla
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_2_2_lizard.txt b/forge-gui/res/tokenscripts/g_2_2_lizard.txt
index 251dbfebba6..b0ff3b3cc79 100644
--- a/forge-gui/res/tokenscripts/g_2_2_lizard.txt
+++ b/forge-gui/res/tokenscripts/g_2_2_lizard.txt
@@ -1,6 +1,6 @@
 Name:Lizard Token
 ManaCost:no cost
-PT:2/2
 Colors:green
 Types:Creature Lizard
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_2_2_monkey.txt b/forge-gui/res/tokenscripts/g_2_2_monkey.txt
index a363cf5df65..8e3ebc01034 100644
--- a/forge-gui/res/tokenscripts/g_2_2_monkey.txt
+++ b/forge-gui/res/tokenscripts/g_2_2_monkey.txt
@@ -1,6 +1,6 @@
 Name:Monkey Token
 ManaCost:no cost
-PT:2/2
 Colors:green
 Types:Creature Monkey
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_2_2_ooze.txt b/forge-gui/res/tokenscripts/g_2_2_ooze.txt
index 89a5cb3d6c1..e2753144492 100644
--- a/forge-gui/res/tokenscripts/g_2_2_ooze.txt
+++ b/forge-gui/res/tokenscripts/g_2_2_ooze.txt
@@ -1,6 +1,6 @@
 Name:Ooze Token
 ManaCost:no cost
-Types:Creature Ooze
 Colors:green
+Types:Creature Ooze
 PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_2_2_ooze_mitotic.txt b/forge-gui/res/tokenscripts/g_2_2_ooze_mitotic.txt
index 3b8bc8f0021..b4262b940ef 100644
--- a/forge-gui/res/tokenscripts/g_2_2_ooze_mitotic.txt
+++ b/forge-gui/res/tokenscripts/g_2_2_ooze_mitotic.txt
@@ -1,7 +1,7 @@
 Name:Ooze Token
 ManaCost:no cost
-Types:Creature Ooze
 Colors:green
+Types:Creature Ooze
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigTokenJunior | TriggerDescription$ When this creature dies, create two 1/1 green Ooze creature tokens.
 SVar:TrigTokenJunior:DB$ Token | TokenScript$ g_1_1_ooze | TokenOwner$ You | TokenAmount$ 2
diff --git a/forge-gui/res/tokenscripts/g_2_2_spider_reach.txt b/forge-gui/res/tokenscripts/g_2_2_spider_reach.txt
index 1f0ddf4cda3..c2a146a6f66 100644
--- a/forge-gui/res/tokenscripts/g_2_2_spider_reach.txt
+++ b/forge-gui/res/tokenscripts/g_2_2_spider_reach.txt
@@ -1,7 +1,7 @@
 Name:Spider Token
 ManaCost:no cost
+Colors:green
 Types:Creature Spider
 PT:2/2
-Colors:green
 K:Reach
 Oracle:Reach
diff --git a/forge-gui/res/tokenscripts/g_2_2_wolf.txt b/forge-gui/res/tokenscripts/g_2_2_wolf.txt
index e7c16a1d768..e8cfda2491e 100644
--- a/forge-gui/res/tokenscripts/g_2_2_wolf.txt
+++ b/forge-gui/res/tokenscripts/g_2_2_wolf.txt
@@ -1,6 +1,6 @@
 Name:Wolf Token
 ManaCost:no cost
-PT:2/2
 Colors:green
 Types:Creature Wolf
+PT:2/2
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_2_3_antelope_forestwalk.txt b/forge-gui/res/tokenscripts/g_2_3_antelope_forestwalk.txt
index e18e8e861fb..d9431ac0d1d 100644
--- a/forge-gui/res/tokenscripts/g_2_3_antelope_forestwalk.txt
+++ b/forge-gui/res/tokenscripts/g_2_3_antelope_forestwalk.txt
@@ -1,7 +1,7 @@
 Name:Antelope Token
 ManaCost:no cost
-Types:Creature Antelope
 Colors:green
+Types:Creature Antelope
 PT:2/3
 K:Landwalk:Forest
 Oracle:Forestwalk
diff --git a/forge-gui/res/tokenscripts/g_2_5_treefolk_shaman.txt b/forge-gui/res/tokenscripts/g_2_5_treefolk_shaman.txt
index 97a0457c01f..77233f96692 100644
--- a/forge-gui/res/tokenscripts/g_2_5_treefolk_shaman.txt
+++ b/forge-gui/res/tokenscripts/g_2_5_treefolk_shaman.txt
@@ -1,6 +1,6 @@
 Name:Treefolk Shaman Token
 ManaCost:no cost
-PT:2/5
 Colors:green
 Types:Creature Treefolk Shaman
+PT:2/5
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_3_2_cat_shroud.txt b/forge-gui/res/tokenscripts/g_3_2_cat_shroud.txt
index c8031e4a07d..225060ec8e3 100644
--- a/forge-gui/res/tokenscripts/g_3_2_cat_shroud.txt
+++ b/forge-gui/res/tokenscripts/g_3_2_cat_shroud.txt
@@ -1,7 +1,7 @@
 Name:Cat Token
 ManaCost:no cost
-Types:Creature Cat
 Colors:green
+Types:Creature Cat
 PT:3/2
 K:Shroud
 Oracle:Shroud
diff --git a/forge-gui/res/tokenscripts/g_3_3_badger.txt b/forge-gui/res/tokenscripts/g_3_3_badger.txt
index d71398dd18b..14ceb0a5850 100644
--- a/forge-gui/res/tokenscripts/g_3_3_badger.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_badger.txt
@@ -1,6 +1,6 @@
 Name:Badger Token
 ManaCost:no cost
-Types:Creature Badger
 Colors:green
+Types:Creature Badger
 PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_3_3_centaur.txt b/forge-gui/res/tokenscripts/g_3_3_centaur.txt
index 33f5b4d6b56..b82c9058ea5 100644
--- a/forge-gui/res/tokenscripts/g_3_3_centaur.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_centaur.txt
@@ -1,6 +1,6 @@
 Name:Centaur Token
 ManaCost:no cost
-Types:Creature Centaur
 Colors:green
+Types:Creature Centaur
 PT:3/3
 Oracle:
diff --git a/forge-gui/res/tokenscripts/g_3_3_centaur_pro_black.txt b/forge-gui/res/tokenscripts/g_3_3_centaur_pro_black.txt
index 1ef8280ccda..6cd5cf8df38 100644
--- a/forge-gui/res/tokenscripts/g_3_3_centaur_pro_black.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_centaur_pro_black.txt
@@ -1,7 +1,7 @@
 Name:Centaur Token
 ManaCost:no cost
-Types:Creature Centaur
 Colors:green
+Types:Creature Centaur
 PT:3/3
 K:Protection from black
 Oracle:Protection from black