diff --git a/forge-gui/res/cardsfolder/upcoming/twenty_toed_toad.txt b/forge-gui/res/cardsfolder/upcoming/twenty_toed_toad.txt
index d5d81b0ecd0..56253636c0c 100644
--- a/forge-gui/res/cardsfolder/upcoming/twenty_toed_toad.txt
+++ b/forge-gui/res/cardsfolder/upcoming/twenty_toed_toad.txt
@@ -1,16 +1,16 @@
-Name:Twenty-Toed Toad
-ManaCost:3 U
-Types:Creature Frog Wizard
-PT:3/3
-S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ 20 | Description$ Your maximum hand size is twenty.
-T:Mode$ AttackersDeclared | Execute$ TrigPutCounter | ValidAttackers$ Creature | ValidAttackersAmount$ GE2 | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with two or more creatures, put a +1/+1 counter on CARDNAME and draw a card.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigWinGame | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you win the game if there are twenty or more counters on it or you have twenty or more cards in hand.
-SVar:TrigWinGame:DB$ WinsGame | Defined$ You | ConditionCheckSVar$ Win | ConditionSVarCompare$ GE20
-SVar:Win:Count$Compare Y GE20.20.Z
-SVar:Y:Count$CardCounters.ALL
-SVar:Z:Count$InYourHand
-SVar:HasAttackEffect:TRUE
-SVar:PlayMain1:TRUE
-Oracle:Your maximum hand size is twenty.\nWhenever you attack with two or more creatures, put a +1/+1 counter on Twenty-Toed Toad and draw a card.\nWhenever Twenty-Toed Toad attacks, you win the game if there are twenty or more counters on it or you have twenty or more cards in hand.
+Name:Twenty-Toed Toad
+ManaCost:3 U
+Types:Creature Frog Wizard
+PT:3/3
+S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ 20 | Description$ Your maximum hand size is twenty.
+T:Mode$ AttackersDeclared | Execute$ TrigPutCounter | ValidAttackers$ Creature | ValidAttackersAmount$ GE2 | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with two or more creatures, put a +1/+1 counter on CARDNAME and draw a card.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigWinGame | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you win the game if there are twenty or more counters on it or you have twenty or more cards in hand.
+SVar:TrigWinGame:DB$ WinsGame | Defined$ You | ConditionCheckSVar$ Win | ConditionSVarCompare$ GE20
+SVar:Win:Count$Compare Y GE20.20.Z
+SVar:Y:Count$CardCounters.ALL
+SVar:Z:Count$InYourHand
+SVar:HasAttackEffect:TRUE
+SVar:PlayMain1:TRUE
+Oracle:Your maximum hand size is twenty.\nWhenever you attack with two or more creatures, put a +1/+1 counter on Twenty-Toed Toad and draw a card.\nWhenever Twenty-Toed Toad attacks, you win the game if there are twenty or more counters on it or you have twenty or more cards in hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/twitching_doll.txt b/forge-gui/res/cardsfolder/upcoming/twitching_doll.txt
index 3478358a2c0..d3f874dbebd 100644
--- a/forge-gui/res/cardsfolder/upcoming/twitching_doll.txt
+++ b/forge-gui/res/cardsfolder/upcoming/twitching_doll.txt
@@ -1,10 +1,10 @@
-Name:Twitching Doll
-ManaCost:1 G
-Types:Artifact Creature Spider Toy
-PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ Any | SubAbility$ DBPutCounter | SpellDescription$ Add one mana of any color. Put a nest counter on CARDNAME.
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ NEST
-A:AB$ Token | Cost$ T Sac<1/CARDNAME> | TokenOwner$ You | TokenAmount$ X | TokenScript$ g_2_2_spider_reach | SorcerySpeed$ True | SpellDescription$ Create a 2/2 green Spider creature token with reach for each counter on CARDNAME. Activate only as a sorcery.
-SVar:X:Count$CardCounters.ALL
-DeckHas:Ability$Token
-Oracle:{T}: Add one mana of any color. Put a nest counter on Twitching Doll.\n{T}, Sacrifice Twitching Doll: Create a 2/2 green Spider creature token with reach for each counter on Twitching Doll. Activate only as a sorcery.
\ No newline at end of file
+Name:Twitching Doll
+ManaCost:1 G
+Types:Artifact Creature Spider Toy
+PT:2/2
+A:AB$ Mana | Cost$ T | Produced$ Any | SubAbility$ DBPutCounter | SpellDescription$ Add one mana of any color. Put a nest counter on CARDNAME.
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ NEST
+A:AB$ Token | Cost$ T Sac<1/CARDNAME> | TokenOwner$ You | TokenAmount$ X | TokenScript$ g_2_2_spider_reach | SorcerySpeed$ True | SpellDescription$ Create a 2/2 green Spider creature token with reach for each counter on CARDNAME. Activate only as a sorcery.
+SVar:X:Count$CardCounters.ALL
+DeckHas:Ability$Token
+Oracle:{T}: Add one mana of any color. Put a nest counter on Twitching Doll.\n{T}, Sacrifice Twitching Doll: Create a 2/2 green Spider creature token with reach for each counter on Twitching Doll. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/valley_flamecaller.txt b/forge-gui/res/cardsfolder/upcoming/valley_flamecaller.txt
index b82195ba564..e5944abbcfc 100644
--- a/forge-gui/res/cardsfolder/upcoming/valley_flamecaller.txt
+++ b/forge-gui/res/cardsfolder/upcoming/valley_flamecaller.txt
@@ -1,9 +1,9 @@
-Name:Valley Flamecaller
-ManaCost:2 R
-Types:Creature Lizard Warlock
-PT:3/3
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Lizard.YouCtrl,Mouse.YouCtrl,Otter.YouCtrl,Raccoon.YouCtrl | ValidTarget$ Permanent,Player | ReplaceWith$ DmgPlus1 | Description$ If a Lizard, Mouse, Otter, or Raccoon you control would deal damage to a permanent or player, it deals that much damage plus 1 instead.
-SVar:DmgPlus1:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X
-SVar:X:ReplaceCount$DamageAmount/Plus.1
-DeckHints:Type$Lizard|Mouse|Otter|Raccoon
-Oracle:If a Lizard, Mouse, Otter, or Raccoon you control would deal damage to a permanent or player, it deals that much damage plus 1 instead.
\ No newline at end of file
+Name:Valley Flamecaller
+ManaCost:2 R
+Types:Creature Lizard Warlock
+PT:3/3
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Lizard.YouCtrl,Mouse.YouCtrl,Otter.YouCtrl,Raccoon.YouCtrl | ValidTarget$ Permanent,Player | ReplaceWith$ DmgPlus1 | Description$ If a Lizard, Mouse, Otter, or Raccoon you control would deal damage to a permanent or player, it deals that much damage plus 1 instead.
+SVar:DmgPlus1:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X
+SVar:X:ReplaceCount$DamageAmount/Plus.1
+DeckHints:Type$Lizard|Mouse|Otter|Raccoon
+Oracle:If a Lizard, Mouse, Otter, or Raccoon you control would deal damage to a permanent or player, it deals that much damage plus 1 instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/valley_floodcaller.txt b/forge-gui/res/cardsfolder/upcoming/valley_floodcaller.txt
index 09ab8b952e7..f350241de09 100644
--- a/forge-gui/res/cardsfolder/upcoming/valley_floodcaller.txt
+++ b/forge-gui/res/cardsfolder/upcoming/valley_floodcaller.txt
@@ -1,11 +1,11 @@
-Name:Valley Floodcaller
-ManaCost:2 U
-Types:Creature Otter Wizard
-PT:2/2
-K:Flash
-S:Mode$ CastWithFlash | ValidCard$ Card.nonCreature | ValidSA$ Spell | Caster$ You | Description$ You may cast noncreature spells as though they had flash.
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ Whenever you cast a noncreature spell, Birds, Frogs, Otters, and Rats you control get +1/+1 until end of turn. Untap them.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Bird.YouCtrl,Frog.YouCtrl,Otter.YouCtrl,Rat.YouCtrl | NumAtt$ 1 | NumDef$ 1 | SubAbility$ TrigUntapAll
-SVar:TrigUntapAll:DB$ UntapAll | ValidCards$ Bird.YouCtrl,Frog.YouCtrl,Otter.YouCtrl,Rat.YouCtrl
-SVar:BuffedBy:Card.nonCreature+nonLand
-Oracle:Flash\nYou may cast noncreature spells as though they had flash.\nWhenever you cast a noncreature spell, Birds, Frogs, Otters, and Rats you control get +1/+1 until end of turn. Untap them.
\ No newline at end of file
+Name:Valley Floodcaller
+ManaCost:2 U
+Types:Creature Otter Wizard
+PT:2/2
+K:Flash
+S:Mode$ CastWithFlash | ValidCard$ Card.nonCreature | ValidSA$ Spell | Caster$ You | Description$ You may cast noncreature spells as though they had flash.
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ Whenever you cast a noncreature spell, Birds, Frogs, Otters, and Rats you control get +1/+1 until end of turn. Untap them.
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Bird.YouCtrl,Frog.YouCtrl,Otter.YouCtrl,Rat.YouCtrl | NumAtt$ 1 | NumDef$ 1 | SubAbility$ TrigUntapAll
+SVar:TrigUntapAll:DB$ UntapAll | ValidCards$ Bird.YouCtrl,Frog.YouCtrl,Otter.YouCtrl,Rat.YouCtrl
+SVar:BuffedBy:Card.nonCreature+nonLand
+Oracle:Flash\nYou may cast noncreature spells as though they had flash.\nWhenever you cast a noncreature spell, Birds, Frogs, Otters, and Rats you control get +1/+1 until end of turn. Untap them.
diff --git a/forge-gui/res/cardsfolder/upcoming/valley_mightcaller.txt b/forge-gui/res/cardsfolder/upcoming/valley_mightcaller.txt
index b736f8ed24e..8ca634e48e0 100644
--- a/forge-gui/res/cardsfolder/upcoming/valley_mightcaller.txt
+++ b/forge-gui/res/cardsfolder/upcoming/valley_mightcaller.txt
@@ -1,10 +1,10 @@
-Name:Valley Mightcaller
-ManaCost:G
-Types:Creature Frog Warrior
-PT:1/1
-K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Frog.Other+YouCtrl,Rabbit.Other+YouCtrl,Raccoon.Other+YouCtrl,Squirrel.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another Frog, Rabbit, Raccoon, or Squirrel you control enters, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-DeckHas:Ability$Counters
-DeckHints:Type$Frog|Rabbit|Raccoon|Squirrel
-Oracle:Trample\nWhenever another Frog, Rabbit, Raccoon, or Squirrel you control enters, put a +1/+1 counter on Valley Mightcaller.
\ No newline at end of file
+Name:Valley Mightcaller
+ManaCost:G
+Types:Creature Frog Warrior
+PT:1/1
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Frog.Other+YouCtrl,Rabbit.Other+YouCtrl,Raccoon.Other+YouCtrl,Squirrel.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another Frog, Rabbit, Raccoon, or Squirrel you control enters, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
+DeckHints:Type$Frog|Rabbit|Raccoon|Squirrel
+Oracle:Trample\nWhenever another Frog, Rabbit, Raccoon, or Squirrel you control enters, put a +1/+1 counter on Valley Mightcaller.
diff --git a/forge-gui/res/cardsfolder/upcoming/valley_questcaller.txt b/forge-gui/res/cardsfolder/upcoming/valley_questcaller.txt
index 3ee7a8ee288..7e353408397 100644
--- a/forge-gui/res/cardsfolder/upcoming/valley_questcaller.txt
+++ b/forge-gui/res/cardsfolder/upcoming/valley_questcaller.txt
@@ -1,9 +1,9 @@
-Name:Valley Questcaller
-ManaCost:1 W
-Types:Creature Rabbit Warrior
-PT:2/3
-T:Mode$ ChangesZoneAll | ValidCards$ Rabbit.Other+YouCtrl,Bat.Other+YouCtrl,Bird.Other+YouCtrl,Mouse.Other+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigScry | TriggerDescription$ Whenever one or more other Rabbits, Bats, Birds, and/or Mice you control enter, scry 1.
-SVar:TrigScry:DB$ Scry | ScryNum$ 1
-S:Mode$ Continuous | Affected$ Rabbit.Other+YouCtrl,Bat.Other+YouCtrl,Bird.Other+YouCtrl,Mouse.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Rabbits, Bats, Birds, and Mice you control get +1/+1.
-DeckHints:Type$Rabbit|Bat|Bird|Mouse
-Oracle:Whenever one or more other Rabbits, Bats, Birds, and/or Mice you control enter, scry 1.\nOther Rabbits, Bats, Birds, and Mice you control get +1/+1.
+Name:Valley Questcaller
+ManaCost:1 W
+Types:Creature Rabbit Warrior
+PT:2/3
+T:Mode$ ChangesZoneAll | ValidCards$ Rabbit.Other+YouCtrl,Bat.Other+YouCtrl,Bird.Other+YouCtrl,Mouse.Other+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigScry | TriggerDescription$ Whenever one or more other Rabbits, Bats, Birds, and/or Mice you control enter, scry 1.
+SVar:TrigScry:DB$ Scry | ScryNum$ 1
+S:Mode$ Continuous | Affected$ Rabbit.Other+YouCtrl,Bat.Other+YouCtrl,Bird.Other+YouCtrl,Mouse.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Rabbits, Bats, Birds, and Mice you control get +1/+1.
+DeckHints:Type$Rabbit|Bat|Bird|Mouse
+Oracle:Whenever one or more other Rabbits, Bats, Birds, and/or Mice you control enter, scry 1.\nOther Rabbits, Bats, Birds, and Mice you control get +1/+1.
diff --git a/forge-gui/res/cardsfolder/upcoming/valley_rally.txt b/forge-gui/res/cardsfolder/upcoming/valley_rally.txt
index 935c06a4093..052d5430133 100644
--- a/forge-gui/res/cardsfolder/upcoming/valley_rally.txt
+++ b/forge-gui/res/cardsfolder/upcoming/valley_rally.txt
@@ -1,9 +1,9 @@
-Name:Valley Rally
-ManaCost:2 R
-Types:Instant
-K:Gift
-SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ Promised | GiftDescription$ a Food
-A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | SubAbility$ DBPump | SpellDescription$ Creatures you control get +2/+0 until end of turn. If the gift was promised, target creature you control gains first strike until end of turn.
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TargetMin$ X | TargetMax$ X | TgtPrompt$ Select target creature you control | KW$ First Strike
-SVar:X:Count$ValidStack Card.Self+PromisedGift
-Oracle:Gift a Food (You may promise an opponent a gift as you cast this spell. If you do, they create a Food token before its other effects. It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")\nCreatures you control get +2/+0 until end of turn. If the gift was promised, target creature you control gains first strike until end of turn.
\ No newline at end of file
+Name:Valley Rally
+ManaCost:2 R
+Types:Instant
+K:Gift
+SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ Promised | GiftDescription$ a Food
+A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | SubAbility$ DBPump | SpellDescription$ Creatures you control get +2/+0 until end of turn. If the gift was promised, target creature you control gains first strike until end of turn.
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TargetMin$ X | TargetMax$ X | TgtPrompt$ Select target creature you control | KW$ First Strike
+SVar:X:Count$ValidStack Card.Self+PromisedGift
+Oracle:Gift a Food (You may promise an opponent a gift as you cast this spell. If you do, they create a Food token before its other effects. It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")\nCreatures you control get +2/+0 until end of turn. If the gift was promised, target creature you control gains first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/valley_rotcaller.txt b/forge-gui/res/cardsfolder/upcoming/valley_rotcaller.txt
index 2b2fbd2a949..fa560a18dfc 100644
--- a/forge-gui/res/cardsfolder/upcoming/valley_rotcaller.txt
+++ b/forge-gui/res/cardsfolder/upcoming/valley_rotcaller.txt
@@ -1,11 +1,11 @@
-Name:Valley Rotcaller
-ManaCost:1 B
-Types:Creature Squirrel Warlock
-PT:1/3
-K:Menace
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME attacks, each opponent loses X life and you gain X life, where X is the number of other Squirrels, Bats, Lizards, and Rats you control.
-SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ X | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
-SVar:X:Count$Valid Squirrel.YouCtrl+StrictlyOther,Bat.YouCtrl+StrictlyOther,Lizard.YouCtrl+StrictlyOther,Rat.YouCtrl+StrictlyOther
-SVar:HasAttackEffect:TRUE
-Oracle:Menace\nWhenever Valley Rotcaller attacks, each opponent loses X life and you gain X life, where X is the number of other Squirrels, Bats, Lizards, and Rats you control.
+Name:Valley Rotcaller
+ManaCost:1 B
+Types:Creature Squirrel Warlock
+PT:1/3
+K:Menace
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME attacks, each opponent loses X life and you gain X life, where X is the number of other Squirrels, Bats, Lizards, and Rats you control.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ X | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
+SVar:X:Count$Valid Squirrel.YouCtrl+StrictlyOther,Bat.YouCtrl+StrictlyOther,Lizard.YouCtrl+StrictlyOther,Rat.YouCtrl+StrictlyOther
+SVar:HasAttackEffect:TRUE
+Oracle:Menace\nWhenever Valley Rotcaller attacks, each opponent loses X life and you gain X life, where X is the number of other Squirrels, Bats, Lizards, and Rats you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/veteran_guardmouse.txt b/forge-gui/res/cardsfolder/upcoming/veteran_guardmouse.txt
index 97d21a0aabc..e336021430b 100644
--- a/forge-gui/res/cardsfolder/upcoming/veteran_guardmouse.txt
+++ b/forge-gui/res/cardsfolder/upcoming/veteran_guardmouse.txt
@@ -1,8 +1,8 @@
-Name:Veteran Guardmouse
-ManaCost:3 RW
-Types:Creature Mouse Soldier
-PT:3/4
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | FirstTime$ True | Execute$ TrigPump | TriggerDescription$ Valiant — Whenever CARDNAME becomes the target of a spell or ability you control for the first time each turn, it gets +1/+0 and gains first strike until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom.)
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | KW$ First Strike | SubAbility$ DBScry
-SVar:DBScry:DB$ Scry | ScryNum$ 1
-Oracle:Valiant — Whenever Veteran Guardmouse becomes the target of a spell or ability you control for the first time each turn, it gets +1/+0 and gains first strike until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom.)
+Name:Veteran Guardmouse
+ManaCost:3 RW
+Types:Creature Mouse Soldier
+PT:3/4
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | FirstTime$ True | Execute$ TrigPump | TriggerDescription$ Valiant — Whenever CARDNAME becomes the target of a spell or ability you control for the first time each turn, it gets +1/+0 and gains first strike until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | KW$ First Strike | SubAbility$ DBScry
+SVar:DBScry:DB$ Scry | ScryNum$ 1
+Oracle:Valiant — Whenever Veteran Guardmouse becomes the target of a spell or ability you control for the first time each turn, it gets +1/+0 and gains first strike until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom.)
diff --git a/forge-gui/res/cardsfolder/upcoming/viewpoint_synchronization.txt b/forge-gui/res/cardsfolder/upcoming/viewpoint_synchronization.txt
index 8ff804381fe..d6248b7476b 100644
--- a/forge-gui/res/cardsfolder/upcoming/viewpoint_synchronization.txt
+++ b/forge-gui/res/cardsfolder/upcoming/viewpoint_synchronization.txt
@@ -1,9 +1,9 @@
-Name:Viewpoint Synchronization
-ManaCost:4 G
-Types:Sorcery
-K:Freerunning:2 G
-A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 3 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to three basic land cards and reveal them. Put two of them onto the battlefield tapped and the other into your hand, then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 2 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your hand | StackDescription$ None | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Freerunning {2}{G} (You may cast this spell for its freerunning cost if you dealt combat damage to a player this turn with an Assassin or commander.)\nSearch your library for up to three basic land cards and reveal them. Put two of them onto the battlefield tapped and the other into your hand, then shuffle.
\ No newline at end of file
+Name:Viewpoint Synchronization
+ManaCost:4 G
+Types:Sorcery
+K:Freerunning:2 G
+A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 3 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to three basic land cards and reveal them. Put two of them onto the battlefield tapped and the other into your hand, then shuffle.
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 2 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your hand | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Freerunning {2}{G} (You may cast this spell for its freerunning cost if you dealt combat damage to a player this turn with an Assassin or commander.)\nSearch your library for up to three basic land cards and reveal them. Put two of them onto the battlefield tapped and the other into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/vinereap_mentor.txt b/forge-gui/res/cardsfolder/upcoming/vinereap_mentor.txt
index c51c1c085a7..6be6cd576cd 100644
--- a/forge-gui/res/cardsfolder/upcoming/vinereap_mentor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vinereap_mentor.txt
@@ -1,8 +1,8 @@
-Name:Vinereap Mentor
-ManaCost:B G
-Types:Creature Squirrel Druid
-PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters or dies, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerDescription$ When CARDNAME enters or dies, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
-Oracle:When Vinereap Mentor enters or dies, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
\ No newline at end of file
+Name:Vinereap Mentor
+ManaCost:B G
+Types:Creature Squirrel Druid
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters or dies, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerDescription$ When CARDNAME enters or dies, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
+Oracle:When Vinereap Mentor enters or dies, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
diff --git a/forge-gui/res/cardsfolder/upcoming/vren_the_relentless.txt b/forge-gui/res/cardsfolder/upcoming/vren_the_relentless.txt
index febcd905009..a50302d88f8 100644
--- a/forge-gui/res/cardsfolder/upcoming/vren_the_relentless.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vren_the_relentless.txt
@@ -1,11 +1,11 @@
-Name:Vren, the Relentless
-ManaCost:2 U B
-Types:Legendary Creature Rat Rogue
-PT:3/4
-K:Ward:2
-R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | ReplaceWith$ DBExile | Description$ If a creature an opponent controls would die, exile it instead.
-SVar:DBExile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard
-T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of each end step, create X 1/1 black Rat creature tokens with "This creature gets +1/+1 for each other Rat you control," where X is the number of creatures your opponents controlled that were exiled this turn.
-SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ b_1_1_rat_relentless | TokenOwner$ You
-SVar:X:Count$ThisTurnEntered_Exile_from_Battlefield_Creature.OppCtrl
-Oracle:Ward {2}\nIf a creature an opponent controls would die, exile it instead.\nAt the beginning of each end step, create X 1/1 black Rat creature tokens with "This creature gets +1/+1 for each other Rat you control," where X is the number of creatures your opponents controlled that were exiled this turn.
+Name:Vren, the Relentless
+ManaCost:2 U B
+Types:Legendary Creature Rat Rogue
+PT:3/4
+K:Ward:2
+R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | ReplaceWith$ DBExile | Description$ If a creature an opponent controls would die, exile it instead.
+SVar:DBExile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of each end step, create X 1/1 black Rat creature tokens with "This creature gets +1/+1 for each other Rat you control," where X is the number of creatures your opponents controlled that were exiled this turn.
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ b_1_1_rat_relentless | TokenOwner$ You
+SVar:X:Count$ThisTurnEntered_Exile_from_Battlefield_Creature.OppCtrl
+Oracle:Ward {2}\nIf a creature an opponent controls would die, exile it instead.\nAt the beginning of each end step, create X 1/1 black Rat creature tokens with "This creature gets +1/+1 for each other Rat you control," where X is the number of creatures your opponents controlled that were exiled this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/wandertale_mentor.txt b/forge-gui/res/cardsfolder/upcoming/wandertale_mentor.txt
index 7296dbcee6b..79981d503cc 100644
--- a/forge-gui/res/cardsfolder/upcoming/wandertale_mentor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wandertale_mentor.txt
@@ -1,8 +1,8 @@
-Name:Wandertale Mentor
-ManaCost:R G
-Types:Creature Raccoon Bard
-PT:2/2
-T:Mode$ ManaExpend | Amount$ 4 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you expend 4, put a +1/+1 counter on CARDNAME. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ Combo R G | SpellDescription$ Add {R} or {G}.
-Oracle:Whenever you expend 4, put a +1/+1 counter on Wandertale Mentor. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)\n{T}: Add {R} or {G}.
\ No newline at end of file
+Name:Wandertale Mentor
+ManaCost:R G
+Types:Creature Raccoon Bard
+PT:2/2
+T:Mode$ ManaExpend | Amount$ 4 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you expend 4, put a +1/+1 counter on CARDNAME. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ Mana | Cost$ T | Produced$ Combo R G | SpellDescription$ Add {R} or {G}.
+Oracle:Whenever you expend 4, put a +1/+1 counter on Wandertale Mentor. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/upcoming/war_squeak.txt b/forge-gui/res/cardsfolder/upcoming/war_squeak.txt
index 75509e27b99..8353825e4e9 100644
--- a/forge-gui/res/cardsfolder/upcoming/war_squeak.txt
+++ b/forge-gui/res/cardsfolder/upcoming/war_squeak.txt
@@ -1,10 +1,10 @@
-Name:War Squeak
-ManaCost:R
-Types:Enchantment Aura
-K:Enchant creature
-A:SP$ Attach | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature an opponent controls can't block this turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | IsCurse$ True | KW$ HIDDEN CARDNAME can't block. | TgtPrompt$ Select target creature an opponent controls
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Haste | Description$ Enchanted creature gets +1/+1 and has haste.
-SVar:PlayMain1:TRUE
-Oracle:Enchant creature\nWhen War Squeak enters, target creature an opponent controls can't block this turn.\nEnchanted creature gets +1/+1 and has haste.
+Name:War Squeak
+ManaCost:R
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ Pump
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature an opponent controls can't block this turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | IsCurse$ True | KW$ HIDDEN CARDNAME can't block. | TgtPrompt$ Select target creature an opponent controls
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Haste | Description$ Enchanted creature gets +1/+1 and has haste.
+SVar:PlayMain1:TRUE
+Oracle:Enchant creature\nWhen War Squeak enters, target creature an opponent controls can't block this turn.\nEnchanted creature gets +1/+1 and has haste.
diff --git a/forge-gui/res/cardsfolder/upcoming/warren_elder.txt b/forge-gui/res/cardsfolder/upcoming/warren_elder.txt
index d40f8e2113f..6ab2d3136a6 100644
--- a/forge-gui/res/cardsfolder/upcoming/warren_elder.txt
+++ b/forge-gui/res/cardsfolder/upcoming/warren_elder.txt
@@ -1,6 +1,6 @@
-Name:Warren Elder
-ManaCost:1 W
-Types:Creature Rabbit Cleric
-PT:2/2
-A:AB$ PumpAll | Cost$ 3 W | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
-Oracle:{3}{W}: Creatures you control get +1/+1 until end of turn.
\ No newline at end of file
+Name:Warren Elder
+ManaCost:1 W
+Types:Creature Rabbit Cleric
+PT:2/2
+A:AB$ PumpAll | Cost$ 3 W | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
+Oracle:{3}{W}: Creatures you control get +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/warren_warleader.txt b/forge-gui/res/cardsfolder/upcoming/warren_warleader.txt
index 8106d67bdab..98220af09e1 100644
--- a/forge-gui/res/cardsfolder/upcoming/warren_warleader.txt
+++ b/forge-gui/res/cardsfolder/upcoming/warren_warleader.txt
@@ -1,10 +1,10 @@
-Name:Warren Warleader
-ManaCost:2 W W
-Types:Creature Rabbit Knight
-PT:4/4
-K:Offspring:2
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigCharm | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, ABILITY
-SVar:TrigCharm:DB$ Charm | CharmNum$ 1 | Choices$ DBToken,DBPumpAll
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_rabbit | TokenOwner$ You | TokenTapped$ True | TokenAttacking$ True | SpellDescription$ Create a 1/1 white Rabbit creature token that's tapped and attacking.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.attacking+YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Attacking creatures you control get +1/+1 until end of turn.
-Oracle:Offspring {2} (You may pay an additional {2} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nWhenever you attack, choose one —\n• Create a 1/1 white Rabbit creature token that's tapped and attacking.\n• Attacking creatures you control get +1/+1 until end of turn.
\ No newline at end of file
+Name:Warren Warleader
+ManaCost:2 W W
+Types:Creature Rabbit Knight
+PT:4/4
+K:Offspring:2
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigCharm | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, ABILITY
+SVar:TrigCharm:DB$ Charm | CharmNum$ 1 | Choices$ DBToken,DBPumpAll
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_rabbit | TokenOwner$ You | TokenTapped$ True | TokenAttacking$ True | SpellDescription$ Create a 1/1 white Rabbit creature token that's tapped and attacking.
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.attacking+YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Attacking creatures you control get +1/+1 until end of turn.
+Oracle:Offspring {2} (You may pay an additional {2} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nWhenever you attack, choose one —\n• Create a 1/1 white Rabbit creature token that's tapped and attacking.\n• Attacking creatures you control get +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/waterspout_warden.txt b/forge-gui/res/cardsfolder/upcoming/waterspout_warden.txt
index 7f090179377..ed1cf3d0caa 100644
--- a/forge-gui/res/cardsfolder/upcoming/waterspout_warden.txt
+++ b/forge-gui/res/cardsfolder/upcoming/waterspout_warden.txt
@@ -1,9 +1,9 @@
-Name:Waterspout Warden
-ManaCost:2 U
-Types:Creature Frog Soldier
-PT:3/2
-T:Mode$ Attacks | ValidCard$ Creature.Self | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, if another creature entered the battlefield under your control this turn, CARDNAME gains flying until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Flying
-SVar:X:Count$ThisTurnEntered_Battlefield_Creature.YouCtrl+StrictlyOther
-SVar:HasAttackEffect:TRUE
-Oracle:Whenever Waterspout Warden attacks, if another creature entered the battlefield under your control this turn, Waterspout Warden gains flying until end of turn.
+Name:Waterspout Warden
+ManaCost:2 U
+Types:Creature Frog Soldier
+PT:3/2
+T:Mode$ Attacks | ValidCard$ Creature.Self | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, if another creature entered the battlefield under your control this turn, CARDNAME gains flying until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Flying
+SVar:X:Count$ThisTurnEntered_Battlefield_Creature.YouCtrl+StrictlyOther
+SVar:HasAttackEffect:TRUE
+Oracle:Whenever Waterspout Warden attacks, if another creature entered the battlefield under your control this turn, Waterspout Warden gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/wax_wane_witness.txt b/forge-gui/res/cardsfolder/upcoming/wax_wane_witness.txt
index aafd30a69b6..0e34c00de6b 100644
--- a/forge-gui/res/cardsfolder/upcoming/wax_wane_witness.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wax_wane_witness.txt
@@ -1,10 +1,10 @@
-Name:Wax-Wane Witness
-ManaCost:3 W
-Types:Creature Bat Cleric
-PT:2/4
-K:Flying
-K:Vigilance
-T:Mode$ LifeChanged | ValidPlayer$ You | TriggerZones$ Battlefield | PlayerTurn$ True | Execute$ TrigPump | TriggerDescription$ Whenever you gain or lose life during your turn, CARDNAME gets +1/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1
-SVar:X:TriggerCount$LifeAmount
-Oracle:Flying, vigilance\nWhenever you gain or lose life during your turn, Wax-Wane Witness gets +1/+0 until end of turn.
+Name:Wax-Wane Witness
+ManaCost:3 W
+Types:Creature Bat Cleric
+PT:2/4
+K:Flying
+K:Vigilance
+T:Mode$ LifeChanged | ValidPlayer$ You | TriggerZones$ Battlefield | PlayerTurn$ True | Execute$ TrigPump | TriggerDescription$ Whenever you gain or lose life during your turn, CARDNAME gets +1/+0 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1
+SVar:X:TriggerCount$LifeAmount
+Oracle:Flying, vigilance\nWhenever you gain or lose life during your turn, Wax-Wane Witness gets +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/wear_down.txt b/forge-gui/res/cardsfolder/upcoming/wear_down.txt
index 4ff3b8c4501..37b3641b3ef 100644
--- a/forge-gui/res/cardsfolder/upcoming/wear_down.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wear_down.txt
@@ -1,8 +1,8 @@
-Name:Wear Down
-ManaCost:1 G
-Types:Sorcery
-K:Gift
-SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
-A:SP$ Destroy | ValidTgts$ Artifact,Enchantment | TargetMin$ X | TargetMax$ X | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment. If the gift was promised, instead destroy two target artifacts and/or enchantments.
-SVar:X:Count$ValidStack Card.Self+PromisedGift/Plus.1
-Oracle:Gift a card (You may promise an opponent a gift as you cast this spell. If you do, they draw a card before its other effects.)\nDestroy target artifact or enchantment. If the gift was promised, instead destroy two target artifacts and/or enchantments.
\ No newline at end of file
+Name:Wear Down
+ManaCost:1 G
+Types:Sorcery
+K:Gift
+SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
+A:SP$ Destroy | ValidTgts$ Artifact,Enchantment | TargetMin$ X | TargetMax$ X | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment. If the gift was promised, instead destroy two target artifacts and/or enchantments.
+SVar:X:Count$ValidStack Card.Self+PromisedGift/Plus.1
+Oracle:Gift a card (You may promise an opponent a gift as you cast this spell. If you do, they draw a card before its other effects.)\nDestroy target artifact or enchantment. If the gift was promised, instead destroy two target artifacts and/or enchantments.
diff --git a/forge-gui/res/cardsfolder/upcoming/what_must_be_done.txt b/forge-gui/res/cardsfolder/upcoming/what_must_be_done.txt
index 50ea85d16c2..f4914dfdee0 100644
--- a/forge-gui/res/cardsfolder/upcoming/what_must_be_done.txt
+++ b/forge-gui/res/cardsfolder/upcoming/what_must_be_done.txt
@@ -1,13 +1,13 @@
-Name:What Must Be Done
-ManaCost:3 W W
-Types:Sorcery
-A:SP$ Charm | Choices$ DBDestroyAll,DBChangeZone
-SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Artifact,Creature | SpellDescription$ Let the World Burn — Destroy all artifacts and creatures.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.Historic+YouOwn | AnimateSubAbility$ DBConditionEffect | TgtPrompt$ Select target historic permanent card | SpellDescription$ Release Juno — Return target historic permanent card from your graveyard to the battlefield. It enters with two additional +1/+1 counters on it if it's a creature. (Artifacts, legendaries, and Sagas are historic.)
-SVar:DBConditionEffect:DB$ Effect | RememberObjects$ Remembered | ReplacementEffects$ ETBCreat | SubAbility$ DBCleanup
-SVar:ETBCreat:Event$ Moved | ValidCard$ Creature.IsRemembered | Destination$ Battlefield | ReplaceWith$ DBPutP1P1 | ReplacementResult$ Updated | Description$ It enters with two additional +1/+1 counters on it if it's a creature.
-SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True | CounterNum$ 2 | SubAbility$ DBExile
-SVar:DBExile:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Graveyard|Counters
-Oracle:Choose one —\n• Let the World Burn — Destroy all artifacts and creatures.\n• Release Juno — Return target historic permanent card from your graveyard to the battlefield. It enters with two additional +1/+1 counters on it if it's a creature. (Artifacts, legendaries, and Sagas are historic.)
+Name:What Must Be Done
+ManaCost:3 W W
+Types:Sorcery
+A:SP$ Charm | Choices$ DBDestroyAll,DBChangeZone
+SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Artifact,Creature | SpellDescription$ Let the World Burn — Destroy all artifacts and creatures.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.Historic+YouOwn | AnimateSubAbility$ DBConditionEffect | TgtPrompt$ Select target historic permanent card | SpellDescription$ Release Juno — Return target historic permanent card from your graveyard to the battlefield. It enters with two additional +1/+1 counters on it if it's a creature. (Artifacts, legendaries, and Sagas are historic.)
+SVar:DBConditionEffect:DB$ Effect | RememberObjects$ Remembered | ReplacementEffects$ ETBCreat | SubAbility$ DBCleanup
+SVar:ETBCreat:Event$ Moved | ValidCard$ Creature.IsRemembered | Destination$ Battlefield | ReplaceWith$ DBPutP1P1 | ReplacementResult$ Updated | Description$ It enters with two additional +1/+1 counters on it if it's a creature.
+SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True | CounterNum$ 2 | SubAbility$ DBExile
+SVar:DBExile:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Graveyard|Counters
+Oracle:Choose one —\n• Let the World Burn — Destroy all artifacts and creatures.\n• Release Juno — Return target historic permanent card from your graveyard to the battlefield. It enters with two additional +1/+1 counters on it if it's a creature. (Artifacts, legendaries, and Sagas are historic.)
diff --git a/forge-gui/res/cardsfolder/upcoming/whiskerquill_scribe.txt b/forge-gui/res/cardsfolder/upcoming/whiskerquill_scribe.txt
index 087aa5c4b1d..ecd34becec1 100644
--- a/forge-gui/res/cardsfolder/upcoming/whiskerquill_scribe.txt
+++ b/forge-gui/res/cardsfolder/upcoming/whiskerquill_scribe.txt
@@ -1,7 +1,7 @@
-Name:Whiskerquill Scribe
-ManaCost:1 R
-Types:Creature Mouse Citizen
-PT:2/2
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | FirstTime$ True | Execute$ TrigDraw | TriggerDescription$ Valiant — Whenever CARDNAME becomes the target of a spell or ability you control for the first time each turn, you may discard a card. If you do, draw a card.
-SVar:TrigDraw:AB$ Draw | Cost$ Discard<1/Card>
-Oracle:Valiant — Whenever Whiskerquill Scribe becomes the target of a spell or ability you control for the first time each turn, you may discard a card. If you do, draw a card.
+Name:Whiskerquill Scribe
+ManaCost:1 R
+Types:Creature Mouse Citizen
+PT:2/2
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | FirstTime$ True | Execute$ TrigDraw | TriggerDescription$ Valiant — Whenever CARDNAME becomes the target of a spell or ability you control for the first time each turn, you may discard a card. If you do, draw a card.
+SVar:TrigDraw:AB$ Draw | Cost$ Discard<1/Card>
+Oracle:Valiant — Whenever Whiskerquill Scribe becomes the target of a spell or ability you control for the first time each turn, you may discard a card. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/whiskervale_forerunner.txt b/forge-gui/res/cardsfolder/upcoming/whiskervale_forerunner.txt
index 5bef3478a4a..e9211f23507 100644
--- a/forge-gui/res/cardsfolder/upcoming/whiskervale_forerunner.txt
+++ b/forge-gui/res/cardsfolder/upcoming/whiskervale_forerunner.txt
@@ -1,12 +1,12 @@
-Name:Whiskervale Forerunner
-ManaCost:3 W
-Types:Creature Mouse Bard
-PT:3/4
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | FirstTime$ True | Execute$ TrigPeekAndReveal | TriggerDescription$ Valiant — Whenever CARDNAME becomes the target of a spell or ability you control for the first time each turn, look at the top five cards of your library. You may reveal a creature card with mana value 3 or less from among them. You may put it onto the battlefield if it's your turn. If you don't put it onto the battlefield, put it into your hand. Put the rest on the bottom of your library in a random order.
-SVar:TrigPeekAndReveal:DB$ PeekAndReveal | Defined$ You | PeekAmount$ 5 | NoReveal$ True | RememberPeeked$ True | SubAbility$ PickOne
-SVar:PickOne:DB$ ChooseCard | Defined$ You | Amount$ 1 | ChoiceTitle$ Choose a creature card to reveal | Choices$ Card.Creature+cmcLE3+IsRemembered | ChoiceZone$ Library | Reveal$ True | SubAbility$ DBChangeZoneBattlefield
-SVar:DBChangeZoneBattlefield:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Defined$ ChosenCard | ConditionPlayerTurn$ True | ConditionDefined$ Remembered | ConditionPresent$ Card.ChosenCard | ConditionCompare$ EQ1 | Optional$ True | SubAbility$ DBChangeZoneHand
-SVar:DBChangeZoneHand:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Library | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Card.ChosenCard+inZoneBattlefield | ConditionCompare$ EQ0 | SubAbility$ DBRestRandomOrder
-SVar:DBRestRandomOrder:DB$ ChangeZoneAll | ChangeType$ Card.IsRemembered | Origin$ Library | Destination$ Library | LibraryPosition$ -1 | RandomOrder$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True
-Oracle:Valiant — Whenever Whiskervale Forerunner becomes the target of a spell or ability you control for the first time each turn, look at the top five cards of your library. You may reveal a creature card with mana value 3 or less from among them. You may put it onto the battlefield if it's your turn. If you don't put it onto the battlefield, put it into your hand. Put the rest on the bottom of your library in a random order.
+Name:Whiskervale Forerunner
+ManaCost:3 W
+Types:Creature Mouse Bard
+PT:3/4
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | FirstTime$ True | Execute$ TrigPeekAndReveal | TriggerDescription$ Valiant — Whenever CARDNAME becomes the target of a spell or ability you control for the first time each turn, look at the top five cards of your library. You may reveal a creature card with mana value 3 or less from among them. You may put it onto the battlefield if it's your turn. If you don't put it onto the battlefield, put it into your hand. Put the rest on the bottom of your library in a random order.
+SVar:TrigPeekAndReveal:DB$ PeekAndReveal | Defined$ You | PeekAmount$ 5 | NoReveal$ True | RememberPeeked$ True | SubAbility$ PickOne
+SVar:PickOne:DB$ ChooseCard | Defined$ You | Amount$ 1 | ChoiceTitle$ Choose a creature card to reveal | Choices$ Card.Creature+cmcLE3+IsRemembered | ChoiceZone$ Library | Reveal$ True | SubAbility$ DBChangeZoneBattlefield
+SVar:DBChangeZoneBattlefield:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Defined$ ChosenCard | ConditionPlayerTurn$ True | ConditionDefined$ Remembered | ConditionPresent$ Card.ChosenCard | ConditionCompare$ EQ1 | Optional$ True | SubAbility$ DBChangeZoneHand
+SVar:DBChangeZoneHand:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Library | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Card.ChosenCard+inZoneBattlefield | ConditionCompare$ EQ0 | SubAbility$ DBRestRandomOrder
+SVar:DBRestRandomOrder:DB$ ChangeZoneAll | ChangeType$ Card.IsRemembered | Origin$ Library | Destination$ Library | LibraryPosition$ -1 | RandomOrder$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True
+Oracle:Valiant — Whenever Whiskervale Forerunner becomes the target of a spell or ability you control for the first time each turn, look at the top five cards of your library. You may reveal a creature card with mana value 3 or less from among them. You may put it onto the battlefield if it's your turn. If you don't put it onto the battlefield, put it into your hand. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/upcoming/wick_the_whorled_mind.txt b/forge-gui/res/cardsfolder/upcoming/wick_the_whorled_mind.txt
index bfb8812adfa..c8d16c94e55 100644
--- a/forge-gui/res/cardsfolder/upcoming/wick_the_whorled_mind.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wick_the_whorled_mind.txt
@@ -1,14 +1,14 @@
-Name:Wick, the Whorled Mind
-ManaCost:3 B
-Types:Legendary Creature Rat Warlock
-PT:2/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Rat.Other+YouCtrl | Execute$ TrigBranch | TriggerDescription$ Whenever NICKNAME or another Rat you control enters, create a 1/1 black Snail creature token if you don't control a Snail. Otherwise, put a +1/+1 counter on a Snail you control.
-SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ EQ0 | TrueSubAbility$ DBToken | FalseSubAbility$ DBPutCounter
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_snail | TokenOwner$ You
-SVar:DBPutCounter:DB$ PutCounter | Choices$ Snail.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ DealDamage | Cost$ U B R Sac<1/Snail> | Defined$ Opponent | NumDmg$ Y | SubAbility$ DBDraw | SpellDescription$ NICKNAME deals damage equal to the sacrificed creature's power to each opponent. Then draw cards equal to the sacrificed creature's power.
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ Y
-SVar:X:Count$Valid Snail.YouCtrl
-SVar:Y:Sacrificed$CardPower
-SVar:BuffedBy:Rat
-Oracle:Whenever Wick or another Rat you control enters, create a 1/1 black Snail creature token if you don't control a Snail. Otherwise, put a +1/+1 counter on a Snail you control.\n{U}{B}{R}, Sacrifice a Snail: Wick deals damage equal to the sacrificed creature's power to each opponent. Then draw cards equal to the sacrificed creature's power.
\ No newline at end of file
+Name:Wick, the Whorled Mind
+ManaCost:3 B
+Types:Legendary Creature Rat Warlock
+PT:2/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Rat.Other+YouCtrl | Execute$ TrigBranch | TriggerDescription$ Whenever NICKNAME or another Rat you control enters, create a 1/1 black Snail creature token if you don't control a Snail. Otherwise, put a +1/+1 counter on a Snail you control.
+SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ EQ0 | TrueSubAbility$ DBToken | FalseSubAbility$ DBPutCounter
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_snail | TokenOwner$ You
+SVar:DBPutCounter:DB$ PutCounter | Choices$ Snail.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ DealDamage | Cost$ U B R Sac<1/Snail> | Defined$ Opponent | NumDmg$ Y | SubAbility$ DBDraw | SpellDescription$ NICKNAME deals damage equal to the sacrificed creature's power to each opponent. Then draw cards equal to the sacrificed creature's power.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ Y
+SVar:X:Count$Valid Snail.YouCtrl
+SVar:Y:Sacrificed$CardPower
+SVar:BuffedBy:Rat
+Oracle:Whenever Wick or another Rat you control enters, create a 1/1 black Snail creature token if you don't control a Snail. Otherwise, put a +1/+1 counter on a Snail you control.\n{U}{B}{R}, Sacrifice a Snail: Wick deals damage equal to the sacrificed creature's power to each opponent. Then draw cards equal to the sacrificed creature's power.
diff --git a/forge-gui/res/cardsfolder/upcoming/wicks_patrol.txt b/forge-gui/res/cardsfolder/upcoming/wicks_patrol.txt
index 9e41def3cdc..26ba044e5a5 100644
--- a/forge-gui/res/cardsfolder/upcoming/wicks_patrol.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wicks_patrol.txt
@@ -1,12 +1,12 @@
-Name:Wick's Patrol
-ManaCost:4 B B
-Types:Creature Rat Warlock
-PT:5/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters, mill three cards. When you do, target creature an opponent controls gets -X/-X until end of turn, where X is the greatest mana value among cards in your graveyard.
-SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You | RememberMilled$ True | SubAbility$ DBImmediateTrigger
-SVar:DBImmediateTrigger:DB$ ImmediateTrigger | Execute$ TrigDebuff | SubAbility$ DBCleanup | TriggerDescription$ When you do, target creature an opponent controls gets -X/-X until end of turn, where X is the greatest mana value among cards in your graveyard.
-SVar:TrigDebuff:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumAtt$ -X | NumDef$ -X | IsCurse$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$ValidGraveyard Card.YouCtrl$GreatestCMC
-DeckHas:Ability$Graveyard
-Oracle:When Wick's Patrol enters, mill three cards. When you do, target creature an opponent controls gets -X/-X until end of turn, where X is the greatest mana value among cards in your graveyard.
\ No newline at end of file
+Name:Wick's Patrol
+ManaCost:4 B B
+Types:Creature Rat Warlock
+PT:5/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters, mill three cards. When you do, target creature an opponent controls gets -X/-X until end of turn, where X is the greatest mana value among cards in your graveyard.
+SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You | RememberMilled$ True | SubAbility$ DBImmediateTrigger
+SVar:DBImmediateTrigger:DB$ ImmediateTrigger | Execute$ TrigDebuff | SubAbility$ DBCleanup | TriggerDescription$ When you do, target creature an opponent controls gets -X/-X until end of turn, where X is the greatest mana value among cards in your graveyard.
+SVar:TrigDebuff:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumAtt$ -X | NumDef$ -X | IsCurse$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$ValidGraveyard Card.YouCtrl$GreatestCMC
+DeckHas:Ability$Graveyard
+Oracle:When Wick's Patrol enters, mill three cards. When you do, target creature an opponent controls gets -X/-X until end of turn, where X is the greatest mana value among cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/wildfire_howl.txt b/forge-gui/res/cardsfolder/upcoming/wildfire_howl.txt
index bac3f619bd4..e4340501a22 100644
--- a/forge-gui/res/cardsfolder/upcoming/wildfire_howl.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wildfire_howl.txt
@@ -1,10 +1,10 @@
-Name:Wildfire Howl
-ManaCost:1 R R
-Types:Sorcery
-K:Gift
-SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
-A:SP$ DealDamage | ValidTgts$ Any | NumDmg$ 1 | TargetMin$ X | TargetMax$ X | SubAbility$ DBDamageAll | DamageMap$ True | SpellDescription$ CARDNAME deals 2 damage to each creature. If the gift was promised, instead CARDNAME deals 1 damage to any target and 2 damage to each creature.
-SVar:DBDamageAll:DB$ DamageAll | NumDmg$ 2 | ValidCards$ Creature | ValidDescription$ each creature | SubAbility$ DBDamageResolve
-SVar:DBDamageResolve:DB$ DamageResolve
-SVar:X:Count$ValidStack Card.Self+PromisedGift
-Oracle:Gift a card (You may promise an opponent a gift as you cast this spell. If you do, they draw a card before its other effects.)\nWildfire Howl deals 2 damage to each creature. If the gift was promised, instead Wildfire Howl deals 1 damage to any target and 2 damage to each creature.
\ No newline at end of file
+Name:Wildfire Howl
+ManaCost:1 R R
+Types:Sorcery
+K:Gift
+SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
+A:SP$ DealDamage | ValidTgts$ Any | NumDmg$ 1 | TargetMin$ X | TargetMax$ X | SubAbility$ DBDamageAll | DamageMap$ True | SpellDescription$ CARDNAME deals 2 damage to each creature. If the gift was promised, instead CARDNAME deals 1 damage to any target and 2 damage to each creature.
+SVar:DBDamageAll:DB$ DamageAll | NumDmg$ 2 | ValidCards$ Creature | ValidDescription$ each creature | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
+SVar:X:Count$ValidStack Card.Self+PromisedGift
+Oracle:Gift a card (You may promise an opponent a gift as you cast this spell. If you do, they draw a card before its other effects.)\nWildfire Howl deals 2 damage to each creature. If the gift was promised, instead Wildfire Howl deals 1 damage to any target and 2 damage to each creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/wildsear_scouring_maw.txt b/forge-gui/res/cardsfolder/upcoming/wildsear_scouring_maw.txt
index 0aa6e252def..fb3215e2d03 100644
--- a/forge-gui/res/cardsfolder/upcoming/wildsear_scouring_maw.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wildsear_scouring_maw.txt
@@ -1,8 +1,8 @@
-Name:Wildsear, Scouring Maw
-ManaCost:3 R G
-Types:Legendary Creature Elemental Wolf
-PT:6/6
-K:Trample
-S:Mode$ Continuous | Affected$ Enchantment.YouCtrl+YouOwn+wasCastFromHand | AffectedZone$ Stack | AddKeyword$ Cascade | Description$ Enchantment spells you cast from your hand have cascade. (Whenever you cast an enchantment spell from your hand, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)
-DeckHints:Type$Enchantment
-Oracle:Trample\nEnchantment spells you cast from your hand have cascade. (Whenever you cast an enchantment spell from your hand, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)
+Name:Wildsear, Scouring Maw
+ManaCost:3 R G
+Types:Legendary Creature Elemental Wolf
+PT:6/6
+K:Trample
+S:Mode$ Continuous | Affected$ Enchantment.YouCtrl+YouOwn+wasCastFromHand | AffectedZone$ Stack | AddKeyword$ Cascade | Description$ Enchantment spells you cast from your hand have cascade. (Whenever you cast an enchantment spell from your hand, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)
+DeckHints:Type$Enchantment
+Oracle:Trample\nEnchantment spells you cast from your hand have cascade. (Whenever you cast an enchantment spell from your hand, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)
diff --git a/forge-gui/res/cardsfolder/upcoming/wishing_well.txt b/forge-gui/res/cardsfolder/upcoming/wishing_well.txt
index b9fd6325aaf..1f3dae7fef2 100644
--- a/forge-gui/res/cardsfolder/upcoming/wishing_well.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wishing_well.txt
@@ -1,10 +1,10 @@
-Name:Wishing Well
-ManaCost:3 U
-Types:Artifact
-A:AB$ PutCounter | Cost$ T | Defined$ Self | SorcerySpeed$ True | CounterType$ COIN | CounterNum$ 1 | RememberPut$ True | SubAbility$ DBImmediateTrig | SpellDescription$ Put a coin counter on Wishing Well. When you do, you may cast target instant or sorcery card with mana value equal to the number of coin counters on CARDNAME from your graveyard without paying its mana cost. If that spell would be put into your graveyard, exile it instead. Activate only as a sorcery.
-SVar:DBImmediateTrig:DB$ ImmediateTrigger | Execute$ TrigPlay | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup | TriggerDescription$ When you do, you may cast target instant or sorcery card with mana value equal to the number of coin counters on CARDNAME from your graveyard without paying its mana cost. If that spell would be put into your graveyard, exile it instead. Activate only as a sorcery.
-SVar:TrigPlay:DB$ Play | TgtZone$ Graveyard | ValidTgts$ Instant.YouCtrl+cmcEQX,Sorcery.YouCtrl+cmcEQX | ValidSA$ Spell | TgtPrompt$ Choose target instant or sorcery card with mana value equal to the number of coin counters on CARDNAME from your graveyard | WithoutManaCost$ True | Optional$ True | ReplaceGraveyard$ Exile | AILogic$ ReplaySpell
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$CardCounters.COIN
-DeckHints:Ability$Counters
-Oracle:{T}: Put a coin counter on Wishing Well. When you do, you may cast target instant or sorcery card with mana value equal to the number of coin counters on Wishing Well from your graveyard without paying its mana cost. If that spell would be put into your graveyard, exile it instead. Activate only as a sorcery.
+Name:Wishing Well
+ManaCost:3 U
+Types:Artifact
+A:AB$ PutCounter | Cost$ T | Defined$ Self | SorcerySpeed$ True | CounterType$ COIN | CounterNum$ 1 | RememberPut$ True | SubAbility$ DBImmediateTrig | SpellDescription$ Put a coin counter on Wishing Well. When you do, you may cast target instant or sorcery card with mana value equal to the number of coin counters on CARDNAME from your graveyard without paying its mana cost. If that spell would be put into your graveyard, exile it instead. Activate only as a sorcery.
+SVar:DBImmediateTrig:DB$ ImmediateTrigger | Execute$ TrigPlay | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup | TriggerDescription$ When you do, you may cast target instant or sorcery card with mana value equal to the number of coin counters on CARDNAME from your graveyard without paying its mana cost. If that spell would be put into your graveyard, exile it instead. Activate only as a sorcery.
+SVar:TrigPlay:DB$ Play | TgtZone$ Graveyard | ValidTgts$ Instant.YouCtrl+cmcEQX,Sorcery.YouCtrl+cmcEQX | ValidSA$ Spell | TgtPrompt$ Choose target instant or sorcery card with mana value equal to the number of coin counters on CARDNAME from your graveyard | WithoutManaCost$ True | Optional$ True | ReplaceGraveyard$ Exile | AILogic$ ReplaySpell
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$CardCounters.COIN
+DeckHints:Ability$Counters
+Oracle:{T}: Put a coin counter on Wishing Well. When you do, you may cast target instant or sorcery card with mana value equal to the number of coin counters on Wishing Well from your graveyard without paying its mana cost. If that spell would be put into your graveyard, exile it instead. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/yggdrasil_rebirth_engine.txt b/forge-gui/res/cardsfolder/upcoming/yggdrasil_rebirth_engine.txt
index 670ecd85b7e..dae0e3494af 100644
--- a/forge-gui/res/cardsfolder/upcoming/yggdrasil_rebirth_engine.txt
+++ b/forge-gui/res/cardsfolder/upcoming/yggdrasil_rebirth_engine.txt
@@ -1,10 +1,10 @@
-Name:Yggdrasil, Rebirth Engine
-ManaCost:3
-Types:Legendary Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZoneAll | TriggerDescription$ When CARDNAME enters, exile all creature cards from your graveyard.
-SVar:TrigChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Creature.YouOwn | Origin$ Graveyard | Destination$ Exile
-A:AB$ Dig | Cost$ T | Defined$ You | DigNum$ 3 | ChangeNum$ All | DestinationZone$ Exile | SpellDescription$ Exile the top three cards of your library.
-A:AB$ ChangeZone | Cost$ 4 T | Origin$ Exile | Destination$ Battlefield | Mandatory$ True | Hidden$ True | ChangeType$ Creature.ExiledWithSource | SorcerySpeed$ True | GainControl$ True | SubAbility$ DBPump | RememberChanged$ True | SpellDescription$ Put a creature card exiled with NICKNAME onto the battlefield under your control. It gains haste until end of turn. Activate only as a sorcery.
-SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Haste | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:When Yggdrasil, Rebirth Engine enters, exile all creature cards from your graveyard.\n{T}: Exile the top three cards of your library.\n{4}, {T}: Put a creature card exiled with Yggdrasil onto the battlefield under your control. It gains haste until end of turn. Activate only as a sorcery.
+Name:Yggdrasil, Rebirth Engine
+ManaCost:3
+Types:Legendary Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZoneAll | TriggerDescription$ When CARDNAME enters, exile all creature cards from your graveyard.
+SVar:TrigChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Creature.YouOwn | Origin$ Graveyard | Destination$ Exile
+A:AB$ Dig | Cost$ T | Defined$ You | DigNum$ 3 | ChangeNum$ All | DestinationZone$ Exile | SpellDescription$ Exile the top three cards of your library.
+A:AB$ ChangeZone | Cost$ 4 T | Origin$ Exile | Destination$ Battlefield | Mandatory$ True | Hidden$ True | ChangeType$ Creature.ExiledWithSource | SorcerySpeed$ True | GainControl$ True | SubAbility$ DBPump | RememberChanged$ True | SpellDescription$ Put a creature card exiled with NICKNAME onto the battlefield under your control. It gains haste until end of turn. Activate only as a sorcery.
+SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Haste | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:When Yggdrasil, Rebirth Engine enters, exile all creature cards from your graveyard.\n{T}: Exile the top three cards of your library.\n{4}, {T}: Put a creature card exiled with Yggdrasil onto the battlefield under your control. It gains haste until end of turn. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/ygra_eater_of_all.txt b/forge-gui/res/cardsfolder/upcoming/ygra_eater_of_all.txt
index 49f38aecc9d..8e98a9e1534 100644
--- a/forge-gui/res/cardsfolder/upcoming/ygra_eater_of_all.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ygra_eater_of_all.txt
@@ -1,10 +1,10 @@
-Name:Ygra, Eater of All
-ManaCost:3 B G
-Types:Legendary Creature Elemental Cat
-PT:6/6
-K:Ward:Sac<1/Food>
-S:Mode$ Continuous | Affected$ Creature.Other | AffectedZone$ Battlefield | AddType$ Artifact & Food | AddAbility$ FoodSac | Description$ Other creatures are Food artifacts in addition to their other types and have "{2}, {T}, Sacrifice this permanent: You gain 3 life."
-SVar:FoodSac:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME/this permanent> | Defined$ You | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Food | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a Food is put into a graveyard from the battlefield, put two +1/+1 counters on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2
-Oracle:Ward—Sacrifice a Food.\nOther creatures are Food artifacts in addition to their other types and have "{2}, {T}, Sacrifice this permanent: You gain 3 life."\nWhenever a Food is put into a graveyard from the battlefield, put two +1/+1 counters on Ygra, Eater of All.
+Name:Ygra, Eater of All
+ManaCost:3 B G
+Types:Legendary Creature Elemental Cat
+PT:6/6
+K:Ward:Sac<1/Food>
+S:Mode$ Continuous | Affected$ Creature.Other | AffectedZone$ Battlefield | AddType$ Artifact & Food | AddAbility$ FoodSac | Description$ Other creatures are Food artifacts in addition to their other types and have "{2}, {T}, Sacrifice this permanent: You gain 3 life."
+SVar:FoodSac:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME/this permanent> | Defined$ You | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Food | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a Food is put into a graveyard from the battlefield, put two +1/+1 counters on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2
+Oracle:Ward—Sacrifice a Food.\nOther creatures are Food artifacts in addition to their other types and have "{2}, {T}, Sacrifice this permanent: You gain 3 life."\nWhenever a Food is put into a graveyard from the battlefield, put two +1/+1 counters on Ygra, Eater of All.
diff --git a/forge-gui/res/cardsfolder/upcoming/zoraline_cosmos_caller.txt b/forge-gui/res/cardsfolder/upcoming/zoraline_cosmos_caller.txt
index 63735ef938b..7ace0530130 100644
--- a/forge-gui/res/cardsfolder/upcoming/zoraline_cosmos_caller.txt
+++ b/forge-gui/res/cardsfolder/upcoming/zoraline_cosmos_caller.txt
@@ -1,14 +1,14 @@
-Name:Zoraline, Cosmos Caller
-ManaCost:1 W B
-Types:Legendary Creature Bat Cleric
-PT:3/3
-K:Flying
-K:Vigilance
-T:Mode$ Attacks | ValidCard$ Bat.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a Bat you control attacks, you gain 1 life.
-SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 | Defined$ You
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigImmediateTrig | TriggerDescription$ Whenever NICKNAME enters or attacks, you may pay {W}{B} and 2 life. When you do, return target nonland permanent card with mana value 3 or less from your graveyard to the battlefield with a finality counter on it.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigImmediateTrig | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever NICKNAME enters or attacks, you may pay {W}{B} and 2 life. When you do, return target nonland permanent card with mana value 3 or less from your graveyard to the battlefield with a finality counter on it.
-SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ W B PayLife<2> | Execute$ TrigChange | SpellDescription$ When you do, return target nonland permanent card with mana value 3 or less from your graveyard to the battlefield with a finality counter on it.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.nonLand+YouOwn+cmcLE3 | TgtPrompt$ Choose target nonland permanent card with mana value 3 or less | WithCountersType$ FINALITY | SpellDescription$ Return target nonland permanent card with mana value 3 or less from your graveyard to the battlefield with a finality counter on it.
-SVar:HasAttackEffect:TRUE
-Oracle:Flying, vigilance\nWhenever a Bat you control attacks, you gain 1 life.\nWhenever Zoraline enters or attacks, you may pay {W}{B} and 2 life. When you do, return target nonland permanent card with mana value 3 or less from your graveyard to the battlefield with a finality counter on it.
\ No newline at end of file
+Name:Zoraline, Cosmos Caller
+ManaCost:1 W B
+Types:Legendary Creature Bat Cleric
+PT:3/3
+K:Flying
+K:Vigilance
+T:Mode$ Attacks | ValidCard$ Bat.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a Bat you control attacks, you gain 1 life.
+SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 | Defined$ You
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigImmediateTrig | TriggerDescription$ Whenever NICKNAME enters or attacks, you may pay {W}{B} and 2 life. When you do, return target nonland permanent card with mana value 3 or less from your graveyard to the battlefield with a finality counter on it.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigImmediateTrig | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever NICKNAME enters or attacks, you may pay {W}{B} and 2 life. When you do, return target nonland permanent card with mana value 3 or less from your graveyard to the battlefield with a finality counter on it.
+SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ W B PayLife<2> | Execute$ TrigChange | SpellDescription$ When you do, return target nonland permanent card with mana value 3 or less from your graveyard to the battlefield with a finality counter on it.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.nonLand+YouOwn+cmcLE3 | TgtPrompt$ Choose target nonland permanent card with mana value 3 or less | WithCountersType$ FINALITY | SpellDescription$ Return target nonland permanent card with mana value 3 or less from your graveyard to the battlefield with a finality counter on it.
+SVar:HasAttackEffect:TRUE
+Oracle:Flying, vigilance\nWhenever a Bat you control attacks, you gain 1 life.\nWhenever Zoraline enters or attacks, you may pay {W}{B} and 2 life. When you do, return target nonland permanent card with mana value 3 or less from your graveyard to the battlefield with a finality counter on it.