diff --git a/forge-gui/res/cardsfolder/upcoming/pond_prophet.txt b/forge-gui/res/cardsfolder/upcoming/pond_prophet.txt
index fd6356111cc..b5aae7f1644 100644
--- a/forge-gui/res/cardsfolder/upcoming/pond_prophet.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pond_prophet.txt
@@ -1,7 +1,7 @@
-Name:Pond Prophet
-ManaCost:GU GU
-Types:Creature Frog Advisor
-PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card.
-SVar:TrigDraw:DB$ Draw
-Oracle:When Pond Prophet enters, draw a card.
\ No newline at end of file
+Name:Pond Prophet
+ManaCost:GU GU
+Types:Creature Frog Advisor
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card.
+SVar:TrigDraw:DB$ Draw
+Oracle:When Pond Prophet enters, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/portent_of_calamity.txt b/forge-gui/res/cardsfolder/upcoming/portent_of_calamity.txt
index 948c417bd10..7e801459559 100644
--- a/forge-gui/res/cardsfolder/upcoming/portent_of_calamity.txt
+++ b/forge-gui/res/cardsfolder/upcoming/portent_of_calamity.txt
@@ -1,14 +1,14 @@
-Name:Portent of Calamity
-ManaCost:X U
-Types:Sorcery
-A:SP$ PeekAndReveal | PeekAmount$ X | Reveal$ True | ImprintRevealed$ True | SubAbility$ DBRepeatTypes | SpellDescription$ Reveal the top X cards of your library. For each card type, you may exile a card of that type from among them. Put the rest into your graveyard. You may cast a spell from among the exiled cards without paying its mana cost if you exiled four or more cards this way. Then put the rest of the exiled cards into your hand.
-SVar:DBRepeatTypes:DB$ RepeatEach | RepeatTypesFrom$ Card.IsImprinted | TypesFromZone$ Library | RepeatSubAbility$ ChooseCard | SubAbility$ DBChangeZone
-SVar:ChooseCard:DB$ ChooseCard | Choices$ Card.ChosenType+YouOwn+IsImprinted | ChoiceZone$ Library | RememberChosen$ True
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Exile | Defined$ Remembered | SubAbility$ DBGraveyard
-SVar:DBGraveyard:DB$ ChangeZoneAll | Origin$ Library | Destination$ Graveyard | ChangeType$ Card.IsImprinted+!IsRemembered | SubAbility$ DBPlay
-SVar:DBPlay:DB$ Play | Valid$ Card.IsRemembered | ValidZone$ Exile | ValidSA$ Spell | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE4 | Controller$ You | WithoutManaCost$ True | Optional$ True | Amount$ 1 | SubAbility$ DBChangeZone2
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Exile | Destination$ Hand | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
-SVar:X:Count$xPaid
-SVar:Y:Count$ValidExile Card.IsRemembered
-Oracle:Reveal the top X cards of your library. For each card type, you may exile a card of that type from among them. Put the rest into your graveyard. You may cast a spell from among the exiled cards without paying its mana cost if you exiled four or more cards this way. Then put the rest of the exiled cards into your hand.
+Name:Portent of Calamity
+ManaCost:X U
+Types:Sorcery
+A:SP$ PeekAndReveal | PeekAmount$ X | Reveal$ True | ImprintRevealed$ True | SubAbility$ DBRepeatTypes | SpellDescription$ Reveal the top X cards of your library. For each card type, you may exile a card of that type from among them. Put the rest into your graveyard. You may cast a spell from among the exiled cards without paying its mana cost if you exiled four or more cards this way. Then put the rest of the exiled cards into your hand.
+SVar:DBRepeatTypes:DB$ RepeatEach | RepeatTypesFrom$ Card.IsImprinted | TypesFromZone$ Library | RepeatSubAbility$ ChooseCard | SubAbility$ DBChangeZone
+SVar:ChooseCard:DB$ ChooseCard | Choices$ Card.ChosenType+YouOwn+IsImprinted | ChoiceZone$ Library | RememberChosen$ True
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Exile | Defined$ Remembered | SubAbility$ DBGraveyard
+SVar:DBGraveyard:DB$ ChangeZoneAll | Origin$ Library | Destination$ Graveyard | ChangeType$ Card.IsImprinted+!IsRemembered | SubAbility$ DBPlay
+SVar:DBPlay:DB$ Play | Valid$ Card.IsRemembered | ValidZone$ Exile | ValidSA$ Spell | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE4 | Controller$ You | WithoutManaCost$ True | Optional$ True | Amount$ 1 | SubAbility$ DBChangeZone2
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Exile | Destination$ Hand | Defined$ Remembered | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
+SVar:X:Count$xPaid
+SVar:Y:Count$ValidExile Card.IsRemembered
+Oracle:Reveal the top X cards of your library. For each card type, you may exile a card of that type from among them. Put the rest into your graveyard. You may cast a spell from among the exiled cards without paying its mana cost if you exiled four or more cards this way. Then put the rest of the exiled cards into your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/prosperous_bandit.txt b/forge-gui/res/cardsfolder/upcoming/prosperous_bandit.txt
index f1aee221ade..204701df861 100644
--- a/forge-gui/res/cardsfolder/upcoming/prosperous_bandit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/prosperous_bandit.txt
@@ -1,10 +1,10 @@
-Name:Prosperous Bandit
-ManaCost:2 R
-Types:Creature Raccoon Rogue
-PT:2/2
-K:Offspring:1
-K:First Strike
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerDescription$ Whenever this creature deals combat damage to a player, create that many tapped Treasure tokens.
-SVar:TrigToken:DB$ Token | TokenScript$ c_a_treasure_sac | TokenAmount$ X | TokenTapped$ True
-SVar:X:TriggerCount$DamageAmount
-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.)\nFirst strike\nWhenever this creature deals combat damage to a player, create that many tapped Treasure tokens.
\ No newline at end of file
+Name:Prosperous Bandit
+ManaCost:2 R
+Types:Creature Raccoon Rogue
+PT:2/2
+K:Offspring:1
+K:First Strike
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerDescription$ Whenever this creature deals combat damage to a player, create that many tapped Treasure tokens.
+SVar:TrigToken:DB$ Token | TokenScript$ c_a_treasure_sac | TokenAmount$ X | TokenTapped$ True
+SVar:X:TriggerCount$DamageAmount
+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.)\nFirst strike\nWhenever this creature deals combat damage to a player, create that many tapped Treasure tokens.
diff --git a/forge-gui/res/cardsfolder/upcoming/psychic_whorl.txt b/forge-gui/res/cardsfolder/upcoming/psychic_whorl.txt
index b120531bde2..ecb393a4fca 100644
--- a/forge-gui/res/cardsfolder/upcoming/psychic_whorl.txt
+++ b/forge-gui/res/cardsfolder/upcoming/psychic_whorl.txt
@@ -1,7 +1,7 @@
-Name:Psychic Whorl
-ManaCost:2 B
-Types:Sorcery
-A:SP$ Discard | ValidTgts$ Player | NumCards$ 2 | Mode$ TgtChoose | SubAbility$ DBSurveil | SpellDescription$ Target player discards two cards. Then if you control a Rat, 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:DBSurveil:DB$ Surveil | Defined$ You | Amount$ 2 | ConditionPresent$ Rat.YouCtrl | ConditionCompare$ GE1
-DeckHas:Ability$Discard
-Oracle:Target player discards two cards. Then if you control a Rat, 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.)
+Name:Psychic Whorl
+ManaCost:2 B
+Types:Sorcery
+A:SP$ Discard | ValidTgts$ Player | NumCards$ 2 | Mode$ TgtChoose | SubAbility$ DBSurveil | SpellDescription$ Target player discards two cards. Then if you control a Rat, 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:DBSurveil:DB$ Surveil | Defined$ You | Amount$ 2 | ConditionPresent$ Rat.YouCtrl | ConditionCompare$ GE1
+DeckHas:Ability$Discard
+Oracle:Target player discards two cards. Then if you control a Rat, 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/pyreswipe_hawk.txt b/forge-gui/res/cardsfolder/upcoming/pyreswipe_hawk.txt
index 37216feb721..56d84041958 100644
--- a/forge-gui/res/cardsfolder/upcoming/pyreswipe_hawk.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pyreswipe_hawk.txt
@@ -1,12 +1,12 @@
-Name:Pyreswipe Hawk
-ManaCost:3 R R
-Types:Creature Elemental Bird
-PT:4/4
-K:Flying
-K:Haste
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +X/+0 until end of turn, where X is the greatest mana value among artifacts you control.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X
-T:Mode$ ManaExpend | Amount$ 6 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigGainControl | TriggerDescription$ Whenever you expend 6, gain control of up to one target artifact for as long as you control CARDNAME. (You expend 6 as you spend your sixth total mana to cast spells during a turn.)
-SVar:TrigGainControl:DB$ GainControl | ValidTgts$ Artifact | TgtPrompt$ Select target artifact. | TargetMin$ 0 | TargetMax$ 1 | LoseControl$ LeavesPlay,LoseControl
-SVar:X:Count$Valid Artifact.YouCtrl$GreatestCMC
-Oracle:Flying, haste\nWhenever Pyreswipe Hawk attacks, it gets +X/+0 until end of turn, where X is the greatest mana value among artifacts you control.\nWhenever you expend 6, gain control of up to one target artifact for as long as you control Pyreswipe Hawk. (You expend 6 as you spend your sixth total mana to cast spells during a turn.)
\ No newline at end of file
+Name:Pyreswipe Hawk
+ManaCost:3 R R
+Types:Creature Elemental Bird
+PT:4/4
+K:Flying
+K:Haste
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +X/+0 until end of turn, where X is the greatest mana value among artifacts you control.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X
+T:Mode$ ManaExpend | Amount$ 6 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigGainControl | TriggerDescription$ Whenever you expend 6, gain control of up to one target artifact for as long as you control CARDNAME. (You expend 6 as you spend your sixth total mana to cast spells during a turn.)
+SVar:TrigGainControl:DB$ GainControl | ValidTgts$ Artifact | TgtPrompt$ Select target artifact. | TargetMin$ 0 | TargetMax$ 1 | LoseControl$ LeavesPlay,LoseControl
+SVar:X:Count$Valid Artifact.YouCtrl$GreatestCMC
+Oracle:Flying, haste\nWhenever Pyreswipe Hawk attacks, it gets +X/+0 until end of turn, where X is the greatest mana value among artifacts you control.\nWhenever you expend 6, gain control of up to one target artifact for as long as you control Pyreswipe Hawk. (You expend 6 as you spend your sixth total mana to cast spells during a turn.)
diff --git a/forge-gui/res/cardsfolder/upcoming/quaketusk_boar.txt b/forge-gui/res/cardsfolder/upcoming/quaketusk_boar.txt
index 8648dd6e608..480630a9a4a 100644
--- a/forge-gui/res/cardsfolder/upcoming/quaketusk_boar.txt
+++ b/forge-gui/res/cardsfolder/upcoming/quaketusk_boar.txt
@@ -1,8 +1,8 @@
-Name:Quaketusk Boar
-ManaCost:3 R R
-Types:Creature Elemental Boar
-PT:5/5
-K:Reach
-K:Trample
-K:Haste
-Oracle:Reach, trample, haste
\ No newline at end of file
+Name:Quaketusk Boar
+ManaCost:3 R R
+Types:Creature Elemental Boar
+PT:5/5
+K:Reach
+K:Trample
+K:Haste
+Oracle:Reach, trample, haste
diff --git a/forge-gui/res/cardsfolder/upcoming/rabbit_response.txt b/forge-gui/res/cardsfolder/upcoming/rabbit_response.txt
index 5e2d6bdd459..f3969492bed 100644
--- a/forge-gui/res/cardsfolder/upcoming/rabbit_response.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rabbit_response.txt
@@ -1,6 +1,6 @@
-Name:Rabbit Response
-ManaCost:2 W W
-Types:Instant
-A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ +1 | SubAbility$ DBScry | SpellDescription$ Creatures you control get +2/+1 until end of turn. If you control a Rabbit, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom and rest on top in any order.)
-SVar:DBScry:DB$ Scry | ScryNum$ 2 | ConditionPresent$ Rabbit.YouCtrl
-Oracle:Creatures you control get +2/+1 until end of turn. If you control a Rabbit, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom and rest on top in any order.)
\ No newline at end of file
+Name:Rabbit Response
+ManaCost:2 W W
+Types:Instant
+A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ +1 | SubAbility$ DBScry | SpellDescription$ Creatures you control get +2/+1 until end of turn. If you control a Rabbit, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom and rest on top in any order.)
+SVar:DBScry:DB$ Scry | ScryNum$ 2 | ConditionPresent$ Rabbit.YouCtrl
+Oracle:Creatures you control get +2/+1 until end of turn. If you control a Rabbit, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom and rest on top in any order.)
diff --git a/forge-gui/res/cardsfolder/upcoming/rabid_gnaw.txt b/forge-gui/res/cardsfolder/upcoming/rabid_gnaw.txt
index 944d4d8bf14..1727d9723b3 100644
--- a/forge-gui/res/cardsfolder/upcoming/rabid_gnaw.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rabid_gnaw.txt
@@ -1,7 +1,7 @@
-Name:Rabid Gnaw
-ManaCost:1 R
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | NumAtt$ +1 | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ {c:ThisTargetedCard} gets +1/+1 until end of turn. | SpellDescription$ Target creature you control gets +1/+0 until end of turn. Then it deals damage equal to 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$ X | DamageSource$ ParentTarget | StackDescription$ Then {c:ParentTarget} deals damage equal to its power to {c:ThisTargetedCard}.
-SVar:X:ParentTargeted$CardPower
-Oracle:Target creature you control gets +1/+0 until end of turn. Then it deals damage equal to its power to target creature you don't control.
\ No newline at end of file
+Name:Rabid Gnaw
+ManaCost:1 R
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | NumAtt$ +1 | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ {c:ThisTargetedCard} gets +1/+1 until end of turn. | SpellDescription$ Target creature you control gets +1/+0 until end of turn. Then it deals damage equal to 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$ X | DamageSource$ ParentTarget | StackDescription$ Then {c:ParentTarget} deals damage equal to its power to {c:ThisTargetedCard}.
+SVar:X:ParentTargeted$CardPower
+Oracle:Target creature you control gets +1/+0 until end of turn. Then it deals damage equal to its power to target creature you don't control.
diff --git a/forge-gui/res/cardsfolder/upcoming/raccoon_rallier.txt b/forge-gui/res/cardsfolder/upcoming/raccoon_rallier.txt
index 5b5fbb6639f..7fb219cbb52 100644
--- a/forge-gui/res/cardsfolder/upcoming/raccoon_rallier.txt
+++ b/forge-gui/res/cardsfolder/upcoming/raccoon_rallier.txt
@@ -1,6 +1,6 @@
-Name:Raccoon Rallier
-ManaCost:1 R
-Types:Creature Raccoon Bard
-PT:2/2
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Haste | SorcerySpeed$ True | SpellDescription$ Target creature you control gains haste until end of turn. Activate only as a sorcery.
-Oracle:{T}: Target creature you control gains haste until end of turn. Activate only as a sorcery.
\ No newline at end of file
+Name:Raccoon Rallier
+ManaCost:1 R
+Types:Creature Raccoon Bard
+PT:2/2
+A:AB$ Pump | Cost$ T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Haste | SorcerySpeed$ True | SpellDescription$ Target creature you control gains haste until end of turn. Activate only as a sorcery.
+Oracle:{T}: Target creature you control gains haste until end of turn. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/rapid_augmenter.txt b/forge-gui/res/cardsfolder/upcoming/rapid_augmenter.txt
index ac63b52d4de..8e6547f8ce9 100644
--- a/forge-gui/res/cardsfolder/upcoming/rapid_augmenter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rapid_augmenter.txt
@@ -1,13 +1,13 @@
-Name:Rapid Augmenter
-ManaCost:1 U R
-Types:Creature Otter Artificer
-PT:1/3
-K:Haste
-T:Mode$ ChangesZone | ValidCard$ Creature.Other+YouCtrl+basePowerEQ1 | Origin$ Any | Destination$ Battlefield | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever another creature you control with base power 1 enters, it gains haste until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredCard | KW$ Haste
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+wasNotCast+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control enters, if it wasn't cast, put a +1/+1 counter on CARDNAME and CARDNAME can't be blocked this turn.
-SVar:TrigPutCounter:DB$ PutCounter | CounterNum$ 1 | CounterType$ P1P1 | SubAbility$ DBUnblockable
-SVar:DBUnblockable:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
-SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
-DeckHas:Ability$Counters
-Oracle:Haste\nWhenever another creature you control with base power 1 enters, it gains haste until end of turn.\nWhenever another creature you control enters, if it wasn't cast, put a +1/+1 counter on Rapid Augmenter and Rapid Augmenter can't be blocked this turn.
\ No newline at end of file
+Name:Rapid Augmenter
+ManaCost:1 U R
+Types:Creature Otter Artificer
+PT:1/3
+K:Haste
+T:Mode$ ChangesZone | ValidCard$ Creature.Other+YouCtrl+basePowerEQ1 | Origin$ Any | Destination$ Battlefield | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever another creature you control with base power 1 enters, it gains haste until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredCard | KW$ Haste
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+wasNotCast+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control enters, if it wasn't cast, put a +1/+1 counter on CARDNAME and CARDNAME can't be blocked this turn.
+SVar:TrigPutCounter:DB$ PutCounter | CounterNum$ 1 | CounterType$ P1P1 | SubAbility$ DBUnblockable
+SVar:DBUnblockable:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
+DeckHas:Ability$Counters
+Oracle:Haste\nWhenever another creature you control with base power 1 enters, it gains haste until end of turn.\nWhenever another creature you control enters, if it wasn't cast, put a +1/+1 counter on Rapid Augmenter and Rapid Augmenter can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/ratonhnhake_ton.txt b/forge-gui/res/cardsfolder/upcoming/ratonhnhake_ton.txt
index 807d5ff23de..91e29497cde 100644
--- a/forge-gui/res/cardsfolder/upcoming/ratonhnhake_ton.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ratonhnhake_ton.txt
@@ -1,14 +1,14 @@
-Name:Ratonhnhaké:ton
-ManaCost:W U B
-Types:Legendary Creature Human Assassin
-PT:3/3
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Hexproof | IsPresent$ Card.Self+dealtDamagetoAny | PresentCompare$ EQ0 | Description$ As long as CARDNAME hasn't dealt damage yet, it has hexproof and can't be blocked.
-S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | Secondary$ True | IsPresent$ Card.Self+dealtDamagetoAny | PresentCompare$ EQ0 | Description$ As long as CARDNAME hasn't dealt damage yet, it has hexproof and can't be blocked.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, create a 1/1 black Assassin creature token with menace. When you do, return target Equipment card from your graveyard to the battlefield, then attach it to that token.
-SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_assassin_menace | RememberTokens$ True | SubAbility$ DBTrigger
-SVar:DBTrigger:DB$ ImmediateTrigger | Execute$ TrigChangeZone | ConditionDefined$ Remembered | ConditionPresent$ Card | TriggerDescription$ When you do, return target creature card from your graveyard to your hand.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Equipment.YouCtrl | SubAbility$ DBAttach
-SVar:DBAttach:DB$ Attach | Object$ Targeted | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Token
-Oracle:As long as Ratonhnhaké꞉ton hasn't dealt damage yet, it has hexproof and can't be blocked.\nWhenever Ratonhnhaké꞉ton deals combat damage to a player, create a 1/1 black Assassin creature token with menace. When you do, return target Equipment card from your graveyard to the battlefield, then attach it to that token.
+Name:Ratonhnhaké:ton
+ManaCost:W U B
+Types:Legendary Creature Human Assassin
+PT:3/3
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Hexproof | IsPresent$ Card.Self+dealtDamagetoAny | PresentCompare$ EQ0 | Description$ As long as CARDNAME hasn't dealt damage yet, it has hexproof and can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | Secondary$ True | IsPresent$ Card.Self+dealtDamagetoAny | PresentCompare$ EQ0 | Description$ As long as CARDNAME hasn't dealt damage yet, it has hexproof and can't be blocked.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, create a 1/1 black Assassin creature token with menace. When you do, return target Equipment card from your graveyard to the battlefield, then attach it to that token.
+SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_assassin_menace | RememberTokens$ True | SubAbility$ DBTrigger
+SVar:DBTrigger:DB$ ImmediateTrigger | Execute$ TrigChangeZone | ConditionDefined$ Remembered | ConditionPresent$ Card | TriggerDescription$ When you do, return target creature card from your graveyard to your hand.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Equipment.YouCtrl | SubAbility$ DBAttach
+SVar:DBAttach:DB$ Attach | Object$ Targeted | Defined$ Remembered | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Token
+Oracle:As long as Ratonhnhaké꞉ton hasn't dealt damage yet, it has hexproof and can't be blocked.\nWhenever Ratonhnhaké꞉ton deals combat damage to a player, create a 1/1 black Assassin creature token with menace. When you do, return target Equipment card from your graveyard to the battlefield, then attach it to that token.
diff --git a/forge-gui/res/cardsfolder/upcoming/raven_clan_war_axe.txt b/forge-gui/res/cardsfolder/upcoming/raven_clan_war_axe.txt
index 8ec0959884e..93cbd403562 100644
--- a/forge-gui/res/cardsfolder/upcoming/raven_clan_war_axe.txt
+++ b/forge-gui/res/cardsfolder/upcoming/raven_clan_war_axe.txt
@@ -1,9 +1,9 @@
-Name:Raven Clan War-Axe
-ManaCost:1 R W
-Types:Artifact Equipment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library and/or graveyard for a card named Eivor, Battle-Ready, reveal it, and put it into your hand. If you search your library this way, shuffle.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | OriginAlternative$ Graveyard | Destination$ Hand | ChangeType$ Card.YouOwn+namedEivor; Battle-Ready | Optional$ True
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddKeyword$ Trample | Description$ Equipped creature gets +2/+0 and has trample.
-K:Equip:2
-DeckHints:Name$Eivor, Battle-Ready
-Oracle:When Raven Clan War-Axe enters, you may search your library and/or graveyard for a card named Eivor, Battle-Ready, reveal it, and put it into your hand. If you search your library this way, shuffle.\nEquipped creature gets +2/+0 and has trample.\nEquip {2}
\ No newline at end of file
+Name:Raven Clan War-Axe
+ManaCost:1 R W
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library and/or graveyard for a card named Eivor, Battle-Ready, reveal it, and put it into your hand. If you search your library this way, shuffle.
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | OriginAlternative$ Graveyard | Destination$ Hand | ChangeType$ Card.YouOwn+namedEivor; Battle-Ready | Optional$ True
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddKeyword$ Trample | Description$ Equipped creature gets +2/+0 and has trample.
+K:Equip:2
+DeckHints:Name$Eivor, Battle-Ready
+Oracle:When Raven Clan War-Axe enters, you may search your library and/or graveyard for a card named Eivor, Battle-Ready, reveal it, and put it into your hand. If you search your library this way, shuffle.\nEquipped creature gets +2/+0 and has trample.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/upcoming/ravine_raider.txt b/forge-gui/res/cardsfolder/upcoming/ravine_raider.txt
index f32dd29f595..b196c415d10 100644
--- a/forge-gui/res/cardsfolder/upcoming/ravine_raider.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ravine_raider.txt
@@ -1,7 +1,7 @@
-Name:Ravine Raider
-ManaCost:B
-Types:Creature Lizard Rogue
-PT:1/1
-K:Menace
-A:AB$ Pump | Cost$ 1 B | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
-Oracle:Menace (This creature can't be blocked except by two or more creatures.)\n{1}{B}: Ravine Raider gets +1/+1 until end of turn.
+Name:Ravine Raider
+ManaCost:B
+Types:Creature Lizard Rogue
+PT:1/1
+K:Menace
+A:AB$ Pump | Cost$ 1 B | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
+Oracle:Menace (This creature can't be blocked except by two or more creatures.)\n{1}{B}: Ravine Raider gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/repel_calamity.txt b/forge-gui/res/cardsfolder/upcoming/repel_calamity.txt
index d6db6ea2c6e..f9b777f4cee 100644
--- a/forge-gui/res/cardsfolder/upcoming/repel_calamity.txt
+++ b/forge-gui/res/cardsfolder/upcoming/repel_calamity.txt
@@ -1,5 +1,5 @@
-Name:Repel Calamity
-ManaCost:1 W
-Types:Instant
-A:SP$ Destroy | ValidTgts$ Creature.powerGE4,Creature.toughnessGE4 | TgtPrompt$ Select target creature with power or toughness 4 or greater | SpellDescription$ Destroy target creature with power or toughness 4 or greater.
-Oracle:Destroy target creature with power or toughness 4 or greater.
\ No newline at end of file
+Name:Repel Calamity
+ManaCost:1 W
+Types:Instant
+A:SP$ Destroy | ValidTgts$ Creature.powerGE4,Creature.toughnessGE4 | TgtPrompt$ Select target creature with power or toughness 4 or greater | SpellDescription$ Destroy target creature with power or toughness 4 or greater.
+Oracle:Destroy target creature with power or toughness 4 or greater.
diff --git a/forge-gui/res/cardsfolder/upcoming/reptilian_recruiter.txt b/forge-gui/res/cardsfolder/upcoming/reptilian_recruiter.txt
index 1cd187098c6..6a08f1fb37d 100644
--- a/forge-gui/res/cardsfolder/upcoming/reptilian_recruiter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/reptilian_recruiter.txt
@@ -1,11 +1,11 @@
-Name:Reptilian Recruiter
-ManaCost:3 R R
-Types:Creature Lizard Warrior
-PT:4/2
-K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, choose target creature. If that creature's power is 2 or less or if you control another Lizard, gain control of that creature until end of turn, untap it, and it gains haste until end of turn.
-SVar:TrigChange:DB$ GainControl | TgtPrompt$ Choose target creature | ValidTgts$ Creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | ConditionCheckSVar$ X
-SVar:X:Count$Valid Creature.targetedBy+powerLE2/Plus.Y
-SVar:Y:Count$Valid Lizard.Other+YouCtrl
-SVar:PlayMain1:OPPONENTCREATURES
-Oracle:Trample\nWhen Reptilian Recruiter enters, choose target creature. If that creature's power is 2 or less or if you control another Lizard, gain control of that creature until end of turn, untap it, and it gains haste until end of turn.
+Name:Reptilian Recruiter
+ManaCost:3 R R
+Types:Creature Lizard Warrior
+PT:4/2
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, choose target creature. If that creature's power is 2 or less or if you control another Lizard, gain control of that creature until end of turn, untap it, and it gains haste until end of turn.
+SVar:TrigChange:DB$ GainControl | TgtPrompt$ Choose target creature | ValidTgts$ Creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | ConditionCheckSVar$ X
+SVar:X:Count$Valid Creature.targetedBy+powerLE2/Plus.Y
+SVar:Y:Count$Valid Lizard.Other+YouCtrl
+SVar:PlayMain1:OPPONENTCREATURES
+Oracle:Trample\nWhen Reptilian Recruiter enters, choose target creature. If that creature's power is 2 or less or if you control another Lizard, gain control of that creature until end of turn, untap it, and it gains haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/restart_sequence.txt b/forge-gui/res/cardsfolder/upcoming/restart_sequence.txt
index c3498db26f7..1825771819a 100644
--- a/forge-gui/res/cardsfolder/upcoming/restart_sequence.txt
+++ b/forge-gui/res/cardsfolder/upcoming/restart_sequence.txt
@@ -1,6 +1,6 @@
-Name:Restart Sequence
-ManaCost:3 B
-Types:Sorcery
-K:Freerunning:1 B
-A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return target creature card from your graveyard to the battlefield.
-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.)\nReturn target creature card from your graveyard to the battlefield.
+Name:Restart Sequence
+ManaCost:3 B
+Types:Sorcery
+K:Freerunning:1 B
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return target creature card from your graveyard to the battlefield.
+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.)\nReturn target creature card from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/rockface_village.txt b/forge-gui/res/cardsfolder/upcoming/rockface_village.txt
index a992f1ed511..9a2e7a95139 100644
--- a/forge-gui/res/cardsfolder/upcoming/rockface_village.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rockface_village.txt
@@ -1,7 +1,7 @@
-Name:Rockface Village
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ T | Produced$ R | RestrictValid$ Spell.Creature | SpellDescription$ Add {R}. Spend this mana only to cast a creature spell.
-A:AB$ Pump | Cost$ R T | ValidTgts$ Lizard.YouCtrl,Mouse.YouCtrl,Otter.YouCtrl,Raccoon.YouCtrl | TgtPrompt$ Select target Lizard, Mouse, Otter, or Raccoon you control | NumAtt$ +1 | KW$ Haste | SorcerySpeed$ True | SpellDescription$ Target Lizard, Mouse, Otter, or Raccoon you control gets +1/+0 and gains haste until end of turn. Activate only as a sorcery.
-Oracle:{T}: Add {C}.\n{T}: Add {R}. Spend this mana only to cast a creature spell.\n{R}, {T}: Target Lizard, Mouse, Otter, or Raccoon you control gets +1/+0 and gains haste until end of turn. Activate only as a sorcery.
\ No newline at end of file
+Name:Rockface Village
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ R | RestrictValid$ Spell.Creature | SpellDescription$ Add {R}. Spend this mana only to cast a creature spell.
+A:AB$ Pump | Cost$ R T | ValidTgts$ Lizard.YouCtrl,Mouse.YouCtrl,Otter.YouCtrl,Raccoon.YouCtrl | TgtPrompt$ Select target Lizard, Mouse, Otter, or Raccoon you control | NumAtt$ +1 | KW$ Haste | SorcerySpeed$ True | SpellDescription$ Target Lizard, Mouse, Otter, or Raccoon you control gets +1/+0 and gains haste until end of turn. Activate only as a sorcery.
+Oracle:{T}: Add {C}.\n{T}: Add {R}. Spend this mana only to cast a creature spell.\n{R}, {T}: Target Lizard, Mouse, Otter, or Raccoon you control gets +1/+0 and gains haste until end of turn. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/rolling_hamsphere.txt b/forge-gui/res/cardsfolder/upcoming/rolling_hamsphere.txt
index 3a90fb39afe..04d593cbcdb 100644
--- a/forge-gui/res/cardsfolder/upcoming/rolling_hamsphere.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rolling_hamsphere.txt
@@ -1,11 +1,11 @@
-Name:Rolling Hamsphere
-ManaCost:7
-Types:Artifact Vehicle
-PT:4/4
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ CARDNAME gets +1/+1 for each Hamster you control.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create three 1/1 red Hamster creature tokens, then it deals X damage to any target, where X is the number of Hamsters you control.
-SVar:TrigToken:DB$ Token | TokenAmount$ 3 | TokenScript$ r_1_1_hamster | SubAbility$ DBDealDamage
-SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ X
-K:Crew:3
-SVar:X:Count$Valid Hamster.YouCtrl
-Oracle:Rolling Hamsphere gets +1/+1 for each Hamster you control.\nWhenever Rolling Hamsphere attacks, create three 1/1 red Hamster creature tokens, then it deals X damage to any target, where X is the number of Hamsters you control.\nCrew 3
+Name:Rolling Hamsphere
+ManaCost:7
+Types:Artifact Vehicle
+PT:4/4
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ CARDNAME gets +1/+1 for each Hamster you control.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create three 1/1 red Hamster creature tokens, then it deals X damage to any target, where X is the number of Hamsters you control.
+SVar:TrigToken:DB$ Token | TokenAmount$ 3 | TokenScript$ r_1_1_hamster | SubAbility$ DBDealDamage
+SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ X
+K:Crew:3
+SVar:X:Count$Valid Hamster.YouCtrl
+Oracle:Rolling Hamsphere gets +1/+1 for each Hamster you control.\nWhenever Rolling Hamsphere attacks, create three 1/1 red Hamster creature tokens, then it deals X damage to any target, where X is the number of Hamsters you control.\nCrew 3
diff --git a/forge-gui/res/cardsfolder/upcoming/rooftop_bypass.txt b/forge-gui/res/cardsfolder/upcoming/rooftop_bypass.txt
index 3c03fd05dd7..8af5bfb2f77 100644
--- a/forge-gui/res/cardsfolder/upcoming/rooftop_bypass.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rooftop_bypass.txt
@@ -1,7 +1,7 @@
-Name:Rooftop Bypass
-ManaCost:1 U B
-Types:Enchantment
-T:Mode$ DamageDoneOnce | ValidSource$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerDescription$ Whenever one or more nontoken creatures you control deal combat damage to a player, create a 1/1 black Assassin creature token with menace. (It can't be blocked except by two or more creatures.)
-SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_assassin_menace
-DeckHas:Ability$Token
-Oracle:Whenever one or more nontoken creatures you control deal combat damage to a player, create a 1/1 black Assassin creature token with menace. (It can't be blocked except by two or more creatures.)
\ No newline at end of file
+Name:Rooftop Bypass
+ManaCost:1 U B
+Types:Enchantment
+T:Mode$ DamageDoneOnce | ValidSource$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerDescription$ Whenever one or more nontoken creatures you control deal combat damage to a player, create a 1/1 black Assassin creature token with menace. (It can't be blocked except by two or more creatures.)
+SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_assassin_menace
+DeckHas:Ability$Token
+Oracle:Whenever one or more nontoken creatures you control deal combat damage to a player, create a 1/1 black Assassin creature token with menace. (It can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/upcoming/rootcast_apprenticeship.txt b/forge-gui/res/cardsfolder/upcoming/rootcast_apprenticeship.txt
index fb78791745f..a7dfd3a0ab9 100644
--- a/forge-gui/res/cardsfolder/upcoming/rootcast_apprenticeship.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rootcast_apprenticeship.txt
@@ -1,10 +1,10 @@
-Name:Rootcast Apprenticeship
-ManaCost:3 G
-Types:Sorcery
-A:SP$ Charm | Choices$ DBPutCounter,DBCopy,DBToken,DBSacrifice | CharmNum$ 3 | CanRepeatModes$ True
-SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 3 | SpellDescription$ Put three +1/+1 counters on target creature.
-SVar:DBCopy:DB$ CopyPermanent | ValidTgts$ Permanent.token+YouCtrl | TgtPrompt$ Select target token you control | SpellDescription$ Create a token that's a copy of target token you control.
-SVar:DBToken:DB$ Token | ValidTgts$ Player | TokenAmount$ 1 | TokenScript$ g_1_1_squirrel | StackDescription$ SpellDescription | SpellDescription$ Target player creates a 1/1 green Squirrel creature token.
-SVar:DBSacrifice:DB$ Sacrifice | ValidTgts$ Opponent | SacValid$ Artifact.nonToken | SpellDescription$ Target opponent sacrifices a nontoken artifact. | SacMessage$ nontoken artifact
-DeckHas:Ability$Counters|Token
-Oracle:Choose three. You may choose the same mode more than once.\n• Put three +1/+1 counters on target creature.\n• Create a token that's a copy of target token you control.\n• Target player creates a 1/1 green Squirrel creature token.\n• Target opponent sacrifices a nontoken artifact.
+Name:Rootcast Apprenticeship
+ManaCost:3 G
+Types:Sorcery
+A:SP$ Charm | Choices$ DBPutCounter,DBCopy,DBToken,DBSacrifice | CharmNum$ 3 | CanRepeatModes$ True
+SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 3 | SpellDescription$ Put three +1/+1 counters on target creature.
+SVar:DBCopy:DB$ CopyPermanent | ValidTgts$ Permanent.token+YouCtrl | TgtPrompt$ Select target token you control | SpellDescription$ Create a token that's a copy of target token you control.
+SVar:DBToken:DB$ Token | ValidTgts$ Player | TokenAmount$ 1 | TokenScript$ g_1_1_squirrel | StackDescription$ SpellDescription | SpellDescription$ Target player creates a 1/1 green Squirrel creature token.
+SVar:DBSacrifice:DB$ Sacrifice | ValidTgts$ Opponent | SacValid$ Artifact.nonToken | SpellDescription$ Target opponent sacrifices a nontoken artifact. | SacMessage$ nontoken artifact
+DeckHas:Ability$Counters|Token
+Oracle:Choose three. You may choose the same mode more than once.\n• Put three +1/+1 counters on target creature.\n• Create a token that's a copy of target token you control.\n• Target player creates a 1/1 green Squirrel creature token.\n• Target opponent sacrifices a nontoken artifact.
diff --git a/forge-gui/res/cardsfolder/upcoming/roshan_hidden_magister.txt b/forge-gui/res/cardsfolder/upcoming/roshan_hidden_magister.txt
index b56c28c1dae..a144dd70126 100644
--- a/forge-gui/res/cardsfolder/upcoming/roshan_hidden_magister.txt
+++ b/forge-gui/res/cardsfolder/upcoming/roshan_hidden_magister.txt
@@ -1,10 +1,10 @@
-Name:Roshan, Hidden Magister
-ManaCost:3 B
-Types:Legendary Creature Human Assassin
-PT:4/4
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+Other | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | AddType$ Assassin | Description$ Other creatures you control are Assassins in addition to their other types. The same is true for creature spells you control and creature cards you own that aren't on the battlefield.
-S:Mode$ Continuous | Affected$ Creature.faceDown+YouCtrl | AddKeyword$ Menace | Description$ Face-down creatures you control have menace.
-T:Mode$ TurnFaceUp | ValidCard$ Permanent.YouCtrl | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever a permanent you control is turned face up, 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:Other creatures you control are Assassins in addition to their other types. The same is true for creature spells you control and creature cards you own that aren't on the battlefield.\nFace-down creatures you control have menace.\nWhenever a permanent you control is turned face up, you draw a card and you lose 1 life.
+Name:Roshan, Hidden Magister
+ManaCost:3 B
+Types:Legendary Creature Human Assassin
+PT:4/4
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+Other | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | AddType$ Assassin | Description$ Other creatures you control are Assassins in addition to their other types. The same is true for creature spells you control and creature cards you own that aren't on the battlefield.
+S:Mode$ Continuous | Affected$ Creature.faceDown+YouCtrl | AddKeyword$ Menace | Description$ Face-down creatures you control have menace.
+T:Mode$ TurnFaceUp | ValidCard$ Permanent.YouCtrl | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever a permanent you control is turned face up, 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:Other creatures you control are Assassins in addition to their other types. The same is true for creature spells you control and creature cards you own that aren't on the battlefield.\nFace-down creatures you control have menace.\nWhenever a permanent you control is turned face up, you draw a card and you lose 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/rottenmouth_viper.txt b/forge-gui/res/cardsfolder/upcoming/rottenmouth_viper.txt
index ee38c35b802..8a73c567e16 100644
--- a/forge-gui/res/cardsfolder/upcoming/rottenmouth_viper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rottenmouth_viper.txt
@@ -1,19 +1,19 @@
-Name:Rottenmouth Viper
-ManaCost:5 B
-Types:Creature Elemental Snake
-PT:6/6
-A:SP$ PermanentCreature | Cost$ 5 B Sac<X/Permanent.nonLand/nonland permanent> | AILogic$ SacToReduceCost
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Relative$ True | Description$ As an additional cost to cast this spell, you may sacrifice any number of nonland permanents. This spell costs {1} less to cast for each permanent sacrificed this way.
-SVar:X:Count$xPaid
-SVar:AIPreference:SacCost$Artifact.token+nonLegendary,Creature.token+powerLE2+toughnessLE2,Creature.cmcLE2+powerLE2+toughnessLE2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME enters or attacks, put a blight counter on it. Then for each blight counter on it, each opponent loses 4 life unless that player sacrifices a nonland permanent or discards a card.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, put a blight counter on it. Then for each blight counter on it, each opponent loses 4 life unless that player sacrifices a nonland permanent or discards a card.
-SVar:TrigPutCounter:DB$ PutCounter | CounterType$ BLIGHT | CounterNum$ 1 | SubAbility$ DBRepeat
-SVar:DBRepeat:DB$ Repeat | MaxRepeat$ Y | RepeatSubAbility$ RepeatTorment | AILogic$ MaxY | StackDescription$ Each opponent loses 4 life unless that player sacrifices a nonland permanent or discards a card.
-SVar:RepeatTorment:DB$ GenericChoice | Defined$ Opponent | TempRemember$ Chooser | Choices$ SacNonland,Discard | FallbackAbility$ LoseLifeFallback | AILogic$ PayUnlessCost
-SVar:Discard:DB$ LoseLife | Defined$ Remembered | LifeAmount$ 4 | UnlessCost$ Discard<1/Card> | UnlessPayer$ Remembered | SpellDescription$ You lose 4 life unless you discard a card
-SVar:SacNonland:DB$ LoseLife | Defined$ Remembered | LifeAmount$ 4 | UnlessCost$ Sac<1/Permanent.nonLand/nonland permanent> | UnlessPayer$ Remembered | SpellDescription$ You lose 4 life unless you sacrifice a nonland permanent
-SVar:LoseLifeFallback:DB$ LoseLife | Defined$ Remembered | LifeAmount$ 4
-SVar:Y:Count$CardCounters.BLIGHT
-DeckHas:Ability$Sacrifice|Counters
-Oracle:As an additional cost to cast this spell, you may sacrifice any number of nonland permanents. This spell costs {1} less to cast for each permanent sacrificed this way.\nWhenever Rottenmouth Viper enters or attacks, put a blight counter on it. Then for each blight counter on it, each opponent loses 4 life unless that player sacrifices a nonland permanent or discards a card.
+Name:Rottenmouth Viper
+ManaCost:5 B
+Types:Creature Elemental Snake
+PT:6/6
+A:SP$ PermanentCreature | Cost$ 5 B Sac<X/Permanent.nonLand/nonland permanent> | AILogic$ SacToReduceCost
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Relative$ True | Description$ As an additional cost to cast this spell, you may sacrifice any number of nonland permanents. This spell costs {1} less to cast for each permanent sacrificed this way.
+SVar:X:Count$xPaid
+SVar:AIPreference:SacCost$Artifact.token+nonLegendary,Creature.token+powerLE2+toughnessLE2,Creature.cmcLE2+powerLE2+toughnessLE2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME enters or attacks, put a blight counter on it. Then for each blight counter on it, each opponent loses 4 life unless that player sacrifices a nonland permanent or discards a card.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, put a blight counter on it. Then for each blight counter on it, each opponent loses 4 life unless that player sacrifices a nonland permanent or discards a card.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ BLIGHT | CounterNum$ 1 | SubAbility$ DBRepeat
+SVar:DBRepeat:DB$ Repeat | MaxRepeat$ Y | RepeatSubAbility$ RepeatTorment | AILogic$ MaxY | StackDescription$ Each opponent loses 4 life unless that player sacrifices a nonland permanent or discards a card.
+SVar:RepeatTorment:DB$ GenericChoice | Defined$ Opponent | TempRemember$ Chooser | Choices$ SacNonland,Discard | FallbackAbility$ LoseLifeFallback | AILogic$ PayUnlessCost
+SVar:Discard:DB$ LoseLife | Defined$ Remembered | LifeAmount$ 4 | UnlessCost$ Discard<1/Card> | UnlessPayer$ Remembered | SpellDescription$ You lose 4 life unless you discard a card
+SVar:SacNonland:DB$ LoseLife | Defined$ Remembered | LifeAmount$ 4 | UnlessCost$ Sac<1/Permanent.nonLand/nonland permanent> | UnlessPayer$ Remembered | SpellDescription$ You lose 4 life unless you sacrifice a nonland permanent
+SVar:LoseLifeFallback:DB$ LoseLife | Defined$ Remembered | LifeAmount$ 4
+SVar:Y:Count$CardCounters.BLIGHT
+DeckHas:Ability$Sacrifice|Counters
+Oracle:As an additional cost to cast this spell, you may sacrifice any number of nonland permanents. This spell costs {1} less to cast for each permanent sacrificed this way.\nWhenever Rottenmouth Viper enters or attacks, put a blight counter on it. Then for each blight counter on it, each opponent loses 4 life unless that player sacrifices a nonland permanent or discards a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/roughshod_duo.txt b/forge-gui/res/cardsfolder/upcoming/roughshod_duo.txt
index ea9368d06b2..38859775d41 100644
--- a/forge-gui/res/cardsfolder/upcoming/roughshod_duo.txt
+++ b/forge-gui/res/cardsfolder/upcoming/roughshod_duo.txt
@@ -1,8 +1,8 @@
-Name:Roughshod Duo
-ManaCost:2 R
-Types:Creature Mouse Raccoon
-PT:3/2
-K:Trample
-T:Mode$ ManaExpend | Amount$ 4 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you expend 4, target creature you control gets +1/+1 and gains trample until end of turn. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Trample
-Oracle:Trample\nWhenever you expend 4, target creature you control gets +1/+1 and gains trample 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:Roughshod Duo
+ManaCost:2 R
+Types:Creature Mouse Raccoon
+PT:3/2
+K:Trample
+T:Mode$ ManaExpend | Amount$ 4 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you expend 4, target creature you control gets +1/+1 and gains trample until end of turn. (You expend 4 as you spend your fourth total mana to cast spells during a turn.)
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Trample
+Oracle:Trample\nWhenever you expend 4, target creature you control gets +1/+1 and gains trample 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/rust_shield_rampager.txt b/forge-gui/res/cardsfolder/upcoming/rust_shield_rampager.txt
index b9d72abe972..343cbc2b2f3 100644
--- a/forge-gui/res/cardsfolder/upcoming/rust_shield_rampager.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rust_shield_rampager.txt
@@ -1,7 +1,7 @@
-Name:Rust-Shield Rampager
-ManaCost:3 G
-Types:Creature Raccoon Warrior
-PT:4/4
-K:Offspring:2
-S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.powerLE2 | Description$ This creature can't be blocked by creatures with power 2 or less.
-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.)\nThis creature can't be blocked by creatures with power 2 or less.
\ No newline at end of file
+Name:Rust-Shield Rampager
+ManaCost:3 G
+Types:Creature Raccoon Warrior
+PT:4/4
+K:Offspring:2
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.powerLE2 | Description$ This creature can't be blocked by creatures with power 2 or less.
+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.)\nThis creature can't be blocked by creatures with power 2 or less.
diff --git a/forge-gui/res/cardsfolder/upcoming/ruthless_negotiation.txt b/forge-gui/res/cardsfolder/upcoming/ruthless_negotiation.txt
index 2efd0dfb2bf..9cb626e7067 100644
--- a/forge-gui/res/cardsfolder/upcoming/ruthless_negotiation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ruthless_negotiation.txt
@@ -1,7 +1,7 @@
-Name:Ruthless Negotiation
-ManaCost:B
-Types:Sorcery
-A:SP$ ChangeZone | Origin$ Hand | Destination$ Exile | DefinedPlayer$ Targeted | ValidTgts$ Opponent | Chooser$ Targeted | ChangeType$ Card | ChangeNum$ 1 | IsCurse$ True | Mandatory$ True | StackDescription$ SpellDescription | SubAbility$ DBDraw | SpellDescription$ Target opponent exiles a card from their hand. If this spell was cast from a graveyard, draw a card.
-SVar:DBDraw:DB$ Draw | ConditionDefined$ Self | ConditionPresent$ Card.wasCastFromGraveyard | ConditionCompare$ EQ1
-K:Flashback:4 B
-Oracle:Target opponent exiles a card from their hand. If this spell was cast from a graveyard, draw a card.\nFlashback {4}{B} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
\ No newline at end of file
+Name:Ruthless Negotiation
+ManaCost:B
+Types:Sorcery
+A:SP$ ChangeZone | Origin$ Hand | Destination$ Exile | DefinedPlayer$ Targeted | ValidTgts$ Opponent | Chooser$ Targeted | ChangeType$ Card | ChangeNum$ 1 | IsCurse$ True | Mandatory$ True | StackDescription$ SpellDescription | SubAbility$ DBDraw | SpellDescription$ Target opponent exiles a card from their hand. If this spell was cast from a graveyard, draw a card.
+SVar:DBDraw:DB$ Draw | ConditionDefined$ Self | ConditionPresent$ Card.wasCastFromGraveyard | ConditionCompare$ EQ1
+K:Flashback:4 B
+Oracle:Target opponent exiles a card from their hand. If this spell was cast from a graveyard, draw a card.\nFlashback {4}{B} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/salvation_swan.txt b/forge-gui/res/cardsfolder/upcoming/salvation_swan.txt
index 31bf3d18d74..c3d1c784b73 100644
--- a/forge-gui/res/cardsfolder/upcoming/salvation_swan.txt
+++ b/forge-gui/res/cardsfolder/upcoming/salvation_swan.txt
@@ -1,12 +1,12 @@
-Name:Salvation Swan
-ManaCost:3 W
-Types:Creature Bird Cleric
-PT:3/3
-K:Flash
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Bird.Other+YouCtrl | Execute$ TrigBlink | TriggerDescription$ Whenever CARDNAME or another Bird you control enters, exile up to one target creature you control without flying. Return it to the battlefield under its owner's control with a flying counter on it at the beginning of the next end step.
-SVar:TrigBlink:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.YouCtrl+withoutFlying | TgtPrompt$ Select up to one target creature you control without flying | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DelTrig
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | TriggerDescription$ Return the exiled card to the battlefield. | SubAbility$ DBCleanup
-SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRememberedLKI | WithCountersType$ Flying
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Flash\nFlying\nWhenever Salvation Swan or another Bird you control enters, exile up to one target creature you control without flying. Return it to the battlefield under its owner's control with a flying counter on it at the beginning of the next end step.
+Name:Salvation Swan
+ManaCost:3 W
+Types:Creature Bird Cleric
+PT:3/3
+K:Flash
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Bird.Other+YouCtrl | Execute$ TrigBlink | TriggerDescription$ Whenever CARDNAME or another Bird you control enters, exile up to one target creature you control without flying. Return it to the battlefield under its owner's control with a flying counter on it at the beginning of the next end step.
+SVar:TrigBlink:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.YouCtrl+withoutFlying | TgtPrompt$ Select up to one target creature you control without flying | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DelTrig
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | TriggerDescription$ Return the exiled card to the battlefield. | SubAbility$ DBCleanup
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRememberedLKI | WithCountersType$ Flying
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Flash\nFlying\nWhenever Salvation Swan or another Bird you control enters, exile up to one target creature you control without flying. Return it to the battlefield under its owner's control with a flying counter on it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/upcoming/savor.txt b/forge-gui/res/cardsfolder/upcoming/savor.txt
index feaa06779cb..e371829ab93 100644
--- a/forge-gui/res/cardsfolder/upcoming/savor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/savor.txt
@@ -1,8 +1,8 @@
-Name:Savor
-ManaCost:1 B
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SubAbility$ DBToken | SpellDescription$ Target creature gets -2/-2 until end of turn.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You | SpellDescription$ Create a Food token.
-DeckHas:Ability$Token|LifeGain|Food
-DeckHints:Ability$Food
-Oracle:Target creature gets -2/-2 until end of turn. Create a Food Token.
+Name:Savor
+ManaCost:1 B
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SubAbility$ DBToken | SpellDescription$ Target creature gets -2/-2 until end of turn.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You | SpellDescription$ Create a Food token.
+DeckHas:Ability$Token|LifeGain|Food
+DeckHints:Ability$Food
+Oracle:Target creature gets -2/-2 until end of turn. Create a Food Token.
diff --git a/forge-gui/res/cardsfolder/upcoming/sazacaps_brew.txt b/forge-gui/res/cardsfolder/upcoming/sazacaps_brew.txt
index c90d8be6966..18af0ff3912 100644
--- a/forge-gui/res/cardsfolder/upcoming/sazacaps_brew.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sazacaps_brew.txt
@@ -1,11 +1,11 @@
-Name:Sazacap's Brew
-ManaCost:1 R
-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$ Draw | Cost$ 1 R Discard<1/Card> | CostDesc$ As an additional cost to cast this spell, discard a card. | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Select target player | SubAbility$ DBPump | SpellDescription$ Target player draws two cards. If the gift was promised, target creature you control gets +2/+0 until end of turn.
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TargetMin$ X | TargetMax$ X | TgtPrompt$ Select target creature you control | NumAtt$ +2
-SVar:X:Count$ValidStack Card.Self+PromisedGift
-DeckHas:Ability$Discard
-DeckHints:Keyword$Madness & Ability$Delirium
-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.)\nAs an additional cost to cast this spell, discard a card.\nTarget player draws two cards. If the gift was promised, target creature you control gets +2/+0 until end of turn.
+Name:Sazacap's Brew
+ManaCost:1 R
+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$ Draw | Cost$ 1 R Discard<1/Card> | CostDesc$ As an additional cost to cast this spell, discard a card. | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Select target player | SubAbility$ DBPump | SpellDescription$ Target player draws two cards. If the gift was promised, target creature you control gets +2/+0 until end of turn.
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TargetMin$ X | TargetMax$ X | TgtPrompt$ Select target creature you control | NumAtt$ +2
+SVar:X:Count$ValidStack Card.Self+PromisedGift
+DeckHas:Ability$Discard
+DeckHints:Keyword$Madness & Ability$Delirium
+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.)\nAs an additional cost to cast this spell, discard a card.\nTarget player draws two cards. If the gift was promised, target creature you control gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/scales_of_shale.txt b/forge-gui/res/cardsfolder/upcoming/scales_of_shale.txt
index b0cd49e80d0..a667ded26f2 100644
--- a/forge-gui/res/cardsfolder/upcoming/scales_of_shale.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scales_of_shale.txt
@@ -1,8 +1,8 @@
-Name:Scales of Shale
-ManaCost:2 B
-Types:Instant
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each Lizard you control.
-SVar:X:Count$Valid Lizard.YouCtrl
-A:SP$ Pump | ValidTgts$ Creature | NumAtt$ +2 | KW$ Lifelink & Indestructible | SpellDescription$ Target creature gets +2/+0 and gains lifelink and indestructible until end of turn.
-DeckHints:Type$Lizard
-Oracle:This spell costs {1} less to cast for each Lizard you control.\nTarget creature gets +2/+0 and gains lifelink and indestructible until end of turn.
+Name:Scales of Shale
+ManaCost:2 B
+Types:Instant
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each Lizard you control.
+SVar:X:Count$Valid Lizard.YouCtrl
+A:SP$ Pump | ValidTgts$ Creature | NumAtt$ +2 | KW$ Lifelink & Indestructible | SpellDescription$ Target creature gets +2/+0 and gains lifelink and indestructible until end of turn.
+DeckHints:Type$Lizard
+Oracle:This spell costs {1} less to cast for each Lizard you control.\nTarget creature gets +2/+0 and gains lifelink and indestructible until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/scavengers_talent.txt b/forge-gui/res/cardsfolder/upcoming/scavengers_talent.txt
index 0df13efb058..8128846e0e5 100644
--- a/forge-gui/res/cardsfolder/upcoming/scavengers_talent.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scavengers_talent.txt
@@ -1,13 +1,13 @@
-Name:Scavenger's Talent
-ManaCost:B
-Types:Enchantment Class
-T:Mode$ ChangesZoneAll | ValidCards$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigToken | TriggerDescription$ Whenever one or more creatures you control die, create a Food token. This ability triggers only once each turn.
-SVar:TrigToken:DB$ Token | TokenScript$ c_a_food_sac
-K:Class:2:1 B:AddTrigger$ TriggerSacrifice
-SVar:TriggerSacrifice:Mode$ Sacrificed | ValidCard$ Permanent | ValidPlayer$ You | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice a permanent, target player mills two cards.
-SVar:TrigMill:DB$ Mill | NumCards$ 2 | ValidTgts$ Player
-K:Class:3:2 B:AddTrigger$ TriggerEnd
-SVar:TriggerEnd:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigReturn | TriggerDescription$ At the beginning of your end step, you may sacrifice three other nonland permanents. If you do, return a creature card from your graveyard to the battlefield with a finality counter on it.
-SVar:TrigReturn:AB$ ChangeZone | Cost$ Sac<3/Permanent.Other+nonLand/other nonland permanent> | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ FINALITY | ChangeType$ Creature.YouOwn | ChangeTypeDesc$ creature | ChangeNum$ 1 | Hidden$ True | Mandatory$ True
-DeckHas:Ability$Token|Graveyard
-Oracle:(Gain the next level as a sorcery to add its ability.)\nWhenever one or more creatures you control die, create a Food token. This ability triggers only once each turn.\n{1}{B}: Level 2\nWhenever you sacrifice a permanent, target player mills two cards.\n{2}{B}: Level 3\nAt the beginning of your end step, you may sacrifice three other nonland permanents. If you do, return a creature card from your graveyard to the battlefield with a finality counter on it.
+Name:Scavenger's Talent
+ManaCost:B
+Types:Enchantment Class
+T:Mode$ ChangesZoneAll | ValidCards$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigToken | TriggerDescription$ Whenever one or more creatures you control die, create a Food token. This ability triggers only once each turn.
+SVar:TrigToken:DB$ Token | TokenScript$ c_a_food_sac
+K:Class:2:1 B:AddTrigger$ TriggerSacrifice
+SVar:TriggerSacrifice:Mode$ Sacrificed | ValidCard$ Permanent | ValidPlayer$ You | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice a permanent, target player mills two cards.
+SVar:TrigMill:DB$ Mill | NumCards$ 2 | ValidTgts$ Player
+K:Class:3:2 B:AddTrigger$ TriggerEnd
+SVar:TriggerEnd:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigReturn | TriggerDescription$ At the beginning of your end step, you may sacrifice three other nonland permanents. If you do, return a creature card from your graveyard to the battlefield with a finality counter on it.
+SVar:TrigReturn:AB$ ChangeZone | Cost$ Sac<3/Permanent.Other+nonLand/other nonland permanent> | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ FINALITY | ChangeType$ Creature.YouOwn | ChangeTypeDesc$ creature | ChangeNum$ 1 | Hidden$ True | Mandatory$ True
+DeckHas:Ability$Token|Graveyard
+Oracle:(Gain the next level as a sorcery to add its ability.)\nWhenever one or more creatures you control die, create a Food token. This ability triggers only once each turn.\n{1}{B}: Level 2\nWhenever you sacrifice a permanent, target player mills two cards.\n{2}{B}: Level 3\nAt the beginning of your end step, you may sacrifice three other nonland permanents. If you do, return a creature card from your graveyard to the battlefield with a finality counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/scrapshooter.txt b/forge-gui/res/cardsfolder/upcoming/scrapshooter.txt
index 0934688bba7..c31352702ec 100644
--- a/forge-gui/res/cardsfolder/upcoming/scrapshooter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scrapshooter.txt
@@ -1,10 +1,10 @@
-Name:Scrapshooter
-ManaCost:1 G G
-Types:Creature Raccoon Archer
-PT:4/4
-K:Gift
-SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
-K:Reach
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+PromisedGift | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, if the gift was promised, destroy target artifact or enchantment an opponent controls.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact.OppCtrl,Enchantment.OppCtrl | TgtPrompt$ Select target artifact or enchantment an opponent controls.
-Oracle:Gift a card (You may promise an opponent a gift as you cast this spell. If you do, when it enters, they draw a card.)\nReach\nWhen Scrapshooter enters, if the gift was promised, destroy target artifact or enchantment an opponent controls.
+Name:Scrapshooter
+ManaCost:1 G G
+Types:Creature Raccoon Archer
+PT:4/4
+K:Gift
+SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
+K:Reach
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+PromisedGift | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, if the gift was promised, destroy target artifact or enchantment an opponent controls.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact.OppCtrl,Enchantment.OppCtrl | TgtPrompt$ Select target artifact or enchantment an opponent controls.
+Oracle:Gift a card (You may promise an opponent a gift as you cast this spell. If you do, when it enters, they draw a card.)\nReach\nWhen Scrapshooter enters, if the gift was promised, destroy target artifact or enchantment an opponent controls.
diff --git a/forge-gui/res/cardsfolder/upcoming/screaming_nemesis.txt b/forge-gui/res/cardsfolder/upcoming/screaming_nemesis.txt
index b36a232abb1..3c1b58bd8a1 100644
--- a/forge-gui/res/cardsfolder/upcoming/screaming_nemesis.txt
+++ b/forge-gui/res/cardsfolder/upcoming/screaming_nemesis.txt
@@ -1,13 +1,13 @@
-Name:Screaming Nemesis
-ManaCost:2 R
-Types:Creature Spirit
-PT:3/3
-K:Haste
-T:Mode$ DamageDoneOnce | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to any other target. If a player is dealt damage this way, they can't gain life for the rest of the game.
-SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Creature.Other,Player,Planeswalker.Other,Battle.Other | TgtPrompt$ Select any other target | RememberDamaged$ True | SubAbility DBEffect
-SVar:DBEffect:DB$ Effect | StaticAbilities$ CantGainLife | Duration$ Permanent | RememberObjects$ Player.IsRemembered | SubAbility$ DBCleanup
-SVar:CantGainLife:Mode$ CantGainLife | ValidPlayer$ Player.IsRemembered | Description$ The damaged player can't gain life for the rest of the game.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:TriggerCount$DamageAmount
-SVar:HasCombatEffect:TRUE
-Oracle:Haste\nWhenever Screaming Nemesis is dealt damage, it deals that much damage to any other target. If a player is dealt damage this way, they can't gain life for the rest of the game.
+Name:Screaming Nemesis
+ManaCost:2 R
+Types:Creature Spirit
+PT:3/3
+K:Haste
+T:Mode$ DamageDoneOnce | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to any other target. If a player is dealt damage this way, they can't gain life for the rest of the game.
+SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Creature.Other,Player,Planeswalker.Other,Battle.Other | TgtPrompt$ Select any other target | RememberDamaged$ True | SubAbility DBEffect
+SVar:DBEffect:DB$ Effect | StaticAbilities$ CantGainLife | Duration$ Permanent | RememberObjects$ Player.IsRemembered | SubAbility$ DBCleanup
+SVar:CantGainLife:Mode$ CantGainLife | ValidPlayer$ Player.IsRemembered | Description$ The damaged player can't gain life for the rest of the game.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:TriggerCount$DamageAmount
+SVar:HasCombatEffect:TRUE
+Oracle:Haste\nWhenever Screaming Nemesis is dealt damage, it deals that much damage to any other target. If a player is dealt damage this way, they can't gain life for the rest of the game.
diff --git a/forge-gui/res/cardsfolder/upcoming/scurry_of_squirrels.txt b/forge-gui/res/cardsfolder/upcoming/scurry_of_squirrels.txt
index b4fdf75bf72..361e62a90ce 100644
--- a/forge-gui/res/cardsfolder/upcoming/scurry_of_squirrels.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scurry_of_squirrels.txt
@@ -1,11 +1,11 @@
-Name:Scurry of Squirrels
-ManaCost:2 G
-Types:Creature Squirrel Scout
-PT:2/2
-K:Myriad
-K:Myriad
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ DBCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on target creature you control.
-SVar:DBCounter:DB$ PutCounter | CounterNum$ 1 | CounterType$ P1P1 | ValidTgts$ Creature.YouCtrl
-DeckHas:Ability$Counters
-AI:RemoveDeck:Random
-Oracle:Myriad, myriad (Whenever this creature attacks, for each opponent other than defending player, you may create a token that's a copy of this creature that’s tapped and attacking that player or a planeswalker they control. Then do it again. Exile the tokens at end of combat.)\nWhenever Scurry of Squirrels deals combat damage to a player, put a +1/+1 counter on target creature you control.
+Name:Scurry of Squirrels
+ManaCost:2 G
+Types:Creature Squirrel Scout
+PT:2/2
+K:Myriad
+K:Myriad
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ DBCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on target creature you control.
+SVar:DBCounter:DB$ PutCounter | CounterNum$ 1 | CounterType$ P1P1 | ValidTgts$ Creature.YouCtrl
+DeckHas:Ability$Counters
+AI:RemoveDeck:Random
+Oracle:Myriad, myriad (Whenever this creature attacks, for each opponent other than defending player, you may create a token that's a copy of this creature that’s tapped and attacking that player or a planeswalker they control. Then do it again. Exile the tokens at end of combat.)\nWhenever Scurry of Squirrels deals combat damage to a player, put a +1/+1 counter on target creature you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/season_of_gathering.txt b/forge-gui/res/cardsfolder/upcoming/season_of_gathering.txt
index 062bdeefa35..642883a640c 100644
--- a/forge-gui/res/cardsfolder/upcoming/season_of_gathering.txt
+++ b/forge-gui/res/cardsfolder/upcoming/season_of_gathering.txt
@@ -1,14 +1,14 @@
-Name:Season of Gathering
-ManaCost:4 G G
-Types:Sorcery
-A:SP$ Charm | Choices$ DBPutCounter,DBChoose,DBDraw | CharmNum$ 5 | MinCharmNum$ 0 | CanRepeatModes$ True | Pawprint$ 5
-SVar:DBPutCounter:DB$ PutCounter | Pawprint$ 1 | Choices$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | RememberCards$ True | SubAbility$ DBPump | SpellDescription$ Put a +1/+1 counter on a creature you control. It gains vigilance and trample until end of turn.
-SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Vigilance & Trample | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:DBChoose:DB$ GenericChoice | Pawprint$ 2 | Choices$ DBKillEnchantments,DBKillArtifacts | Defined$ You | AILogic$ BestOption | SpellDescription$ Choose artifact or enchantment. Destroy all permanents of the chosen type.
-SVar:DBKillEnchantments:DB$ DestroyAll | ValidCards$ Enchantment
-SVar:DBKillArtifacts:DB$ DestroyAll | ValidCards$ Artifact
-SVar:DBDraw:DB$ Draw | Pawprint$ 3 | NumCards$ X | SpellDescription$ Draw cards equal to the greatest power among creatures you control.
-SVar:X:Count$Valid Creature.YouCtrl$GreatestPower
-DeckHas:Ability$Counters
-Oracle:Choose up to five {P} worth of modes. You may choose the same mode more than once.\n{P} — Put a +1/+1 counter on a creature you control. It gains vigilance and trample until end of turn.\n{P}{P} — Choose artifact or enchantment. Destroy all permanents of the chosen type.\n{P}{P}{P} — Draw cards equal to the greatest power among creatures you control.
\ No newline at end of file
+Name:Season of Gathering
+ManaCost:4 G G
+Types:Sorcery
+A:SP$ Charm | Choices$ DBPutCounter,DBChoose,DBDraw | CharmNum$ 5 | MinCharmNum$ 0 | CanRepeatModes$ True | Pawprint$ 5
+SVar:DBPutCounter:DB$ PutCounter | Pawprint$ 1 | Choices$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | RememberCards$ True | SubAbility$ DBPump | SpellDescription$ Put a +1/+1 counter on a creature you control. It gains vigilance and trample until end of turn.
+SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Vigilance & Trample | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBChoose:DB$ GenericChoice | Pawprint$ 2 | Choices$ DBKillEnchantments,DBKillArtifacts | Defined$ You | AILogic$ BestOption | SpellDescription$ Choose artifact or enchantment. Destroy all permanents of the chosen type.
+SVar:DBKillEnchantments:DB$ DestroyAll | ValidCards$ Enchantment
+SVar:DBKillArtifacts:DB$ DestroyAll | ValidCards$ Artifact
+SVar:DBDraw:DB$ Draw | Pawprint$ 3 | NumCards$ X | SpellDescription$ Draw cards equal to the greatest power among creatures you control.
+SVar:X:Count$Valid Creature.YouCtrl$GreatestPower
+DeckHas:Ability$Counters
+Oracle:Choose up to five {P} worth of modes. You may choose the same mode more than once.\n{P} — Put a +1/+1 counter on a creature you control. It gains vigilance and trample until end of turn.\n{P}{P} — Choose artifact or enchantment. Destroy all permanents of the chosen type.\n{P}{P}{P} — Draw cards equal to the greatest power among creatures you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/season_of_the_bold.txt b/forge-gui/res/cardsfolder/upcoming/season_of_the_bold.txt
index ad717f89f1e..af08a51043a 100644
--- a/forge-gui/res/cardsfolder/upcoming/season_of_the_bold.txt
+++ b/forge-gui/res/cardsfolder/upcoming/season_of_the_bold.txt
@@ -1,14 +1,14 @@
-Name:Season of the Bold
-ManaCost:3 R R
-Types:Sorcery
-A:SP$ Charm | Choices$ DBToken,DBExile,DBDamageEffect | CharmNum$ 5 | MinCharmNum$ 0 | CanRepeatModes$ True | Pawprint$ 5
-SVar:DBToken:DB$ Token | Pawprint$ 1 | TokenScript$ c_a_treasure_sac | TokenTapped$ True | SpellDescription$ Create a tapped Treasure token.
-SVar:DBExile:DB$ Dig | Pawprint$ 2 | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top two cards of your library. Until the end of your next turn, you may play them.
-SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | Duration$ UntilTheEndOfYourNextTurn | StaticAbilities$ Play | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
-SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play remembered card.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:DBDamageEffect:DB$ Effect | Pawprint$ 3 | Duration$ UntilTheEndOfYourNextTurn | Triggers$ TrigSpellCast | SpellDescription$ Until the end of your next turn, whenever you cast a spell, CARDNAME deals 2 damage to up to one target creature.
-SVar:TrigSpellCast:Mode$ SpellCast | ValidActivatingPlayer$ You | Execute$ EffSpellCast | TriggerDescription$ Whenever you cast a spell, CARDNAME deals 2 damage to up to one target creature.
-SVar:EffSpellCast:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ 1 | NumDmg$ 2 | DamageSource$ EffectSource
-DeckHas:Ability$Token & Type$Treasure|Artifact
-Oracle:Choose up to five {P} worth of modes. You may choose the same mode more than once.\n{P} — Create a tapped Treasure token.\n{P}{P} — Exile the top two cards of your library. Until the end of your next turn, you may play them.\n{P}{P}{P} — Until the end of your next turn, whenever you cast a spell, Season of the Bold deals 2 damage to up to one target creature.
\ No newline at end of file
+Name:Season of the Bold
+ManaCost:3 R R
+Types:Sorcery
+A:SP$ Charm | Choices$ DBToken,DBExile,DBDamageEffect | CharmNum$ 5 | MinCharmNum$ 0 | CanRepeatModes$ True | Pawprint$ 5
+SVar:DBToken:DB$ Token | Pawprint$ 1 | TokenScript$ c_a_treasure_sac | TokenTapped$ True | SpellDescription$ Create a tapped Treasure token.
+SVar:DBExile:DB$ Dig | Pawprint$ 2 | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top two cards of your library. Until the end of your next turn, you may play them.
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | Duration$ UntilTheEndOfYourNextTurn | StaticAbilities$ Play | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
+SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play remembered card.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBDamageEffect:DB$ Effect | Pawprint$ 3 | Duration$ UntilTheEndOfYourNextTurn | Triggers$ TrigSpellCast | SpellDescription$ Until the end of your next turn, whenever you cast a spell, CARDNAME deals 2 damage to up to one target creature.
+SVar:TrigSpellCast:Mode$ SpellCast | ValidActivatingPlayer$ You | Execute$ EffSpellCast | TriggerDescription$ Whenever you cast a spell, CARDNAME deals 2 damage to up to one target creature.
+SVar:EffSpellCast:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ 1 | NumDmg$ 2 | DamageSource$ EffectSource
+DeckHas:Ability$Token & Type$Treasure|Artifact
+Oracle:Choose up to five {P} worth of modes. You may choose the same mode more than once.\n{P} — Create a tapped Treasure token.\n{P}{P} — Exile the top two cards of your library. Until the end of your next turn, you may play them.\n{P}{P}{P} — Until the end of your next turn, whenever you cast a spell, Season of the Bold deals 2 damage to up to one target creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/season_of_the_burrow.txt b/forge-gui/res/cardsfolder/upcoming/season_of_the_burrow.txt
index eb6b1af0b42..b6445a43eb6 100644
--- a/forge-gui/res/cardsfolder/upcoming/season_of_the_burrow.txt
+++ b/forge-gui/res/cardsfolder/upcoming/season_of_the_burrow.txt
@@ -1,11 +1,11 @@
-Name:Season of the Burrow
-ManaCost:3 W W
-Types:Sorcery
-A:SP$ Charm | Choices$ DBToken,DBExile,DBReanimate | CharmNum$ 5 | MinCharmNum$ 0 | CanRepeatModes$ True | Pawprint$ 5
-SVar:DBToken:DB$ Token | Pawprint$ 1 | TokenScript$ w_1_1_rabbit | SpellDescription$ Create a 1/1 white Rabbit creature token.
-SVar:DBExile:DB$ ChangeZone | Pawprint$ 2 | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | RememberLKI$ True | SubAbility$ DBDraw | SpellDescription$ Exile target nonland permanent. Its controller draws a card.
-SVar:DBDraw:DB$ Draw | Defined$ RememberedController | NumCards$ 1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:DBReanimate:DB$ ChangeZone | Pawprint$ 3 | ValidTgts$ Permanent.YouCtrl+cmcLE3 | TgtPrompt$ Select target permanent card with mana value 3 or less in your graveyard | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ Indestructible | SpellDescription$ Return target permanent card with mana value 3 or less from your graveyard to the battlefield with an indestructible counter on it.
-DeckHas:Ability$Graveyard|Counters|Token
-Oracle:Choose up to five {P} worth of modes. You may choose the same mode more than once.\n{P} — Create a 1/1 white Rabbit creature token.\n{P}{P} — Exile target nonland permanent. Its controller draws a card.\n{P}{P}{P} — Return target permanent card with mana value 3 or less from your graveyard to the battlefield with an indestructible counter on it.
+Name:Season of the Burrow
+ManaCost:3 W W
+Types:Sorcery
+A:SP$ Charm | Choices$ DBToken,DBExile,DBReanimate | CharmNum$ 5 | MinCharmNum$ 0 | CanRepeatModes$ True | Pawprint$ 5
+SVar:DBToken:DB$ Token | Pawprint$ 1 | TokenScript$ w_1_1_rabbit | SpellDescription$ Create a 1/1 white Rabbit creature token.
+SVar:DBExile:DB$ ChangeZone | Pawprint$ 2 | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | RememberLKI$ True | SubAbility$ DBDraw | SpellDescription$ Exile target nonland permanent. Its controller draws a card.
+SVar:DBDraw:DB$ Draw | Defined$ RememberedController | NumCards$ 1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBReanimate:DB$ ChangeZone | Pawprint$ 3 | ValidTgts$ Permanent.YouCtrl+cmcLE3 | TgtPrompt$ Select target permanent card with mana value 3 or less in your graveyard | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ Indestructible | SpellDescription$ Return target permanent card with mana value 3 or less from your graveyard to the battlefield with an indestructible counter on it.
+DeckHas:Ability$Graveyard|Counters|Token
+Oracle:Choose up to five {P} worth of modes. You may choose the same mode more than once.\n{P} — Create a 1/1 white Rabbit creature token.\n{P}{P} — Exile target nonland permanent. Its controller draws a card.\n{P}{P}{P} — Return target permanent card with mana value 3 or less from your graveyard to the battlefield with an indestructible counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/season_of_weaving.txt b/forge-gui/res/cardsfolder/upcoming/season_of_weaving.txt
index ba771f98e46..c7c47b2f37e 100644
--- a/forge-gui/res/cardsfolder/upcoming/season_of_weaving.txt
+++ b/forge-gui/res/cardsfolder/upcoming/season_of_weaving.txt
@@ -1,9 +1,9 @@
-Name:Season of Weaving
-ManaCost:4 U U
-Types:Sorcery
-A:SP$ Charm | Choices$ DBDraw,DBCopy,DBReturn | CharmNum$ 5 | MinCharmNum$ 0 | CanRepeatModes$ True | Pawprint$ 5
-SVar:DBDraw:DB$ Draw | Pawprint$ 1 | SpellDescription$ Draw a card.
-SVar:DBCopy:DB$ CopyPermanent | Pawprint$ 2 | Choices$ Artifact.YouCtrl,Creature.YouCtrl | SpellDescription$ Choose an artifact or creature you control. Create a token that's a copy of it.
-SVar:DBReturn:DB$ ChangeZoneAll | Pawprint$ 3 | ChangeType$ Permanent.nonLand+nonToken | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return each nonland, nontoken permanent to its owner's hand.
-DeckHas:Ability$Token
-Oracle:Choose up to five {P} worth of modes. You may choose the same mode more than once.\n{P} — Draw a card.\n{P}{P} — Choose an artifact or creature you control. Create a token that's a copy of it.\n{P}{P}{P} — Return each nonland, nontoken permanent to its owner's hand.
\ No newline at end of file
+Name:Season of Weaving
+ManaCost:4 U U
+Types:Sorcery
+A:SP$ Charm | Choices$ DBDraw,DBCopy,DBReturn | CharmNum$ 5 | MinCharmNum$ 0 | CanRepeatModes$ True | Pawprint$ 5
+SVar:DBDraw:DB$ Draw | Pawprint$ 1 | SpellDescription$ Draw a card.
+SVar:DBCopy:DB$ CopyPermanent | Pawprint$ 2 | Choices$ Artifact.YouCtrl,Creature.YouCtrl | SpellDescription$ Choose an artifact or creature you control. Create a token that's a copy of it.
+SVar:DBReturn:DB$ ChangeZoneAll | Pawprint$ 3 | ChangeType$ Permanent.nonLand+nonToken | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return each nonland, nontoken permanent to its owner's hand.
+DeckHas:Ability$Token
+Oracle:Choose up to five {P} worth of modes. You may choose the same mode more than once.\n{P} — Draw a card.\n{P}{P} — Choose an artifact or creature you control. Create a token that's a copy of it.\n{P}{P}{P} — Return each nonland, nontoken permanent to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/seasoned_warrenguard.txt b/forge-gui/res/cardsfolder/upcoming/seasoned_warrenguard.txt
index b93d5eb365b..86d9365159b 100644
--- a/forge-gui/res/cardsfolder/upcoming/seasoned_warrenguard.txt
+++ b/forge-gui/res/cardsfolder/upcoming/seasoned_warrenguard.txt
@@ -1,9 +1,9 @@
-Name:Seasoned Warrenguard
-ManaCost:W
-Types:Creature Rabbit Warrior
-PT:1/2
-T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Permanent.token+YouCtrl | PresentCompare$ GE1 | NoResolvingCheck$ True | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks while you control a token, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
-SVar:HasAttackEffect:TRUE
-DeckHints:Ability$Token
-Oracle:Whenever Seasoned Warrenguard attacks while you control a token, Seasoned Warrenguard gets +2/+0 until end of turn.
\ No newline at end of file
+Name:Seasoned Warrenguard
+ManaCost:W
+Types:Creature Rabbit Warrior
+PT:1/2
+T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Permanent.token+YouCtrl | PresentCompare$ GE1 | NoResolvingCheck$ True | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks while you control a token, CARDNAME gets +2/+0 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
+SVar:HasAttackEffect:TRUE
+DeckHints:Ability$Token
+Oracle:Whenever Seasoned Warrenguard attacks while you control a token, Seasoned Warrenguard gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/seedglaive_mentor.txt b/forge-gui/res/cardsfolder/upcoming/seedglaive_mentor.txt
index 3eb6e5db714..172c400e626 100644
--- a/forge-gui/res/cardsfolder/upcoming/seedglaive_mentor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/seedglaive_mentor.txt
@@ -1,10 +1,10 @@
-Name:Seedglaive Mentor
-ManaCost:1 R W
-Types:Creature Mouse Soldier
-PT:3/2
-K:Vigilance
-K:Haste
-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
-DeckHas:Ability$Counters
-Oracle:Vigilance, haste\nValiant — Whenever Seedglaive Mentor becomes the target of a spell or ability you control for the first time each turn, put a +1/+1 counter on it.
\ No newline at end of file
+Name:Seedglaive Mentor
+ManaCost:1 R W
+Types:Creature Mouse Soldier
+PT:3/2
+K:Vigilance
+K:Haste
+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
+DeckHas:Ability$Counters
+Oracle:Vigilance, haste\nValiant — Whenever Seedglaive Mentor becomes the target of a spell or ability you control for the first time each turn, put a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/seedpod_squire.txt b/forge-gui/res/cardsfolder/upcoming/seedpod_squire.txt
index 25e291d60a4..3fe22d733c1 100644
--- a/forge-gui/res/cardsfolder/upcoming/seedpod_squire.txt
+++ b/forge-gui/res/cardsfolder/upcoming/seedpod_squire.txt
@@ -1,9 +1,9 @@
-Name:Seedpod Squire
-ManaCost:3 WU
-Types:Creature Bird Scout
-PT:3/3
-K:Flying
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, target creature you control without flying gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.withoutFlying+YouCtrl | TgtPrompt$ Select target creature you control without flying. | NumAtt$ 1 | NumDef$ 1
-SVar:HasAttackEffect:TRUE
-Oracle:Flying\nWhenever Seedpod Squire attacks, target creature you control without flying gets +1/+1 until end of turn.
+Name:Seedpod Squire
+ManaCost:3 WU
+Types:Creature Bird Scout
+PT:3/3
+K:Flying
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, target creature you control without flying gets +1/+1 until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.withoutFlying+YouCtrl | TgtPrompt$ Select target creature you control without flying. | NumAtt$ 1 | NumDef$ 1
+SVar:HasAttackEffect:TRUE
+Oracle:Flying\nWhenever Seedpod Squire attacks, target creature you control without flying gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/senu_keen_eyed_protector.txt b/forge-gui/res/cardsfolder/upcoming/senu_keen_eyed_protector.txt
index 3e96cca62b6..3afbd1c5869 100644
--- a/forge-gui/res/cardsfolder/upcoming/senu_keen_eyed_protector.txt
+++ b/forge-gui/res/cardsfolder/upcoming/senu_keen_eyed_protector.txt
@@ -1,11 +1,11 @@
-Name:Senu, Keen-Eyed Protector
-ManaCost:1 W
-Types:Legendary Creature Bird Scout
-PT:2/1
-K:Flying
-K:Vigilance
-A:AB$ GainLife | Cost$ T Exile<1/CARDNAME> | LifeAmount$ 2 | SubAbility$ DBScry | SpellDescription$ You gain 2 life and scry 2.
-SVar:DBScry:DB$ Scry | ScryNum$ 2
-T:Mode$ AttackerUnblocked | ValidCard$ Creature.Legendary+YouCtrl | Execute$ TrigChange | TriggerZones$ Exile | TriggerDescription$ When a legendary creature you control attacks and isn't blocked, if NICKNAME is exiled, put it onto the battlefield attacking.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Exile | Defined$ Self | Destination$ Battlefield | Attacking$ True
-Oracle:Flying, vigilance\n{T}, Exile Senu, Keen-Eyed Protector: You gain 2 life and scry 2.\nWhen a legendary creature you control attacks and isn't blocked, if Senu is exiled, put it onto the battlefield attacking.
+Name:Senu, Keen-Eyed Protector
+ManaCost:1 W
+Types:Legendary Creature Bird Scout
+PT:2/1
+K:Flying
+K:Vigilance
+A:AB$ GainLife | Cost$ T Exile<1/CARDNAME> | LifeAmount$ 2 | SubAbility$ DBScry | SpellDescription$ You gain 2 life and scry 2.
+SVar:DBScry:DB$ Scry | ScryNum$ 2
+T:Mode$ AttackerUnblocked | ValidCard$ Creature.Legendary+YouCtrl | Execute$ TrigChange | TriggerZones$ Exile | TriggerDescription$ When a legendary creature you control attacks and isn't blocked, if NICKNAME is exiled, put it onto the battlefield attacking.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Exile | Defined$ Self | Destination$ Battlefield | Attacking$ True
+Oracle:Flying, vigilance\n{T}, Exile Senu, Keen-Eyed Protector: You gain 2 life and scry 2.\nWhen a legendary creature you control attacks and isn't blocked, if Senu is exiled, put it onto the battlefield attacking.
diff --git a/forge-gui/res/cardsfolder/upcoming/settlement_blacksmith.txt b/forge-gui/res/cardsfolder/upcoming/settlement_blacksmith.txt
index 8ef20c5af6f..5ea10f0125d 100644
--- a/forge-gui/res/cardsfolder/upcoming/settlement_blacksmith.txt
+++ b/forge-gui/res/cardsfolder/upcoming/settlement_blacksmith.txt
@@ -1,7 +1,7 @@
-Name:Settlement Blacksmith
-ManaCost:2 W
-Types:Creature Human Artificer
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Equipment.YouCtrl | PresentCompare$ GE1 | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, if you control an Equipment, draw a card.
-SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Defined$ You
-Oracle:When Settlement Blacksmith enters, if you control an Equipment, draw a card.
\ No newline at end of file
+Name:Settlement Blacksmith
+ManaCost:2 W
+Types:Creature Human Artificer
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Equipment.YouCtrl | PresentCompare$ GE1 | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, if you control an Equipment, draw a card.
+SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Defined$ You
+Oracle:When Settlement Blacksmith enters, if you control an Equipment, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/shao_jun.txt b/forge-gui/res/cardsfolder/upcoming/shao_jun.txt
index 4452506e3cd..19108c275df 100644
--- a/forge-gui/res/cardsfolder/upcoming/shao_jun.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shao_jun.txt
@@ -1,7 +1,7 @@
-Name:Shao Jun
-ManaCost:1 U R
-Types:Legendary Creature Human Assassin
-PT:3/3
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying & First Strike | Condition$ PlayerTurn | Description$ As long as it's your turn, CARDNAME has flying and first strike.
-A:AB$ DealDamage | Cost$ tapXType<2/Artifact> | PrecostDesc$ Rope Dart — | Defined$ Player.Opponent | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to each opponent.
-Oracle:Leap Strike — As long as it's your turn, Shao Jun has flying and first strike.\nRope Dart — Tap two untapped artifacts you control: Shao Jun deals 1 damage to each opponent.
\ No newline at end of file
+Name:Shao Jun
+ManaCost:1 U R
+Types:Legendary Creature Human Assassin
+PT:3/3
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying & First Strike | Condition$ PlayerTurn | Description$ As long as it's your turn, CARDNAME has flying and first strike.
+A:AB$ DealDamage | Cost$ tapXType<2/Artifact> | PrecostDesc$ Rope Dart — | Defined$ Player.Opponent | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to each opponent.
+Oracle:Leap Strike — As long as it's your turn, Shao Jun has flying and first strike.\nRope Dart — Tap two untapped artifacts you control: Shao Jun deals 1 damage to each opponent.
diff --git a/forge-gui/res/cardsfolder/upcoming/shoreline_looter.txt b/forge-gui/res/cardsfolder/upcoming/shoreline_looter.txt
index 2a428ba6df4..cb7bf78bf25 100644
--- a/forge-gui/res/cardsfolder/upcoming/shoreline_looter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shoreline_looter.txt
@@ -1,10 +1,10 @@
-Name:Shoreline Looter
-ManaCost:1 U
-Types:Creature Rat Rogue
-PT:1/1
-S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Threshold — Whenever CARDNAME deals combat damage to a player, draw a card. Then discard a card unless seven or more cards are in your graveyard.
-SVar:TrigDraw:DB$ Draw | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$ Discard | NumCards$ 1 | Mode$ TgtChoose | ConditionCheckSVar$ X | ConditionSVarCompare$ LE6
-SVar:X:Count$InYourYard
-Oracle:Shoreline Looter can't be blocked.\nThreshold — Whenever Shoreline Looter deals combat damage to a player, draw a card. Then discard a card unless seven or more cards are in your graveyard.
\ No newline at end of file
+Name:Shoreline Looter
+ManaCost:1 U
+Types:Creature Rat Rogue
+PT:1/1
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Threshold — Whenever CARDNAME deals combat damage to a player, draw a card. Then discard a card unless seven or more cards are in your graveyard.
+SVar:TrigDraw:DB$ Draw | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | NumCards$ 1 | Mode$ TgtChoose | ConditionCheckSVar$ X | ConditionSVarCompare$ LE6
+SVar:X:Count$InYourYard
+Oracle:Shoreline Looter can't be blocked.\nThreshold — Whenever Shoreline Looter deals combat damage to a player, draw a card. Then discard a card unless seven or more cards are in your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/short_bow.txt b/forge-gui/res/cardsfolder/upcoming/short_bow.txt
index f51e547b4e5..5ddcfba89c2 100644
--- a/forge-gui/res/cardsfolder/upcoming/short_bow.txt
+++ b/forge-gui/res/cardsfolder/upcoming/short_bow.txt
@@ -1,6 +1,6 @@
-Name:Short Bow
-ManaCost:2
-Types:Artifact Equipment
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Vigilance & Reach | Description$ Equipped creature gets +1/+1 and has vigilance and reach.
-K:Equip:1
-Oracle:Equipped creature gets +1/+1 and has vigilance and reach.\nEquip {1}
\ No newline at end of file
+Name:Short Bow
+ManaCost:2
+Types:Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Vigilance & Reach | Description$ Equipped creature gets +1/+1 and has vigilance and reach.
+K:Equip:1
+Oracle:Equipped creature gets +1/+1 and has vigilance and reach.\nEquip {1}
diff --git a/forge-gui/res/cardsfolder/upcoming/shrike_force.txt b/forge-gui/res/cardsfolder/upcoming/shrike_force.txt
index 135a45b9800..28bb8d86fdd 100644
--- a/forge-gui/res/cardsfolder/upcoming/shrike_force.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shrike_force.txt
@@ -1,8 +1,8 @@
-Name:Shrike Force
-ManaCost:2 W
-Types:Creature Bird Knight
-PT:1/3
-K:Flying
-K:Double Strike
-K:Vigilance
-Oracle:Flying, double strike, vigilance
\ No newline at end of file
+Name:Shrike Force
+ManaCost:2 W
+Types:Creature Bird Knight
+PT:1/3
+K:Flying
+K:Double Strike
+K:Vigilance
+Oracle:Flying, double strike, vigilance
diff --git a/forge-gui/res/cardsfolder/upcoming/sigurd_jarl_of_ravensthorpe.txt b/forge-gui/res/cardsfolder/upcoming/sigurd_jarl_of_ravensthorpe.txt
index 1573f022d9d..6bba041dedb 100644
--- a/forge-gui/res/cardsfolder/upcoming/sigurd_jarl_of_ravensthorpe.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sigurd_jarl_of_ravensthorpe.txt
@@ -1,11 +1,11 @@
-Name:Sigurd, Jarl of Ravensthorpe
-ManaCost:R G W
-Types:Legendary Creature Human Warrior
-PT:3/3
-K:Vigilance
-K:Trample
-K:Lifelink
-A:AB$ AddOrRemoveCounter | Cost$ 1 | Boast$ True | ValidTgts$ Saga.YouCtrl | TgtPrompt$ Select target Saga you control | CounterType$ LORE | CounterNum$ 1
-T:Mode$ CounterAdded | ValidCard$ Saga.YouCtrl | ValidSource$ You | TriggerZones$ Battlefield | CounterType$ LORE | Execute$ TrigPutCounter | TriggerDescription$ Whenever you put a lore counter on a Saga you control, put a +1/+1 counter on up to one other target creature.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.Other | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select another target creature | CounterType$ P1P1 | CounterNum$ 1
-Oracle:Vigilance, trample, lifelink\nBoast — {1}: Put a lore counter on target Saga you control or remove one from it. (Activate only if this creature attacked this turn and only once each turn.)\nWhenever you put a lore counter on a Saga you control, put a +1/+1 counter on up to one other target creature.
+Name:Sigurd, Jarl of Ravensthorpe
+ManaCost:R G W
+Types:Legendary Creature Human Warrior
+PT:3/3
+K:Vigilance
+K:Trample
+K:Lifelink
+A:AB$ AddOrRemoveCounter | Cost$ 1 | Boast$ True | ValidTgts$ Saga.YouCtrl | TgtPrompt$ Select target Saga you control | CounterType$ LORE | CounterNum$ 1
+T:Mode$ CounterAdded | ValidCard$ Saga.YouCtrl | ValidSource$ You | TriggerZones$ Battlefield | CounterType$ LORE | Execute$ TrigPutCounter | TriggerDescription$ Whenever you put a lore counter on a Saga you control, put a +1/+1 counter on up to one other target creature.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.Other | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select another target creature | CounterType$ P1P1 | CounterNum$ 1
+Oracle:Vigilance, trample, lifelink\nBoast — {1}: Put a lore counter on target Saga you control or remove one from it. (Activate only if this creature attacked this turn and only once each turn.)\nWhenever you put a lore counter on a Saga you control, put a +1/+1 counter on up to one other target creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/sinister_monolith.txt b/forge-gui/res/cardsfolder/upcoming/sinister_monolith.txt
index 70401a91631..20be8e1628d 100644
--- a/forge-gui/res/cardsfolder/upcoming/sinister_monolith.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sinister_monolith.txt
@@ -1,9 +1,9 @@
-Name:Sinister Monolith
-ManaCost:3 B
-Types:Artifact
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ At the beginning of combat on your turn, each opponent loses 1 life and you gain 1 life.
-SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-A:AB$ Draw | Cost$ T PayLife<2> Sac<1/CARDNAME> | NumCards$ 2 | SorcerySpeed$ True | SpellDescription$ Draw two cards. Activate only as a sorcery.
-DeckHas:Ability$LifeGain
-Oracle:At the beginning of combat on your turn, each opponent loses 1 life and you gain 1 life.\n{T}, Pay 2 life, Sacrifice Sinister Monolith: Draw two cards. Activate only as a sorcery.
+Name:Sinister Monolith
+ManaCost:3 B
+Types:Artifact
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ At the beginning of combat on your turn, each opponent loses 1 life and you gain 1 life.
+SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+A:AB$ Draw | Cost$ T PayLife<2> Sac<1/CARDNAME> | NumCards$ 2 | SorcerySpeed$ True | SpellDescription$ Draw two cards. Activate only as a sorcery.
+DeckHas:Ability$LifeGain
+Oracle:At the beginning of combat on your turn, each opponent loses 1 life and you gain 1 life.\n{T}, Pay 2 life, Sacrifice Sinister Monolith: Draw two cards. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/skyskipper_duo.txt b/forge-gui/res/cardsfolder/upcoming/skyskipper_duo.txt
index e3af9192027..9432b37c635 100644
--- a/forge-gui/res/cardsfolder/upcoming/skyskipper_duo.txt
+++ b/forge-gui/res/cardsfolder/upcoming/skyskipper_duo.txt
@@ -1,11 +1,11 @@
-Name:Skyskipper Duo
-ManaCost:4 U
-Types:Creature Bird Frog
-PT:3/3
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBlink | TriggerDescription$ WWhen CARDNAME enters, exile up to one other target creature you control. Return it to the battlefield under its owner's control at the beginning of the next end step.
-SVar:TrigBlink:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select up to one other target creature you control | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DelTrig
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | TriggerDescription$ Return the exiled card to the battlefield. | SubAbility$ DBCleanup
-SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRememberedLKI
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Flying\nWhen Skyskipper Duo enters, exile up to one other target creature you control. Return it to the battlefield under its owner's control at the beginning of the next end step.
+Name:Skyskipper Duo
+ManaCost:4 U
+Types:Creature Bird Frog
+PT:3/3
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBlink | TriggerDescription$ WWhen CARDNAME enters, exile up to one other target creature you control. Return it to the battlefield under its owner's control at the beginning of the next end step.
+SVar:TrigBlink:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select up to one other target creature you control | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DelTrig
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | TriggerDescription$ Return the exiled card to the battlefield. | SubAbility$ DBCleanup
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRememberedLKI
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Flying\nWhen Skyskipper Duo enters, exile up to one other target creature you control. Return it to the battlefield under its owner's control at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/upcoming/smoke_bomb.txt b/forge-gui/res/cardsfolder/upcoming/smoke_bomb.txt
index 5b4db3811f9..833e498e40b 100644
--- a/forge-gui/res/cardsfolder/upcoming/smoke_bomb.txt
+++ b/forge-gui/res/cardsfolder/upcoming/smoke_bomb.txt
@@ -1,13 +1,13 @@
-Name:Smoke Bomb
-ManaCost:3
-Types:Artifact
-K:Flash
-S:Mode$ Continuous | Affected$ Creature | AddKeyword$ Shroud | Description$ All creatures have shroud. (They can't be the targets of spells or abilities.)
-T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigSac | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME. When you do, target creature you control can't be blocked this turn.
-SVar:TrigSac:DB$ Sacrifice | SacValid$ Self | RememberSacrificed$ True | SubAbility$ DBTrigger
-SVar:DBTrigger:DB$ ImmediateTrigger | Execute$ TrigUnblockable | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup | TriggerDescription$ When you do, target creature you control can't be blocked this turn.
-SVar:TrigUnblockable:DB$ Effect | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
-SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Sacrifice
-Oracle:Flash\nAll creatures have shroud. (They can't be the targets of spells or abilities.)\nAt the beginning of your upkeep, sacrifice Smoke Bomb. When you do, target creature you control can't be blocked this turn.
+Name:Smoke Bomb
+ManaCost:3
+Types:Artifact
+K:Flash
+S:Mode$ Continuous | Affected$ Creature | AddKeyword$ Shroud | Description$ All creatures have shroud. (They can't be the targets of spells or abilities.)
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigSac | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME. When you do, target creature you control can't be blocked this turn.
+SVar:TrigSac:DB$ Sacrifice | SacValid$ Self | RememberSacrificed$ True | SubAbility$ DBTrigger
+SVar:DBTrigger:DB$ ImmediateTrigger | Execute$ TrigUnblockable | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup | TriggerDescription$ When you do, target creature you control can't be blocked this turn.
+SVar:TrigUnblockable:DB$ Effect | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Sacrifice
+Oracle:Flash\nAll creatures have shroud. (They can't be the targets of spells or abilities.)\nAt the beginning of your upkeep, sacrifice Smoke Bomb. When you do, target creature you control can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/sonar_strike.txt b/forge-gui/res/cardsfolder/upcoming/sonar_strike.txt
index e5e460df3fa..7a26b68e2a0 100644
--- a/forge-gui/res/cardsfolder/upcoming/sonar_strike.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sonar_strike.txt
@@ -1,6 +1,6 @@
-Name:Sonar Strike
-ManaCost:1 W
-Types:Instant
-A:SP$ DealDamage | ValidTgts$ Creature.attacking,Creature.blocking,Creature.tapped | TgtPrompt$ Select target attacking, blocking, or tapped creature | NumDmg$ 4 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 4 damage to target attacking, blocking, or tapped creature. You gain 3 life if you control a Bat.
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3 | ConditionPresent$ Bat.YouCtrl
-Oracle:Sonar Strike deals 4 damage to target attacking, blocking, or tapped creature. You gain 3 life if you control a Bat.
\ No newline at end of file
+Name:Sonar Strike
+ManaCost:1 W
+Types:Instant
+A:SP$ DealDamage | ValidTgts$ Creature.attacking,Creature.blocking,Creature.tapped | TgtPrompt$ Select target attacking, blocking, or tapped creature | NumDmg$ 4 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 4 damage to target attacking, blocking, or tapped creature. You gain 3 life if you control a Bat.
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3 | ConditionPresent$ Bat.YouCtrl
+Oracle:Sonar Strike deals 4 damage to target attacking, blocking, or tapped creature. You gain 3 life if you control a Bat.
diff --git a/forge-gui/res/cardsfolder/upcoming/spellgyre.txt b/forge-gui/res/cardsfolder/upcoming/spellgyre.txt
index cc3cdd3d094..ac31bf97ed3 100644
--- a/forge-gui/res/cardsfolder/upcoming/spellgyre.txt
+++ b/forge-gui/res/cardsfolder/upcoming/spellgyre.txt
@@ -1,8 +1,8 @@
-Name:Spellgyre
-ManaCost:2 U U
-Types:Instant
-A:SP$ Charm | Choices$ DBCounter,DBSurveil | Defined$ You
-SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | TgtPrompt$ Counter target spell | SpellDescription$ Counter target spell.
-SVar:DBSurveil:DB$ Surveil | Amount$ 2 | SubAbility$ DBDraw | SpellDescription$ Surveil 2, then draw two cards.
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 2
-Oracle:Choose one —\n• Counter target spell.\n• Surveil 2, then draw two cards. (To 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:Spellgyre
+ManaCost:2 U U
+Types:Instant
+A:SP$ Charm | Choices$ DBCounter,DBSurveil | Defined$ You
+SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | TgtPrompt$ Counter target spell | SpellDescription$ Counter target spell.
+SVar:DBSurveil:DB$ Surveil | Amount$ 2 | SubAbility$ DBDraw | SpellDescription$ Surveil 2, then draw two cards.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 2
+Oracle:Choose one —\n• Counter target spell.\n• Surveil 2, then draw two cards. (To 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/splash_lasher.txt b/forge-gui/res/cardsfolder/upcoming/splash_lasher.txt
index c49facee546..5c59ad98c6d 100644
--- a/forge-gui/res/cardsfolder/upcoming/splash_lasher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/splash_lasher.txt
@@ -1,9 +1,9 @@
-Name:Splash Lasher
-ManaCost:3 U
-Types:Creature Frog Wizard
-PT:3/3
-K:Offspring:1 U
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When this creature enters, tap up to one target creature and put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
-SVar:TrigTap:DB$ Tap | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature | SubAbility$ DBCounter
-SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1
-Oracle:Offspring {1}{U} (You may pay an additional {1}{U} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nWhen this creature enters, tap up to one target creature and put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
\ No newline at end of file
+Name:Splash Lasher
+ManaCost:3 U
+Types:Creature Frog Wizard
+PT:3/3
+K:Offspring:1 U
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When this creature enters, tap up to one target creature and put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+SVar:TrigTap:DB$ Tap | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature | SubAbility$ DBCounter
+SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1
+Oracle:Offspring {1}{U} (You may pay an additional {1}{U} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nWhen this creature enters, tap up to one target creature 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/splash_portal.txt b/forge-gui/res/cardsfolder/upcoming/splash_portal.txt
index a1c8e2142fb..63f4da7f5a9 100644
--- a/forge-gui/res/cardsfolder/upcoming/splash_portal.txt
+++ b/forge-gui/res/cardsfolder/upcoming/splash_portal.txt
@@ -1,9 +1,9 @@
-Name:Splash Portal
-ManaCost:U
-Types:Sorcery
-A:SP$ ChangeZone | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature you control | RememberTargets$ True | SubAbility$ DBReturn | StackDescription$ Exile {c:Targeted}, | SpellDescription$ Exile target creature you control, then return it to the battlefield under its owner's control. If that creature is a Bird, Frog, Otter, or Rat, draw a card.
-SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | Defined$ You | ConditionDefined$ Remembered | ConditionPresent$ Bird,Frog,Otter,Rat | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHints:Type$Bird|Frog|Otter|Rat
-Oracle:Exile target creature you control, then return it to the battlefield under its owner's control. If that creature is a Bird, Frog, Otter, or Rat, draw a card.
+Name:Splash Portal
+ManaCost:U
+Types:Sorcery
+A:SP$ ChangeZone | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature you control | RememberTargets$ True | SubAbility$ DBReturn | StackDescription$ Exile {c:Targeted}, | SpellDescription$ Exile target creature you control, then return it to the battlefield under its owner's control. If that creature is a Bird, Frog, Otter, or Rat, draw a card.
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ You | ConditionDefined$ Remembered | ConditionPresent$ Bird,Frog,Otter,Rat | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHints:Type$Bird|Frog|Otter|Rat
+Oracle:Exile target creature you control, then return it to the battlefield under its owner's control. If that creature is a Bird, Frog, Otter, or Rat, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/staff_of_eden_vaults_key.txt b/forge-gui/res/cardsfolder/upcoming/staff_of_eden_vaults_key.txt
index 90f9ac82ff2..6b577683dd5 100644
--- a/forge-gui/res/cardsfolder/upcoming/staff_of_eden_vaults_key.txt
+++ b/forge-gui/res/cardsfolder/upcoming/staff_of_eden_vaults_key.txt
@@ -1,8 +1,8 @@
-Name:Staff of Eden, Vault's Key
-ManaCost:6
-Types:Legendary Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, put target legendary permanent card not named Staff of Eden, Vault's Key from a graveyard onto the battlefield under your control.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.Legendary+notnamedStaff of Eden; Vault's Key | GainControl$ True | ChangeNum$ 1 | Mandatory$ True | TgtPrompt$ Choose target legendary permanent card not named Staff of Eden, Vault's Key in a graveyard
-A:AB$ Draw | Cost$ T | NumCards$ Count$Valid Permanent.YouCtrl+YouDontOwn | SpellDescription$ Draw a card for each permanent you control but don't own.
-SVar:X:Count$ColorsCtrl Permanent
-Oracle:When Staff of Eden, Vault's Key enters, put target legendary permanent card not named Staff of Eden, Vault's Key from a graveyard onto the battlefield under your control.\n{T}: Draw a card for each permanent you control but don't own.
\ No newline at end of file
+Name:Staff of Eden, Vault's Key
+ManaCost:6
+Types:Legendary Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, put target legendary permanent card not named Staff of Eden, Vault's Key from a graveyard onto the battlefield under your control.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.Legendary+notnamedStaff of Eden; Vault's Key | GainControl$ True | ChangeNum$ 1 | Mandatory$ True | TgtPrompt$ Choose target legendary permanent card not named Staff of Eden, Vault's Key in a graveyard
+A:AB$ Draw | Cost$ T | NumCards$ Count$Valid Permanent.YouCtrl+YouDontOwn | SpellDescription$ Draw a card for each permanent you control but don't own.
+SVar:X:Count$ColorsCtrl Permanent
+Oracle:When Staff of Eden, Vault's Key enters, put target legendary permanent card not named Staff of Eden, Vault's Key from a graveyard onto the battlefield under your control.\n{T}: Draw a card for each permanent you control but don't own.
diff --git a/forge-gui/res/cardsfolder/upcoming/star_charter.txt b/forge-gui/res/cardsfolder/upcoming/star_charter.txt
index 587c76c5838..d8beb511d34 100644
--- a/forge-gui/res/cardsfolder/upcoming/star_charter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/star_charter.txt
@@ -1,10 +1,10 @@
-Name:Star Charter
-ManaCost:3 W
-Types:Creature Bat Cleric
-PT:3/1
-K:Flying
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigDig | TriggerDescription$ At the beginning of your end step, if you gained or lost life this turn, look at the top four cards of your library. You may reveal a creature card with power 3 or less from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
-SVar:TrigDig:DB$ Dig | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Creature.powerLE3 | RestRandomOrder$ True
-SVar:X:Count$LifeYouGainedThisTurn/Plus.Y
-SVar:Y:PlayerCountPropertyYou$LifeLostThisTurn
-Oracle:Flying\nAt the beginning of your end step, if you gained or lost life this turn, look at the top four cards of your library. You may reveal a creature card with power 3 or less from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+Name:Star Charter
+ManaCost:3 W
+Types:Creature Bat Cleric
+PT:3/1
+K:Flying
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigDig | TriggerDescription$ At the beginning of your end step, if you gained or lost life this turn, look at the top four cards of your library. You may reveal a creature card with power 3 or less from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+SVar:TrigDig:DB$ Dig | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Creature.powerLE3 | RestRandomOrder$ True
+SVar:X:Count$LifeYouGainedThisTurn/Plus.Y
+SVar:Y:PlayerCountPropertyYou$LifeLostThisTurn
+Oracle:Flying\nAt the beginning of your end step, if you gained or lost life this turn, look at the top four cards of your library. You may reveal a creature card with power 3 or less 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/starfall_invocation.txt b/forge-gui/res/cardsfolder/upcoming/starfall_invocation.txt
index 7d2acf6bb16..99edfcefcbb 100644
--- a/forge-gui/res/cardsfolder/upcoming/starfall_invocation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/starfall_invocation.txt
@@ -1,9 +1,9 @@
-Name:Starfall Invocation
-ManaCost:3 W W
-Types:Sorcery
-K:Gift
-SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
-A:SP$ DestroyAll | ValidCards$ Creature | RememberDestroyed$ True | SubAbility$ DBReturn | SpellDescription$ Destroy all creatures. If the gift was promised, return a creature card put into your graveyard this way to the battlefield under your control.
-SVar:DBReturn:DB$ ChangeZone | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | ChangeType$ Creature.nonToken+IsRemembered+YouOwn | ChangeNum$ 1 | Hidden$ True | Mandatory$ True | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Gift a card (You may promise an opponent a gift as you cast this spell. If you do, they draw a card before its other effects.)\nDestroy all creatures. If the gift was promised, return a creature card put into your graveyard this way to the battlefield under your control.
+Name:Starfall Invocation
+ManaCost:3 W W
+Types:Sorcery
+K:Gift
+SVar:GiftAbility:DB$ Draw | NumCards$ 1 | Defined$ Promised | GiftDescription$ a card
+A:SP$ DestroyAll | ValidCards$ Creature | RememberDestroyed$ True | SubAbility$ DBReturn | SpellDescription$ Destroy all creatures. If the gift was promised, return a creature card put into your graveyard this way to the battlefield under your control.
+SVar:DBReturn:DB$ ChangeZone | ConditionZone$ Stack | ConditionPresent$ Card.Self+PromisedGift | ConditionCompare$ EQ1 | ChangeType$ Creature.nonToken+IsRemembered+YouOwn | ChangeNum$ 1 | Hidden$ True | Mandatory$ True | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Gift a card (You may promise an opponent a gift as you cast this spell. If you do, they draw a card before its other effects.)\nDestroy all creatures. If the gift was promised, return a creature card put into your graveyard this way to the battlefield under your control.
diff --git a/forge-gui/res/cardsfolder/upcoming/starforged_sword.txt b/forge-gui/res/cardsfolder/upcoming/starforged_sword.txt
index 63c877b85f4..65a8be67c2d 100644
--- a/forge-gui/res/cardsfolder/upcoming/starforged_sword.txt
+++ b/forge-gui/res/cardsfolder/upcoming/starforged_sword.txt
@@ -1,10 +1,10 @@
-Name:Starforged Sword
-ManaCost:4
-Types:Artifact Equipment
-K:Gift
-SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenTapped$ True | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ a tapped Fish
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+PromisedGift | Execute$ TrigAttach | TriggerDescription$ When CARDNAME enters, if the gift was promised, attach CARDNAME to target creature you control.
-SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddToughness$ 3 | RemoveKeyword$ Flying | Description$ Equipped creature gets +3/+3 and loses flying.
-K:Equip:3
-Oracle:Gift a tapped Fish (You may promise an opponent a gift as you cast this spell. If you do, when it enters, they create a tapped 1/1 blue Fish creature token.)\nWhen Starforged Sword enters, if the gift was promised, attach Starforged Sword to target creature you control.\nEquipped creature gets +3/+3 and loses flying.\nEquip {3}
+Name:Starforged Sword
+ManaCost:4
+Types:Artifact Equipment
+K:Gift
+SVar:GiftAbility:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenTapped$ True | TokenOwner$ Promised | LockTokenScript$ True | GiftDescription$ a tapped Fish
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+PromisedGift | Execute$ TrigAttach | TriggerDescription$ When CARDNAME enters, if the gift was promised, attach CARDNAME to target creature you control.
+SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddToughness$ 3 | RemoveKeyword$ Flying | Description$ Equipped creature gets +3/+3 and loses flying.
+K:Equip:3
+Oracle:Gift a tapped Fish (You may promise an opponent a gift as you cast this spell. If you do, when it enters, they create a tapped 1/1 blue Fish creature token.)\nWhen Starforged Sword enters, if the gift was promised, attach Starforged Sword to target creature you control.\nEquipped creature gets +3/+3 and loses flying.\nEquip {3}
diff --git a/forge-gui/res/cardsfolder/upcoming/stargaze.txt b/forge-gui/res/cardsfolder/upcoming/stargaze.txt
index 9831fa54896..525718056f1 100644
--- a/forge-gui/res/cardsfolder/upcoming/stargaze.txt
+++ b/forge-gui/res/cardsfolder/upcoming/stargaze.txt
@@ -1,10 +1,10 @@
-Name:Stargaze
-ManaCost:X B B
-Types:Sorcery
-A:SP$ Dig | DigNum$ Y | ChangeNum$ X | DestinationZone2$ Graveyard | SubAbility$ DBLoseLife | SpellDescription$ Look at twice X cards from the top of your library. Put X cards from among them into your hand and the rest into your graveyard. You lose X life.
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X
-SVar:X:Count$xPaid
-SVar:Y:Count$xPaid/Twice
-DeckHas:Ability$Graveyard
-DeckHints:Ability$Delirium
-Oracle:Look at twice X cards from the top of your library. Put X cards from among them into your hand and the rest into your graveyard. You lose X life.
\ No newline at end of file
+Name:Stargaze
+ManaCost:X B B
+Types:Sorcery
+A:SP$ Dig | DigNum$ Y | ChangeNum$ X | DestinationZone2$ Graveyard | SubAbility$ DBLoseLife | SpellDescription$ Look at twice X cards from the top of your library. Put X cards from among them into your hand and the rest into your graveyard. You lose X life.
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X
+SVar:X:Count$xPaid
+SVar:Y:Count$xPaid/Twice
+DeckHas:Ability$Graveyard
+DeckHints:Ability$Delirium
+Oracle:Look at twice X cards from the top of your library. Put X cards from among them into your hand and the rest into your graveyard. You lose X life.
diff --git a/forge-gui/res/cardsfolder/upcoming/starlit_soothsayer.txt b/forge-gui/res/cardsfolder/upcoming/starlit_soothsayer.txt
index 7c723e015fe..e6bff5c4344 100644
--- a/forge-gui/res/cardsfolder/upcoming/starlit_soothsayer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/starlit_soothsayer.txt
@@ -1,10 +1,10 @@
-Name:Starlit Soothsayer
-ManaCost:2 B
-Types:Creature Bat Cleric
-PT:2/2
-K:Flying
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your end step, if you gained or lost life this turn, 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
-SVar:X:Count$LifeYouGainedThisTurn/Plus.Y
-SVar:Y:PlayerCountPropertyYou$LifeLostThisTurn
-Oracle:Flying\nAt the beginning of your end step, if you gained or lost life this turn, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+Name:Starlit Soothsayer
+ManaCost:2 B
+Types:Creature Bat Cleric
+PT:2/2
+K:Flying
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your end step, if you gained or lost life this turn, 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
+SVar:X:Count$LifeYouGainedThisTurn/Plus.Y
+SVar:Y:PlayerCountPropertyYou$LifeLostThisTurn
+Oracle:Flying\nAt the beginning of your end step, if you gained or lost life this turn, 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/starscape_cleric.txt b/forge-gui/res/cardsfolder/upcoming/starscape_cleric.txt
index 280f755c88a..e1edee16809 100644
--- a/forge-gui/res/cardsfolder/upcoming/starscape_cleric.txt
+++ b/forge-gui/res/cardsfolder/upcoming/starscape_cleric.txt
@@ -1,11 +1,11 @@
-Name:Starscape Cleric
-ManaCost:1 B
-Types:Creature Bat Cleric
-PT:2/1
-K:Offspring:2 B
-K:Flying
-K:CARDNAME can't block.
-T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever you gain life, each opponent loses 1 life.
-SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1
-DeckHints:Ability$Lifegain
-Oracle:Offspring {2}{B} (You may pay an additional {2}{B} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nFlying\nThis creature can't block.\nWhenever you gain life, each opponent loses 1 life.
\ No newline at end of file
+Name:Starscape Cleric
+ManaCost:1 B
+Types:Creature Bat Cleric
+PT:2/1
+K:Offspring:2 B
+K:Flying
+K:CARDNAME can't block.
+T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever you gain life, each opponent loses 1 life.
+SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1
+DeckHints:Ability$Lifegain
+Oracle:Offspring {2}{B} (You may pay an additional {2}{B} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nFlying\nThis creature can't block.\nWhenever you gain life, each opponent loses 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/starseer_mentor.txt b/forge-gui/res/cardsfolder/upcoming/starseer_mentor.txt
index 97870a3cb82..01419c4fad1 100644
--- a/forge-gui/res/cardsfolder/upcoming/starseer_mentor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/starseer_mentor.txt
@@ -1,15 +1,15 @@
-Name:Starseer Mentor
-ManaCost:3 W B
-Types:Creature Bat Warlock
-PT:3/5
-K:Flying
-K:Vigilance
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigGenericChoice | TriggerDescription$ At the beginning of your end step, if you gained or lost life this turn, target opponent loses 3 life unless they sacrifice a nonland permanent or discard a card.
-SVar:TrigGenericChoice:DB$ GenericChoice | ValidTgts$ Opponent | Choices$ PaySac,PayDiscard | FallbackAbility$ LoseLifeFallback | AILogic$ PayUnlessCost
-SVar:PaySac:DB$ LoseLife | LifeAmount$ 3 | Defined$ Targeted | UnlessCost$ Sac<1/Permanent.nonland/nonland permanent> | UnlessPayer$ Targeted | UnlessAI$ LifeLE3 | SpellDescription$ You lose 3 life unless you sacrifice a nonland permanent
-SVar:PayDiscard:DB$ LoseLife | LifeAmount$ 3 | Defined$ Targeted | UnlessCost$ Discard<1/Card> | UnlessPayer$ Targeted | UnlessAI$ LifeLE3 | SpellDescription$ You lose 3 life unless you discard a card
-# TODO: Most likely the ChooseGenericEffect code can be simplified somehow to avoid the necessity of having a dedicated fallback ability
-SVar:LoseLifeFallback:DB$ LoseLife | Defined$ Targeted | LifeAmount$ 3
-SVar:X:Count$LifeYouGainedThisTurn/Plus.Y
-SVar:Y:PlayerCountPropertyYou$LifeLostThisTurn
-Oracle:Flying, vigilance\nAt the beginning of your end step, if you gained or lost life this turn, target opponent loses 3 life unless they sacrifice a nonland permanent or discard a card.
\ No newline at end of file
+Name:Starseer Mentor
+ManaCost:3 W B
+Types:Creature Bat Warlock
+PT:3/5
+K:Flying
+K:Vigilance
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigGenericChoice | TriggerDescription$ At the beginning of your end step, if you gained or lost life this turn, target opponent loses 3 life unless they sacrifice a nonland permanent or discard a card.
+SVar:TrigGenericChoice:DB$ GenericChoice | ValidTgts$ Opponent | Choices$ PaySac,PayDiscard | FallbackAbility$ LoseLifeFallback | AILogic$ PayUnlessCost
+SVar:PaySac:DB$ LoseLife | LifeAmount$ 3 | Defined$ Targeted | UnlessCost$ Sac<1/Permanent.nonland/nonland permanent> | UnlessPayer$ Targeted | UnlessAI$ LifeLE3 | SpellDescription$ You lose 3 life unless you sacrifice a nonland permanent
+SVar:PayDiscard:DB$ LoseLife | LifeAmount$ 3 | Defined$ Targeted | UnlessCost$ Discard<1/Card> | UnlessPayer$ Targeted | UnlessAI$ LifeLE3 | SpellDescription$ You lose 3 life unless you discard a card
+# TODO: Most likely the ChooseGenericEffect code can be simplified somehow to avoid the necessity of having a dedicated fallback ability
+SVar:LoseLifeFallback:DB$ LoseLife | Defined$ Targeted | LifeAmount$ 3
+SVar:X:Count$LifeYouGainedThisTurn/Plus.Y
+SVar:Y:PlayerCountPropertyYou$LifeLostThisTurn
+Oracle:Flying, vigilance\nAt the beginning of your end step, if you gained or lost life this turn, target opponent loses 3 life unless they sacrifice a nonland permanent or discard a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/steampath_charger.txt b/forge-gui/res/cardsfolder/upcoming/steampath_charger.txt
index 00e6089cc8f..8dd305ef8cf 100644
--- a/forge-gui/res/cardsfolder/upcoming/steampath_charger.txt
+++ b/forge-gui/res/cardsfolder/upcoming/steampath_charger.txt
@@ -1,8 +1,8 @@
-Name:Steampath Charger
-ManaCost:1 R
-Types:Creature Lizard Warlock
-PT:2/1
-K:Offspring:2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When this creature dies, it deals 1 damage to target player.
-SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1
-Oracle:Offspring {2} (You may pay an additional {2} as you cast this spell. If do, when this creature enters, create a 1/1 token copy of it.)\nWhen this creature dies, it deals 1 damage to target player.
\ No newline at end of file
+Name:Steampath Charger
+ManaCost:1 R
+Types:Creature Lizard Warlock
+PT:2/1
+K:Offspring:2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When this creature dies, it deals 1 damage to target player.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1
+Oracle:Offspring {2} (You may pay an additional {2} as you cast this spell. If do, when this creature enters, create a 1/1 token copy of it.)\nWhen this creature dies, it deals 1 damage to target player.
diff --git a/forge-gui/res/cardsfolder/upcoming/steelburr_champion.txt b/forge-gui/res/cardsfolder/upcoming/steelburr_champion.txt
index 7f14ec8b0fb..3458142d334 100644
--- a/forge-gui/res/cardsfolder/upcoming/steelburr_champion.txt
+++ b/forge-gui/res/cardsfolder/upcoming/steelburr_champion.txt
@@ -1,10 +1,10 @@
-Name:Steelburr Champion
-ManaCost:2 W
-Types:Creature Mouse Soldier
-PT:1/1
-K:Offspring:1 W
-K:Vigilance
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent casts a noncreature spell, put a +1/+1 counter on this creature.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:PlayMain1:TRUE
-Oracle:Offspring {1}{W} (You may pay an additional {1}{W} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nVigilance\nWhenever an opponent casts a noncreature spell, put a +1/+1 counter on this creature.
\ No newline at end of file
+Name:Steelburr Champion
+ManaCost:2 W
+Types:Creature Mouse Soldier
+PT:1/1
+K:Offspring:1 W
+K:Vigilance
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent casts a noncreature spell, put a +1/+1 counter on this creature.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:PlayMain1:TRUE
+Oracle:Offspring {1}{W} (You may pay an additional {1}{W} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nVigilance\nWhenever an opponent casts a noncreature spell, put a +1/+1 counter on this creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/stickytongue_sentinel.txt b/forge-gui/res/cardsfolder/upcoming/stickytongue_sentinel.txt
index 4c4fe8d0fec..d0ca722d5ea 100644
--- a/forge-gui/res/cardsfolder/upcoming/stickytongue_sentinel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/stickytongue_sentinel.txt
@@ -1,8 +1,8 @@
-Name:Stickytongue Sentinel
-ManaCost:2 G
-Types:Creature Frog Warrior
-PT:3/3
-K:Reach
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters, return up to one other target permanent you control to its owner's hand.
-SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Permanent.Other+YouCtrl | TargetMin$ 0 | TargetMax$ 1 | Origin$ Battlefield | Destination$ Hand | TgtPrompt$ Select up to one other target permanent you control
-Oracle:Reach\nWhen Stickytongue Sentinel enters, return up to one other target permanent you control to its owner's hand.
\ No newline at end of file
+Name:Stickytongue Sentinel
+ManaCost:2 G
+Types:Creature Frog Warrior
+PT:3/3
+K:Reach
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters, return up to one other target permanent you control to its owner's hand.
+SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Permanent.Other+YouCtrl | TargetMin$ 0 | TargetMax$ 1 | Origin$ Battlefield | Destination$ Hand | TgtPrompt$ Select up to one other target permanent you control
+Oracle:Reach\nWhen Stickytongue Sentinel enters, return up to one other target permanent you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/stocking_the_pantry.txt b/forge-gui/res/cardsfolder/upcoming/stocking_the_pantry.txt
index df8f69a089a..f5b24f7cc8b 100644
--- a/forge-gui/res/cardsfolder/upcoming/stocking_the_pantry.txt
+++ b/forge-gui/res/cardsfolder/upcoming/stocking_the_pantry.txt
@@ -1,8 +1,8 @@
-Name:Stocking the Pantry
-ManaCost:G
-Types:Enchantment
-T:Mode$ CounterAddedOnce | CounterType$ P1P1 | ValidSource$ You | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you put one or more +1/+1 counters on a creature you control, put a supply counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ SUPPLY | CounterNum$ 1
-A:AB$ Draw | Cost$ 2 SubCounter<1/SUPPLY> | SpellDescription$ Draw a card.
-DeckNeeds:Ability$Counters
-Oracle:Whenever you put one or more +1/+1 counters on a creature you control, put a supply counter on Stocking the Pantry.\n{2}, Remove a supply counter from Stocking the Pantry: Draw a card.
+Name:Stocking the Pantry
+ManaCost:G
+Types:Enchantment
+T:Mode$ CounterAddedOnce | CounterType$ P1P1 | ValidSource$ You | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you put one or more +1/+1 counters on a creature you control, put a supply counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ SUPPLY | CounterNum$ 1
+A:AB$ Draw | Cost$ 2 SubCounter<1/SUPPLY> | SpellDescription$ Draw a card.
+DeckNeeds:Ability$Counters
+Oracle:Whenever you put one or more +1/+1 counters on a creature you control, put a supply counter on Stocking the Pantry.\n{2}, Remove a supply counter from Stocking the Pantry: Draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/stormcatch_mentor.txt b/forge-gui/res/cardsfolder/upcoming/stormcatch_mentor.txt
index 3c1c9d2fa87..369a8ae0147 100644
--- a/forge-gui/res/cardsfolder/upcoming/stormcatch_mentor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/stormcatch_mentor.txt
@@ -1,9 +1,9 @@
-Name:Stormcatch Mentor
-ManaCost:U R
-Types:Creature Otter Wizard
-PT:1/1
-K:Haste
-K:Prowess
-S:Mode$ ReduceCost | ValidCard$ Instant,Sorcery | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Instant and sorcery spells you cast cost {1} less to cast.
-DeckHints:Type$Instant|Sorcery
-Oracle:Haste\nProwess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)\nInstant and sorcery spells you cast cost {1} less to cast.
\ No newline at end of file
+Name:Stormcatch Mentor
+ManaCost:U R
+Types:Creature Otter Wizard
+PT:1/1
+K:Haste
+K:Prowess
+S:Mode$ ReduceCost | ValidCard$ Instant,Sorcery | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Instant and sorcery spells you cast cost {1} less to cast.
+DeckHints:Type$Instant|Sorcery
+Oracle:Haste\nProwess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)\nInstant and sorcery spells you cast cost {1} less to cast.
diff --git a/forge-gui/res/cardsfolder/upcoming/stormchasers_talent.txt b/forge-gui/res/cardsfolder/upcoming/stormchasers_talent.txt
index 5bcf2b86093..9d56e0ab591 100644
--- a/forge-gui/res/cardsfolder/upcoming/stormchasers_talent.txt
+++ b/forge-gui/res/cardsfolder/upcoming/stormchasers_talent.txt
@@ -1,11 +1,11 @@
-Name:Stormchaser's Talent
-ManaCost:U
-Types:Enchantment Class
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 blue and red Otter creature token with prowess.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ ur_1_1_otter_prowess | TokenOwner$ You
-K:Class:2:3 U:AddTrigger$ TriggerClassLevel
-SVar:TriggerClassLevel:Mode$ ClassLevelGained | ClassLevel$ 2 | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When this Class becomes level 2, return target instant or sorcery card from your graveyard to your hand.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl
-K:Class:3:5 U:AddTrigger$ TriggerCast
-SVar:TriggerCast:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you cast an instant or sorcery spell, create a 1/1 blue and red Otter creature token with prowess.
-Oracle:(Gain the next level as a sorcery to add its ability.)\nWhen Stormchaser's Talent enters, create a 1/1 blue and red Otter creature token with prowess.\n{3}{U}: Level 2\nWhen this Class becomes level 2, return target instant or sorcery card from your graveyard to your hand.\n{5}{U}: Level 3\nWhenever you cast an instant or sorcery spell, create a 1/1 blue and red Otter creature token with prowess.
\ No newline at end of file
+Name:Stormchaser's Talent
+ManaCost:U
+Types:Enchantment Class
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 blue and red Otter creature token with prowess.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ ur_1_1_otter_prowess | TokenOwner$ You
+K:Class:2:3 U:AddTrigger$ TriggerClassLevel
+SVar:TriggerClassLevel:Mode$ ClassLevelGained | ClassLevel$ 2 | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When this Class becomes level 2, return target instant or sorcery card from your graveyard to your hand.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl
+K:Class:3:5 U:AddTrigger$ TriggerCast
+SVar:TriggerCast:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you cast an instant or sorcery spell, create a 1/1 blue and red Otter creature token with prowess.
+Oracle:(Gain the next level as a sorcery to add its ability.)\nWhen Stormchaser's Talent enters, create a 1/1 blue and red Otter creature token with prowess.\n{3}{U}: Level 2\nWhen this Class becomes level 2, return target instant or sorcery card from your graveyard to your hand.\n{5}{U}: Level 3\nWhenever you cast an instant or sorcery spell, create a 1/1 blue and red Otter creature token with prowess.
diff --git a/forge-gui/res/cardsfolder/upcoming/stormsplitter.txt b/forge-gui/res/cardsfolder/upcoming/stormsplitter.txt
index 59f1b5959d5..71ebebc6c2e 100644
--- a/forge-gui/res/cardsfolder/upcoming/stormsplitter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/stormsplitter.txt
@@ -1,8 +1,8 @@
-Name:Stormsplitter
-ManaCost:3 R
-Types:Creature Otter Wizard
-PT:1/4
-K:Haste
-T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an instant or sorcery spell, create a token that's a copy of CARDNAME. Exile that token at the beginning of the next end step.
-SVar:TrigCopy:DB$ CopyPermanent | Defined$ Self | NumCopies$ 1 | AtEOT$ Exile
-Oracle:Haste\nWhenever you cast an instant or sorcery spell, create a token that's a copy of Stormsplitter. Exile that token at the beginning of the next end step.
\ No newline at end of file
+Name:Stormsplitter
+ManaCost:3 R
+Types:Creature Otter Wizard
+PT:1/4
+K:Haste
+T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an instant or sorcery spell, create a token that's a copy of CARDNAME. Exile that token at the beginning of the next end step.
+SVar:TrigCopy:DB$ CopyPermanent | Defined$ Self | NumCopies$ 1 | AtEOT$ Exile
+Oracle:Haste\nWhenever you cast an instant or sorcery spell, create a token that's a copy of Stormsplitter. Exile that token at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/upcoming/sugar_coat.txt b/forge-gui/res/cardsfolder/upcoming/sugar_coat.txt
index c88f8f3ed74..e72082c99e4 100644
--- a/forge-gui/res/cardsfolder/upcoming/sugar_coat.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sugar_coat.txt
@@ -1,9 +1,9 @@
-Name:Sugar Coat
-ManaCost:2 U
-Types:Enchantment Aura
-K:Flash
-K:Enchant creature or Food
-A:SP$ Attach | ValidTgts$ Creature,Food | TgtPrompt$ Select target creature or Food | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Permanent.EnchantedBy | SetColor$ Colorless | AddType$ Food & Artifact | RemoveCardTypes$ True | RemoveAllAbilities$ True | AddAbility$ FoodSac | Description$ Enchanted permanent is a colorless Food artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life" and loses all other card types and abilities.
-SVar:FoodSac:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME/this artifact> | Defined$ You | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
-Oracle:Flash\nEnchant creature or Food\nEnchanted permanent is a colorless Food artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life" and loses all other card types and abilities.
+Name:Sugar Coat
+ManaCost:2 U
+Types:Enchantment Aura
+K:Flash
+K:Enchant creature or Food
+A:SP$ Attach | ValidTgts$ Creature,Food | TgtPrompt$ Select target creature or Food | AILogic$ Curse
+S:Mode$ Continuous | Affected$ Permanent.EnchantedBy | SetColor$ Colorless | AddType$ Food & Artifact | RemoveCardTypes$ True | RemoveAllAbilities$ True | AddAbility$ FoodSac | Description$ Enchanted permanent is a colorless Food artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life" and loses all other card types and abilities.
+SVar:FoodSac:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME/this artifact> | Defined$ You | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
+Oracle:Flash\nEnchant creature or Food\nEnchanted permanent is a colorless Food artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life" and loses all other card types and abilities.
diff --git a/forge-gui/res/cardsfolder/upcoming/sunshower_druid.txt b/forge-gui/res/cardsfolder/upcoming/sunshower_druid.txt
index 2099815ef18..1bb5f50b79a 100644
--- a/forge-gui/res/cardsfolder/upcoming/sunshower_druid.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sunshower_druid.txt
@@ -1,10 +1,10 @@
-Name:Sunshower Druid
-ManaCost:G
-Types:Creature Frog Druid
-PT:0/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, put a +1/+1 counter on target creature and you gain 1 life.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | LifeAmount$ 1
-SVar:PlayMain1:TRUE
-DeckHas:Ability$Counters
-Oracle:When Sunshower Druid enters, put a +1/+1 counter on target creature and you gain 1 life.
\ No newline at end of file
+Name:Sunshower Druid
+ManaCost:G
+Types:Creature Frog Druid
+PT:0/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, put a +1/+1 counter on target creature and you gain 1 life.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 1
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Counters
+Oracle:When Sunshower Druid enters, put a +1/+1 counter on target creature and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/sunspine_lynx.txt b/forge-gui/res/cardsfolder/upcoming/sunspine_lynx.txt
index caa3c0e61dc..9e1baba1146 100644
--- a/forge-gui/res/cardsfolder/upcoming/sunspine_lynx.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sunspine_lynx.txt
@@ -1,11 +1,11 @@
-Name:Sunspine Lynx
-ManaCost:2 R R
-Types:Creature Elemental Cat
-PT:5/4
-S:Mode$ CantGainLife | ValidPlayer$ Player | Description$ Players can't gain life.
-S:Mode$ CantPreventDamage | Description$ Damage can't be prevented.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRepeatEach | TriggerDescription$ When CARDNAME enters, it deals damage to each player equal to the number of nonbasic lands that player controls.
-SVar:TrigRepeatEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBDamage | DamageMap$ True
-SVar:DBDamage:DB$ DealDamage | Defined$ Remembered | NumDmg$ X
-SVar:X:Count$Valid Land.nonBasic+RememberedPlayerCtrl
-Oracle:Players can't gain life.\nDamage can't be prevented.\nWhen Sunspine Lynx enters, it deals damage to each player equal to the number of nonbasic lands that player controls.
\ No newline at end of file
+Name:Sunspine Lynx
+ManaCost:2 R R
+Types:Creature Elemental Cat
+PT:5/4
+S:Mode$ CantGainLife | ValidPlayer$ Player | Description$ Players can't gain life.
+S:Mode$ CantPreventDamage | Description$ Damage can't be prevented.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRepeatEach | TriggerDescription$ When CARDNAME enters, it deals damage to each player equal to the number of nonbasic lands that player controls.
+SVar:TrigRepeatEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBDamage | DamageMap$ True
+SVar:DBDamage:DB$ DealDamage | Defined$ Remembered | NumDmg$ X
+SVar:X:Count$Valid Land.nonBasic+RememberedPlayerCtrl
+Oracle:Players can't gain life.\nDamage can't be prevented.\nWhen Sunspine Lynx enters, it deals damage to each player equal to the number of nonbasic lands that player controls.
diff --git a/forge-gui/res/cardsfolder/upcoming/surtr_fiery_jotun.txt b/forge-gui/res/cardsfolder/upcoming/surtr_fiery_jotun.txt
index c623e18f089..081477c2631 100644
--- a/forge-gui/res/cardsfolder/upcoming/surtr_fiery_jotun.txt
+++ b/forge-gui/res/cardsfolder/upcoming/surtr_fiery_jotun.txt
@@ -1,8 +1,8 @@
-Name:Surtr, Fiery Jötun
-ManaCost:3 R R
-Types:Legendary Creature Giant God Warrior
-PT:5/5
-K:Trample
-T:Mode$ SpellCast | ValidCard$ Card.Historic | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever you cast a historic spell, CARDNAME deals 3 damage to any target. (Artifacts, legendaries, and Sagas are historic.)
-SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 3
-Oracle:Trample (This creature can deal excess combat damage to the player it's attacking.)\nWhenever you cast a historic spell, Surtr, Fiery Jötun deals 3 damage to any target. (Artifacts, legendaries, and Sagas are historic.)
+Name:Surtr, Fiery Jötun
+ManaCost:3 R R
+Types:Legendary Creature Giant God Warrior
+PT:5/5
+K:Trample
+T:Mode$ SpellCast | ValidCard$ Card.Historic | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever you cast a historic spell, CARDNAME deals 3 damage to any target. (Artifacts, legendaries, and Sagas are historic.)
+SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 3
+Oracle:Trample (This creature can deal excess combat damage to the player it's attacking.)\nWhenever you cast a historic spell, Surtr, Fiery Jötun deals 3 damage to any target. (Artifacts, legendaries, and Sagas are historic.)
diff --git a/forge-gui/res/cardsfolder/upcoming/swarmyard_massacre.txt b/forge-gui/res/cardsfolder/upcoming/swarmyard_massacre.txt
index 0dcadeb1ac7..eea3f72f5e9 100644
--- a/forge-gui/res/cardsfolder/upcoming/swarmyard_massacre.txt
+++ b/forge-gui/res/cardsfolder/upcoming/swarmyard_massacre.txt
@@ -1,9 +1,9 @@
-Name:Swarmyard Massacre
-ManaCost:3 B B
-Types:Sorcery
-A:SP$ Token | TokenScript$ g_1_1_squirrel | TokenAmount$ 2 | TokenOwner$ You | SubAbility$ DBPumpAll | SpellDescription$ Create two 1/1 green Squirrel creature tokens. Then each creature that isn't an Insect, Rat, Spider, or Squirrel gets -1/-1 until end of turn for each creature you control that's an Insect, Rat, Spider, or Squirrel.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.nonInsect+nonRat+nonSpider+nonSquirrel | NumAtt$ -X | NumDef$ -X
-SVar:X:Count$Valid Insect.YouCtrl,Rat.YouCtrl,Spider.YouCtrl,Squirrel.YouCtrl
-DeckHints:Type$Insect|Rat|Spider|Squirrel
-DeckHas:Ability$Token
-Oracle:Create two 1/1 green Squirrel creature tokens. Then each creature that isn't an Insect, Rat, Spider, or Squirrel gets -1/-1 until end of turn for each creature you control that's an Insect, Rat, Spider, or Squirrel.
+Name:Swarmyard Massacre
+ManaCost:3 B B
+Types:Sorcery
+A:SP$ Token | TokenScript$ g_1_1_squirrel | TokenAmount$ 2 | TokenOwner$ You | SubAbility$ DBPumpAll | SpellDescription$ Create two 1/1 green Squirrel creature tokens. Then each creature that isn't an Insect, Rat, Spider, or Squirrel gets -1/-1 until end of turn for each creature you control that's an Insect, Rat, Spider, or Squirrel.
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.nonInsect+nonRat+nonSpider+nonSquirrel | NumAtt$ -X | NumDef$ -X
+SVar:X:Count$Valid Insect.YouCtrl,Rat.YouCtrl,Spider.YouCtrl,Squirrel.YouCtrl
+DeckHints:Type$Insect|Rat|Spider|Squirrel
+DeckHas:Ability$Token
+Oracle:Create two 1/1 green Squirrel creature tokens. Then each creature that isn't an Insect, Rat, Spider, or Squirrel gets -1/-1 until end of turn for each creature you control that's an Insect, Rat, Spider, or Squirrel.
diff --git a/forge-gui/res/cardsfolder/upcoming/sword_of_the_squeak.txt b/forge-gui/res/cardsfolder/upcoming/sword_of_the_squeak.txt
index 5186451ad81..996d5810b0f 100644
--- a/forge-gui/res/cardsfolder/upcoming/sword_of_the_squeak.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sword_of_the_squeak.txt
@@ -1,9 +1,9 @@
-Name:Sword of the Squeak
-ManaCost:2
-Types:Artifact Equipment
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +1/+1 for each creature you control with base power or toughness 1.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Hamster.YouCtrl,Mouse.YouCtrl,Rat.YouCtrl,Squirrel.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigAttach | OptionalDecider$ You | TriggerDescription$ Whenever a Hamster, Mouse, Rat, or Squirrel you control enters, you may attach CARDNAME to that creature.
-SVar:TrigAttach:DB$ Attach | Defined$ TriggeredCard
-K:Equip:2
-SVar:X:Count$Valid Creature.basePowerEQ1+YouCtrl,Creature.baseToughnessEQ1+YouCtrl
-Oracle:Equipped creature gets +1/+1 for each creature you control with base power or toughness 1.\nWhenever a Hamster, Mouse, Rat, or Squirrel you control enters, you may attach Sword of the Squeak to that creature.\nEquip {2}
\ No newline at end of file
+Name:Sword of the Squeak
+ManaCost:2
+Types:Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +1/+1 for each creature you control with base power or toughness 1.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Hamster.YouCtrl,Mouse.YouCtrl,Rat.YouCtrl,Squirrel.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigAttach | OptionalDecider$ You | TriggerDescription$ Whenever a Hamster, Mouse, Rat, or Squirrel you control enters, you may attach CARDNAME to that creature.
+SVar:TrigAttach:DB$ Attach | Defined$ TriggeredCard
+K:Equip:2
+SVar:X:Count$Valid Creature.basePowerEQ1+YouCtrl,Creature.baseToughnessEQ1+YouCtrl
+Oracle:Equipped creature gets +1/+1 for each creature you control with base power or toughness 1.\nWhenever a Hamster, Mouse, Rat, or Squirrel you control enters, you may attach Sword of the Squeak to that creature.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/upcoming/take_out_the_trash.txt b/forge-gui/res/cardsfolder/upcoming/take_out_the_trash.txt
index f656ff95df1..e5911a4384d 100644
--- a/forge-gui/res/cardsfolder/upcoming/take_out_the_trash.txt
+++ b/forge-gui/res/cardsfolder/upcoming/take_out_the_trash.txt
@@ -1,7 +1,7 @@
-Name:Take Out the Trash
-ManaCost:1 R
-Types:Instant
-A:SP$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker. | NumDmg$ 3 | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals 3 damage to target creature or planeswalker. If you control a Raccoon, you may discard a card. If you do, draw a card.
-SVar:DBDraw:DB$ Draw | ConditionPresent$ Raccoon.YouCtrl | UnlessCost$ Discard<1/Card> | UnlessSwitched$ True | UnlessPayer$ You
-DeckHints:Type$Raccoon
-Oracle:Take Out the Trash deals 3 damage to target creature or planeswalker. If you control a Raccoon, you may discard a card. If you do, draw a card.
+Name:Take Out the Trash
+ManaCost:1 R
+Types:Instant
+A:SP$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker. | NumDmg$ 3 | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals 3 damage to target creature or planeswalker. If you control a Raccoon, you may discard a card. If you do, draw a card.
+SVar:DBDraw:DB$ Draw | ConditionPresent$ Raccoon.YouCtrl | UnlessCost$ Discard<1/Card> | UnlessSwitched$ True | UnlessPayer$ You
+DeckHints:Type$Raccoon
+Oracle:Take Out the Trash deals 3 damage to target creature or planeswalker. If you control a Raccoon, you may discard a card. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/tangle_tumbler.txt b/forge-gui/res/cardsfolder/upcoming/tangle_tumbler.txt
index f04a9884d39..6fe2bfb584d 100644
--- a/forge-gui/res/cardsfolder/upcoming/tangle_tumbler.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tangle_tumbler.txt
@@ -1,8 +1,8 @@
-Name:Tangle Tumbler
-ManaCost:3
-Types:Artifact Vehicle
-PT:6/6
-K:Vigilance
-A:AB$ PutCounter | Cost$ 3 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature.
-A:AB$ Animate | Cost$ tapXType<2/Permanent.token/token> | Defined$ Self | Types$ Artifact,Creature | SpellDescription$ CARDNAME becomes an artifact creature until end of turn.
-Oracle:Vigilance\n{3}, {T}: Put a +1/+1 counter on target creature.\nTap two untapped tokens you control: Tangle Tumbler becomes an artifact creature until end of turn.
\ No newline at end of file
+Name:Tangle Tumbler
+ManaCost:3
+Types:Artifact Vehicle
+PT:6/6
+K:Vigilance
+A:AB$ PutCounter | Cost$ 3 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature.
+A:AB$ Animate | Cost$ tapXType<2/Permanent.token/token> | Defined$ Self | Types$ Artifact,Creature | SpellDescription$ CARDNAME becomes an artifact creature until end of turn.
+Oracle:Vigilance\n{3}, {T}: Put a +1/+1 counter on target creature.\nTap two untapped tokens you control: Tangle Tumbler becomes an artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/tempest_angler.txt b/forge-gui/res/cardsfolder/upcoming/tempest_angler.txt
index 58cf8fea293..59d1b4e84fa 100644
--- a/forge-gui/res/cardsfolder/upcoming/tempest_angler.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tempest_angler.txt
@@ -1,8 +1,8 @@
-Name:Tempest Angler
-ManaCost:1 UR UR
-Types:Creature Otter Wizard
-PT:2/2
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:BuffedBy:nonCreature
-Oracle:Whenever you cast a noncreature spell, put a +1/+1 counter on Tempest Angler.
\ No newline at end of file
+Name:Tempest Angler
+ManaCost:1 UR UR
+Types:Creature Otter Wizard
+PT:2/2
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:BuffedBy:nonCreature
+Oracle:Whenever you cast a noncreature spell, put a +1/+1 counter on Tempest Angler.
diff --git a/forge-gui/res/cardsfolder/upcoming/tempt_with_bunnies.txt b/forge-gui/res/cardsfolder/upcoming/tempt_with_bunnies.txt
index 89686b6f528..54134a077c5 100644
--- a/forge-gui/res/cardsfolder/upcoming/tempt_with_bunnies.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tempt_with_bunnies.txt
@@ -1,14 +1,14 @@
-Name:Tempt with Bunnies
-ManaCost:2 W
-Types:Sorcery
-A:SP$ Draw | SubAbility$ DBToken1 | SpellDescription$ Tempting offer — Draw a card and create a 1/1 white Rabbit creature token. Then each opponent may draw a card and create a 1/1 white Rabbit creature token. For each opponent who does, you draw a card and you create a 1/1 white Rabbit creature token.
-SVar:DBToken1:DB$ Token | TokenScript$ w_1_1_rabbit | TokenAmount$ 1 | TokenOwner$ You | SubAbility$ DBRepeat
-SVar:DBRepeat:DB$ RepeatEach | RepeatSubAbility$ DBDraw1 | RepeatPlayers$ Player.Opponent | SubAbility$ DBDraw2 | ChangeZoneTable$ True | RepeatOptionalForEachPlayer$ True | RepeatOptionalMessage$ Do you want to draw a card and create a 1/1 white Rabbit creature token?
-SVar:DBDraw1:DB$ Draw | Defined$ Player.IsRemembered | SubAbility$ DBToken2
-SVar:DBToken2:DB$ Token | TokenScript$ w_1_1_rabbit | TokenAmount$ 1 | TokenOwner$ Player.IsRemembered | SubAbility$ DBCount
-SVar:DBCount:DB$ StoreSVar | SVar$ X | Type$ CountSVar | Expression$ X/Plus.1
-SVar:DBDraw2:DB$ Draw | NumCards$ X | SubAbility$ DBToken3
-SVar:DBToken3:DB$ Token | TokenScript$ w_1_1_rabbit | TokenAmount$ X | TokenOwner$ You | SubAbility$ DBReset
-SVar:DBReset:DB$ StoreSVar | SVar$ X | Type$ Number | Expression$ 0
-SVar:X:Number$0
-Oracle:Tempting offer — Draw a card and create a 1/1 white Rabbit creature token. Then each opponent may draw a card and create a 1/1 white Rabbit creature token. For each opponent who does, you draw a card and you create a 1/1 white Rabbit creature token.
+Name:Tempt with Bunnies
+ManaCost:2 W
+Types:Sorcery
+A:SP$ Draw | SubAbility$ DBToken1 | SpellDescription$ Tempting offer — Draw a card and create a 1/1 white Rabbit creature token. Then each opponent may draw a card and create a 1/1 white Rabbit creature token. For each opponent who does, you draw a card and you create a 1/1 white Rabbit creature token.
+SVar:DBToken1:DB$ Token | TokenScript$ w_1_1_rabbit | TokenAmount$ 1 | TokenOwner$ You | SubAbility$ DBRepeat
+SVar:DBRepeat:DB$ RepeatEach | RepeatSubAbility$ DBDraw1 | RepeatPlayers$ Player.Opponent | SubAbility$ DBDraw2 | ChangeZoneTable$ True | RepeatOptionalForEachPlayer$ True | RepeatOptionalMessage$ Do you want to draw a card and create a 1/1 white Rabbit creature token?
+SVar:DBDraw1:DB$ Draw | Defined$ Player.IsRemembered | SubAbility$ DBToken2
+SVar:DBToken2:DB$ Token | TokenScript$ w_1_1_rabbit | TokenAmount$ 1 | TokenOwner$ Player.IsRemembered | SubAbility$ DBCount
+SVar:DBCount:DB$ StoreSVar | SVar$ X | Type$ CountSVar | Expression$ X/Plus.1
+SVar:DBDraw2:DB$ Draw | NumCards$ X | SubAbility$ DBToken3
+SVar:DBToken3:DB$ Token | TokenScript$ w_1_1_rabbit | TokenAmount$ X | TokenOwner$ You | SubAbility$ DBReset
+SVar:DBReset:DB$ StoreSVar | SVar$ X | Type$ Number | Expression$ 0
+SVar:X:Number$0
+Oracle:Tempting offer — Draw a card and create a 1/1 white Rabbit creature token. Then each opponent may draw a card and create a 1/1 white Rabbit creature token. For each opponent who does, you draw a card and you create a 1/1 white Rabbit creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_aesir_escape_valhalla.txt b/forge-gui/res/cardsfolder/upcoming/the_aesir_escape_valhalla.txt
index 0d1964b90cd..14333e71a54 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_aesir_escape_valhalla.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_aesir_escape_valhalla.txt
@@ -1,9 +1,9 @@
-Name:The Aesir Escape Valhalla
-ManaCost:2 G
-Types:Enchantment Saga
-K:Chapter:3:I,II,III
-SVar:I:DB$ ChangeZone | ChangeNum$ 1 | ChangeType$ Permanent.YouOwn | Mandatory$ True | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBGainLife | SpellDescription$ Exile a permanent card from your graveyard. You gain life equal to its mana value.
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ ExiledWith$CardManaCost
-SVar:II:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ ExiledWith$CardManaCost | SpellDescription$ Put a number of +1/+1 counters on target creature you control equal to the mana value of the exiled card.
-SVar:III:DB$ ChangeZone | ChangeType$ Card.StrictlySelf,Card.ExiledWithSource | Origin$ Battlefield,Exile | Destination$ Hand | SpellDescription$ Return CARDNAME and the exiled card to their owner's hand.
-Oracle:(As this Saga enters and after your draw step, add a lore counter.)\nI — Exile a permanent card from your graveyard. You gain life equal to its mana value.\nII — Put a number of +1/+1 counters on target creature you control equal to the mana value of the exiled card.\nIII — Return The Aesir Escape Valhalla and the exiled card to their owner's hand.
\ No newline at end of file
+Name:The Aesir Escape Valhalla
+ManaCost:2 G
+Types:Enchantment Saga
+K:Chapter:3:I,II,III
+SVar:I:DB$ ChangeZone | ChangeNum$ 1 | ChangeType$ Permanent.YouOwn | Mandatory$ True | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBGainLife | SpellDescription$ Exile a permanent card from your graveyard. You gain life equal to its mana value.
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ ExiledWith$CardManaCost
+SVar:II:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ ExiledWith$CardManaCost | SpellDescription$ Put a number of +1/+1 counters on target creature you control equal to the mana value of the exiled card.
+SVar:III:DB$ ChangeZone | ChangeType$ Card.StrictlySelf,Card.ExiledWithSource | Origin$ Battlefield,Exile | Destination$ Hand | SpellDescription$ Return CARDNAME and the exiled card to their owner's hand.
+Oracle:(As this Saga enters and after your draw step, add a lore counter.)\nI — Exile a permanent card from your graveyard. You gain life equal to its mana value.\nII — Put a number of +1/+1 counters on target creature you control equal to the mana value of the exiled card.\nIII — Return The Aesir Escape Valhalla and the exiled card to their owner's hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_infamous_cruelclaw.txt b/forge-gui/res/cardsfolder/upcoming/the_infamous_cruelclaw.txt
index 817d1e9829a..70cacf6fd1b 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_infamous_cruelclaw.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_infamous_cruelclaw.txt
@@ -1,11 +1,11 @@
-Name:The Infamous Cruelclaw
-ManaCost:1 B R
-Types:Legendary Creature Weasel Mercenary
-PT:3/3
-K:Menace
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDigUntil | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, exile cards from the top of your library until you exile a nonland card. You may cast that card by discarding a card rather than paying its mana cost.
-SVar:TrigDigUntil:DB$ DigUntil | Valid$ Card.nonLand | FoundDestination$ Exile | RevealedDestination$ Exile | RememberFound$ True | SubAbility$ DBPlay
-SVar:DBPlay:DB$ Play | Defined$ Remembered | ValidSA$ Spell | PlayCost$ Discard<1/Card> | Optional$ True | SubAbility$ DBChange | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:MustBeBlocked:True
-Oracle:Menace\nWhenever The Infamous Cruelclaw deals combat damage to a player, exile cards from the top of your library until you exile a nonland card. You may cast that card by discarding a card rather than paying its mana cost.
\ No newline at end of file
+Name:The Infamous Cruelclaw
+ManaCost:1 B R
+Types:Legendary Creature Weasel Mercenary
+PT:3/3
+K:Menace
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDigUntil | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, exile cards from the top of your library until you exile a nonland card. You may cast that card by discarding a card rather than paying its mana cost.
+SVar:TrigDigUntil:DB$ DigUntil | Valid$ Card.nonLand | FoundDestination$ Exile | RevealedDestination$ Exile | RememberFound$ True | SubAbility$ DBPlay
+SVar:DBPlay:DB$ Play | Defined$ Remembered | ValidSA$ Spell | PlayCost$ Discard<1/Card> | Optional$ True | SubAbility$ DBChange | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:MustBeBlocked:True
+Oracle:Menace\nWhenever The Infamous Cruelclaw deals combat damage to a player, exile cards from the top of your library until you exile a nonland card. You may cast that card by discarding a card rather than paying its mana cost.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_odd_acorn_gang.txt b/forge-gui/res/cardsfolder/upcoming/the_odd_acorn_gang.txt
index 0a32ef3f7e5..da45207a13a 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_odd_acorn_gang.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_odd_acorn_gang.txt
@@ -1,14 +1,14 @@
-Name:The Odd Acorn Gang
-ManaCost:3 B G
-Types:Legendary Creature Squirrel Warrior
-PT:5/5
-K:Menace
-K:Trample
-K:Reach
-S:Mode$ Continuous | Affected$ Squirrel.YouCtrl | AddAbility$ Pump | Description$ Squirrels you control have "{T}: Target Squirrel gets +2/+2 and gains trample until end of turn. Activate only as a sorcery."
-SVar:Pump:AB$ Pump | Cost$ T | ValidTgts$ Squirrel | TgtPrompt$ Select target Squirrel | NumAtt$ 2 | NumDef$ 2 | KW$ Trample | SorcerySpeed$ True | SpellDescription$ Target Squirrel gets +2/+2 and gains trample until end of turn. Activate only as a sorcery.
-T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Squirrel.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | Execute$ TrigDraw | TriggerDescription$ Whenever one or more Squirrels you control deal combat damage to a player, draw a card.
-SVar:TrigDraw:DB$ Draw
-SVar:PlayMain1:TRUE
-DeckHints:Type$Squirrel
-Oracle:Menace, trample, reach\nSquirrels you control have "{T}: Target Squirrel gets +2/+2 and gains trample until end of turn. Activate only as a sorcery."\nWhenever one or more Squirrels you control deal combat damage to a player, draw a card.
\ No newline at end of file
+Name:The Odd Acorn Gang
+ManaCost:3 B G
+Types:Legendary Creature Squirrel Warrior
+PT:5/5
+K:Menace
+K:Trample
+K:Reach
+S:Mode$ Continuous | Affected$ Squirrel.YouCtrl | AddAbility$ Pump | Description$ Squirrels you control have "{T}: Target Squirrel gets +2/+2 and gains trample until end of turn. Activate only as a sorcery."
+SVar:Pump:AB$ Pump | Cost$ T | ValidTgts$ Squirrel | TgtPrompt$ Select target Squirrel | NumAtt$ 2 | NumDef$ 2 | KW$ Trample | SorcerySpeed$ True | SpellDescription$ Target Squirrel gets +2/+2 and gains trample until end of turn. Activate only as a sorcery.
+T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Squirrel.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | Execute$ TrigDraw | TriggerDescription$ Whenever one or more Squirrels you control deal combat damage to a player, draw a card.
+SVar:TrigDraw:DB$ Draw
+SVar:PlayMain1:TRUE
+DeckHints:Type$Squirrel
+Oracle:Menace, trample, reach\nSquirrels you control have "{T}: Target Squirrel gets +2/+2 and gains trample until end of turn. Activate only as a sorcery."\nWhenever one or more Squirrels you control deal combat damage to a player, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_revelations_of_ezio.txt b/forge-gui/res/cardsfolder/upcoming/the_revelations_of_ezio.txt
index 3f4c5029c6d..6f285c62390 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_revelations_of_ezio.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_revelations_of_ezio.txt
@@ -1,11 +1,11 @@
-Name:The Revelations of Ezio
-ManaCost:2 B
-Types:Enchantment Saga
-K:Chapter:3:DBDestroy,DBEffect,DBChangeZone
-SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature.OppCtrl+tapped | TgtPrompt$ Select target tapped creature an opponent controls | SpellDescription$ Destroy target tapped creature an opponent controls.
-SVar:DBEffect:DB$ Effect | Triggers$ TrigAttack | SpellDescription$ Whenever an Assassin you control attacks this turn, put a +1/+1 counter on it.
-SVar:TrigAttack:Mode$ Attacks | ValidCard$ Assassin.YouCtrl | Execute$ TrigPutCounter | TriggerDescription$ Whenever an Assassin you control attacks this turn, put a +1/+1 counter on it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredAttackerLKICopy | CounterType$ P1P1 | CounterNum$ 1
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target Assassin creature card in your graveyard | ValidTgts$ Creature.Assassin+YouOwn | WithCountersType$ P1P1 | SpellDescription$ Return target Assassin creature card from your graveyard to the battlefield with an additional +1/+1 counter on it.
-DeckHas:Ability$Counters
-Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — Destroy target tapped creature an opponent controls.\nII — Whenever an Assassin you control attacks this turn, put a +1/+1 counter on it.\nIII — Return target Assassin creature card from your graveyard to the battlefield with an additional +1/+1 counter on it.
\ No newline at end of file
+Name:The Revelations of Ezio
+ManaCost:2 B
+Types:Enchantment Saga
+K:Chapter:3:DBDestroy,DBEffect,DBChangeZone
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature.OppCtrl+tapped | TgtPrompt$ Select target tapped creature an opponent controls | SpellDescription$ Destroy target tapped creature an opponent controls.
+SVar:DBEffect:DB$ Effect | Triggers$ TrigAttack | SpellDescription$ Whenever an Assassin you control attacks this turn, put a +1/+1 counter on it.
+SVar:TrigAttack:Mode$ Attacks | ValidCard$ Assassin.YouCtrl | Execute$ TrigPutCounter | TriggerDescription$ Whenever an Assassin you control attacks this turn, put a +1/+1 counter on it.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredAttackerLKICopy | CounterType$ P1P1 | CounterNum$ 1
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target Assassin creature card in your graveyard | ValidTgts$ Creature.Assassin+YouOwn | WithCountersType$ P1P1 | SpellDescription$ Return target Assassin creature card from your graveyard to the battlefield with an additional +1/+1 counter on it.
+DeckHas:Ability$Counters
+Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — Destroy target tapped creature an opponent controls.\nII — Whenever an Assassin you control attacks this turn, put a +1/+1 counter on it.\nIII — Return target Assassin creature card from your graveyard to the battlefield with an additional +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_wandering_rescuer.txt b/forge-gui/res/cardsfolder/upcoming/the_wandering_rescuer.txt
index 98d5cec3a6f..38e60fd5f9d 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_wandering_rescuer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_wandering_rescuer.txt
@@ -1,9 +1,9 @@
-Name:The Wandering Rescuer
-ManaCost:3 W W
-Types:Legendary Creature Human Samurai Noble
-PT:3/4
-K:Flash
-K:Convoke
-K:Double Strike
-S:Mode$ Continuous | Affected$ Creature.tapped+YouCtrl+Other | AddKeyword$ Hexproof | Description$ Other tapped creatures you control have hexproof.
-Oracle:Flash\nConvoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nDouble strike\nOther tapped creatures you control have hexproof.
+Name:The Wandering Rescuer
+ManaCost:3 W W
+Types:Legendary Creature Human Samurai Noble
+PT:3/4
+K:Flash
+K:Convoke
+K:Double Strike
+S:Mode$ Continuous | Affected$ Creature.tapped+YouCtrl+Other | AddKeyword$ Hexproof | Description$ Other tapped creatures you control have hexproof.
+Oracle:Flash\nConvoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nDouble strike\nOther tapped creatures you control have hexproof.
diff --git a/forge-gui/res/cardsfolder/upcoming/thickest_in_the_thicket.txt b/forge-gui/res/cardsfolder/upcoming/thickest_in_the_thicket.txt
index 22272c87a2e..480e580608b 100644
--- a/forge-gui/res/cardsfolder/upcoming/thickest_in_the_thicket.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thickest_in_the_thicket.txt
@@ -1,13 +1,13 @@
-Name:Thickest in the Thicket
-ManaCost:3 G G
-Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, put X +1/+1 counters on target creature, where X is that creature's power.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ X
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, draw two cards if you control the creature with the greatest power or tied for the greatest power.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 2 | ConditionPresent$ Creature.YouCtrl | ConditionCompare$ GE1 | ConditionCheckSVar$ Y | ConditionSVarCompare$ GEZ
-SVar:X:Targeted$CardPower
-SVar:Y:Count$Valid Creature.YouCtrl$GreatestPower
-SVar:Z:Count$Valid Creature.YouDontCtrl$GreatestPower
-SVar:PlayMain1:TRUE
-DeckHas:Ability$Counters
-Oracle:When Thickest in the Thicket enters, put X +1/+1 counters on target creature, where X is that creature's power.\nAt the beginning of your end step, draw two cards if you control the creature with the greatest power or tied for the greatest power.
\ No newline at end of file
+Name:Thickest in the Thicket
+ManaCost:3 G G
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, put X +1/+1 counters on target creature, where X is that creature's power.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ X
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, draw two cards if you control the creature with the greatest power or tied for the greatest power.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 2 | ConditionPresent$ Creature.YouCtrl | ConditionCompare$ GE1 | ConditionCheckSVar$ Y | ConditionSVarCompare$ GEZ
+SVar:X:Targeted$CardPower
+SVar:Y:Count$Valid Creature.YouCtrl$GreatestPower
+SVar:Z:Count$Valid Creature.YouDontCtrl$GreatestPower
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Counters
+Oracle:When Thickest in the Thicket enters, put X +1/+1 counters on target creature, where X is that creature's power.\nAt the beginning of your end step, draw two cards if you control the creature with the greatest power or tied for the greatest power.
diff --git a/forge-gui/res/cardsfolder/upcoming/thistledown_players.txt b/forge-gui/res/cardsfolder/upcoming/thistledown_players.txt
index 1eeab5b2c9e..f0fbc7ac2ec 100644
--- a/forge-gui/res/cardsfolder/upcoming/thistledown_players.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thistledown_players.txt
@@ -1,8 +1,8 @@
-Name:Thistledown Players
-ManaCost:2 W
-Types:Creature Mouse Bard
-PT:3/3
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME attacks, untap target nonland permanent.
-SVar:TrigUntap:DB$ Untap | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent
-SVar:HasAttackEffect:TRUE
-Oracle:Whenever Thistledown Players attacks, untap target nonland permanent.
+Name:Thistledown Players
+ManaCost:2 W
+Types:Creature Mouse Bard
+PT:3/3
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME attacks, untap target nonland permanent.
+SVar:TrigUntap:DB$ Untap | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent
+SVar:HasAttackEffect:TRUE
+Oracle:Whenever Thistledown Players attacks, untap target nonland permanent.
diff --git a/forge-gui/res/cardsfolder/upcoming/thornplate_intimidator.txt b/forge-gui/res/cardsfolder/upcoming/thornplate_intimidator.txt
index a5ead5cfcd8..ea07aad854b 100644
--- a/forge-gui/res/cardsfolder/upcoming/thornplate_intimidator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thornplate_intimidator.txt
@@ -1,12 +1,12 @@
-Name:Thornplate Intimidator
-ManaCost:3 B
-Types:Creature Rat Rogue
-PT:4/3
-K:Offspring:3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGenericChoice | TriggerDescription$ When this creature enters, target opponent loses 3 life unless they sacrifice a nonland permanent or discard a card.
-SVar:TrigGenericChoice:DB$ GenericChoice | ValidTgts$ Opponent | Choices$ PaySac,PayDiscard | FallbackAbility$ LoseLifeFallback | AILogic$ PayUnlessCost
-SVar:PaySac:DB$ LoseLife | LifeAmount$ 3 | Defined$ Targeted | UnlessCost$ Sac<1/Permanent.nonland/nonland permanent> | UnlessPayer$ Targeted | UnlessAI$ LifeLE3 | SpellDescription$ You lose 3 life unless you sacrifice a nonland permanent
-SVar:PayDiscard:DB$ LoseLife | LifeAmount$ 3 | Defined$ Targeted | UnlessCost$ Discard<1/Card> | UnlessPayer$ Targeted | UnlessAI$ LifeLE3 | SpellDescription$ You lose 3 life unless you discard a card
-# TODO: Most likely the ChooseGenericEffect code can be simplified somehow to avoid the necessity of having a dedicated fallback ability
-SVar:LoseLifeFallback:DB$ LoseLife | Defined$ Targeted | LifeAmount$ 3
-Oracle:Offspring {3} (You may pay an additional {3} 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 opponent loses 3 life unless they sacrifice a nonland permanent or discard a card.
\ No newline at end of file
+Name:Thornplate Intimidator
+ManaCost:3 B
+Types:Creature Rat Rogue
+PT:4/3
+K:Offspring:3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGenericChoice | TriggerDescription$ When this creature enters, target opponent loses 3 life unless they sacrifice a nonland permanent or discard a card.
+SVar:TrigGenericChoice:DB$ GenericChoice | ValidTgts$ Opponent | Choices$ PaySac,PayDiscard | FallbackAbility$ LoseLifeFallback | AILogic$ PayUnlessCost
+SVar:PaySac:DB$ LoseLife | LifeAmount$ 3 | Defined$ Targeted | UnlessCost$ Sac<1/Permanent.nonland/nonland permanent> | UnlessPayer$ Targeted | UnlessAI$ LifeLE3 | SpellDescription$ You lose 3 life unless you sacrifice a nonland permanent
+SVar:PayDiscard:DB$ LoseLife | LifeAmount$ 3 | Defined$ Targeted | UnlessCost$ Discard<1/Card> | UnlessPayer$ Targeted | UnlessAI$ LifeLE3 | SpellDescription$ You lose 3 life unless you discard a card
+# TODO: Most likely the ChooseGenericEffect code can be simplified somehow to avoid the necessity of having a dedicated fallback ability
+SVar:LoseLifeFallback:DB$ LoseLife | Defined$ Targeted | LifeAmount$ 3
+Oracle:Offspring {3} (You may pay an additional {3} 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 opponent loses 3 life unless they sacrifice a nonland permanent or discard a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/thornvault_forager.txt b/forge-gui/res/cardsfolder/upcoming/thornvault_forager.txt
index eb61919881a..244e6d75317 100644
--- a/forge-gui/res/cardsfolder/upcoming/thornvault_forager.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thornvault_forager.txt
@@ -1,9 +1,9 @@
-Name:Thornvault Forager
-ManaCost:1 G
-Types:Creature Squirrel Ranger
-PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
-A:AB$ Mana | Cost$ T Forage | Produced$ Combo Any | Amount$ 2 | SpellDescription$ Add two mana in any combination of colors.
-A:AB$ ChangeZone | Cost$ 3 G T | Origin$ Library | Destination$ Hand | ChangeType$ Squirrel | SpellDescription$ Search your library for a Squirrel card, reveal it, put it into your hand, then shuffle.
-DeckHints:Ability$Graveyard & Type$Food
-Oracle:{T}: Add {G}.\n{T}, Forage: Add two mana in any combination of colors. (To forage, exile three cards from your graveyard or sacrifice a Food.)\n{3}{G}, {T}: Search your library for a Squirrel card, reveal it, put it into your hand, then shuffle.
+Name:Thornvault Forager
+ManaCost:1 G
+Types:Creature Squirrel Ranger
+PT:2/2
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T Forage | Produced$ Combo Any | Amount$ 2 | SpellDescription$ Add two mana in any combination of colors.
+A:AB$ ChangeZone | Cost$ 3 G T | Origin$ Library | Destination$ Hand | ChangeType$ Squirrel | SpellDescription$ Search your library for a Squirrel card, reveal it, put it into your hand, then shuffle.
+DeckHints:Ability$Graveyard & Type$Food
+Oracle:{T}: Add {G}.\n{T}, Forage: Add two mana in any combination of colors. (To forage, exile three cards from your graveyard or sacrifice a Food.)\n{3}{G}, {T}: Search your library for a Squirrel card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/thought_shucker.txt b/forge-gui/res/cardsfolder/upcoming/thought_shucker.txt
index 52b06648329..0d9a25b5dcd 100644
--- a/forge-gui/res/cardsfolder/upcoming/thought_shucker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thought_shucker.txt
@@ -1,9 +1,9 @@
-Name:Thought Shucker
-ManaCost:1 U
-Types:Creature Rat Rogue
-PT:1/3
-A:AB$ PutCounter | Cost$ 1 U | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw | CheckSVar$ X | SVarCompare$ GE7 | GameActivationLimit$ 1 | PrecostDesc$ Threshold — | SpellDescription$ Put a +1/+1 counter on CARDNAME and draw a card. Activate only if seven or more cards are in your graveyard and only once.
-SVar:DBDraw:DB$ Draw
-SVar:X:Count$InYourYard
-DeckHas:Ability$Counters
-Oracle:Threshold — {1}{U}: Put a +1/+1 counter on Thought Shucker and draw a card. Activate only if seven or more cards are in your graveyard and only once.
+Name:Thought Shucker
+ManaCost:1 U
+Types:Creature Rat Rogue
+PT:1/3
+A:AB$ PutCounter | Cost$ 1 U | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw | CheckSVar$ X | SVarCompare$ GE7 | GameActivationLimit$ 1 | PrecostDesc$ Threshold — | SpellDescription$ Put a +1/+1 counter on CARDNAME and draw a card. Activate only if seven or more cards are in your graveyard and only once.
+SVar:DBDraw:DB$ Draw
+SVar:X:Count$InYourYard
+DeckHas:Ability$Counters
+Oracle:Threshold — {1}{U}: Put a +1/+1 counter on Thought Shucker and draw a card. Activate only if seven or more cards are in your graveyard and only once.
diff --git a/forge-gui/res/cardsfolder/upcoming/thought_stalker_warlock.txt b/forge-gui/res/cardsfolder/upcoming/thought_stalker_warlock.txt
index 32dc3becfb8..aa619ccb001 100644
--- a/forge-gui/res/cardsfolder/upcoming/thought_stalker_warlock.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thought_stalker_warlock.txt
@@ -1,11 +1,11 @@
-Name:Thought-Stalker Warlock
-ManaCost:2 B
-Types:Creature Lizard Warlock
-PT:2/2
-K:Menace
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBranch | TriggerDescription$ When CARDNAME enters, choose target opponent. If they lost life this turn, they reveal their hand, you choose a nonland card from it, and they discard that card. Otherwise, they discard a card.
-SVar:TrigBranch:DB$ Branch | ValidTgts$ Opponent | BranchConditionSVar$ X | BranchConditionSVarCompare$ GT0 | TrueSubAbility$ DBDuress | FalseSubAbility$ DBDiscard
-SVar:DBDuress:DB$ Discard | Defined$ TargetedPlayer | Mode$ RevealYouChoose | DiscardValid$ Card.nonLand | NumCards$ 1
-SVar:DBDiscard:DB$ Discard | Defined$ TargetedPlayer | Mode$ TgtChoose | NumCards$ 1
-SVar:X:TargetedPlayer$LifeLostThisTurn
-Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhen Thought-Stalker Warlock enters, choose target opponent. If they lost life this turn, they reveal their hand, you choose a nonland card from it, and they discard that card. Otherwise, they discard a card.
+Name:Thought-Stalker Warlock
+ManaCost:2 B
+Types:Creature Lizard Warlock
+PT:2/2
+K:Menace
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBranch | TriggerDescription$ When CARDNAME enters, choose target opponent. If they lost life this turn, they reveal their hand, you choose a nonland card from it, and they discard that card. Otherwise, they discard a card.
+SVar:TrigBranch:DB$ Branch | ValidTgts$ Opponent | BranchConditionSVar$ X | BranchConditionSVarCompare$ GT0 | TrueSubAbility$ DBDuress | FalseSubAbility$ DBDiscard
+SVar:DBDuress:DB$ Discard | Defined$ TargetedPlayer | Mode$ RevealYouChoose | DiscardValid$ Card.nonLand | NumCards$ 1
+SVar:DBDiscard:DB$ Discard | Defined$ TargetedPlayer | Mode$ TgtChoose | NumCards$ 1
+SVar:X:TargetedPlayer$LifeLostThisTurn
+Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhen Thought-Stalker Warlock enters, choose target opponent. If they lost life this turn, they reveal their hand, you choose a nonland card from it, and they discard that card. Otherwise, they discard a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/three_tree_mascot.txt b/forge-gui/res/cardsfolder/upcoming/three_tree_mascot.txt
index e7cbf444446..581f18471d2 100644
--- a/forge-gui/res/cardsfolder/upcoming/three_tree_mascot.txt
+++ b/forge-gui/res/cardsfolder/upcoming/three_tree_mascot.txt
@@ -1,7 +1,7 @@
-Name:Three Tree Mascot
-ManaCost:2
-Types:Artifact Creature Shapeshifter
-PT:2/1
-K:Changeling
-A:AB$ Mana | Cost$ 1 | Produced$ Any | ActivationLimit$ 1 | SpellDescription$ Add one mana of any color. Activate only once each turn.
-Oracle:Changeling (This card is every creature type.)\n{1}: Add one mana of any color. Activate only once each turn.
\ No newline at end of file
+Name:Three Tree Mascot
+ManaCost:2
+Types:Artifact Creature Shapeshifter
+PT:2/1
+K:Changeling
+A:AB$ Mana | Cost$ 1 | Produced$ Any | ActivationLimit$ 1 | SpellDescription$ Add one mana of any color. Activate only once each turn.
+Oracle:Changeling (This card is every creature type.)\n{1}: Add one mana of any color. Activate only once each turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/three_tree_rootweaver.txt b/forge-gui/res/cardsfolder/upcoming/three_tree_rootweaver.txt
index 506e44d276a..3afa980e4da 100644
--- a/forge-gui/res/cardsfolder/upcoming/three_tree_rootweaver.txt
+++ b/forge-gui/res/cardsfolder/upcoming/three_tree_rootweaver.txt
@@ -1,6 +1,6 @@
-Name:Three Tree Rootweaver
-ManaCost:1 G
-Types:Creature Mole Druid
-PT:1/3
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
-Oracle:{T}: Add one mana of any color.
+Name:Three Tree Rootweaver
+ManaCost:1 G
+Types:Creature Mole Druid
+PT:1/3
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
+Oracle:{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/upcoming/three_tree_scribe.txt b/forge-gui/res/cardsfolder/upcoming/three_tree_scribe.txt
index 4da120bd590..abb8602dc2c 100644
--- a/forge-gui/res/cardsfolder/upcoming/three_tree_scribe.txt
+++ b/forge-gui/res/cardsfolder/upcoming/three_tree_scribe.txt
@@ -1,8 +1,8 @@
-Name:Three Tree Scribe
-ManaCost:1 G
-Types:Creature Frog Druid
-PT:2/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Ante,Command,Exile,Hand,Library | ValidCard$ Card.Self,Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another creature you control leaves the battlefield without dying, put a +1/+1 counter on target creature you control.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
-DeckHas:Ability$Counters
-Oracle:Whenever Three Tree Scribe or another creature you control leaves the battlefield without dying, put a +1/+1 counter on target creature you control.
\ No newline at end of file
+Name:Three Tree Scribe
+ManaCost:1 G
+Types:Creature Frog Druid
+PT:2/3
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Ante,Command,Exile,Hand,Library | ValidCard$ Card.Self,Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another creature you control leaves the battlefield without dying, put a +1/+1 counter on target creature you control.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
+Oracle:Whenever Three Tree Scribe or another creature you control leaves the battlefield without dying, put a +1/+1 counter on target creature you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/thundertrap_trainer.txt b/forge-gui/res/cardsfolder/upcoming/thundertrap_trainer.txt
index a4cee7a102a..416cea7fbd1 100644
--- a/forge-gui/res/cardsfolder/upcoming/thundertrap_trainer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thundertrap_trainer.txt
@@ -1,8 +1,8 @@
-Name:Thundertrap Trainer
-ManaCost:1 U
-Types:Creature Otter Wizard
-PT:1/2
-K:Offspring:4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When this creature enters, look at the top four cards of your library. You may reveal a noncreature, nonland card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
-SVar:TrigDig:DB$ Dig | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Card.nonCreature+nonLand | RestRandomOrder$ True
-Oracle:Offspring {4} (You may pay an additional {4} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nWhen this creature enters, look at the top four cards of your library. You may reveal a noncreature, nonland card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
\ No newline at end of file
+Name:Thundertrap Trainer
+ManaCost:1 U
+Types:Creature Otter Wizard
+PT:1/2
+K:Offspring:4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When this creature enters, look at the top four cards of your library. You may reveal a noncreature, nonland card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+SVar:TrigDig:DB$ Dig | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Card.nonCreature+nonLand | RestRandomOrder$ True
+Oracle:Offspring {4} (You may pay an additional {4} as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it.)\nWhen this creature enters, look at the top four cards of your library. You may reveal a noncreature, nonland 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/tidecaller_mentor.txt b/forge-gui/res/cardsfolder/upcoming/tidecaller_mentor.txt
index 2871e2f8a7d..a8f5d9496b4 100644
--- a/forge-gui/res/cardsfolder/upcoming/tidecaller_mentor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tidecaller_mentor.txt
@@ -1,9 +1,9 @@
-Name:Tidecaller Mentor
-ManaCost:1 U B
-Types:Creature Rat Wizard
-PT:3/3
-K:Menace
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | CheckSVar$ X | SVarCompare$ GE7 | TriggerDescription$ Threshold — When CARDNAME enters, if seven or more cards are in your graveyard, return up to one target nonland permanent to its owner's hand.
-SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonLand | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target nonland permanent
-SVar:X:Count$InYourYard
-Oracle:Menace\nThreshold — When Tidecaller Mentor enters, if seven or more cards are in your graveyard, return up to one target nonland permanent to its owner's hand.
\ No newline at end of file
+Name:Tidecaller Mentor
+ManaCost:1 U B
+Types:Creature Rat Wizard
+PT:3/3
+K:Menace
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | CheckSVar$ X | SVarCompare$ GE7 | TriggerDescription$ Threshold — When CARDNAME enters, if seven or more cards are in your graveyard, return up to one target nonland permanent to its owner's hand.
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonLand | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target nonland permanent
+SVar:X:Count$InYourYard
+Oracle:Menace\nThreshold — When Tidecaller Mentor enters, if seven or more cards are in your graveyard, return up to one target nonland permanent to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/toby_beastie_befriender.txt b/forge-gui/res/cardsfolder/upcoming/toby_beastie_befriender.txt
index 7aba36e4089..3a7321c9ebb 100644
--- a/forge-gui/res/cardsfolder/upcoming/toby_beastie_befriender.txt
+++ b/forge-gui/res/cardsfolder/upcoming/toby_beastie_befriender.txt
@@ -1,9 +1,9 @@
-Name:Toby, Beastie Befriender
-ManaCost:2 W
-Types:Legendary Creature Human Wizard
-PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 4/4 white Beast creature token with "This creature can't attack or block alone."
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_4_4_beast_lonely | TokenOwner$ You
-S:Mode$ Continuous | Affected$ Creature.token+YouCtrl | AddKeyword$ Flying | IsPresent$ Creature.token+YouCtrl | PresentCompare$ GE4 | Description$ As long as you control four or more creature tokens, creature tokens you control have flying.
-DeckHas:Ability$Token
-Oracle:When Toby, Beastie Befriender enters, create a 4/4 white Beast creature token with "This creature can't attack or block alone."\nAs long as you control four or more creature tokens, creature tokens you control have flying.
\ No newline at end of file
+Name:Toby, Beastie Befriender
+ManaCost:2 W
+Types:Legendary Creature Human Wizard
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 4/4 white Beast creature token with "This creature can't attack or block alone."
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_4_4_beast_lonely | TokenOwner$ You
+S:Mode$ Continuous | Affected$ Creature.token+YouCtrl | AddKeyword$ Flying | IsPresent$ Creature.token+YouCtrl | PresentCompare$ GE4 | Description$ As long as you control four or more creature tokens, creature tokens you control have flying.
+DeckHas:Ability$Token
+Oracle:When Toby, Beastie Befriender enters, create a 4/4 white Beast creature token with "This creature can't attack or block alone."\nAs long as you control four or more creature tokens, creature tokens you control have flying.
diff --git a/forge-gui/res/cardsfolder/upcoming/towering_viewpoint.txt b/forge-gui/res/cardsfolder/upcoming/towering_viewpoint.txt
index 3088cf7a520..6134c32e9f7 100644
--- a/forge-gui/res/cardsfolder/upcoming/towering_viewpoint.txt
+++ b/forge-gui/res/cardsfolder/upcoming/towering_viewpoint.txt
@@ -1,8 +1,8 @@
-Name:Towering Viewpoint
-ManaCost:2
-Types:Artifact Creature Wall
-PT:0/4
-K:Defender
-K:Reach
-A:AB$ Pump | Cost$ 3 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
-Oracle:Defender, reach\nLeap of Faith — {3}: Target creature gains flying until end of turn.
+Name:Towering Viewpoint
+ManaCost:2
+Types:Artifact Creature Wall
+PT:0/4
+K:Defender
+K:Reach
+A:AB$ Pump | Cost$ 3 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
+Oracle:Defender, reach\nLeap of Faith — {3}: Target creature gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/trailtracker_scout.txt b/forge-gui/res/cardsfolder/upcoming/trailtracker_scout.txt
index fe0cc84f61f..718d79e3eed 100644
--- a/forge-gui/res/cardsfolder/upcoming/trailtracker_scout.txt
+++ b/forge-gui/res/cardsfolder/upcoming/trailtracker_scout.txt
@@ -1,8 +1,8 @@
-Name:Trailtracker Scout
-ManaCost:1 G
-Types:Creature Raccooon Scout
-PT:1/3
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
-T:Mode$ ManaExpend | Amount$ 8 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ Whenever you expend 8, return up to one target permanent card from your graveyard to your hand. (You expend 8 as you spend your eighth total mana to cast spells during a turn.)
-SVar:TrigChangeZone:DB$ ChangeZone | ValidTgts$ Permanent.YouOwn | TgtPrompt$ Choose up to one target permanent card | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 1
-Oracle:{T}: Add one mana of any color.\nWhenever you expend 8, return up to one target permanent card from your graveyard to your hand. (You expend 8 as you spend your eighth total mana to cast spells during a turn.)
\ No newline at end of file
+Name:Trailtracker Scout
+ManaCost:1 G
+Types:Creature Raccooon Scout
+PT:1/3
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
+T:Mode$ ManaExpend | Amount$ 8 | Player$ You | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ Whenever you expend 8, return up to one target permanent card from your graveyard to your hand. (You expend 8 as you spend your eighth total mana to cast spells during a turn.)
+SVar:TrigChangeZone:DB$ ChangeZone | ValidTgts$ Permanent.YouOwn | TgtPrompt$ Choose up to one target permanent card | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 1
+Oracle:{T}: Add one mana of any color.\nWhenever you expend 8, return up to one target permanent card from your graveyard to your hand. (You expend 8 as you spend your eighth total mana to cast spells during a turn.)
diff --git a/forge-gui/res/cardsfolder/upcoming/tranquilize.txt b/forge-gui/res/cardsfolder/upcoming/tranquilize.txt
index bf4001dcd90..860a356cdc6 100644
--- a/forge-gui/res/cardsfolder/upcoming/tranquilize.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tranquilize.txt
@@ -1,7 +1,7 @@
-Name:Tranquilize
-ManaCost:1 U
-Types:Sorcery
-A:SP$ Tap | ValidTgts$ Creature.OppCtrl | SubAbility$ DBCounter | TgtPrompt$ Select target creature an opponent controls. | SpellDescription$ Tap target creature an opponent controls and put three stun counters on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
-SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 3
-DeckHas:Ability$Counters
-Oracle:Tap target creature an opponent controls and put three stun counters on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
\ No newline at end of file
+Name:Tranquilize
+ManaCost:1 U
+Types:Sorcery
+A:SP$ Tap | ValidTgts$ Creature.OppCtrl | SubAbility$ DBCounter | TgtPrompt$ Select target creature an opponent controls. | SpellDescription$ Tap target creature an opponent controls and put three stun counters on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 3
+DeckHas:Ability$Counters
+Oracle:Tap target creature an opponent controls and put three stun counters 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/treeguard_duo.txt b/forge-gui/res/cardsfolder/upcoming/treeguard_duo.txt
index af3b9915469..0ba8e532f77 100644
--- a/forge-gui/res/cardsfolder/upcoming/treeguard_duo.txt
+++ b/forge-gui/res/cardsfolder/upcoming/treeguard_duo.txt
@@ -1,9 +1,9 @@
-Name:Treeguard Duo
-ManaCost:3 G
-Types:Creature Frog Rabbit
-PT:3/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, until end of turn, target creature you control gains vigilance and gets +X/+X, where X is the number of creatures you control.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | NumDef$ X | KW$ Vigilance
-SVar:X:Count$TypeYouCtrl.Creature
-SVar:PlayMain1:TRUE
-Oracle:When Treeguard Duo enters, until end of turn, target creature you control gains vigilance and gets +X/+X, where X is the number of creatures you control.
+Name:Treeguard Duo
+ManaCost:3 G
+Types:Creature Frog Rabbit
+PT:3/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, until end of turn, target creature you control gains vigilance and gets +X/+X, where X is the number of creatures you control.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | NumDef$ X | KW$ Vigilance
+SVar:X:Count$TypeYouCtrl.Creature
+SVar:PlayMain1:TRUE
+Oracle:When Treeguard Duo enters, until end of turn, target creature you control gains vigilance and gets +X/+X, where X is the number of creatures you control.