diff --git a/forge-gui/res/cardsfolder/a/akoum_firebird.txt b/forge-gui/res/cardsfolder/a/akoum_firebird.txt
index 879751c4599..d07fad223d5 100644
--- a/forge-gui/res/cardsfolder/a/akoum_firebird.txt
+++ b/forge-gui/res/cardsfolder/a/akoum_firebird.txt
@@ -6,7 +6,7 @@ K:Flying
 K:Haste
 K:CARDNAME attacks each combat if able.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, you may pay {4}{R}{R}. If you do, return CARDNAME from your graveyard to the battlefield.
-SVar:TrigChange:AB$ChangeZone | Cost$ 4 R R | Origin$ Graveyard | Destination$ Battlefield
+SVar:TrigChange:AB$ ChangeZone | Cost$ 4 R R | Origin$ Graveyard | Destination$ Battlefield
 SVar:SacMe:3
 SVar:DiscardMe:3
 Oracle:Flying, haste\nAkoum Firebird attacks each combat if able.\nLandfall — Whenever a land enters the battlefield under your control, you may pay {4}{R}{R}. If you do, return Akoum Firebird from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/b/blood_speaker.txt b/forge-gui/res/cardsfolder/b/blood_speaker.txt
index 216ee836b53..c12cb57ba7d 100644
--- a/forge-gui/res/cardsfolder/b/blood_speaker.txt
+++ b/forge-gui/res/cardsfolder/b/blood_speaker.txt
@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Ogre Shaman
 PT:3/2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigSearch | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may sacrifice CARDNAME. If you do, search your library for a Demon card, reveal that card, put it into your hand, then shuffle.
-SVar:TrigSearch:AB$ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Demon | ChangeNum$ 1
+SVar:TrigSearch:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Demon | ChangeNum$ 1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Demon.YouCtrl | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever a Demon enters the battlefield under your control, you may return CARDNAME from your graveyard to your hand.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
 DeckHints:Type$Demon
diff --git a/forge-gui/res/cardsfolder/c/carrion_thrash.txt b/forge-gui/res/cardsfolder/c/carrion_thrash.txt
index 208fc55960d..b4508dd2167 100644
--- a/forge-gui/res/cardsfolder/c/carrion_thrash.txt
+++ b/forge-gui/res/cardsfolder/c/carrion_thrash.txt
@@ -3,5 +3,5 @@ ManaCost:2 B R G
 Types:Creature Viashino Warrior
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | OptionalDecider$ You | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME dies, you may pay {2}. If you do, return another target creature card from your graveyard to your hand.
-SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.Other | TargetsWithDefinedController$ TriggeredCardController | Cost$ 2
+SVar:TrigChange:AB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.Other | TargetsWithDefinedController$ TriggeredCardController | Cost$ 2
 Oracle:When Carrion Thrash dies, you may pay {2}. If you do, return another target creature card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/c/charnelhoard_wurm.txt b/forge-gui/res/cardsfolder/c/charnelhoard_wurm.txt
index de233f86f29..19c8185191e 100644
--- a/forge-gui/res/cardsfolder/c/charnelhoard_wurm.txt
+++ b/forge-gui/res/cardsfolder/c/charnelhoard_wurm.txt
@@ -4,5 +4,5 @@ Types:Creature Wurm
 PT:6/6
 K:Trample
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | OptionalDecider$ You | Execute$ TrigChange | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, you may return target card from your graveyard to your hand.
-SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.YouCtrl | Cost$ 0
+SVar:TrigChange:AB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.YouCtrl | Cost$ 0
 Oracle:Trample\nWhenever Charnelhoard Wurm deals damage to an opponent, you may return target card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/c/crossroads_candleguide.txt b/forge-gui/res/cardsfolder/c/crossroads_candleguide.txt
index a64f02b760b..1b0b6caf46e 100644
--- a/forge-gui/res/cardsfolder/c/crossroads_candleguide.txt
+++ b/forge-gui/res/cardsfolder/c/crossroads_candleguide.txt
@@ -3,6 +3,6 @@ ManaCost:4
 Types:Artifact Creature Scarecrow
 PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, exile up to one target card from a graveyard.
-SVar:TrigChangeZone:DB$ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target card in a graveyard to exile
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target card in a graveyard to exile
 A:AB$ Mana | Cost$ 2 | Produced$ Any | SpellDescription$ Add one mana of any color.
 Oracle:When Crossroads Candleguide enters the battlefield, exile up to one target card from a graveyard.\n{2}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/d/death_spark.txt b/forge-gui/res/cardsfolder/d/death_spark.txt
index a886a2dee80..661a11e0058 100644
--- a/forge-gui/res/cardsfolder/d/death_spark.txt
+++ b/forge-gui/res/cardsfolder/d/death_spark.txt
@@ -3,6 +3,6 @@ ManaCost:R
 Types:Instant
 A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Graveyard | IsPresent$ Creature.YouOwn+DirectlyAbove | PresentZone$ Graveyard | PresentCompare$ EQ1 | Execute$ TrigReturn | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard with a creature card directly above it, you may pay {1}. If you do, return CARDNAME to your hand.
-SVar:TrigReturn:AB$ChangeZone | Cost$ 1 | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+SVar:TrigReturn:AB$ ChangeZone | Cost$ 1 | Defined$ Self | Origin$ Graveyard | Destination$ Hand
 SVar:NeedsOrderedGraveyard:TRUE
 Oracle:Death Spark deals 1 damage to any target.\nAt the beginning of your upkeep, if Death Spark is in your graveyard with a creature card directly above it, you may pay {1}. If you do, return Death Spark to your hand.
diff --git a/forge-gui/res/cardsfolder/e/emeria_the_sky_ruin.txt b/forge-gui/res/cardsfolder/e/emeria_the_sky_ruin.txt
index 31eff212495..cce91b3f9d1 100644
--- a/forge-gui/res/cardsfolder/e/emeria_the_sky_ruin.txt
+++ b/forge-gui/res/cardsfolder/e/emeria_the_sky_ruin.txt
@@ -4,5 +4,5 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | IsPresent$ Card.Plains+YouCtrl | PresentCompare$ GE7 | TriggerDescription$ At the beginning of your upkeep, if you control seven or more Plains, you may return target creature card from your graveyard to the battlefield.
-SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | Cost$ 0
+SVar:TrigChange:AB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | Cost$ 0
 Oracle:Emeria, the Sky Ruin enters the battlefield tapped.\nAt the beginning of your upkeep, if you control seven or more Plains, you may return target creature card from your graveyard to the battlefield.\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/e/equilibrium.txt b/forge-gui/res/cardsfolder/e/equilibrium.txt
index 00284c47c52..1d72c337973 100644
--- a/forge-gui/res/cardsfolder/e/equilibrium.txt
+++ b/forge-gui/res/cardsfolder/e/equilibrium.txt
@@ -2,6 +2,6 @@ Name:Equilibrium
 ManaCost:1 U U
 Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigBounce | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you cast a creature spell, you may pay {1}. If you do, return target creature to its owner's hand.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
+SVar:TrigBounce:AB$ ChangeZone | Cost$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
 SVar:BuffedBy:Creature
 Oracle:Whenever you cast a creature spell, you may pay {1}. If you do, return target creature to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/g/genesis.txt b/forge-gui/res/cardsfolder/g/genesis.txt
index d282a94c18a..39de00dce06 100644
--- a/forge-gui/res/cardsfolder/g/genesis.txt
+++ b/forge-gui/res/cardsfolder/g/genesis.txt
@@ -3,6 +3,6 @@ ManaCost:4 G
 Types:Creature Incarnation
 PT:4/4
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard, you may pay {2}{G}. If you do, return target creature card from your graveyard to your hand.
-SVar:TrigChange:AB$ChangeZone | Cost$ 2 G | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl
+SVar:TrigChange:AB$ ChangeZone | Cost$ 2 G | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl
 SVar:DiscardMe:2
 Oracle:At the beginning of your upkeep, if Genesis is in your graveyard, you may pay {2}{G}. If you do, return target creature card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/g/ghastly_remains.txt b/forge-gui/res/cardsfolder/g/ghastly_remains.txt
index 14f680dc2bd..239849116a4 100644
--- a/forge-gui/res/cardsfolder/g/ghastly_remains.txt
+++ b/forge-gui/res/cardsfolder/g/ghastly_remains.txt
@@ -4,7 +4,7 @@ Types:Creature Zombie
 PT:0/0
 K:Amplify:1:Zombie
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.StrictlySelf | PresentZone$ Graveyard | PresentPlayer$ You | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard, you may pay {B}{B}{B}. If you do, return CARDNAME to your hand.
-SVar:TrigReturn:AB$ChangeZone | Cost$ B B B | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+SVar:TrigReturn:AB$ ChangeZone | Cost$ B B B | Defined$ Self | Origin$ Graveyard | Destination$ Hand
 SVar:NeedsToPlayVar:X GE2
 SVar:X:Count$TypeInYourHand.Zombie
 SVar:SacMe:2
diff --git a/forge-gui/res/cardsfolder/h/hibernation_sliver.txt b/forge-gui/res/cardsfolder/h/hibernation_sliver.txt
index 2022e5b75fa..d589147c5a0 100644
--- a/forge-gui/res/cardsfolder/h/hibernation_sliver.txt
+++ b/forge-gui/res/cardsfolder/h/hibernation_sliver.txt
@@ -3,6 +3,6 @@ ManaCost:U B
 Types:Creature Sliver
 PT:2/2
 S:Mode$ Continuous | Affected$ Sliver | AddAbility$ Bounce | Description$ All Slivers have "Pay 2 life, Return this permanent to its owner's hand."
-SVar:Bounce:AB$ChangeZone | Cost$ PayLife<2> | Defined$ Self | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return this permanent to its owner's hand
+SVar:Bounce:AB$ ChangeZone | Cost$ PayLife<2> | Defined$ Self | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return this permanent to its owner's hand
 SVar:PlayMain1:TRUE
 Oracle:All Slivers have "Pay 2 life: Return this permanent to its owner's hand."
diff --git a/forge-gui/res/cardsfolder/i/ichorid.txt b/forge-gui/res/cardsfolder/i/ichorid.txt
index 907d338bd61..8976a46043b 100644
--- a/forge-gui/res/cardsfolder/i/ichorid.txt
+++ b/forge-gui/res/cardsfolder/i/ichorid.txt
@@ -8,5 +8,5 @@ SVar:TrigSac:DB$ Sacrifice | SacValid$ Self
 SVar:EndOfTurnLeavePlay:True
 SVar:PlayMain1:TRUE
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | OptionalDecider$ You | TriggerZones$ Graveyard | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard, you may exile a black creature card other than CARDNAME from your graveyard. If you do, return CARDNAME to the battlefield.
-SVar:TrigReturn:AB$ChangeZone | Cost$ ExileFromGrave<1/Creature.Black+Other> | Origin$ Graveyard | Destination$ Battlefield
+SVar:TrigReturn:AB$ ChangeZone | Cost$ ExileFromGrave<1/Creature.Black+Other> | Origin$ Graveyard | Destination$ Battlefield
 Oracle:Haste\nAt the beginning of the end step, sacrifice Ichorid.\nAt the beginning of your upkeep, if Ichorid is in your graveyard, you may exile a black creature card other than Ichorid from your graveyard. If you do, return Ichorid to the battlefield.
diff --git a/forge-gui/res/cardsfolder/j/junk_diver.txt b/forge-gui/res/cardsfolder/j/junk_diver.txt
index fe173890098..8e37e7ae626 100644
--- a/forge-gui/res/cardsfolder/j/junk_diver.txt
+++ b/forge-gui/res/cardsfolder/j/junk_diver.txt
@@ -4,6 +4,6 @@ Types:Artifact Creature Bird
 PT:1/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME dies, return another target artifact card from your graveyard to your hand.
-SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Artifact.Other | TargetsWithDefinedController$ TriggeredCardController | Cost$ 0
+SVar:TrigChange:AB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Artifact.Other | TargetsWithDefinedController$ TriggeredCardController | Cost$ 0
 SVar:SacMe:1
 Oracle:Flying\nWhen Junk Diver dies, return another target artifact card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/l/llanowar_sentinel.txt b/forge-gui/res/cardsfolder/l/llanowar_sentinel.txt
index dd00570a77a..010534bc347 100644
--- a/forge-gui/res/cardsfolder/l/llanowar_sentinel.txt
+++ b/forge-gui/res/cardsfolder/l/llanowar_sentinel.txt
@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Creature Elf
 PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may pay {1}{G}. If you do, search your library for a card named CARDNAME, put that card onto the battlefield, then shuffle.
-SVar:TrigChange:AB$ChangeZone | Cost$ 1 G | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.namedLlanowar Sentinel | ChangeNum$ 1
+SVar:TrigChange:AB$ ChangeZone | Cost$ 1 G | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.namedLlanowar Sentinel | ChangeNum$ 1
 DeckHints:Name$Llanowar Sentinel
 Oracle:When Llanowar Sentinel enters the battlefield, you may pay {1}{G}. If you do, search your library for a card named Llanowar Sentinel, put that card onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/m/masked_admirers.txt b/forge-gui/res/cardsfolder/m/masked_admirers.txt
index a4dbeafdc8c..a88f591a44d 100644
--- a/forge-gui/res/cardsfolder/m/masked_admirers.txt
+++ b/forge-gui/res/cardsfolder/m/masked_admirers.txt
@@ -5,5 +5,5 @@ PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a creature spell, you may pay {G}{G}. If you do, return CARDNAME from your graveyard to your hand.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
-SVar:TrigReturn:AB$ChangeZone | Cost$ G G | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+SVar:TrigReturn:AB$ ChangeZone | Cost$ G G | Defined$ Self | Origin$ Graveyard | Destination$ Hand
 Oracle:When Masked Admirers enters the battlefield, draw a card.\nWhenever you cast a creature spell, you may pay {G}{G}. If you do, return Masked Admirers from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/m/master_of_death.txt b/forge-gui/res/cardsfolder/m/master_of_death.txt
index f6845616466..46590664327 100644
--- a/forge-gui/res/cardsfolder/m/master_of_death.txt
+++ b/forge-gui/res/cardsfolder/m/master_of_death.txt
@@ -5,7 +5,7 @@ PT:3/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters the battlefield, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
 SVar:TrigSurveil:DB$ Surveil | Defined$ You | Amount$ 2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.StrictlySelf | PresentZone$ Graveyard | PresentPlayer$ You | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard, you may pay 1 life. If you do, return it to your hand.
-SVar:TrigReturn:AB$ChangeZone | Cost$ PayLife<1> | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+SVar:TrigReturn:AB$ ChangeZone | Cost$ PayLife<1> | Defined$ Self | Origin$ Graveyard | Destination$ Hand
 SVar:SacMe:2
 SVar:DiscardMe:1
 Oracle:When Master of Death enters the battlefield, surveil 2.\nAt the beginning of your upkeep, if Master of Death is in your graveyard, you may pay 1 life. If you do, return it to your hand.
diff --git a/forge-gui/res/cardsfolder/m/myr_retriever.txt b/forge-gui/res/cardsfolder/m/myr_retriever.txt
index a36f67ab152..2ce6a896830 100644
--- a/forge-gui/res/cardsfolder/m/myr_retriever.txt
+++ b/forge-gui/res/cardsfolder/m/myr_retriever.txt
@@ -3,6 +3,6 @@ ManaCost:2
 Types:Artifact Creature Myr
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME dies, return another target artifact card from your graveyard to your hand.
-SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Artifact.Other | TargetsWithDefinedController$ TriggeredCardController | Cost$ 0
+SVar:TrigChange:AB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Artifact.Other | TargetsWithDefinedController$ TriggeredCardController | Cost$ 0
 SVar:SacMe:1
 Oracle:When Myr Retriever dies, return another target artifact card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/p/paleoloth.txt b/forge-gui/res/cardsfolder/p/paleoloth.txt
index e4cce8d9f8f..13956ec7eb7 100644
--- a/forge-gui/res/cardsfolder/p/paleoloth.txt
+++ b/forge-gui/res/cardsfolder/p/paleoloth.txt
@@ -3,5 +3,5 @@ ManaCost:4 G G
 Types:Creature Beast
 PT:5/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE5+Other+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ Whenever another creature with power 5 or greater enters the battlefield under your control, you may return target creature card from your graveyard to your hand.
-SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl | Cost$ 0
+SVar:TrigChange:AB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl | Cost$ 0
 Oracle:Whenever another creature with power 5 or greater enters the battlefield under your control, you may return target creature card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/p/punishing_fire.txt b/forge-gui/res/cardsfolder/p/punishing_fire.txt
index 94de257b396..9e2ea73ec40 100644
--- a/forge-gui/res/cardsfolder/p/punishing_fire.txt
+++ b/forge-gui/res/cardsfolder/p/punishing_fire.txt
@@ -3,5 +3,5 @@ ManaCost:1 R
 Types:Instant
 A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target.
 T:Mode$ LifeGained | ValidPlayer$ Opponent | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ Whenever an opponent gains life, you may pay {R}. If you do, return CARDNAME from your graveyard to your hand.
-SVar:TrigChange:AB$ChangeZone | Cost$ R | Origin$ Graveyard | Destination$ Hand
+SVar:TrigChange:AB$ ChangeZone | Cost$ R | Origin$ Graveyard | Destination$ Hand
 Oracle:Punishing Fire deals 2 damage to any target.\nWhenever an opponent gains life, you may pay {R}. If you do, return Punishing Fire from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/p/pyre_zombie.txt b/forge-gui/res/cardsfolder/p/pyre_zombie.txt
index 778c27be90b..7292dfce3af 100644
--- a/forge-gui/res/cardsfolder/p/pyre_zombie.txt
+++ b/forge-gui/res/cardsfolder/p/pyre_zombie.txt
@@ -5,7 +5,7 @@ PT:2/1
 A:AB$ DealDamage | Cost$ 1 R R Sac<1/CARDNAME> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target.
 #The IsPresent stuff in the trigger is necessary because it must be checked on resolve as well.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.StrictlySelf | PresentZone$ Graveyard | PresentPlayer$ You | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard, you may pay {1}{B}{B}. If you do, return CARDNAME to your hand.
-SVar:TrigReturn:AB$ChangeZone | Cost$ 1 B B | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+SVar:TrigReturn:AB$ ChangeZone | Cost$ 1 B B | Defined$ Self | Origin$ Graveyard | Destination$ Hand
 SVar:SacMe:2
 SVar:DiscardMe:1
 Oracle:At the beginning of your upkeep, if Pyre Zombie is in your graveyard, you may pay {1}{B}{B}. If you do, return Pyre Zombie to your hand.\n{1}{R}{R}, Sacrifice Pyre Zombie: It deals 2 damage to any target.
diff --git a/forge-gui/res/cardsfolder/r/reya_dawnbringer.txt b/forge-gui/res/cardsfolder/r/reya_dawnbringer.txt
index e948b61f48d..729ec682704 100644
--- a/forge-gui/res/cardsfolder/r/reya_dawnbringer.txt
+++ b/forge-gui/res/cardsfolder/r/reya_dawnbringer.txt
@@ -4,5 +4,5 @@ Types:Legendary Creature Angel
 PT:4/6
 K:Flying
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, you may return target creature card from your graveyard to the battlefield.
-SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | Cost$ 0
+SVar:TrigChange:AB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | Cost$ 0
 Oracle:Flying\nAt the beginning of your upkeep, you may return target creature card from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/r/rootwater_thief.txt b/forge-gui/res/cardsfolder/r/rootwater_thief.txt
index 71fc5fbe1f0..9ab4dbdb1e8 100644
--- a/forge-gui/res/cardsfolder/r/rootwater_thief.txt
+++ b/forge-gui/res/cardsfolder/r/rootwater_thief.txt
@@ -4,5 +4,5 @@ Types:Creature Merfolk Rogue
 PT:1/2
 A:AB$ Pump | Cost$ U | KW$ Flying | Defined$ Self | SpellDescription$ CARDNAME gains flying until end of turn.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may pay {2}. If you do, search that player's library for a card and exile it, then the player shuffles.
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 2 | Origin$ Library | Destination$ Exile | DefinedPlayer$ TriggeredTarget | ChangeType$ Card | ChangeNum$ 1 | Chooser$ You | Shuffle$ True
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 2 | Origin$ Library | Destination$ Exile | DefinedPlayer$ TriggeredTarget | ChangeType$ Card | ChangeNum$ 1 | Chooser$ You | Shuffle$ True
 Oracle:{U}: Rootwater Thief gains flying until end of turn.\nWhenever Rootwater Thief deals combat damage to a player, you may pay {2}. If you do, search that player's library for a card and exile it, then the player shuffles.
diff --git a/forge-gui/res/cardsfolder/s/sanctum_of_ugin.txt b/forge-gui/res/cardsfolder/s/sanctum_of_ugin.txt
index 4d9d75b05c0..bb286a79ce9 100644
--- a/forge-gui/res/cardsfolder/s/sanctum_of_ugin.txt
+++ b/forge-gui/res/cardsfolder/s/sanctum_of_ugin.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 T:Mode$ SpellCast | ValidCard$ Card.Colorless+cmcGE7 | ValidActivatingPlayer$ You | Execute$ TrigSearch | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a colorless spell with mana value 7 or greater, you may sacrifice CARDNAME. If you do, search your library for a colorless creature card, reveal it, put it into your hand, then shuffle.
-SVar:TrigSearch:AB$ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Colorless | ChangeNum$ 1
+SVar:TrigSearch:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Colorless | ChangeNum$ 1
 DeckHas:Ability$Mana.Colorless
 Oracle:{T}: Add {C}.\nWhenever you cast a colorless spell with mana value 7 or greater, you may sacrifice Sanctum of Ugin. If you do, search your library for a colorless creature card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/soul_guide_gryff.txt b/forge-gui/res/cardsfolder/s/soul_guide_gryff.txt
index 63f0c548f0f..e2ce0d00d75 100644
--- a/forge-gui/res/cardsfolder/s/soul_guide_gryff.txt
+++ b/forge-gui/res/cardsfolder/s/soul_guide_gryff.txt
@@ -4,5 +4,5 @@ Types:Creature Hippogriff Spirit
 PT:3/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, exile up to one target card from a graveyard.
-SVar:TrigChangeZone:DB$ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target card in a graveyard to exile
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target card in a graveyard to exile
 Oracle:Flying\nWhen Soul-Guide Gryff enters the battlefield, exile up to one target card from a graveyard.
diff --git a/forge-gui/res/cardsfolder/s/sun_titan.txt b/forge-gui/res/cardsfolder/s/sun_titan.txt
index fedfe7fa02d..d1015766903 100644
--- a/forge-gui/res/cardsfolder/s/sun_titan.txt
+++ b/forge-gui/res/cardsfolder/s/sun_titan.txt
@@ -5,6 +5,6 @@ PT:6/6
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may return target permanent card with mana value 3 or less from your graveyard to the battlefield.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may return target permanent card with mana value 3 or less from your graveyard to the battlefield.
-SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.YouCtrl+cmcLE3 | Cost$ 0
+SVar:TrigChange:AB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.YouCtrl+cmcLE3 | Cost$ 0
 SVar:HasAttackEffect:TRUE
 Oracle:Vigilance\nWhenever Sun Titan enters the battlefield or attacks, you may return target permanent card with mana value 3 or less from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/surgespanner.txt b/forge-gui/res/cardsfolder/s/surgespanner.txt
index e0f03c1937e..1d6ed6e11b2 100644
--- a/forge-gui/res/cardsfolder/s/surgespanner.txt
+++ b/forge-gui/res/cardsfolder/s/surgespanner.txt
@@ -2,6 +2,6 @@ Name:Surgespanner
 ManaCost:2 U U
 Types:Creature Merfolk Wizard
 PT:2/2
-T:Mode$ Taps | ValidCard$ Card.Self | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ Whenever Surgespanner becomes tapped, you may pay {1}{U}. If you do, return target permanent to its owner's hand.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 1 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand
+T:Mode$ Taps | ValidCard$ Card.Self | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ Whenever CARDNAME becomes tapped, you may pay {1}{U}. If you do, return target permanent to its owner's hand.
+SVar:TrigBounce:AB$ ChangeZone | Cost$ 1 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand
 Oracle:Whenever Surgespanner becomes tapped, you may pay {1}{U}. If you do, return target permanent to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/t/taj_nar_swordsmith.txt b/forge-gui/res/cardsfolder/t/taj_nar_swordsmith.txt
index 96c9f85ea3e..01a14a73d04 100644
--- a/forge-gui/res/cardsfolder/t/taj_nar_swordsmith.txt
+++ b/forge-gui/res/cardsfolder/t/taj_nar_swordsmith.txt
@@ -3,6 +3,6 @@ ManaCost:3 W
 Types:Creature Cat Soldier
 PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may pay {X}. If you do, search your library for an Equipment card with mana value X or less, put that card onto the battlefield, then shuffle.
-SVar:TrigChange:AB$ChangeZone | Cost$ X | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.Equipment+cmcLEX | ChangeNum$ 1
+SVar:TrigChange:AB$ ChangeZone | Cost$ X | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.Equipment+cmcLEX | ChangeNum$ 1
 SVar:X:Count$xPaid
 Oracle:When Taj-Nar Swordsmith enters the battlefield, you may pay {X}. If you do, search your library for an Equipment card with mana value X or less, put that card onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/t/teneb_the_harvester.txt b/forge-gui/res/cardsfolder/t/teneb_the_harvester.txt
index c79bb1c1cb7..b2af01451fc 100644
--- a/forge-gui/res/cardsfolder/t/teneb_the_harvester.txt
+++ b/forge-gui/res/cardsfolder/t/teneb_the_harvester.txt
@@ -4,5 +4,5 @@ Types:Legendary Creature Dragon
 PT:6/6
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may pay {2}{B}. If you do, put target creature card from a graveyard onto the battlefield under your control.
-SVar:TrigChange:AB$ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | ChangeNum$ 1 | TgtPrompt$ Select target creature card in a graveyard | ValidTgts$ Creature
+SVar:TrigChange:AB$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | ChangeNum$ 1 | TgtPrompt$ Select target creature card in a graveyard | ValidTgts$ Creature
 Oracle:Flying\nWhenever Teneb, the Harvester deals combat damage to a player, you may pay {2}{B}. If you do, put target creature card from a graveyard onto the battlefield under your control.
diff --git a/forge-gui/res/cardsfolder/t/tethmos_high_priest.txt b/forge-gui/res/cardsfolder/t/tethmos_high_priest.txt
index 6ee2488e057..2da3ea01960 100644
--- a/forge-gui/res/cardsfolder/t/tethmos_high_priest.txt
+++ b/forge-gui/res/cardsfolder/t/tethmos_high_priest.txt
@@ -3,5 +3,5 @@ ManaCost:2 W
 Types:Creature Cat Cleric
 PT:2/3
 T:Mode$ SpellCast | ValidActivatingPlayer$ You | TargetsValid$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ Heroic — Whenever you cast a spell that targets CARDNAME, return target creature card with mana value 2 or less from your graveyard to the battlefield.
-SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn+cmcLE2 | Cost$ 0
+SVar:TrigChange:AB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn+cmcLE2 | Cost$ 0
 Oracle:Heroic — Whenever you cast a spell that targets Tethmos High Priest, return target creature card with mana value 2 or less from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/t/timely_hordemate.txt b/forge-gui/res/cardsfolder/t/timely_hordemate.txt
index 47adb20a6a1..917c71ef510 100644
--- a/forge-gui/res/cardsfolder/t/timely_hordemate.txt
+++ b/forge-gui/res/cardsfolder/t/timely_hordemate.txt
@@ -4,5 +4,5 @@ Types:Creature Human Warrior
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigChange | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked this turn, return target creature card with mana value 2 or less from your graveyard to the battlefield.
 SVar:RaidTest:Count$AttackersDeclared
-SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl+cmcLE2 | Cost$ 0
+SVar:TrigChange:AB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl+cmcLE2 | Cost$ 0
 Oracle:Raid — When Timely Hordemate enters the battlefield, if you attacked this turn, return target creature card with mana value 2 or less from your graveyard to the battlefield.
diff --git a/forge-gui/res/tokenscripts/b_1_2_bat_flying_nosferatu.txt b/forge-gui/res/tokenscripts/b_1_2_bat_flying_nosferatu.txt
index eef38983faf..fb9b5950fd0 100644
--- a/forge-gui/res/tokenscripts/b_1_2_bat_flying_nosferatu.txt
+++ b/forge-gui/res/tokenscripts/b_1_2_bat_flying_nosferatu.txt
@@ -4,5 +4,5 @@ Types:Creature Bat
 Colors:black
 PT:1/2
 K:Flying
-A:AB$ChangeZone | Cost$ 1 B Sac<1/CARDNAME> | ChangeType$ Card.namedSengir Nosferatu | ChangeNum$ 1 | Origin$ Exile | Destination$ Battlefield | Hidden$ True | SpellDescription$ Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control
+A:AB$ ChangeZone | Cost$ 1 B Sac<1/CARDNAME> | ChangeType$ Card.namedSengir Nosferatu | ChangeNum$ 1 | Origin$ Exile | Destination$ Battlefield | Hidden$ True | SpellDescription$ Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control
 Oracle:Flying\n{1}{B}, Sacrifice this creature: Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control.