diff --git a/b_x_x_minion.txt b/b_x_x_minion.txt
new file mode 100644
index 00000000000..4103864eb8b
--- /dev/null
+++ b/b_x_x_minion.txt
@@ -0,0 +1,6 @@
+Name:Minion
+ManaCost:no cost
+Types:Creature Minion
+PT:*/*
+Colors:black
+Oracle:
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/goblin_offensive.txt b/forge-gui/res/cardsfolder/g/goblin_offensive.txt
index 8832d19dae3..539a7713ad3 100644
--- a/forge-gui/res/cardsfolder/g/goblin_offensive.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_offensive.txt
@@ -1,7 +1,7 @@
 Name:Goblin Offensive
 ManaCost:X 1 R R
 Types:Sorcery
-A:SP$ Token | Cost$ X 1 R R | TokenAmount$ X | TokenScript$ r_1_1_goblin | TokenOwner$ You | References$ X | SpellDescription$ Create X 1/1 red Goblin creature tokens.
+A:SP$ Token | Cost$ X 1 R R | TokenAmount$ X | TokenScript$ r_1_1_goblin | TokenOwner$ You | LegacyImage$ r_1_1_goblin | References$ X | SpellDescription$ Create X 1/1 red Goblin creature tokens.
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_offensive.jpg
 Oracle:Create X 1/1 red Goblin creature tokens.
diff --git a/forge-gui/res/cardsfolder/g/greener_pastures.txt b/forge-gui/res/cardsfolder/g/greener_pastures.txt
index b02d0c8b004..e2b21bb91ac 100644
--- a/forge-gui/res/cardsfolder/g/greener_pastures.txt
+++ b/forge-gui/res/cardsfolder/g/greener_pastures.txt
@@ -2,7 +2,7 @@ Name:Greener Pastures
 ManaCost:2 G
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigToken | CheckSVar$ ActiveLands | SVarCompare$ GTHighestOpp | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, if that player controls more lands than each other player, the player creates a 1/1 green Saproling creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ TriggeredPlayer | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_1_1_saproling | TokenOwner$ TriggeredPlayer | LegacyImage$ g_1_1_saproling
 SVar:ActiveLands:Count$Valid Land.ActivePlayerCtrl
 SVar:HighestOpp:PlayerCountNonActive$HighestValid Land.YouCtrl
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/m/metrognome.txt b/forge-gui/res/cardsfolder/m/metrognome.txt
index 9f5e248eb8b..d56d48b5fab 100644
--- a/forge-gui/res/cardsfolder/m/metrognome.txt
+++ b/forge-gui/res/cardsfolder/m/metrognome.txt
@@ -1,7 +1,7 @@
 Name:Metrognome
 ManaCost:4
 Types:Artifact
-A:AB$ Token | Cost$ 4 T | TokenAmount$ 1 | TokenName$ Gnome | TokenTypes$ Artifact,Creature,Gnome | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Create a 1/1 colorless Gnome artifact creature token.
+A:AB$ Token | Cost$ 4 T | TokenAmount$ 1 | TokenScript$ c_1_1_a_gnome | TokenOwner$ You | LegacyImage$ c 1 1 a gnome | SpellDescription$ Create a 1/1 colorless Gnome artifact creature token.
 T:Mode$ Discarded | ValidCard$ Card.Self | ValidCause$ Card.OppCtrl | Execute$ TrigToken | TriggerDescription$ When a spell or ability an opponent controls causes you to discard CARDNAME, create four 1/1 colorless Gnome artifact creature tokens.
 SVar:TrigToken:DB$ Token | TokenAmount$ 4 | TokenName$ Gnome | TokenTypes$ Artifact,Creature,Gnome | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1
 SVar:DiscardMeByOpp:2
diff --git a/forge-gui/res/cardsfolder/m/midsummer_revel.txt b/forge-gui/res/cardsfolder/m/midsummer_revel.txt
index 884f7b1aefd..9676b8f0a18 100644
--- a/forge-gui/res/cardsfolder/m/midsummer_revel.txt
+++ b/forge-gui/res/cardsfolder/m/midsummer_revel.txt
@@ -2,7 +2,7 @@ Name:Midsummer Revel
 ManaCost:3 G G
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, you may put a verse counter on CARDNAME.
-A:AB$ Token | Cost$ G Sac<1/CARDNAME> | TokenImage$ g 3 3 beast | TokenAmount$ X | References$ X | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Create X 3/3 green Beast creature tokens.
+A:AB$ Token | Cost$ G Sac<1/CARDNAME> | LegacyImage$ g 3 3 beast | TokenAmount$ X | References$ X | TokenScript$ g_3_3_beast | TokenOwner$ You | SpellDescription$ Create X 3/3 green Beast creature tokens.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ VERSE | CounterNum$ 1
 AI:RemoveDeck:All
 SVar:X:Count$CardCounters.VERSE
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_processor.txt b/forge-gui/res/cardsfolder/p/phyrexian_processor.txt
index e2fa0b3d50e..410ecfb693c 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_processor.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_processor.txt
@@ -4,7 +4,7 @@ Types:Artifact
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ PayLife | Description$ As CARDNAME enters the battlefield, pay any amount of life.
 SVar:PayLife:AB$ StoreSVar | Cost$ PayLife<X> | References$ X | SVar$ LifePaidOnETB | Type$ CountSVar | Expression$ ChosenX | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ All | Destination$ Battlefield
-A:AB$ Token | Cost$ 4 T | TokenAmount$ 1 | TokenName$ Minion | TokenTypes$ Creature,Minion | TokenOwner$ You | TokenColors$ Black | TokenPower$ LifePaidOnETB | TokenToughness$ LifePaidOnETB | TokenImage$ b x x minion | SpellDescription$ Create an X/X black Minion creature token, where X is the life paid as CARDNAME entered the battlefield.
+A:AB$ Token | Cost$ 4 T | TokenAmount$ 1 | TokenScript$ b_x_x_minion | TokenOwner$ You | TokenPower$ LifePaidOnETB | TokenToughness$ LifePaidOnETB | LegacyImage$ b x x minion dde | SpellDescription$ Create an X/X black Minion creature token, where X is the life paid as CARDNAME entered the battlefield.
 SVar:X:XChoice
 SVar:LifePaidOnETB:Number$0
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/s/sporogenesis.txt b/forge-gui/res/cardsfolder/s/sporogenesis.txt
index c5685fe1f59..1f8df920646 100644
--- a/forge-gui/res/cardsfolder/s/sporogenesis.txt
+++ b/forge-gui/res/cardsfolder/s/sporogenesis.txt
@@ -4,7 +4,7 @@ Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, you may put a fungus counter on target nontoken creature.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.nonToken | TgtPrompt$ Select target nontoken creature | CounterType$ FUNGUS | CounterNum$ 1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Creature.counters_GE1_FUNGUS | Execute$ TrigToken | TriggerDescription$ Whenever a creature with a fungus counter on it dies, create a 1/1 green Saproling creature token for each fungus counter on that creature.
-SVar:TrigToken:DB$ Token | TokenAmount$ X | References$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
+SVar:TrigToken:DB$ Token | TokenAmount$ X | References$ X | TokenScript$ g_1_1_saproling | TokenOwner$ You | LegacyImage$ g 1 1 saproling
 SVar:X:TriggeredCard$CardCounters.FUNGUS
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigRemove | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, remove all fungus counters from all creatures.
 SVar:TrigRemove:DB$ RepeatEach | RepeatCards$ Creature | RepeatSubAbility$ DBRemoveFungus
diff --git a/forge-gui/res/cardsfolder/w/waylay.txt b/forge-gui/res/cardsfolder/w/waylay.txt
index 74b21070a36..d06de614bd2 100644
--- a/forge-gui/res/cardsfolder/w/waylay.txt
+++ b/forge-gui/res/cardsfolder/w/waylay.txt
@@ -1,8 +1,9 @@
 Name:Waylay
 ManaCost:2 W
 Types:Instant
-A:SP$ Token | Cost$ 2 W | TokenAmount$ 3 | TokenScript$ w_2_2_knight | AtEOT$ Exile | SpellDescription$ Create three 2/2 white Knight creature tokens. Exile them at the beginning of the next cleanup step.
+A:SP$ Token | Cost$ 2 W | TokenAmount$ 3 | TokenScript$ w_2_2_knight | TokenOwner$ You | LegacyImage$ w_2_2_knight | AtEOT$ Exile | SpellDescription$ Create three 2/2 white Knight creature tokens. Exile them at the beginning of the next cleanup step.
 DeckHas:Ability$Token
 AI:RemoveDeck:All
+DeckHints:Type$Knight
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waylay.jpg
 Oracle:Create three 2/2 white Knight creature tokens. Exile them at the beginning of the next cleanup step.
diff --git a/forge-gui/res/tokenscripts/c_1_1_a_gnome.txt b/forge-gui/res/tokenscripts/c_1_1_a_gnome.txt
new file mode 100644
index 00000000000..107f12cf528
--- /dev/null
+++ b/forge-gui/res/tokenscripts/c_1_1_a_gnome.txt
@@ -0,0 +1,5 @@
+Name:Gnome
+ManaCost:no cost
+PT:1/1
+Types:Artifact Creature Gnome
+Oracle:
\ No newline at end of file
diff --git a/forge-gui/res/tokenscripts/g_3_3_beast.txt b/forge-gui/res/tokenscripts/g_3_3_beast.txt
new file mode 100644
index 00000000000..80918b83e63
--- /dev/null
+++ b/forge-gui/res/tokenscripts/g_3_3_beast.txt
@@ -0,0 +1,6 @@
+Name:Beast
+Colors:green
+ManaCost:no cost
+PT:3/3
+Types:Creature Beast
+Oracle:
\ No newline at end of file