diff --git a/forge-gui/res/cardsfolder/upcoming/havi_the_all_father.txt b/forge-gui/res/cardsfolder/upcoming/havi_the_all_father.txt
index 7248b7e5f3a..58148fcae94 100644
--- a/forge-gui/res/cardsfolder/upcoming/havi_the_all_father.txt
+++ b/forge-gui/res/cardsfolder/upcoming/havi_the_all_father.txt
@@ -1,11 +1,11 @@
-Name:Havi, the All-Father
-ManaCost:3 R G W
-Types:Legendary Creature God Warrior
-PT:6/6
-S:Mode$ Continuous | Affected$ Card.Self | IsPresent$ Card.Historic+YouOwn | PresentZone$ Graveyard | PresentCompare$ GE4 | AddKeyword$ Indestructible | Description$ CARDNAME has indestructible as long as there are four or more historic cards in your graveyard. (Artifacts, legendaries, and Sagas are historic.)
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Legendary+YouCtrl+Other | Execute$ TrigReturn | TriggerDescription$ Sage Project — Whenever NICKNAME or another legendary creature you control dies, return target legendary creature card with lesser mana value from your graveyard to the battlefield tapped.
-SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Creature.Legendary+cmcLTX+YouOwn | TgtPrompt$ Choose target legendary creature card with lesser mana value | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True
-SVar:X:TriggeredCard$CardManaCost
-DeckHas:Ability$Graveyard
-DeckHints:Type$Legendary
-Oracle:Havi, the All-Father has indestructible as long as there are four or more historic cards in your graveyard. (Artifacts, legendaries, and Sagas are historic.)\nSage Project — Whenever Havi or another legendary creature you control dies, return target legendary creature card with lesser mana value from your graveyard to the battlefield tapped.
\ No newline at end of file
+Name:Havi, the All-Father
+ManaCost:3 R G W
+Types:Legendary Creature God Warrior
+PT:6/6
+S:Mode$ Continuous | Affected$ Card.Self | IsPresent$ Card.Historic+YouOwn | PresentZone$ Graveyard | PresentCompare$ GE4 | AddKeyword$ Indestructible | Description$ CARDNAME has indestructible as long as there are four or more historic cards in your graveyard. (Artifacts, legendaries, and Sagas are historic.)
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Legendary+YouCtrl+Other | Execute$ TrigReturn | TriggerDescription$ Sage Project — Whenever NICKNAME or another legendary creature you control dies, return target legendary creature card with lesser mana value from your graveyard to the battlefield tapped.
+SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Creature.Legendary+cmcLTX+YouOwn | TgtPrompt$ Choose target legendary creature card with lesser mana value | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True
+SVar:X:TriggeredCard$CardManaCost
+DeckHas:Ability$Graveyard
+DeckHints:Type$Legendary
+Oracle:Havi, the All-Father has indestructible as long as there are four or more historic cards in your graveyard. (Artifacts, legendaries, and Sagas are historic.)\nSage Project — Whenever Havi or another legendary creature you control dies, return target legendary creature card with lesser mana value from your graveyard to the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/hazardroot_herbalist.txt b/forge-gui/res/cardsfolder/upcoming/hazardroot_herbalist.txt
index 5698d50edf2..629b50ee95f 100644
--- a/forge-gui/res/cardsfolder/upcoming/hazardroot_herbalist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hazardroot_herbalist.txt
@@ -1,10 +1,10 @@
-Name:Hazardroot Herbalist
-ManaCost:2 G
-Types:Creature Rabbit Druid
-PT:1/4
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, target creature you control gets +1/+0 until end of turn. If that creature is a token, it also gains deathtouch until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +1 | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | ConditionDefined$ Targeted | ConditionPresent$ Permanent.token | KW$ Deathtouch
-SVar:PlayMain1:TRUE
-DeckHints:Ability$Token
-Oracle:Whenever you attack, target creature you control gets +1/+0 until end of turn. If that creature is a token, it also gains deathtouch until end of turn.
\ No newline at end of file
+Name:Hazardroot Herbalist
+ManaCost:2 G
+Types:Creature Rabbit Druid
+PT:1/4
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, target creature you control gets +1/+0 until end of turn. If that creature is a token, it also gains deathtouch until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +1 | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Targeted | ConditionDefined$ Targeted | ConditionPresent$ Permanent.token | KW$ Deathtouch
+SVar:PlayMain1:TRUE
+DeckHints:Ability$Token
+Oracle:Whenever you attack, target creature you control gets +1/+0 until end of turn. If that creature is a token, it also gains deathtouch until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/hazel_of_the_rootbloom.txt b/forge-gui/res/cardsfolder/upcoming/hazel_of_the_rootbloom.txt
index 083c3b5f96d..796891341b9 100644
--- a/forge-gui/res/cardsfolder/upcoming/hazel_of_the_rootbloom.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hazel_of_the_rootbloom.txt
@@ -1,10 +1,10 @@
-Name:Hazel of the Rootbloom
-ManaCost:2 B G
-Types:Legendary Creature Squirrel Druid
-PT:3/5
-A:AB$ Mana | Cost$ T PayLife<2> tapXType<X/Card.token/token> | Produced$ Combo Any | Amount$ X | SpellDescription$ Add X mana in any combination of colors.
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBCopyPermanent | TriggerDescription$ At the beginning of your end step, create a token that's a copy of target token you control. If that token is a Squirrel, instead create two tokens that are copies of it.
-SVar:DBCopyPermanent:DB$ CopyPermanent | ValidTgts$ Permanent.token+YouCtrl | NumCopies$ Y | TgtPrompt$ Select target token you control to copy
-SVar:X:Count$xPaid
-SVar:Y:Targeted$Valid Squirrel/Plus.1
-Oracle:{T}, Pay 2 life, Tap X untapped tokens you control: Add X mana in any combination of colors.\nAt the beginning of your end step, create a token that's a copy of target token you control. If that token is a Squirrel, instead create two tokens that are copies of it.
+Name:Hazel of the Rootbloom
+ManaCost:2 B G
+Types:Legendary Creature Squirrel Druid
+PT:3/5
+A:AB$ Mana | Cost$ T PayLife<2> tapXType<X/Card.token/token> | Produced$ Combo Any | Amount$ X | SpellDescription$ Add X mana in any combination of colors.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBCopyPermanent | TriggerDescription$ At the beginning of your end step, create a token that's a copy of target token you control. If that token is a Squirrel, instead create two tokens that are copies of it.
+SVar:DBCopyPermanent:DB$ CopyPermanent | ValidTgts$ Permanent.token+YouCtrl | NumCopies$ Y | TgtPrompt$ Select target token you control to copy
+SVar:X:Count$xPaid
+SVar:Y:Targeted$Valid Squirrel/Plus.1
+Oracle:{T}, Pay 2 life, Tap X untapped tokens you control: Add X mana in any combination of colors.\nAt the beginning of your end step, create a token that's a copy of target token you control. If that token is a Squirrel, instead create two tokens that are copies of it.
diff --git a/forge-gui/res/cardsfolder/upcoming/hazels_brewmaster.txt b/forge-gui/res/cardsfolder/upcoming/hazels_brewmaster.txt
index c59e751061b..b09ae705a38 100644
--- a/forge-gui/res/cardsfolder/upcoming/hazels_brewmaster.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hazels_brewmaster.txt
@@ -1,14 +1,14 @@
-Name:Hazel's Brewmaster
-ManaCost:3 B
-Types:Creature Squirrel Warlock
-PT:3/4
-K:Menace
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ Whenever CARDNAME enters or attacks, exile up to one target card from a graveyard and create a Food token.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, exile up to one target card from a graveyard and create a Food token.
-SVar:TrigExile:DB$ ChangeZone | ValidTgts$ Card | Origin$ Graveyard | TargetMin$ 0 | TargetMax$ 1 | Destination$ Exile | TgtPrompt$ Select up to one target card from a graveyard | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
-S:Mode$ Continuous | Affected$ Food.YouCtrl | EffectZone$ Battlefield | GainsAbilitiesOf$ Creature.ExiledWithSource | GainsAbilitiesOfZones$ Exile | Description$ Foods you control have all activated abilities of all creature cards exiled with CARDNAME.
-DeckHas:Ability$Token|Graveyard & Type$Food|Artifact
-DeckHints:Ability$Graveyard|Mill
-SVar:HasAttackEffect:TRUE
-Oracle:Menace\nWhenever Hazel's Brewmaster enters or attacks, exile up to one target card from a graveyard and create a Food token.\nFoods you control have all activated abilities of all creature cards exiled with Hazel's Brewmaster.
+Name:Hazel's Brewmaster
+ManaCost:3 B
+Types:Creature Squirrel Warlock
+PT:3/4
+K:Menace
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ Whenever CARDNAME enters or attacks, exile up to one target card from a graveyard and create a Food token.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, exile up to one target card from a graveyard and create a Food token.
+SVar:TrigExile:DB$ ChangeZone | ValidTgts$ Card | Origin$ Graveyard | TargetMin$ 0 | TargetMax$ 1 | Destination$ Exile | TgtPrompt$ Select up to one target card from a graveyard | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
+S:Mode$ Continuous | Affected$ Food.YouCtrl | EffectZone$ Battlefield | GainsAbilitiesOf$ Creature.ExiledWithSource | GainsAbilitiesOfZones$ Exile | Description$ Foods you control have all activated abilities of all creature cards exiled with CARDNAME.
+DeckHas:Ability$Token|Graveyard & Type$Food|Artifact
+DeckHints:Ability$Graveyard|Mill
+SVar:HasAttackEffect:TRUE
+Oracle:Menace\nWhenever Hazel's Brewmaster enters or attacks, exile up to one target card from a graveyard and create a Food token.\nFoods you control have all activated abilities of all creature cards exiled with Hazel's Brewmaster.
diff --git a/forge-gui/res/cardsfolder/upcoming/hazels_nocturne.txt b/forge-gui/res/cardsfolder/upcoming/hazels_nocturne.txt
index ae78a7102b3..a18fc5b8f1e 100644
--- a/forge-gui/res/cardsfolder/upcoming/hazels_nocturne.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hazels_nocturne.txt
@@ -1,8 +1,8 @@
-Name:Hazel's Nocturne
-ManaCost:3 B
-Types:Instant
-A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SubAbility$ DBDrain | SpellDescription$ Return up to two target creature cards from your graveyard to your hand. Each opponent loses 2 life and you gain 2 life.
-SVar:DBDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
-DeckHas:Ability$LifeGain
-Oracle:Return up to two target creature cards from your graveyard to your hand. Each opponent loses 2 life and you gain 2 life.
+Name:Hazel's Nocturne
+ManaCost:3 B
+Types:Instant
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SubAbility$ DBDrain | SpellDescription$ Return up to two target creature cards from your graveyard to your hand. Each opponent loses 2 life and you gain 2 life.
+SVar:DBDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
+DeckHas:Ability$LifeGain
+Oracle:Return up to two target creature cards from your graveyard to your hand. Each opponent loses 2 life and you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/head_of_the_homestead.txt b/forge-gui/res/cardsfolder/upcoming/head_of_the_homestead.txt
index 89a1d3b7917..8123d45a060 100644
--- a/forge-gui/res/cardsfolder/upcoming/head_of_the_homestead.txt
+++ b/forge-gui/res/cardsfolder/upcoming/head_of_the_homestead.txt
@@ -1,8 +1,8 @@
-Name:Head of the Homestead
-ManaCost:3 GW GW
-Types:Creature Rabbit Citizen
-PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create two 1/1 white Rabbit creature tokens.
-SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_rabbit | TokenOwner$ You
-DeckHas:Ability$Token
-Oracle:When Head of the Homestead enters, create two 1/1 white Rabbit creature tokens.
\ No newline at end of file
+Name:Head of the Homestead
+ManaCost:3 GW GW
+Types:Creature Rabbit Citizen
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create two 1/1 white Rabbit creature tokens.
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_rabbit | TokenOwner$ You
+DeckHas:Ability$Token
+Oracle:When Head of the Homestead enters, create two 1/1 white Rabbit creature tokens.
diff --git a/forge-gui/res/cardsfolder/upcoming/headsplitter.txt b/forge-gui/res/cardsfolder/upcoming/headsplitter.txt
index c6366f1b6c8..d10655cf717 100644
--- a/forge-gui/res/cardsfolder/upcoming/headsplitter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/headsplitter.txt
@@ -1,11 +1,11 @@
-Name:Headsplitter
-ManaCost:1 R
-Types:Artifact Equipment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 black Assassin creature token with menace, then attach CARDNAME to it.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_assassin_menace | TokenOwner$ You | RememberTokens$ True | SubAbility$ DBAttach
-SVar:DBAttach:DB$ Attach | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Token
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | Description$ Equipped creature gets +1/+0.
-K:Equip:2
-Oracle:When Headsplitter enters, create a 1/1 black Assassin creature token with menace, then attach Headsplitter to it.\nEquipped creature gets +1/+0.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
+Name:Headsplitter
+ManaCost:1 R
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 black Assassin creature token with menace, then attach CARDNAME to it.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_assassin_menace | TokenOwner$ You | RememberTokens$ True | SubAbility$ DBAttach
+SVar:DBAttach:DB$ Attach | Defined$ Remembered | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Token
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | Description$ Equipped creature gets +1/+0.
+K:Equip:2
+Oracle:When Headsplitter enters, create a 1/1 black Assassin creature token with menace, then attach Headsplitter to it.\nEquipped creature gets +1/+0.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/upcoming/heaped_harvest.txt b/forge-gui/res/cardsfolder/upcoming/heaped_harvest.txt
index 90360949ae3..696a3e01720 100644
--- a/forge-gui/res/cardsfolder/upcoming/heaped_harvest.txt
+++ b/forge-gui/res/cardsfolder/upcoming/heaped_harvest.txt
@@ -1,10 +1,10 @@
-Name:Heaped Harvest
-ManaCost:2 G
-Types:Artifact Food
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters and when you sacrifice it, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-T:Mode$ Sacrificed | ValidPlayer$ You | ValidCard$ Card.Self | Execute$ TrigChange | Secondary$ True | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters and when you sacrifice it, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
-A:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME> | Defined$ You | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
-SVar:SacMe:5
-DeckHas:Ability$LifeGain|Food
-Oracle:When Heaped Harvest enters and when you sacrifice it, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.\n{2}, {T}, Sacrifice Heaped Harvest: You gain 3 life.
+Name:Heaped Harvest
+ManaCost:2 G
+Types:Artifact Food
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters and when you sacrifice it, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+T:Mode$ Sacrificed | ValidPlayer$ You | ValidCard$ Card.Self | Execute$ TrigChange | Secondary$ True | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters and when you sacrifice it, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+A:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME> | Defined$ You | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
+SVar:SacMe:5
+DeckHas:Ability$LifeGain|Food
+Oracle:When Heaped Harvest enters and when you sacrifice it, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.\n{2}, {T}, Sacrifice Heaped Harvest: You gain 3 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/heartfire_hero.txt b/forge-gui/res/cardsfolder/upcoming/heartfire_hero.txt
index 0ba443a5bac..3afec36c609 100644
--- a/forge-gui/res/cardsfolder/upcoming/heartfire_hero.txt
+++ b/forge-gui/res/cardsfolder/upcoming/heartfire_hero.txt
@@ -1,11 +1,11 @@
-Name:Heartfire Hero
-ManaCost:R
-Types:Creature Mouse Soldier
-PT:1/1
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | FirstTime$ True | Execute$ TrigCounter | TriggerDescription$ Valiant — Whenever CARDNAME becomes the target of a spell or ability you control for the first time each turn, put a +1/+1 counter on it.
-SVar:TrigCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDamageDies | TriggerDescription$ When CARDNAME dies, it deals damage equal to its power to each opponent.
-SVar:TrigDamageDies:DB$ DealDamage | Defined$ Opponent | NumDmg$ X
-SVar:X:TriggeredCard$CardPower
-DeckHas:Ability$Counters
-Oracle:Valiant — Whenever Heartfire Hero becomes the target of a spell or ability you control for the first time each turn, put a +1/+1 counter on it.\nWhen Heartfire Hero dies, it deals damage equal to its power to each opponent.
\ No newline at end of file
+Name:Heartfire Hero
+ManaCost:R
+Types:Creature Mouse Soldier
+PT:1/1
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | FirstTime$ True | Execute$ TrigCounter | TriggerDescription$ Valiant — Whenever CARDNAME becomes the target of a spell or ability you control for the first time each turn, put a +1/+1 counter on it.
+SVar:TrigCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDamageDies | TriggerDescription$ When CARDNAME dies, it deals damage equal to its power to each opponent.
+SVar:TrigDamageDies:DB$ DealDamage | Defined$ Opponent | NumDmg$ X
+SVar:X:TriggeredCard$CardPower
+DeckHas:Ability$Counters
+Oracle:Valiant — Whenever Heartfire Hero becomes the target of a spell or ability you control for the first time each turn, put a +1/+1 counter on it.\nWhen Heartfire Hero dies, it deals damage equal to its power to each opponent.
diff --git a/forge-gui/res/cardsfolder/upcoming/hearthborn_battler.txt b/forge-gui/res/cardsfolder/upcoming/hearthborn_battler.txt
index bec43c5c5f2..13a24b6854f 100644
--- a/forge-gui/res/cardsfolder/upcoming/hearthborn_battler.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hearthborn_battler.txt
@@ -1,8 +1,8 @@
-Name:Hearthborn Battler
-ManaCost:2 R
-Types:Creature Lizard Warlock
-PT:2/3
-K:Haste
-T:Mode$ SpellCast | ValidActivatingPlayer$ Player | ActivatorThisTurnCast$ EQ2 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a player casts their second spell each turn, CARDNAME deals 2 damage to target opponent.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Player.Opponent | TgtPrompt$ Select target opponent | NumDmg$ 2
-Oracle:Haste\nWhenever a player casts their second spell each turn, Hearthborn Battler deals 2 damage to target opponent.
\ No newline at end of file
+Name:Hearthborn Battler
+ManaCost:2 R
+Types:Creature Lizard Warlock
+PT:2/3
+K:Haste
+T:Mode$ SpellCast | ValidActivatingPlayer$ Player | ActivatorThisTurnCast$ EQ2 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a player casts their second spell each turn, CARDNAME deals 2 damage to target opponent.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Player.Opponent | TgtPrompt$ Select target opponent | NumDmg$ 2
+Oracle:Haste\nWhenever a player casts their second spell each turn, Hearthborn Battler deals 2 damage to target opponent.
diff --git a/forge-gui/res/cardsfolder/upcoming/helga_skittish_seer.txt b/forge-gui/res/cardsfolder/upcoming/helga_skittish_seer.txt
index 75f1896cbd4..fc6768219f0 100644
--- a/forge-gui/res/cardsfolder/upcoming/helga_skittish_seer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/helga_skittish_seer.txt
@@ -1,11 +1,11 @@
-Name:Helga, Skittish Seer
-ManaCost:G W U
-Types:Legendary Creature Frog Druid
-PT:1/3
-T:Mode$ SpellCast | ValidCard$ Creature.cmcGE4 | ValidActivatingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a creature spell with mana value 4 or greater, you draw a card, gain 1 life, and put a +1/+1 counter on CARDNAME.
-SVar:TrigDraw:DB$ Draw | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | LifeAmount$ 1 | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | RestrictValid$ Spell.Creature+cmcGE4,Spell.Creature+hasXCost | SpellDescription$ Add X mana of any one color, where X is CARDNAME's power. Spend this mana only to cast creature spells with mana value 4 or greater or creature spells with {X} in their mana costs.
-SVar:X:Count$CardPower
-Oracle:Whenever you cast a creature spell with mana value 4 or greater, you draw a card, gain 1 life, and put a +1/+1 counter on Helga, Skittish Seer.\n{T}: Add X mana of any one color, where X is Helga, Skittish Seer's power. Spend this mana only to cast creature spells with mana value 4 or greater or creature spells with {X} in their mana costs.
+Name:Helga, Skittish Seer
+ManaCost:G W U
+Types:Legendary Creature Frog Druid
+PT:1/3
+T:Mode$ SpellCast | ValidCard$ Creature.cmcGE4 | ValidActivatingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a creature spell with mana value 4 or greater, you draw a card, gain 1 life, and put a +1/+1 counter on CARDNAME.
+SVar:TrigDraw:DB$ Draw | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 1 | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | RestrictValid$ Spell.Creature+cmcGE4,Spell.Creature+hasXCost | SpellDescription$ Add X mana of any one color, where X is CARDNAME's power. Spend this mana only to cast creature spells with mana value 4 or greater or creature spells with {X} in their mana costs.
+SVar:X:Count$CardPower
+Oracle:Whenever you cast a creature spell with mana value 4 or greater, you draw a card, gain 1 life, and put a +1/+1 counter on Helga, Skittish Seer.\n{T}: Add X mana of any one color, where X is Helga, Skittish Seer's power. Spend this mana only to cast creature spells with mana value 4 or greater or creature spells with {X} in their mana costs.
diff --git a/forge-gui/res/cardsfolder/upcoming/hemlock_vial.txt b/forge-gui/res/cardsfolder/upcoming/hemlock_vial.txt
index 350525befa3..652694f9540 100644
--- a/forge-gui/res/cardsfolder/upcoming/hemlock_vial.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hemlock_vial.txt
@@ -1,8 +1,8 @@
-Name:Hemlock Vial
-ManaCost:1 B
-Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you draw a card and you lose 1 life.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
-A:AB$ PumpAll | Cost$ B T Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl+equipped,Equipment.YouCtrl | KW$ Deathtouch | SpellDescription$ Each equipped creature and Equipment you control gains deathtouch until end of turn.
-Oracle:When Hemlock Vial enters, you draw a card and you lose 1 life.\n{B}, {T}, Sacrifice Hemlock Vial: Each equipped creature and Equipment you control gains deathtouch until end of turn.
\ No newline at end of file
+Name:Hemlock Vial
+ManaCost:1 B
+Types:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you draw a card and you lose 1 life.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
+A:AB$ PumpAll | Cost$ B T Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl+equipped,Equipment.YouCtrl | KW$ Deathtouch | SpellDescription$ Each equipped creature and Equipment you control gains deathtouch until end of turn.
+Oracle:When Hemlock Vial enters, you draw a card and you lose 1 life.\n{B}, {T}, Sacrifice Hemlock Vial: Each equipped creature and Equipment you control gains deathtouch until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/hidden_grotto.txt b/forge-gui/res/cardsfolder/upcoming/hidden_grotto.txt
index 3b5d3a04424..9a515ebffcf 100644
--- a/forge-gui/res/cardsfolder/upcoming/hidden_grotto.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hidden_grotto.txt
@@ -1,11 +1,11 @@
-Name:Hidden Grotto
-ManaCost:no cost
-Types:Land
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
-SVar:TrigSurveil:DB$ Surveil | Defined$ You | Amount$ 1
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
-AI:RemoveDeck:Random
-DeckHas:Ability$Mana.Colorless
-DeckHints:Color$Colorless & Keyword$Devoid
-Oracle:When Hidden Grotto enters, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)\n{T}: Add {C}.\n{1}, {T}: Add one mana of any color.
\ No newline at end of file
+Name:Hidden Grotto
+ManaCost:no cost
+Types:Land
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+SVar:TrigSurveil:DB$ Surveil | Defined$ You | Amount$ 1
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
+AI:RemoveDeck:Random
+DeckHas:Ability$Mana.Colorless
+DeckHints:Color$Colorless & Keyword$Devoid
+Oracle:When Hidden Grotto enters, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)\n{T}: Add {C}.\n{1}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/upcoming/high_stride.txt b/forge-gui/res/cardsfolder/upcoming/high_stride.txt
index 26eeb74a08f..85a7fb3a71b 100644
--- a/forge-gui/res/cardsfolder/upcoming/high_stride.txt
+++ b/forge-gui/res/cardsfolder/upcoming/high_stride.txt
@@ -1,6 +1,6 @@
-Name:High Stride
-ManaCost:G
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +3 | KW$ Reach | SubAbility$ DBUntap | SpellDescription$ Target creature gets +1/+3 and gains reach until end of turn. Untap it.
-SVar:DBUntap:DB$ Untap | Defined$ Targeted
-Oracle:Target creature gets +1/+3 and gains reach until end of turn. Untap it.
+Name:High Stride
+ManaCost:G
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +3 | KW$ Reach | SubAbility$ DBUntap | SpellDescription$ Target creature gets +1/+3 and gains reach until end of turn. Untap it.
+SVar:DBUntap:DB$ Untap | Defined$ Targeted
+Oracle:Target creature gets +1/+3 and gains reach until end of turn. Untap it.
diff --git a/forge-gui/res/cardsfolder/upcoming/hired_claw.txt b/forge-gui/res/cardsfolder/upcoming/hired_claw.txt
index e4394e4d400..49123c22e00 100644
--- a/forge-gui/res/cardsfolder/upcoming/hired_claw.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hired_claw.txt
@@ -1,9 +1,9 @@
-Name:Hired Claw
-ManaCost:R
-Types:Creature Lizard Mercenary
-PT:1/2
-T:Mode$ AttackersDeclared | ValidAttackers$ Lizard.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you attack with one or more Lizards, CARDNAME deals 1 damage to target opponent.
-SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ 1
-A:AB$ PutCounter | Cost$ 1 R | CounterType$ P1P1 | CounterNum$ 1 | CheckSVar$ X | ActivationLimit$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME. Activate only if an opponent lost life this turn and only once each turn.
-SVar:X:Count$LifeOppsLostThisTurn
-Oracle:Whenever you attack with one or more Lizards, Hired Claw deals 1 damage to target opponent.\n{1}{R}: Put a +1/+1 counter on Hired Claw. Activate only if an opponent lost life this turn and only once each turn.
+Name:Hired Claw
+ManaCost:R
+Types:Creature Lizard Mercenary
+PT:1/2
+T:Mode$ AttackersDeclared | ValidAttackers$ Lizard.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you attack with one or more Lizards, CARDNAME deals 1 damage to target opponent.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ 1
+A:AB$ PutCounter | Cost$ 1 R | CounterType$ P1P1 | CounterNum$ 1 | CheckSVar$ X | ActivationLimit$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME. Activate only if an opponent lost life this turn and only once each turn.
+SVar:X:Count$LifeOppsLostThisTurn
+Oracle:Whenever you attack with one or more Lizards, Hired Claw deals 1 damage to target opponent.\n{1}{R}: Put a +1/+1 counter on Hired Claw. Activate only if an opponent lost life this turn and only once each turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/hivespine_wolverine.txt b/forge-gui/res/cardsfolder/upcoming/hivespine_wolverine.txt
index 741290cf519..d3b0b9d820c 100644
--- a/forge-gui/res/cardsfolder/upcoming/hivespine_wolverine.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hivespine_wolverine.txt
@@ -1,11 +1,11 @@
-Name:Hivespine Wolverine
-ManaCost:3 G G
-Types:Creature Elemental Wolverine
-PT:5/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
-SVar:TrigCharm:DB$ Charm | Choices$ DBPutCounter,DBFight,DBDestroy
-SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | CounterType$ P1P1 | TgtPrompt$ Select target creature you control | StackDescription$ Put a +1/+1 counter on {c:ThisTargetedCard}. | SpellDescription$ Put a +1/+1 counter on target creature you control.
-SVar:DBFight:DB$ Fight | Defined$ TriggeredCardLKICopy | ValidTgts$ Creature.token | TgtPrompt$ Select target creature token | SpellDescription$ CARDNAME fights target creature token.
-SVar:DBDestroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
-DeckHas:Ability$Counters
-Oracle:When Hivespine Wolverine enters, choose one —\n• Put a +1/+1 counter on target creature you control.\n• Hivespine Wolverine fights target creature token.\n• Destroy target artifact or enchantment.
+Name:Hivespine Wolverine
+ManaCost:3 G G
+Types:Creature Elemental Wolverine
+PT:5/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
+SVar:TrigCharm:DB$ Charm | Choices$ DBPutCounter,DBFight,DBDestroy
+SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | CounterType$ P1P1 | TgtPrompt$ Select target creature you control | StackDescription$ Put a +1/+1 counter on {c:ThisTargetedCard}. | SpellDescription$ Put a +1/+1 counter on target creature you control.
+SVar:DBFight:DB$ Fight | Defined$ TriggeredCardLKICopy | ValidTgts$ Creature.token | TgtPrompt$ Select target creature token | SpellDescription$ CARDNAME fights target creature token.
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
+DeckHas:Ability$Counters
+Oracle:When Hivespine Wolverine enters, choose one —\n• Put a +1/+1 counter on target creature you control.\n• Hivespine Wolverine fights target creature token.\n• Destroy target artifact or enchantment.
diff --git a/forge-gui/res/cardsfolder/upcoming/hoarders_overflow.txt b/forge-gui/res/cardsfolder/upcoming/hoarders_overflow.txt
index 73e4b68af84..5c9b7acd788 100644
--- a/forge-gui/res/cardsfolder/upcoming/hoarders_overflow.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hoarders_overflow.txt
@@ -1,11 +1,11 @@
-Name:Hoarder's Overflow
-ManaCost:1 R
-Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters and whenever you expend 4, put a stash counter on it. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
-T:Mode$ ManaExpend | Amount$ 4 | Player$ You | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters and whenever you expend 4, put a stash counter on it. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ STASH | CounterNum$ 1
-A:AB$ Discard | Cost$ 1 R Sac<1/CARDNAME> | Defined$ You | Mode$ Hand | SubAbility$ DBDraw | SpellDescription$ Discard your hand, then draw cards equal to the number of stash counters on CARDNAME.
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X
-SVar:X:Count$CardCounters.STASH
-DeckHas:Ability$Counters
-Oracle:When Hoarder's Overflow enters and whenever you expend 4, put a stash counter on it. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)\n{1}{R}, Sacrifice Hoarder's Overflow: Discard your hand, then draw cards equal to the number of stash counters on Hoarder's Overflow.
\ No newline at end of file
+Name:Hoarder's Overflow
+ManaCost:1 R
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters and whenever you expend 4, put a stash counter on it. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
+T:Mode$ ManaExpend | Amount$ 4 | Player$ You | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters and whenever you expend 4, put a stash counter on it. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ STASH | CounterNum$ 1
+A:AB$ Discard | Cost$ 1 R Sac<1/CARDNAME> | Defined$ You | Mode$ Hand | SubAbility$ DBDraw | SpellDescription$ Discard your hand, then draw cards equal to the number of stash counters on CARDNAME.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X
+SVar:X:Count$CardCounters.STASH
+DeckHas:Ability$Counters
+Oracle:When Hoarder's Overflow enters and whenever you expend 4, put a stash counter on it. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)\n{1}{R}, Sacrifice Hoarder's Overflow: Discard your hand, then draw cards equal to the number of stash counters on Hoarder's Overflow.
diff --git a/forge-gui/res/cardsfolder/upcoming/honored_dreyleader.txt b/forge-gui/res/cardsfolder/upcoming/honored_dreyleader.txt
index de512aaa385..f8eac3a78f9 100644
--- a/forge-gui/res/cardsfolder/upcoming/honored_dreyleader.txt
+++ b/forge-gui/res/cardsfolder/upcoming/honored_dreyleader.txt
@@ -1,13 +1,13 @@
-Name:Honored Dreyleader
-ManaCost:2 G
-Types:Creature Squirrel Warrior
-PT:1/1
-K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPutCounter1 | TriggerDescription$ When CARDNAME enters, put a +1/+1 counter on it for each other Squirrel and/or Food you control.
-SVar:TrigPutCounter1:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Squirrel.Other+YouCtrl,Food.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter2 | TriggerDescription$ Whenever another Squirrel or Food you control enters, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter2:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:X:Count$Valid Squirrel.Other+YouCtrl,Food.Other+YouCtrl
-DeckHas:Ability$Counters
-DeckHints:Type$Squirrel|Food
-Oracle:Trample\nWhen Honored Dreyleader enters, put a +1/+1 counter on it for each other Squirrel and/or Food you control.\nWhenever another Squirrel or Food you control enters, put a +1/+1 counter on Honored Dreyleader.
\ No newline at end of file
+Name:Honored Dreyleader
+ManaCost:2 G
+Types:Creature Squirrel Warrior
+PT:1/1
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPutCounter1 | TriggerDescription$ When CARDNAME enters, put a +1/+1 counter on it for each other Squirrel and/or Food you control.
+SVar:TrigPutCounter1:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Squirrel.Other+YouCtrl,Food.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter2 | TriggerDescription$ Whenever another Squirrel or Food you control enters, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter2:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:X:Count$Valid Squirrel.Other+YouCtrl,Food.Other+YouCtrl
+DeckHas:Ability$Counters
+DeckHints:Type$Squirrel|Food
+Oracle:Trample\nWhen Honored Dreyleader enters, put a +1/+1 counter on it for each other Squirrel and/or Food you control.\nWhenever another Squirrel or Food you control enters, put a +1/+1 counter on Honored Dreyleader.
diff --git a/forge-gui/res/cardsfolder/upcoming/hookblade_veteran.txt b/forge-gui/res/cardsfolder/upcoming/hookblade_veteran.txt
index b0c64a9354d..22c502449bb 100644
--- a/forge-gui/res/cardsfolder/upcoming/hookblade_veteran.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hookblade_veteran.txt
@@ -1,6 +1,6 @@
-Name:Hookblade Veteran
-ManaCost:U
-Types:Creature Human Assassin
-PT:1/2
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | Condition$ PlayerTurn | Description$ As long as it's your turn, CARDNAME has flying. (It can't be blocked except by creatures with flying or reach.)
-Oracle:As long as it's your turn, Hookblade Veteran has flying. (It can't be blocked except by creatures with flying or reach.)
\ No newline at end of file
+Name:Hookblade Veteran
+ManaCost:U
+Types:Creature Human Assassin
+PT:1/2
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | Condition$ PlayerTurn | Description$ As long as it's your turn, CARDNAME has flying. (It can't be blocked except by creatures with flying or reach.)
+Oracle:As long as it's your turn, Hookblade Veteran has flying. (It can't be blocked except by creatures with flying or reach.)
diff --git a/forge-gui/res/cardsfolder/upcoming/hop_to_it.txt b/forge-gui/res/cardsfolder/upcoming/hop_to_it.txt
index b3cba7c5253..85d383c791f 100644
--- a/forge-gui/res/cardsfolder/upcoming/hop_to_it.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hop_to_it.txt
@@ -1,5 +1,5 @@
-Name:Hop to It
-ManaCost:2 W
-Types:Sorcery
-A:SP$ Token | TokenAmount$ 3 | TokenScript$ w_1_1_rabbit | TokenOwner$ You | SpellDescription$ Create three 1/1 white Rabbit creature tokens.
-Oracle:Create three 1/1 white Rabbit creature tokens.
\ No newline at end of file
+Name:Hop to It
+ManaCost:2 W
+Types:Sorcery
+A:SP$ Token | TokenAmount$ 3 | TokenScript$ w_1_1_rabbit | TokenOwner$ You | SpellDescription$ Create three 1/1 white Rabbit creature tokens.
+Oracle:Create three 1/1 white Rabbit creature tokens.
diff --git a/forge-gui/res/cardsfolder/upcoming/hugs_grisly_guardian.txt b/forge-gui/res/cardsfolder/upcoming/hugs_grisly_guardian.txt
index db793b71050..c451dddb853 100644
--- a/forge-gui/res/cardsfolder/upcoming/hugs_grisly_guardian.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hugs_grisly_guardian.txt
@@ -1,14 +1,14 @@
-Name:Hugs, Grisly Guardian
-ManaCost:X R R G G
-Types:Legendary Creature Badger Warrior
-PT:5/5
-K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile the top X cards of your library. Until the end of your next turn, you may play those cards.
-SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ X | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ UntilTheEndOfYourNextTurn
-SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until the end of your next turn, you may play the exiled cards.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-S:Mode$ Continuous | Affected$ You | AdjustLandPlays$ 1 | Description$ You may play an additional land on each of your turns.
-SVar:PlayMain1:ALWAYS
-SVar:X:Count$xPaid
-Oracle:Trample\nWhen Hugs, Grisly Guardian enters, exile the top X cards of your library. Until the end of your next turn, you may play those cards.\nYou may play an additional land on each of your turns.
+Name:Hugs, Grisly Guardian
+ManaCost:X R R G G
+Types:Legendary Creature Badger Warrior
+PT:5/5
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile the top X cards of your library. Until the end of your next turn, you may play those cards.
+SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ X | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ UntilTheEndOfYourNextTurn
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until the end of your next turn, you may play the exiled cards.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+S:Mode$ Continuous | Affected$ You | AdjustLandPlays$ 1 | Description$ You may play an additional land on each of your turns.
+SVar:PlayMain1:ALWAYS
+SVar:X:Count$xPaid
+Oracle:Trample\nWhen Hugs, Grisly Guardian enters, exile the top X cards of your library. Until the end of your next turn, you may play those cards.\nYou may play an additional land on each of your turns.
diff --git a/forge-gui/res/cardsfolder/upcoming/hunters_bow.txt b/forge-gui/res/cardsfolder/upcoming/hunters_bow.txt
index 3d7e55b1c9e..c3bc24ea253 100644
--- a/forge-gui/res/cardsfolder/upcoming/hunters_bow.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hunters_bow.txt
@@ -1,10 +1,10 @@
-Name:Hunter's Bow
-ManaCost:1 G
-Types:Artifact Equipment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When CARDNAME enters, attach it to target creature you control. That creature deals damage equal to its power to up to one target creature you don't control.
-SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBDamage
-SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget | AILogic$ PowerDmg
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Reach & Ward:2 | Description$ Equipped creature has reach and ward {2}.
-K:Equip:1
-SVar:X:ParentTargeted$CardPower
-Oracle:When Hunter's Bow enters, attach it to target creature you control. That creature deals damage equal to its power to up to one target creature you don't control.\nEquipped creature has reach and ward {2}.\nEquip {1}
+Name:Hunter's Bow
+ManaCost:1 G
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When CARDNAME enters, attach it to target creature you control. That creature deals damage equal to its power to up to one target creature you don't control.
+SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBDamage
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget | AILogic$ PowerDmg
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Reach & Ward:2 | Description$ Equipped creature has reach and ward {2}.
+K:Equip:1
+SVar:X:ParentTargeted$CardPower
+Oracle:When Hunter's Bow enters, attach it to target creature you control. That creature deals damage equal to its power to up to one target creature you don't control.\nEquipped creature has reach and ward {2}.\nEquip {1}
diff --git a/forge-gui/res/cardsfolder/upcoming/hunters_talent.txt b/forge-gui/res/cardsfolder/upcoming/hunters_talent.txt
index 8cfeb6dbec8..6f5e166f069 100644
--- a/forge-gui/res/cardsfolder/upcoming/hunters_talent.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hunters_talent.txt
@@ -1,15 +1,15 @@
-Name:Hunter's Talent
-ManaCost:1 G
-Types:Enchantment Class
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigHit | TriggerDescription$ When CARDNAME enters, target creature you control deals damage equal to its power to target creature you don't control.
-SVar:TrigHit:DB$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ None
-SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget
-K:Class:2:1 G:AddTrigger$ TriggerAttackersDeclared
-SVar:TriggerAttackersDeclared:Mode$ AttackersDeclared | AttackingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever you attack, target attacking creature gets +1/+0 and gains trample until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumAtt$ 1 | KW$ Trample
-K:Class:3:3 G:AddTrigger$ TriggerEndStep
-SVar:TriggerEndStep:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Creature.powerGE4+YouCtrl | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, if you control a creature with power 4 or greater, draw a card.
-SVar:TrigDraw:DB$ Draw
-SVar:X:ParentTargeted$CardPower
-SVar:PlayMain1:ALWAYS
-Oracle:(Gain the next level as a sorcery to add its ability.)\nWhen Hunter's Talent enters, target creature you control deals damage equal to its power to target creature you don't control.\n{1}{G}: Level 2\nWhenever you attack, target attacking creature gets +1/+0 and gains trample until end of turn.\n{3}{G}: Level 3\nAt the beginning of your end step, if you control a creature with power 4 or greater, draw a card.
+Name:Hunter's Talent
+ManaCost:1 G
+Types:Enchantment Class
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigHit | TriggerDescription$ When CARDNAME enters, target creature you control deals damage equal to its power to target creature you don't control.
+SVar:TrigHit:DB$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ None
+SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget
+K:Class:2:1 G:AddTrigger$ TriggerAttackersDeclared
+SVar:TriggerAttackersDeclared:Mode$ AttackersDeclared | AttackingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever you attack, target attacking creature gets +1/+0 and gains trample until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumAtt$ 1 | KW$ Trample
+K:Class:3:3 G:AddTrigger$ TriggerEndStep
+SVar:TriggerEndStep:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Creature.powerGE4+YouCtrl | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, if you control a creature with power 4 or greater, draw a card.
+SVar:TrigDraw:DB$ Draw
+SVar:X:ParentTargeted$CardPower
+SVar:PlayMain1:ALWAYS
+Oracle:(Gain the next level as a sorcery to add its ability.)\nWhen Hunter's Talent enters, target creature you control deals damage equal to its power to target creature you don't control.\n{1}{G}: Level 2\nWhenever you attack, target attacking creature gets +1/+0 and gains trample until end of turn.\n{3}{G}: Level 3\nAt the beginning of your end step, if you control a creature with power 4 or greater, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/huskburster_swarm.txt b/forge-gui/res/cardsfolder/upcoming/huskburster_swarm.txt
index 641d193f5b5..d8cb3322017 100644
--- a/forge-gui/res/cardsfolder/upcoming/huskburster_swarm.txt
+++ b/forge-gui/res/cardsfolder/upcoming/huskburster_swarm.txt
@@ -1,9 +1,9 @@
-Name:Huskburster Swarm
-ManaCost:7 B
-Types:Creature Elemental Insect
-PT:6/6
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each creature card you own in exile and in your graveyard.
-K:Menace
-K:Deathtouch
-SVar:X:Count$ValidGraveyard,Exile Creature.YouOwn
-Oracle:This spell costs {1} less to cast for each creature card you own in exile and in your graveyard.\nMenace, deathtouch
\ No newline at end of file
+Name:Huskburster Swarm
+ManaCost:7 B
+Types:Creature Elemental Insect
+PT:6/6
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each creature card you own in exile and in your graveyard.
+K:Menace
+K:Deathtouch
+SVar:X:Count$ValidGraveyard,Exile Creature.YouOwn
+Oracle:This spell costs {1} less to cast for each creature card you own in exile and in your graveyard.\nMenace, deathtouch
diff --git a/forge-gui/res/cardsfolder/upcoming/innkeepers_talent.txt b/forge-gui/res/cardsfolder/upcoming/innkeepers_talent.txt
index 9a7da9638c6..355b58dfca9 100644
--- a/forge-gui/res/cardsfolder/upcoming/innkeepers_talent.txt
+++ b/forge-gui/res/cardsfolder/upcoming/innkeepers_talent.txt
@@ -1,12 +1,12 @@
-Name:Innkeeper's Talent
-ManaCost:1 G
-Types:Enchantment Class
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of combat on your turn, put a +1/+1 counter on target creature you control.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select another target creature you control | CounterType$ P1P1 | CounterNum$ 1
-K:Class:2:G:AddStaticAbility$ WardForCounters
-SVar:WardForCounters:Mode$ Continuous | Affected$ Permanent.YouCtrl+HasCounters | AddKeyword$ Ward:1 | Description$ Permanents you control with counters on them have ward {1}.
-K:Class:3:3 G:AddReplacementEffect$ DoubleCounters
-SVar:DoubleCounters:Event$ AddCounter | ActiveZones$ Battlefield | ValidSource$ You | ValidObject$ Permanent.inZoneBattlefield,Player | ReplaceWith$ AddTwiceCounters | Description$ If you would put one or more counters on a permanent or player, put twice that many of each of those kinds of counters on that permanent or player instead.
-SVar:AddTwiceCounters:DB$ ReplaceCounter | ChooseCounter$ True | Amount$ X
-SVar:X:ReplaceCount$CounterNum/Twice
-Oracle:(Gain the next level as a sorcery to add its ability.)\nAt the beginning of combat on your turn, put a +1/+1 counter on target creature you control.\n{G}: Level 2\nPermanents you control with counters on them have ward {1}.\n{3}{G}: Level 3\nIf you would put one or more counters on a permanent or player, put twice that many of each of those kinds of counters on that permanent or player instead.
+Name:Innkeeper's Talent
+ManaCost:1 G
+Types:Enchantment Class
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of combat on your turn, put a +1/+1 counter on target creature you control.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select another target creature you control | CounterType$ P1P1 | CounterNum$ 1
+K:Class:2:G:AddStaticAbility$ WardForCounters
+SVar:WardForCounters:Mode$ Continuous | Affected$ Permanent.YouCtrl+HasCounters | AddKeyword$ Ward:1 | Description$ Permanents you control with counters on them have ward {1}.
+K:Class:3:3 G:AddReplacementEffect$ DoubleCounters
+SVar:DoubleCounters:Event$ AddCounter | ActiveZones$ Battlefield | ValidSource$ You | ValidObject$ Permanent.inZoneBattlefield,Player | ReplaceWith$ AddTwiceCounters | Description$ If you would put one or more counters on a permanent or player, put twice that many of each of those kinds of counters on that permanent or player instead.
+SVar:AddTwiceCounters:DB$ ReplaceCounter | ChooseCounter$ True | Amount$ X
+SVar:X:ReplaceCount$CounterNum/Twice
+Oracle:(Gain the next level as a sorcery to add its ability.)\nAt the beginning of combat on your turn, put a +1/+1 counter on target creature you control.\n{G}: Level 2\nPermanents you control with counters on them have ward {1}.\n{3}{G}: Level 3\nIf you would put one or more counters on a permanent or player, put twice that many of each of those kinds of counters on that permanent or player instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/insatiable_frugivore.txt b/forge-gui/res/cardsfolder/upcoming/insatiable_frugivore.txt
index 2c18de36b51..97dc4c2a5ae 100644
--- a/forge-gui/res/cardsfolder/upcoming/insatiable_frugivore.txt
+++ b/forge-gui/res/cardsfolder/upcoming/insatiable_frugivore.txt
@@ -1,14 +1,14 @@
-Name:Insatiable Frugivore
-ManaCost:3 B
-Types:Creature Rat Berserker
-PT:2/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a Food token, then you may exile three cards from your graveyard. If you do, repeat this process.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | TokenScript$ c_a_food_sac | SubAbility$ DBStoreSVar
-SVar:DBStoreSVar:DB$ StoreSVar | SVar$ CheckNotPaid | Type$ Number | Expression$ 1 | SubAbility$ DBRepeat
-SVar:DBRepeat:DB$ Repeat | RepeatSubAbility$ DBToken | RepeatCheckSVar$ CheckNotPaid | RepeatSVarCompare$ GT0
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | UnlessCost$ ExileFromGrave<3/Card> | UnlessPayer$ You | UnlessSwitched$ True | UnlessResolveSubs$ WhenNotPaid | SubAbility$ DBStoreSVar | TokenScript$ c_a_food_sac
-SVar:DBStoreSVar:DB$ StoreSVar | SVar$ CheckNotPaid | Type$ Number | Expression$ 0
-A:AB$ PumpAll | Cost$ 3 B Sac<X/Food> | ValidCards$ Creature.YouCtrl | NumAtt$ +X | KW$ Menace | SpellDescription$ Creatures you control get +X/+0 and gain menace until end of turn.
-SVar:CheckNotPaid:Number$1
-SVar:X:Count$xPaid
-Oracle:When Insatiable Frugivore enters, create a Food token, then you may exile three cards from your graveyard. If you do, repeat this process.\n{3}{B}, Sacrifice X Foods: Creatures you control get +X/+0 and gain menace until end of turn.
+Name:Insatiable Frugivore
+ManaCost:3 B
+Types:Creature Rat Berserker
+PT:2/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a Food token, then you may exile three cards from your graveyard. If you do, repeat this process.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | TokenScript$ c_a_food_sac | SubAbility$ DBStoreSVar
+SVar:DBStoreSVar:DB$ StoreSVar | SVar$ CheckNotPaid | Type$ Number | Expression$ 1 | SubAbility$ DBRepeat
+SVar:DBRepeat:DB$ Repeat | RepeatSubAbility$ DBToken | RepeatCheckSVar$ CheckNotPaid | RepeatSVarCompare$ GT0
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | UnlessCost$ ExileFromGrave<3/Card> | UnlessPayer$ You | UnlessSwitched$ True | UnlessResolveSubs$ WhenNotPaid | SubAbility$ DBStoreSVar | TokenScript$ c_a_food_sac
+SVar:DBStoreSVar:DB$ StoreSVar | SVar$ CheckNotPaid | Type$ Number | Expression$ 0
+A:AB$ PumpAll | Cost$ 3 B Sac<X/Food> | ValidCards$ Creature.YouCtrl | NumAtt$ +X | KW$ Menace | SpellDescription$ Creatures you control get +X/+0 and gain menace until end of turn.
+SVar:CheckNotPaid:Number$1
+SVar:X:Count$xPaid
+Oracle:When Insatiable Frugivore enters, create a Food token, then you may exile three cards from your graveyard. If you do, repeat this process.\n{3}{B}, Sacrifice X Foods: Creatures you control get +X/+0 and gain menace until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/into_the_flood_maw.txt b/forge-gui/res/cardsfolder/upcoming/into_the_flood_maw.txt
index 2659aebb0c3..33dcb83d673 100644
--- a/forge-gui/res/cardsfolder/upcoming/into_the_flood_maw.txt
+++ b/forge-gui/res/cardsfolder/upcoming/into_the_flood_maw.txt
@@ -1,10 +1,10 @@
-Name:Into the Flood Maw
-ManaCost:U
-Types:Instant
-K:Gift
-SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenTapped$ True | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ a tapped Fish
-A:SP$ ChangeZone | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | Origin$ Battlefield | Destination$ Hand | TargetMin$ X | TargetMax$ X | SubAbility$ DBChangeZone | SpellDescription$ Return target creature an opponent controls to its owner's hand. If the gift was promised, instead return target nonland permanent an opponent controls to its owner's hand.
-SVar:DBChangeZone:DB$ ChangeZone | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | Origin$ Battlefield | Destination$ Hand | TargetMin$ Y | TargetMax$ Y
-SVar:X:Count$Compare Y EQ1.0.1
-SVar:Y:Count$ValidStack Card.Self+PromisedGift
-Oracle:Gift a tapped Fish (You may promise an opponent a gift as you cast this spell. If you do, they create a tapped 1/1 blue Fish creature token before its other effects.)\nReturn target creature an opponent controls to its owner's hand. If the gift was promised, instead return target nonland permanent an opponent controls to its owner's hand.
+Name:Into the Flood Maw
+ManaCost:U
+Types:Instant
+K:Gift
+SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenTapped$ True | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ a tapped Fish
+A:SP$ ChangeZone | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | Origin$ Battlefield | Destination$ Hand | TargetMin$ X | TargetMax$ X | SubAbility$ DBChangeZone | SpellDescription$ Return target creature an opponent controls to its owner's hand. If the gift was promised, instead return target nonland permanent an opponent controls to its owner's hand.
+SVar:DBChangeZone:DB$ ChangeZone | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | Origin$ Battlefield | Destination$ Hand | TargetMin$ Y | TargetMax$ Y
+SVar:X:Count$Compare Y EQ1.0.1
+SVar:Y:Count$ValidStack Card.Self+PromisedGift
+Oracle:Gift a tapped Fish (You may promise an opponent a gift as you cast this spell. If you do, they create a tapped 1/1 blue Fish creature token before its other effects.)\nReturn target creature an opponent controls to its owner's hand. If the gift was promised, instead return target nonland permanent an opponent controls to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/intrepid_rabbit.txt b/forge-gui/res/cardsfolder/upcoming/intrepid_rabbit.txt
index 528d9013973..afa8b9dca86 100644
--- a/forge-gui/res/cardsfolder/upcoming/intrepid_rabbit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/intrepid_rabbit.txt
@@ -1,8 +1,8 @@
-Name:Intrepid Rabbit
-ManaCost:2 W
-Types:Creature Rabbit Soldier
-PT:3/2
-K:Offspring:1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When this creature enters, target creature you control gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ 1 | NumDef$ 1
-Oracle:Offspring {1} (You may pay an additional {1} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nWhen this creature enters, target creature you control gets +1/+1 until end of turn.
+Name:Intrepid Rabbit
+ManaCost:2 W
+Types:Creature Rabbit Soldier
+PT:3/2
+K:Offspring:1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When this creature enters, target creature you control gets +1/+1 until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ 1 | NumDef$ 1
+Oracle:Offspring {1} (You may pay an additional {1} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nWhen this creature enters, target creature you control gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/iridescent_vinelasher.txt b/forge-gui/res/cardsfolder/upcoming/iridescent_vinelasher.txt
index f5cbabf86b3..3f13122f583 100644
--- a/forge-gui/res/cardsfolder/upcoming/iridescent_vinelasher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/iridescent_vinelasher.txt
@@ -1,9 +1,9 @@
-Name:Iridescent Vinelasher
-ManaCost:B
-Types:Creature Lizard Assassin
-PT:1/2
-K:Offspring:2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Landfall — Whenever a land you control enters, this creature deals 1 damage to target opponent.
-SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Opponent | NumDmg$ 1
-SVar:BuffedBy:Land
-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.)\nLandfall — Whenever a land you control enters, this creature deals 1 damage to target opponent.
+Name:Iridescent Vinelasher
+ManaCost:B
+Types:Creature Lizard Assassin
+PT:1/2
+K:Offspring:2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Landfall — Whenever a land you control enters, this creature deals 1 damage to target opponent.
+SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Opponent | NumDmg$ 1
+SVar:BuffedBy:Land
+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.)\nLandfall — Whenever a land you control enters, this creature deals 1 damage to target opponent.
diff --git a/forge-gui/res/cardsfolder/upcoming/jackdaw.txt b/forge-gui/res/cardsfolder/upcoming/jackdaw.txt
index d5a7cd79656..0c7e35c1103 100644
--- a/forge-gui/res/cardsfolder/upcoming/jackdaw.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jackdaw.txt
@@ -1,8 +1,8 @@
-Name:Jackdaw
-ManaCost:1 U R
-Types:Legendary Artifact Vehicle
-PT:4/4
-T:Mode$ DamageDone | CombatDamage$ True | ValidSource$ Card.Self | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigDiscard | Whenever CARDNAME deals combat damage to a player, you may discard your hand. If you do, draw a card for each artifact you control.
-SVar:TrigDiscard:AB$ Draw | NumCards$ Count$Valid Artifact.YouCtrl | Cost$ Discard<0/Hand>
-K:Crew:3
-Oracle:Whenever Jackdaw deals combat damage to a player, you may discard your hand. If you do, draw a card for each artifact you control.\nCrew 3
+Name:Jackdaw
+ManaCost:1 U R
+Types:Legendary Artifact Vehicle
+PT:4/4
+T:Mode$ DamageDone | CombatDamage$ True | ValidSource$ Card.Self | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigDiscard | Whenever CARDNAME deals combat damage to a player, you may discard your hand. If you do, draw a card for each artifact you control.
+SVar:TrigDiscard:AB$ Draw | NumCards$ Count$Valid Artifact.YouCtrl | Cost$ Discard<0/Hand>
+K:Crew:3
+Oracle:Whenever Jackdaw deals combat damage to a player, you may discard your hand. If you do, draw a card for each artifact you control.\nCrew 3
diff --git a/forge-gui/res/cardsfolder/upcoming/jackdaw_savior.txt b/forge-gui/res/cardsfolder/upcoming/jackdaw_savior.txt
index df10bcc4069..9c001948a3d 100644
--- a/forge-gui/res/cardsfolder/upcoming/jackdaw_savior.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jackdaw_savior.txt
@@ -1,9 +1,9 @@
-Name:Jackdaw Savior
-ManaCost:2 W
-Types:Creature Bird Cleric
-PT:3/1
-K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+YouCtrl+withFlying | Execute$ TrigReturn | TriggerDescription$ Whenever CARDNAME or another creature you control with flying dies, return another target creature card with lesser mana value from your graveyard to the battlefield.
-SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Creature.cmcLTX+YouOwn+NotDefinedTriggeredCard | TgtPrompt$ Select another target creature card with lesser mana value in your graveyard | Origin$ Graveyard | Destination$ Battlefield
-SVar:X:TriggeredCard$CardManaCost
-Oracle:Flying\nWhenever Jackdaw Savior or another creature you control with flying dies, return another target creature card with lesser mana value from your graveyard to the battlefield.
+Name:Jackdaw Savior
+ManaCost:2 W
+Types:Creature Bird Cleric
+PT:3/1
+K:Flying
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+YouCtrl+withFlying | Execute$ TrigReturn | TriggerDescription$ Whenever CARDNAME or another creature you control with flying dies, return another target creature card with lesser mana value from your graveyard to the battlefield.
+SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Creature.cmcLTX+YouOwn+NotDefinedTriggeredCard | TgtPrompt$ Select another target creature card with lesser mana value in your graveyard | Origin$ Graveyard | Destination$ Battlefield
+SVar:X:TriggeredCard$CardManaCost
+Oracle:Flying\nWhenever Jackdaw Savior or another creature you control with flying dies, return another target creature card with lesser mana value from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/jacked_rabbit.txt b/forge-gui/res/cardsfolder/upcoming/jacked_rabbit.txt
index b6224e4b9c2..ed7af08e1ce 100644
--- a/forge-gui/res/cardsfolder/upcoming/jacked_rabbit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jacked_rabbit.txt
@@ -1,11 +1,11 @@
-Name:Jacked Rabbit
-ManaCost:X 1 W
-Types:Creature Rabbit Warrior
-PT:1/2
-K:Ravenous
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, create a number of 1/1 white Rabbit creature tokens equal to CARDNAME's power.
-SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_rabbit | TokenOwner$ You | TokenAmount$ Y
-SVar:X:Count$xPaid
-SVar:Y:Count$CardPower
-DeckHas:Ability$Counters|Token
-Oracle:Ravenous (This creature enters with X +1/+1 counters on it. If X is 5 or more, draw a card when it enters.)\nWhenever Jacked Rabbit attacks, create a number of 1/1 white Rabbit creature tokens equal to Jacked Rabbit's power.
+Name:Jacked Rabbit
+ManaCost:X 1 W
+Types:Creature Rabbit Warrior
+PT:1/2
+K:Ravenous
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, create a number of 1/1 white Rabbit creature tokens equal to CARDNAME's power.
+SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_rabbit | TokenOwner$ You | TokenAmount$ Y
+SVar:X:Count$xPaid
+SVar:Y:Count$CardPower
+DeckHas:Ability$Counters|Token
+Oracle:Ravenous (This creature enters with X +1/+1 counters on it. If X is 5 or more, draw a card when it enters.)\nWhenever Jacked Rabbit attacks, create a number of 1/1 white Rabbit creature tokens equal to Jacked Rabbit's power.
diff --git a/forge-gui/res/cardsfolder/upcoming/junkblade_bruiser.txt b/forge-gui/res/cardsfolder/upcoming/junkblade_bruiser.txt
index 510f5875cf3..45ee6e451ac 100644
--- a/forge-gui/res/cardsfolder/upcoming/junkblade_bruiser.txt
+++ b/forge-gui/res/cardsfolder/upcoming/junkblade_bruiser.txt
@@ -1,8 +1,8 @@
-Name:Junkblade Bruiser
-ManaCost:3 RG RG
-Types:Creature Raccoon Berserker
-PT:4/5
-K:Trample
-T:Mode$ ManaExpend | Amount$ 4 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you expend 4, CARDNAME gets +2/+1 until end of turn. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
-SVar:TrigPump:DB$ Pump | NumAtt$ +2 | NumDef$ +1 | Defined$ Self
-Oracle:Trample\nWhenever you expend 4, Junkblade Bruiser gets +2/+1 until end of turn. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
\ No newline at end of file
+Name:Junkblade Bruiser
+ManaCost:3 RG RG
+Types:Creature Raccoon Berserker
+PT:4/5
+K:Trample
+T:Mode$ ManaExpend | Amount$ 4 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you expend 4, CARDNAME gets +2/+1 until end of turn. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
+SVar:TrigPump:DB$ Pump | NumAtt$ +2 | NumDef$ +1 | Defined$ Self
+Oracle:Trample\nWhenever you expend 4, Junkblade Bruiser gets +2/+1 until end of turn. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
diff --git a/forge-gui/res/cardsfolder/upcoming/kastral_the_windcrested.txt b/forge-gui/res/cardsfolder/upcoming/kastral_the_windcrested.txt
index 6ea0aa29e76..864338e7d12 100644
--- a/forge-gui/res/cardsfolder/upcoming/kastral_the_windcrested.txt
+++ b/forge-gui/res/cardsfolder/upcoming/kastral_the_windcrested.txt
@@ -1,11 +1,11 @@
-Name:Kastral, the Windcrested
-ManaCost:3 W U
-Types:Legendary Creature Bird Scout
-PT:4/5
-K:Flying
-T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.Bird+YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigCharm | TriggerDescription$ Whenever one or more Birds you control deal combat damage to a player, ABILITY
-SVar:TrigCharm:DB$ Charm | Choices$ DBChangeZone,DBPutCounterAll,DBDraw
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand,Graveyard | Destination$ Battlefield | ChangeType$ Creature.Bird+YouOwn | WithCountersType$ FINALITY | Optional$ You | SpellDescription$ You may put a Bird creature card from your hand or graveyard onto the battlefield with a finality counter on it.
-SVar:DBPutCounterAll:DB$ PutCounterAll | ValidCards$ Bird.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each Bird you control.
-SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
-Oracle:Flying\nWhenever one or more Birds you control deal combat damage to a player, choose one —\n• You may put a Bird creature card from your hand or graveyard onto the battlefield with a finality counter on it.\n• Put a +1/+1 counter on each Bird you control.\n• Draw a card.
+Name:Kastral, the Windcrested
+ManaCost:3 W U
+Types:Legendary Creature Bird Scout
+PT:4/5
+K:Flying
+T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.Bird+YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigCharm | TriggerDescription$ Whenever one or more Birds you control deal combat damage to a player, ABILITY
+SVar:TrigCharm:DB$ Charm | Choices$ DBChangeZone,DBPutCounterAll,DBDraw
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand,Graveyard | Destination$ Battlefield | ChangeType$ Creature.Bird+YouOwn | WithCountersType$ FINALITY | Optional$ You | SpellDescription$ You may put a Bird creature card from your hand or graveyard onto the battlefield with a finality counter on it.
+SVar:DBPutCounterAll:DB$ PutCounterAll | ValidCards$ Bird.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each Bird you control.
+SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
+Oracle:Flying\nWhenever one or more Birds you control deal combat damage to a player, choose one —\n• You may put a Bird creature card from your hand or graveyard onto the battlefield with a finality counter on it.\n• Put a +1/+1 counter on each Bird you control.\n• Draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/keen_eyed_curator.txt b/forge-gui/res/cardsfolder/upcoming/keen_eyed_curator.txt
index a0d0f1ff0f6..7d8e40cdcb1 100644
--- a/forge-gui/res/cardsfolder/upcoming/keen_eyed_curator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/keen_eyed_curator.txt
@@ -1,8 +1,8 @@
-Name:Keen-Eyed Curator
-ManaCost:G G
-Types:Creature Raccoon Scout
-PT:3/3
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 4 | AddToughness$ 4 | AddKeyword$ Trample | CheckSVar$ X | SVarCompare$ GE4 | Description$ As long as there are four or more card types among cards exiled with CARDNAME, it gets +4/+4 and has trample.
-A:AB$ ChangeZone | Cost$ 1 | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
-SVar:X:Count$ValidExile Card.ExiledWithSource$CardTypes
-Oracle:As long as there are four or more card types among cards exiled with Keen-Eyed Curator, it gets +4/+4 and has trample.\n{1}: Exile target card from a graveyard.
\ No newline at end of file
+Name:Keen-Eyed Curator
+ManaCost:G G
+Types:Creature Raccoon Scout
+PT:3/3
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 4 | AddToughness$ 4 | AddKeyword$ Trample | CheckSVar$ X | SVarCompare$ GE4 | Description$ As long as there are four or more card types among cards exiled with CARDNAME, it gets +4/+4 and has trample.
+A:AB$ ChangeZone | Cost$ 1 | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
+SVar:X:Count$ValidExile Card.ExiledWithSource$CardTypes
+Oracle:As long as there are four or more card types among cards exiled with Keen-Eyed Curator, it gets +4/+4 and has trample.\n{1}: Exile target card from a graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/keen_eyed_raven.txt b/forge-gui/res/cardsfolder/upcoming/keen_eyed_raven.txt
index 891e815a9cb..f750b421196 100644
--- a/forge-gui/res/cardsfolder/upcoming/keen_eyed_raven.txt
+++ b/forge-gui/res/cardsfolder/upcoming/keen_eyed_raven.txt
@@ -1,9 +1,9 @@
-Name:Keen-Eyed Raven
-ManaCost:2 W
-Types:Creature Bird
-PT:2/2
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPut | TriggerDescription$ When CARDNAME enters, put a +1/+1 counter on another target creature you control.
-SVar:TrigPut:DB$ PutCounter | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | CounterType$ P1P1 | CounterNum$ 1
-DeckHas:Ability$Counters
-Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nWhen Keen-Eyed Raven enters, put a +1/+1 counter on another target creature you control.
\ No newline at end of file
+Name:Keen-Eyed Raven
+ManaCost:2 W
+Types:Creature Bird
+PT:2/2
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPut | TriggerDescription$ When CARDNAME enters, put a +1/+1 counter on another target creature you control.
+SVar:TrigPut:DB$ PutCounter | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
+Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nWhen Keen-Eyed Raven enters, put a +1/+1 counter on another target creature you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/kindlespark_duo.txt b/forge-gui/res/cardsfolder/upcoming/kindlespark_duo.txt
index f56fa1ac175..e7a535ebc8d 100644
--- a/forge-gui/res/cardsfolder/upcoming/kindlespark_duo.txt
+++ b/forge-gui/res/cardsfolder/upcoming/kindlespark_duo.txt
@@ -1,9 +1,9 @@
-Name:Kindlespark Duo
-ManaCost:2 R
-Types:Creature Lizard Otter
-PT:1/3
-A:AB$ DealDamage | Cost$ T | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target opponent.
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell, untap CARDNAME.
-SVar:TrigUntap:DB$ Untap | Defined$ Self
-SVar:BuffedBy:Card.nonLand+nonCreature
-Oracle:{T}: Kindlespark Duo deals 1 damage to target opponent.\nWhenever you cast a noncreature spell, untap Kindlespark Duo.
\ No newline at end of file
+Name:Kindlespark Duo
+ManaCost:2 R
+Types:Creature Lizard Otter
+PT:1/3
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target opponent.
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell, untap CARDNAME.
+SVar:TrigUntap:DB$ Untap | Defined$ Self
+SVar:BuffedBy:Card.nonLand+nonCreature
+Oracle:{T}: Kindlespark Duo deals 1 damage to target opponent.\nWhenever you cast a noncreature spell, untap Kindlespark Duo.
diff --git a/forge-gui/res/cardsfolder/upcoming/kitsa_otterball_elite.txt b/forge-gui/res/cardsfolder/upcoming/kitsa_otterball_elite.txt
index 7532efa6eed..0175a85f112 100644
--- a/forge-gui/res/cardsfolder/upcoming/kitsa_otterball_elite.txt
+++ b/forge-gui/res/cardsfolder/upcoming/kitsa_otterball_elite.txt
@@ -1,10 +1,10 @@
-Name:Kitsa, Otterball Elite
-ManaCost:1 U
-Types:Legendary Creature Otter Wizard
-PT:1/3
-K:Vigilance
-K:Prowess
-A:AB$ Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
-A:AB$ CopySpellAbility | Cost$ 2 T | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | TargetType$ Spell | AILogic$ OnceIfViable | MayChooseTarget$ True | IsPresent$ Card.powerGE3+Self | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy. Activate only if NICKNAME's power is 3 or greater.
-Oracle:Vigilance\nProwess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)\n{T}: Draw a card, then discard a card.\n{2}, {T}: Copy target instant or sorcery spell you control. You may choose new targets for the copy. Activate only if Kitsa's power is 3 or greater.
\ No newline at end of file
+Name:Kitsa, Otterball Elite
+ManaCost:1 U
+Types:Legendary Creature Otter Wizard
+PT:1/3
+K:Vigilance
+K:Prowess
+A:AB$ Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
+A:AB$ CopySpellAbility | Cost$ 2 T | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | TargetType$ Spell | AILogic$ OnceIfViable | MayChooseTarget$ True | IsPresent$ Card.powerGE3+Self | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy. Activate only if NICKNAME's power is 3 or greater.
+Oracle:Vigilance\nProwess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)\n{T}: Draw a card, then discard a card.\n{2}, {T}: Copy target instant or sorcery spell you control. You may choose new targets for the copy. Activate only if Kitsa's power is 3 or greater.
diff --git a/forge-gui/res/cardsfolder/upcoming/knightfisher.txt b/forge-gui/res/cardsfolder/upcoming/knightfisher.txt
index b917cfb82f8..0460460f4a2 100644
--- a/forge-gui/res/cardsfolder/upcoming/knightfisher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/knightfisher.txt
@@ -1,8 +1,8 @@
-Name:Knightfisher
-ManaCost:3 U U
-Types:Creature Bird Knight
-PT:4/5
-K:Flying
-T:Mode$ ChangesZone | ValidCard$ Bird.Other+nonToken+YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever another nontoken Bird you control enters, create a 1/1 blue Fish token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenOwner$ You
-Oracle:Flying\nWhenever another nontoken Bird you control enters, create a 1/1 blue Fish token.
\ No newline at end of file
+Name:Knightfisher
+ManaCost:3 U U
+Types:Creature Bird Knight
+PT:4/5
+K:Flying
+T:Mode$ ChangesZone | ValidCard$ Bird.Other+nonToken+YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever another nontoken Bird you control enters, create a 1/1 blue Fish token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenOwner$ You
+Oracle:Flying\nWhenever another nontoken Bird you control enters, create a 1/1 blue Fish token.
diff --git a/forge-gui/res/cardsfolder/upcoming/labyrinth_adversary.txt b/forge-gui/res/cardsfolder/upcoming/labyrinth_adversary.txt
index 089e543a6d8..3fdfc4ba4ab 100644
--- a/forge-gui/res/cardsfolder/upcoming/labyrinth_adversary.txt
+++ b/forge-gui/res/cardsfolder/upcoming/labyrinth_adversary.txt
@@ -1,9 +1,9 @@
-Name:Labyrinth Adversary
-ManaCost:3 R
-Types:Creature Minotaur
-PT:4/3
-K:Trample
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigImmediateTrig | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, you may pay {1}{R}. When you do, target creature can't block this turn.
-SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ 1 R | Execute$ TrigPump | TriggerDescription$ When you do, target creature can't block this turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | IsCurse$ True | KW$ HIDDEN CARDNAME can't block.
-Oracle:Trample (This creature can deal excess combat damage to the player it's attacking.)\nWhenever you attack, you may pay {1}{R}. When you do, target creature can't block this turn.
\ No newline at end of file
+Name:Labyrinth Adversary
+ManaCost:3 R
+Types:Creature Minotaur
+PT:4/3
+K:Trample
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigImmediateTrig | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, you may pay {1}{R}. When you do, target creature can't block this turn.
+SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ 1 R | Execute$ TrigPump | TriggerDescription$ When you do, target creature can't block this turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | IsCurse$ True | KW$ HIDDEN CARDNAME can't block.
+Oracle:Trample (This creature can deal excess combat damage to the player it's attacking.)\nWhenever you attack, you may pay {1}{R}. When you do, target creature can't block this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/layla_hassan.txt b/forge-gui/res/cardsfolder/upcoming/layla_hassan.txt
index 8128f903e6f..c9505ae9e35 100644
--- a/forge-gui/res/cardsfolder/upcoming/layla_hassan.txt
+++ b/forge-gui/res/cardsfolder/upcoming/layla_hassan.txt
@@ -1,9 +1,9 @@
-Name:Layla Hassan
-ManaCost:3 W
-Types:Legendary Creature Human Assassin
-PT:3/4
-K:First Strike
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters and whenever one or more Assassins you control deal combat damage to a player, return target historic card from your graveyard to your hand.
-T:Mode$ DamageDoneOnce | ValidSource$ Assassin.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigChangeZone | Secondary$ True | TriggerDescription$ When CARDNAME enters and whenever one or more Assassins you control deal combat damage to a player, return target historic card from your graveyard to your hand.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.Historic+YouCtrl | TgtPrompt$ Select target historic card
-Oracle:First strike\nWhen Layla Hassan enters and whenever one or more Assassins you control deal combat damage to a player, return target historic card from your graveyard to your hand.
\ No newline at end of file
+Name:Layla Hassan
+ManaCost:3 W
+Types:Legendary Creature Human Assassin
+PT:3/4
+K:First Strike
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters and whenever one or more Assassins you control deal combat damage to a player, return target historic card from your graveyard to your hand.
+T:Mode$ DamageDoneOnce | ValidSource$ Assassin.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigChangeZone | Secondary$ True | TriggerDescription$ When CARDNAME enters and whenever one or more Assassins you control deal combat damage to a player, return target historic card from your graveyard to your hand.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.Historic+YouCtrl | TgtPrompt$ Select target historic card
+Oracle:First strike\nWhen Layla Hassan enters and whenever one or more Assassins you control deal combat damage to a player, return target historic card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/leyline_of_hope.txt b/forge-gui/res/cardsfolder/upcoming/leyline_of_hope.txt
index dde7e5b33dc..e311214d38f 100644
--- a/forge-gui/res/cardsfolder/upcoming/leyline_of_hope.txt
+++ b/forge-gui/res/cardsfolder/upcoming/leyline_of_hope.txt
@@ -1,14 +1,14 @@
-Name:Leyline of Hope
-ManaCost:2 W W
-Types:Enchantment
-K:MayEffectFromOpeningHand:FromHand
-SVar:FromHand:DB$ ChangeZone | Defined$ Self | Origin$ Hand | Destination$ Battlefield | SpellDescription$ If CARDNAME is in your opening hand, you may begin the game with it on the battlefield.
-R:Event$ GainLife | ActiveZones$ Battlefield | ValidPlayer$ You | ReplaceWith$ GainLife | AILogic$ DoubleLife | Description$ If you would gain life, you gain that much life plus 1 instead.
-SVar:GainLife:DB$ ReplaceEffect | VarName$ LifeGained | VarValue$ X
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 2 | AddToughness$ 2 | CheckSVar$ Y | SVarCompare$ GEZ | Description$ As long as you have at least 7 life more than your starting life total, creatures you control get +2/+2.
-SVar:X:ReplaceCount$LifeGained/Plus.1
-SVar:Y:Count$YourLifeTotal
-SVar:Z:Count$YourStartingLife/Plus.7
-SVar:PlayMain1:True
-DeckHints:Ability$LifeGain
-Oracle:If Leyline of Hope is in your opening hand, you may begin the game with it on the battlefield.\nIf you would gain life, you gain that much life plus 1 instead.\nAs long as you have at least 7 life more than your starting life total, creatures you control get +2/+2.
\ No newline at end of file
+Name:Leyline of Hope
+ManaCost:2 W W
+Types:Enchantment
+K:MayEffectFromOpeningHand:FromHand
+SVar:FromHand:DB$ ChangeZone | Defined$ Self | Origin$ Hand | Destination$ Battlefield | SpellDescription$ If CARDNAME is in your opening hand, you may begin the game with it on the battlefield.
+R:Event$ GainLife | ActiveZones$ Battlefield | ValidPlayer$ You | ReplaceWith$ GainLife | AILogic$ DoubleLife | Description$ If you would gain life, you gain that much life plus 1 instead.
+SVar:GainLife:DB$ ReplaceEffect | VarName$ LifeGained | VarValue$ X
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 2 | AddToughness$ 2 | CheckSVar$ Y | SVarCompare$ GEZ | Description$ As long as you have at least 7 life more than your starting life total, creatures you control get +2/+2.
+SVar:X:ReplaceCount$LifeGained/Plus.1
+SVar:Y:Count$YourLifeTotal
+SVar:Z:Count$YourStartingLife/Plus.7
+SVar:PlayMain1:True
+DeckHints:Ability$LifeGain
+Oracle:If Leyline of Hope is in your opening hand, you may begin the game with it on the battlefield.\nIf you would gain life, you gain that much life plus 1 instead.\nAs long as you have at least 7 life more than your starting life total, creatures you control get +2/+2.
diff --git a/forge-gui/res/cardsfolder/upcoming/lifecreed_duo.txt b/forge-gui/res/cardsfolder/upcoming/lifecreed_duo.txt
index 0d9c2421855..c5f37ba9fa8 100644
--- a/forge-gui/res/cardsfolder/upcoming/lifecreed_duo.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lifecreed_duo.txt
@@ -1,8 +1,8 @@
-Name:Lifecreed Duo
-ManaCost:1 W
-Types:Creature Bat Bird
-PT:1/2
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever another creature you control enters, you gain 1 life.
-SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-Oracle:Flying\nWhenever another creature you control enters, you gain 1 life.
\ No newline at end of file
+Name:Lifecreed Duo
+ManaCost:1 W
+Types:Creature Bat Bird
+PT:1/2
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever another creature you control enters, you gain 1 life.
+SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+Oracle:Flying\nWhenever another creature you control enters, you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/lightshell_duo.txt b/forge-gui/res/cardsfolder/upcoming/lightshell_duo.txt
index 0b561732887..0f4bc641f27 100644
--- a/forge-gui/res/cardsfolder/upcoming/lightshell_duo.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lightshell_duo.txt
@@ -1,8 +1,8 @@
-Name:Lightshell Duo
-ManaCost:3 U
-Types:Creature Rat Otter
-PT:3/4
-K:Prowess
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters, 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
-Oracle:Prowess (Whenever you cast a noncreature spell, this creature gets+1/+1 until end of turn.)\nWhen Lightshell Duo enters, 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.)
\ No newline at end of file
+Name:Lightshell Duo
+ManaCost:3 U
+Types:Creature Rat Otter
+PT:3/4
+K:Prowess
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters, 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
+Oracle:Prowess (Whenever you cast a noncreature spell, this creature gets+1/+1 until end of turn.)\nWhen Lightshell Duo enters, 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.)
diff --git a/forge-gui/res/cardsfolder/upcoming/lilypad_village.txt b/forge-gui/res/cardsfolder/upcoming/lilypad_village.txt
index 64e3fdff19f..2e8b12194e2 100644
--- a/forge-gui/res/cardsfolder/upcoming/lilypad_village.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lilypad_village.txt
@@ -1,8 +1,8 @@
-Name:Lilypad Village
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ T | Produced$ U | RestrictValid$ Spell.Creature | SpellDescription$ Add {U}. Spend this mana only to cast a creature spell.
-A:AB$ Surveil | Cost$ U T | Amount$ 2 | CheckSVar$ X | SVarCompare$ GE1 | SpellDescription$ Surveil 2. Activate only if a Bird, Frog, Otter, or Rat entered the battlefield under your control this turn.
-SVar:X:Count$ThisTurnEntered_Battlefield_Frog.YouCtrl,Bird.YouCtrl,Otter.YouCtrl,Rat.YouCtrl
-Oracle:{T}: Add {C}.\n{T}: Add {U}. Spend this mana only to cast a creature spell.\n {U}, {T}: Surveil 2. Activate only if a Bird, Frog, Otter, or Rat entered the battlefield under your control this turn.
\ No newline at end of file
+Name:Lilypad Village
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ U | RestrictValid$ Spell.Creature | SpellDescription$ Add {U}. Spend this mana only to cast a creature spell.
+A:AB$ Surveil | Cost$ U T | Amount$ 2 | CheckSVar$ X | SVarCompare$ GE1 | SpellDescription$ Surveil 2. Activate only if a Bird, Frog, Otter, or Rat entered the battlefield under your control this turn.
+SVar:X:Count$ThisTurnEntered_Battlefield_Frog.YouCtrl,Bird.YouCtrl,Otter.YouCtrl,Rat.YouCtrl
+Oracle:{T}: Add {C}.\n{T}: Add {U}. Spend this mana only to cast a creature spell.\n {U}, {T}: Surveil 2. Activate only if a Bird, Frog, Otter, or Rat entered the battlefield under your control this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/lilysplash_mentor.txt b/forge-gui/res/cardsfolder/upcoming/lilysplash_mentor.txt
index 683f91a8c62..3fff4efd021 100644
--- a/forge-gui/res/cardsfolder/upcoming/lilysplash_mentor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lilysplash_mentor.txt
@@ -1,9 +1,9 @@
-Name:Lilysplash Mentor
-ManaCost:2 G U
-Types:Creature Frog Druid
-PT:4/4
-K:Reach
-A:AB$ ChangeZone | Cost$ 1 G U | ValidTgts$ Creature.Other+YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select another target creature you control | RememberChanged$ True | SorcerySpeed$ True | SubAbility$ DBReturn | SpellDescription$ Exile another target creature you control, then return it to the battlefield under its owner's control with a +1/+1 counter on it. Activate only as a sorcery.
-SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Destination$ Battlefield | WithCountersType$ P1P1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Reach\n{1}{G}{U}: Exile another target creature you control, then return it to the battlefield under its owner's control with a +1/+1 counter on it. Activate only as a sorcery.
\ No newline at end of file
+Name:Lilysplash Mentor
+ManaCost:2 G U
+Types:Creature Frog Druid
+PT:4/4
+K:Reach
+A:AB$ ChangeZone | Cost$ 1 G U | ValidTgts$ Creature.Other+YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select another target creature you control | RememberChanged$ True | SorcerySpeed$ True | SubAbility$ DBReturn | SpellDescription$ Exile another target creature you control, then return it to the battlefield under its owner's control with a +1/+1 counter on it. Activate only as a sorcery.
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Destination$ Battlefield | WithCountersType$ P1P1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Reach\n{1}{G}{U}: Exile another target creature you control, then return it to the battlefield under its owner's control with a +1/+1 counter on it. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/long_river_lurker.txt b/forge-gui/res/cardsfolder/upcoming/long_river_lurker.txt
index 2b9445fa152..f2e1c62ee89 100644
--- a/forge-gui/res/cardsfolder/upcoming/long_river_lurker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/long_river_lurker.txt
@@ -1,14 +1,14 @@
-Name:Long River Lurker
-ManaCost:2 U
-Types:Creature Frog Scout
-PT:2/3
-K:Ward:1
-S:Mode$ Continuous | Affected$ Frog.YouCtrl+Other | AddKeyword$ Ward:1 | Description$ Other Frogs you control have ward {1}.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigUnblockable | TriggerDescription$ When CARDNAME enters, target creature you control can't be blocked this turn. Whenever that creature deals combat damage this turn, you may exile it. If you do, return it to the battlefield under its owner's control.
-SVar:TrigUnblockable:DB$ Effect | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | Triggers$ TrigDamage
-SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
-SVar:TrigDamage:Mode$ DamageDealtOnce | ValidSource$ Creature.IsRemembered | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Whenever this creature deals combat damage this turn, you may exile it. If you do, return it to the battlefield under its owner's control.
-SVar:TrigExile:DB$ ChangeZone | Defined$ Remembered | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Ward {1}\nOther Frogs you control have ward {1}.\nWhen Long River Lurker enters, target creature you control can't be blocked this turn. Whenever that creature deals combat damage this turn, you may exile it. If you do, return it to the battlefield under its owner's control.
+Name:Long River Lurker
+ManaCost:2 U
+Types:Creature Frog Scout
+PT:2/3
+K:Ward:1
+S:Mode$ Continuous | Affected$ Frog.YouCtrl+Other | AddKeyword$ Ward:1 | Description$ Other Frogs you control have ward {1}.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigUnblockable | TriggerDescription$ When CARDNAME enters, target creature you control can't be blocked this turn. Whenever that creature deals combat damage this turn, you may exile it. If you do, return it to the battlefield under its owner's control.
+SVar:TrigUnblockable:DB$ Effect | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | Triggers$ TrigDamage
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
+SVar:TrigDamage:Mode$ DamageDealtOnce | ValidSource$ Creature.IsRemembered | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Whenever this creature deals combat damage this turn, you may exile it. If you do, return it to the battlefield under its owner's control.
+SVar:TrigExile:DB$ ChangeZone | Defined$ Remembered | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Ward {1}\nOther Frogs you control have ward {1}.\nWhen Long River Lurker enters, target creature you control can't be blocked this turn. Whenever that creature deals combat damage this turn, you may exile it. If you do, return it to the battlefield under its owner's control.
diff --git a/forge-gui/res/cardsfolder/upcoming/long_rivers_pull.txt b/forge-gui/res/cardsfolder/upcoming/long_rivers_pull.txt
index ad34788b695..57689ffe434 100644
--- a/forge-gui/res/cardsfolder/upcoming/long_rivers_pull.txt
+++ b/forge-gui/res/cardsfolder/upcoming/long_rivers_pull.txt
@@ -1,10 +1,10 @@
-Name:Long River's Pull
-ManaCost:U U
-Types:Instant
-K:Gift
-SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
-A:SP$ Counter | TargetType$ Spell | TgtPrompt$ Select target creature spell | ValidTgts$ Creature | TargetMin$ X | TargetMax$ X | SubAbility$ DBCounter | SpellDescription$ Counter target creature spell. If the gift was promised, instead counter target spell.
-SVar:DBCounter:DB$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | TargetMin$ Y | TargetMax$ Y
-SVar:X:Count$Compare Y EQ1.0.1
-SVar:Y: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.)\nCounter target creature spell. If the gift was promised, instead counter target spell.
\ No newline at end of file
+Name:Long River's Pull
+ManaCost:U U
+Types:Instant
+K:Gift
+SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
+A:SP$ Counter | TargetType$ Spell | TgtPrompt$ Select target creature spell | ValidTgts$ Creature | TargetMin$ X | TargetMax$ X | SubAbility$ DBCounter | SpellDescription$ Counter target creature spell. If the gift was promised, instead counter target spell.
+SVar:DBCounter:DB$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | TargetMin$ Y | TargetMax$ Y
+SVar:X:Count$Compare Y EQ1.0.1
+SVar:Y: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.)\nCounter target creature spell. If the gift was promised, instead counter target spell.
diff --git a/forge-gui/res/cardsfolder/upcoming/longstalk_brawl.txt b/forge-gui/res/cardsfolder/upcoming/longstalk_brawl.txt
index 615a91ebed6..9bce00e9310 100644
--- a/forge-gui/res/cardsfolder/upcoming/longstalk_brawl.txt
+++ b/forge-gui/res/cardsfolder/upcoming/longstalk_brawl.txt
@@ -1,8 +1,8 @@
-Name:Longstalk Brawl
-ManaCost:G
-Types:Sorcery
-K:Gift
-SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenTapped$ True | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ a tapped Fish
-A:SP$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBFight | SpellDescription$ Choose target creature you control and target creature you don't control. Put a +1/+1 counter on the creature you control if the gift was promised. Then those creatures fight each other.
-SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Choose target creature you don't control
-Oracle:Gift a tapped Fish (You may promise an opponent a gift as you cast this spell. If you do, they create a tapped 1/1 blue Fish creature token before its other effects.)\nChoose target creature you control and target creature you don't control. Put a +1/+1 counter on the creature you control if the gift was promised. Then those creatures fight each other.
+Name:Longstalk Brawl
+ManaCost:G
+Types:Sorcery
+K:Gift
+SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenTapped$ True | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ a tapped Fish
+A:SP$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBFight | SpellDescription$ Choose target creature you control and target creature you don't control. Put a +1/+1 counter on the creature you control if the gift was promised. Then those creatures fight each other.
+SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Choose target creature you don't control
+Oracle:Gift a tapped Fish (You may promise an opponent a gift as you cast this spell. If you do, they create a tapped 1/1 blue Fish creature token before its other effects.)\nChoose target creature you control and target creature you don't control. Put a +1/+1 counter on the creature you control if the gift was promised. Then those creatures fight each other.
diff --git a/forge-gui/res/cardsfolder/upcoming/lunar_convocation.txt b/forge-gui/res/cardsfolder/upcoming/lunar_convocation.txt
index da10f46229f..b37f95e6706 100644
--- a/forge-gui/res/cardsfolder/upcoming/lunar_convocation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lunar_convocation.txt
@@ -1,13 +1,13 @@
-Name:Lunar Convocation
-ManaCost:W B
-Types:Enchantment
-T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | ValidPlayer$ You | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your end step, if you gained life this turn, each opponent loses 1 life.
-SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1
-T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | ValidPlayer$ You | CheckSVar$ Y | SVarCompare$ GE1 | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, if you gained and lost life this turn, create a 1/1 black Bat creature token with flying.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_bat_flying | TokenOwner$ You
-A:AB$ Draw | Cost$ 1 B PayLife<2> | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:X:Count$LifeYouGainedThisTurn
-SVar:Y:PlayerCountPropertyYou$LifeLostThisTurn/Times.X
-DeckNeeds:Ability$LifeGain
-AI:RemoveDeck:Random
-Oracle:At the beginning of your end step, if you gained life this turn, each opponent loses 1 life.\nAt the beginning of your end step, if you gained and lost life this turn, create a 1/1 black Bat creature token with flying.\n{1}{B}, Pay 2 life: Draw a card.
+Name:Lunar Convocation
+ManaCost:W B
+Types:Enchantment
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | ValidPlayer$ You | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your end step, if you gained life this turn, each opponent loses 1 life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | ValidPlayer$ You | CheckSVar$ Y | SVarCompare$ GE1 | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, if you gained and lost life this turn, create a 1/1 black Bat creature token with flying.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_bat_flying | TokenOwner$ You
+A:AB$ Draw | Cost$ 1 B PayLife<2> | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:X:Count$LifeYouGainedThisTurn
+SVar:Y:PlayerCountPropertyYou$LifeLostThisTurn/Times.X
+DeckNeeds:Ability$LifeGain
+AI:RemoveDeck:Random
+Oracle:At the beginning of your end step, if you gained life this turn, each opponent loses 1 life.\nAt the beginning of your end step, if you gained and lost life this turn, create a 1/1 black Bat creature token with flying.\n{1}{B}, Pay 2 life: Draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/lupinflower_village.txt b/forge-gui/res/cardsfolder/upcoming/lupinflower_village.txt
index 70cebfb8869..1eea073c3f1 100644
--- a/forge-gui/res/cardsfolder/upcoming/lupinflower_village.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lupinflower_village.txt
@@ -1,7 +1,7 @@
-Name:Lupinflower Village
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ T | Produced$ W | RestrictValid$ Spell.Creature | SpellDescription$ Add {W}. Spend this mana only to cast a creature spell.
-A:AB$ Dig | Cost$ 1 W T Sac<1/CARDNAME> | DigNum$ 6 | ChangeNum$ 1 | ChangeValid$ Bat,Bird,Mouse,Rabbit | Optional$ True | RestRandomOrder$ True | SpellDescription$ Look at the top six cards of your library. You may reveal a Bat, Bird, Mouse, or Rabbit card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
-Oracle:{T}: Add {C}.\n{T}: Add {W}. Spend this mana only to cast a creature spell.\n{1}{W}, {T}, Sacrifice Lupinflower Village: Look at the top six cards of your library. You may reveal a Bat, Bird, Mouse, or Rabbit card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+Name:Lupinflower Village
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | RestrictValid$ Spell.Creature | SpellDescription$ Add {W}. Spend this mana only to cast a creature spell.
+A:AB$ Dig | Cost$ 1 W T Sac<1/CARDNAME> | DigNum$ 6 | ChangeNum$ 1 | ChangeValid$ Bat,Bird,Mouse,Rabbit | Optional$ True | RestRandomOrder$ True | SpellDescription$ Look at the top six cards of your library. You may reveal a Bat, Bird, Mouse, or Rabbit card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+Oracle:{T}: Add {C}.\n{T}: Add {W}. Spend this mana only to cast a creature spell.\n{1}{W}, {T}, Sacrifice Lupinflower Village: Look at the top six cards of your library. You may reveal a Bat, Bird, Mouse, or Rabbit card from among them and 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/lydia_frye.txt b/forge-gui/res/cardsfolder/upcoming/lydia_frye.txt
index 89804811d71..4d3dbeead62 100644
--- a/forge-gui/res/cardsfolder/upcoming/lydia_frye.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lydia_frye.txt
@@ -1,9 +1,9 @@
-Name:Lydia Frye
-ManaCost:2 UB
-Types:Legendary Creature Human Assassin
-PT:3/2
-S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.powerGE3 | Description$ CARDNAME can't be blocked by creatures with power 3 or greater.
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your end step, surveil X, where X is the number of tapped Assassins you control. (Look at the top X 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 | Amount$ X
-SVar:X:Count$Valid Assassin.YouCtrl+tapped
-Oracle:Lydia Frye can't be blocked by creatures with power 3 or greater.\nAt the beginning of your end step, surveil X, where X is the number of tapped Assassins you control. (Look at the top X cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
\ No newline at end of file
+Name:Lydia Frye
+ManaCost:2 UB
+Types:Legendary Creature Human Assassin
+PT:3/2
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.powerGE3 | Description$ CARDNAME can't be blocked by creatures with power 3 or greater.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your end step, surveil X, where X is the number of tapped Assassins you control. (Look at the top X 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 | Amount$ X
+SVar:X:Count$Valid Assassin.YouCtrl+tapped
+Oracle:Lydia Frye can't be blocked by creatures with power 3 or greater.\nAt the beginning of your end step, surveil X, where X is the number of tapped Assassins you control. (Look at the top X cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/upcoming/mabels_mettle.txt b/forge-gui/res/cardsfolder/upcoming/mabels_mettle.txt
index 199780b41e1..d094b8b5444 100644
--- a/forge-gui/res/cardsfolder/upcoming/mabels_mettle.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mabels_mettle.txt
@@ -1,6 +1,6 @@
-Name:Mabel's Mettle
-ManaCost:1 W
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature to get +2/+2 | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBPump | SpellDescription$ Target creature gets +2/+2 until end of turn. Up to one other target creature gets +1/+1 until end of turn.
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select up to one other target creature to get +1/+1 | TargetMin$ 0 | TargetMax$ 1 | NumAtt$ 1 | NumDef$ 1 | TargetUnique$ True
-Oracle:Target creature gets +2/+2 until end of turn. Up to one other target creature gets +1/+1 until end of turn.
\ No newline at end of file
+Name:Mabel's Mettle
+ManaCost:1 W
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature to get +2/+2 | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBPump | SpellDescription$ Target creature gets +2/+2 until end of turn. Up to one other target creature gets +1/+1 until end of turn.
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select up to one other target creature to get +1/+1 | TargetMin$ 0 | TargetMax$ 1 | NumAtt$ 1 | NumDef$ 1 | TargetUnique$ True
+Oracle:Target creature gets +2/+2 until end of turn. Up to one other target creature gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/maha_its_feathers_night.txt b/forge-gui/res/cardsfolder/upcoming/maha_its_feathers_night.txt
index 51cd3a53145..6950a1f89ce 100644
--- a/forge-gui/res/cardsfolder/upcoming/maha_its_feathers_night.txt
+++ b/forge-gui/res/cardsfolder/upcoming/maha_its_feathers_night.txt
@@ -1,9 +1,9 @@
-Name:Maha, Its Feathers Night
-ManaCost:3 B B
-Types:Legendary Creature Elemental Bird
-PT:6/5
-K:Flying
-K:Trample
-K:Ward:Discard<1/Card>
-S:Mode$ Continuous | Affected$ Creature.OppCtrl | SetToughness$ 1 | Description$ Creatures your opponents control have base toughness 1.
-Oracle:Flying, trample\nWard—Discard a card.\nCreatures your opponents control have base toughness 1.
\ No newline at end of file
+Name:Maha, Its Feathers Night
+ManaCost:3 B B
+Types:Legendary Creature Elemental Bird
+PT:6/5
+K:Flying
+K:Trample
+K:Ward:Discard<1/Card>
+S:Mode$ Continuous | Affected$ Creature.OppCtrl | SetToughness$ 1 | Description$ Creatures your opponents control have base toughness 1.
+Oracle:Flying, trample\nWard—Discard a card.\nCreatures your opponents control have base toughness 1.
diff --git a/forge-gui/res/cardsfolder/upcoming/manifold_mouse.txt b/forge-gui/res/cardsfolder/upcoming/manifold_mouse.txt
index 2fc6341a7c1..4acce09fcd7 100644
--- a/forge-gui/res/cardsfolder/upcoming/manifold_mouse.txt
+++ b/forge-gui/res/cardsfolder/upcoming/manifold_mouse.txt
@@ -1,9 +1,9 @@
-Name:Manifold Mouse
-ManaCost:1 R
-Types:Creature Mouse Soldier
-PT:1/2
-K:Offspring:2
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, target Mouse you control gains your choice of double strike or trample until end of turn.
-SVar:TrigPump:DB$ Pump | KWChoice$ Double Strike,Trample | ValidTgts$ Mouse.YouCtrl | TgtPrompt$ Select target Mouse you control
-SVar:PlayMain1:TRUE
-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.)\nAt the beginning of combat on your turn, target Mouse you control gains your choice of double strike or trample until end of turn.
\ No newline at end of file
+Name:Manifold Mouse
+ManaCost:1 R
+Types:Creature Mouse Soldier
+PT:1/2
+K:Offspring:2
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, target Mouse you control gains your choice of double strike or trample until end of turn.
+SVar:TrigPump:DB$ Pump | KWChoice$ Double Strike,Trample | ValidTgts$ Mouse.YouCtrl | TgtPrompt$ Select target Mouse you control
+SVar:PlayMain1:TRUE
+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.)\nAt the beginning of combat on your turn, target Mouse you control gains your choice of double strike or trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/mary_read_and_anne_bonny.txt b/forge-gui/res/cardsfolder/upcoming/mary_read_and_anne_bonny.txt
index 720530de31a..bc38fed99ac 100644
--- a/forge-gui/res/cardsfolder/upcoming/mary_read_and_anne_bonny.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mary_read_and_anne_bonny.txt
@@ -1,10 +1,10 @@
-Name:Mary Read and Anne Bonny
-ManaCost:1 U R
-Types:Legendary Creature Human Assassin Pirate
-PT:3/3
-K:Haste
-A:AB$ Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
-T:Mode$ Discarded | ValidCard$ Island.YouCtrl,Pirate.YouCtrl,Vehicle.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you discard an Island, Pirate, or Vehicle card, create a tapped Treasure token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | TokenTapped$ True
-Oracle:Haste\n{T}: Draw a card, then discard a card.\nWhenever you discard an Island, Pirate, or Vehicle card, create a tapped Treasure token.
+Name:Mary Read and Anne Bonny
+ManaCost:1 U R
+Types:Legendary Creature Human Assassin Pirate
+PT:3/3
+K:Haste
+A:AB$ Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
+T:Mode$ Discarded | ValidCard$ Island.YouCtrl,Pirate.YouCtrl,Vehicle.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you discard an Island, Pirate, or Vehicle card, create a tapped Treasure token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | TokenTapped$ True
+Oracle:Haste\n{T}: Draw a card, then discard a card.\nWhenever you discard an Island, Pirate, or Vehicle card, create a tapped Treasure token.
diff --git a/forge-gui/res/cardsfolder/upcoming/merciless_harlequin.txt b/forge-gui/res/cardsfolder/upcoming/merciless_harlequin.txt
index 8534e7ac7f7..0d6c52c28e0 100644
--- a/forge-gui/res/cardsfolder/upcoming/merciless_harlequin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/merciless_harlequin.txt
@@ -1,9 +1,9 @@
-Name:Merciless Harlequin
-ManaCost:2 B
-Types:Creature Human Assassin
-PT:2/1
-K:Freerunning:1 B
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you draw a card and you lose 1 life.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
-Oracle:Freerunning {1}{B} (You may cast this spell for its freerunning cost if you dealt combat damage to a player this turn with an Assassin or commander.)\nWhen Merciless Harlequin enters, you draw a card and you lose 1 life.
+Name:Merciless Harlequin
+ManaCost:2 B
+Types:Creature Human Assassin
+PT:2/1
+K:Freerunning:1 B
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you draw a card and you lose 1 life.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
+Oracle:Freerunning {1}{B} (You may cast this spell for its freerunning cost if you dealt combat damage to a player this turn with an Assassin or commander.)\nWhen Merciless Harlequin enters, you draw a card and you lose 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/might_of_the_meek.txt b/forge-gui/res/cardsfolder/upcoming/might_of_the_meek.txt
index 4aface0ef89..d8f8231f1eb 100644
--- a/forge-gui/res/cardsfolder/upcoming/might_of_the_meek.txt
+++ b/forge-gui/res/cardsfolder/upcoming/might_of_the_meek.txt
@@ -1,7 +1,7 @@
-Name:Might of the Meek
-ManaCost:R
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Trample | SubAbility$ DBPump | SpellDescription$ Target creature gains trample until end of turn. It also gets +1/+0 until end of turn if you control a Mouse. Draw a card.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | NumAtt$ +1 | ConditionPresent$ Mouse.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Mouse. | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
-Oracle:Target creature gains trample until end of turn. It also gets +1/+0 until end of turn if you control a Mouse.\nDraw a card.
\ No newline at end of file
+Name:Might of the Meek
+ManaCost:R
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Trample | SubAbility$ DBPump | SpellDescription$ Target creature gains trample until end of turn. It also gets +1/+0 until end of turn if you control a Mouse. Draw a card.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | NumAtt$ +1 | ConditionPresent$ Mouse.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Mouse. | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
+Oracle:Target creature gains trample until end of turn. It also gets +1/+0 until end of turn if you control a Mouse.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/mind_drill_assailant.txt b/forge-gui/res/cardsfolder/upcoming/mind_drill_assailant.txt
index 2e21142a566..4a7168706f4 100644
--- a/forge-gui/res/cardsfolder/upcoming/mind_drill_assailant.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mind_drill_assailant.txt
@@ -1,8 +1,8 @@
-Name:Mind Drill Assailant
-ManaCost:2 UB UB
-Types:Creature Rat Warlock
-PT:2/5
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | CheckSVar$ X | SVarCompare$ GE7 | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +3/+0.
-A:AB$ Surveil | Cost$ 2 UB | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
-SVar:X:Count$InYourYard
-Oracle:Threshold — As long as seven or more cards are in your graveyard, Mind Drill Assailant gets +3/+0.\n{2}{U/B}: Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+Name:Mind Drill Assailant
+ManaCost:2 UB UB
+Types:Creature Rat Warlock
+PT:2/5
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | CheckSVar$ X | SVarCompare$ GE7 | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +3/+0.
+A:AB$ Surveil | Cost$ 2 UB | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+SVar:X:Count$InYourYard
+Oracle:Threshold — As long as seven or more cards are in your graveyard, Mind Drill Assailant gets +3/+0.\n{2}{U/B}: Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/upcoming/mind_spiral.txt b/forge-gui/res/cardsfolder/upcoming/mind_spiral.txt
index e345e7bc7a9..e8feae99281 100644
--- a/forge-gui/res/cardsfolder/upcoming/mind_spiral.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mind_spiral.txt
@@ -1,11 +1,11 @@
-Name:Mind Spiral
-ManaCost:4 U
-Types:Sorcery
-K:Gift
-SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenTapped$ True | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ a tapped Fish
-A:SP$ Draw | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Select target player | SubAbility$ DBTap | SpellDescription$ Target player draws three cards. If the gift was promised, tap target creature an opponent controls and put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
-SVar:DBTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TargetMin$ X | TargetMax$ X | SubAbility$ DBCounter
-SVar:DBCounter:DB$ PutCounter | Defined$ ParentTarget | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | CounterType$ Stun | CounterNum$ 1
-SVar:X:Count$ValidStack Card.Self+PromisedGift
-DeckHas:Ability$Counters
-Oracle:Gift a tapped Fish (You may promise an opponent a gift as you cast this spell. If you do, they create a tapped 1/1 blue Fish creature token before its other effects.)\nTarget player draws three cards. If the gift was promised, tap target creature an opponent controls and put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+Name:Mind Spiral
+ManaCost:4 U
+Types:Sorcery
+K:Gift
+SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenTapped$ True | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ a tapped Fish
+A:SP$ Draw | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Select target player | SubAbility$ DBTap | SpellDescription$ Target player draws three cards. If the gift was promised, tap target creature an opponent controls and put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+SVar:DBTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TargetMin$ X | TargetMax$ X | SubAbility$ DBCounter
+SVar:DBCounter:DB$ PutCounter | Defined$ ParentTarget | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | CounterType$ Stun | CounterNum$ 1
+SVar:X:Count$ValidStack Card.Self+PromisedGift
+DeckHas:Ability$Counters
+Oracle:Gift a tapped Fish (You may promise an opponent a gift as you cast this spell. If you do, they create a tapped 1/1 blue Fish creature token before its other effects.)\nTarget player draws three cards. If the gift was promised, tap target creature an opponent controls and put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
diff --git a/forge-gui/res/cardsfolder/upcoming/mindwhisker.txt b/forge-gui/res/cardsfolder/upcoming/mindwhisker.txt
index 6c039276273..21968b5bb45 100644
--- a/forge-gui/res/cardsfolder/upcoming/mindwhisker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mindwhisker.txt
@@ -1,11 +1,11 @@
-Name:Mindwhisker
-ManaCost:2 U
-Types:Creature Rat Wizard
-PT:3/2
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
-SVar:TrigSurveil:DB$ Surveil | Amount$ 1
-S:Mode$ Continuous | Affected$ Creature.OppCtrl | Condition$ Threshold | AddPower$ -1 | Description$ Threshold — As long as seven or more cards are in your graveyard, creatures your opponents control get -1/-0.
-SVar:PlayMain1:TRUE
-DeckHas:Ability$Graveyard|Surveil
-DeckHints:Ability$Graveyard
-Oracle:At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)\nThreshold — As long as seven or more cards are in your graveyard, creatures your opponents control get -1/-0.
+Name:Mindwhisker
+ManaCost:2 U
+Types:Creature Rat Wizard
+PT:3/2
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
+SVar:TrigSurveil:DB$ Surveil | Amount$ 1
+S:Mode$ Continuous | Affected$ Creature.OppCtrl | Condition$ Threshold | AddPower$ -1 | Description$ Threshold — As long as seven or more cards are in your graveyard, creatures your opponents control get -1/-0.
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Graveyard|Surveil
+DeckHints:Ability$Graveyard
+Oracle:At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)\nThreshold — As long as seven or more cards are in your graveyard, creatures your opponents control get -1/-0.
diff --git a/forge-gui/res/cardsfolder/upcoming/mistbreath_elder.txt b/forge-gui/res/cardsfolder/upcoming/mistbreath_elder.txt
index 4a146ebd1f0..0420ba427de 100644
--- a/forge-gui/res/cardsfolder/upcoming/mistbreath_elder.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mistbreath_elder.txt
@@ -1,12 +1,12 @@
-Name:Mistbreath Elder
-ManaCost:G
-Types:Creature Frog Warrior
-PT:2/2
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ At the beginning of your upkeep, return another creature you control to its owner's hand. If you do, put a +1/+1 counter on CARDNAME. Otherwise, you may return CARDNAME to its owner's hand.
-SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ChangeType$ Creature.StrictlyOther+YouCtrl | ChangeNum$ 1 | Mandatory$ True | Hidden$ True | RememberChanged$ True | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBChangeZone
+Name:Mistbreath Elder
+ManaCost:G
+Types:Creature Frog Warrior
+PT:2/2
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ At the beginning of your upkeep, return another creature you control to its owner's hand. If you do, put a +1/+1 counter on CARDNAME. Otherwise, you may return CARDNAME to its owner's hand.
+SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ChangeType$ Creature.StrictlyOther+YouCtrl | ChangeNum$ 1 | Mandatory$ True | Hidden$ True | RememberChanged$ True | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ LE0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$Amount
-AI:RemoveDeck:All
-Oracle:At the beginning of your upkeep, return another creature you control to its owner's hand. If you do, put a +1/+1 counter on Mistbreath Elder. Otherwise, you may return Mistbreath Elder to its owner's hand.
+SVar:X:Remembered$Amount
+AI:RemoveDeck:All
+Oracle:At the beginning of your upkeep, return another creature you control to its owner's hand. If you do, put a +1/+1 counter on Mistbreath Elder. Otherwise, you may return Mistbreath Elder to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/misthioss_fury.txt b/forge-gui/res/cardsfolder/upcoming/misthioss_fury.txt
index 55cc44d1ece..0769ebd475b 100644
--- a/forge-gui/res/cardsfolder/upcoming/misthioss_fury.txt
+++ b/forge-gui/res/cardsfolder/upcoming/misthioss_fury.txt
@@ -1,6 +1,6 @@
-Name:Misthios's Fury
-ManaCost:1 R
-Types:Instant
-A:SP$ DealDamage | NumDmg$ 3 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 3 damage to target creature. If you control an Equipment, CARDNAME also deals 2 damage to that creature's controller.
-SVar:DBDamage:DB$ DealDamage | Defined$ TargetedController | NumDmg$ 2 | ConditionPresent$ Equipment.YouCtrl | ConditionCompare$ GE1
-Oracle:Misthios's Fury deals 3 damage to target creature. If you control an Equipment, Misthios's Fury also deals 2 damage to that creature's controller.
+Name:Misthios's Fury
+ManaCost:1 R
+Types:Instant
+A:SP$ DealDamage | NumDmg$ 3 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 3 damage to target creature. If you control an Equipment, CARDNAME also deals 2 damage to that creature's controller.
+SVar:DBDamage:DB$ DealDamage | Defined$ TargetedController | NumDmg$ 2 | ConditionPresent$ Equipment.YouCtrl | ConditionCompare$ GE1
+Oracle:Misthios's Fury deals 3 damage to target creature. If you control an Equipment, Misthios's Fury also deals 2 damage to that creature's controller.
diff --git a/forge-gui/res/cardsfolder/upcoming/mjolnir_storm_hammer.txt b/forge-gui/res/cardsfolder/upcoming/mjolnir_storm_hammer.txt
index 7876b84df8e..a4d7837ab69 100644
--- a/forge-gui/res/cardsfolder/upcoming/mjolnir_storm_hammer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mjolnir_storm_hammer.txt
@@ -1,14 +1,14 @@
-Name:Mjölnir, Storm Hammer
-ManaCost:4
-Types:Legendary Artifact Equipment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When NICKNAME enters, attach it to target legendary creature you control.
-SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.Legendary+YouCtrl | TgtPrompt$ Select target creature you control
-T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigTap | TriggerDescription$ Whenever equipped creature attacks, tap target creature defending player controls and put a stun counter on it. Then NICKNAME deals damage to each opponent equal to the number of tapped creatures that opponent controls.
-SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.ControlledBy TriggeredDefendingPlayer | SubAbility$ DBCounter | TgtPrompt$ Select target creature defending player controls
-SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1 | SubAbility$ DBRepeat
-SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBDmg | DamageMap$ True
-SVar:DBDmg:DB$ DealDamage | Defined$ Player.IsRemembered | NumDmg$ X
-SVar:X:Count$Valid Creature.RememberedPlayerCtrl+tapped
-K:Equip:4
-DeckHas:Ability$Counters
-Oracle:When Mjölnir enters, attach it to target legendary creature you control.\nWhenever equipped creature attacks, tap target creature defending player controls and put a stun counter on it. Then Mjölnir deals damage to each opponent equal to the number of tapped creatures that opponent controls.\nEquip {4}
\ No newline at end of file
+Name:Mjölnir, Storm Hammer
+ManaCost:4
+Types:Legendary Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When NICKNAME enters, attach it to target legendary creature you control.
+SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.Legendary+YouCtrl | TgtPrompt$ Select target creature you control
+T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigTap | TriggerDescription$ Whenever equipped creature attacks, tap target creature defending player controls and put a stun counter on it. Then NICKNAME deals damage to each opponent equal to the number of tapped creatures that opponent controls.
+SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.ControlledBy TriggeredDefendingPlayer | SubAbility$ DBCounter | TgtPrompt$ Select target creature defending player controls
+SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1 | SubAbility$ DBRepeat
+SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBDmg | DamageMap$ True
+SVar:DBDmg:DB$ DealDamage | Defined$ Player.IsRemembered | NumDmg$ X
+SVar:X:Count$Valid Creature.RememberedPlayerCtrl+tapped
+K:Equip:4
+DeckHas:Ability$Counters
+Oracle:When Mjölnir enters, attach it to target legendary creature you control.\nWhenever equipped creature attacks, tap target creature defending player controls and put a stun counter on it. Then Mjölnir deals damage to each opponent equal to the number of tapped creatures that opponent controls.\nEquip {4}
diff --git a/forge-gui/res/cardsfolder/upcoming/mockingbird.txt b/forge-gui/res/cardsfolder/upcoming/mockingbird.txt
index 11552b6785c..29f79828fc0 100644
--- a/forge-gui/res/cardsfolder/upcoming/mockingbird.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mockingbird.txt
@@ -1,10 +1,10 @@
-Name:Mockingbird
-ManaCost:X U
-Types:Creature Bird Bard
-PT:1/1
-K:Flying
-K:ETBReplacement:Copy:DBCopy:Optional
-SVar:DBCopy:DB$ Clone | Choices$ Creature.Other+cmcLEY | AddTypes$ Bird | AddKeywords$ Flying | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield with mana value less than or equal to the amount of mana spent to cast CARDNAME, except it's a Bird in addition to its other types and it has flying.
-SVar:X:Count$xPaid
-SVar:Y:Count$CastTotalManaSpent
-Oracle:Flying\nYou may have Mockingbird enter the battlefield as a copy of any creature on the battlefield with mana value less than or equal to the amount of mana spent to cast Mockingbird, except it's a Bird in addition to its other types and it has flying.
\ No newline at end of file
+Name:Mockingbird
+ManaCost:X U
+Types:Creature Bird Bard
+PT:1/1
+K:Flying
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other+cmcLEY | AddTypes$ Bird | AddKeywords$ Flying | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield with mana value less than or equal to the amount of mana spent to cast CARDNAME, except it's a Bird in addition to its other types and it has flying.
+SVar:X:Count$xPaid
+SVar:Y:Count$CastTotalManaSpent
+Oracle:Flying\nYou may have Mockingbird enter the battlefield as a copy of any creature on the battlefield with mana value less than or equal to the amount of mana spent to cast Mockingbird, except it's a Bird in addition to its other types and it has flying.
diff --git a/forge-gui/res/cardsfolder/upcoming/moonrise_cleric.txt b/forge-gui/res/cardsfolder/upcoming/moonrise_cleric.txt
index f580d5672d1..6877e2f4d0e 100644
--- a/forge-gui/res/cardsfolder/upcoming/moonrise_cleric.txt
+++ b/forge-gui/res/cardsfolder/upcoming/moonrise_cleric.txt
@@ -1,9 +1,9 @@
-Name:Moonrise Cleric
-ManaCost:1 WB WB
-Types:Creature Bat Cleric
-PT:2/3
-K:Flying
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME attacks, you gain 1 life.
-SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-DeckHas:Ability$LifeGain
-Oracle:Flying\nWhenever Moonrise Cleric attacks, you gain 1 life.
\ No newline at end of file
+Name:Moonrise Cleric
+ManaCost:1 WB WB
+Types:Creature Bat Cleric
+PT:2/3
+K:Flying
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME attacks, you gain 1 life.
+SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+DeckHas:Ability$LifeGain
+Oracle:Flying\nWhenever Moonrise Cleric attacks, you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/moonstone_eulogist.txt b/forge-gui/res/cardsfolder/upcoming/moonstone_eulogist.txt
index afcd247eb29..940f93191a6 100644
--- a/forge-gui/res/cardsfolder/upcoming/moonstone_eulogist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/moonstone_eulogist.txt
@@ -1,12 +1,12 @@
-Name:Moonstone Eulogist
-ManaCost:3 B B
-Types:Creature Bat Warlock
-PT:4/4
-K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature an opponent controls dies, you create a Blood token. (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_blood_draw | TokenOwner$ You
-T:Mode$ Sacrificed | ValidCard$ Artifact | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice an artifact, put a +1/+1 counter on CARDNAME and you gain 1 life.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-DeckHas:Ability$Token|Sacrifice|Counters & Type$Artifact|Blood
-Oracle:Flying\nWhenever a creature an opponent controls dies, you create a Blood token. (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")\nWhenever you sacrifice an artifact, put a +1/+1 counter on Moonstone Eulogist and you gain 1 life.
+Name:Moonstone Eulogist
+ManaCost:3 B B
+Types:Creature Bat Warlock
+PT:4/4
+K:Flying
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature an opponent controls dies, you create a Blood token. (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_blood_draw | TokenOwner$ You
+T:Mode$ Sacrificed | ValidCard$ Artifact | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice an artifact, put a +1/+1 counter on CARDNAME and you gain 1 life.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+DeckHas:Ability$Token|Sacrifice|Counters & Type$Artifact|Blood
+Oracle:Flying\nWhenever a creature an opponent controls dies, you create a Blood token. (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")\nWhenever you sacrifice an artifact, put a +1/+1 counter on Moonstone Eulogist and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/mouse_trapper.txt b/forge-gui/res/cardsfolder/upcoming/mouse_trapper.txt
index a40c9e3173e..4107cb5a41d 100644
--- a/forge-gui/res/cardsfolder/upcoming/mouse_trapper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mouse_trapper.txt
@@ -1,8 +1,8 @@
-Name:Mouse Trapper
-ManaCost:2 W
-Types:Creature Mouse Soldier
-PT:3/2
-K:Flash
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | FirstTime$ True | Execute$ TrigTap | TriggerDescription$ Valiant — Whenever CARDNAME becomes the target of a spell or ability you control for the first time each turn, tap target creature an opponent controls.
-SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls.
-Oracle:Flash\nValiant — Whenever Mouse Trapper becomes the target of a spell or ability you control for the first time each turn, tap target creature an opponent controls.
\ No newline at end of file
+Name:Mouse Trapper
+ManaCost:2 W
+Types:Creature Mouse Soldier
+PT:3/2
+K:Flash
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | FirstTime$ True | Execute$ TrigTap | TriggerDescription$ Valiant — Whenever CARDNAME becomes the target of a spell or ability you control for the first time each turn, tap target creature an opponent controls.
+SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls.
+Oracle:Flash\nValiant — Whenever Mouse Trapper becomes the target of a spell or ability you control for the first time each turn, tap target creature an opponent controls.
diff --git a/forge-gui/res/cardsfolder/upcoming/mr_foxglove.txt b/forge-gui/res/cardsfolder/upcoming/mr_foxglove.txt
index 917fa592b38..b1aaa2398b5 100644
--- a/forge-gui/res/cardsfolder/upcoming/mr_foxglove.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mr_foxglove.txt
@@ -1,13 +1,13 @@
-Name:Mr. Foxglove
-ManaCost:2 G W U
-Types:Legendary Creature Fox Rogue
-PT:3/5
-K:Lifelink
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME attacks, draw cards equal to the number of cards in defending player's hand minus the number of cards in your hand. If you didn't draw cards this way, you may put a creature card from your hand onto the battlefield.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X | RememberDrawn$ True | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:TriggeredDefendingPlayer$CardsInHand/Minus.Y
-SVar:Y:Count$InYourHand
-SVar:HasAttackEffect:TRUE
-Oracle:Lifelink\nWhenever Mr. Foxglove attacks, draw cards equal to the number of cards in defending player's hand minus the number of cards in your hand. If you didn't draw cards this way, you may put a creature card from your hand onto the battlefield.
\ No newline at end of file
+Name:Mr. Foxglove
+ManaCost:2 G W U
+Types:Legendary Creature Fox Rogue
+PT:3/5
+K:Lifelink
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME attacks, draw cards equal to the number of cards in defending player's hand minus the number of cards in your hand. If you didn't draw cards this way, you may put a creature card from your hand onto the battlefield.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X | RememberDrawn$ True | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:TriggeredDefendingPlayer$CardsInHand/Minus.Y
+SVar:Y:Count$InYourHand
+SVar:HasAttackEffect:TRUE
+Oracle:Lifelink\nWhenever Mr. Foxglove attacks, draw cards equal to the number of cards in defending player's hand minus the number of cards in your hand. If you didn't draw cards this way, you may put a creature card from your hand onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/ms_bumbleflower.txt b/forge-gui/res/cardsfolder/upcoming/ms_bumbleflower.txt
index babf7aabc6f..773f6bace0f 100644
--- a/forge-gui/res/cardsfolder/upcoming/ms_bumbleflower.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ms_bumbleflower.txt
@@ -1,13 +1,13 @@
-Name:Ms. Bumbleflower
-ManaCost:1 G W U
-Types:Legendary Creature Rabbit Citizen
-PT:1/5
-K:Vigilance
-T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell, target opponent draws a card. Put a +1/+1 counter on target creature. It gains flying until end of turn. If this is the second time this ability has resolved this turn, you draw two cards.
-SVar:TrigDraw:DB$ Draw | ValidTgts$ Opponent | TgtPrompt$ Select target opponent to draw a card | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted.Creature | KW$ Flying | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | NumCards$ 2 | ConditionCheckSVar$ Resolved | ConditionSVarCompare$ EQ2
-SVar:Resolved:Count$ResolvedThisTurn
-DeckHas:Ability$Counters
-Oracle:Vigilance\nWhenever you cast a spell, target opponent draws a card. Put a +1/+1 counter on target creature. It gains flying until end of turn. If this is the second time this ability has resolved this turn, you draw two cards.
+Name:Ms. Bumbleflower
+ManaCost:1 G W U
+Types:Legendary Creature Rabbit Citizen
+PT:1/5
+K:Vigilance
+T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell, target opponent draws a card. Put a +1/+1 counter on target creature. It gains flying until end of turn. If this is the second time this ability has resolved this turn, you draw two cards.
+SVar:TrigDraw:DB$ Draw | ValidTgts$ Opponent | TgtPrompt$ Select target opponent to draw a card | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Targeted.Creature | KW$ Flying | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ 2 | ConditionCheckSVar$ Resolved | ConditionSVarCompare$ EQ2
+SVar:Resolved:Count$ResolvedThisTurn
+DeckHas:Ability$Counters
+Oracle:Vigilance\nWhenever you cast a spell, target opponent draws a card. Put a +1/+1 counter on target creature. It gains flying until end of turn. If this is the second time this ability has resolved this turn, you draw two cards.
diff --git a/forge-gui/res/cardsfolder/upcoming/mudflat_village.txt b/forge-gui/res/cardsfolder/upcoming/mudflat_village.txt
index d4b4462a836..b1c05c7251b 100644
--- a/forge-gui/res/cardsfolder/upcoming/mudflat_village.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mudflat_village.txt
@@ -1,7 +1,7 @@
-Name:Mudflat Village
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ T | Produced$ B | RestrictValid$ Spell.Creature | SpellDescription$ Add {B}. Spend this mana only to cast a creature spell.
-A:AB$ ChangeZone | Cost$ 1 B T Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Bat.YouOwn,Lizard.YouOwn,Rat.YouOwn,Squirrel.YouOwn | TgtPrompt$ Select target Bat, Lizard, Rat, or Squirrel card in your graveyard | SpellDescription$ Return target Bat, Lizard, Rat, or Squirrel card from your graveyard to your hand.
-Oracle:{T}: Add {C}.\n{T}: Add {B}. Spend this mana only to cast a creature spell.\n{1}{B}, {T}, Sacrifice Mudflat Village: Return target Bat, Lizard, Rat, or Squirrel card from your graveyard to your hand.
\ No newline at end of file
+Name:Mudflat Village
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ B | RestrictValid$ Spell.Creature | SpellDescription$ Add {B}. Spend this mana only to cast a creature spell.
+A:AB$ ChangeZone | Cost$ 1 B T Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Bat.YouOwn,Lizard.YouOwn,Rat.YouOwn,Squirrel.YouOwn | TgtPrompt$ Select target Bat, Lizard, Rat, or Squirrel card in your graveyard | SpellDescription$ Return target Bat, Lizard, Rat, or Squirrel card from your graveyard to your hand.
+Oracle:{T}: Add {C}.\n{T}: Add {B}. Spend this mana only to cast a creature spell.\n{1}{B}, {T}, Sacrifice Mudflat Village: Return target Bat, Lizard, Rat, or Squirrel card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/muerra_trash_tactician.txt b/forge-gui/res/cardsfolder/upcoming/muerra_trash_tactician.txt
index e48656f7d00..448d698b093 100644
--- a/forge-gui/res/cardsfolder/upcoming/muerra_trash_tactician.txt
+++ b/forge-gui/res/cardsfolder/upcoming/muerra_trash_tactician.txt
@@ -1,15 +1,15 @@
-Name:Muerra, Trash Tactician
-ManaCost:1 R G
-Types:Legendary Creature Raccoon Warrior
-PT:2/4
-T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGetMana | TriggerDescription$ At the beginning of your first main phase, add {R} or {G} for each Raccoon you control.
-SVar:TrigGetMana:DB$ Mana | Produced$ Combo R G | Amount$ X
-T:Mode$ ManaExpend | Amount$ 4 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever you expend 4, you gain 3 life. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
-SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3
-T:Mode$ ManaExpend | Amount$ 8 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever you expend 8, exile the top two cards of your library. Until the end of your next turn, you may play those cards.
-SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ UntilTheEndOfYourNextTurn
-SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until the end of your next turn, you may play the exiled cards.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$Valid Raccoon.YouCtrl
-Oracle:At the beginning of your first main phase, add {R} or {G} for each Raccoon you control.\nWhenever you expend 4, you gain 3 life. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)\nWhenever you expend 8, exile the top two cards of your library. Until the end of your next turn, you may play those cards.
+Name:Muerra, Trash Tactician
+ManaCost:1 R G
+Types:Legendary Creature Raccoon Warrior
+PT:2/4
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGetMana | TriggerDescription$ At the beginning of your first main phase, add {R} or {G} for each Raccoon you control.
+SVar:TrigGetMana:DB$ Mana | Produced$ Combo R G | Amount$ X
+T:Mode$ ManaExpend | Amount$ 4 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever you expend 4, you gain 3 life. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
+SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3
+T:Mode$ ManaExpend | Amount$ 8 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever you expend 8, exile the top two cards of your library. Until the end of your next turn, you may play those cards.
+SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ UntilTheEndOfYourNextTurn
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until the end of your next turn, you may play the exiled cards.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$Valid Raccoon.YouCtrl
+Oracle:At the beginning of your first main phase, add {R} or {G} for each Raccoon you control.\nWhenever you expend 4, you gain 3 life. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)\nWhenever you expend 8, exile the top two cards of your library. Until the end of your next turn, you may play those cards.
diff --git a/forge-gui/res/cardsfolder/upcoming/murmuration.txt b/forge-gui/res/cardsfolder/upcoming/murmuration.txt
index 4fa4b21a324..6aad679a33b 100644
--- a/forge-gui/res/cardsfolder/upcoming/murmuration.txt
+++ b/forge-gui/res/cardsfolder/upcoming/murmuration.txt
@@ -1,11 +1,11 @@
-Name:Murmuration
-ManaCost:4 W
-Types:Enchantment
-S:Mode$ Continuous | Affected$ Bird.YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Vigilance | Description$ Birds you control get +1/+1 and have vigilance.
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, for each spell you've cast this turn, create a 1/2 blue Bird creature token with flying named Storm Crow.
-SVar:TrigToken:DB$ Token | TokenScript$ storm_crow | TokenAmount$ X | TokenOwner$ You
-SVar:X:Count$ThisTurnCast_Card.YouCtrl
-SVar:PlayMain1:TRUE
-DeckHas:Ability$Token
-DeckHints:Type$Bird
-Oracle:Birds you control get +1/+1 and have vigilance.\nAt the beginning of your end step, for each spell you've cast this turn, create a 1/2 blue Bird creature token with flying named Storm Crow.
+Name:Murmuration
+ManaCost:4 W
+Types:Enchantment
+S:Mode$ Continuous | Affected$ Bird.YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Vigilance | Description$ Birds you control get +1/+1 and have vigilance.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, for each spell you've cast this turn, create a 1/2 blue Bird creature token with flying named Storm Crow.
+SVar:TrigToken:DB$ Token | TokenScript$ storm_crow | TokenAmount$ X | TokenOwner$ You
+SVar:X:Count$ThisTurnCast_Card.YouCtrl
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Token
+DeckHints:Type$Bird
+Oracle:Birds you control get +1/+1 and have vigilance.\nAt the beginning of your end step, for each spell you've cast this turn, create a 1/2 blue Bird creature token with flying named Storm Crow.
diff --git a/forge-gui/res/cardsfolder/upcoming/nettle_guard.txt b/forge-gui/res/cardsfolder/upcoming/nettle_guard.txt
index ce073c4dd8b..ef68fa57be0 100644
--- a/forge-gui/res/cardsfolder/upcoming/nettle_guard.txt
+++ b/forge-gui/res/cardsfolder/upcoming/nettle_guard.txt
@@ -1,8 +1,8 @@
-Name:Nettle Guard
-ManaCost:1 W
-Types:Creature Mouse Soldier
-PT:3/1
-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 +0/+2 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumDef$ 2
-A:AB$ Destroy | Cost$ 1 Sac<1/CARDNAME> | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
-Oracle:Valiant — Whenever Nettle Guard becomes the target of a spell or ability you control for the first time each turn, it gets +0/+2 until end of turn.\n{1}, Sacrifice Nettle Guard: Destroy target artifact or enchantment.
\ No newline at end of file
+Name:Nettle Guard
+ManaCost:1 W
+Types:Creature Mouse Soldier
+PT:3/1
+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 +0/+2 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumDef$ 2
+A:AB$ Destroy | Cost$ 1 Sac<1/CARDNAME> | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
+Oracle:Valiant — Whenever Nettle Guard becomes the target of a spell or ability you control for the first time each turn, it gets +0/+2 until end of turn.\n{1}, Sacrifice Nettle Guard: Destroy target artifact or enchantment.
diff --git a/forge-gui/res/cardsfolder/upcoming/nightwhorl_hermit.txt b/forge-gui/res/cardsfolder/upcoming/nightwhorl_hermit.txt
index ad56f6129bd..c34e09516a9 100644
--- a/forge-gui/res/cardsfolder/upcoming/nightwhorl_hermit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/nightwhorl_hermit.txt
@@ -1,8 +1,8 @@
-Name:Nightwhorl Hermit
-ManaCost:2 U
-Types:Creature Rat Rogue
-PT:1/4
-K:Vigilance
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+0 and can't be blocked.
-S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | Condition$ Threshold
-Oracle:Vigilance\nThreshold — As long as seven or more cards are in your graveyard, Nightwhorl Hermit gets +1/+0 and can't be blocked.
+Name:Nightwhorl Hermit
+ManaCost:2 U
+Types:Creature Rat Rogue
+PT:1/4
+K:Vigilance
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+0 and can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | Condition$ Threshold
+Oracle:Vigilance\nThreshold — As long as seven or more cards are in your graveyard, Nightwhorl Hermit gets +1/+0 and can't be blocked.
diff --git a/forge-gui/res/cardsfolder/upcoming/nocturnal_hunger.txt b/forge-gui/res/cardsfolder/upcoming/nocturnal_hunger.txt
index f33b6269090..4def557c607 100644
--- a/forge-gui/res/cardsfolder/upcoming/nocturnal_hunger.txt
+++ b/forge-gui/res/cardsfolder/upcoming/nocturnal_hunger.txt
@@ -1,8 +1,8 @@
-Name:Nocturnal Hunger
-ManaCost:2 B
-Types:Instant
-K:Gift
-SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ Promised | GiftDescription$ a Food
-A:SP$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature. If the gift wasn't promised, you lose 2 life.
-SVar:DBLoseLife:DB$ LoseLife | Defined$ You | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ0 | LifeAmount$ 2
-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.")\nDestroy target creature. If the gift wasn't promised, you lose 2 life.
\ No newline at end of file
+Name:Nocturnal Hunger
+ManaCost:2 B
+Types:Instant
+K:Gift
+SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ Promised | GiftDescription$ a Food
+A:SP$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature. If the gift wasn't promised, you lose 2 life.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ You | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ0 | LifeAmount$ 2
+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.")\nDestroy target creature. If the gift wasn't promised, you lose 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/oakhollow_village.txt b/forge-gui/res/cardsfolder/upcoming/oakhollow_village.txt
index 589b3ff8c88..3c25a5c985b 100644
--- a/forge-gui/res/cardsfolder/upcoming/oakhollow_village.txt
+++ b/forge-gui/res/cardsfolder/upcoming/oakhollow_village.txt
@@ -1,7 +1,7 @@
-Name:Oakhollow Village
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ T | Produced$ G | RestrictValid$ Spell.Creature | SpellDescription$ Add {G}. Spend this mana only to cast a creature spell.
-A:AB$ PutCounterAll | Cost$ G T | ValidCards$ Frog.ThisTurnEntered+YouCtrl,Rabbit.ThisTurnEntered+YouCtrl,Raccoon.ThisTurnEntered+YouCtrl,Squirrel.ThisTurnEntered+YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each Frog, Rabbit, Raccoon, or Squirrel you control that entered the battlefield this turn.
-Oracle:{T}: Add {C}.\n{T}: Add {G}. Spend this mana only to cast a creature spell.\n {G}, {T}: Put a +1/+1 counter on each Frog, Rabbit, Raccoon, or Squirrel you control that entered the battlefield this turn.
\ No newline at end of file
+Name:Oakhollow Village
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ G | RestrictValid$ Spell.Creature | SpellDescription$ Add {G}. Spend this mana only to cast a creature spell.
+A:AB$ PutCounterAll | Cost$ G T | ValidCards$ Frog.ThisTurnEntered+YouCtrl,Rabbit.ThisTurnEntered+YouCtrl,Raccoon.ThisTurnEntered+YouCtrl,Squirrel.ThisTurnEntered+YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each Frog, Rabbit, Raccoon, or Squirrel you control that entered the battlefield this turn.
+Oracle:{T}: Add {C}.\n{T}: Add {G}. Spend this mana only to cast a creature spell.\n {G}, {T}: Put a +1/+1 counter on each Frog, Rabbit, Raccoon, or Squirrel you control that entered the battlefield this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/octomancer.txt b/forge-gui/res/cardsfolder/upcoming/octomancer.txt
index 1454b47d00c..8dbc35e6278 100644
--- a/forge-gui/res/cardsfolder/upcoming/octomancer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/octomancer.txt
@@ -1,9 +1,9 @@
-Name:Octomancer
-ManaCost:3 G U
-Types:Creature Frog Druid
-PT:3/3
-K:Gift
-SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_8_8_octopus | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ an Octopus
-T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ At the beginning of each end step, create a token that's a copy of target creature token that entered the battlefield this turn.
-SVar:TrigCopy:DB$ CopyPermanent | ValidTgts$ Permanent.Creature+token+ThisTurnEntered | TgtPrompt$ Select target creature token that entered the battlefield this turn | NumCopies$ 1
-Oracle:Gift an Octopus (You may promise an opponent a gift as you cast this spell. If you do, when it enters, they create an 8/8 blue Octopus creature token.)\nAt the beginning of each end step, create a token that's a copy of target creature token that entered the battlefield this turn.
+Name:Octomancer
+ManaCost:3 G U
+Types:Creature Frog Druid
+PT:3/3
+K:Gift
+SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_8_8_octopus | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ an Octopus
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ At the beginning of each end step, create a token that's a copy of target creature token that entered the battlefield this turn.
+SVar:TrigCopy:DB$ CopyPermanent | ValidTgts$ Permanent.Creature+token+ThisTurnEntered | TgtPrompt$ Select target creature token that entered the battlefield this turn | NumCopies$ 1
+Oracle:Gift an Octopus (You may promise an opponent a gift as you cast this spell. If you do, when it enters, they create an 8/8 blue Octopus creature token.)\nAt the beginning of each end step, create a token that's a copy of target creature token that entered the battlefield this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/origin_of_the_hidden_ones.txt b/forge-gui/res/cardsfolder/upcoming/origin_of_the_hidden_ones.txt
index 4125b3c9741..dbc65a8b74a 100644
--- a/forge-gui/res/cardsfolder/upcoming/origin_of_the_hidden_ones.txt
+++ b/forge-gui/res/cardsfolder/upcoming/origin_of_the_hidden_ones.txt
@@ -1,11 +1,11 @@
-Name:Origin of the Hidden Ones
-ManaCost:3 R
-Types:Enchantment Saga
-K:Chapter:3:DBDamage,DBToken,DBEffect
-SVar:DBDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to any target.
-SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ b_1_1_assassin_menace | TokenOwner$ You | SpellDescription$ Create two 1/1 black Assassin creature tokens with menace.
-SVar:DBEffect:DB$ Effect | Triggers$ TrigAttack | SpellDescription$ Whenever an Assassin you control attacks this turn, create a 1/1 black Assassin creature token with menace that's tapped and attacking.
-SVar:TrigAttack:Mode$ Attacks | ValidCard$ Creature.Assassin+YouCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever an Assassin you control attacks this turn, create a 1/1 black Assassin creature token with menace that's tapped and attacking.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_assassin_menace | TokenOwner$ You | TokenTapped$ True | TokenAttacking$ True
-DeckHas:Ability$Token
-Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — Origin of the Hidden Ones deals 4 damage to any target.\nII — Create two 1/1 black Assassin creature tokens with menace.\nIII — Whenever an Assassin you control attacks this turn, create a 1/1 black Assassin creature token with menace that's tapped and attacking.
\ No newline at end of file
+Name:Origin of the Hidden Ones
+ManaCost:3 R
+Types:Enchantment Saga
+K:Chapter:3:DBDamage,DBToken,DBEffect
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to any target.
+SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ b_1_1_assassin_menace | TokenOwner$ You | SpellDescription$ Create two 1/1 black Assassin creature tokens with menace.
+SVar:DBEffect:DB$ Effect | Triggers$ TrigAttack | SpellDescription$ Whenever an Assassin you control attacks this turn, create a 1/1 black Assassin creature token with menace that's tapped and attacking.
+SVar:TrigAttack:Mode$ Attacks | ValidCard$ Creature.Assassin+YouCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever an Assassin you control attacks this turn, create a 1/1 black Assassin creature token with menace that's tapped and attacking.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_assassin_menace | TokenOwner$ You | TokenTapped$ True | TokenAttacking$ True
+DeckHas:Ability$Token
+Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — Origin of the Hidden Ones deals 4 damage to any target.\nII — Create two 1/1 black Assassin creature tokens with menace.\nIII — Whenever an Assassin you control attacks this turn, create a 1/1 black Assassin creature token with menace that's tapped and attacking.
diff --git a/forge-gui/res/cardsfolder/upcoming/osteomancer_adept.txt b/forge-gui/res/cardsfolder/upcoming/osteomancer_adept.txt
index 2b35ae75976..0cf34f747b0 100644
--- a/forge-gui/res/cardsfolder/upcoming/osteomancer_adept.txt
+++ b/forge-gui/res/cardsfolder/upcoming/osteomancer_adept.txt
@@ -1,15 +1,15 @@
-Name:Osteomancer Adept
-ManaCost:1 B
-Types:Creature Squirrel Warlock
-PT:2/2
-K:Deathtouch
-A:AB$ Effect | Cost$ T | StaticAbilities$ MayCast | Triggers$ StaticCast | SpellDescription$ Until end of turn, you may cast creature spells from your graveyard by foraging in addition to paying their other costs. If you cast a spell this way, that creature enters with a finality counter on it. (To forage, exile three cards from your graveyard or sacrifice a Food. If a creature with a finality counter on it would die, exile it instead.)
-SVar:MayCast:Mode$ Continuous | Affected$ Creature.nonLand+YouOwn | MayPlay$ True | AffectedZone$ Graveyard | RaiseCost$ Forage | Description$ Until end of turn, you may cast creature spells from your graveyard by foraging in addition to paying their other costs. If you cast a spell this way, that creature enters with a finality counter on it. (To forage, exile three cards from your graveyard or sacrifice a Food. If a creature with a finality counter on it would die, exile it instead.)
-SVar:StaticCast:Mode$ SpellCast | ValidCard$ Card.CastSa Spell.MayPlaySource | Execute$ TrigEffect | Static$ True | TriggerZones$ Command
-SVar:TrigEffect:DB$ Effect | ReplacementEffects$ ReMoved | RememberObjects$ TriggeredCard
-SVar:ReMoved:Event$ Moved | Origin$ Stack | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBCounter
-SVar:ETBCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ FINALITY | CounterNum$ 1 | SubAbility$ RemoveSelf
-SVar:RemoveSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-DeckHas:Ability$Counters
-DeckHints:Ability$Graveyard & Type$Food
-Oracle:Deathtouch\n{T}: Until end of turn, you may cast creature spells from your graveyard by foraging in addition to paying their other costs. If you cast a spell this way, that creature enters with a finality counter on it. (To forage, exile three cards from your graveyard or sacrifice a Food. If a creature with a finality counter on it would die, exile it instead.)
+Name:Osteomancer Adept
+ManaCost:1 B
+Types:Creature Squirrel Warlock
+PT:2/2
+K:Deathtouch
+A:AB$ Effect | Cost$ T | StaticAbilities$ MayCast | Triggers$ StaticCast | SpellDescription$ Until end of turn, you may cast creature spells from your graveyard by foraging in addition to paying their other costs. If you cast a spell this way, that creature enters with a finality counter on it. (To forage, exile three cards from your graveyard or sacrifice a Food. If a creature with a finality counter on it would die, exile it instead.)
+SVar:MayCast:Mode$ Continuous | Affected$ Creature.nonLand+YouOwn | MayPlay$ True | AffectedZone$ Graveyard | RaiseCost$ Forage | Description$ Until end of turn, you may cast creature spells from your graveyard by foraging in addition to paying their other costs. If you cast a spell this way, that creature enters with a finality counter on it. (To forage, exile three cards from your graveyard or sacrifice a Food. If a creature with a finality counter on it would die, exile it instead.)
+SVar:StaticCast:Mode$ SpellCast | ValidCard$ Card.CastSa Spell.MayPlaySource | Execute$ TrigEffect | Static$ True | TriggerZones$ Command
+SVar:TrigEffect:DB$ Effect | ReplacementEffects$ ReMoved | RememberObjects$ TriggeredCard
+SVar:ReMoved:Event$ Moved | Origin$ Stack | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBCounter
+SVar:ETBCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ FINALITY | CounterNum$ 1 | SubAbility$ RemoveSelf
+SVar:RemoveSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+DeckHas:Ability$Counters
+DeckHints:Ability$Graveyard & Type$Food
+Oracle:Deathtouch\n{T}: Until end of turn, you may cast creature spells from your graveyard by foraging in addition to paying their other costs. If you cast a spell this way, that creature enters with a finality counter on it. (To forage, exile three cards from your graveyard or sacrifice a Food. If a creature with a finality counter on it would die, exile it instead.)
diff --git a/forge-gui/res/cardsfolder/upcoming/otterball_antics.txt b/forge-gui/res/cardsfolder/upcoming/otterball_antics.txt
index 8632db9e630..c785b451ae7 100644
--- a/forge-gui/res/cardsfolder/upcoming/otterball_antics.txt
+++ b/forge-gui/res/cardsfolder/upcoming/otterball_antics.txt
@@ -1,8 +1,8 @@
-Name:Otterball Antics
-ManaCost:1 U
-Types:Sorcery
-A:SP$ Token | TokenAmount$ 1 | TokenScript$ ur_1_1_otter_prowess | TokenOwner$ You | RememberTokens$ True | SubAbility$ DBPutCounter | SpellDescription$ Create a 1/1 blue and red Otter creature token with prowess. If this spell was cast from anywhere other than your hand, put a +1/+1 counter on that creature. (Whenever you cast a noncreature spell, a creature with prowess gets +1/+1 until end of turn.)
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ 1 | ConditionDefined$ Self | ConditionPresent$ Card.wasCast+!wasCastFromHand | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-K:Flashback:3 U
-Oracle:Create a 1/1 blue and red Otter creature token with prowess. If this spell was cast from anywhere other than your hand, put a +1/+1 counter on that creature. (Whenever you cast a noncreature spell, a creature with prowess gets +1/+1 until end of turn.)\nFlashback {3}{U} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
\ No newline at end of file
+Name:Otterball Antics
+ManaCost:1 U
+Types:Sorcery
+A:SP$ Token | TokenAmount$ 1 | TokenScript$ ur_1_1_otter_prowess | TokenOwner$ You | RememberTokens$ True | SubAbility$ DBPutCounter | SpellDescription$ Create a 1/1 blue and red Otter creature token with prowess. If this spell was cast from anywhere other than your hand, put a +1/+1 counter on that creature. (Whenever you cast a noncreature spell, a creature with prowess gets +1/+1 until end of turn.)
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ 1 | ConditionDefined$ Self | ConditionPresent$ Card.wasCast+!wasCastFromHand | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+K:Flashback:3 U
+Oracle:Create a 1/1 blue and red Otter creature token with prowess. If this spell was cast from anywhere other than your hand, put a +1/+1 counter on that creature. (Whenever you cast a noncreature spell, a creature with prowess gets +1/+1 until end of turn.)\nFlashback {3}{U} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/overpowering_attack.txt b/forge-gui/res/cardsfolder/upcoming/overpowering_attack.txt
index 222b326b71b..c7253b0d8a6 100644
--- a/forge-gui/res/cardsfolder/upcoming/overpowering_attack.txt
+++ b/forge-gui/res/cardsfolder/upcoming/overpowering_attack.txt
@@ -1,7 +1,7 @@
-Name:Overpowering Attack
-ManaCost:3 R R
-Types:Sorcery
-K:Freerunning:2 R
-A:SP$ UntapAll | ValidCards$ Creature.YouCtrl+attackedThisTurn | SubAbility$ DBAddCombat | SpellDescription$ Untap all creatures you control that attacked this turn. If it's your main phase, there is an additional combat phase after this phase, followed by an additional main phase.
-SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ Combat | FollowedBy$ Main2 | ConditionPhases$ Main1,Main2 | ConditionPlayerTurn$ True
-Oracle:Freerunning {2}{R} (You may cast this spell for its freerunning cost if you dealt combat damage to a player this turn with an Assassin or commander.)\nUntap all creatures you control that attacked this turn. If it's your main phase, there is an additional combat phase after this phase, followed by an additional main phase.
\ No newline at end of file
+Name:Overpowering Attack
+ManaCost:3 R R
+Types:Sorcery
+K:Freerunning:2 R
+A:SP$ UntapAll | ValidCards$ Creature.YouCtrl+attackedThisTurn | SubAbility$ DBAddCombat | SpellDescription$ Untap all creatures you control that attacked this turn. If it's your main phase, there is an additional combat phase after this phase, followed by an additional main phase.
+SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ Combat | FollowedBy$ Main2 | ConditionPhases$ Main1,Main2 | ConditionPlayerTurn$ True
+Oracle:Freerunning {2}{R} (You may cast this spell for its freerunning cost if you dealt combat damage to a player this turn with an Assassin or commander.)\nUntap all creatures you control that attacked this turn. If it's your main phase, there is an additional combat phase after this phase, followed by an additional main phase.
diff --git a/forge-gui/res/cardsfolder/upcoming/overprotect.txt b/forge-gui/res/cardsfolder/upcoming/overprotect.txt
index 3f220029f38..fbaaa0af753 100644
--- a/forge-gui/res/cardsfolder/upcoming/overprotect.txt
+++ b/forge-gui/res/cardsfolder/upcoming/overprotect.txt
@@ -1,5 +1,5 @@
-Name:Overprotect
-ManaCost:1 G
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +3 | NumDef$ +3 | KW$ Trample & Hexproof & Indestructible | SpellDescription$ Target creature you control gets +3/+3 and gains trample, hexproof, and indestructible until end of turn.
-Oracle:Target creature you control gets +3/+3 and gains trample, hexproof, and indestructible until end of turn.
\ No newline at end of file
+Name:Overprotect
+ManaCost:1 G
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +3 | NumDef$ +3 | KW$ Trample & Hexproof & Indestructible | SpellDescription$ Target creature you control gets +3/+3 and gains trample, hexproof, and indestructible until end of turn.
+Oracle:Target creature you control gets +3/+3 and gains trample, hexproof, and indestructible until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/palazzo_archers.txt b/forge-gui/res/cardsfolder/upcoming/palazzo_archers.txt
index e5dd5a10f48..4c94f1b0ef3 100644
--- a/forge-gui/res/cardsfolder/upcoming/palazzo_archers.txt
+++ b/forge-gui/res/cardsfolder/upcoming/palazzo_archers.txt
@@ -1,10 +1,10 @@
-Name:Palazzo Archers
-ManaCost:2 G
-Types:Creature Human Archer
-PT:2/3
-K:Reach
-K:Vigilance
-T:Mode$ Attacks | ValidCard$ Creature.withFlying | Attacked$ You,Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature with flying attacks you or a planeswalker you control, CARDNAME deals damage equal to its power to that creature.
-SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredAttackerLKICopy | NumDmg$ X
-SVar:X:Count$CardPower
-Oracle:Whenever a creature with flying attacks you or a planeswalker you control, Palazzo Archers deals damage equal to its power to that creature.
\ No newline at end of file
+Name:Palazzo Archers
+ManaCost:2 G
+Types:Creature Human Archer
+PT:2/3
+K:Reach
+K:Vigilance
+T:Mode$ Attacks | ValidCard$ Creature.withFlying | Attacked$ You,Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature with flying attacks you or a planeswalker you control, CARDNAME deals damage equal to its power to that creature.
+SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredAttackerLKICopy | NumDmg$ X
+SVar:X:Count$CardPower
+Oracle:Whenever a creature with flying attacks you or a planeswalker you control, Palazzo Archers deals damage equal to its power to that creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/parting_gust.txt b/forge-gui/res/cardsfolder/upcoming/parting_gust.txt
index 71a78bc0728..1c41c1c5a4a 100644
--- a/forge-gui/res/cardsfolder/upcoming/parting_gust.txt
+++ b/forge-gui/res/cardsfolder/upcoming/parting_gust.txt
@@ -1,10 +1,10 @@
-Name:Parting Gust
-ManaCost:W W
-Types:Instant
-K:Gift
-SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenTapped$ True | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ a tapped Fish
-A:SP$ ChangeZone | ValidTgts$ Creature.nonToken | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target nontoken creature | RememberChanged$ True | SubAbility$ DelTrig | SpellDescription$ Exile target nontoken creature. If the gift wasn't promised, return that creature to the battlefield under its owner's control with a +1/+1 counter on it at the beginning of the next end step.
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ0 | TriggerDescription$ Return exiled card to the battlefield with a +1/+1 counter on it. | SubAbility$ DBCleanup
-SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Exile | Destination$ Battlefield | WithCountersType$ P1P1
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Gift a tapped Fish (You may promise an opponent a gift as you cast this spell. If you do, they create a tapped 1/1 blue Fish creature token before its other effects.)\nExile target nontoken creature. If the gift wasn't promised, return that creature to the battlefield under its owner's control with a +1/+1 counter on it at the beginning of the next end step.
+Name:Parting Gust
+ManaCost:W W
+Types:Instant
+K:Gift
+SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenTapped$ True | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ a tapped Fish
+A:SP$ ChangeZone | ValidTgts$ Creature.nonToken | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target nontoken creature | RememberChanged$ True | SubAbility$ DelTrig | SpellDescription$ Exile target nontoken creature. If the gift wasn't promised, return that creature to the battlefield under its owner's control with a +1/+1 counter on it at the beginning of the next end step.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ0 | TriggerDescription$ Return exiled card to the battlefield with a +1/+1 counter on it. | SubAbility$ DBCleanup
+SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Exile | Destination$ Battlefield | WithCountersType$ P1P1
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Gift a tapped Fish (You may promise an opponent a gift as you cast this spell. If you do, they create a tapped 1/1 blue Fish creature token before its other effects.)\nExile target nontoken creature. If the gift wasn't promised, return that creature to the battlefield under its owner's control with a +1/+1 counter on it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/upcoming/patchwork_banner.txt b/forge-gui/res/cardsfolder/upcoming/patchwork_banner.txt
index 152675bcfc2..2549a743c17 100644
--- a/forge-gui/res/cardsfolder/upcoming/patchwork_banner.txt
+++ b/forge-gui/res/cardsfolder/upcoming/patchwork_banner.txt
@@ -1,8 +1,8 @@
-Name:Patchwork Banner
-ManaCost:3
-Types:Artifact
-K:ETBReplacement:Other:ChooseCT
-SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | SpellDescription$ As CARDNAME enters, choose a creature type. | AILogic$ MostProminentInComputerDeck
-S:Mode$ Continuous | Affected$ Creature.ChosenType+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control of the chosen type get +1/+1.
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
-Oracle:As Patchwork Banner enters, choose a creature type.\nCreatures you control of the chosen type get +1/+1.\n{T}: Add one mana of any color.
+Name:Patchwork Banner
+ManaCost:3
+Types:Artifact
+K:ETBReplacement:Other:ChooseCT
+SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | SpellDescription$ As CARDNAME enters, choose a creature type. | AILogic$ MostProminentInComputerDeck
+S:Mode$ Continuous | Affected$ Creature.ChosenType+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control of the chosen type get +1/+1.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
+Oracle:As Patchwork Banner enters, choose a creature type.\nCreatures you control of the chosen type get +1/+1.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/upcoming/pawpatch_formation.txt b/forge-gui/res/cardsfolder/upcoming/pawpatch_formation.txt
index 36837fcc13b..fe969f525f2 100644
--- a/forge-gui/res/cardsfolder/upcoming/pawpatch_formation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pawpatch_formation.txt
@@ -1,10 +1,10 @@
-Name:Pawpatch Formation
-ManaCost:1 G
-Types:Instant
-A:SP$ Charm | Choices$ DBDestroyFlier,DBDestroyEnchantment,DBDraw
-SVar:DBDestroyFlier:DB$ Destroy | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | SpellDescription$ Destroy target creature with flying.
-SVar:DBDestroyEnchantment:DB$ Destroy | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SpellDescription$ Destroy target enchantment.
-SVar:DBDraw:DB$ Draw | Defined$ You | SubAbility$ DBToken | SpellDescription$ Draw a card. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
-DeckHas:Ability$LifeGain|Token
-Oracle:Choose one —\n• Destroy target creature with flying.\n• Destroy target enchantment.\n• Draw a card. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+Name:Pawpatch Formation
+ManaCost:1 G
+Types:Instant
+A:SP$ Charm | Choices$ DBDestroyFlier,DBDestroyEnchantment,DBDraw
+SVar:DBDestroyFlier:DB$ Destroy | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | SpellDescription$ Destroy target creature with flying.
+SVar:DBDestroyEnchantment:DB$ Destroy | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SpellDescription$ Destroy target enchantment.
+SVar:DBDraw:DB$ Draw | Defined$ You | SubAbility$ DBToken | SpellDescription$ Draw a card. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
+DeckHas:Ability$LifeGain|Token
+Oracle:Choose one —\n• Destroy target creature with flying.\n• Destroy target enchantment.\n• Draw a card. 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/pawpatch_recruit.txt b/forge-gui/res/cardsfolder/upcoming/pawpatch_recruit.txt
index 29e84e62e83..e62e0ff3254 100644
--- a/forge-gui/res/cardsfolder/upcoming/pawpatch_recruit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pawpatch_recruit.txt
@@ -1,10 +1,10 @@
-Name:Pawpatch Recruit
-ManaCost:G
-Types:Creature Rabbit Warrior
-PT:2/1
-K:Offspring:2
-K:Trample
-T:Mode$ BecomesTarget | ValidSource$ SpellAbility.OppCtrl | ValidTarget$ Creature.YouCtrl+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control becomes the target of a spell or ability an opponent controls, put a +1/+1 counter on target creature you control other than that creature.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl+NotDefinedTriggeredTarget | TgtPrompt$ Select target creature you control other than that creature | CounterType$ P1P1 | CounterNum$ 1
-SVar:PlayMain1:TRUE
-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.)\nTrample\nWhenever a creature you control becomes the target of a spell or ability an opponent controls, put a +1/+1 counter on target creature you control other than that creature.
\ No newline at end of file
+Name:Pawpatch Recruit
+ManaCost:G
+Types:Creature Rabbit Warrior
+PT:2/1
+K:Offspring:2
+K:Trample
+T:Mode$ BecomesTarget | ValidSource$ SpellAbility.OppCtrl | ValidTarget$ Creature.YouCtrl+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control becomes the target of a spell or ability an opponent controls, put a +1/+1 counter on target creature you control other than that creature.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl+NotDefinedTriggeredTarget | TgtPrompt$ Select target creature you control other than that creature | CounterType$ P1P1 | CounterNum$ 1
+SVar:PlayMain1:TRUE
+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.)\nTrample\nWhenever a creature you control becomes the target of a spell or ability an opponent controls, put a +1/+1 counter on target creature you control other than that creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/pearl_of_wisdom.txt b/forge-gui/res/cardsfolder/upcoming/pearl_of_wisdom.txt
index f64d093febf..32f1e5b2818 100644
--- a/forge-gui/res/cardsfolder/upcoming/pearl_of_wisdom.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pearl_of_wisdom.txt
@@ -1,6 +1,6 @@
-Name:Pearl of Wisdom
-ManaCost:2 U
-Types:Sorcery
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | IsPresent$ Otter.YouCtrl | Description$ This spell costs {1} less to cast if you control an Otter.
-A:SP$ Draw | NumCards$ 2 | SpellDescription$ Draw two cards.
-Oracle:This spell costs {1} less to cast if you control an Otter.\nDraw two cards.
\ No newline at end of file
+Name:Pearl of Wisdom
+ManaCost:2 U
+Types:Sorcery
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | IsPresent$ Otter.YouCtrl | Description$ This spell costs {1} less to cast if you control an Otter.
+A:SP$ Draw | NumCards$ 2 | SpellDescription$ Draw two cards.
+Oracle:This spell costs {1} less to cast if you control an Otter.\nDraw two cards.
diff --git a/forge-gui/res/cardsfolder/upcoming/peerless_recycling.txt b/forge-gui/res/cardsfolder/upcoming/peerless_recycling.txt
index 69d56c62bd8..fd54e0d43ef 100644
--- a/forge-gui/res/cardsfolder/upcoming/peerless_recycling.txt
+++ b/forge-gui/res/cardsfolder/upcoming/peerless_recycling.txt
@@ -1,8 +1,8 @@
-Name:Peerless Recycling
-ManaCost:1 G
-Types:Instant
-K:Gift
-SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
-A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TargetMin$ X | TargetMax$ X | TgtPrompt$ Choose target permanent card in your graveyard | ValidTgts$ Permanent.YouCtrl | SpellDescription$ Return target permanent card from your graveyard to your hand. If the gift was promised, instead return two target permanent cards from your graveyard to your hand.
-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.)\nReturn target permanent card from your graveyard to your hand. If the gift was promised, instead return two target permanent cards from your graveyard to your hand.
\ No newline at end of file
+Name:Peerless Recycling
+ManaCost:1 G
+Types:Instant
+K:Gift
+SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TargetMin$ X | TargetMax$ X | TgtPrompt$ Choose target permanent card in your graveyard | ValidTgts$ Permanent.YouCtrl | SpellDescription$ Return target permanent card from your graveyard to your hand. If the gift was promised, instead return two target permanent cards from your graveyard to your hand.
+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.)\nReturn target permanent card from your graveyard to your hand. If the gift was promised, instead return two target permanent cards from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/perch_protection.txt b/forge-gui/res/cardsfolder/upcoming/perch_protection.txt
index a95dd58a831..b2f48d08d54 100644
--- a/forge-gui/res/cardsfolder/upcoming/perch_protection.txt
+++ b/forge-gui/res/cardsfolder/upcoming/perch_protection.txt
@@ -1,12 +1,12 @@
-Name:Perch Protection
-ManaCost:4 W W
-Types:Instant
-K:Gift
-SVar:GiftAbility:DB$ AddTurn | Defined$ Promised | NumTurns$ 1 | GiftDescription$ an extra turn
-A:SP$ Token | TokenAmount$ 4 | TokenScript$ u_2_2_bird_flying | TokenOwner$ You | SubAbility$ DBPhases | SpellDescription$ Create four 2/2 blue Bird creature tokens with flying. If the gift was promised, all permanents you control phase out, and until your next turn, your life total can't change and you gain protection from everything. Exile CARDNAME.
-SVar:DBPhases:DB$ Phases | Defined$ Valid Permanent.YouCtrl | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | Duration$ UntilYourNextTurn | StaticAbilities$ STCantChange | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ You | Duration$ UntilYourNextTurn | KW$ Protection from everything | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | SubAbility$ DBChange
-SVar:STCantChange:Mode$ CantChangeLife | ValidPlayer$ You | Description$ Your life total can't change.
-SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile
-Oracle:Gift an extra turn (You may promise an opponent a gift as you cast this spell. If you do, they take an extra turn after this one.)\nCreate four 2/2 blue Bird creature tokens with flying. If the gift was promised, all permanents you control phase out, and until your next turn, your life total can't change and you gain protection from everything.\nExile Perch Protection.
+Name:Perch Protection
+ManaCost:4 W W
+Types:Instant
+K:Gift
+SVar:GiftAbility:DB$ AddTurn | Defined$ Promised | NumTurns$ 1 | GiftDescription$ an extra turn
+A:SP$ Token | TokenAmount$ 4 | TokenScript$ u_2_2_bird_flying | TokenOwner$ You | SubAbility$ DBPhases | SpellDescription$ Create four 2/2 blue Bird creature tokens with flying. If the gift was promised, all permanents you control phase out, and until your next turn, your life total can't change and you gain protection from everything. Exile CARDNAME.
+SVar:DBPhases:DB$ Phases | Defined$ Valid Permanent.YouCtrl | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | Duration$ UntilYourNextTurn | StaticAbilities$ STCantChange | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ You | Duration$ UntilYourNextTurn | KW$ Protection from everything | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | SubAbility$ DBChange
+SVar:STCantChange:Mode$ CantChangeLife | ValidPlayer$ You | Description$ Your life total can't change.
+SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile
+Oracle:Gift an extra turn (You may promise an opponent a gift as you cast this spell. If you do, they take an extra turn after this one.)\nCreate four 2/2 blue Bird creature tokens with flying. If the gift was promised, all permanents you control phase out, and until your next turn, your life total can't change and you gain protection from everything.\nExile Perch Protection.
diff --git a/forge-gui/res/cardsfolder/upcoming/persistent_marshstalker.txt b/forge-gui/res/cardsfolder/upcoming/persistent_marshstalker.txt
index 54c50f67b6c..5bd9228d38a 100644
--- a/forge-gui/res/cardsfolder/upcoming/persistent_marshstalker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/persistent_marshstalker.txt
@@ -1,15 +1,15 @@
-Name:Persistent Marshstalker
-ManaCost:1 B
-Types:Creature Rat Berserker
-PT:3/1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | Description$ CARDNAME gets +1/+0 for each other Rat you control.
-T:Mode$ AttackersDeclared | ValidAttackers$ Creature.YouCtrl+Rat | TriggerZones$ Graveyard | Execute$ TrigChangeZone | CheckSVar$ Y | SVarCompare$ GE7 | TriggerDescription$ Threshold — Whenever you attack with one or more Rats, if seven of more cards are in your graveyard, you may pay {2}{B}. If you do, return CARDNAME from your graveyard to the battlefield tapped and attacking.
-SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | Attacking$ True
-SVar:X:Count$Valid Rat.YouCtrl+Other
-SVar:Y:Count$InYourYard
-SVar:SacMe:3
-SVar:DiscardMe:3
-SVar:BuffedBy:Rat
-SVar:PlayMain1:TRUE
-DeckNeeds:Type$Rat
-Oracle:Persistent Marshstalker gets +1/+0 for each other Rat you control.\nThreshold — Whenever you attack with one or more Rats, if seven of more cards are in your graveyard, you may pay {2}{B}. If you do, return Persistent Marshstalker from your graveyard to the battlefield tapped and attacking.
\ No newline at end of file
+Name:Persistent Marshstalker
+ManaCost:1 B
+Types:Creature Rat Berserker
+PT:3/1
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | Description$ CARDNAME gets +1/+0 for each other Rat you control.
+T:Mode$ AttackersDeclared | ValidAttackers$ Creature.YouCtrl+Rat | TriggerZones$ Graveyard | Execute$ TrigChangeZone | CheckSVar$ Y | SVarCompare$ GE7 | TriggerDescription$ Threshold — Whenever you attack with one or more Rats, if seven of more cards are in your graveyard, you may pay {2}{B}. If you do, return CARDNAME from your graveyard to the battlefield tapped and attacking.
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | Attacking$ True
+SVar:X:Count$Valid Rat.YouCtrl+Other
+SVar:Y:Count$InYourYard
+SVar:SacMe:3
+SVar:DiscardMe:3
+SVar:BuffedBy:Rat
+SVar:PlayMain1:TRUE
+DeckNeeds:Type$Rat
+Oracle:Persistent Marshstalker gets +1/+0 for each other Rat you control.\nThreshold — Whenever you attack with one or more Rats, if seven of more cards are in your graveyard, you may pay {2}{B}. If you do, return Persistent Marshstalker from your graveyard to the battlefield tapped and attacking.
diff --git a/forge-gui/res/cardsfolder/upcoming/phantom_blade.txt b/forge-gui/res/cardsfolder/upcoming/phantom_blade.txt
index 5edbc2be535..e3b848d3eee 100644
--- a/forge-gui/res/cardsfolder/upcoming/phantom_blade.txt
+++ b/forge-gui/res/cardsfolder/upcoming/phantom_blade.txt
@@ -1,9 +1,9 @@
-Name:Phantom Blade
-ManaCost:4 B
-Types:Artifact Equipment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When CARDNAME enters, attach it to up to one target creature you control. Destroy up to one other target creature.
-SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature you control | SubAbility$ DBDestroy
-SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature | TargetUnique$ True | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one other target creature
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Menace | Description$ Equipped creature gets +1/+1 and has menace. (It can't be blocked except by two or more creatures.)
-K:Equip:2
-Oracle:When Phantom Blade enters, attach it to up to one target creature you control. Destroy up to one other target creature.\nEquipped creature gets +1/+1 and has menace. (It can't be blocked except by two or more creatures.)\nEquip {2}
+Name:Phantom Blade
+ManaCost:4 B
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When CARDNAME enters, attach it to up to one target creature you control. Destroy up to one other target creature.
+SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature you control | SubAbility$ DBDestroy
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature | TargetUnique$ True | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one other target creature
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Menace | Description$ Equipped creature gets +1/+1 and has menace. (It can't be blocked except by two or more creatures.)
+K:Equip:2
+Oracle:When Phantom Blade enters, attach it to up to one target creature you control. Destroy up to one other target creature.\nEquipped creature gets +1/+1 and has menace. (It can't be blocked except by two or more creatures.)\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/upcoming/pileated_provisioner.txt b/forge-gui/res/cardsfolder/upcoming/pileated_provisioner.txt
index 57e1d925d97..3020f82af46 100644
--- a/forge-gui/res/cardsfolder/upcoming/pileated_provisioner.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pileated_provisioner.txt
@@ -1,9 +1,9 @@
-Name:Pileated Provisioner
-ManaCost:4 W
-Types:Creature Bird Scout
-PT:3/4
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPut | TriggerDescription$ When CARDNAME enters, put a +1/+1 counter on target creature you control without flying.
-SVar:TrigPut:DB$ PutCounter | ValidTgts$ Creature.YouCtrl+withoutFlying | TgtPrompt$ Select target creature you control without flying | CounterType$ P1P1
-DeckHas:Ability$Counters
-Oracle:Flying\nWhen Pileated Provisioner enters, put a +1/+1 counter on target creature you control without flying.
\ No newline at end of file
+Name:Pileated Provisioner
+ManaCost:4 W
+Types:Creature Bird Scout
+PT:3/4
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPut | TriggerDescription$ When CARDNAME enters, put a +1/+1 counter on target creature you control without flying.
+SVar:TrigPut:DB$ PutCounter | ValidTgts$ Creature.YouCtrl+withoutFlying | TgtPrompt$ Select target creature you control without flying | CounterType$ P1P1
+DeckHas:Ability$Counters
+Oracle:Flying\nWhen Pileated Provisioner enters, put a +1/+1 counter on target creature you control without flying.
diff --git a/forge-gui/res/cardsfolder/upcoming/playful_shove.txt b/forge-gui/res/cardsfolder/upcoming/playful_shove.txt
index 49b817d4f73..98e2de5e2b9 100644
--- a/forge-gui/res/cardsfolder/upcoming/playful_shove.txt
+++ b/forge-gui/res/cardsfolder/upcoming/playful_shove.txt
@@ -1,6 +1,6 @@
-Name:Playful Shove
-ManaCost:1 R
-Types:Sorcery
-A:SP$ DealDamage | ValidTgts$ Any | NumDmg$ 1 | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals 1 damage to any target. Draw a card.
-SVar:DBDraw:DB$ Draw
-Oracle:Playful Shove deals 1 damage to any target.\nDraw a card.
\ No newline at end of file
+Name:Playful Shove
+ManaCost:1 R
+Types:Sorcery
+A:SP$ DealDamage | ValidTgts$ Any | NumDmg$ 1 | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals 1 damage to any target. Draw a card.
+SVar:DBDraw:DB$ Draw
+Oracle:Playful Shove deals 1 damage to any target.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/plumecreed_escort.txt b/forge-gui/res/cardsfolder/upcoming/plumecreed_escort.txt
index 59ed0b25035..7dc78bed1d5 100644
--- a/forge-gui/res/cardsfolder/upcoming/plumecreed_escort.txt
+++ b/forge-gui/res/cardsfolder/upcoming/plumecreed_escort.txt
@@ -1,9 +1,9 @@
-Name:Plumecreed Escort
-ManaCost:1 U
-Types:Creature Bird Scout
-PT:2/1
-K:Flash
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature you control gains hexproof until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Hexproof
-Oracle:Flash\nFlying\nWhen Plumecreed Escort enters, target creature you control gains hexproof until end of turn.
\ No newline at end of file
+Name:Plumecreed Escort
+ManaCost:1 U
+Types:Creature Bird Scout
+PT:2/1
+K:Flash
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature you control gains hexproof until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Hexproof
+Oracle:Flash\nFlying\nWhen Plumecreed Escort enters, target creature you control gains hexproof until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/plumecreed_mentor.txt b/forge-gui/res/cardsfolder/upcoming/plumecreed_mentor.txt
index 98f3c724e89..6aaf6fe27ca 100644
--- a/forge-gui/res/cardsfolder/upcoming/plumecreed_mentor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/plumecreed_mentor.txt
@@ -1,9 +1,9 @@
-Name:Plumecreed Mentor
-ManaCost:1 W U
-Types:Creature Bird Scout
-PT:2/3
-K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self,Creature.Other+YouCtrl+withFlying | Origin$ Any | Destination$ Battlefield | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another creature you control with flying enters, put a +1/+1 counter on target creature you control without flying.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.withoutFlying+YouCtrl | TgtPrompt$ Select target creature you control without flying. | CounterType$ P1P1 | CounterNum$ 1
-DeckHas:Ability$Counters
-Oracle:Flying\nWhenever Plumecreed Mentor or another creature you control with flying enters, put a +1/+1 counter on target creature you control without flying.
+Name:Plumecreed Mentor
+ManaCost:1 W U
+Types:Creature Bird Scout
+PT:2/3
+K:Flying
+T:Mode$ ChangesZone | ValidCard$ Card.Self,Creature.Other+YouCtrl+withFlying | Origin$ Any | Destination$ Battlefield | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another creature you control with flying enters, put a +1/+1 counter on target creature you control without flying.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.withoutFlying+YouCtrl | TgtPrompt$ Select target creature you control without flying. | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
+Oracle:Flying\nWhenever Plumecreed Mentor or another creature you control with flying enters, put a +1/+1 counter on target creature you control without flying.
diff --git a/forge-gui/res/cardsfolder/upcoming/poison_blade_mentor.txt b/forge-gui/res/cardsfolder/upcoming/poison_blade_mentor.txt
index 2f79bac115f..07b954e7faf 100644
--- a/forge-gui/res/cardsfolder/upcoming/poison_blade_mentor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/poison_blade_mentor.txt
@@ -1,8 +1,8 @@
-Name:Poison-Blade Mentor
-ManaCost:1 B
-Types:Creature Human Assassin
-PT:2/1
-K:Deathtouch
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target Assassin you control gains deathtouch until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Assassin.Other+YouCtrl | TgtPrompt$ Select another target attacking creature | KW$ Deathtouch
-Oracle:Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)\nWhenever Poison-Blade Mentor attacks, another target Assassin you control gains deathtouch until end of turn.
+Name:Poison-Blade Mentor
+ManaCost:1 B
+Types:Creature Human Assassin
+PT:2/1
+K:Deathtouch
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target Assassin you control gains deathtouch until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Assassin.Other+YouCtrl | TgtPrompt$ Select another target attacking creature | KW$ Deathtouch
+Oracle:Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)\nWhenever Poison-Blade Mentor attacks, another target Assassin you control gains deathtouch until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/polliwallop.txt b/forge-gui/res/cardsfolder/upcoming/polliwallop.txt
index f24b32e770e..c090397b020 100644
--- a/forge-gui/res/cardsfolder/upcoming/polliwallop.txt
+++ b/forge-gui/res/cardsfolder/upcoming/polliwallop.txt
@@ -1,9 +1,9 @@
-Name:Polliwallop
-ManaCost:3 G
-Types:Instant
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each Frog you control.
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to twice its power to target creature you don't control.
-SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ Y | DamageSource$ ParentTarget
-SVar:X:Count$Valid Frog.YouCtrl
-SVar:Y:ParentTargeted$CardPower/Twice
-Oracle:This spell costs {1} less to cast for each Frog you control.\nTarget creature you control deals damage equal to twice its power to target creature you don't control.
\ No newline at end of file
+Name:Polliwallop
+ManaCost:3 G
+Types:Instant
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each Frog you control.
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to twice its power to target creature you don't control.
+SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ Y | DamageSource$ ParentTarget
+SVar:X:Count$Valid Frog.YouCtrl
+SVar:Y:ParentTargeted$CardPower/Twice
+Oracle:This spell costs {1} less to cast for each Frog you control.\nTarget creature you control deals damage equal to twice its power to target creature you don't control.
diff --git a/forge-gui/res/cardsfolder/upcoming/pollywog_prodigy.txt b/forge-gui/res/cardsfolder/upcoming/pollywog_prodigy.txt
index cbfa9129407..5e920f97229 100644
--- a/forge-gui/res/cardsfolder/upcoming/pollywog_prodigy.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pollywog_prodigy.txt
@@ -1,9 +1,9 @@
-Name:Pollywog Prodigy
-ManaCost:1 U
-Types:Creature Frog Wizard
-PT:1/3
-K:Evolve
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature+cmcLTX | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent casts a noncreature spell with mana value less than CARDNAME's power, draw a card.
-SVar:TrigDraw:DB$ Draw
-SVar:X:Count$CardPower
-Oracle:Evolve (Whenever a creature you control enters, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)\nWhenever an opponent casts a noncreature spell with mana value less than Pollywog Prodigy's power, draw a card.
\ No newline at end of file
+Name:Pollywog Prodigy
+ManaCost:1 U
+Types:Creature Frog Wizard
+PT:1/3
+K:Evolve
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature+cmcLTX | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent casts a noncreature spell with mana value less than CARDNAME's power, draw a card.
+SVar:TrigDraw:DB$ Draw
+SVar:X:Count$CardPower
+Oracle:Evolve (Whenever a creature you control enters, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)\nWhenever an opponent casts a noncreature spell with mana value less than Pollywog Prodigy's power, draw a card.