diff --git a/forge-gui/res/cardsfolder/a/angelic_accord.txt b/forge-gui/res/cardsfolder/a/angelic_accord.txt
index 216dc9adc8b..bfa1c170a84 100644
--- a/forge-gui/res/cardsfolder/a/angelic_accord.txt
+++ b/forge-gui/res/cardsfolder/a/angelic_accord.txt
@@ -1,9 +1,9 @@
-Name:Angelic Accord
-ManaCost:3 W
-Types:Enchantment
-T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | CheckSVar$ YouLifeGained | SVarCompare$ GE4 | Execute$ TrigToken | TriggerDescription$ At the beginning of each end step, if you gained 4 or more life this turn, put a 4/4 white Angel creature token with flying onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenImage$ w 4 4 angel M14 | TokenKeywords$ Flying
-SVar:YouLifeGained:Count$LifeYouGainedThisTurn
-SVar:RemRandomDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_accord.jpg
-Oracle:At the beginning of each end step, if you gained 4 or more life this turn, put a 4/4 white Angel creature token with flying onto the battlefield.
+Name:Angelic Accord
+ManaCost:3 W
+Types:Enchantment
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | CheckSVar$ YouLifeGained | SVarCompare$ GE4 | Execute$ TrigToken | TriggerDescription$ At the beginning of each end step, if you gained 4 or more life this turn, create a 4/4 white Angel creature token with flying.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenImage$ w 4 4 angel M14 | TokenKeywords$ Flying
+SVar:YouLifeGained:Count$LifeYouGainedThisTurn
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_accord.jpg
+Oracle:At the beginning of each end step, if you gained 4 or more life this turn, create a 4/4 white Angel creature token with flying.
diff --git a/forge-gui/res/cardsfolder/a/angelic_favor.txt b/forge-gui/res/cardsfolder/a/angelic_favor.txt
index f8511e47e61..c783f3f87cc 100644
--- a/forge-gui/res/cardsfolder/a/angelic_favor.txt
+++ b/forge-gui/res/cardsfolder/a/angelic_favor.txt
@@ -1,9 +1,9 @@
 Name:Angelic Favor
 ManaCost:3 W
 Types:Instant
-A:SP$ Token | Cost$ 3 W | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenSVars$ AngelicFavorEOT | AtEOT$ Exile | ActivationPhases$ BeginCombat->EndCombat | SpellDescription$ Cast CARDNAME only during combat. Put a 4/4 white Angel creature token with flying onto the battlefield. Exile it at the beginning of the next end step.
+A:SP$ Token | Cost$ 3 W | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenSVars$ AngelicFavorEOT | AtEOT$ Exile | ActivationPhases$ BeginCombat->EndCombat | SpellDescription$ Cast CARDNAME only during combat. Create a 4/4 white Angel creature token with flying. Exile it at the beginning of the next end step.
 SVar:AngelicFavorEOT:SVar:EndOfTurnLeavePlay:True
 SVar:AltCost:Cost$ tapXType<1/Creature> | IsPresent$ Plains.YouCtrl | Description$ If you control a Plains, you may tap an untapped creature you control rather than pay CARDNAME's mana cost. 
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_favor.jpg
-Oracle:If you control a Plains, you may tap an untapped creature you control rather than pay Angelic Favor's mana cost.\nCast Angelic Favor only during combat.\nPut a 4/4 white Angel creature token with flying onto the battlefield. Exile it at the beginning of the next end step.
+Oracle:If you control a Plains, you may tap an untapped creature you control rather than pay Angelic Favor's mana cost.\nCast Angelic Favor only during combat.\nCreate a 4/4 white Angel creature token with flying. Exile it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/a/assault_battery.txt b/forge-gui/res/cardsfolder/a/assault_battery.txt
index 52e5b3ac71d..34192d1b03a 100644
--- a/forge-gui/res/cardsfolder/a/assault_battery.txt
+++ b/forge-gui/res/cardsfolder/a/assault_battery.txt
@@ -1,15 +1,15 @@
-Name:Assault
-ManaCost:R
-AlternateMode: Split
-Types:Sorcery
-A:SP$ DealDamage | Cost$ R | NumDmg$ 2 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | SpellDescription$ Assault deals 2 damage to target creature or player.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/assault_battery.jpg
-Oracle:Assault deals 2 damage to target creature or player.
-
-ALTERNATE
-
-Name:Battery
-ManaCost:3 G
-Types:Sorcery
-A:SP$ Token | Cost$ 3 G | TokenAmount$ 1 | TokenName$ Elephant| TokenTypes$ Creature,Elephant| TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 elephant | SpellDescription$ Put a 3/3 green Elephant creature token onto the battlefield.
-Oracle:Put a 3/3 green Elephant creature token onto the battlefield.
+Name:Assault
+ManaCost:R
+AlternateMode: Split
+Types:Sorcery
+A:SP$ DealDamage | Cost$ R | NumDmg$ 2 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | SpellDescription$ Assault deals 2 damage to target creature or player.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/assault_battery.jpg
+Oracle:Assault deals 2 damage to target creature or player.
+
+ALTERNATE
+
+Name:Battery
+ManaCost:3 G
+Types:Sorcery
+A:SP$ Token | Cost$ 3 G | TokenAmount$ 1 | TokenName$ Elephant| TokenTypes$ Creature,Elephant| TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 elephant | SpellDescription$ Create a 3/3 green Elephant creature token.
+Oracle:Create a 3/3 green Elephant creature token.
diff --git a/forge-gui/res/cardsfolder/a/avenger_of_zendikar.txt b/forge-gui/res/cardsfolder/a/avenger_of_zendikar.txt
index 17bf8916f92..dc1a4bf4ff8 100644
--- a/forge-gui/res/cardsfolder/a/avenger_of_zendikar.txt
+++ b/forge-gui/res/cardsfolder/a/avenger_of_zendikar.txt
@@ -2,11 +2,11 @@ Name:Avenger of Zendikar
 ManaCost:5 G G
 Types:Creature Elemental
 PT:5/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 0/1 green Plant creature token onto the battlefield for each land you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 0/1 green Plant creature token for each land you control.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ X | TokenName$ Plant | TokenTypes$ Creature,Plant | TokenOwner$ You | TokenColors$ Green | TokenPower$ 0 | TokenToughness$ 1 | References$ X
 SVar:X:Count$NumTypeYouCtrl.Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounterAll | OptionalDecider$ You | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, you may put a +1/+1 counter on each Plant creature you control.
 SVar:TrigPutCounterAll:AB$PutCounterAll | Cost$ 0 | ValidCards$ Creature.Plant+YouCtrl | CounterType$ P1P1 | CounterNum$ 1
 SVar:BuffedBy:Land
 SVar:Picture:http://www.wizards.com/global/images/magic/general/avenger_of_zendikar.jpg
-Oracle:When Avenger of Zendikar enters the battlefield, put a 0/1 green Plant creature token onto the battlefield for each land you control.\nLandfall - Whenever a land enters the battlefield under your control, you may put a +1/+1 counter on each Plant creature you control.
+Oracle:When Avenger of Zendikar enters the battlefield, create a 0/1 green Plant creature token for each land you control.\nLandfall - Whenever a land enters the battlefield under your control, you may put a +1/+1 counter on each Plant creature you control.
diff --git a/forge-gui/res/cardsfolder/b/beast_within.txt b/forge-gui/res/cardsfolder/b/beast_within.txt
index a976be69215..18570e25ef2 100644
--- a/forge-gui/res/cardsfolder/b/beast_within.txt
+++ b/forge-gui/res/cardsfolder/b/beast_within.txt
@@ -1,8 +1,8 @@
-Name:Beast Within
+beast withinName:Beast Within
 ManaCost:2 G
 Types:Instant
-A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | AITgts$ Card.cmcGE4 | SubAbility$ DBToken | SpellDescription$ Destroy target permanent. Its controller puts a 3/3 green Beast creature token onto the battlefield.
+A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | AITgts$ Card.cmcGE4 | SubAbility$ DBToken | SpellDescription$ Destroy target permanent. Its controller creates a 3/3 green Beast creature token.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ TargetedController | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 beast NPH
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/beast_within.jpg
-Oracle:Destroy target permanent. Its controller puts a 3/3 green Beast creature token onto the battlefield.
+Oracle:Destroy target permanent. Its controller creates a 3/3 green Beast creature token.
diff --git a/forge-gui/res/cardsfolder/b/beetleback_chief.txt b/forge-gui/res/cardsfolder/b/beetleback_chief.txt
index 8863dffecd4..d2b3442f897 100644
--- a/forge-gui/res/cardsfolder/b/beetleback_chief.txt
+++ b/forge-gui/res/cardsfolder/b/beetleback_chief.txt
@@ -1,8 +1,8 @@
-Name:Beetleback Chief
-ManaCost:2 R R
-Types:Creature Goblin Warrior
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put two 1/1 red Goblin creature tokens onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 2 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/beetleback_chief.jpg
-Oracle:When Beetleback Chief enters the battlefield, put two 1/1 red Goblin creature tokens onto the battlefield.
+Name:Beetleback Chief
+ManaCost:2 R R
+Types:Creature Goblin Warrior
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 red Goblin creature tokens.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 2 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/beetleback_chief.jpg
+Oracle:When Beetleback Chief enters the battlefield, create two 1/1 red Goblin creature tokens.
diff --git a/forge-gui/res/cardsfolder/b/bestial_menace.txt b/forge-gui/res/cardsfolder/b/bestial_menace.txt
index 7516f3e0020..9371004e152 100644
--- a/forge-gui/res/cardsfolder/b/bestial_menace.txt
+++ b/forge-gui/res/cardsfolder/b/bestial_menace.txt
@@ -1,8 +1,8 @@
 Name:Bestial Menace
 ManaCost:3 G G
 Types:Sorcery
-A:SP$ Token | Cost$ 3 G G | TokenAmount$ 1 | TokenName$ Snake | TokenTypes$ Creature,Snake | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SubAbility$ DBWolfToken | SpellDescription$ Put a 1/1 green Snake creature token,
+A:SP$ Token | Cost$ 3 G G | TokenAmount$ 1 | TokenName$ Snake | TokenTypes$ Creature,Snake | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SubAbility$ DBWolfToken | SpellDescription$ Create a 1/1 green Snake creature token,
 SVar:DBWolfToken:DB$ Token | TokenAmount$ 1 | TokenName$ Wolf | TokenTypes$ Creature,Wolf | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ g 2 2 wolf ZEN | SubAbility$ DBElephantToken | SpellDescription$ a 2/2 green Wolf creature token,
-SVar:DBElephantToken:DB$ Token | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 elephant WWK | SpellDescription$ and a 3/3 green Elephant creature token onto the battlefield.
+SVar:DBElephantToken:DB$ Token | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 elephant WWK | SpellDescription$ and a 3/3 green Elephant creature token.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bestial_menace.jpg
-Oracle:Put a 1/1 green Snake creature token, a 2/2 green Wolf creature token, and a 3/3 green Elephant creature token onto the battlefield.
+Oracle:Create a 1/1 green Snake creature token, a 2/2 green Wolf creature token, and a 3/3 green Elephant creature token.
diff --git a/forge-gui/res/cardsfolder/b/brindle_shoat.txt b/forge-gui/res/cardsfolder/b/brindle_shoat.txt
index 40d3bc8d72d..b1291ae11ce 100644
--- a/forge-gui/res/cardsfolder/b/brindle_shoat.txt
+++ b/forge-gui/res/cardsfolder/b/brindle_shoat.txt
@@ -1,9 +1,9 @@
-Name:Brindle Shoat
-ManaCost:1 G
-Types:Creature Boar
-PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a 3/3 green Boar creature token onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Boar | TokenTypes$ Creature,Boar | TokenOwner$ TriggeredCardController | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3
-SVar:SacMe:4
-SVar:Picture:http://www.wizards.com/global/images/magic/general/brindle_shoat.jpg
-Oracle:When Brindle Shoat dies, put a 3/3 green Boar creature token onto the battlefield.
+Name:Brindle Shoat
+ManaCost:1 G
+Types:Creature Boar
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, create a 3/3 green Boar creature token.
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Boar | TokenTypes$ Creature,Boar | TokenOwner$ TriggeredCardController | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3
+SVar:SacMe:4
+SVar:Picture:http://www.wizards.com/global/images/magic/general/brindle_shoat.jpg
+Oracle:When Brindle Shoat dies, create a 3/3 green Boar creature token.
diff --git a/forge-gui/res/cardsfolder/d/decree_of_justice.txt b/forge-gui/res/cardsfolder/d/decree_of_justice.txt
index be18e028d00..8ac0151e742 100644
--- a/forge-gui/res/cardsfolder/d/decree_of_justice.txt
+++ b/forge-gui/res/cardsfolder/d/decree_of_justice.txt
@@ -2,10 +2,10 @@ Name:Decree of Justice
 ManaCost:X X 2 W W
 Types:Sorcery
 K:Cycling:2 W
-A:SP$ Token | Cost$ X X 2 W W | TokenAmount$ X | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | References$ X | SpellDescription$ Put X 4/4 white Angel creature tokens with flying onto the battlefield.
+A:SP$ Token | Cost$ X X 2 W W | TokenAmount$ X | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | References$ X | SpellDescription$ Create X 4/4 white Angel creature tokens with flying.
 T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ When you cycle CARDNAME, you may pay {X}. If you do, put X 1/1 white Soldier creature tokens onto the battlefield.
 SVar:TrigToken:AB$ Token | Cost$ X | TokenAmount$ X | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | References$ X
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/decree_of_justice.jpg
-Oracle:Put X 4/4 white Angel creature tokens with flying onto the battlefield.\nCycling {2}{W} ({2}{W}, Discard this card: Draw a card.)\nWhen you cycle Decree of Justice, you may pay {X}. If you do, put X 1/1 white Soldier creature tokens onto the battlefield.
+Oracle:Create X 4/4 white Angel creature tokens with flying.\nCycling {2}{W} ({2}{W}, Discard this card: Draw a card.)\nWhen you cycle Decree of Justice, you may pay {X}. If you do, put X 1/1 white Soldier creature tokens onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/d/descend_upon_the_sinful.txt b/forge-gui/res/cardsfolder/d/descend_upon_the_sinful.txt
index 03f7493eaac..1e058775eaf 100644
--- a/forge-gui/res/cardsfolder/d/descend_upon_the_sinful.txt
+++ b/forge-gui/res/cardsfolder/d/descend_upon_the_sinful.txt
@@ -1,9 +1,9 @@
 Name:Descend upon the Sinful
 ManaCost:4 W W
 Types:Sorcery
-A:SP$ ChangeZoneAll | Cost$ 4 W W | ChangeType$ Creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | SpellDescription$ Exile all creatures. Delirium — Put a 4/4 white Angel creature token with flying onto the battlefield if there are four or more card types among cards in your graveyard.
+A:SP$ ChangeZoneAll | Cost$ 4 W W | ChangeType$ Creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | SpellDescription$ Exile all creatures. Delirium — Create a 4/4 white Angel creature token with flying if there are four or more card types among cards in your graveyard.
 SVar:DBToken:DB$ Token | Condition$ Delirium | Cost$ 0 | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenImage$ w 4 4 angel SOI
 DeckHints:Ability$Graveyard & Ability$Discard
 DeckHas:Ability$Delirium
 SVar:Picture:http://www.wizards.com/global/images/magic/general/descend_upon_the_sinful.jpg
-Oracle:Exile all creatures.\nDelirium — Put a 4/4 white Angel creature token with flying onto the battlefield if there are four or more card types among cards in your graveyard.
\ No newline at end of file
+Oracle:Exile all creatures.\nDelirium — Create a 4/4 white Angel creature token with flying if there are four or more card types among cards in your graveyard.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/devout_invocation.txt b/forge-gui/res/cardsfolder/d/devout_invocation.txt
index 19371a961be..e18085a16bc 100644
--- a/forge-gui/res/cardsfolder/d/devout_invocation.txt
+++ b/forge-gui/res/cardsfolder/d/devout_invocation.txt
@@ -1,12 +1,12 @@
-Name:Devout Invocation
-ManaCost:6 W
-Types:Sorcery
-A:SP$ ChooseCard | Cost$ 6 W | Defined$ You | MinAmount$ 0 | Amount$ X | References$ X | Choices$ Creature.untapped+YouCtrl | ChoiceTitle$ Choose any number of untapped creatures you control | ChoiceZone$ Battlefield | RememberChosen$ True | SubAbility$ TrigTap | SpellDescription$ Tap any number of untapped creatures you control. Put a 4/4 white Angel creature token with flying onto the battlefield for each creature tapped this way.
-SVar:TrigTap:DB$ Tap | Defined$ Remembered | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenAmount$ Y | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenImage$ w 4 4 angel M14 | TokenKeywords$ Flying | References$ Y | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$Valid Creature.YouCtrl
-SVar:Y:Remembered$Amount
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/devout_invocation.jpg
-Oracle:Tap any number of untapped creatures you control. Put a 4/4 white Angel creature token with flying onto the battlefield for each creature tapped this way.
+Name:Devout Invocation
+ManaCost:6 W
+Types:Sorcery
+A:SP$ ChooseCard | Cost$ 6 W | Defined$ You | MinAmount$ 0 | Amount$ X | References$ X | Choices$ Creature.untapped+YouCtrl | ChoiceTitle$ Choose any number of untapped creatures you control | ChoiceZone$ Battlefield | RememberChosen$ True | SubAbility$ TrigTap | SpellDescription$ Tap any number of untapped creatures you control. Create a 4/4 white Angel creature token with flying for each creature tapped this way.
+SVar:TrigTap:DB$ Tap | Defined$ Remembered | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ Y | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenImage$ w 4 4 angel M14 | TokenKeywords$ Flying | References$ Y | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$Valid Creature.YouCtrl
+SVar:Y:Remembered$Amount
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/devout_invocation.jpg
+Oracle:Tap any number of untapped creatures you control. Create a 4/4 white Angel creature token with flying for each creature tapped this way.
diff --git a/forge-gui/res/cardsfolder/e/elephant_ambush.txt b/forge-gui/res/cardsfolder/e/elephant_ambush.txt
index e8152c68d3b..5758b92495e 100644
--- a/forge-gui/res/cardsfolder/e/elephant_ambush.txt
+++ b/forge-gui/res/cardsfolder/e/elephant_ambush.txt
@@ -2,6 +2,6 @@ Name:Elephant Ambush
 ManaCost:2 G G
 Types:Instant
 K:Flashback 6 G G
-A:SP$ Token | Cost$ 2 G G | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 elephant ODY | SpellDescription$ Put a 3/3 green Elephant creature token onto the battlefield.
+A:SP$ Token | Cost$ 2 G G | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 elephant ODY | SpellDescription$ Create a 3/3 green Elephant creature token.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elephant_ambush.jpg
-Oracle:Put a 3/3 green Elephant creature token onto the battlefield.\nFlashback {6}{G}{G} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+Oracle:Create a 3/3 green Elephant creature token.\nFlashback {6}{G}{G} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/e/elephant_guide.txt b/forge-gui/res/cardsfolder/e/elephant_guide.txt
index 4ce2170914b..95507b1f526 100644
--- a/forge-gui/res/cardsfolder/e/elephant_guide.txt
+++ b/forge-gui/res/cardsfolder/e/elephant_guide.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | Description$ Enchanted creature gets +3/+3.
-T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigToken | TriggerDescription$ When enchanted creature dies, put a 3/3 green Elephant creature token onto the battlefield.
+T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigToken | TriggerDescription$ When enchanted creature dies, create a 3/3 green Elephant creature token.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elephant_guide.jpg
-Oracle:Enchant creature\nEnchanted creature gets +3/+3.\nWhen enchanted creature dies, put a 3/3 green Elephant creature token onto the battlefield.
+Oracle:Enchant creature\nEnchanted creature gets +3/+3.\nWhen enchanted creature dies, create a 3/3 green Elephant creature token.
diff --git a/forge-gui/res/cardsfolder/g/geist_of_saint_traft.txt b/forge-gui/res/cardsfolder/g/geist_of_saint_traft.txt
index 74ae7b5583a..774268c50cd 100644
--- a/forge-gui/res/cardsfolder/g/geist_of_saint_traft.txt
+++ b/forge-gui/res/cardsfolder/g/geist_of_saint_traft.txt
@@ -1,11 +1,11 @@
-Name:Geist of Saint Traft
-ManaCost:1 W U
-Types:Legendary Creature Spirit Cleric
-PT:2/2
-K:Hexproof
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at the end of combat.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenImage$ w 4 4 angel ISD | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenTapped$ True | TokenAttacking$ True | TokenSVars$ SaintTraftEOT | AtEOT$ ExileCombat
-SVar:HasAttackEffect:TRUE
-SVar:SaintTraftEOT:SVar:EndOfTurnLeavePlay:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/geist_of_saint_traft.jpg
-Oracle:Hexproof (This creature can't be the target of spells or abilities your opponents control.)\nWhenever Geist of Saint Traft attacks, put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at end of combat.
+Name:Geist of Saint Traft
+ManaCost:1 W U
+Types:Legendary Creature Spirit Cleric
+PT:2/2
+K:Hexproof
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create a 4/4 white Angel creature token with flying that's tapped and attacking. Exile that token at end of combat.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenImage$ w 4 4 angel ISD | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenTapped$ True | TokenAttacking$ True | TokenSVars$ SaintTraftEOT | AtEOT$ ExileCombat
+SVar:HasAttackEffect:TRUE
+SVar:SaintTraftEOT:SVar:EndOfTurnLeavePlay:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/geist_of_saint_traft.jpg
+Oracle:Hexproof (This creature can't be the target of spells or abilities your opponents control.)\nWhenever Geist of Saint Traft attacks, create a 4/4 white Angel creature token with flying that's tapped and attacking. Exile that token at end of combat.
diff --git a/forge-gui/res/cardsfolder/g/gelatinous_genesis.txt b/forge-gui/res/cardsfolder/g/gelatinous_genesis.txt
index af97e696180..246b844e0cc 100644
--- a/forge-gui/res/cardsfolder/g/gelatinous_genesis.txt
+++ b/forge-gui/res/cardsfolder/g/gelatinous_genesis.txt
@@ -1,7 +1,7 @@
 Name:Gelatinous Genesis
 ManaCost:X X G
 Types:Sorcery
-A:SP$ Token | Cost$ X X G | TokenImage$ g x x ooze ROE | TokenAmount$ X | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenOwner$ You | TokenColors$ Green | TokenPower$ X | TokenToughness$ X | References$ X | SpellDescription$ Put X X/X green Ooze creature tokens onto the battlefield.
+A:SP$ Token | Cost$ X X G | TokenImage$ g x x ooze ROE | TokenAmount$ X | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenOwner$ You | TokenColors$ Green | TokenPower$ X | TokenToughness$ X | References$ X | SpellDescription$ Create X X/X green Ooze creature tokens.
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gelatinous_genesis.jpg
-Oracle:Put X X/X green Ooze creature tokens onto the battlefield.
+Oracle:Create X X/X green Ooze creature tokens.
diff --git a/forge-gui/res/cardsfolder/g/glimmervoid_basin.txt b/forge-gui/res/cardsfolder/g/glimmervoid_basin.txt
index 9129e9a9c31..1748df5567b 100644
--- a/forge-gui/res/cardsfolder/g/glimmervoid_basin.txt
+++ b/forge-gui/res/cardsfolder/g/glimmervoid_basin.txt
@@ -1,16 +1,16 @@
-Name:Glimmervoid Basin
-ManaCost:no cost
-Types:Plane Mirrodin
-
-T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | IsSingleTarget$ True | Execute$ TrigCopy | TriggerZones$ Command | TriggerDescription$ Whenever a player casts an instant or sorcery spell with a single target, he or she copies that spell for each other spell, permanent, card not on the battlefield, and/or player the spell could target. Each copy targets a different one of them.
-SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | Controller$ TriggeredActivator | CopyForEachCanTarget$ Spell,Permanent,Card,Player
-
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, choose target creature. Each player except that creature's controller puts a token that's a copy of that creature onto the battlefield.
-
-SVar:RolledChaos:DB$ RepeatEach | RepeatPlayers$ NonTargetedController | RepeatSubAbility$ DBCopy | ValidTgts$ Creature | TgtPrompt$ Select target creature
-
-SVar:DBCopy:DB$ CopyPermanent | Defined$ ParentTarget | Controller$ Remembered
-
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/glimmervoid_basin.jpg
-Oracle:Whenever a player casts an instant or sorcery spell with a single target, he or she copies that spell for each other spell, permanent, card not on the battlefield, and/or player the spell could target. Each copy targets a different one of them.\nWhenever you roll {CHAOS}, choose target creature. Each player except that creature's controller puts a token that's a copy of that creature onto the battlefield.
+Name:Glimmervoid Basin
+ManaCost:no cost
+Types:Plane Mirrodin
+
+T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | IsSingleTarget$ True | Execute$ TrigCopy | TriggerZones$ Command | TriggerDescription$ Whenever a player casts an instant or sorcery spell with a single target, he or she copies that spell for each other spell, permanent, card not on the battlefield, and/or player the spell could target. Each copy targets a different one of them.
+SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | Controller$ TriggeredActivator | CopyForEachCanTarget$ Spell,Permanent,Card,Player
+
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, choose target creature. Each player except that creature's controller creates a token that's a copy of that creature.
+
+SVar:RolledChaos:DB$ RepeatEach | RepeatPlayers$ NonTargetedController | RepeatSubAbility$ DBCopy | ValidTgts$ Creature | TgtPrompt$ Select target creature
+
+SVar:DBCopy:DB$ CopyPermanent | Defined$ ParentTarget | Controller$ Remembered
+
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/glimmervoid_basin.jpg
+Oracle:Whenever a player casts an instant or sorcery spell with a single target, he or she copies that spell for each other spell, permanent, card not on the battlefield, and/or player the spell could target. Each copy targets a different one of them.\nWhenever you roll {CHAOS}, choose target creature. Each player except that creature's controller creates a token that's a copy of that creature.
diff --git a/forge-gui/res/cardsfolder/g/goldmeadow.txt b/forge-gui/res/cardsfolder/g/goldmeadow.txt
index 81c6a090309..f51f672eaf1 100644
--- a/forge-gui/res/cardsfolder/g/goldmeadow.txt
+++ b/forge-gui/res/cardsfolder/g/goldmeadow.txt
@@ -1,10 +1,10 @@
-Name:Goldmeadow
-ManaCost:no cost
-Types:Plane Lorwyn
-T:Mode$ ChangesZone | ValidCard$ Land | Destination$ Battlefield | Execute$ TripleGoat | TriggerZones$ Command | TriggerDescription$ Whenever a land enters the battlefield, that land's controller puts three 0/1 white Goat creature tokens onto the battlefield.
-SVar:TripleGoat:AB$ Token | Cost$ 0 | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenPower$ 0 | TokenToughness$ 1 | TokenColors$ White | TokenOwner$ TriggeredCardController | TokenImage$ w 0 1 goat | TokenAmount$ 3
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, put a 0/1 white Goat creature token onto the battlefield.
-SVar:RolledChaos:AB$ Token | Cost$ 0 | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenPower$ 0 | TokenToughness$ 1 | TokenColors$ White | TokenOwner$ You | TokenImage$ w 0 1 goat | TokenAmount$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/goldmeadow.jpg
-SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
-Oracle:Whenever a land enters the battlefield, that land's controller puts three 0/1 white Goat creature tokens onto the battlefield.\nWhenever you roll {CHAOS}, put a 0/1 white Goat creature token onto the battlefield.
+Name:Goldmeadow
+ManaCost:no cost
+Types:Plane Lorwyn
+T:Mode$ ChangesZone | ValidCard$ Land | Destination$ Battlefield | Execute$ TripleGoat | TriggerZones$ Command | TriggerDescription$ Whenever a land enters the battlefield, that land's controller creates three 0/1 white Goat creature tokens.
+SVar:TripleGoat:AB$ Token | Cost$ 0 | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenPower$ 0 | TokenToughness$ 1 | TokenColors$ White | TokenOwner$ TriggeredCardController | TokenImage$ w 0 1 goat | TokenAmount$ 3
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, create a 0/1 white Goat creature token.
+SVar:RolledChaos:AB$ Token | Cost$ 0 | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenPower$ 0 | TokenToughness$ 1 | TokenColors$ White | TokenOwner$ You | TokenImage$ w 0 1 goat | TokenAmount$ 1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/goldmeadow.jpg
+SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
+Oracle:Whenever a land enters the battlefield, that land's controller creates three 0/1 white Goat creature tokens.\nWhenever you roll {CHAOS}, create a 0/1 white Goat creature token.
diff --git a/forge-gui/res/cardsfolder/g/grand_ossuary.txt b/forge-gui/res/cardsfolder/g/grand_ossuary.txt
index df70db553d5..c0040fea4e1 100644
--- a/forge-gui/res/cardsfolder/g/grand_ossuary.txt
+++ b/forge-gui/res/cardsfolder/g/grand_ossuary.txt
@@ -1,17 +1,17 @@
-Name:Grand Ossuary
-ManaCost:no cost
-Types:Plane Ravnica
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Command | Execute$ OssuaryCounters | TriggerDescription$ Whenever a creature dies, its controller distributes a number of +1/+1 counters equal to its power among any number of target creatures he or she controls.
-SVar:OssuaryCounters:DB$ PutCounter | ValidTgts$ Creature | TargetsWithDefinedController$ TriggeredCardController | TargetingPlayer$ TriggeredCardController | TgtPrompt$ Select target creature you control to distribute counters to | CounterType$ P1P1 | CounterNum$ OssuaryX | TargetMin$ 1 | TargetMax$ MaxTgts | DividedAsYouChoose$ OssuaryX | References$ OssuaryX,MaxTgts
-SVar:OssuaryX:TriggeredCard$CardPower
-SVar:MaxTgts:TriggeredCardController$Valid Creature.YouCtrl
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, each player exiles all creatures he or she controls and puts X 1/1 green Saproling creature tokens onto the battlefield, where X is the total power of the creatures he or she exiled this way. Then planeswalk.
-SVar:RolledChaos:AB$ ChangeZoneAll | Cost$ 0 | ChangeType$ Creature | Imprint$ True | Origin$ Battlefield | Destination$ Exile | SubAbility$ OssuaryRepeat
-SVar:OssuaryRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ OssuaryTokens | SubAbility$ WalkAway
-SVar:OssuaryTokens:DB$ Token | TokenAmount$ OsX | References$ OsX | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Player.IsRemembered | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
-SVar:WalkAway:DB$ Planeswalk | SubAbility$ ClearImprinted
-SVar:ClearImprinted:DB$ Cleanup | ClearImprinted$ True
-SVar:OsX:ImprintedLKI$FilterControlledByRemembered_CardPower
-SVar:AIRollPlanarDieParams:Mode$ Random | MinTurn$ 5
-SVar:Picture:http://www.wizards.com/global/images/magic/general/grand_ossuary.jpg
-Oracle:Whenever a creature dies, its controller distributes a number of +1/+1 counters equal to its power among any number of target creatures he or she controls.\nWhenever you roll {CHAOS}, each player exiles all creatures he or she controls and puts X 1/1 green Saproling creature tokens onto the battlefield, where X is the total power of the creatures he or she exiled this way. Then planeswalk.
+Name:Grand Ossuary
+ManaCost:no cost
+Types:Plane Ravnica
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Command | Execute$ OssuaryCounters | TriggerDescription$ Whenever a creature dies, its controller distributes a number of +1/+1 counters equal to its power among any number of target creatures he or she controls.
+SVar:OssuaryCounters:DB$ PutCounter | ValidTgts$ Creature | TargetsWithDefinedController$ TriggeredCardController | TargetingPlayer$ TriggeredCardController | TgtPrompt$ Select target creature you control to distribute counters to | CounterType$ P1P1 | CounterNum$ OssuaryX | TargetMin$ 1 | TargetMax$ MaxTgts | DividedAsYouChoose$ OssuaryX | References$ OssuaryX,MaxTgts
+SVar:OssuaryX:TriggeredCard$CardPower
+SVar:MaxTgts:TriggeredCardController$Valid Creature.YouCtrl
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, each player exiles all creatures he or she controls and creates X 1/1 green Saproling creature tokens, where X is the total power of the creatures he or she exiled this way. Then planeswalk.
+SVar:RolledChaos:AB$ ChangeZoneAll | Cost$ 0 | ChangeType$ Creature | Imprint$ True | Origin$ Battlefield | Destination$ Exile | SubAbility$ OssuaryRepeat
+SVar:OssuaryRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ OssuaryTokens | SubAbility$ WalkAway
+SVar:OssuaryTokens:DB$ Token | TokenAmount$ OsX | References$ OsX | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Player.IsRemembered | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
+SVar:WalkAway:DB$ Planeswalk | SubAbility$ ClearImprinted
+SVar:ClearImprinted:DB$ Cleanup | ClearImprinted$ True
+SVar:OsX:ImprintedLKI$FilterControlledByRemembered_CardPower
+SVar:AIRollPlanarDieParams:Mode$ Random | MinTurn$ 5
+SVar:Picture:http://www.wizards.com/global/images/magic/general/grand_ossuary.jpg
+Oracle:Whenever a creature dies, its controller distributes a number of +1/+1 counters equal to its power among any number of target creatures he or she controls.\nWhenever you roll {CHAOS}, each player exiles all creatures he or she controls and creates X 1/1 green Saproling creature tokens, where X is the total power of the creatures he or she exiled this way. Then planeswalk.
diff --git a/forge-gui/res/cardsfolder/h/hedron_fields_of_agadeem.txt b/forge-gui/res/cardsfolder/h/hedron_fields_of_agadeem.txt
index b869364f796..b67a164f0e2 100644
--- a/forge-gui/res/cardsfolder/h/hedron_fields_of_agadeem.txt
+++ b/forge-gui/res/cardsfolder/h/hedron_fields_of_agadeem.txt
@@ -1,9 +1,9 @@
-Name:Hedron Fields of Agadeem
-ManaCost:no cost
-Types:Plane Zendikar
-S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.powerGE7 | AddHiddenKeyword$ CARDNAME can't attack or block. | Description$ Creatures with power 7 or greater can't attack or block.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, put a 7/7 colorless Eldrazi creature token with annihilator 1 onto the battlefield. (Whenever it attacks, defending player sacrifices a permanent.)
-SVar:RolledChaos:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Eldrazi | TokenTypes$ Creature,Eldrazi | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 7 | TokenToughness$ 7 | TokenKeywords$ Annihilator:1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hedron_fields_of_agadeem.jpg
-SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
-Oracle:Creatures with power 7 or greater can't attack or block.\nWhenever you roll {CHAOS}, put a 7/7 colorless Eldrazi creature token with annihilator 1 onto the battlefield. (Whenever it attacks, defending player sacrifices a permanent.)
+Name:Hedron Fields of Agadeem
+ManaCost:no cost
+Types:Plane Zendikar
+S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.powerGE7 | AddHiddenKeyword$ CARDNAME can't attack or block. | Description$ Creatures with power 7 or greater can't attack or block.
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, create a 7/7 colorless Eldrazi creature token with annihilator 1. (Whenever it attacks, defending player sacrifices a permanent.)
+SVar:RolledChaos:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Eldrazi | TokenTypes$ Creature,Eldrazi | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 7 | TokenToughness$ 7 | TokenKeywords$ Annihilator:1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hedron_fields_of_agadeem.jpg
+SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
+Oracle:Creatures with power 7 or greater can't attack or block.\nWhenever you roll {CHAOS}, create a 7/7 colorless Eldrazi creature token with annihilator 1. (Whenever it attacks, defending player sacrifices a permanent.)
diff --git a/forge-gui/res/cardsfolder/h/hellion_crucible.txt b/forge-gui/res/cardsfolder/h/hellion_crucible.txt
index 0cf15622340..f684ca94013 100644
--- a/forge-gui/res/cardsfolder/h/hellion_crucible.txt
+++ b/forge-gui/res/cardsfolder/h/hellion_crucible.txt
@@ -1,8 +1,8 @@
-Name:Hellion Crucible
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ PutCounter | Cost$ 1 R T | CounterType$ PRESSURE | CounterNum$ 1 | SpellDescription$ Put a pressure counter on CARDNAME.
-A:AB$ Token | Cost$ 1 R T SubCounter<2/PRESSURE> Sac<1/CARDNAME> | TokenAmount$ 1 | TokenName$ Hellion | TokenTypes$ Creature,Hellion | TokenOwner$ You | TokenColors$ Red | TokenPower$ 4 | TokenToughness$ 4 | TokenImage$ r 4 4 hellion M13 | TokenKeywords$ Haste | SpellDescription$ Put a 4/4 red Hellion creature token with haste onto the battlefield.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hellion_crucible.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}{R}, {T}: Put a pressure counter on Hellion Crucible.\n{1}{R}, {T}, Remove two pressure counters from Hellion Crucible and sacrifice it: Put a 4/4 red Hellion creature token with haste onto the battlefield. (It can attack and {T} as soon as it comes under your control.)
+Name:Hellion Crucible
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ PutCounter | Cost$ 1 R T | CounterType$ PRESSURE | CounterNum$ 1 | SpellDescription$ Put a pressure counter on CARDNAME.
+A:AB$ Token | Cost$ 1 R T SubCounter<2/PRESSURE> Sac<1/CARDNAME> | TokenAmount$ 1 | TokenName$ Hellion | TokenTypes$ Creature,Hellion | TokenOwner$ You | TokenColors$ Red | TokenPower$ 4 | TokenToughness$ 4 | TokenImage$ r 4 4 hellion M13 | TokenKeywords$ Haste | SpellDescription$ Create a 4/4 red Hellion creature token with haste.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hellion_crucible.jpg
+Oracle:{T}: Add {C} to your mana pool.\n{1}{R}, {T}: Put a pressure counter on Hellion Crucible.\n{1}{R}, {T}, Remove two pressure counters from Hellion Crucible and sacrifice it: Create a 4/4 red Hellion creature token with haste. (It can attack and {T} as soon as it comes under your control.)
diff --git a/forge-gui/res/cardsfolder/h/hellion_eruption.txt b/forge-gui/res/cardsfolder/h/hellion_eruption.txt
index 1332a247bc2..62071059a7b 100644
--- a/forge-gui/res/cardsfolder/h/hellion_eruption.txt
+++ b/forge-gui/res/cardsfolder/h/hellion_eruption.txt
@@ -1,9 +1,9 @@
 Name:Hellion Eruption
 ManaCost:5 R
 Types:Sorcery
-A:SP$ SacrificeAll | Cost$ 5 R | ValidCards$ Creature.YouCtrl | RememberSacrificed$ True | SubAbility$ DBToken | SpellDescription$ Sacrifice all creatures you control, then put that many 4/4 red Hellion creature tokens onto the battlefield.
+A:SP$ SacrificeAll | Cost$ 5 R | ValidCards$ Creature.YouCtrl | RememberSacrificed$ True | SubAbility$ DBToken | SpellDescription$ Sacrifice all creatures you control, then create that many 4/4 red Hellion creature tokens.
 SVar:DBToken:DB$Token | TokenAmount$ X | TokenName$ Hellion | TokenTypes$ Creature,Hellion | TokenOwner$ You | TokenColors$ Red | TokenPower$ 4 | TokenToughness$ 4 | References$ X
 SVar:X:Remembered$Amount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hellion_eruption.jpg
-Oracle:Sacrifice all creatures you control, then put that many 4/4 red Hellion creature tokens onto the battlefield.
+Oracle:Sacrifice all creatures you control, then create that many 4/4 red Hellion creature tokens.
diff --git a/forge-gui/res/cardsfolder/h/hissing_iguanar.txt b/forge-gui/res/cardsfolder/h/hissing_iguanar.txt
index 953c55a5d8d..09f3a6cf8b7 100644
--- a/forge-gui/res/cardsfolder/h/hissing_iguanar.txt
+++ b/forge-gui/res/cardsfolder/h/hissing_iguanar.txt
@@ -2,7 +2,7 @@ Name:Hissing Iguanar
 ManaCost:2 R
 Types:Creature Lizard
 PT:3/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDealDamage | TriggerDescription$ Whenever another creature is put into a graveyard from the battlefield, you may have CARDNAME deal 1 damage to target player.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDealDamage | TriggerDescription$ Whenever another creature dies, you may have CARDNAME deal 1 damage to target player.
 SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hissing_iguanar.jpg
 Oracle:Whenever another creature dies, you may have Hissing Iguanar deal 1 damage to target player.
diff --git a/forge-gui/res/cardsfolder/i/inexorable_blob.txt b/forge-gui/res/cardsfolder/i/inexorable_blob.txt
index 42cdbfa4a55..1d85a922d4d 100644
--- a/forge-gui/res/cardsfolder/i/inexorable_blob.txt
+++ b/forge-gui/res/cardsfolder/i/inexorable_blob.txt
@@ -2,11 +2,11 @@ Name:Inexorable Blob
 ManaCost:2 G
 Types:Creature Ooze
 PT:3/3
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | Delirium$ True | TriggerDescription$ Delirium - Whenever CARDNAME attacks, if there are four or more card types among cards in your graveyard, put a 3/3 green Ooze creature token onto the battlefield tapped and attacking.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | Delirium$ True | TriggerDescription$ Delirium — Whenever CARDNAME attacks, if there are four or more card types among cards in your graveyard, create a 3/3 green Ooze creature token that's tapped and attacking.
 SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenTapped$ True | TokenAttacking$ True
 SVar:HasAttackEffect:TRUE
 DeckHints:Ability$Graveyard & Ability$Discard
 DeckHas:Ability$Delirium
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inexorable_blob.jpg
-Oracle:Delirium - Whenever Inexorable Blob attacks, if there are four or more card types among cards in your graveyard, put a 3/3 green Ooze creature token onto the battlefield tapped and attacking.
+Oracle:Delirium — Whenever Inexorable Blob attacks, if there are four or more card types among cards in your graveyard, create a 3/3 green Ooze creature token that's tapped and attacking.
 
diff --git a/forge-gui/res/cardsfolder/i/invocation_of_saint_traft.txt b/forge-gui/res/cardsfolder/i/invocation_of_saint_traft.txt
index 03ad5c1ca9f..6ec13211d3d 100644
--- a/forge-gui/res/cardsfolder/i/invocation_of_saint_traft.txt
+++ b/forge-gui/res/cardsfolder/i/invocation_of_saint_traft.txt
@@ -3,11 +3,11 @@ ManaCost:1 W U
 Types:Enchantment Aura
 K:Enchant Creature
 A:SP$ Attach | Cost$ 1 W U | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ SaintTraftTrig | AddSVar$ SaintTraftToken & SaintTraftDelTrig & SaintTraftTrigExile & SaintTraftCleanup | Description$ Enchanted creature has "Whenever this creature attacks, put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at end of combat."
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ SaintTraftTrig | AddSVar$ SaintTraftToken & SaintTraftDelTrig & SaintTraftTrigExile & SaintTraftCleanup | Description$ Enchanted creature has "Whenever this creature attacks, create a 4/4 white Angel creature token with flying that's tapped and attacking. Exile that token at end of combat."
 SVar:SaintTraftTrig:Mode$ Attacks | ValidCard$ Card.Self | Execute$ SaintTraftToken | TriggerDescription$ Whenever this creature attacks, put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at end of combat.
 SVar:SaintTraftToken:AB$Token | Cost$ 0 | TokenImage$ w 4 4 angel SOI | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenTapped$ True | TokenAttacking$ True | TokenSVars$ SaintTraftEOT | AtEOT$ ExileCombat
 SVar:HasAttackEffect:TRUE
 SVar:SaintTraftEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/invocation_of_saint_traft.jpg
-Oracle:Enchant creature\nEnchanted creature has "Whenever this creature attacks, put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at end of combat."
+Oracle:Enchant creature\nEnchanted creature has "Whenever this creature attacks, create a 4/4 white Angel creature token with flying that's tapped and attacking. Exile that token at end of combat."
 
diff --git a/forge-gui/res/cardsfolder/i/isle_of_vesuva.txt b/forge-gui/res/cardsfolder/i/isle_of_vesuva.txt
index cd629a82452..b362423c007 100644
--- a/forge-gui/res/cardsfolder/i/isle_of_vesuva.txt
+++ b/forge-gui/res/cardsfolder/i/isle_of_vesuva.txt
@@ -1,11 +1,11 @@
-Name:Isle of Vesuva
-ManaCost:no cost
-Types:Plane Dominaria
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken | TriggerZones$ Command | Execute$ TrigVesuvaCopy | TriggerDescription$ Whenever a nontoken creature enters the battlefield, its controller puts a token onto the battlefield that's a copy of that creature.
-SVar:TrigVesuvaCopy:AB$ CopyPermanent | Cost$ 0 | Defined$ TriggeredCard | Controller$ TriggeredCardController
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, destroy target creature and all other creatures with the same name as that creature.
-SVar:RolledChaos:AB$ Destroy | Cost$ 0 | ValidTgts$ Creature | SubAbility$ DestroyOtherAll
-SVar:DestroyOtherAll:DB$ DestroyAll | ValidCards$ Targeted.sameName+Other
-SVar:Picture:http://www.wizards.com/global/images/magic/general/isle_of_vesuva.jpg
-SVar:AIRollPlanarDieParams:Mode$ Always | OppHasCreatureInPlay$ True
-Oracle:Whenever a nontoken creature enters the battlefield, its controller puts a token onto the battlefield that's a copy of that creature.\nWhenever you roll {CHAOS}, destroy target creature and all other creatures with the same name as that creature.
+Name:Isle of Vesuva
+ManaCost:no cost
+Types:Plane Dominaria
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken | TriggerZones$ Command | Execute$ TrigVesuvaCopy | TriggerDescription$ Whenever a nontoken creature enters the battlefield, its controller creates a token that's a copy of that creature.
+SVar:TrigVesuvaCopy:AB$ CopyPermanent | Cost$ 0 | Defined$ TriggeredCard | Controller$ TriggeredCardController
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, destroy target creature and all other creatures with the same name as that creature.
+SVar:RolledChaos:AB$ Destroy | Cost$ 0 | ValidTgts$ Creature | SubAbility$ DestroyOtherAll
+SVar:DestroyOtherAll:DB$ DestroyAll | ValidCards$ Targeted.sameName+Other
+SVar:Picture:http://www.wizards.com/global/images/magic/general/isle_of_vesuva.jpg
+SVar:AIRollPlanarDieParams:Mode$ Always | OppHasCreatureInPlay$ True
+Oracle:Whenever a nontoken creature enters the battlefield, its controller creates a token that's a copy of that creature.\nWhenever you roll {CHAOS}, destroy target creature and all other creatures with the same name as that creature.
diff --git a/forge-gui/res/cardsfolder/j/jund.txt b/forge-gui/res/cardsfolder/j/jund.txt
index 0a49e1ae05c..30f8215d980 100644
--- a/forge-gui/res/cardsfolder/j/jund.txt
+++ b/forge-gui/res/cardsfolder/j/jund.txt
@@ -1,9 +1,9 @@
-Name:Jund
-ManaCost:no cost
-Types:Plane Alara
-T:Mode$ SpellCast | ValidCard$ Creature.Black,Creature.Red,Creature.Green | ValidActivatingPlayer$ Player | TriggerZones$ Command | Execute$ DevourPump | TriggerDescription$ Whenever a player casts a black, red, or green creature spell, it gains devour 5. (As the creature enters the battlefield, its controller may sacrifice any number of creatures. The creature enters the battlefield with five times that many +1/+1 counters on it.)
-SVar:DevourPump:AB$ Animate | Cost$ 0 | Defined$ TriggeredCard | Keywords$ Devour:5 | Permanent$ True
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, put two 1/1 red Goblin creature tokens onto the battlefield.
-SVar:RolledChaos:AB$ Token | Cost$ 0 | TokenAmount$ 2 | TokenPower$ 1 | TokenName$ Goblin | TokenToughness$ 1 | TokenColors$ Red | TokenTypes$ Creature,Goblin | TokenOwner$ You
-SVar:Picture:http://www.wizards.com/global/images/magic/general/jund.jpg
-Oracle:Whenever a player casts a black, red, or green creature spell, it gains devour 5. (As the creature enters the battlefield, its controller may sacrifice any number of creatures. The creature enters the battlefield with five times that many +1/+1 counters on it.)\nWhenever you roll {CHAOS}, put two 1/1 red Goblin creature tokens onto the battlefield.
+Name:Jund
+ManaCost:no cost
+Types:Plane Alara
+T:Mode$ SpellCast | ValidCard$ Creature.Black,Creature.Red,Creature.Green | ValidActivatingPlayer$ Player | TriggerZones$ Command | Execute$ DevourPump | TriggerDescription$ Whenever a player casts a black, red, or green creature spell, it gains devour 5. (As the creature enters the battlefield, its controller may sacrifice any number of creatures. The creature enters the battlefield with five times that many +1/+1 counters on it.)
+SVar:DevourPump:AB$ Animate | Cost$ 0 | Defined$ TriggeredCard | Keywords$ Devour:5 | Permanent$ True
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, create two 1/1 red Goblin creature tokens.
+SVar:RolledChaos:AB$ Token | Cost$ 0 | TokenAmount$ 2 | TokenPower$ 1 | TokenName$ Goblin | TokenToughness$ 1 | TokenColors$ Red | TokenTypes$ Creature,Goblin | TokenOwner$ You
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jund.jpg
+Oracle:Whenever a player casts a black, red, or green creature spell, it gains devour 5. (As the creature enters the battlefield, its controller may sacrifice any number of creatures. The creature enters the battlefield with five times that many +1/+1 counters on it.)\nWhenever you roll {CHAOS}, create two 1/1 red Goblin creature tokens.
diff --git a/forge-gui/res/cardsfolder/k/kazandu_tuskcaller.txt b/forge-gui/res/cardsfolder/k/kazandu_tuskcaller.txt
index c00ad7579a6..64e3032f62a 100644
--- a/forge-gui/res/cardsfolder/k/kazandu_tuskcaller.txt
+++ b/forge-gui/res/cardsfolder/k/kazandu_tuskcaller.txt
@@ -4,11 +4,11 @@ Types:Creature Human Shaman
 PT:1/1
 K:Level up:1 G
 SVar:maxLevel:6
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 1 | AddAbility$ TokenLow | CheckSVar$ X | SVarCompare$ EQ1 | Description$ LEVEL 2-5 1/1 {T}: Put a 3/3 green Elephant creature token onto the battlefield.
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 1 | AddAbility$ TokenHigh | CheckSVar$ Y | SVarCompare$ EQ1 | Description$ LEVEL 6+ 1/1 {T}: Put two 3/3 green Elephant creature tokens onto the battlefield.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 1 | AddAbility$ TokenLow | CheckSVar$ X | SVarCompare$ EQ1 | Description$ LEVEL 2-5 1/1 {T}: Create a 3/3 green Elephant creature token.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 1 | AddAbility$ TokenHigh | CheckSVar$ Y | SVarCompare$ EQ1 | Description$ LEVEL 6+ 1/1 {T}: Create two 3/3 green Elephant creature tokens.
 SVar:TokenLow:AB$ Token | Cost$ T | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 elephant WWK | SpellDescription$ Put a 3/3 green Elephant creature token onto the battlefield.
 SVar:TokenHigh:AB$ Token | Cost$ T | TokenAmount$ 2 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 elephant WWK | SpellDescription$ Put two 3/3 green Elephant creature tokens onto the battlefield.
 SVar:X:Count$Valid Card.Self+counters_GE2_LEVEL+counters_LE5_LEVEL
 SVar:Y:Count$Valid Card.Self+counters_GE6_LEVEL
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kazandu_tuskcaller.jpg
-Oracle:Level up {1}{G} ({1}{G}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 2-5\n1/1\n{T}: Put a 3/3 green Elephant creature token onto the battlefield.\nLEVEL 6+\n1/1\n{T}: Put two 3/3 green Elephant creature tokens onto the battlefield.
+Oracle:Level up {1}{G} ({1}{G}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 2-5\n1/1\n{T}: Create a 3/3 green Elephant creature token.\nLEVEL 6+\n1/1\n{T}: Create two 3/3 green Elephant creature tokens.
diff --git a/forge-gui/res/cardsfolder/k/khalni_garden.txt b/forge-gui/res/cardsfolder/k/khalni_garden.txt
index 718bfea0047..01462e4baf9 100644
--- a/forge-gui/res/cardsfolder/k/khalni_garden.txt
+++ b/forge-gui/res/cardsfolder/k/khalni_garden.txt
@@ -2,8 +2,8 @@ Name:Khalni Garden
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 0/1 green Plant creature token onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 0/1 green Plant creature token.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Plant | TokenTypes$ Creature,Plant | TokenOwner$ You | TokenColors$ Green | TokenPower$ 0 | TokenToughness$ 1
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/khalni_garden.jpg
-Oracle:Khalni Garden enters the battlefield tapped.\nWhen Khalni Garden enters the battlefield, put a 0/1 green Plant creature token onto the battlefield.\n{T}: Add {G} to your mana pool.
+Oracle:Khalni Garden enters the battlefield tapped.\nWhen Khalni Garden enters the battlefield, create a 0/1 green Plant creature token.\n{T}: Add {G} to your mana pool.
diff --git a/forge-gui/res/cardsfolder/k/kharasha_foothills.txt b/forge-gui/res/cardsfolder/k/kharasha_foothills.txt
index 7c333e3ad82..d1a84fe9a18 100644
--- a/forge-gui/res/cardsfolder/k/kharasha_foothills.txt
+++ b/forge-gui/res/cardsfolder/k/kharasha_foothills.txt
@@ -1,14 +1,14 @@
-Name:Kharasha Foothills
-ManaCost:no cost
-Types:Plane Mongseng
-T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Command | Attacked$ Player | Execute$ TrigCopy | TriggerDescription$ Whenever a creature you control attacks a player, for each other opponent, you may put a token that's a copy of that creature onto the battlefield tapped and attacking that opponent. Exile those tokens at the beginning of the next end step.
-SVar:TrigCopy:AB$ RepeatEach | Cost$ 0 | RepeatPlayers$ OppNonTriggeredDefender | RepeatSubAbility$ DBCopy
-SVar:DBCopy:DB$ CopyPermanent | Defined$ TriggeredAttacker | NumCopies$ 1 | CopyAttacking$ Remembered | Tapped$ True | AtEOT$ Exile | Optional$ True
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, you may sacrifice any number of creatures. If you do, CARDNAME deals that much damage to target creature.
-SVar:RolledChaos:AB$ Sacrifice | Cost$ 0 | Defined$ You | Amount$ SacX | References$ SacX | SacValid$ Creature | RememberSacrificed$ True | Optional$ True | SubAbility$ DBDmg
-SVar:SacX:Count$Valid Creature.YouCtrl
-SVar:DBDmg:DB$ DealDamage | ValidTgts$ Creature | NumDmg$ DmgX | References$ DmgX | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:DmgX:Remembered$Amount
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kharasha_foothills.jpg
-Oracle:Whenever a creature you control attacks a player, for each other opponent, you may put a token that's a copy of that creature onto the battlefield tapped and attacking that opponent. Exile those tokens at the beginning of the next end step.\nWhenever you roll {CHAOS}, you may sacrifice any number of creatures. If you do, Kharasha Foothills deals that much damage to target creature.
+Name:Kharasha Foothills
+ManaCost:no cost
+Types:Plane Mongseng
+T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Command | Attacked$ Player | Execute$ TrigCopy | TriggerDescription$ Whenever a creature you control attacks a player, for each other opponent, you may create a token that's a copy of that creature, tapped and attacking that opponent. Exile those tokens at the beginning of the next end step.
+SVar:TrigCopy:AB$ RepeatEach | Cost$ 0 | RepeatPlayers$ OppNonTriggeredDefender | RepeatSubAbility$ DBCopy
+SVar:DBCopy:DB$ CopyPermanent | Defined$ TriggeredAttacker | NumCopies$ 1 | CopyAttacking$ Remembered | Tapped$ True | AtEOT$ Exile | Optional$ True
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, you may sacrifice any number of creatures. If you do, CARDNAME deals that much damage to target creature.
+SVar:RolledChaos:AB$ Sacrifice | Cost$ 0 | Defined$ You | Amount$ SacX | References$ SacX | SacValid$ Creature | RememberSacrificed$ True | Optional$ True | SubAbility$ DBDmg
+SVar:SacX:Count$Valid Creature.YouCtrl
+SVar:DBDmg:DB$ DealDamage | ValidTgts$ Creature | NumDmg$ DmgX | References$ DmgX | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DmgX:Remembered$Amount
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kharasha_foothills.jpg
+Oracle:Whenever a creature you control attacks a player, for each other opponent, you may create a token that's a copy of that creature, tapped and attacking that opponent. Exile those tokens at the beginning of the next end step.\nWhenever you roll {CHAOS}, you may sacrifice any number of creatures. If you do, Kharasha Foothills deals that much damage to target creature.
diff --git a/forge-gui/res/cardsfolder/l/lair_of_the_ashen_idol.txt b/forge-gui/res/cardsfolder/l/lair_of_the_ashen_idol.txt
index fd607585a94..67f54873ca6 100644
--- a/forge-gui/res/cardsfolder/l/lair_of_the_ashen_idol.txt
+++ b/forge-gui/res/cardsfolder/l/lair_of_the_ashen_idol.txt
@@ -1,13 +1,13 @@
-Name:Lair of the Ashen Idol
-ManaCost:no cost
-Types:Plane Azgol
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ SacToIdol | TriggerDescription$ At the beginning of your upkeep, sacrifice a creature. If you can't, planeswalk.
-SVar:SacToIdol:AB$ Sacrifice | Cost$ 0 | Defined$ You | SacValid$ Creature | SubAbility$ IdolWalk | RememberSacrificed$ True
-SVar:IdolWalk:DB$ Planeswalk | ConditionCheckSVar$ IdolX | ConditionSVarCompare$ EQ0 | SubAbility$ DBCleanup | References$ IdolX
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:IdolX:Remembered$Amount
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, any number of target players each put a 2/2 black Zombie creature token onto the battlefield.
-SVar:RolledChaos:DB$ Token | ValidTgts$ Player | TgtPrompt$ Select target player to receive zombie token | TargetMin$ 0 | TargetMax$ MaxTgt | References$ MaxTgt | TokenName$ Zombie | TokenColors$ Black | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenOwner$ Targeted | TokenAmount$ 1 | TokenImage$ b 2 2 zombie ISD | TokenAltImages$ b_2_2_zombie2_ISD,b_2_2_zombie3_ISD
-SVar:MaxTgt:PlayerCountPlayers$Amount
-SVar:Picture:http://www.wizards.com/global/images/magic/general/lair_of_the_ashen_idol.jpg
-Oracle:At the beginning of your upkeep, sacrifice a creature. If you can't, planeswalk.\nWhenever you roll {CHAOS}, any number of target players each put a 2/2 black Zombie creature token onto the battlefield.
+Name:Lair of the Ashen Idol
+ManaCost:no cost
+Types:Plane Azgol
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ SacToIdol | TriggerDescription$ At the beginning of your upkeep, sacrifice a creature. If you can't, planeswalk.
+SVar:SacToIdol:AB$ Sacrifice | Cost$ 0 | Defined$ You | SacValid$ Creature | SubAbility$ IdolWalk | RememberSacrificed$ True
+SVar:IdolWalk:DB$ Planeswalk | ConditionCheckSVar$ IdolX | ConditionSVarCompare$ EQ0 | SubAbility$ DBCleanup | References$ IdolX
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:IdolX:Remembered$Amount
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, any number of target players each create a 2/2 black Zombie creature token.
+SVar:RolledChaos:DB$ Token | ValidTgts$ Player | TgtPrompt$ Select target player to receive zombie token | TargetMin$ 0 | TargetMax$ MaxTgt | References$ MaxTgt | TokenName$ Zombie | TokenColors$ Black | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenOwner$ Targeted | TokenAmount$ 1 | TokenImage$ b 2 2 zombie ISD | TokenAltImages$ b_2_2_zombie2_ISD,b_2_2_zombie3_ISD
+SVar:MaxTgt:PlayerCountPlayers$Amount
+SVar:Picture:http://www.wizards.com/global/images/magic/general/lair_of_the_ashen_idol.jpg
+Oracle:At the beginning of your upkeep, sacrifice a creature. If you can't, planeswalk.\nWhenever you roll {CHAOS}, any number of target players each create a 2/2 black Zombie creature token.
diff --git a/forge-gui/res/cardsfolder/l/luminarch_ascension.txt b/forge-gui/res/cardsfolder/l/luminarch_ascension.txt
index c9a95a4f473..7fe416b24be 100644
--- a/forge-gui/res/cardsfolder/l/luminarch_ascension.txt
+++ b/forge-gui/res/cardsfolder/l/luminarch_ascension.txt
@@ -1,11 +1,11 @@
-Name:Luminarch Ascension
-ManaCost:1 W
-Types:Enchantment
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPut | OptionalDecider$ You | CheckSVar$ X | SVarCompare$ EQ0 | TriggerDescription$ At the beginning of each opponent's end step, if you didn't lose life this turn, you may put a quest counter on CARDNAME. (Damage causes loss of life.)
-A:AB$ Token | Cost$ 1 W | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenImage$ w 4 4 angel ZEN | IsPresent$ Card.Self+counters_GE4_QUEST | SpellDescription$ Put a 4/4 white Angel creature token with flying onto the battlefield. Activate this ability only if CARDNAME has four or more quest counters on it.
-SVar:TrigPut:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
-SVar:X:Count$LifeYouLostThisTurn
-DeckHas:Ability$Counters
-SVar:MaxQuestEffect:4
-SVar:Picture:http://www.wizards.com/global/images/magic/general/luminarch_ascension.jpg
-Oracle:At the beginning of each opponent's end step, if you didn't lose life this turn, you may put a quest counter on Luminarch Ascension. (Damage causes loss of life.)\n{1}{W}: Put a 4/4 white Angel creature token with flying onto the battlefield. Activate this ability only if Luminarch Ascension has four or more quest counters on it.
+		Name:Luminarch Ascension
+ManaCost:1 W
+Types:Enchantment
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPut | OptionalDecider$ You | CheckSVar$ X | SVarCompare$ EQ0 | TriggerDescription$ At the beginning of each opponent's end step, if you didn't lose life this turn, you may put a quest counter on CARDNAME. (Damage causes loss of life.)
+A:AB$ Token | Cost$ 1 W | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenImage$ w 4 4 angel ZEN | IsPresent$ Card.Self+counters_GE4_QUEST | SpellDescription$ Create a 4/4 white Angel creature token with flying. Activate this ability only if Luminarch Ascension has four or more quest counters on it.
+SVar:TrigPut:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
+SVar:X:Count$LifeYouLostThisTurn
+DeckHas:Ability$Counters
+SVar:MaxQuestEffect:4
+SVar:Picture:http://www.wizards.com/global/images/magic/general/luminarch_ascension.jpg
+Oracle:At the beginning of each opponent's end step, if you didn't lose life this turn, you may put a quest counter on Luminarch Ascension. (Damage causes loss of life.)\n{1}{W}: Create a 4/4 white Angel creature token with flying. Activate this ability only if Luminarch Ascension has four or more quest counters on it.
diff --git a/forge-gui/res/cardsfolder/m/miming_slime.txt b/forge-gui/res/cardsfolder/m/miming_slime.txt
index a59daa3b92c..7b9dff8cfa8 100644
--- a/forge-gui/res/cardsfolder/m/miming_slime.txt
+++ b/forge-gui/res/cardsfolder/m/miming_slime.txt
@@ -1,9 +1,9 @@
-Name:Miming Slime
-ManaCost:2 G
-Types:Sorcery
-A:SP$ Token | Cost$ 2 G | TokenAmount$ 1 | TokenName$ Ooze | TokenOwner$ You | TokenPower$ X | TokenToughness$ X | References$ X | TokenTypes$ Creature,Ooze | TokenColors$ Green | SpellDescription$ Put an X/X green Ooze creature token onto the battlefield, where X is the greatest power among creatures you control.
-SVar:X:Count$GreatestPower_Creature.YouCtrl
-SVar:NeedsToPlay:Creature.YouCtrl
-DeckHas:Ability$Token
-SVar:Picture:http://www.wizards.com/global/images/magic/general/miming_slime.jpg
-Oracle:Put an X/X green Ooze creature token onto the battlefield, where X is the greatest power among creatures you control.
+Name:Miming Slime
+ManaCost:2 G
+Types:Sorcery
+A:SP$ Token | Cost$ 2 G | TokenAmount$ 1 | TokenName$ Ooze | TokenOwner$ You | TokenPower$ X | TokenToughness$ X | References$ X | TokenTypes$ Creature,Ooze | TokenColors$ Green | SpellDescription$ Create an X/X green Ooze creature token, where X is the greatest power among creatures you control.
+SVar:X:Count$GreatestPower_Creature.YouCtrl
+SVar:NeedsToPlay:Creature.YouCtrl
+DeckHas:Ability$Token
+SVar:Picture:http://www.wizards.com/global/images/magic/general/miming_slime.jpg
+Oracle:Create an X/X green Ooze creature token, where X is the greatest power among creatures you control.
diff --git a/forge-gui/res/cardsfolder/m/mitotic_slime.txt b/forge-gui/res/cardsfolder/m/mitotic_slime.txt
index afaf61f6b8a..71d4d9c4b65 100644
--- a/forge-gui/res/cardsfolder/m/mitotic_slime.txt
+++ b/forge-gui/res/cardsfolder/m/mitotic_slime.txt
@@ -2,9 +2,9 @@ Name:Mitotic Slime
 ManaCost:4 G
 Types:Creature Ooze
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigTokenSenior | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put two 2/2 green Ooze creature tokens onto the battlefield. They have "When this creature is put into a graveyard, put two 1/1 green Ooze creature tokens onto the battlefield."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigTokenSenior | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, create two 2/2 green Ooze creature tokens. They have "When this creature dies, create two 1/1 green Ooze creature tokens."
 SVar:TrigTokenSenior:AB$Token | Cost$ 0 | TokenImage$ g 2 2 ooze | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenColors$ Green | TokenOwner$ You | TokenPower$ 2 | TokenToughness$ 2 | TokenAmount$ 2 | TokenTriggers$ TriggerJunior | TokenSVars$ TrigTokenJunior
-SVar:TriggerJunior:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigTokenJunior | TriggerController$ TriggeredCardController | TriggerDescription$ When this creature is put into a graveyard, put two 1/1 green Ooze creature tokens onto the battlefield.
+SVar:TriggerJunior:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigTokenJunior | TriggerController$ TriggeredCardController | TriggerDescription$ When this creature dies, create two 1/1 green Ooze creature tokens.
 SVar:TrigTokenJunior:AB$Token | Cost$ 0 | TokenImage$ g 1 1 ooze | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenColors$ Green | TokenOwner$ You | TokenPower$ 1 | TokenToughness$ 1 | TokenAmount$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mitotic_slime.jpg
-Oracle:When Mitotic Slime dies, put two 2/2 green Ooze creature tokens onto the battlefield. They have "When this creature dies, put two 1/1 green Ooze creature tokens onto the battlefield."
+Oracle:When Mitotic Slime dies, create two 2/2 green Ooze creature tokens. They have "When this creature dies, create two 1/1 green Ooze creature tokens."
diff --git a/forge-gui/res/cardsfolder/m/moonsilver_spear.txt b/forge-gui/res/cardsfolder/m/moonsilver_spear.txt
index c0f4302d004..622def90234 100644
--- a/forge-gui/res/cardsfolder/m/moonsilver_spear.txt
+++ b/forge-gui/res/cardsfolder/m/moonsilver_spear.txt
@@ -1,9 +1,9 @@
-Name:Moonsilver Spear
-ManaCost:4
-Types:Artifact Equipment
-K:Equip 4
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ First Strike | AddSVar$ AE | Description$ Equipped creature has first strike.
-T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigAngelToken | TriggerDescription$ Whenever equipped creature attacks, put a 4/4 white Angel token with flying onto the battlefield.
-SVar:TrigAngelToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenImage$ w 4 4 angel avr | TokenAltImages$ w_4_4_angel2_AVR
-SVar:Picture:http://www.wizards.com/global/images/magic/general/moonsilver_spear.jpg
-Oracle:Equipped creature has first strike.\nWhenever equipped creature attacks, put a 4/4 white Angel creature token with flying onto the battlefield.\nEquip {4}
+Name:Moonsilver Spear
+ManaCost:4
+Types:Artifact Equipment
+K:Equip 4
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ First Strike | AddSVar$ AE | Description$ Equipped creature has first strike.
+T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigAngelToken | TriggerDescription$ Whenever equipped creature attacks, create a 4/4 white Angel token with flying.
+SVar:TrigAngelToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenImage$ w 4 4 angel avr | TokenAltImages$ w_4_4_angel2_AVR
+SVar:Picture:http://www.wizards.com/global/images/magic/general/moonsilver_spear.jpg
+Oracle:Equipped creature has first strike.\nWhenever equipped creature attacks, create a 4/4 white Angel creature token with flying.\nEquip {4}
diff --git a/forge-gui/res/cardsfolder/n/nissa_vastwood_seer.txt b/forge-gui/res/cardsfolder/n/nissa_vastwood_seer.txt
index f1b90b6089b..b4027b18ad3 100644
--- a/forge-gui/res/cardsfolder/n/nissa_vastwood_seer.txt
+++ b/forge-gui/res/cardsfolder/n/nissa_vastwood_seer.txt
@@ -20,11 +20,11 @@ Colors:green
 Types:Planeswalker Nissa
 Loyalty:3
 A:AB$ Dig | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Land | DestinationZone$ Battlefield | DestinationZone2$ Hand | SpellDescription$ Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand.
-A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenImage$ g 4 4 Ashaya | TokenName$ Ashaya, the Awoken World | TokenTypes$ Legendary,Creature,Elemental | TokenOwner$ You | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 4 | SpellDescription$ Put a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World onto the battlefield.
+A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenImage$ g 4 4 Ashaya | TokenName$ Ashaya, the Awoken World | TokenTypes$ Legendary,Creature,Elemental | TokenOwner$ You | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 4 | SpellDescription$ Create a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World.
  | SpellDescription$ Return target nonlegendary creature card with converted mana cost X from your graveyard to the battlefield.
 A:AB$ Untap | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Land | TgtPrompt$ Choose target land | TargetMin$ 0 | TargetMax$ 6 | RememberTargets$ True | SubAbility$ DBAnimate | SpellDescription$ Untap up to six target lands. They become 6/6 Elemental creatures. They're still lands.
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered  | Power$ 6 | Toughness$ 6 | Types$ Creature,Elemental | Permanent$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nissa_sage_animist.jpg
-Oracle:[+1] Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand.\n[-2] Put a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World onto the battlefield.\n[-7] Untap up to six target lands. They become 6/6 Elemental creatures. They're still lands.
+Oracle:[+1] Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand.\n[-2] Create a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World.\n[-7] Untap up to six target lands. They become 6/6 Elemental creatures. They're still lands.
 
diff --git a/forge-gui/res/cardsfolder/n/nissa_voice_of_zendikar.txt b/forge-gui/res/cardsfolder/n/nissa_voice_of_zendikar.txt
index e209a216af1..93582990063 100644
--- a/forge-gui/res/cardsfolder/n/nissa_voice_of_zendikar.txt
+++ b/forge-gui/res/cardsfolder/n/nissa_voice_of_zendikar.txt
@@ -2,10 +2,10 @@ Name:Nissa, Voice of Zendikar
 ManaCost:1 G G
 Types:Planeswalker Nissa
 Loyalty:3
-A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenImage$ g 0 1 plant OGW | TokenName$ Plant | TokenColors$ Green | TokenTypes$ Creature,Plant | TokenPower$ 0 | TokenToughness$ 1 | SpellDescription$ Put a 0/1 green Plant creature token onto the battlefield.
+A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenImage$ g 0 1 plant OGW | TokenName$ Plant | TokenColors$ Green | TokenTypes$ Creature,Plant | TokenPower$ 0 | TokenToughness$ 1 | SpellDescription$ Create a 0/1 green Plant creature token.
 A:AB$ PutCounterAll | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each creature you control.
 A:AB$ GainLife | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | LifeAmount$ X | References$ X | SubAbility$ DBDraw | SpellDescription$ You gain X life and you draw X cards, where X is the number of lands you control.
 SVar:DBDraw:DB$ Draw | NumCards$ X | References$ X 
 SVar:X:Count$Valid Land.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nissa_voice_of_zendikar.jpg
-Oracle:[+1] Put a 0/1 green Plant creature token onto the battlefield.\n[-2] Put a +1/+1 counter on each creature you control.\n[-7] You gain X life and you draw X cards, where X is the number of lands you control.
\ No newline at end of file
+Oracle:[+1] Create a 0/1 green Plant creature token.\n[-2] Put a +1/+1 counter on each creature you control.\n[-7] You gain X life and you draw X cards, where X is the number of lands you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/o/ooze_flux.txt b/forge-gui/res/cardsfolder/o/ooze_flux.txt
index 2950dd7faeb..9b149b64297 100644
--- a/forge-gui/res/cardsfolder/o/ooze_flux.txt
+++ b/forge-gui/res/cardsfolder/o/ooze_flux.txt
@@ -1,9 +1,9 @@
-Name:Ooze Flux
-ManaCost:3 G
-Types:Enchantment
-A:AB$ Token | Announce$ X | Cost$ XCantBe0 1 G SubCounter<X/P1P1/Creature/among creatures you control> | TokenAmount$ 1 | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenOwner$ You | TokenImage$ g x x ooze | TokenColors$ Green | TokenPower$ X | TokenToughness$ X | SpellDescription$ Put an X/X green Ooze creature token onto the battlefield, where X is the number of +1/+1 counters removed this way.
-SVar:X:Count$xPaid
-SVar:RemAIDeck:True
-DeckHints:Ability$Counters
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ooze_flux.jpg
-Oracle:{1}{G}, Remove one or more +1/+1 counters from among creatures you control: Put an X/X green Ooze creature token onto the battlefield, where X is the number of +1/+1 counters removed this way.
+Name:Ooze Flux
+ManaCost:3 G
+Types:Enchantment
+A:AB$ Token | Announce$ X | Cost$ XCantBe0 1 G SubCounter<X/P1P1/Creature/among creatures you control> | TokenAmount$ 1 | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenOwner$ You | TokenImage$ g x x ooze | TokenColors$ Green | TokenPower$ X | TokenToughness$ X | SpellDescription$ Create an X/X green Ooze creature token, where X is the number of +1/+1 counters removed this way.
+SVar:X:Count$xPaid
+SVar:RemAIDeck:True
+DeckHints:Ability$Counters
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ooze_flux.jpg
+Oracle:{1}{G}, Remove one or more +1/+1 counters from among creatures you control: Create an X/X green Ooze creature token, where X is the number of +1/+1 counters removed this way.
diff --git a/forge-gui/res/cardsfolder/o/ooze_garden.txt b/forge-gui/res/cardsfolder/o/ooze_garden.txt
index 59c608d8f99..76ff5c06044 100644
--- a/forge-gui/res/cardsfolder/o/ooze_garden.txt
+++ b/forge-gui/res/cardsfolder/o/ooze_garden.txt
@@ -1,7 +1,7 @@
 Name:Ooze Garden
 ManaCost:1 G
 Types:Enchantment
-A:AB$ Token | Cost$ 1 G Sac<1/Creature.nonOoze/non-Ooze creature> | TokenAmount$ 1 | TokenName$ Ooze | TokenOwner$ You | TokenPower$ X | TokenToughness$ X | References$ X | TokenTypes$ Creature,Ooze | TokenColors$ Green | SorcerySpeed$ True | SpellDescription$ Put an X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery.
+A:AB$ Token | Cost$ 1 G Sac<1/Creature.nonOoze/non-Ooze creature> | TokenAmount$ 1 | TokenName$ Ooze | TokenOwner$ You | TokenPower$ X | TokenToughness$ X | References$ X | TokenTypes$ Creature,Ooze | TokenColors$ Green | SorcerySpeed$ True | SpellDescription$ Create an X/X green Ooze creature token, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery.
 SVar:X:Sacrificed$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ooze_garden.jpg
-Oracle:{1}{G}, Sacrifice a non-Ooze creature: Put an X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery.
+Oracle:{1}{G}, Sacrifice a non-Ooze creature: Create an X/X green Ooze creature token, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery.
diff --git a/forge-gui/res/cardsfolder/s/selesnya_loft_gardens.txt b/forge-gui/res/cardsfolder/s/selesnya_loft_gardens.txt
index 8f591df5a9e..72ca1442d90 100644
--- a/forge-gui/res/cardsfolder/s/selesnya_loft_gardens.txt
+++ b/forge-gui/res/cardsfolder/s/selesnya_loft_gardens.txt
@@ -1,17 +1,17 @@
-Name:Selesnya Loft Gardens
-ManaCost:no cost
-Types:Plane Ravnica
-
-R:Event$ CreateToken | ActiveZones$ Battlefield | ReplaceWith$ DoubleToken | EffectOnly$ True | Description$ If an effect would put one or more tokens onto the battlefield under your control, it puts twice that many of those tokens onto the battlefield instead.
-SVar:DoubleToken:DB$ ReplaceEffect | VarName$ TokenNum | VarValue$ Y | References$ Y
-R:Event$ AddCounter | ActiveZones$ Battlefield | ValidCard$ Permanent | EffectOnly$ True | ReplaceWith$ DoubleCounters | Description$ If an effect would place one or more counters on a permanent, it places twice that many of those counters on that permanent instead.
-SVar:DoubleCounters:DB$ ReplaceEffect | VarName$ CounterNum | VarValue$ Z | References$ Z
-SVar:Y:ReplaceCount$TokenNum/Twice
-SVar:Z:ReplaceCount$CounterNum/Twice
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, until end of turn, whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
-SVar:RolledChaos:AB$ Effect | Cost$ 0 | AILogic$ Always | Triggers$ TrigTapForMana | SVars$ TrigMana
-SVar:TrigTapForMana:Mode$ TapsForMana | TriggerZones$ Command | ValidCard$ Land.YouCtrl | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
-SVar:TrigMana:AB$ ManaReflected | Cost$ 0 | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
-YouSVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_loft_gardens.jpg
-SVar:AIRollPlanarDieParams:Mode$ Always | MinTurn$ 1 | RollInMain1$ True
-Oracle:If an effect would put one or more tokens onto the battlefield, it puts twice that many of those tokens onto the battlefield instead.\nIf an effect would place one or more counters on a permanent, it places twice that many of those counters on that permanent instead.\nWhenever you roll {CHAOS}, until end of turn, whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
+Name:Selesnya Loft Gardens
+ManaCost:no cost
+Types:Plane Ravnica
+
+R:Event$ CreateToken | ActiveZones$ Battlefield | ReplaceWith$ DoubleToken | EffectOnly$ True | Description$ If an effect would create one or more tokens, it creates twice that many of those tokens instead.
+SVar:DoubleToken:DB$ ReplaceEffect | VarName$ TokenNum | VarValue$ Y | References$ Y
+R:Event$ AddCounter | ActiveZones$ Battlefield | ValidCard$ Permanent | EffectOnly$ True | ReplaceWith$ DoubleCounters | Description$ If an effect would place one or more counters on a permanent, it places twice that many of those counters on that permanent instead.
+SVar:DoubleCounters:DB$ ReplaceEffect | VarName$ CounterNum | VarValue$ Z | References$ Z
+SVar:Y:ReplaceCount$TokenNum/Twice
+SVar:Z:ReplaceCount$CounterNum/Twice
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, until end of turn, whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
+SVar:RolledChaos:AB$ Effect | Cost$ 0 | AILogic$ Always | Triggers$ TrigTapForMana | SVars$ TrigMana
+SVar:TrigTapForMana:Mode$ TapsForMana | TriggerZones$ Command | ValidCard$ Land.YouCtrl | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
+SVar:TrigMana:AB$ ManaReflected | Cost$ 0 | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
+YouSVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_loft_gardens.jpg
+SVar:AIRollPlanarDieParams:Mode$ Always | MinTurn$ 1 | RollInMain1$ True
+Oracle:If an effect would create one or more tokens, it creates twice that many of those tokens instead.\nIf an effect would place one or more counters on a permanent, it places twice that many of those counters on that permanent instead.\nWhenever you roll {CHAOS}, until end of turn, whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
diff --git a/forge-gui/res/cardsfolder/s/selvalas_charge.txt b/forge-gui/res/cardsfolder/s/selvalas_charge.txt
index 379edef6a00..a0a4c828cf7 100644
--- a/forge-gui/res/cardsfolder/s/selvalas_charge.txt
+++ b/forge-gui/res/cardsfolder/s/selvalas_charge.txt
@@ -1,10 +1,10 @@
-Name:Selvala's Charge
-ManaCost:4 G
-Types:Sorcery
-A:SP$ Dig | Cost$ 4 G | PreCostDesc$ Parley - | DigNum$ 1 | Defined$ Player | Reveal$ True | NoMove$ True | RememberRevealed$ True | SubAbility$ DBToken | SpellDescription$ Each player reveals the top card of his or her library. For each nonland card revealed this way, you put a 3/3 green Elephant creature token onto the battlefield. Then each player draws a card.
-SVar:DBToken:DB$ Token | TokenAmount$ X | References$ X | TokenName$ Elephant  | TokenTypes$ Creature,Elephant | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g_3_3_elephant_CNS | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | Defined$ Player | NumCards$ 1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$Valid Card.nonLand
-SVar:Picture:http://www.wizards.com/global/images/magic/general/selvalas_charge.jpg
-Oracle:Parley - Each player reveals the top card of his or her library. For each nonland card revealed this way, you put a 3/3 green Elephant creature token onto the battlefield. Then each player draws a card.
+Name:Selvala's Charge
+ManaCost:4 G
+Types:Sorcery
+A:SP$ Dig | Cost$ 4 G | PreCostDesc$ Parley - | DigNum$ 1 | Defined$ Player | Reveal$ True | NoMove$ True | RememberRevealed$ True | SubAbility$ DBToken | SpellDescription$ Each player reveals the top card of his or her library. For each nonland card revealed this way, you create a 3/3 green Elephant creature token. Then each player draws a card.
+SVar:DBToken:DB$ Token | TokenAmount$ X | References$ X | TokenName$ Elephant  | TokenTypes$ Creature,Elephant | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g_3_3_elephant_CNS | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ Player | NumCards$ 1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Remembered$Valid Card.nonLand
+SVar:Picture:http://www.wizards.com/global/images/magic/general/selvalas_charge.jpg
+Oracle:Parley - Each player reveals the top card of his or her library. For each nonland card revealed this way, you create a 3/3 green Elephant creature token. Then each player draws a card.
diff --git a/forge-gui/res/cardsfolder/s/shiv.txt b/forge-gui/res/cardsfolder/s/shiv.txt
index 59f8d927fc6..6b9b7a10695 100644
--- a/forge-gui/res/cardsfolder/s/shiv.txt
+++ b/forge-gui/res/cardsfolder/s/shiv.txt
@@ -1,10 +1,10 @@
-Name:Shiv
-ManaCost:no cost
-Types:Plane Dominaria
-S:Mode$ Continuous | Affected$ Creature | EffectZone$ Command | AddAbility$ Pump | Description$ All creatures have "{R}: This creature gets +1/+0 until end of turn."
-SVar:Pump:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, put a 5/5 red Dragon creature token with flying onto the battlefield.
-SVar:RolledChaos:AB$ Token | Cost$ 0 | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenColors$ Red | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying
-SVar:Picture:http://www.wizards.com/global/images/magic/general/shiv.jpg
-SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
-Oracle:All creatures have "{R}: This creature gets +1/+0 until end of turn."\nWhenever you roll {CHAOS}, put a 5/5 red Dragon creature token with flying onto the battlefield.
+Name:Shiv
+ManaCost:no cost
+Types:Plane Dominaria
+S:Mode$ Continuous | Affected$ Creature | EffectZone$ Command | AddAbility$ Pump | Description$ All creatures have "{R}: This creature gets +1/+0 until end of turn."
+SVar:Pump:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, create a 5/5 red Dragon creature token with flying.
+SVar:RolledChaos:AB$ Token | Cost$ 0 | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenColors$ Red | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying
+SVar:Picture:http://www.wizards.com/global/images/magic/general/shiv.jpg
+SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
+Oracle:All creatures have "{R}: This creature gets +1/+0 until end of turn."\nWhenever you roll {CHAOS}, create a 5/5 red Dragon creature token with flying.
diff --git a/forge-gui/res/cardsfolder/s/sigil_of_the_empty_throne.txt b/forge-gui/res/cardsfolder/s/sigil_of_the_empty_throne.txt
index 92373d73796..ad59744421b 100644
--- a/forge-gui/res/cardsfolder/s/sigil_of_the_empty_throne.txt
+++ b/forge-gui/res/cardsfolder/s/sigil_of_the_empty_throne.txt
@@ -1,7 +1,7 @@
 Name:Sigil of the Empty Throne
 ManaCost:3 W W
 Types:Enchantment
-T:Mode$ SpellCast | ValidCard$ Enchantment | ValidActivatingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an enchantment spell, put a 4/4 white Angel creature token with flying onto the battlefield.
+T:Mode$ SpellCast | ValidCard$ Enchantment | ValidActivatingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an enchantment spell, create a 4/4 white Angel creature token with flying.
 SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenImage$ w 4 4 angel CFX
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sigil_of_the_empty_throne.jpg
-Oracle:Whenever you cast an enchantment spell, put a 4/4 white Angel creature token with flying onto the battlefield.
+Oracle:Whenever you cast an enchantment spell, create a 4/4 white Angel creature token with flying.
diff --git a/forge-gui/res/cardsfolder/s/springjack_pasture.txt b/forge-gui/res/cardsfolder/s/springjack_pasture.txt
index 53df42ef5c2..21a5d2fcfe0 100644
--- a/forge-gui/res/cardsfolder/s/springjack_pasture.txt
+++ b/forge-gui/res/cardsfolder/s/springjack_pasture.txt
@@ -1,11 +1,11 @@
-Name:Springjack Pasture
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Token | Cost$ 4 T | TokenAmount$ 1 | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenOwner$ You | TokenColors$ White | TokenPower$ 0 | TokenToughness$ 1 | SpellDescription$ Put a 0/1 white Goat creature token onto the battlefield.
-A:AB$Mana | Cost$ T Sac<X/Goat> | CostDesc$ {T}, Sacrifice X Goats: | Produced$ Any | Amount$ ChosenX | References$ X | Defined$ You | SubAbility$ DBGainLife | SpellDescription$ Add X mana of any one color to your mana pool. You gain X life.
-SVar:X:XChoice
-SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ ChosenX
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/springjack_pasture.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}, {T}: Put a 0/1 white Goat creature token onto the battlefield.\n{T}, Sacrifice X Goats: Add X mana of any one color to your mana pool. You gain X life.
+Name:Springjack Pasture
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Token | Cost$ 4 T | TokenAmount$ 1 | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenOwner$ You | TokenColors$ White | TokenPower$ 0 | TokenToughness$ 1 | SpellDescription$ Create a 0/1 white Goat creature token.
+A:AB$Mana | Cost$ T Sac<X/Goat> | CostDesc$ {T}, Sacrifice X Goats: | Produced$ Any | Amount$ ChosenX | References$ X | Defined$ You | SubAbility$ DBGainLife | SpellDescription$ Add X mana of any one color to your mana pool. You gain X life.
+SVar:X:XChoice
+SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ ChosenX
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/springjack_pasture.jpg
+Oracle:{T}: Add {C} to your mana pool.\n{4}, {T}: Create a 0/1 white Goat creature token.\n{T}, Sacrifice X Goats: Add X mana of any one color to your mana pool. You gain X life.
diff --git a/forge-gui/res/cardsfolder/s/springjack_shepherd.txt b/forge-gui/res/cardsfolder/s/springjack_shepherd.txt
index c8894225ee5..6711e0b65ae 100644
--- a/forge-gui/res/cardsfolder/s/springjack_shepherd.txt
+++ b/forge-gui/res/cardsfolder/s/springjack_shepherd.txt
@@ -2,8 +2,8 @@ Name:Springjack Shepherd
 ManaCost:3 W
 Types:Creature Kithkin Wizard
 PT:1/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Chroma - When CARDNAME enters the battlefield, put a 0/1 white Goat creature token onto the battlefield for each white mana symbol in the mana costs of permanents you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Chroma - When CARDNAME enters the battlefield, create a 0/1 white Goat creature token for each white mana symbol in the mana costs of permanents you control.
 SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ X | References$ X | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenOwner$ You | TokenColors$ White | TokenPower$ 0 | TokenToughness$ 1
 SVar:X:Count$Chroma.White
 SVar:Picture:http://www.wizards.com/global/images/magic/general/springjack_shepherd.jpg
-Oracle:Chroma - When Springjack Shepherd enters the battlefield, put a 0/1 white Goat creature token onto the battlefield for each white mana symbol in the mana costs of permanents you control.
+Oracle:Chroma - When Springjack Shepherd enters the battlefield, create a 0/1 white Goat creature token for each white mana symbol in the mana costs of permanents you control.
diff --git a/forge-gui/res/cardsfolder/t/terastodon.txt b/forge-gui/res/cardsfolder/t/terastodon.txt
index 0683fb20805..32b921005a1 100644
--- a/forge-gui/res/cardsfolder/t/terastodon.txt
+++ b/forge-gui/res/cardsfolder/t/terastodon.txt
@@ -1,11 +1,11 @@
-Name:Terastodon
-ManaCost:6 G G
-Types:Creature Elephant
-PT:9/9
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy up to three target noncreature permanents. For each permanent put into a graveyard this way, its controller puts a 3/3 green Elephant creature token onto the battlefield.
-SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 3 | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Choose up to three noncreature permanents. | SubAbility$ MakeTokens
-SVar:MakeTokens:DB$ RepeatEach | RepeatSubAbility$ DBToken | DefinedCards$ Targeted
-SVar:DBToken:DB$ Token | ConditionCheckSVar$ InGrave | ConditionSVarCompare$ EQ1 | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenOwner$ RememberedController | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 elephant WWK
-SVar:InGrave:Remembered$Valid Card.inZoneGraveyard
-SVar:Picture:http://www.wizards.com/global/images/magic/general/terastodon.jpg
-Oracle:When Terastodon enters the battlefield, you may destroy up to three target noncreature permanents. For each permanent put into a graveyard this way, its controller puts a 3/3 green Elephant creature token onto the battlefield.
+Name:Terastodon
+ManaCost:6 G G
+Types:Creature Elephant
+PT:9/9
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy up to three target noncreature permanents. For each permanent put into a graveyard this way, its controller creates a 3/3 green Elephant creature token.
+SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 3 | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Choose up to three noncreature permanents. | SubAbility$ MakeTokens
+SVar:MakeTokens:DB$ RepeatEach | RepeatSubAbility$ DBToken | DefinedCards$ Targeted
+SVar:DBToken:DB$ Token | ConditionCheckSVar$ InGrave | ConditionSVarCompare$ EQ1 | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenOwner$ RememberedController | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 elephant WWK
+SVar:InGrave:Remembered$Valid Card.inZoneGraveyard
+SVar:Picture:http://www.wizards.com/global/images/magic/general/terastodon.jpg
+Oracle:When Terastodon enters the battlefield, you may destroy up to three target noncreature permanents. For each permanent put into a graveyard this way, its controller creates a 3/3 green Elephant creature token.
diff --git a/forge-gui/res/cardsfolder/t/trading_post.txt b/forge-gui/res/cardsfolder/t/trading_post.txt
index c9e42467a2b..c5240a1f0f9 100644
--- a/forge-gui/res/cardsfolder/t/trading_post.txt
+++ b/forge-gui/res/cardsfolder/t/trading_post.txt
@@ -1,10 +1,10 @@
-Name:Trading Post
-ManaCost:4
-Types:Artifact
-A:AB$ GainLife | Cost$ 1 T Discard<1/Card> | LifeAmount$ 4 | SpellDescription$ You gain 4 life.
-A:AB$ Token | Cost$ 1 T PayLife<1> | TokenAmount$ 1 | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenOwner$ You | TokenColors$ White | TokenPower$ 0 | TokenToughness$ 1 | TokenImage$ w 0 1 goat M13 | SpellDescription$ Put a 0/1 white Goat creature token onto the battlefield.
-A:AB$ ChangeZone | Cost$ 1 T Sac<1/Creature> | TgtPrompt$ Choose target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target artifact card from your graveyard to your hand.
-A:AB$ Draw | Cost$ 1 T Sac<1/Artifact> | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/trading_post.jpg
-Oracle:{1}, {T}, Discard a card: You gain 4 life.\n{1}, {T}, Pay 1 life: Put a 0/1 white Goat creature token onto the battlefield.\n{1}, {T}, Sacrifice a creature: Return target artifact card from your graveyard to your hand.\n{1}, {T}, Sacrifice an artifact: Draw a card.
+Name:Trading Post
+ManaCost:4
+Types:Artifact
+A:AB$ GainLife | Cost$ 1 T Discard<1/Card> | LifeAmount$ 4 | SpellDescription$ You gain 4 life.
+A:AB$ Token | Cost$ 1 T PayLife<1> | TokenAmount$ 1 | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenOwner$ You | TokenColors$ White | TokenPower$ 0 | TokenToughness$ 1 | TokenImage$ w 0 1 goat M13 | SpellDescription$ Create a 0/1 white Goat creature token.
+A:AB$ ChangeZone | Cost$ 1 T Sac<1/Creature> | TgtPrompt$ Choose target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target artifact card from your graveyard to your hand.
+A:AB$ Draw | Cost$ 1 T Sac<1/Artifact> | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/trading_post.jpg
+Oracle:{1}, {T}, Discard a card: You gain 4 life.\n{1}, {T}, Pay 1 life: Create a 0/1 white Goat creature token.\n{1}, {T}, Sacrifice a creature: Return target artifact card from your graveyard to your hand.\n{1}, {T}, Sacrifice an artifact: Draw a card.
diff --git a/forge-gui/res/cardsfolder/v/viridian_emissary.txt b/forge-gui/res/cardsfolder/v/viridian_emissary.txt
index 5619e0c6470..ce0584a87ae 100644
--- a/forge-gui/res/cardsfolder/v/viridian_emissary.txt
+++ b/forge-gui/res/cardsfolder/v/viridian_emissary.txt
@@ -2,7 +2,7 @@ Name:Viridian Emissary
 ManaCost:1 G
 Types:Creature Elf Scout
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/viridian_emissary.jpg
 Oracle:When Viridian Emissary dies, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.