diff --git a/forge-gui/res/cardsfolder/upcoming/house_cartographer.txt b/forge-gui/res/cardsfolder/upcoming/house_cartographer.txt
index 3e4067fba61..5abe82dc26d 100644
--- a/forge-gui/res/cardsfolder/upcoming/house_cartographer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/house_cartographer.txt
@@ -1,7 +1,7 @@
-Name:House Cartographer
-Types:Creature Human Scout Survivor
-ManaCost:1 G
-PT:2/2
-T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigDigUntil | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, reveal cards from the top of your library until you reveal a land card. Put that card into your hand and the rest on the bottom of your library in a random order.
-SVar:TrigDigUntil:DB$ DigUntil | Valid$ Card.Land | ValidDescription$ land | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True | FoundDestination$ Hand
-Oracle:Survival — At the beginning of your second main phase, if House Cartographer is tapped, reveal cards from the top of your library until you reveal a land card. Put that card into your hand and the rest on the bottom of your library in a random order.
+Name:House Cartographer
+Types:Creature Human Scout Survivor
+ManaCost:1 G
+PT:2/2
+T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigDigUntil | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, reveal cards from the top of your library until you reveal a land card. Put that card into your hand and the rest on the bottom of your library in a random order.
+SVar:TrigDigUntil:DB$ DigUntil | Valid$ Card.Land | ValidDescription$ land | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True | FoundDestination$ Hand
+Oracle:Survival — At the beginning of your second main phase, if House Cartographer is tapped, reveal cards from the top of your library until you reveal a land card. Put that card into your hand and the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/upcoming/hushwood_verge.txt b/forge-gui/res/cardsfolder/upcoming/hushwood_verge.txt
index 7a52d0726ce..5ba190ef724 100644
--- a/forge-gui/res/cardsfolder/upcoming/hushwood_verge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hushwood_verge.txt
@@ -1,6 +1,6 @@
-Name:Hushwood Verge
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
-A:AB$ Mana | Cost$ T | Produced$ W | IsPresent$ Forest.YouCtrl,Plains.YouCtrl | SpellDescription$ Add {W}. Activate only if you control a Forest or a Plains.
-Oracle:{T}: Add {G}.\n{T}: Add {W}. Activate only if you control a Forest or a Plains.
\ No newline at end of file
+Name:Hushwood Verge
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | IsPresent$ Forest.YouCtrl,Plains.YouCtrl | SpellDescription$ Add {W}. Activate only if you control a Forest or a Plains.
+Oracle:{T}: Add {G}.\n{T}: Add {W}. Activate only if you control a Forest or a Plains.
diff --git a/forge-gui/res/cardsfolder/upcoming/i_am_duskmourn.txt b/forge-gui/res/cardsfolder/upcoming/i_am_duskmourn.txt
index 03928be8e48..0653d2aa201 100644
--- a/forge-gui/res/cardsfolder/upcoming/i_am_duskmourn.txt
+++ b/forge-gui/res/cardsfolder/upcoming/i_am_duskmourn.txt
@@ -1,8 +1,8 @@
-Name:I Am Duskmourn
-ManaCost:no cost
-Types:Ongoing Scheme
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPlay | TriggerDescription$ At the beginning of your end step, you may cast a spell from your hand without paying its mana cost. If you do, abandon this scheme.
-SVar:TrigPlay:DB$ Play | Valid$ Card.YouCtrl | ValidSA$ Spell | ValidZone$ Hand | WithoutManaCost$ True | Optional$ True | RememberPlayed$ True
-SVar:Abandon:DB$ Abandon | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:(An ongoing scheme remains face up until it's abandoned.)\nAt the beginning of your end step, you may cast a spell from your hand without paying its mana cost. If you do, abandon this scheme.
\ No newline at end of file
+Name:I Am Duskmourn
+ManaCost:no cost
+Types:Ongoing Scheme
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPlay | TriggerDescription$ At the beginning of your end step, you may cast a spell from your hand without paying its mana cost. If you do, abandon this scheme.
+SVar:TrigPlay:DB$ Play | Valid$ Card.YouCtrl | ValidSA$ Spell | ValidZone$ Hand | WithoutManaCost$ True | Optional$ True | RememberPlayed$ True
+SVar:Abandon:DB$ Abandon | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:(An ongoing scheme remains face up until it's abandoned.)\nAt the beginning of your end step, you may cast a spell from your hand without paying its mana cost. If you do, abandon this scheme.
diff --git a/forge-gui/res/cardsfolder/upcoming/i_am_untouchable.txt b/forge-gui/res/cardsfolder/upcoming/i_am_untouchable.txt
index 6b8943a66e2..bb2f9c148bc 100644
--- a/forge-gui/res/cardsfolder/upcoming/i_am_untouchable.txt
+++ b/forge-gui/res/cardsfolder/upcoming/i_am_untouchable.txt
@@ -1,8 +1,8 @@
-Name:I Am Untouchable
-ManaCost:no cost
-Types:Ongoing Scheme
-S:Mode$ Continuous | EffectZone$ Command | Affected$ You,Permanent.YouCtrl | AddKeyword$ Hexproof | Description$ You and permanents you control have hexproof.
-T:Mode$ DamageDoneOnce | ValidTarget$ You | TriggerZones$ Battlefield | CombatDamage$ True | Execute$ TrigToken | TriggerZones$ Command | TriggerDescription$ When combat damage is dealt to you, create a 4/4 colorless Scarecrow artifact creature token with vigilance, then abandon this scheme.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_4_4_a_scarecrow_vigilance | TokenOwner$ You | SubAbility$ DBAbandon
-SVar:DBAbandon:DB$ Abandon
-Oracle:(An ongoing scheme remains face up until it's abandoned.)\nYou and permanents you control have hexproof.\nWhen combat damage is dealt to you, create a 4/4 colorless Scarecrow artifact creature token with vigilance, then abandon this scheme.
+Name:I Am Untouchable
+ManaCost:no cost
+Types:Ongoing Scheme
+S:Mode$ Continuous | EffectZone$ Command | Affected$ You,Permanent.YouCtrl | AddKeyword$ Hexproof | Description$ You and permanents you control have hexproof.
+T:Mode$ DamageDoneOnce | ValidTarget$ You | TriggerZones$ Battlefield | CombatDamage$ True | Execute$ TrigToken | TriggerZones$ Command | TriggerDescription$ When combat damage is dealt to you, create a 4/4 colorless Scarecrow artifact creature token with vigilance, then abandon this scheme.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_4_4_a_scarecrow_vigilance | TokenOwner$ You | SubAbility$ DBAbandon
+SVar:DBAbandon:DB$ Abandon
+Oracle:(An ongoing scheme remains face up until it's abandoned.)\nYou and permanents you control have hexproof.\nWhen combat damage is dealt to you, create a 4/4 colorless Scarecrow artifact creature token with vigilance, then abandon this scheme.
diff --git a/forge-gui/res/cardsfolder/upcoming/i_call_for_slaughter.txt b/forge-gui/res/cardsfolder/upcoming/i_call_for_slaughter.txt
index 8b091c2d1d3..375cd8a48b4 100644
--- a/forge-gui/res/cardsfolder/upcoming/i_call_for_slaughter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/i_call_for_slaughter.txt
@@ -1,10 +1,10 @@
-Name:I Call for Slaughter
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigToken | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, create three 1/1 red Devil creature tokens with "When this creature dies, it deals 1 damage to any target." They gain haste until end of turn. If a source you control would deal damage this turn, it deals that much damage plus 1 instead.
-SVar:TrigToken:DB$ Token | TokenAmount$ 3 | TokenScript$ r_1_1_devil_burn | PumpKeywords$ Haste | PumpDuration$ EOT | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | ReplacementEffects$ DamageEvent
-SVar:DamageEvent:Event$ DamageDone | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ReplaceWith$ DmgPlusOne | Description$ If a source you control would deal damage this turn, it deals that much damage plus 1 instead.
-SVar:DmgPlusOne:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X
-SVar:X:ReplaceCount$DamageAmount/Plus.1
-Oracle:When you set this scheme in motion, create three 1/1 red Devil creature tokens with "When this creature dies, it deals 1 damage to any target." They gain haste until end of turn. If a source you control would deal damage this turn, it deals that much damage plus 1 instead.
+Name:I Call for Slaughter
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigToken | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, create three 1/1 red Devil creature tokens with "When this creature dies, it deals 1 damage to any target." They gain haste until end of turn. If a source you control would deal damage this turn, it deals that much damage plus 1 instead.
+SVar:TrigToken:DB$ Token | TokenAmount$ 3 | TokenScript$ r_1_1_devil_burn | PumpKeywords$ Haste | PumpDuration$ EOT | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ DamageEvent
+SVar:DamageEvent:Event$ DamageDone | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ReplaceWith$ DmgPlusOne | Description$ If a source you control would deal damage this turn, it deals that much damage plus 1 instead.
+SVar:DmgPlusOne:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X
+SVar:X:ReplaceCount$DamageAmount/Plus.1
+Oracle:When you set this scheme in motion, create three 1/1 red Devil creature tokens with "When this creature dies, it deals 1 damage to any target." They gain haste until end of turn. If a source you control would deal damage this turn, it deals that much damage plus 1 instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/i_will_savor_your_agony.txt b/forge-gui/res/cardsfolder/upcoming/i_will_savor_your_agony.txt
index 8fe04618117..37a3d7717f6 100644
--- a/forge-gui/res/cardsfolder/upcoming/i_will_savor_your_agony.txt
+++ b/forge-gui/res/cardsfolder/upcoming/i_will_savor_your_agony.txt
@@ -1,9 +1,9 @@
-Name:I Will Savor Your Agony
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, ABILITY
-SVar:TrigCharm:DB$ Charm | Choices$ DBDestroy,DBDraw,DBGainLife | CharmNum$ 3 | CanRepeatModes$ True
-SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target Creature. | SpellDescription$ Destroy target creature.
-SVar:DBDraw:DB$ Draw | ValidTgts$ Player | TgtPrompt$ Select target player (to draw a card) | SpellDescription$ Target player draws a card.
-SVar:DBGainLife:DB$ GainLife | ValidTgts$ Player | TgtPrompt$ Select target player (to gain 5 life) | LifeAmount$ 5 | SpellDescription$ Target player gains 5 life.
-Oracle:When you set this scheme in motion, choose three. You may choose the same mode more than once.\n• Destroy target creature.\n• Target player draws a card.\n• Target player gains 5 life.
\ No newline at end of file
+Name:I Will Savor Your Agony
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, ABILITY
+SVar:TrigCharm:DB$ Charm | Choices$ DBDestroy,DBDraw,DBGainLife | CharmNum$ 3 | CanRepeatModes$ True
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target Creature. | SpellDescription$ Destroy target creature.
+SVar:DBDraw:DB$ Draw | ValidTgts$ Player | TgtPrompt$ Select target player (to draw a card) | SpellDescription$ Target player draws a card.
+SVar:DBGainLife:DB$ GainLife | ValidTgts$ Player | TgtPrompt$ Select target player (to gain 5 life) | LifeAmount$ 5 | SpellDescription$ Target player gains 5 life.
+Oracle:When you set this scheme in motion, choose three. You may choose the same mode more than once.\n• Destroy target creature.\n• Target player draws a card.\n• Target player gains 5 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/impossible_inferno.txt b/forge-gui/res/cardsfolder/upcoming/impossible_inferno.txt
index eda80333898..f268021cbdd 100644
--- a/forge-gui/res/cardsfolder/upcoming/impossible_inferno.txt
+++ b/forge-gui/res/cardsfolder/upcoming/impossible_inferno.txt
@@ -1,9 +1,9 @@
-Name:Impossible Inferno
-ManaCost:4 R
-Types:Instant
-A:SP$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 6 | SubAbility$ DBDig | SpellDescription$ CARDNAME deals 6 damage to target creature. Delirium — If there are four or more card types among cards in your graveyard, exile the top card of your library. You may play it until the end of your next turn.
-SVar:DBDig:DB$ Dig | Condition$ Delirium | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ UntilTheEndOfYourNextTurn
-SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play it until the end of your next turn.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Impossible Inferno deals 6 damage to target creature.\nDelirium — If there are four or more card types among cards in your graveyard, exile the top card of your library. You may play it until the end of your next turn.
\ No newline at end of file
+Name:Impossible Inferno
+ManaCost:4 R
+Types:Instant
+A:SP$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 6 | SubAbility$ DBDig | SpellDescription$ CARDNAME deals 6 damage to target creature. Delirium — If there are four or more card types among cards in your graveyard, exile the top card of your library. You may play it until the end of your next turn.
+SVar:DBDig:DB$ Dig | Condition$ Delirium | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ UntilTheEndOfYourNextTurn
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play it until the end of your next turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Impossible Inferno deals 6 damage to target creature.\nDelirium — If there are four or more card types among cards in your graveyard, exile the top card of your library. You may play it until the end of your next turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/infernal_phantom.txt b/forge-gui/res/cardsfolder/upcoming/infernal_phantom.txt
index 5bf2f757441..eb016d0c644 100644
--- a/forge-gui/res/cardsfolder/upcoming/infernal_phantom.txt
+++ b/forge-gui/res/cardsfolder/upcoming/infernal_phantom.txt
@@ -1,12 +1,12 @@
-Name:Infernal Phantom
-ManaCost:3 R
-Types:Creature Spirit
-PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +2/+0 until end of turn.
-T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME dies, it deals damage equal to its power to any target.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ X
-SVar:X:TriggeredCard$CardPower
-DeckNeeds:Type$Enchantment
-Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, Infernal Phantom gets +2/+0 until end of turn.\nWhen Infernal Phantom dies, it deals damage equal to its power to any target.
+Name:Infernal Phantom
+ManaCost:3 R
+Types:Creature Spirit
+PT:2/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +2/+0 until end of turn.
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +2/+0 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME dies, it deals damage equal to its power to any target.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ X
+SVar:X:TriggeredCard$CardPower
+DeckNeeds:Type$Enchantment
+Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, Infernal Phantom gets +2/+0 until end of turn.\nWhen Infernal Phantom dies, it deals damage equal to its power to any target.
diff --git a/forge-gui/res/cardsfolder/upcoming/innocuous_rat.txt b/forge-gui/res/cardsfolder/upcoming/innocuous_rat.txt
index 32c378de3fe..f19af761096 100644
--- a/forge-gui/res/cardsfolder/upcoming/innocuous_rat.txt
+++ b/forge-gui/res/cardsfolder/upcoming/innocuous_rat.txt
@@ -1,7 +1,7 @@
-Name:Innocuous Rat
-ManaCost:1 B
-Types:Creature Rat
-PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME dies, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-SVar:TrigDread:DB$ ManifestDread
-Oracle:When Innocuous Rat dies, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
\ No newline at end of file
+Name:Innocuous Rat
+ManaCost:1 B
+Types:Creature Rat
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME dies, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+SVar:TrigDread:DB$ ManifestDread
+Oracle:When Innocuous Rat dies, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
diff --git a/forge-gui/res/cardsfolder/upcoming/insidious_fungus.txt b/forge-gui/res/cardsfolder/upcoming/insidious_fungus.txt
index 571fabf656f..f0fdc3e5011 100644
--- a/forge-gui/res/cardsfolder/upcoming/insidious_fungus.txt
+++ b/forge-gui/res/cardsfolder/upcoming/insidious_fungus.txt
@@ -1,10 +1,10 @@
-Name:Insidious Fungus
-ManaCost:G
-Types:Creature Fungus
-PT:1/2
-A:AB$ Charm | Cost$ 2 Sac<1/CARDNAME> | Choices$ DBDestroyArtifact,DBDestroyEnchantment,DBDraw
-SVar:DBDestroyArtifact:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact.
-SVar:DBDestroyEnchantment:DB$ Destroy | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SpellDescription$ Destroy target enchantment.
-SVar:DBDraw:DB$ Draw | SubAbility$ DBChangeZone | SpellDescription$ Draw a card. Then you may put a land card from your hand onto the battlefield tapped.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.YouOwn
-Oracle:{2}, Sacrifice Insidious Fungus: Choose one —\n• Destroy target artifact.\n• Destroy target enchantment.\n• Draw a card. Then you may put a land card from your hand onto the battlefield tapped.
+Name:Insidious Fungus
+ManaCost:G
+Types:Creature Fungus
+PT:1/2
+A:AB$ Charm | Cost$ 2 Sac<1/CARDNAME> | Choices$ DBDestroyArtifact,DBDestroyEnchantment,DBDraw
+SVar:DBDestroyArtifact:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact.
+SVar:DBDestroyEnchantment:DB$ Destroy | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SpellDescription$ Destroy target enchantment.
+SVar:DBDraw:DB$ Draw | SubAbility$ DBChangeZone | SpellDescription$ Draw a card. Then you may put a land card from your hand onto the battlefield tapped.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.YouOwn
+Oracle:{2}, Sacrifice Insidious Fungus: Choose one —\n• Destroy target artifact.\n• Destroy target enchantment.\n• Draw a card. Then you may put a land card from your hand onto the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/into_the_pit.txt b/forge-gui/res/cardsfolder/upcoming/into_the_pit.txt
index 51eededc041..7c3a61128e1 100644
--- a/forge-gui/res/cardsfolder/upcoming/into_the_pit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/into_the_pit.txt
@@ -1,7 +1,7 @@
-Name:Into the Pit
-ManaCost:2 B
-Types:Enchantment
-S:Mode$ Continuous | Affected$ Card.TopLibrary+YouOwn | AffectedZone$ Library | MayLookAt$ You | Description$ You may look at the top card of your library any time.
-S:Mode$ Continuous | Affected$ Card.TopLibrary+YouOwn+nonLand | AffectedZone$ Library | MayPlay$ True | RaiseCost$ Sac<1/Permanent.nonLand/nonland permanent> | Description$ You may cast spells from the top of your library by sacrificing a nonland permanent in addition to paying their other costs.
-SVar:NonStackingEffect:True
-Oracle:You may look at the top card of your library any time.\nYou may cast spells from the top of your library by sacrificing a nonland permanent in addition to paying their other costs.
\ No newline at end of file
+Name:Into the Pit
+ManaCost:2 B
+Types:Enchantment
+S:Mode$ Continuous | Affected$ Card.TopLibrary+YouOwn | AffectedZone$ Library | MayLookAt$ You | Description$ You may look at the top card of your library any time.
+S:Mode$ Continuous | Affected$ Card.TopLibrary+YouOwn+nonLand | AffectedZone$ Library | MayPlay$ True | RaiseCost$ Sac<1/Permanent.nonLand/nonland permanent> | Description$ You may cast spells from the top of your library by sacrificing a nonland permanent in addition to paying their other costs.
+SVar:NonStackingEffect:True
+Oracle:You may look at the top card of your library any time.\nYou may cast spells from the top of your library by sacrificing a nonland permanent in addition to paying their other costs.
diff --git a/forge-gui/res/cardsfolder/upcoming/irreverent_gremlin.txt b/forge-gui/res/cardsfolder/upcoming/irreverent_gremlin.txt
index cda428d726e..c604a223e61 100644
--- a/forge-gui/res/cardsfolder/upcoming/irreverent_gremlin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/irreverent_gremlin.txt
@@ -1,8 +1,8 @@
-Name:Irreverent Gremlin
-ManaCost:1 R
-Types:Creature Gremlin
-PT:2/2
-K:Menace
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerLE2+Other+YouCtrl | ResolvedLimit$ 1 | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever another creature you control with power 2 or less enters, you may discard a card. If you do, draw a card. Do this only once each turn.
-SVar:TrigDraw:AB$ Draw | Cost$ Discard<1/Card>
-Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhenever another creature you control with power 2 or less enters, you may discard a card. If you do, draw a card. Do this only once each turn.
+Name:Irreverent Gremlin
+ManaCost:1 R
+Types:Creature Gremlin
+PT:2/2
+K:Menace
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerLE2+Other+YouCtrl | ResolvedLimit$ 1 | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever another creature you control with power 2 or less enters, you may discard a card. If you do, draw a card. Do this only once each turn.
+SVar:TrigDraw:AB$ Draw | Cost$ Discard<1/Card>
+Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhenever another creature you control with power 2 or less enters, you may discard a card. If you do, draw a card. Do this only once each turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/jump_scare.txt b/forge-gui/res/cardsfolder/upcoming/jump_scare.txt
index 2e3b7607ea3..6c31bea42a1 100644
--- a/forge-gui/res/cardsfolder/upcoming/jump_scare.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jump_scare.txt
@@ -1,6 +1,6 @@
-Name:Jump Scare
-ManaCost:W
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | KW$ Flying | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBAnimate | SpellDescription$ Until end of turn, target creature gets +2/+2, gains flying, and becomes a Horror enchantment creature in addition to its other types.
-SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Types$ Enchantment,Creature,Horror
-Oracle:Until end of turn, target creature gets +2/+2, gains flying, and becomes a Horror enchantment creature in addition to its other types.
\ No newline at end of file
+Name:Jump Scare
+ManaCost:W
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | KW$ Flying | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBAnimate | SpellDescription$ Until end of turn, target creature gets +2/+2, gains flying, and becomes a Horror enchantment creature in addition to its other types.
+SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Types$ Enchantment,Creature,Horror
+Oracle:Until end of turn, target creature gets +2/+2, gains flying, and becomes a Horror enchantment creature in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/upcoming/kaito_bane_of_nightmares.txt b/forge-gui/res/cardsfolder/upcoming/kaito_bane_of_nightmares.txt
index fda8cc7c780..ffa67267488 100644
--- a/forge-gui/res/cardsfolder/upcoming/kaito_bane_of_nightmares.txt
+++ b/forge-gui/res/cardsfolder/upcoming/kaito_bane_of_nightmares.txt
@@ -1,13 +1,13 @@
-Name:Kaito, Bane of Nightmares
-ManaCost:2 U B
-Types:Legendary Planeswalker Kaito
-Loyalty:4
-K:Ninjutsu:1 U B
-S:Mode$ Continuous | Affected$ Permanent.Self+counters_GE1_LOYALTY | Condition$ PlayerTurn | AddType$ Creature & Ninja | RemoveCardTypes$ True | SetPower$ 3 | SetToughness$ 4 | AddKeyword$ Hexproof | Description$ During your turn, as long as NICKNAME has one or more loyalty counters on him, he's a 3/4 Ninja creature and has hexproof.
-A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Name$ Emblem — Kaito, Bane of Nightmares | Image$ emblem_kaito_bane_of_nightmares | StaticAbilities$ STNinjaBoost | Planeswalker$ True | Duration$ Permanent | SpellDescription$ You get an emblem with "Ninjas you control get +1/+1."
-SVar:STNinjaBoost:Mode$ Continuous | EffectZone$ Command | Affected$ Ninja.YouCtrl | AffectedZone$ Battlefield | AddPower$ 1 | AddToughness$ 1 | Description$ Ninjas you control get +1/+1.
-A:AB$ Surveil | Cost$ AddCounter<0/LOYALTY> | Amount$ 2 | Planeswalker$ True | SubAbility$ DBDraw | SpellDescription$ Surveil 2. Then draw a card for each opponent who lost life this turn.
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ PlayerCountRegisteredOpponents$HasPropertyLostLifeThisTurn
-A:AB$ Tap | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Choose target creature to tap. | Planeswalker$ True | SubAbility$ DBPutCounter | SpellDescription$ Tap target creature. Put two stun counters on it.
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 2
-Oracle:Ninjutsu {1}{U}{B} ({1}{U}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)\nDuring your turn, as long as Kaito has one or more loyalty counters on him, he's a 3/4 Ninja creature and has hexproof.\n[+1]: You get an emblem with "Ninjas you control get +1/+1."\n[0]: Surveil 2. Then draw a card for each opponent who lost life this turn.\n[−2]: Tap target creature. Put two stun counters on it.
+Name:Kaito, Bane of Nightmares
+ManaCost:2 U B
+Types:Legendary Planeswalker Kaito
+Loyalty:4
+K:Ninjutsu:1 U B
+S:Mode$ Continuous | Affected$ Permanent.Self+counters_GE1_LOYALTY | Condition$ PlayerTurn | AddType$ Creature & Ninja | RemoveCardTypes$ True | SetPower$ 3 | SetToughness$ 4 | AddKeyword$ Hexproof | Description$ During your turn, as long as NICKNAME has one or more loyalty counters on him, he's a 3/4 Ninja creature and has hexproof.
+A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Name$ Emblem — Kaito, Bane of Nightmares | Image$ emblem_kaito_bane_of_nightmares | StaticAbilities$ STNinjaBoost | Planeswalker$ True | Duration$ Permanent | SpellDescription$ You get an emblem with "Ninjas you control get +1/+1."
+SVar:STNinjaBoost:Mode$ Continuous | EffectZone$ Command | Affected$ Ninja.YouCtrl | AffectedZone$ Battlefield | AddPower$ 1 | AddToughness$ 1 | Description$ Ninjas you control get +1/+1.
+A:AB$ Surveil | Cost$ AddCounter<0/LOYALTY> | Amount$ 2 | Planeswalker$ True | SubAbility$ DBDraw | SpellDescription$ Surveil 2. Then draw a card for each opponent who lost life this turn.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ PlayerCountRegisteredOpponents$HasPropertyLostLifeThisTurn
+A:AB$ Tap | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Choose target creature to tap. | Planeswalker$ True | SubAbility$ DBPutCounter | SpellDescription$ Tap target creature. Put two stun counters on it.
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 2
+Oracle:Ninjutsu {1}{U}{B} ({1}{U}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)\nDuring your turn, as long as Kaito has one or more loyalty counters on him, he's a 3/4 Ninja creature and has hexproof.\n[+1]: You get an emblem with "Ninjas you control get +1/+1."\n[0]: Surveil 2. Then draw a card for each opponent who lost life this turn.\n[-2]: Tap target creature. Put two stun counters on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/kianne_corrupted_memory.txt b/forge-gui/res/cardsfolder/upcoming/kianne_corrupted_memory.txt
index 3c18c3a157e..466c8869974 100644
--- a/forge-gui/res/cardsfolder/upcoming/kianne_corrupted_memory.txt
+++ b/forge-gui/res/cardsfolder/upcoming/kianne_corrupted_memory.txt
@@ -1,9 +1,9 @@
-Name:Kianne, Corrupted Memory
-ManaCost:2 G U
-Types:Legendary Creature Illusion
-PT:2/2
-S:Mode$ CastWithFlash | ValidCard$ Card.nonCreature | ValidSA$ Spell | Caster$ You | IsPresent$ Card.Self+powerEven | Description$ As long as NICKNAME's power is even, you may cast noncreature spells as though they had flash.
-S:Mode$ CastWithFlash | ValidCard$ Creature | ValidSA$ Spell | Caster$ You | IsPresent$ Card.Self+powerOdd | Description$ As long as NICKNAME's power is odd, you may cast creature spells as though they had flash.
-T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you draw a card, put a +1/+1 counter on NICKNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-Oracle:As long as Kianne's power is even, you may cast noncreature spells as though they had flash.\nAs long as Kianne's power is odd, you may cast creature spells as though they had flash.\nWhenever you draw a card, put a +1/+1 counter on Kianne.
+Name:Kianne, Corrupted Memory
+ManaCost:2 G U
+Types:Legendary Creature Illusion
+PT:2/2
+S:Mode$ CastWithFlash | ValidCard$ Card.nonCreature | ValidSA$ Spell | Caster$ You | IsPresent$ Card.Self+powerEven | Description$ As long as NICKNAME's power is even, you may cast noncreature spells as though they had flash.
+S:Mode$ CastWithFlash | ValidCard$ Creature | ValidSA$ Spell | Caster$ You | IsPresent$ Card.Self+powerOdd | Description$ As long as NICKNAME's power is odd, you may cast creature spells as though they had flash.
+T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you draw a card, put a +1/+1 counter on NICKNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+Oracle:As long as Kianne's power is even, you may cast noncreature spells as though they had flash.\nAs long as Kianne's power is odd, you may cast creature spells as though they had flash.\nWhenever you draw a card, put a +1/+1 counter on Kianne.
diff --git a/forge-gui/res/cardsfolder/upcoming/killers_mask.txt b/forge-gui/res/cardsfolder/upcoming/killers_mask.txt
index 29af1ed44cb..02419823f36 100644
--- a/forge-gui/res/cardsfolder/upcoming/killers_mask.txt
+++ b/forge-gui/res/cardsfolder/upcoming/killers_mask.txt
@@ -1,10 +1,10 @@
-Name:Killer's Mask
-ManaCost:2 B
-Types:Artifact Equipment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, manifest dread, then attach CARDNAME to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-SVar:TrigDread:DB$ ManifestDread | RememberManifested$ True | SubAbility$ DBAttach
-SVar:DBAttach:DB$ Attach | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Menace | Description$ Equipped creature has menace.
-K:Equip:2
-Oracle:When Killer's Mask enters, manifest dread, then attach Killer's Mask to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)\nEquipped creature has menace.\nEquip {2}
\ No newline at end of file
+Name:Killer's Mask
+ManaCost:2 B
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, manifest dread, then attach CARDNAME to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+SVar:TrigDread:DB$ ManifestDread | RememberManifested$ True | SubAbility$ DBAttach
+SVar:DBAttach:DB$ Attach | Defined$ Remembered | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Menace | Description$ Equipped creature has menace.
+K:Equip:2
+Oracle:When Killer's Mask enters, manifest dread, then attach Killer's Mask to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)\nEquipped creature has menace.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/upcoming/kneel_before_my_legions.txt b/forge-gui/res/cardsfolder/upcoming/kneel_before_my_legions.txt
index dd38c63cc39..81b9869a352 100644
--- a/forge-gui/res/cardsfolder/upcoming/kneel_before_my_legions.txt
+++ b/forge-gui/res/cardsfolder/upcoming/kneel_before_my_legions.txt
@@ -1,8 +1,8 @@
-Name:Kneel Before My Legions
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, ABILITY
-SVar:TrigCharm:DB$ Charm | Choices$ DBToken,DBPumpAll | CharmNum$ 1
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_4_4_a_scarecrow_vigilance | TokenOwner$ You | SpellDescription$ Create a 4/4 colorless Scarecrow artifact creature token with vigilance.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +3 | NumDef$ +3 | KW$ Vigilance & Trample | SpellDescription$ Creatures you control get +3/+3 and gain vigilance and trample until end of turn.
-Oracle:When you set this scheme in motion, choose one —\n• Create a 4/4 colorless Scarecrow artifact creature token with vigilance.\n• Creatures you control get +3/+3 and gain vigilance and trample until end of turn.
+Name:Kneel Before My Legions
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, ABILITY
+SVar:TrigCharm:DB$ Charm | Choices$ DBToken,DBPumpAll | CharmNum$ 1
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_4_4_a_scarecrow_vigilance | TokenOwner$ You | SpellDescription$ Create a 4/4 colorless Scarecrow artifact creature token with vigilance.
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +3 | NumDef$ +3 | KW$ Vigilance & Trample | SpellDescription$ Creatures you control get +3/+3 and gain vigilance and trample until end of turn.
+Oracle:When you set this scheme in motion, choose one —\n• Create a 4/4 colorless Scarecrow artifact creature token with vigilance.\n• Creatures you control get +3/+3 and gain vigilance and trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/kona_rescue_beastie.txt b/forge-gui/res/cardsfolder/upcoming/kona_rescue_beastie.txt
index e0abae0c9f7..7ad75680796 100644
--- a/forge-gui/res/cardsfolder/upcoming/kona_rescue_beastie.txt
+++ b/forge-gui/res/cardsfolder/upcoming/kona_rescue_beastie.txt
@@ -1,7 +1,7 @@
-Name:Kona, Rescue Beastie
-Types:Legendary Creature Beast Survivor
-ManaCost:3 G
-PT:4/3
-T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, you may put a permanent card from your hand onto the battlefield.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Permanent.YouOwn
-Oracle:Survival — At the beginning of your second main phase, if Kona, Rescue Beastie is tapped, you may put a permanent card from your hand onto the battlefield.
\ No newline at end of file
+Name:Kona, Rescue Beastie
+Types:Legendary Creature Beast Survivor
+ManaCost:3 G
+PT:4/3
+T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, you may put a permanent card from your hand onto the battlefield.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Permanent.YouOwn
+Oracle:Survival — At the beginning of your second main phase, if Kona, Rescue Beastie is tapped, you may put a permanent card from your hand onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/lakeside_shack.txt b/forge-gui/res/cardsfolder/upcoming/lakeside_shack.txt
index 42b9d3746af..33cba88a377 100644
--- a/forge-gui/res/cardsfolder/upcoming/lakeside_shack.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lakeside_shack.txt
@@ -1,8 +1,8 @@
-Name:Lakeside Shack
-ManaCost:no cost
-Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
-SVar:X:PlayerCountPlayers$LowestLifeTotal
-A:AB$ Mana | Cost$ T | Produced$ Combo G U | SpellDescription$ Add {G} or {U}.
-Oracle:Lakeside Shack enters tapped unless a player has 13 or less life.\n{T}: Add {G} or {U}.
+Name:Lakeside Shack
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
+SVar:X:PlayerCountPlayers$LowestLifeTotal
+A:AB$ Mana | Cost$ T | Produced$ Combo G U | SpellDescription$ Add {G} or {U}.
+Oracle:Lakeside Shack enters tapped unless a player has 13 or less life.\n{T}: Add {G} or {U}.
diff --git a/forge-gui/res/cardsfolder/upcoming/lets_play_a_game.txt b/forge-gui/res/cardsfolder/upcoming/lets_play_a_game.txt
index 8bf86d4d34d..dacd54de079 100644
--- a/forge-gui/res/cardsfolder/upcoming/lets_play_a_game.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lets_play_a_game.txt
@@ -1,11 +1,11 @@
-Name:Let's Play a Game
-ManaCost:3 B
-Types:Sorcery
-A:SP$ Charm | PrecostDesc$ Delirium — | MinCharmNum$ 1 | CharmNum$ Count$Delirium.3.1 | Choices$ DBPumpAll,DBDiscard,DBLoseLife | AdditionalDescription$ . If there are four or more card types among cards in your graveyard, choose one or more instead.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.OppCtrl | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Creatures your opponents control get -1/-1 until end of turn.
-SVar:DBDiscard:DB$ Discard | Defined$ Opponent | Mode$ TgtChoose | NumCards$ 2 | SpellDescription$ Each opponent discards two cards.
-SVar:DBLoseLife:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 3 | SubAbility$ DBGainLife | SpellDescription$ Each opponent loses 3 life and you gain 3 life.
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:Delirium — Choose one. If there are four or more card types among cards in your graveyard, choose one or more instead.\n• Creatures your opponents control get -1/-1 until end of turn.\n• Each opponent discards two cards.\n• Each opponent loses 3 life and you gain 3 life.
\ No newline at end of file
+Name:Let's Play a Game
+ManaCost:3 B
+Types:Sorcery
+A:SP$ Charm | PrecostDesc$ Delirium — | MinCharmNum$ 1 | CharmNum$ Count$Delirium.3.1 | Choices$ DBPumpAll,DBDiscard,DBLoseLife | AdditionalDescription$ . If there are four or more card types among cards in your graveyard, choose one or more instead.
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.OppCtrl | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Creatures your opponents control get -1/-1 until end of turn.
+SVar:DBDiscard:DB$ Discard | Defined$ Opponent | Mode$ TgtChoose | NumCards$ 2 | SpellDescription$ Each opponent discards two cards.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 3 | SubAbility$ DBGainLife | SpellDescription$ Each opponent loses 3 life and you gain 3 life.
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:Delirium — Choose one. If there are four or more card types among cards in your graveyard, choose one or more instead.\n• Creatures your opponents control get -1/-1 until end of turn.\n• Each opponent discards two cards.\n• Each opponent loses 3 life and you gain 3 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/leyline_of_mutation.txt b/forge-gui/res/cardsfolder/upcoming/leyline_of_mutation.txt
index b72b1b48c46..d7651719c11 100644
--- a/forge-gui/res/cardsfolder/upcoming/leyline_of_mutation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/leyline_of_mutation.txt
@@ -1,8 +1,8 @@
-Name:Leyline of Mutation
-ManaCost:2 G G
-Types:Enchantment
-K:MayEffectFromOpeningHand:FromHand
-SVar:FromHand:DB$ ChangeZone | Defined$ Self | Origin$ Hand | Destination$ Battlefield | SpellDescription$ If CARDNAME is in your opening hand, you may begin the game with it on the battlefield.
-S:Mode$ AlternativeCost | ValidSA$ Spell | ValidPlayer$ You | Cost$ W U B R G | Description$ You may pay {W}{U}{B}{R}{G} rather than pay the mana cost for spells that you cast.
-SVar:NonStackingEffect:True
-Oracle:If Leyline of Mutation is in your opening hand, you may begin the game with it on the battlefield.\nYou may pay {W}{U}{B}{R}{G} rather than pay the mana cost for spells that you cast.
\ No newline at end of file
+Name:Leyline of Mutation
+ManaCost:2 G G
+Types:Enchantment
+K:MayEffectFromOpeningHand:FromHand
+SVar:FromHand:DB$ ChangeZone | Defined$ Self | Origin$ Hand | Destination$ Battlefield | SpellDescription$ If CARDNAME is in your opening hand, you may begin the game with it on the battlefield.
+S:Mode$ AlternativeCost | ValidSA$ Spell | ValidPlayer$ You | Cost$ W U B R G | Description$ You may pay {W}{U}{B}{R}{G} rather than pay the mana cost for spells that you cast.
+SVar:NonStackingEffect:True
+Oracle:If Leyline of Mutation is in your opening hand, you may begin the game with it on the battlefield.\nYou may pay {W}{U}{B}{R}{G} rather than pay the mana cost for spells that you cast.
diff --git a/forge-gui/res/cardsfolder/upcoming/leyline_of_resonance.txt b/forge-gui/res/cardsfolder/upcoming/leyline_of_resonance.txt
index a26537fd0a7..91fdfb9d9da 100644
--- a/forge-gui/res/cardsfolder/upcoming/leyline_of_resonance.txt
+++ b/forge-gui/res/cardsfolder/upcoming/leyline_of_resonance.txt
@@ -1,8 +1,8 @@
-Name:Leyline of Resonance
-ManaCost:2 R R
-Types:Enchantment
-K:MayEffectFromOpeningHand:FromHand
-SVar:FromHand:DB$ ChangeZone | Defined$ Self | Origin$ Hand | Destination$ Battlefield | SpellDescription$ If CARDNAME is in your opening hand, you may begin the game with it on the battlefield.
-T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | Execute$ TrigCopy | ValidActivatingPlayer$ You | IsSingleTarget$ True | TriggerZones$ Battlefield | TargetsValid$ Creature.YouCtrl+inZoneBattlefield | TriggerDescription$ Whenever you cast an instant or sorcery spell that targets only a single creature you control, copy that spell. You may choose new targets for the copy.
-SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True | Controller$ You
-Oracle:If Leyline of Resonance is in your opening hand, you may begin the game with it on the battlefield.\nWhenever you cast an instant or sorcery spell that targets only a single creature you control, copy that spell. You may choose new targets for the copy.
\ No newline at end of file
+Name:Leyline of Resonance
+ManaCost:2 R R
+Types:Enchantment
+K:MayEffectFromOpeningHand:FromHand
+SVar:FromHand:DB$ ChangeZone | Defined$ Self | Origin$ Hand | Destination$ Battlefield | SpellDescription$ If CARDNAME is in your opening hand, you may begin the game with it on the battlefield.
+T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | Execute$ TrigCopy | ValidActivatingPlayer$ You | IsSingleTarget$ True | TriggerZones$ Battlefield | TargetsValid$ Creature.YouCtrl+inZoneBattlefield | TriggerDescription$ Whenever you cast an instant or sorcery spell that targets only a single creature you control, copy that spell. You may choose new targets for the copy.
+SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True | Controller$ You
+Oracle:If Leyline of Resonance is in your opening hand, you may begin the game with it on the battlefield.\nWhenever you cast an instant or sorcery spell that targets only a single creature you control, copy that spell. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/upcoming/leyline_of_transformation.txt b/forge-gui/res/cardsfolder/upcoming/leyline_of_transformation.txt
index ada0790c4e8..8ba7fe4f10f 100644
--- a/forge-gui/res/cardsfolder/upcoming/leyline_of_transformation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/leyline_of_transformation.txt
@@ -1,9 +1,9 @@
-Name:Leyline of Transformation
-ManaCost:2 U U
-Types:Enchantment
-K:MayEffectFromOpeningHand:FromHand
-SVar:FromHand:DB$ ChangeZone | Defined$ Self | Origin$ Hand | Destination$ Battlefield | SpellDescription$ If CARDNAME is in your opening hand, you may begin the game with it on the battlefield.
-K:ETBReplacement:Other:DBChooseCreatureType
-SVar:DBChooseCreatureType:DB$ ChooseType | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters, choose a creature type.
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command,Ante | AddType$ ChosenType | Description$ Creatures you control are the chosen type 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.
-Oracle:If Leyline of Transformation is in your opening hand, you may begin the game with it on the battlefield.\nAs Leyline of Transformation enters, choose a creature type.\nCreatures you control are the chosen type 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.
\ No newline at end of file
+Name:Leyline of Transformation
+ManaCost:2 U U
+Types:Enchantment
+K:MayEffectFromOpeningHand:FromHand
+SVar:FromHand:DB$ ChangeZone | Defined$ Self | Origin$ Hand | Destination$ Battlefield | SpellDescription$ If CARDNAME is in your opening hand, you may begin the game with it on the battlefield.
+K:ETBReplacement:Other:DBChooseCreatureType
+SVar:DBChooseCreatureType:DB$ ChooseType | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters, choose a creature type.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command,Ante | AddType$ ChosenType | Description$ Creatures you control are the chosen type 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.
+Oracle:If Leyline of Transformation is in your opening hand, you may begin the game with it on the battlefield.\nAs Leyline of Transformation enters, choose a creature type.\nCreatures you control are the chosen type 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.
diff --git a/forge-gui/res/cardsfolder/upcoming/lionheart_glimmer.txt b/forge-gui/res/cardsfolder/upcoming/lionheart_glimmer.txt
index f663bd82215..3fbeb4fa4d7 100644
--- a/forge-gui/res/cardsfolder/upcoming/lionheart_glimmer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lionheart_glimmer.txt
@@ -1,8 +1,8 @@
-Name:Lionheart Glimmer
-ManaCost:3 W W
-Types:Enchantment Creature Cat Glimmer
-PT:2/5
-K:Ward:2
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPumpAll | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, creatures you control get +1/+1 until end of turn.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1
-Oracle:Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nWhenever you attack, creatures you control get +1/+1 until end of turn.
\ No newline at end of file
+Name:Lionheart Glimmer
+ManaCost:3 W W
+Types:Enchantment Creature Cat Glimmer
+PT:2/5
+K:Ward:2
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPumpAll | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, creatures you control get +1/+1 until end of turn.
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1
+Oracle:Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nWhenever you attack, creatures you control get +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/live_or_die.txt b/forge-gui/res/cardsfolder/upcoming/live_or_die.txt
index 777bcf850b9..06fa2d890a6 100644
--- a/forge-gui/res/cardsfolder/upcoming/live_or_die.txt
+++ b/forge-gui/res/cardsfolder/upcoming/live_or_die.txt
@@ -1,7 +1,7 @@
-Name:Live or Die
-ManaCost:3 B B
-Types:Instant
-A:SP$ Charm | Choices$ DBChange,DBDestroy | CharmNum$ 1
-SVar:DBChange:DB$ 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.
-SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Destroy target creature.
-Oracle:Choose one —\n• Return target creature card from your graveyard to the battlefield.\n• Destroy target creature.
\ No newline at end of file
+Name:Live or Die
+ManaCost:3 B B
+Types:Instant
+A:SP$ Charm | Choices$ DBChange,DBDestroy | CharmNum$ 1
+SVar:DBChange:DB$ 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.
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Destroy target creature.
+Oracle:Choose one —\n• Return target creature card from your graveyard to the battlefield.\n• Destroy target creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/malevolent_chandelier.txt b/forge-gui/res/cardsfolder/upcoming/malevolent_chandelier.txt
index 3c6d3e4ecb2..9e0d457ef7c 100644
--- a/forge-gui/res/cardsfolder/upcoming/malevolent_chandelier.txt
+++ b/forge-gui/res/cardsfolder/upcoming/malevolent_chandelier.txt
@@ -1,7 +1,7 @@
-Name:Malevolent Chandelier
-ManaCost:6
-Types:Artifact Creature Construct
-PT:4/4
-K:Flying
-A:AB$ ChangeZone | Cost$ 2 | ValidTgts$ Card | TgtPrompt$ Select target card | Origin$ Graveyard | Destination$ Library | LibraryPosition$ -1 | SorcerySpeed$ True | SpellDescription$ Put target card from a graveyard on the bottom of its owner's library. Activate only as a sorcery.
-Oracle:Flying\n{2}: Put target card from a graveyard on the bottom of its owner's library. Activate only as a sorcery.
\ No newline at end of file
+Name:Malevolent Chandelier
+ManaCost:6
+Types:Artifact Creature Construct
+PT:4/4
+K:Flying
+A:AB$ ChangeZone | Cost$ 2 | ValidTgts$ Card | TgtPrompt$ Select target card | Origin$ Graveyard | Destination$ Library | LibraryPosition$ -1 | SorcerySpeed$ True | SpellDescription$ Put target card from a graveyard on the bottom of its owner's library. Activate only as a sorcery.
+Oracle:Flying\n{2}: Put target card from a graveyard on the bottom of its owner's library. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/manifest_dread.txt b/forge-gui/res/cardsfolder/upcoming/manifest_dread.txt
index a5f638f5e94..7a0446d75f0 100644
--- a/forge-gui/res/cardsfolder/upcoming/manifest_dread.txt
+++ b/forge-gui/res/cardsfolder/upcoming/manifest_dread.txt
@@ -1,5 +1,5 @@
-Name:Manifest Dread
-ManaCost:1 G
-Types:Sorcery
-A:SP$ ManifestDread | SpellDescription$ Manifest dread. (Look at the top two cards of your library, then put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-Oracle:Manifest dread. (Look at the top two cards of your library, then put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+Name:Manifest Dread
+ManaCost:1 G
+Types:Sorcery
+A:SP$ ManifestDread | SpellDescription$ Manifest dread. (Look at the top two cards of your library, then put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+Oracle:Manifest dread. (Look at the top two cards of your library, then put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
diff --git a/forge-gui/res/cardsfolder/upcoming/marina_vendrells_grimoire.txt b/forge-gui/res/cardsfolder/upcoming/marina_vendrells_grimoire.txt
index 3fa50f07df2..0bf87fbaea6 100644
--- a/forge-gui/res/cardsfolder/upcoming/marina_vendrells_grimoire.txt
+++ b/forge-gui/res/cardsfolder/upcoming/marina_vendrells_grimoire.txt
@@ -1,15 +1,15 @@
-Name:Marina Vendrell's Grimoire
-ManaCost:5 U
-Types:Legendary Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+wasCastByYou | Execute$ TrigDraw1 | TriggerDescription$ When CARDNAME enters, if you cast it, draw five cards.
-SVar:TrigDraw1:DB$ Draw | NumCards$ 5
-S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size and don't lose the game for having 0 or less life.
-R:Event$ GameLoss | ActiveZones$ Battlefield | ValidPlayer$ You | ValidLoseReason$ LifeReachedZero | Layer$ CantHappen | Secondary$ True | Description$ You have no maximum hand size and don't lose the game for having 0 or less life.
-T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw2 | TriggerDescription$ Whenever you gain life, draw that many cards.
-SVar:TrigDraw2:DB$ Draw | Defined$ You | NumCards$ X
-T:Mode$ LifeLost | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Whenever you lose life, discard that many cards. Then if you have no cards in hand, you lose the game.
-SVar:TrigDiscard:DB$ Discard | Defined$ You | NumCards$ X | Mode$ TgtChoose | SubAbility$ DBLosesGame
-SVar:DBLosesGame:DB$ LosesGame | Defined$ You | ConditionCheckSVar$ Y | ConditionSVarCompare$ EQ0
-SVar:X:TriggerCount$LifeAmount
-SVar:Y:Count$InYourHand
-Oracle:When Marine Vendrell's Grimoire enters, if you cast it, draw five cards.\nYou have no maximum hand size and don't lose the game for having 0 or less life.\nWhenever you gain life, draw that many cards.\nWhenever you lose life, discard that many cards. Then if you have no cards in hand, you lose the game.
+Name:Marina Vendrell's Grimoire
+ManaCost:5 U
+Types:Legendary Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+wasCastByYou | Execute$ TrigDraw1 | TriggerDescription$ When CARDNAME enters, if you cast it, draw five cards.
+SVar:TrigDraw1:DB$ Draw | NumCards$ 5
+S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size and don't lose the game for having 0 or less life.
+R:Event$ GameLoss | ActiveZones$ Battlefield | ValidPlayer$ You | ValidLoseReason$ LifeReachedZero | Layer$ CantHappen | Secondary$ True | Description$ You have no maximum hand size and don't lose the game for having 0 or less life.
+T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw2 | TriggerDescription$ Whenever you gain life, draw that many cards.
+SVar:TrigDraw2:DB$ Draw | Defined$ You | NumCards$ X
+T:Mode$ LifeLost | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Whenever you lose life, discard that many cards. Then if you have no cards in hand, you lose the game.
+SVar:TrigDiscard:DB$ Discard | Defined$ You | NumCards$ X | Mode$ TgtChoose | SubAbility$ DBLosesGame
+SVar:DBLosesGame:DB$ LosesGame | Defined$ You | ConditionCheckSVar$ Y | ConditionSVarCompare$ EQ0
+SVar:X:TriggerCount$LifeAmount
+SVar:Y:Count$InYourHand
+Oracle:When Marine Vendrell's Grimoire enters, if you cast it, draw five cards.\nYou have no maximum hand size and don't lose the game for having 0 or less life.\nWhenever you gain life, draw that many cards.\nWhenever you lose life, discard that many cards. Then if you have no cards in hand, you lose the game.
diff --git a/forge-gui/res/cardsfolder/upcoming/marvin_murderous_mimic.txt b/forge-gui/res/cardsfolder/upcoming/marvin_murderous_mimic.txt
index 15a981a828a..4f6c9ee168f 100644
--- a/forge-gui/res/cardsfolder/upcoming/marvin_murderous_mimic.txt
+++ b/forge-gui/res/cardsfolder/upcoming/marvin_murderous_mimic.txt
@@ -1,6 +1,6 @@
-Name:Marvin, Murderous Mimic
-ManaCost:2
-Types:Legendary Artifact Creature Toy
-PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOf$ Creature.YouCtrl+!sharesNameWith Self | Description$ CARDNAME has all activated abilities of creatures you control that don't have the same name as this creature.
-Oracle:Marvin, Murderous Mimic has all activated abilities of creatures you control that don't have the same name as this creature.
+Name:Marvin, Murderous Mimic
+ManaCost:2
+Types:Legendary Artifact Creature Toy
+PT:2/2
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOf$ Creature.YouCtrl+!sharesNameWith Self | Description$ CARDNAME has all activated abilities of creatures you control that don't have the same name as this creature.
+Oracle:Marvin, Murderous Mimic has all activated abilities of creatures you control that don't have the same name as this creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/meathook_massacre_ii.txt b/forge-gui/res/cardsfolder/upcoming/meathook_massacre_ii.txt
index cad539fa8b4..7cd4f19a70e 100644
--- a/forge-gui/res/cardsfolder/upcoming/meathook_massacre_ii.txt
+++ b/forge-gui/res/cardsfolder/upcoming/meathook_massacre_ii.txt
@@ -1,12 +1,12 @@
-Name:Meathook Massacre II
-ManaCost:X X B B B B
-Types:Legendary Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters, each player sacrifices X creatures.
-SVar:TrigSac:DB$ Sacrifice | Defined$ Player | Amount$ X | SacValid$ Creature
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigReturn1 | TriggerDescription$ Whenever a creature you control dies, you may pay 3 life. If you do, return that card under your control with a finality counter on it.
-SVar:TrigReturn1:AB$ ChangeZone | Cost$ PayLife<3> | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredNewCardLKICopy | WithCountersType$ FINALITY
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigReturn2 | TriggerDescription$ Whenever a creature an opponent controls dies, they may pay 3 life. If they don't, return that card under your control with a finality counter on it.
-SVar:TrigReturn2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredNewCardLKICopy | UnlessCost$ PayLife<3> |  UnlessPayer$ TriggeredCardController | WithCountersType$ FINALITY
-SVar:X:Count$xPaid
-DeckHas:Ability$Sacrifice
-Oracle:When Meathook Massacre II enters, each player sacrifices X creatures.\nWhenever a creature you control dies, you may pay 3 life. If you do, return that card under your control with a finality counter on it.\nWhenever a creature an opponent controls dies, they may pay 3 life. If they don't, return that card under your control with a finality counter on it.
+Name:Meathook Massacre II
+ManaCost:X X B B B B
+Types:Legendary Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters, each player sacrifices X creatures.
+SVar:TrigSac:DB$ Sacrifice | Defined$ Player | Amount$ X | SacValid$ Creature
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigReturn1 | TriggerDescription$ Whenever a creature you control dies, you may pay 3 life. If you do, return that card under your control with a finality counter on it.
+SVar:TrigReturn1:AB$ ChangeZone | Cost$ PayLife<3> | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredNewCardLKICopy | WithCountersType$ FINALITY
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigReturn2 | TriggerDescription$ Whenever a creature an opponent controls dies, they may pay 3 life. If they don't, return that card under your control with a finality counter on it.
+SVar:TrigReturn2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredNewCardLKICopy | UnlessCost$ PayLife<3> | UnlessPayer$ TriggeredCardController | WithCountersType$ FINALITY
+SVar:X:Count$xPaid
+DeckHas:Ability$Sacrifice
+Oracle:When Meathook Massacre II enters, each player sacrifices X creatures.\nWhenever a creature you control dies, you may pay 3 life. If you do, return that card under your control with a finality counter on it.\nWhenever a creature an opponent controls dies, they may pay 3 life. If they don't, return that card under your control with a finality counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/metamorphosis_fanatic.txt b/forge-gui/res/cardsfolder/upcoming/metamorphosis_fanatic.txt
index 1285ae333b5..8a4fa699760 100644
--- a/forge-gui/res/cardsfolder/upcoming/metamorphosis_fanatic.txt
+++ b/forge-gui/res/cardsfolder/upcoming/metamorphosis_fanatic.txt
@@ -1,9 +1,9 @@
-Name:Metamorphosis Fanatic
-ManaCost:4 B B
-Types:Creature Human Cleric
-PT:4/4
-K:Lifelink
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, return up to one target creature card from your graveyard to the battlefield with a lifelink counter on it.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Choose up to one target creature card in your graveyard | ValidTgts$ Creature.YouOwn | WithCountersType$ Lifelink
-K:Miracle:1 B
-Oracle:Lifelink\nWhen Metamorphosis Fanatic enters, return up to one target creature card from your graveyard to the battlefield with a lifelink counter on it.\nMiracle {1}{B} (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.)
\ No newline at end of file
+Name:Metamorphosis Fanatic
+ManaCost:4 B B
+Types:Creature Human Cleric
+PT:4/4
+K:Lifelink
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, return up to one target creature card from your graveyard to the battlefield with a lifelink counter on it.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Choose up to one target creature card in your graveyard | ValidTgts$ Creature.YouOwn | WithCountersType$ Lifelink
+K:Miracle:1 B
+Oracle:Lifelink\nWhen Metamorphosis Fanatic enters, return up to one target creature card from your graveyard to the battlefield with a lifelink counter on it.\nMiracle {1}{B} (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.)
diff --git a/forge-gui/res/cardsfolder/upcoming/miasma_demon.txt b/forge-gui/res/cardsfolder/upcoming/miasma_demon.txt
index c53f086274e..4f6d60ffb36 100644
--- a/forge-gui/res/cardsfolder/upcoming/miasma_demon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/miasma_demon.txt
@@ -1,13 +1,13 @@
-Name:Miasma Demon
-ManaCost:4 B B
-Types:Creature Demon
-PT:5/4
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, you may discard any number of cards. When you do, up to that many target creatures each get -2/-2 until end of turn.
-SVar:TrigDiscard:DB$ Discard | DiscardValid$ Card | AnyNumber$ True | Optional$ True | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ TrigImmediateTrig
-SVar:TrigImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | RememberObjects$ Remembered | Execute$ TrigPump | SubAbility$ DBCleanup | TriggerDescription$ When you do, up to that many target creatures each get -2/-2 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select up to that many target creatures | TargetMin$ 0 | TargetMax$ X | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True
-SVar:X:TriggerRemembered$Amount
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Discard|Graveyard
-Oracle:Flying\nWhen Miasma Demon enters, you may discard any number of cards. When you do, up to that many target creatures each get -2/-2 until end of turn.
\ No newline at end of file
+Name:Miasma Demon
+ManaCost:4 B B
+Types:Creature Demon
+PT:5/4
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, you may discard any number of cards. When you do, up to that many target creatures each get -2/-2 until end of turn.
+SVar:TrigDiscard:DB$ Discard | DiscardValid$ Card | AnyNumber$ True | Optional$ True | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ TrigImmediateTrig
+SVar:TrigImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | RememberObjects$ Remembered | Execute$ TrigPump | SubAbility$ DBCleanup | TriggerDescription$ When you do, up to that many target creatures each get -2/-2 until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select up to that many target creatures | TargetMin$ 0 | TargetMax$ X | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True
+SVar:X:TriggerRemembered$Amount
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Discard|Graveyard
+Oracle:Flying\nWhen Miasma Demon enters, you may discard any number of cards. When you do, up to that many target creatures each get -2/-2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/midnight_mayhem.txt b/forge-gui/res/cardsfolder/upcoming/midnight_mayhem.txt
index c38b08cad50..194b08475b3 100644
--- a/forge-gui/res/cardsfolder/upcoming/midnight_mayhem.txt
+++ b/forge-gui/res/cardsfolder/upcoming/midnight_mayhem.txt
@@ -1,7 +1,7 @@
-Name:Midnight Mayhem
-ManaCost:2 R W
-Types:Sorcery
-A:SP$ Token | TokenAmount$ 3 | TokenScript$ r_1_1_gremlin | TokenOwner$ You | SubAbility$ DBPumpAll | SpellDescription$ Create three 1/1 red Gremlin creature tokens. Gremlins you control gain menace, lifelink, and haste until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Gremlin.YouCtrl | KW$ Menace & Lifelink & Haste
-SVar:PlayMain1:TRUE
-Oracle:Create three 1/1 red Gremlin creature tokens. Gremlins you control gain menace, lifelink, and haste until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
\ No newline at end of file
+Name:Midnight Mayhem
+ManaCost:2 R W
+Types:Sorcery
+A:SP$ Token | TokenAmount$ 3 | TokenScript$ r_1_1_gremlin | TokenOwner$ You | SubAbility$ DBPumpAll | SpellDescription$ Create three 1/1 red Gremlin creature tokens. Gremlins you control gain menace, lifelink, and haste until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Gremlin.YouCtrl | KW$ Menace & Lifelink & Haste
+SVar:PlayMain1:TRUE
+Oracle:Create three 1/1 red Gremlin creature tokens. Gremlins you control gain menace, lifelink, and haste until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/upcoming/most_valuable_slayer.txt b/forge-gui/res/cardsfolder/upcoming/most_valuable_slayer.txt
index 0e9ee884151..9860b221a87 100644
--- a/forge-gui/res/cardsfolder/upcoming/most_valuable_slayer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/most_valuable_slayer.txt
@@ -1,7 +1,7 @@
-Name:Most Valuable Slayer
-ManaCost:3 R
-Types:Creature Human Warrior
-PT:2/4
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, target attacking creature gets +1/+0 and gains first strike until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumAtt$ +1 | KW$ First Strike
-Oracle:Whenever you attack, target attacking creature gets +1/+0 and gains first strike until end of turn.
\ No newline at end of file
+Name:Most Valuable Slayer
+ManaCost:3 R
+Types:Creature Human Warrior
+PT:2/4
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, target attacking creature gets +1/+0 and gains first strike until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumAtt$ +1 | KW$ First Strike
+Oracle:Whenever you attack, target attacking creature gets +1/+0 and gains first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/murky_sewer.txt b/forge-gui/res/cardsfolder/upcoming/murky_sewer.txt
index 92e8c7dad69..8958d66b63e 100644
--- a/forge-gui/res/cardsfolder/upcoming/murky_sewer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/murky_sewer.txt
@@ -1,8 +1,8 @@
-Name:Murky Sewer
-ManaCost:no cost
-Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
-SVar:X:PlayerCountPlayers$LowestLifeTotal
-A:AB$ Mana | Cost$ T | Produced$ Combo U B | SpellDescription$ Add {U} or {B}.
-Oracle:Murky Sewer enters tapped unless a player has 13 or less life.\n{T}: Add {U} or {B}.
+Name:Murky Sewer
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
+SVar:X:PlayerCountPlayers$LowestLifeTotal
+A:AB$ Mana | Cost$ T | Produced$ Combo U B | SpellDescription$ Add {U} or {B}.
+Oracle:Murky Sewer enters tapped unless a player has 13 or less life.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/upcoming/my_followers_ascend.txt b/forge-gui/res/cardsfolder/upcoming/my_followers_ascend.txt
index 451ae1e48a4..126196fe963 100644
--- a/forge-gui/res/cardsfolder/upcoming/my_followers_ascend.txt
+++ b/forge-gui/res/cardsfolder/upcoming/my_followers_ascend.txt
@@ -1,11 +1,11 @@
-Name:My Followers Ascend
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigBranch| TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, put five +1/+1 counters on a creature you control and it gains flying and vigilance until end of turn. If you control no creatures, instead create a 4/4 colorless Scarecrow artifact creature token with vigilance.
-SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ EQ0 | TrueSubAbility$ DBToken | FalseSubAbility$ DBPutCounter
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_4_4_a_scarecrow_vigilance | TokenOwner$ You
-SVar:DBPutCounter:DB$ PutCounter | Choices$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 5 | RememberChosen$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Flying & Vigilance | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$Valid Creature.YouCtrl
-Oracle:When you set this scheme in motion, put five +1/+1 counters on a creature you control and it gains flying and vigilance until end of turn. If you control no creatures, instead create a 4/4 colorless Scarecrow artifact creature token with vigilance.
+Name:My Followers Ascend
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigBranch | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, put five +1/+1 counters on a creature you control and it gains flying and vigilance until end of turn. If you control no creatures, instead create a 4/4 colorless Scarecrow artifact creature token with vigilance.
+SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ EQ0 | TrueSubAbility$ DBToken | FalseSubAbility$ DBPutCounter
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_4_4_a_scarecrow_vigilance | TokenOwner$ You
+SVar:DBPutCounter:DB$ PutCounter | Choices$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 5 | RememberChosen$ True | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Flying & Vigilance | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$Valid Creature.YouCtrl
+Oracle:When you set this scheme in motion, put five +1/+1 counters on a creature you control and it gains flying and vigilance until end of turn. If you control no creatures, instead create a 4/4 colorless Scarecrow artifact creature token with vigilance.
diff --git a/forge-gui/res/cardsfolder/upcoming/my_tendrils_run_deep.txt b/forge-gui/res/cardsfolder/upcoming/my_tendrils_run_deep.txt
index 6e08a5067c2..8eb4ac8844f 100644
--- a/forge-gui/res/cardsfolder/upcoming/my_tendrils_run_deep.txt
+++ b/forge-gui/res/cardsfolder/upcoming/my_tendrils_run_deep.txt
@@ -1,9 +1,9 @@
-Name:My Tendrils Run Deep
-ManaCost:no cost
-Types:Ongoing Scheme
-S:Mode$ Continuous | EffectZone$ Command | Affected$ You | AdjustLandPlays$ 1 | Description$ You may play an additional land on each of your turns.
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ TrigDraw | TriggerZones$ Command | IsPresent$ Land.YouCtrl | PresentCompare$ GE6 | TriggerDescription$ At the beginning of your end step, if you control six or more lands, draw two cards, then abandon this scheme.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 2 | SubAbility$ DBAbandon
-SVar:DBAbandon:DB$ Abandon
-SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl
-Oracle:(An ongoing scheme remains face up until it's abandoned.)\nYou may play an additional land on each of your turns.\nAt the beginning of your end step, if you control six or more lands, draw two cards, then abandon this scheme.
\ No newline at end of file
+Name:My Tendrils Run Deep
+ManaCost:no cost
+Types:Ongoing Scheme
+S:Mode$ Continuous | EffectZone$ Command | Affected$ You | AdjustLandPlays$ 1 | Description$ You may play an additional land on each of your turns.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ TrigDraw | TriggerZones$ Command | IsPresent$ Land.YouCtrl | PresentCompare$ GE6 | TriggerDescription$ At the beginning of your end step, if you control six or more lands, draw two cards, then abandon this scheme.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 2 | SubAbility$ DBAbandon
+SVar:DBAbandon:DB$ Abandon
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl
+Oracle:(An ongoing scheme remains face up until it's abandoned.)\nYou may play an additional land on each of your turns.\nAt the beginning of your end step, if you control six or more lands, draw two cards, then abandon this scheme.
diff --git a/forge-gui/res/cardsfolder/upcoming/my_wealth_will_bury_you.txt b/forge-gui/res/cardsfolder/upcoming/my_wealth_will_bury_you.txt
index 8874347d3d5..cfdb6ba4758 100644
--- a/forge-gui/res/cardsfolder/upcoming/my_wealth_will_bury_you.txt
+++ b/forge-gui/res/cardsfolder/upcoming/my_wealth_will_bury_you.txt
@@ -1,8 +1,8 @@
-Name:My Wealth Will Bury You
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigToken | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, create a number of Treasure tokens equal to the number of artifacts and enchantments your opponents control. If they control fewer than four artifacts and enchantments, create four Treasure tokens instead. (Treasure tokens are artifacts with "{T}, Sacrifice this artifact: Add one mana of any color.")
-SVar:TrigToken:DB$ Token | TokenAmount$ Y | TokenScript$ c_a_treasure_sac | TokenOwner$ You
-SVar:X:Count$Valid Artifact.OppCtrl,Enchantment.OppCtrl
-SVar:Y:Count$Compare X GE4.X.4
-Oracle:When you set this scheme in motion, create a number of Treasure tokens equal to the number of artifacts and enchantments your opponents control. If they control fewer than four artifacts and enchantments, create four Treasure tokens instead. (Treasure tokens are artifacts with "{T}, Sacrifice this artifact: Add one mana of any color.")
\ No newline at end of file
+Name:My Wealth Will Bury You
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigToken | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, create a number of Treasure tokens equal to the number of artifacts and enchantments your opponents control. If they control fewer than four artifacts and enchantments, create four Treasure tokens instead. (Treasure tokens are artifacts with "{T}, Sacrifice this artifact: Add one mana of any color.")
+SVar:TrigToken:DB$ Token | TokenAmount$ Y | TokenScript$ c_a_treasure_sac | TokenOwner$ You
+SVar:X:Count$Valid Artifact.OppCtrl,Enchantment.OppCtrl
+SVar:Y:Count$Compare X GE4.X.4
+Oracle:When you set this scheme in motion, create a number of Treasure tokens equal to the number of artifacts and enchantments your opponents control. If they control fewer than four artifacts and enchantments, create four Treasure tokens instead. (Treasure tokens are artifacts with "{T}, Sacrifice this artifact: Add one mana of any color.")
diff --git a/forge-gui/res/cardsfolder/upcoming/my_wings_enfold_all.txt b/forge-gui/res/cardsfolder/upcoming/my_wings_enfold_all.txt
index 74b630ec0d1..2e201a45281 100644
--- a/forge-gui/res/cardsfolder/upcoming/my_wings_enfold_all.txt
+++ b/forge-gui/res/cardsfolder/upcoming/my_wings_enfold_all.txt
@@ -1,10 +1,10 @@
-Name:My Wings Enfold All
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, ABILITY
-SVar:TrigCharm:DB$ Charm | Choices$ DBDraw,DBEffect | CharmNum$ 1
-SVar:DBDraw:DB$ Draw | NumCards$ 2 | SpellDescription$ Draw two cards.
-SVar:DBEffect:DB$ Effect | Triggers$ CastTrig | SpellDescription$ Until end of turn, whenever you cast an instant or sorcery spell, copy it. You may choose new targets for the copy.
-SVar:CastTrig:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | Execute$ TrigCopySpell | TriggerZones$ Command | TriggerDescription$ Whenever you cast an instant or sorcery spell, copy it. You may choose new targets for the copy.
-SVar:TrigCopySpell:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
-Oracle:When you set this scheme in motion, choose one —\n• Draw two cards.\n• Until end of turn, whenever you cast an instant or sorcery spell, copy it. You may choose new targets for the copy.
\ No newline at end of file
+Name:My Wings Enfold All
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, ABILITY
+SVar:TrigCharm:DB$ Charm | Choices$ DBDraw,DBEffect | CharmNum$ 1
+SVar:DBDraw:DB$ Draw | NumCards$ 2 | SpellDescription$ Draw two cards.
+SVar:DBEffect:DB$ Effect | Triggers$ CastTrig | SpellDescription$ Until end of turn, whenever you cast an instant or sorcery spell, copy it. You may choose new targets for the copy.
+SVar:CastTrig:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | Execute$ TrigCopySpell | TriggerZones$ Command | TriggerDescription$ Whenever you cast an instant or sorcery spell, copy it. You may choose new targets for the copy.
+SVar:TrigCopySpell:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
+Oracle:When you set this scheme in motion, choose one —\n• Draw two cards.\n• Until end of turn, whenever you cast an instant or sorcery spell, copy it. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/upcoming/nashi_searcher_in_the_dark.txt b/forge-gui/res/cardsfolder/upcoming/nashi_searcher_in_the_dark.txt
index 3115d5f0ed7..d5638d4ae09 100644
--- a/forge-gui/res/cardsfolder/upcoming/nashi_searcher_in_the_dark.txt
+++ b/forge-gui/res/cardsfolder/upcoming/nashi_searcher_in_the_dark.txt
@@ -1,14 +1,14 @@
-Name:Nashi, Searcher in the Dark
-ManaCost:U B
-Types:Legendary Creature Rat Ninja Wizard
-PT:2/2
-K:Menace
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you mill that many cards. You may put any number of legendary and/or enchantment cards from among them into your hand. If you put no cards into your hand this way, put a +1/+1 counter on NICKNAME.
-SVar:TrigMill:DB$ Mill | NumCards$ X | Defined$ You | RememberMilled$ True | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Hidden$ True | Origin$ Graveyard,Exile | Destination$ Hand | ChangeType$ Card.Legendary+IsRemembered,Enchantment.IsRemembered | ChangeNum$ X | RememberChanged$ True | ForgetOtherRemembered$ True | SelectPrompt$ You may select any number of legendary and/or enchantment cards. | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:TriggerCount$DamageAmount
-DeckHas:Ability$Mill
-DeckHints:Type$Legendary|Enchantment
-Oracle:Menace\nWhenever Nashi, Searcher in the Dark deals combat damage to a player, you mill that many cards. You may put any number of legendary and/or enchantment cards from among them into your hand. If you put no cards into your hand this way, put a +1/+1 counter on Nashi.
+Name:Nashi, Searcher in the Dark
+ManaCost:U B
+Types:Legendary Creature Rat Ninja Wizard
+PT:2/2
+K:Menace
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you mill that many cards. You may put any number of legendary and/or enchantment cards from among them into your hand. If you put no cards into your hand this way, put a +1/+1 counter on NICKNAME.
+SVar:TrigMill:DB$ Mill | NumCards$ X | Defined$ You | RememberMilled$ True | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Hidden$ True | Origin$ Graveyard,Exile | Destination$ Hand | ChangeType$ Card.Legendary+IsRemembered,Enchantment.IsRemembered | ChangeNum$ X | RememberChanged$ True | ForgetOtherRemembered$ True | SelectPrompt$ You may select any number of legendary and/or enchantment cards. | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:TriggerCount$DamageAmount
+DeckHas:Ability$Mill
+DeckHints:Type$Legendary|Enchantment
+Oracle:Menace\nWhenever Nashi, Searcher in the Dark deals combat damage to a player, you mill that many cards. You may put any number of legendary and/or enchantment cards from among them into your hand. If you put no cards into your hand this way, put a +1/+1 counter on Nashi.
diff --git a/forge-gui/res/cardsfolder/upcoming/neglected_manor.txt b/forge-gui/res/cardsfolder/upcoming/neglected_manor.txt
index ff0c70d1892..c6b0947dbbc 100644
--- a/forge-gui/res/cardsfolder/upcoming/neglected_manor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/neglected_manor.txt
@@ -1,8 +1,8 @@
-Name:Neglected Manor
-ManaCost:no cost
-Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
-SVar:X:PlayerCountPlayers$LowestLifeTotal
-A:AB$ Mana | Cost$ T | Produced$ Combo W B | SpellDescription$ Add {W} or {B}.
-Oracle:Neglected Manor enters tapped unless a player has 13 or less life.\n{T}: Add {W} or {B}.
+Name:Neglected Manor
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
+SVar:X:PlayerCountPlayers$LowestLifeTotal
+A:AB$ Mana | Cost$ T | Produced$ Combo W B | SpellDescription$ Add {W} or {B}.
+Oracle:Neglected Manor enters tapped unless a player has 13 or less life.\n{T}: Add {W} or {B}.
diff --git a/forge-gui/res/cardsfolder/upcoming/niko_light_of_hope.txt b/forge-gui/res/cardsfolder/upcoming/niko_light_of_hope.txt
index c4e14ca79a9..64f6644187a 100644
--- a/forge-gui/res/cardsfolder/upcoming/niko_light_of_hope.txt
+++ b/forge-gui/res/cardsfolder/upcoming/niko_light_of_hope.txt
@@ -1,12 +1,12 @@
-Name:Niko, Light of Hope
-ManaCost:2 W U
-Types:Legendary Creature Human Wizard
-PT:3/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create two Shard tokens. (They're enchantments with "2, Sacrifice this enchantment: Scry 1, then draw a card.")
-SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_e_shard_draw | TokenOwner$ You
-A:AB$ ChangeZone | Cost$ 2 T | ValidTgts$ Creature.nonLegendary+YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select nonlegendary creature you control | SubAbility$ DBClone | RememberLKI$ True | Imprint$ True | SpellDescription$ Exile target nonlegendary creature you control. Shards you control become copies of it until the beginning of the next end step. Return it to the battlefield under its owner's control at the beginning of the next end step.
-SVar:DBClone:DB$ Clone | Defined$ RememberedLKI | CloneTarget$ Valid Shard.YouCtrl | Duration$ UntilNextEndStep | SubAbility$ DelTrig
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ ImprintedLKI | TriggerDescription$ Return exiled permanent to the battlefield. | SubAbility$ DBCleanup
-SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRememberedLKI
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
-Oracle:When Niko, Light of Hope enters, create two Shard tokens. (They're enchantments with "2, Sacrifice this enchantment: Scry 1, then draw a card.")\n{2}, {T}: Exile target nonlegendary creature you control. Shards you control become copies of it until the beginning of the next end step. Return it to the battlefield under its owner's control at the beginning of the next end step.
\ No newline at end of file
+Name:Niko, Light of Hope
+ManaCost:2 W U
+Types:Legendary Creature Human Wizard
+PT:3/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create two Shard tokens. (They're enchantments with "2, Sacrifice this enchantment: Scry 1, then draw a card.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_e_shard_draw | TokenOwner$ You
+A:AB$ ChangeZone | Cost$ 2 T | ValidTgts$ Creature.nonLegendary+YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select nonlegendary creature you control | SubAbility$ DBClone | RememberLKI$ True | Imprint$ True | SpellDescription$ Exile target nonlegendary creature you control. Shards you control become copies of it until the beginning of the next end step. Return it to the battlefield under its owner's control at the beginning of the next end step.
+SVar:DBClone:DB$ Clone | Defined$ RememberedLKI | CloneTarget$ Valid Shard.YouCtrl | Duration$ UntilNextEndStep | SubAbility$ DelTrig
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ ImprintedLKI | TriggerDescription$ Return exiled permanent to the battlefield. | SubAbility$ DBCleanup
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRememberedLKI
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
+Oracle:When Niko, Light of Hope enters, create two Shard tokens. (They're enchantments with "2, Sacrifice this enchantment: Scry 1, then draw a card.")\n{2}, {T}: Exile target nonlegendary creature you control. Shards you control become copies of it until the beginning of the next end step. 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/no_secret_is_hidden_from_me.txt b/forge-gui/res/cardsfolder/upcoming/no_secret_is_hidden_from_me.txt
index e6fa1df53e4..ddb30933b66 100644
--- a/forge-gui/res/cardsfolder/upcoming/no_secret_is_hidden_from_me.txt
+++ b/forge-gui/res/cardsfolder/upcoming/no_secret_is_hidden_from_me.txt
@@ -1,12 +1,12 @@
-Name:No Secret Is Hidden From Me
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigDigUntil | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, exile cards from the top of your library until you exile a nonland card. You may cast that card without paying its mana cost. Then if you control six or more lands, repeat this process once.
-SVar:TrigDigUntil:DB$ DigUntil | Valid$ Card.nonLand | FoundDestination$ Exile | RevealedDestination$ Exile | RememberFound$ True | SubAbility$ DBPlay1
-SVar:DBPlay1:DB$ Play | Defined$ Remembered | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | SubAbility$ DBChange | SubAbility$ DBCleanup1
-SVar:DBCleanup1:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBDigUntil
-SVar:DBDigUntil:DB$ DigUntil | Valid$ Card.nonLand | FoundDestination$ Exile | RevealedDestination$ Exile | RememberFound$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE6 | SubAbility$ DBPlay2
-SVar:DBPlay2:DB$ Play | Defined$ Remembered | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | SubAbility$ DBChange | SubAbility$ DBCleanup2
-SVar:DBCleanup2:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$Valid Land.YouCtrl
-Oracle:When you set this scheme in motion, exile cards from the top of your library until you exile a nonland card. You may cast that card without paying its mana cost. Then if you control six or more lands, repeat this process once.
\ No newline at end of file
+Name:No Secret Is Hidden From Me
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigDigUntil | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, exile cards from the top of your library until you exile a nonland card. You may cast that card without paying its mana cost. Then if you control six or more lands, repeat this process once.
+SVar:TrigDigUntil:DB$ DigUntil | Valid$ Card.nonLand | FoundDestination$ Exile | RevealedDestination$ Exile | RememberFound$ True | SubAbility$ DBPlay1
+SVar:DBPlay1:DB$ Play | Defined$ Remembered | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | SubAbility$ DBChange | SubAbility$ DBCleanup1
+SVar:DBCleanup1:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBDigUntil
+SVar:DBDigUntil:DB$ DigUntil | Valid$ Card.nonLand | FoundDestination$ Exile | RevealedDestination$ Exile | RememberFound$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE6 | SubAbility$ DBPlay2
+SVar:DBPlay2:DB$ Play | Defined$ Remembered | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | SubAbility$ DBChange | SubAbility$ DBCleanup2
+SVar:DBCleanup2:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$Valid Land.YouCtrl
+Oracle:When you set this scheme in motion, exile cards from the top of your library until you exile a nonland card. You may cast that card without paying its mana cost. Then if you control six or more lands, repeat this process once.
diff --git a/forge-gui/res/cardsfolder/upcoming/norin_swift_survivalist.txt b/forge-gui/res/cardsfolder/upcoming/norin_swift_survivalist.txt
index 42230eb9239..8343054a224 100644
--- a/forge-gui/res/cardsfolder/upcoming/norin_swift_survivalist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/norin_swift_survivalist.txt
@@ -1,11 +1,11 @@
-Name:Norin, Swift Survivalist
-ManaCost:R
-Types:Legendary Creature Human Coward
-PT:2/1
-K:CARDNAME can't block.
-T:Mode$ AttackerBlocked | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Whenever a creature you control becomes blocked, you may exile it. You may play that card from exile this turn.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ TriggeredAttackerLKICopy | RememberChanged$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
-SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play that card from exile this turn.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Norin, Swift Survivalist can't block.\nWhenever a creature you control becomes blocked, you may exile it. You may play that card from exile this turn.
\ No newline at end of file
+Name:Norin, Swift Survivalist
+ManaCost:R
+Types:Legendary Creature Human Coward
+PT:2/1
+K:CARDNAME can't block.
+T:Mode$ AttackerBlocked | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Whenever a creature you control becomes blocked, you may exile it. You may play that card from exile this turn.
+SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ TriggeredAttackerLKICopy | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play that card from exile this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Norin, Swift Survivalist can't block.\nWhenever a creature you control becomes blocked, you may exile it. You may play that card from exile this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/nowhere_to_run.txt b/forge-gui/res/cardsfolder/upcoming/nowhere_to_run.txt
index 47270a8a19f..0c2fda12459 100644
--- a/forge-gui/res/cardsfolder/upcoming/nowhere_to_run.txt
+++ b/forge-gui/res/cardsfolder/upcoming/nowhere_to_run.txt
@@ -1,9 +1,9 @@
-Name:Nowhere to Run
-ManaCost:1 B
-Types:Enchantment
-K:Flash
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature an opponent controls gets -3/-3 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumAtt$ -3 | NumDef$ -3 | IsCurse$ True
-S:Mode$ IgnoreHexproof | ValidEntity$ Creature.OppCtrl | Description$ Creatures your opponents control can be the targets of spells and abilities as though they didn't have hexproof. Ward abilities of those creatures don't trigger.
-S:Mode$ DisableTriggers | Secondary$ True | ValidTrigger$ Triggered.Ward | ValidCard$ Creature.OppCtrl+inZoneBattlefield | Description$ Creatures your opponents control can be the targets of spells and abilities as though they didn't have hexproof. Ward abilities of those creatures don't trigger.
-Oracle:Flash\nWhen Nowhere to Run enters, target creature an opponent controls gets -3/-3 until end of turn.\nCreatures your opponents control can be the targets of spells and abilities as though they didn't have hexproof. Ward abilities of those creatures don't trigger.
+Name:Nowhere to Run
+ManaCost:1 B
+Types:Enchantment
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature an opponent controls gets -3/-3 until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumAtt$ -3 | NumDef$ -3 | IsCurse$ True
+S:Mode$ IgnoreHexproof | ValidEntity$ Creature.OppCtrl | Description$ Creatures your opponents control can be the targets of spells and abilities as though they didn't have hexproof. Ward abilities of those creatures don't trigger.
+S:Mode$ DisableTriggers | Secondary$ True | ValidTrigger$ Triggered.Ward | ValidCard$ Creature.OppCtrl+inZoneBattlefield | Description$ Creatures your opponents control can be the targets of spells and abilities as though they didn't have hexproof. Ward abilities of those creatures don't trigger.
+Oracle:Flash\nWhen Nowhere to Run enters, target creature an opponent controls gets -3/-3 until end of turn.\nCreatures your opponents control can be the targets of spells and abilities as though they didn't have hexproof. Ward abilities of those creatures don't trigger.
diff --git a/forge-gui/res/cardsfolder/upcoming/omnivorous_flytrap.txt b/forge-gui/res/cardsfolder/upcoming/omnivorous_flytrap.txt
index 5f8b52432da..3492c824a7c 100644
--- a/forge-gui/res/cardsfolder/upcoming/omnivorous_flytrap.txt
+++ b/forge-gui/res/cardsfolder/upcoming/omnivorous_flytrap.txt
@@ -1,10 +1,10 @@
-Name:Omnivorous Flytrap
-ManaCost:2 G
-Types:Creature Plant
-PT:2/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | Delirium$ True | TriggerDescription$ Delirium — Whenever CARDNAME enters or attacks, if there are four or more card types among cards in your graveyard, distribute two +1/+1 counters among one or two target creatures. Then if there are six or more card types among cards in your graveyard, double the number of +1/+1 counters on those creatures.
-T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigPutCounter | Delirium$ True | TriggerDescription$ Delirium — Whenever CARDNAME enters or attacks, if there are four or more card types among cards in your graveyard, distribute two +1/+1 counters among one or two target creatures. Then if there are six or more card types among cards in your graveyard, double the number of +1/+1 counters on those creatures.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature  | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2 | SubAbility$ DBMultiplyCounter
-SVar:DBMultiplyCounter:DB$ MultiplyCounter | Defined$ Targeted | CounterType$ P1P1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE6
-SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
-Oracle:Delirium — Whenever Omnivorous Flytrap enters or attacks, if there are four or more card types among cards in your graveyard, distribute two +1/+1 counters among one or two target creatures. Then if there are six or more card types among cards in your graveyard, double the number of +1/+1 counters on those creatures.
+Name:Omnivorous Flytrap
+ManaCost:2 G
+Types:Creature Plant
+PT:2/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | Delirium$ True | TriggerDescription$ Delirium — Whenever CARDNAME enters or attacks, if there are four or more card types among cards in your graveyard, distribute two +1/+1 counters among one or two target creatures. Then if there are six or more card types among cards in your graveyard, double the number of +1/+1 counters on those creatures.
+T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigPutCounter | Delirium$ True | TriggerDescription$ Delirium — Whenever CARDNAME enters or attacks, if there are four or more card types among cards in your graveyard, distribute two +1/+1 counters among one or two target creatures. Then if there are six or more card types among cards in your graveyard, double the number of +1/+1 counters on those creatures.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2 | SubAbility$ DBMultiplyCounter
+SVar:DBMultiplyCounter:DB$ MultiplyCounter | Defined$ Targeted | CounterType$ P1P1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE6
+SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
+Oracle:Delirium — Whenever Omnivorous Flytrap enters or attacks, if there are four or more card types among cards in your graveyard, distribute two +1/+1 counters among one or two target creatures. Then if there are six or more card types among cards in your graveyard, double the number of +1/+1 counters on those creatures.
diff --git a/forge-gui/res/cardsfolder/upcoming/only_i_know_what_awaits.txt b/forge-gui/res/cardsfolder/upcoming/only_i_know_what_awaits.txt
index 7cea15966b4..191fef467c1 100644
--- a/forge-gui/res/cardsfolder/upcoming/only_i_know_what_awaits.txt
+++ b/forge-gui/res/cardsfolder/upcoming/only_i_know_what_awaits.txt
@@ -1,9 +1,9 @@
-Name:Only I Know What Awaits
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigRepeatEach | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, for each card type among permanents your opponents control, you may put a permanent card of that type from your hand onto the battlefield.
-SVar:TrigRepeatEach:DB$ RepeatEach | RepeatTypesFrom$ Permanent.OppCtrl | RepeatSubAbility$ ChooseCard | SubAbility$ DBChangeZoneAll
-SVar:ChooseCard:DB$ ChooseCard | Choices$ Card.YouOwn+ChosenType | ChoiceTitle$ You may choose a card of this type to put onto the battlefield | ChoiceTitleAppend$ ChosenType | ChoiceZone$ Hand
-SVar:DBChangeZoneAll:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Hand | Destination$ Battlefield | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
-Oracle:When you set this scheme in motion, for each card type among permanents your opponents control, you may put a permanent card of that type from your hand onto the battlefield.
+Name:Only I Know What Awaits
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigRepeatEach | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, for each card type among permanents your opponents control, you may put a permanent card of that type from your hand onto the battlefield.
+SVar:TrigRepeatEach:DB$ RepeatEach | RepeatTypesFrom$ Permanent.OppCtrl | RepeatSubAbility$ ChooseCard | SubAbility$ DBChangeZoneAll
+SVar:ChooseCard:DB$ ChooseCard | Choices$ Card.YouOwn+ChosenType | ChoiceTitle$ You may choose a card of this type to put onto the battlefield | ChoiceTitleAppend$ ChosenType | ChoiceZone$ Hand
+SVar:DBChangeZoneAll:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Hand | Destination$ Battlefield | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
+Oracle:When you set this scheme in motion, for each card type among permanents your opponents control, you may put a permanent card of that type from your hand onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/optimistic_scavenger.txt b/forge-gui/res/cardsfolder/upcoming/optimistic_scavenger.txt
index 23ddae673a2..79e5eee871d 100644
--- a/forge-gui/res/cardsfolder/upcoming/optimistic_scavenger.txt
+++ b/forge-gui/res/cardsfolder/upcoming/optimistic_scavenger.txt
@@ -1,10 +1,10 @@
-Name:Optimistic Scavenger
-ManaCost:W
-Types:Creature Human Scout
-PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, put a +1/+1 counter on target creature.
-T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, put a +1/+1 counter on target creature.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1
-DeckHas:Ability$Counters
-DeckNeeds:Type$Enchantment
-Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, put a +1/+1 counter on target creature.
+Name:Optimistic Scavenger
+ManaCost:W
+Types:Creature Human Scout
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, put a +1/+1 counter on target creature.
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, put a +1/+1 counter on target creature.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
+DeckNeeds:Type$Enchantment
+Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, put a +1/+1 counter on target creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/orphans_of_the_wheat.txt b/forge-gui/res/cardsfolder/upcoming/orphans_of_the_wheat.txt
index e0faf39da69..369655dea92 100644
--- a/forge-gui/res/cardsfolder/upcoming/orphans_of_the_wheat.txt
+++ b/forge-gui/res/cardsfolder/upcoming/orphans_of_the_wheat.txt
@@ -1,10 +1,10 @@
-Name:Orphans of the Wheat
-ManaCost:1 W
-Types:Creature Human
-PT:2/1
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you may tap any number of untapped creatures you control. CARDNAME gets +1/+1 until end of turn for each creature tapped this way.
-SVar:TrigTap:DB$ Tap | CardChoices$ Creature.YouCtrl+untapped | AnyNumber$ True | ChoiceAmount$ Count$Valid Creature.YouCtrl+untapped | RememberTapped$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | NumAtt$ X | NumDef$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$Amount
-Oracle:Whenever Orphans of the Wheat attacks, you may tap any number of untapped creatures you control. Orphans of the Wheat gets +1/+1 until end of turn for each creature tapped this way.
+Name:Orphans of the Wheat
+ManaCost:1 W
+Types:Creature Human
+PT:2/1
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you may tap any number of untapped creatures you control. CARDNAME gets +1/+1 until end of turn for each creature tapped this way.
+SVar:TrigTap:DB$ Tap | CardChoices$ Creature.YouCtrl+untapped | AnyNumber$ True | ChoiceAmount$ Count$Valid Creature.YouCtrl+untapped | RememberTapped$ True | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | NumAtt$ X | NumDef$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Remembered$Amount
+Oracle:Whenever Orphans of the Wheat attacks, you may tap any number of untapped creatures you control. Orphans of the Wheat gets +1/+1 until end of turn for each creature tapped this way.
diff --git a/forge-gui/res/cardsfolder/upcoming/osseous_sticktwister.txt b/forge-gui/res/cardsfolder/upcoming/osseous_sticktwister.txt
index 6edf107faec..a559a0af681 100644
--- a/forge-gui/res/cardsfolder/upcoming/osseous_sticktwister.txt
+++ b/forge-gui/res/cardsfolder/upcoming/osseous_sticktwister.txt
@@ -1,13 +1,13 @@
-Name:Osseous Sticktwister
-ManaCost:1 B
-Types:Artifact Creature Scarecrow
-PT:2/2
-K:Lifelink
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Delirium$ True | TriggerZones$ Battlefield | Execute$ TrigMaySacorDiscard | TriggerDescription$ Delirium — At the beginning of your end step, if there are four or more card types among cards in your graveyard, each opponent may sacrifice a nonland permanent or discard a card. Then CARDNAME deals damage equal to its power to each opponent who didn't sacrifice a permanent or discard a card this way.
-SVar:TrigMaySacorDiscard:DB$ GenericChoice | Choices$ PaySac,PayDiscard | TempRemember$ Chooser | Defined$ Opponent | AILogic$ PayUnlessCost | DamageMap$ True
-SVar:PaySac:DB$ DealDamage | NumDmg$ X | Defined$ Remembered | UnlessCost$ Sac<1/Permanent.nonLand> | UnlessPayer$ Remembered | UnlessAI$ LifeLTX | SpellDescription$ CARDNAME deals damage equal to its power to you unless you sacrifice a nonland permanent.
-SVar:PayDiscard:DB$ DealDamage | NumDmg$ X | Defined$ Remembered | UnlessCost$ Discard<1/Card> | UnlessPayer$ Remembered | UnlessAI$ LifeLTX | SpellDescription$ CARDNAME deals damage equal to its power to you unless you discard a card.
-SVar:X:Count$CardPower
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:Lifelink\nDelirium — At the beginning of your end step, if there are four or more card types among cards in your graveyard, each opponent may sacrifice a nonland permanent or discard a card. Then Osseous Sticktwister deals damage equal to its power to each opponent who didn't sacrifice a permanent or discard a card this way.
\ No newline at end of file
+Name:Osseous Sticktwister
+ManaCost:1 B
+Types:Artifact Creature Scarecrow
+PT:2/2
+K:Lifelink
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Delirium$ True | TriggerZones$ Battlefield | Execute$ TrigMaySacorDiscard | TriggerDescription$ Delirium — At the beginning of your end step, if there are four or more card types among cards in your graveyard, each opponent may sacrifice a nonland permanent or discard a card. Then CARDNAME deals damage equal to its power to each opponent who didn't sacrifice a permanent or discard a card this way.
+SVar:TrigMaySacorDiscard:DB$ GenericChoice | Choices$ PaySac,PayDiscard | TempRemember$ Chooser | Defined$ Opponent | AILogic$ PayUnlessCost | DamageMap$ True
+SVar:PaySac:DB$ DealDamage | NumDmg$ X | Defined$ Remembered | UnlessCost$ Sac<1/Permanent.nonLand> | UnlessPayer$ Remembered | UnlessAI$ LifeLTX | SpellDescription$ CARDNAME deals damage equal to its power to you unless you sacrifice a nonland permanent.
+SVar:PayDiscard:DB$ DealDamage | NumDmg$ X | Defined$ Remembered | UnlessCost$ Discard<1/Card> | UnlessPayer$ Remembered | UnlessAI$ LifeLTX | SpellDescription$ CARDNAME deals damage equal to its power to you unless you discard a card.
+SVar:X:Count$CardPower
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:Lifelink\nDelirium — At the beginning of your end step, if there are four or more card types among cards in your graveyard, each opponent may sacrifice a nonland permanent or discard a card. Then Osseous Sticktwister deals damage equal to its power to each opponent who didn't sacrifice a permanent or discard a card this way.
diff --git a/forge-gui/res/cardsfolder/upcoming/overgrown_zealot.txt b/forge-gui/res/cardsfolder/upcoming/overgrown_zealot.txt
index 753c78a2d1a..f93559c7d82 100644
--- a/forge-gui/res/cardsfolder/upcoming/overgrown_zealot.txt
+++ b/forge-gui/res/cardsfolder/upcoming/overgrown_zealot.txt
@@ -1,7 +1,7 @@
-Name:Overgrown Zealot
-ManaCost:1 G
-Types:Creature Elf Druid
-PT:0/4
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | RestrictValid$ Static.isTurnFaceUp | SpellDescription$ Add two mana of any one color. Spend this mana only to turn permanents face up.
-Oracle:{T}: Add one mana of any color.\n{T}: Add two mana of any one color. Spend this mana only to turn permanents face up.
+Name:Overgrown Zealot
+ManaCost:1 G
+Types:Creature Elf Druid
+PT:0/4
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | RestrictValid$ Static.isTurnFaceUp | SpellDescription$ Add two mana of any one color. Spend this mana only to turn permanents face up.
+Oracle:{T}: Add one mana of any color.\n{T}: Add two mana of any one color. Spend this mana only to turn permanents face up.
diff --git a/forge-gui/res/cardsfolder/upcoming/overlord_of_the_balemurk.txt b/forge-gui/res/cardsfolder/upcoming/overlord_of_the_balemurk.txt
index ffc60130019..8d1ab3aa73a 100644
--- a/forge-gui/res/cardsfolder/upcoming/overlord_of_the_balemurk.txt
+++ b/forge-gui/res/cardsfolder/upcoming/overlord_of_the_balemurk.txt
@@ -1,10 +1,10 @@
-Name:Overlord of the Balemurk
-ManaCost:3 B B
-Types:Enchantment Creature Avatar Horror
-PT:5/5
-K:Impending:5:1 B
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME enters or attacks, mill four cards, then you may return a non-Avatar creature card or a planeswalker card from your graveyard to your hand.
-T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME enters or attacks, mill four cards, then you may return a non-Avatar creature card or a planeswalker card from your graveyard to your hand.
-SVar:TrigMill:DB$ Mill | NumCards$ 4 | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Creature.nonAvatar+YouOwn,Planeswalker.YouOwn | Hidden$ True | Optional$ True
-Oracle:Impending 5—{1}{B} (If you cast this spell for its impending cost, it enters with five time counters and isn't a creature until the last is removed. At the beginning of your end step, remove a time counter from it.)\nWhenever Overlord of the Balemurk enters or attacks, mill four cards, then you may return a non-Avatar creature card or a planeswalker card from your graveyard to your hand.
+Name:Overlord of the Balemurk
+ManaCost:3 B B
+Types:Enchantment Creature Avatar Horror
+PT:5/5
+K:Impending:5:1 B
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME enters or attacks, mill four cards, then you may return a non-Avatar creature card or a planeswalker card from your graveyard to your hand.
+T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME enters or attacks, mill four cards, then you may return a non-Avatar creature card or a planeswalker card from your graveyard to your hand.
+SVar:TrigMill:DB$ Mill | NumCards$ 4 | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Creature.nonAvatar+YouOwn,Planeswalker.YouOwn | Hidden$ True | Optional$ True
+Oracle:Impending 5—{1}{B} (If you cast this spell for its impending cost, it enters with five time counters and isn't a creature until the last is removed. At the beginning of your end step, remove a time counter from it.)\nWhenever Overlord of the Balemurk enters or attacks, mill four cards, then you may return a non-Avatar creature card or a planeswalker card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/overlord_of_the_boilerbilges.txt b/forge-gui/res/cardsfolder/upcoming/overlord_of_the_boilerbilges.txt
index ac07be5ada8..79f8b72a0e3 100644
--- a/forge-gui/res/cardsfolder/upcoming/overlord_of_the_boilerbilges.txt
+++ b/forge-gui/res/cardsfolder/upcoming/overlord_of_the_boilerbilges.txt
@@ -1,9 +1,9 @@
-Name:Overlord of the Boilerbilges
-ManaCost:4 R R
-Types:Enchantment Creature Avatar Horror
-PT:5/5
-K:Impending:4:2 R R
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME enters or attacks, it deals 4 damage to any target.
-T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME enters or attacks, it deals 4 damage to any target.
-SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 4
-Oracle:Impending 4—{2}{R}{R} (If you cast this spell for its impending cost, it enters with four time counters and isn't a creature until the last is removed. At the beginning of your end step, remove a time counter from it.)\nWhenever Overlord of the Boilerbilges enters or attacks, it deals 4 damage to any target.
+Name:Overlord of the Boilerbilges
+ManaCost:4 R R
+Types:Enchantment Creature Avatar Horror
+PT:5/5
+K:Impending:4:2 R R
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME enters or attacks, it deals 4 damage to any target.
+T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME enters or attacks, it deals 4 damage to any target.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 4
+Oracle:Impending 4—{2}{R}{R} (If you cast this spell for its impending cost, it enters with four time counters and isn't a creature until the last is removed. At the beginning of your end step, remove a time counter from it.)\nWhenever Overlord of the Boilerbilges enters or attacks, it deals 4 damage to any target.
diff --git a/forge-gui/res/cardsfolder/upcoming/overlord_of_the_floodpits.txt b/forge-gui/res/cardsfolder/upcoming/overlord_of_the_floodpits.txt
index 635e595e7f3..c2073412bef 100644
--- a/forge-gui/res/cardsfolder/upcoming/overlord_of_the_floodpits.txt
+++ b/forge-gui/res/cardsfolder/upcoming/overlord_of_the_floodpits.txt
@@ -1,11 +1,11 @@
-Name:Overlord of the Floodpits
-ManaCost:3 U U
-Types:Enchantment Creature Avatar Horror
-PT:5/3
-K:Impending:4:1 U U
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME enters or attacks, draw two cards, then discard a card.
-T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME enters or attacks, draw two cards, then discard a card.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 2 | SubAbility$ TrigDiscard
-SVar:TrigDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
-Oracle:Impending 4—{1}{U}{U} (If you cast this spell for its impending cost, it enters with four time counters and isn't a creature until the last is removed. At the beginning of your end step, remove a time counter from it.)\nFlying\nWhenever Overlord of the Floodpits enters or attacks, draw two cards, then discard a card.
+Name:Overlord of the Floodpits
+ManaCost:3 U U
+Types:Enchantment Creature Avatar Horror
+PT:5/3
+K:Impending:4:1 U U
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME enters or attacks, draw two cards, then discard a card.
+T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME enters or attacks, draw two cards, then discard a card.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 2 | SubAbility$ TrigDiscard
+SVar:TrigDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
+Oracle:Impending 4—{1}{U}{U} (If you cast this spell for its impending cost, it enters with four time counters and isn't a creature until the last is removed. At the beginning of your end step, remove a time counter from it.)\nFlying\nWhenever Overlord of the Floodpits enters or attacks, draw two cards, then discard a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/overlord_of_the_mistmoors.txt b/forge-gui/res/cardsfolder/upcoming/overlord_of_the_mistmoors.txt
index 73a5033daba..1bb4a4b1361 100644
--- a/forge-gui/res/cardsfolder/upcoming/overlord_of_the_mistmoors.txt
+++ b/forge-gui/res/cardsfolder/upcoming/overlord_of_the_mistmoors.txt
@@ -1,9 +1,9 @@
-Name:Overlord of the Mistmoors
-ManaCost:5 W W
-Types:Enchantment Creature Avatar Horror
-PT:6/6
-K:Impending:4:2 W W
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters or attacks, create two 2/1 white Insect creature tokens with flying.
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters or attacks, create two 2/1 white Insect creature tokens with flying.
-SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_2_1_insect_flying
-Oracle:Impending 4—{2}{W}{W} (If you cast this spell for its impending cost, it enters with four time counters and isn't a creature until the last is removed. At the beginning of your end step, remove a time counter from it.)\nWhenever Overlord of the Mistmoors enters or attacks, create two 2/1 white Insect creature tokens with flying.
+Name:Overlord of the Mistmoors
+ManaCost:5 W W
+Types:Enchantment Creature Avatar Horror
+PT:6/6
+K:Impending:4:2 W W
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters or attacks, create two 2/1 white Insect creature tokens with flying.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters or attacks, create two 2/1 white Insect creature tokens with flying.
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_2_1_insect_flying
+Oracle:Impending 4—{2}{W}{W} (If you cast this spell for its impending cost, it enters with four time counters and isn't a creature until the last is removed. At the beginning of your end step, remove a time counter from it.)\nWhenever Overlord of the Mistmoors enters or attacks, create two 2/1 white Insect creature tokens with flying.
diff --git a/forge-gui/res/cardsfolder/upcoming/patched_plaything.txt b/forge-gui/res/cardsfolder/upcoming/patched_plaything.txt
index 7e746da39a0..e46eb12dd7b 100644
--- a/forge-gui/res/cardsfolder/upcoming/patched_plaything.txt
+++ b/forge-gui/res/cardsfolder/upcoming/patched_plaything.txt
@@ -1,9 +1,9 @@
-Name:Patched Plaything
-ManaCost:2 W
-Types:Artifact Creature Toy
-PT:4/3
-K:Double Strike
-K:etbCounter:M1M1:2:CheckSVar$ FromHand:CARDNAME enters with two -1/-1 counters on it if you cast it from your hand.
-SVar:FromHand:Count$wasCastFromYourHandByYou.1.0
-DeckHas:Ability$Counters
-Oracle:Double strike\nPatched Plaything enters with two -1/-1 counters on it if you cast it from your hand.
\ No newline at end of file
+Name:Patched Plaything
+ManaCost:2 W
+Types:Artifact Creature Toy
+PT:4/3
+K:Double Strike
+K:etbCounter:M1M1:2:CheckSVar$ FromHand:CARDNAME enters with two -1/-1 counters on it if you cast it from your hand.
+SVar:FromHand:Count$wasCastFromYourHandByYou.1.0
+DeckHas:Ability$Counters
+Oracle:Double strike\nPatched Plaything enters with two -1/-1 counters on it if you cast it from your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/patchwork_beastie.txt b/forge-gui/res/cardsfolder/upcoming/patchwork_beastie.txt
index c1026d2142a..d4b0807ab2b 100644
--- a/forge-gui/res/cardsfolder/upcoming/patchwork_beastie.txt
+++ b/forge-gui/res/cardsfolder/upcoming/patchwork_beastie.txt
@@ -1,11 +1,11 @@
-Name:Patchwork Beastie
-ManaCost:G
-Types:Artifact Creature Beast
-PT:3/3
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | Description$ Delirium — CARDNAME can't attack or block unless there are four or more card types among cards in your graveyard.
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may mill a card. (You may put the top card of your library into your graveyard.)
-SVar:TrigMill:DB$ Mill | NumCards$ 1 | Defined$ You | Optional$ True
-SVar:X:Count$Delirium.0.1
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:Delirium — Patchwork Beastie can't attack or block unless there are four or more card types among cards in your graveyard.\nAt the beginning of your upkeep, you may mill a card. (You may put the top card of your library into your graveyard.)
+Name:Patchwork Beastie
+ManaCost:G
+Types:Artifact Creature Beast
+PT:3/3
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | Description$ Delirium — CARDNAME can't attack or block unless there are four or more card types among cards in your graveyard.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may mill a card. (You may put the top card of your library into your graveyard.)
+SVar:TrigMill:DB$ Mill | NumCards$ 1 | Defined$ You | Optional$ True
+SVar:X:Count$Delirium.0.1
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:Delirium — Patchwork Beastie can't attack or block unless there are four or more card types among cards in your graveyard.\nAt the beginning of your upkeep, you may mill a card. (You may put the top card of your library into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/upcoming/peculiar_lighthouse.txt b/forge-gui/res/cardsfolder/upcoming/peculiar_lighthouse.txt
index 433b7648ca9..e8adfed5f27 100644
--- a/forge-gui/res/cardsfolder/upcoming/peculiar_lighthouse.txt
+++ b/forge-gui/res/cardsfolder/upcoming/peculiar_lighthouse.txt
@@ -1,8 +1,8 @@
-Name:Peculiar Lighthouse
-ManaCost:no cost
-Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
-SVar:X:PlayerCountPlayers$LowestLifeTotal
-A:AB$ Mana | Cost$ T | Produced$ Combo U R | SpellDescription$ Add {U} or {R}.
-Oracle:Peculiar Lighthouse enters tapped unless a player has 13 or less life.\n{T}: Add {U} or {R}.
+Name:Peculiar Lighthouse
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
+SVar:X:PlayerCountPlayers$LowestLifeTotal
+A:AB$ Mana | Cost$ T | Produced$ Combo U R | SpellDescription$ Add {U} or {R}.
+Oracle:Peculiar Lighthouse enters tapped unless a player has 13 or less life.\n{T}: Add {U} or {R}.
diff --git a/forge-gui/res/cardsfolder/upcoming/peer_past_the_veil.txt b/forge-gui/res/cardsfolder/upcoming/peer_past_the_veil.txt
index be9b090efc5..f20070915f6 100644
--- a/forge-gui/res/cardsfolder/upcoming/peer_past_the_veil.txt
+++ b/forge-gui/res/cardsfolder/upcoming/peer_past_the_veil.txt
@@ -1,7 +1,7 @@
-Name:Peer Past the Veil
-ManaCost:2 R G
-Types:Instant
-A:SP$ Discard | Mode$ Hand | SubAbility$ DBDraw | SpellDescription$ Discard your hand. Then draw X cards, where X is the number of card types among cards in your graveyard.
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X
-SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
-Oracle:Discard your hand. Then draw X cards, where X is the number of card types among cards in your graveyard.
\ No newline at end of file
+Name:Peer Past the Veil
+ManaCost:2 R G
+Types:Instant
+A:SP$ Discard | Mode$ Hand | SubAbility$ DBDraw | SpellDescription$ Discard your hand. Then draw X cards, where X is the number of card types among cards in your graveyard.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X
+SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
+Oracle:Discard your hand. Then draw X cards, where X is the number of card types among cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/persistent_constrictor.txt b/forge-gui/res/cardsfolder/upcoming/persistent_constrictor.txt
index 8994eb253bf..0b99b465fdf 100644
--- a/forge-gui/res/cardsfolder/upcoming/persistent_constrictor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/persistent_constrictor.txt
@@ -1,9 +1,9 @@
-Name:Persistent Constrictor
-ManaCost:4 B
-Types:Creature Zombie Snake
-PT:5/3
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each opponent's upkeep, they lose 1 life and you put a -1/-1 counter on up to one target creature they control.
-SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 1 | Defined$ TriggeredPlayer | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature they control | CounterType$ M1M1 | CounterNum$ 1 | TargetsWithDefinedController$ TriggeredPlayer
-K:Persist
-Oracle:At the beginning of each opponent's upkeep, they lose 1 life and you put a -1/-1 counter on up to one target creature they control.\nPersist (When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
\ No newline at end of file
+Name:Persistent Constrictor
+ManaCost:4 B
+Types:Creature Zombie Snake
+PT:5/3
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each opponent's upkeep, they lose 1 life and you put a -1/-1 counter on up to one target creature they control.
+SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 1 | Defined$ TriggeredPlayer | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature they control | CounterType$ M1M1 | CounterNum$ 1 | TargetsWithDefinedController$ TriggeredPlayer
+K:Persist
+Oracle:At the beginning of each opponent's upkeep, they lose 1 life and you put a -1/-1 counter on up to one target creature they control.\nPersist (When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/phenomenon_investigators.txt b/forge-gui/res/cardsfolder/upcoming/phenomenon_investigators.txt
index 1d65137dd84..30b142b77cd 100644
--- a/forge-gui/res/cardsfolder/upcoming/phenomenon_investigators.txt
+++ b/forge-gui/res/cardsfolder/upcoming/phenomenon_investigators.txt
@@ -1,17 +1,17 @@
-Name:Phenomenon Investigators
-ManaCost:2 U B
-Types:Creature Human Detective
-PT:3/4
-K:ETBReplacement:Other:BelieveOrDoubt
-SVar:BelieveOrDoubt:DB$ GenericChoice | Choices$ Believe,Doubt | Defined$ You | SetChosenMode$ True | ShowChoice$ ExceptSelf | SpellDescription$ As CARDNAME enters, enters, choose Believe or Doubt.
-SVar:Believe:DB$ Pump | SpellDescription$ Believe
-SVar:Doubt:DB$ Pump | SpellDescription$ Doubt
-S:Mode$ Continuous | Affected$ Card.Self+ChosenModeBelieve | AddTrigger$ BelieveTrigger | Description$ • Believe — Whenever a nontoken creature you control dies, create a 2/2 black Horror enchantment creature token.
-S:Mode$ Continuous | Affected$ Card.Self+ChosenModeDoubt | AddTrigger$ DoubtTrigger | Description$ • Doubt — At the beginning of your end step, you may return a nonland permanent you own to your hand. If you do, draw a card.
-SVar:BelieveTrigger:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control dies, create a 2/2 black Horror enchantment creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_e_horror | TokenOwner$ You
-SVar:DoubtTrigger:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of your end step, you may return a nonland permanent you own to your hand. If you do, draw a card.
-SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Permanent.nonLand+YouOwn | ChoiceOptional$ True | RememberChanged$ True | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:As Phenomenon Investigators enters, choose Believe or Doubt.\n• Believe — Whenever a nontoken creature you control dies, create a 2/2 black Horror enchantment creature token.\n• Doubt — At the beginning of your end step, you may return a nonland permanent you own to your hand. If you do, draw a card.
\ No newline at end of file
+Name:Phenomenon Investigators
+ManaCost:2 U B
+Types:Creature Human Detective
+PT:3/4
+K:ETBReplacement:Other:BelieveOrDoubt
+SVar:BelieveOrDoubt:DB$ GenericChoice | Choices$ Believe,Doubt | Defined$ You | SetChosenMode$ True | ShowChoice$ ExceptSelf | SpellDescription$ As CARDNAME enters, choose Believe or Doubt.
+SVar:Believe:DB$ Pump | SpellDescription$ Believe
+SVar:Doubt:DB$ Pump | SpellDescription$ Doubt
+S:Mode$ Continuous | Affected$ Card.Self+ChosenModeBelieve | AddTrigger$ BelieveTrigger | Description$ • Believe — Whenever a nontoken creature you control dies, create a 2/2 black Horror enchantment creature token.
+S:Mode$ Continuous | Affected$ Card.Self+ChosenModeDoubt | AddTrigger$ DoubtTrigger | Description$ • Doubt — At the beginning of your end step, you may return a nonland permanent you own to your hand. If you do, draw a card.
+SVar:BelieveTrigger:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control dies, create a 2/2 black Horror enchantment creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_e_horror | TokenOwner$ You
+SVar:DoubtTrigger:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of your end step, you may return a nonland permanent you own to your hand. If you do, draw a card.
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Permanent.nonLand+YouOwn | ChoiceOptional$ True | RememberChanged$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:As Phenomenon Investigators enters, choose Believe or Doubt.\n• Believe — Whenever a nontoken creature you control dies, create a 2/2 black Horror enchantment creature token.\n• Doubt — At the beginning of your end step, you may return a nonland permanent you own to your hand. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/piggy_bank.txt b/forge-gui/res/cardsfolder/upcoming/piggy_bank.txt
index cb8254ebc64..52cca85607e 100644
--- a/forge-gui/res/cardsfolder/upcoming/piggy_bank.txt
+++ b/forge-gui/res/cardsfolder/upcoming/piggy_bank.txt
@@ -1,8 +1,8 @@
-Name:Piggy Bank
-ManaCost:1 R
-Types:Artifact Creature Boar Toy
-PT:3/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a Treasure token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
-DeckHas:Ability$Token
-Oracle:When Piggy Bank dies, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
\ No newline at end of file
+Name:Piggy Bank
+ManaCost:1 R
+Types:Artifact Creature Boar Toy
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a Treasure token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
+DeckHas:Ability$Token
+Oracle:When Piggy Bank dies, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
diff --git a/forge-gui/res/cardsfolder/upcoming/piranha_fly.txt b/forge-gui/res/cardsfolder/upcoming/piranha_fly.txt
index deb3666f4bb..57b758beb33 100644
--- a/forge-gui/res/cardsfolder/upcoming/piranha_fly.txt
+++ b/forge-gui/res/cardsfolder/upcoming/piranha_fly.txt
@@ -1,8 +1,8 @@
-Name:Piranha Fly
-ManaCost:1 U
-Types:Creature Fish Insect
-PT:2/1
-K:Flying
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
-SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-Oracle:Flying\nPiranha Fly enters tapped.
\ No newline at end of file
+Name:Piranha Fly
+ManaCost:1 U
+Types:Creature Fish Insect
+PT:2/1
+K:Flying
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+Oracle:Flying\nPiranha Fly enters tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/popular_egotist.txt b/forge-gui/res/cardsfolder/upcoming/popular_egotist.txt
index 7938233e39c..ff8e7f085c5 100644
--- a/forge-gui/res/cardsfolder/upcoming/popular_egotist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/popular_egotist.txt
@@ -1,10 +1,10 @@
-Name:Popular Egotist
-ManaCost:2 B
-Types:Creature Human Rogue
-PT:3/2
-A:AB$ Pump | Cost$ 1 B Sac<1/Creature.Other;Enchantment.Other/another creature or enchantment> | Defined$ Self | KW$ Indestructible | SubAbility$ DBTap | SpellDescription$ CARDNAME gains indestructible until end of turn. Tap it. (Damage and effects that say "destroy" don't destroy it.)
-SVar:DBTap:DB$ Tap | Defined$ Self
-T:Mode$ Sacrificed | ValidCard$ Permanent.YouCtrl | Execute$ TrigLoseLife | TriggerZones$ Battlefield | ValidPlayer$ You | TriggerDescription$ Whenever you sacrifice a permanent, target opponent loses 1 life and you gain 1 life.
-SVar:TrigLoseLife:DB$ LoseLife | ValidTgts$ Opponent | TgtPrompt$ Choose an opponent to lose life | LifeAmount$ 1 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-Oracle:{1}{B}, Sacrifice another creature or enchantment: Popular Egotist gains indestructible until end of turn. Tap it. (Damage and effects that say "destroy" don't destroy it.)\nWhenever you sacrifice a permanent, target opponent loses 1 life and you gain 1 life.
\ No newline at end of file
+Name:Popular Egotist
+ManaCost:2 B
+Types:Creature Human Rogue
+PT:3/2
+A:AB$ Pump | Cost$ 1 B Sac<1/Creature.Other;Enchantment.Other/another creature or enchantment> | Defined$ Self | KW$ Indestructible | SubAbility$ DBTap | SpellDescription$ CARDNAME gains indestructible until end of turn. Tap it. (Damage and effects that say "destroy" don't destroy it.)
+SVar:DBTap:DB$ Tap | Defined$ Self
+T:Mode$ Sacrificed | ValidCard$ Permanent.YouCtrl | Execute$ TrigLoseLife | TriggerZones$ Battlefield | ValidPlayer$ You | TriggerDescription$ Whenever you sacrifice a permanent, target opponent loses 1 life and you gain 1 life.
+SVar:TrigLoseLife:DB$ LoseLife | ValidTgts$ Opponent | TgtPrompt$ Choose an opponent to lose life | LifeAmount$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+Oracle:{1}{B}, Sacrifice another creature or enchantment: Popular Egotist gains indestructible until end of turn. Tap it. (Damage and effects that say "destroy" don't destroy it.)\nWhenever you sacrifice a permanent, target opponent loses 1 life and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/possessed_goat.txt b/forge-gui/res/cardsfolder/upcoming/possessed_goat.txt
index 3917abd9d9d..d17de755447 100644
--- a/forge-gui/res/cardsfolder/upcoming/possessed_goat.txt
+++ b/forge-gui/res/cardsfolder/upcoming/possessed_goat.txt
@@ -1,7 +1,7 @@
-Name:Possessed Goat
-ManaCost:W
-Types:Creature Goat
-PT:1/1
-A:AB$ PutCounter | Cost$ 3 Discard<1/Card> | Defined$ Self | CounterType$ P1P1 | CounterNum$ 3 | SubAbility$ DBAnimate | GameActivationLimit$ 1 | SpellDescription$ Put three +1/+1 counters on CARDNAME and it becomes a black Demon in addition to its other colors and types. Activate only once.
-SVar:DBAnimate:DB$ Animate | Defined$ Self | Types$ Demon | Colors$ Black | Duration$ Permanent
-Oracle:{3}, Discard a card: Put three +1/+1 counters on Possessed Goat and it becomes a black Demon in addition to its other colors and types. Activate only once.
+Name:Possessed Goat
+ManaCost:W
+Types:Creature Goat
+PT:1/1
+A:AB$ PutCounter | Cost$ 3 Discard<1/Card> | Defined$ Self | CounterType$ P1P1 | CounterNum$ 3 | SubAbility$ DBAnimate | GameActivationLimit$ 1 | SpellDescription$ Put three +1/+1 counters on CARDNAME and it becomes a black Demon in addition to its other colors and types. Activate only once.
+SVar:DBAnimate:DB$ Animate | Defined$ Self | Types$ Demon | Colors$ Black | Duration$ Permanent
+Oracle:{3}, Discard a card: Put three +1/+1 counters on Possessed Goat and it becomes a black Demon in addition to its other colors and types. Activate only once.
diff --git a/forge-gui/res/cardsfolder/upcoming/ragged_playmate.txt b/forge-gui/res/cardsfolder/upcoming/ragged_playmate.txt
index 6f7a573e0e3..1deb93bf8e9 100644
--- a/forge-gui/res/cardsfolder/upcoming/ragged_playmate.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ragged_playmate.txt
@@ -1,7 +1,7 @@
-Name:Ragged Playmate
-ManaCost:1 R
-Types:Artifact Creature Toy
-PT:2/2
-A:AB$ Effect | Cost$ 1 T | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature with power 2 or less can't be blocked this turn.
-SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
-Oracle:{1}, {T}: Target creature with power 2 or less can't be blocked this turn.
\ No newline at end of file
+Name:Ragged Playmate
+ManaCost:1 R
+Types:Artifact Creature Toy
+PT:2/2
+A:AB$ Effect | Cost$ 1 T | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature with power 2 or less can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
+Oracle:{1}, {T}: Target creature with power 2 or less can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/razorkin_hordecaller.txt b/forge-gui/res/cardsfolder/upcoming/razorkin_hordecaller.txt
index 1e8e7b5e716..4097ba8ee46 100644
--- a/forge-gui/res/cardsfolder/upcoming/razorkin_hordecaller.txt
+++ b/forge-gui/res/cardsfolder/upcoming/razorkin_hordecaller.txt
@@ -1,9 +1,9 @@
-Name:Razorkin Hordecaller
-ManaCost:4 R
-Types:Creature Human Clown Berserker
-PT:4/4
-K:Haste
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, create a 1/1 red Gremlin creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_1_1_gremlin | TokenOwner$ You
-DeckHas:Ability$Token
-Oracle:Haste\nWhenever you attack, create a 1/1 red Gremlin creature token.
\ No newline at end of file
+Name:Razorkin Hordecaller
+ManaCost:4 R
+Types:Creature Human Clown Berserker
+PT:4/4
+K:Haste
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, create a 1/1 red Gremlin creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_1_1_gremlin | TokenOwner$ You
+DeckHas:Ability$Token
+Oracle:Haste\nWhenever you attack, create a 1/1 red Gremlin creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/razorkin_needlehead.txt b/forge-gui/res/cardsfolder/upcoming/razorkin_needlehead.txt
index 1b993b6f02d..75059814575 100644
--- a/forge-gui/res/cardsfolder/upcoming/razorkin_needlehead.txt
+++ b/forge-gui/res/cardsfolder/upcoming/razorkin_needlehead.txt
@@ -1,8 +1,8 @@
-Name:Razorkin Needlehead
-ManaCost:R R
-Types:Creature Human Assassin
-PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ First Strike | Condition$ PlayerTurn | Description$ CARDNAME has first strike during your turn.
-T:Mode$ Drawn | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever an opponent draws a card, CARDNAME deals 1 damage to them.
-SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 1
-Oracle:Razorkin Needlehead has first strike during your turn.\nWhenever an opponent draws a card, Razorkin Needlehead deals 1 damage to them.
\ No newline at end of file
+Name:Razorkin Needlehead
+ManaCost:R R
+Types:Creature Human Assassin
+PT:2/2
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ First Strike | Condition$ PlayerTurn | Description$ CARDNAME has first strike during your turn.
+T:Mode$ Drawn | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever an opponent draws a card, CARDNAME deals 1 damage to them.
+SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 1
+Oracle:Razorkin Needlehead has first strike during your turn.\nWhenever an opponent draws a card, Razorkin Needlehead deals 1 damage to them.
diff --git a/forge-gui/res/cardsfolder/upcoming/razortrap_gorge.txt b/forge-gui/res/cardsfolder/upcoming/razortrap_gorge.txt
index 9ae51e16718..a5233c82958 100644
--- a/forge-gui/res/cardsfolder/upcoming/razortrap_gorge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/razortrap_gorge.txt
@@ -1,8 +1,8 @@
-Name:Razortrap Gorge
-ManaCost:no cost
-Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
-SVar:X:PlayerCountPlayers$LowestLifeTotal
-A:AB$ Mana | Cost$ T | Produced$ Combo B R | SpellDescription$ Add {B} or {R}.
-Oracle:Razortrap Gorge enters tapped unless a player has 13 or less life.\n{T}: Add {B} or {R}.
+Name:Razortrap Gorge
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
+SVar:X:PlayerCountPlayers$LowestLifeTotal
+A:AB$ Mana | Cost$ T | Produced$ Combo B R | SpellDescription$ Add {B} or {R}.
+Oracle:Razortrap Gorge enters tapped unless a player has 13 or less life.\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/upcoming/reality_is_mine_to_control.txt b/forge-gui/res/cardsfolder/upcoming/reality_is_mine_to_control.txt
index da1ad12e46b..d66abbeac3c 100644
--- a/forge-gui/res/cardsfolder/upcoming/reality_is_mine_to_control.txt
+++ b/forge-gui/res/cardsfolder/upcoming/reality_is_mine_to_control.txt
@@ -1,8 +1,8 @@
-Name:Reality Is Mine to Control
-ManaCost:no cost
-Types:Ongoing Scheme
-T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | Execute$ TrigAbandon | TriggerZones$ Command | TriggerDescription$ Whenever you cast a spell, you may abandon this scheme. If you do, copy that spell, and you may choose new targets for the copy.
-SVar:TrigAbandon:DB$ Abandon | Optional$ True | RememberAbandoned$ True | SubAbility$ DBCopy
-SVar:DBCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:(An ongoing scheme remains face up until it's abandoned.)\nWhenever you cast a spell, you may abandon this scheme. If you do, copy that spell, and you may choose new targets for the copy.
+Name:Reality Is Mine to Control
+ManaCost:no cost
+Types:Ongoing Scheme
+T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | Execute$ TrigAbandon | TriggerZones$ Command | TriggerDescription$ Whenever you cast a spell, you may abandon this scheme. If you do, copy that spell, and you may choose new targets for the copy.
+SVar:TrigAbandon:DB$ Abandon | Optional$ True | RememberAbandoned$ True | SubAbility$ DBCopy
+SVar:DBCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:(An ongoing scheme remains face up until it's abandoned.)\nWhenever you cast a spell, you may abandon this scheme. If you do, copy that spell, and you may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/upcoming/redress_fate.txt b/forge-gui/res/cardsfolder/upcoming/redress_fate.txt
index 7df3c6ccba9..d996c08a8dd 100644
--- a/forge-gui/res/cardsfolder/upcoming/redress_fate.txt
+++ b/forge-gui/res/cardsfolder/upcoming/redress_fate.txt
@@ -1,8 +1,8 @@
-Name:Redress Fate
-ManaCost:6 W W
-Types:Sorcery
-A:SP$ ChangeZoneAll | ChangeType$ Artifact.YouOwn,Enchantment.YouOwn | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Return all artifact and enchantment cards from your graveyard to the battlefield.
-K:Miracle:3 W
-DeckNeeds:Type$Artifact|Enchantment
-DeckHas:Ability$Graveyard
-Oracle:Return all artifact and enchantment cards from your graveyard to the battlefield.\nMiracle {3}{W} (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.)
\ No newline at end of file
+Name:Redress Fate
+ManaCost:6 W W
+Types:Sorcery
+A:SP$ ChangeZoneAll | ChangeType$ Artifact.YouOwn,Enchantment.YouOwn | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Return all artifact and enchantment cards from your graveyard to the battlefield.
+K:Miracle:3 W
+DeckNeeds:Type$Artifact|Enchantment
+DeckHas:Ability$Graveyard
+Oracle:Return all artifact and enchantment cards from your graveyard to the battlefield.\nMiracle {3}{W} (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.)
diff --git a/forge-gui/res/cardsfolder/upcoming/reluctant_role_model.txt b/forge-gui/res/cardsfolder/upcoming/reluctant_role_model.txt
index bd9888cb34e..94bad0306d0 100644
--- a/forge-gui/res/cardsfolder/upcoming/reluctant_role_model.txt
+++ b/forge-gui/res/cardsfolder/upcoming/reluctant_role_model.txt
@@ -1,9 +1,9 @@
-Name:Reluctant Role Model
-ManaCost:1 W
-Types:Creature Human Survivor
-PT:2/2
-T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigPutCounter1 | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, put a flying, lifelink, or +1/+1 counter on it.
-SVar:TrigPutCounter1:DB$ PutCounter | CounterType$ Flying,Lifelink,P1P1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+HasCounters,Creature.Other+YouCtrl+HasCounters | TriggerZones$ Battlefield | Execute$ TrigPutCounter2 | TriggerDescription$ Whenever CARDNAME or another creature you control dies, if it had counters on it, put those counters on up to one target creature.
-SVar:TrigPutCounter2:DB$ PutCounter | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Choose target creature | ValidTgts$ Creature | CounterType$ EachFromSource | EachFromSource$ TriggeredCardLKICopy
-Oracle:Survival — At the beginning of your second main phase, if Reluctant Role Model is tapped, put a flying, lifelink, or +1/+1 counter on it.\nWhenever Reluctant Role Model or another creature you control dies, if it had counters on it, put those counters on up to one target creature.
\ No newline at end of file
+Name:Reluctant Role Model
+ManaCost:1 W
+Types:Creature Human Survivor
+PT:2/2
+T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigPutCounter1 | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, put a flying, lifelink, or +1/+1 counter on it.
+SVar:TrigPutCounter1:DB$ PutCounter | CounterType$ Flying,Lifelink,P1P1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+HasCounters,Creature.Other+YouCtrl+HasCounters | TriggerZones$ Battlefield | Execute$ TrigPutCounter2 | TriggerDescription$ Whenever CARDNAME or another creature you control dies, if it had counters on it, put those counters on up to one target creature.
+SVar:TrigPutCounter2:DB$ PutCounter | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Choose target creature | ValidTgts$ Creature | CounterType$ EachFromSource | EachFromSource$ TriggeredCardLKICopy
+Oracle:Survival — At the beginning of your second main phase, if Reluctant Role Model is tapped, put a flying, lifelink, or +1/+1 counter on it.\nWhenever Reluctant Role Model or another creature you control dies, if it had counters on it, put those counters on up to one target creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/resurrected_cultist.txt b/forge-gui/res/cardsfolder/upcoming/resurrected_cultist.txt
index 6194e206c49..48ac572993f 100644
--- a/forge-gui/res/cardsfolder/upcoming/resurrected_cultist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/resurrected_cultist.txt
@@ -1,8 +1,8 @@
-Name:Resurrected Cultist
-ManaCost:2 B
-Types:Creature Human Cleric
-PT:4/1
-A:AB$ ChangeZone | Cost$ 2 B B | PrecostDesc$ Delirium — | Activation$ Delirium | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ FINALITY | ActivationZone$ Graveyard | SorcerySpeed$ True | SpellDescription$ Return CARDNAME from your graveyard to the battlefield with a finality counter on it. Activate only if there are four or more card types among cards in your graveyard and only as a sorcery. (If a creature with a finality counter on it would die, exile it instead.)
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:Delirium — {2}{B}{B}: Return Resurrected Cultist from your graveyard to the battlefield with a finality counter on it. Activate only if there are four or more card types among cards in your graveyard and only as a sorcery. (If a creature with a finality counter on it would die, exile it instead.)
\ No newline at end of file
+Name:Resurrected Cultist
+ManaCost:2 B
+Types:Creature Human Cleric
+PT:4/1
+A:AB$ ChangeZone | Cost$ 2 B B | PrecostDesc$ Delirium — | Activation$ Delirium | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ FINALITY | ActivationZone$ Graveyard | SorcerySpeed$ True | SpellDescription$ Return CARDNAME from your graveyard to the battlefield with a finality counter on it. Activate only if there are four or more card types among cards in your graveyard and only as a sorcery. (If a creature with a finality counter on it would die, exile it instead.)
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:Delirium — {2}{B}{B}: Return Resurrected Cultist from your graveyard to the battlefield with a finality counter on it. Activate only if there are four or more card types among cards in your graveyard and only as a sorcery. (If a creature with a finality counter on it would die, exile it instead.)
diff --git a/forge-gui/res/cardsfolder/upcoming/rite_of_the_moth.txt b/forge-gui/res/cardsfolder/upcoming/rite_of_the_moth.txt
index 50f884a84e8..ced30ba7ea7 100644
--- a/forge-gui/res/cardsfolder/upcoming/rite_of_the_moth.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rite_of_the_moth.txt
@@ -1,7 +1,7 @@
-Name:Rite of the Moth
-ManaCost:1 W B B
-Types:Sorcery
-K:Flashback:3 W W B
-A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | WithCountersType$ FINALITY | SpellDescription$ Return target creature card from your graveyard to the battlefield with a finality counter on it. (If a creature with a finality counter on it would die, exile it instead.)
-SVar:DiscardMe:1
-Oracle:Return target creature card from your graveyard to the battlefield with a finality counter on it. (If a creature with a finality counter on it would die, exile it instead.)\nFlashback {3}{W}{W}{B} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
\ No newline at end of file
+Name:Rite of the Moth
+ManaCost:1 W B B
+Types:Sorcery
+K:Flashback:3 W W B
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | WithCountersType$ FINALITY | SpellDescription$ Return target creature card from your graveyard to the battlefield with a finality counter on it. (If a creature with a finality counter on it would die, exile it instead.)
+SVar:DiscardMe:1
+Oracle:Return target creature card from your graveyard to the battlefield with a finality counter on it. (If a creature with a finality counter on it would die, exile it instead.)\nFlashback {3}{W}{W}{B} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/rootwise_survivor.txt b/forge-gui/res/cardsfolder/upcoming/rootwise_survivor.txt
index 1311dee275c..3e447858e80 100644
--- a/forge-gui/res/cardsfolder/upcoming/rootwise_survivor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rootwise_survivor.txt
@@ -1,10 +1,10 @@
-Name:Rootwise Survivor
-Types:Creature Human Survivor
-ManaCost:3 G G
-PT:3/4
-K:Haste
-T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, put three +1/+1 counters on up to one target land you control. That land becomes a 0/0 Elemental creature in addition to its other types. It gains haste until your next turn.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | TargetMin$ 0 | TargetMax$ 1 | CounterType$ P1P1 | CounterNum$ 3 | SubAbility$ DBAnimate
-SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Power$ 0 | Toughness$ 0 | Types$ Creature,Elemental | Duration$ Permanent | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Keywords$ Haste | Defined$ Targeted | Duration$ UntilYourNextTurn
-Oracle:Haste\nSurvival — At the beginning of your second main phase, if Rootwise Survivor is tapped, put three +1/+1 counters on up to one target land you control. That land becomes a 0/0 Elemental creature in addition to its other types. It gains haste until your next turn.
\ No newline at end of file
+Name:Rootwise Survivor
+Types:Creature Human Survivor
+ManaCost:3 G G
+PT:3/4
+K:Haste
+T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, put three +1/+1 counters on up to one target land you control. That land becomes a 0/0 Elemental creature in addition to its other types. It gains haste until your next turn.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | TargetMin$ 0 | TargetMax$ 1 | CounterType$ P1P1 | CounterNum$ 3 | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Power$ 0 | Toughness$ 0 | Types$ Creature,Elemental | Duration$ Permanent | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Keywords$ Haste | Defined$ Targeted | Duration$ UntilYourNextTurn
+Oracle:Haste\nSurvival — At the beginning of your second main phase, if Rootwise Survivor is tapped, put three +1/+1 counters on up to one target land you control. That land becomes a 0/0 Elemental creature in addition to its other types. It gains haste until your next turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/rot_like_the_scum_you_are.txt b/forge-gui/res/cardsfolder/upcoming/rot_like_the_scum_you_are.txt
index 152e5842b77..028129c6248 100644
--- a/forge-gui/res/cardsfolder/upcoming/rot_like_the_scum_you_are.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rot_like_the_scum_you_are.txt
@@ -1,9 +1,9 @@
-Name:Rot Like the Scum You Are
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigToken | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, create a 2/2 green Ooze creature token, then put a number of +1/+1 counters on it equal to the number of lands your opponents control.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_2_2_ooze | RememberTokens$ True | TokenOwner$ You | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterNum$ X | CounterType$ P1P1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$Valid Land.OppCtrl
-Oracle:When you set this scheme in motion, create a 2/2 green Ooze creature token, then put a number of +1/+1 counters on it equal to the number of lands your opponents control.
\ No newline at end of file
+Name:Rot Like the Scum You Are
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigToken | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, create a 2/2 green Ooze creature token, then put a number of +1/+1 counters on it equal to the number of lands your opponents control.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_2_2_ooze | RememberTokens$ True | TokenOwner$ You | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterNum$ X | CounterType$ P1P1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$Valid Land.OppCtrl
+Oracle:When you set this scheme in motion, create a 2/2 green Ooze creature token, then put a number of +1/+1 counters on it equal to the number of lands your opponents control.
diff --git a/forge-gui/res/cardsfolder/upcoming/savior_of_the_small.txt b/forge-gui/res/cardsfolder/upcoming/savior_of_the_small.txt
index 31d7fda0b34..c60ce984e8b 100644
--- a/forge-gui/res/cardsfolder/upcoming/savior_of_the_small.txt
+++ b/forge-gui/res/cardsfolder/upcoming/savior_of_the_small.txt
@@ -1,7 +1,7 @@
-Name:Savior of the Small
-Types:Creature Kor Survivor
-ManaCost:3 W
-PT:3/4
-T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, return target creature card with mana value 3 or less from your graveyard to your hand.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouOwn+cmcLE3 | TgtPrompt$ Select target creature card with mana value 3 or less
-Oracle:Survival — At the beginning of your second main phase, if Savior of the Small is tapped, return target creature card with mana value 3 or less from your graveyard to your hand.
+Name:Savior of the Small
+Types:Creature Kor Survivor
+ManaCost:3 W
+PT:3/4
+T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, return target creature card with mana value 3 or less from your graveyard to your hand.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouOwn+cmcLE3 | TgtPrompt$ Select target creature card with mana value 3 or less
+Oracle:Survival — At the beginning of your second main phase, if Savior of the Small is tapped, return target creature card with mana value 3 or less from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/saw.txt b/forge-gui/res/cardsfolder/upcoming/saw.txt
index b1e66c2133b..2a81fc95eda 100644
--- a/forge-gui/res/cardsfolder/upcoming/saw.txt
+++ b/forge-gui/res/cardsfolder/upcoming/saw.txt
@@ -1,8 +1,8 @@
-Name:Saw
-ManaCost:2
-Types:Artifact Equipment
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | Description$ Equipped creature gets +2/+0.
-T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature attacks, you may sacrifice a permanent other than that creature or CARDNAME. If you do, draw a card.
-SVar:TrigDraw:AB$ Draw | Cost$ Sac<1/Permanent.Other+NotDefinedTriggeredAttacker/permanent other than the triggered attacker or CARDNAME>
-K:Equip:2
-Oracle:Equipped creature gets +2/+0.\nWhenever equipped creature attacks, you may sacrifice a permanent other than that creature or Saw. If you do, draw a card.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file
+Name:Saw
+ManaCost:2
+Types:Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | Description$ Equipped creature gets +2/+0.
+T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature attacks, you may sacrifice a permanent other than that creature or CARDNAME. If you do, draw a card.
+SVar:TrigDraw:AB$ Draw | Cost$ Sac<1/Permanent.Other+NotDefinedTriggeredAttacker/permanent other than the triggered attacker or CARDNAME>
+K:Equip:2
+Oracle:Equipped creature gets +2/+0.\nWhenever equipped creature attacks, you may sacrifice a permanent other than that creature or Saw. If you do, draw a card.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/upcoming/sawblade_skinripper.txt b/forge-gui/res/cardsfolder/upcoming/sawblade_skinripper.txt
index 559af866bc4..faebdc04b3f 100644
--- a/forge-gui/res/cardsfolder/upcoming/sawblade_skinripper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sawblade_skinripper.txt
@@ -1,12 +1,12 @@
-Name:Sawblade Skinripper
-ManaCost:1 B R
-Types:Creature Human Assassin
-PT:3/2
-K:Menace
-A:AB$ PutCounter | Cost$ 2 Sac<1/Creature.Other;Enchantment.Other/another creature or enchantment> | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GT0 | Execute$ TrigDealDamage | TriggerDescription$ At the beginning of your end step, if you sacrificed one or more permanents this turn, CARDNAME deals that much damage to any target.
-SVar:TrigDealDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Any
-SVar:X:PlayerCountPropertyYou$SacrificedThisTurn Permanent
-DeckHints:Ability$Investigate
-DeckHas:Ability$Investigate|Token
-Oracle:Menace\n{2}, Sacrifice another creature or enchantment: Put a +1/+1 counter on Sawblade Skinripper.\nAt the beginning of your end step, if you sacrificed one or more permanents this turn, Sawblade Skinripper deals that much damage to any target.
+Name:Sawblade Skinripper
+ManaCost:1 B R
+Types:Creature Human Assassin
+PT:3/2
+K:Menace
+A:AB$ PutCounter | Cost$ 2 Sac<1/Creature.Other;Enchantment.Other/another creature or enchantment> | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GT0 | Execute$ TrigDealDamage | TriggerDescription$ At the beginning of your end step, if you sacrificed one or more permanents this turn, CARDNAME deals that much damage to any target.
+SVar:TrigDealDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Any
+SVar:X:PlayerCountPropertyYou$SacrificedThisTurn Permanent
+DeckHints:Ability$Investigate
+DeckHas:Ability$Investigate|Token
+Oracle:Menace\n{2}, Sacrifice another creature or enchantment: Put a +1/+1 counter on Sawblade Skinripper.\nAt the beginning of your end step, if you sacrificed one or more permanents this turn, Sawblade Skinripper deals that much damage to any target.
diff --git a/forge-gui/res/cardsfolder/upcoming/say_its_name.txt b/forge-gui/res/cardsfolder/upcoming/say_its_name.txt
index 6f6abae2acc..0838fd145c2 100644
--- a/forge-gui/res/cardsfolder/upcoming/say_its_name.txt
+++ b/forge-gui/res/cardsfolder/upcoming/say_its_name.txt
@@ -1,9 +1,9 @@
-Name:Say Its Name
-ManaCost:1 G
-Types:Sorcery
-A:SP$ Mill | NumCards$ 3 | Defined$ You | SubAbility$ DBChangeZone | SpellDescription$ Mill three cards. Then you may return a creature or land card from your graveyard to your hand.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Creature.YouOwn,Land.YouOwn | ChangeNum$ 1 | Hidden$ True
-A:AB$ ChangeZone | Cost$ ExileFromGrave<1/CARDNAME> ExileFromGrave<2/Card.Other+YouOwn+namedSay Its Name> | ActivationZone$ Graveyard | Hidden$ True | Origin$ Library | OriginAlternative$ Graveyard,Hand | Destination$ Battlefield | ChangeType$ Card.YouOwn+namedAltanak; the Thrice-Called | SorcerySpeed$ True | SpellDescription$ Search your graveyard, hand, and/or library for a card named Altanak, the Thrice-Called and put it onto the battlefield. If you search your library this way, shuffle. Activate only as a sorcery.
-DeckHas:Ability$Graveyard
-DeckHints:Name$Altanak, the Thrice-Called
-Oracle:Mill three cards. Then you may return a creature or land card from your graveyard to your hand.\nExile this card and two other cards named Say Its Name from your graveyard: Search your graveyard, hand, and/or library for a card named Altanak, the Thrice-Called and put it onto the battlefield. If you search your library this way, shuffle. Activate only as a sorcery.
+Name:Say Its Name
+ManaCost:1 G
+Types:Sorcery
+A:SP$ Mill | NumCards$ 3 | Defined$ You | SubAbility$ DBChangeZone | SpellDescription$ Mill three cards. Then you may return a creature or land card from your graveyard to your hand.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Creature.YouOwn,Land.YouOwn | ChangeNum$ 1 | Hidden$ True
+A:AB$ ChangeZone | Cost$ ExileFromGrave<1/CARDNAME> ExileFromGrave<2/Card.Other+YouOwn+namedSay Its Name> | ActivationZone$ Graveyard | Hidden$ True | Origin$ Library | OriginAlternative$ Graveyard,Hand | Destination$ Battlefield | ChangeType$ Card.YouOwn+namedAltanak; the Thrice-Called | SorcerySpeed$ True | SpellDescription$ Search your graveyard, hand, and/or library for a card named Altanak, the Thrice-Called and put it onto the battlefield. If you search your library this way, shuffle. Activate only as a sorcery.
+DeckHas:Ability$Graveyard
+DeckHints:Name$Altanak, the Thrice-Called
+Oracle:Mill three cards. Then you may return a creature or land card from your graveyard to your hand.\nExile this card and two other cards named Say Its Name from your graveyard: Search your graveyard, hand, and/or library for a card named Altanak, the Thrice-Called and put it onto the battlefield. If you search your library this way, shuffle. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/scrabbling_skullcrab.txt b/forge-gui/res/cardsfolder/upcoming/scrabbling_skullcrab.txt
index 773e900cb6e..fb0a3c2c02d 100644
--- a/forge-gui/res/cardsfolder/upcoming/scrabbling_skullcrab.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scrabbling_skullcrab.txt
@@ -1,9 +1,9 @@
-Name:Scrabbling Skullcrab
-ManaCost:U
-Types:Creature Crab Skeleton
-PT:0/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, target player mills two cards. (They put the top two cards of their library into their graveyard.)
-T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, target player mills two cards. (They put the top two cards of their library into their graveyard.)
-SVar:TrigMill:DB$ Mill | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Select target player
-DeckNeeds:Type$Enchantment
-Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, target player mills two cards. (They put the top two cards of their library into their graveyard.)
+Name:Scrabbling Skullcrab
+ManaCost:U
+Types:Creature Crab Skeleton
+PT:0/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, target player mills two cards. (They put the top two cards of their library into their graveyard.)
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, target player mills two cards. (They put the top two cards of their library into their graveyard.)
+SVar:TrigMill:DB$ Mill | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Select target player
+DeckNeeds:Type$Enchantment
+Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, target player mills two cards. (They put the top two cards of their library into their graveyard.)
diff --git a/forge-gui/res/cardsfolder/upcoming/seance_board.txt b/forge-gui/res/cardsfolder/upcoming/seance_board.txt
index d6b49833d0d..ac5a6963057 100644
--- a/forge-gui/res/cardsfolder/upcoming/seance_board.txt
+++ b/forge-gui/res/cardsfolder/upcoming/seance_board.txt
@@ -1,9 +1,9 @@
-Name:Séance Board
-ManaCost:2
-Types:Artifact
-T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Morbid — At the beginning of each end step, if a creature died this turn, put a soul counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ SOUL | CounterNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ Y | RestrictValid$ Spell.Instant,Spell.Sorcery,Spell.Demon,Spell.Spirit | SpellDescription$ Add X mana of any one color, where X is the number of soul counters on CARDNAME. Spend this mana only to cast instant, sorcery, Demon, and Spirit spells.
-SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature
-SVar:Y:Count$CardCounters.SOUL
-Oracle:Morbid — At the beginning of each end step, if a creature died this turn, put a soul counter on Séance Board.\n{T}: Add X mana of any one color, where X is the number of soul counters on Séance Board. Spend this mana only to cast instant, sorcery, Demon, and Spirit spells.
+Name:Séance Board
+ManaCost:2
+Types:Artifact
+T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Morbid — At the beginning of each end step, if a creature died this turn, put a soul counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ SOUL | CounterNum$ 1
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ Y | RestrictValid$ Spell.Instant,Spell.Sorcery,Spell.Demon,Spell.Spirit | SpellDescription$ Add X mana of any one color, where X is the number of soul counters on CARDNAME. Spend this mana only to cast instant, sorcery, Demon, and Spirit spells.
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature
+SVar:Y:Count$CardCounters.SOUL
+Oracle:Morbid — At the beginning of each end step, if a creature died this turn, put a soul counter on Séance Board.\n{T}: Add X mana of any one color, where X is the number of soul counters on Séance Board. Spend this mana only to cast instant, sorcery, Demon, and Spirit spells.
diff --git a/forge-gui/res/cardsfolder/upcoming/seized_from_slumber.txt b/forge-gui/res/cardsfolder/upcoming/seized_from_slumber.txt
index bc5e6954ff3..273419c3e7c 100644
--- a/forge-gui/res/cardsfolder/upcoming/seized_from_slumber.txt
+++ b/forge-gui/res/cardsfolder/upcoming/seized_from_slumber.txt
@@ -1,6 +1,6 @@
-Name:Seized from Slumber
-ManaCost:4 W
-Types:Instant
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 3 | EffectZone$ All | ValidTarget$ Creature.tapped | Description$ This spell costs {3} less to cast if it targets a tapped creature.
-A:SP$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Destroy target creature.
-Oracle:This spell costs {3} less to cast if it targets a tapped creature.\nDestroy target creature.
\ No newline at end of file
+Name:Seized from Slumber
+ManaCost:4 W
+Types:Instant
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 3 | EffectZone$ All | ValidTarget$ Creature.tapped | Description$ This spell costs {3} less to cast if it targets a tapped creature.
+A:SP$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Destroy target creature.
+Oracle:This spell costs {3} less to cast if it targets a tapped creature.\nDestroy target creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/shardmages_rescue.txt b/forge-gui/res/cardsfolder/upcoming/shardmages_rescue.txt
index 6a7cc0444fe..9d692d14de7 100644
--- a/forge-gui/res/cardsfolder/upcoming/shardmages_rescue.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shardmages_rescue.txt
@@ -1,9 +1,9 @@
-Name:Shardmage's Rescue
-ManaCost:W
-Types:Enchantment Aura
-K:Flash
-K:Enchant creature you control
-A:SP$ Attach | Cost$ W | ValidTgts$ Creature.YouCtrl | AILogic$ Pump
-S:Mode$ Continuous | IsPresent$ Card.Self+ThisTurnEntered | Affected$ Creature.EnchantedBy | AddKeyword$ Hexproof | Description$ As long as CARDNAME entered this turn, enchanted creature has hexproof.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1.
-Oracle:Flash\nEnchant creature you control\nAs long as Shardmage's Rescue entered this turn, enchanted creature has hexproof.\nEnchanted creature gets +1/+1.
\ No newline at end of file
+Name:Shardmage's Rescue
+ManaCost:W
+Types:Enchantment Aura
+K:Flash
+K:Enchant creature you control
+A:SP$ Attach | Cost$ W | ValidTgts$ Creature.YouCtrl | AILogic$ Pump
+S:Mode$ Continuous | IsPresent$ Card.Self+ThisTurnEntered | Affected$ Creature.EnchantedBy | AddKeyword$ Hexproof | Description$ As long as CARDNAME entered this turn, enchanted creature has hexproof.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1.
+Oracle:Flash\nEnchant creature you control\nAs long as Shardmage's Rescue entered this turn, enchanted creature has hexproof.\nEnchanted creature gets +1/+1.
diff --git a/forge-gui/res/cardsfolder/upcoming/sheltered_by_ghosts.txt b/forge-gui/res/cardsfolder/upcoming/sheltered_by_ghosts.txt
index b1219aeb2b2..493a88ce82a 100644
--- a/forge-gui/res/cardsfolder/upcoming/sheltered_by_ghosts.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sheltered_by_ghosts.txt
@@ -1,9 +1,9 @@
-Name:Sheltered by Ghosts
-ManaCost:1 W
-Types:Enchantment Aura
-K:Enchant creature you control
-A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile target nonland permanent an opponent controls until CARDNAME leaves the battlefield.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | Duration$ UntilHostLeavesPlay
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddKeyword$ Lifelink & Ward:2 | Description$ Enchanted creature gets +1/+0 and has lifelink and ward {2}.
-Oracle:Enchant creature you control\nWhen Sheltered by Ghosts enters, exile target nonland permanent an opponent controls until Sheltered by Ghosts leaves the battlefield.\nEnchanted creature gets +1/+0 and has lifelink and ward {2}.
\ No newline at end of file
+Name:Sheltered by Ghosts
+ManaCost:1 W
+Types:Enchantment Aura
+K:Enchant creature you control
+A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ Pump
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile target nonland permanent an opponent controls until CARDNAME leaves the battlefield.
+SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | Duration$ UntilHostLeavesPlay
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddKeyword$ Lifelink & Ward:2 | Description$ Enchanted creature gets +1/+0 and has lifelink and ward {2}.
+Oracle:Enchant creature you control\nWhen Sheltered by Ghosts enters, exile target nonland permanent an opponent controls until Sheltered by Ghosts leaves the battlefield.\nEnchanted creature gets +1/+0 and has lifelink and ward {2}.
diff --git a/forge-gui/res/cardsfolder/upcoming/shepherding spirits.txt b/forge-gui/res/cardsfolder/upcoming/shepherding spirits.txt
index b4fc661465f..9175873339a 100644
--- a/forge-gui/res/cardsfolder/upcoming/shepherding spirits.txt	
+++ b/forge-gui/res/cardsfolder/upcoming/shepherding spirits.txt	
@@ -1,7 +1,7 @@
-Name:Shepherding Spirits
-ManaCost:4 W W
-Types:Creature Spirit
-PT:4/5
-K:Flying
-K:TypeCycling:Plains:2
-Oracle:Flying\nPlainscycling {2} ({2}, Discard this card: Search your library for a Plains card, reveal it, put it into your hand, then shuffle.)
\ No newline at end of file
+Name:Shepherding Spirits
+ManaCost:4 W W
+Types:Creature Spirit
+PT:4/5
+K:Flying
+K:TypeCycling:Plains:2
+Oracle:Flying\nPlainscycling {2} ({2}, Discard this card: Search your library for a Plains card, reveal it, put it into your hand, then shuffle.)
diff --git a/forge-gui/res/cardsfolder/upcoming/shrewd_storyteller.txt b/forge-gui/res/cardsfolder/upcoming/shrewd_storyteller.txt
index 21ec339f6e4..e2ce2a99dad 100644
--- a/forge-gui/res/cardsfolder/upcoming/shrewd_storyteller.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shrewd_storyteller.txt
@@ -1,7 +1,7 @@
-Name:Shrewd Storyteller
-Types:Creature Human Survivor
-ManaCost:1 G W
-PT:3/3
-T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, put a +1/+1 counter on target creature.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1
-Oracle:Survival — At the beginning of your second main phase, if Shrewd Storyteller is tapped, put a +1/+1 counter on target creature.
+Name:Shrewd Storyteller
+Types:Creature Human Survivor
+ManaCost:1 G W
+PT:3/3
+T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, put a +1/+1 counter on target creature.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1
+Oracle:Survival — At the beginning of your second main phase, if Shrewd Storyteller is tapped, put a +1/+1 counter on target creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/shriekwood_devourer.txt b/forge-gui/res/cardsfolder/upcoming/shriekwood_devourer.txt
index b97fb45fb70..37f710d92a1 100644
--- a/forge-gui/res/cardsfolder/upcoming/shriekwood_devourer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shriekwood_devourer.txt
@@ -1,9 +1,9 @@
-Name:Shriekwood Devourer
-ManaCost:5 G G
-Types:Creature Treefolk
-PT:7/5
-K:Trample
-T:Mode$ AttackersDeclared | ValidAttackers$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever you attack with one or more creatures, untap up to X lands, where X is the greatest power among those creatures.
-SVar:TrigUntap:DB$ Untap | UntapUpTo$ True | UntapType$ Land | Amount$ X
-SVar:X:TriggerObjectsAttackers$GreatestPower
-Oracle:Trample\nWhenever you attack with one or more creatures, untap up to X lands, where X is the greatest power among those creatures.
\ No newline at end of file
+Name:Shriekwood Devourer
+ManaCost:5 G G
+Types:Creature Treefolk
+PT:7/5
+K:Trample
+T:Mode$ AttackersDeclared | ValidAttackers$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever you attack with one or more creatures, untap up to X lands, where X is the greatest power among those creatures.
+SVar:TrigUntap:DB$ Untap | UntapUpTo$ True | UntapType$ Land | Amount$ X
+SVar:X:TriggerObjectsAttackers$GreatestPower
+Oracle:Trample\nWhenever you attack with one or more creatures, untap up to X lands, where X is the greatest power among those creatures.
diff --git a/forge-gui/res/cardsfolder/upcoming/shroudstomper.txt b/forge-gui/res/cardsfolder/upcoming/shroudstomper.txt
index 6c84fd3c4df..aa463dd1f62 100644
--- a/forge-gui/res/cardsfolder/upcoming/shroudstomper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shroudstomper.txt
@@ -1,12 +1,12 @@
-Name:Shroudstomper
-ManaCost:3 W W B B
-Types:Creature Elemental
-PT:5/5
-K:Deathtouch
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME enters or attacks, each opponent loses 2 life. You gain 2 life and draw a card.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigLoseLife | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, each opponent loses 2 life. You gain 2 life and draw a card.
-SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2 | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw
-SVar:HasAttackEffect:TRUE
-Oracle:Deathtouch\nWhenever Shroudstomper enters or attacks, each opponent loses 2 life. You gain 2 life and draw a card.
+Name:Shroudstomper
+ManaCost:3 W W B B
+Types:Creature Elemental
+PT:5/5
+K:Deathtouch
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME enters or attacks, each opponent loses 2 life. You gain 2 life and draw a card.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigLoseLife | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, each opponent loses 2 life. You gain 2 life and draw a card.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw
+SVar:HasAttackEffect:TRUE
+Oracle:Deathtouch\nWhenever Shroudstomper enters or attacks, each opponent loses 2 life. You gain 2 life and draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/silent_hallcreeper.txt b/forge-gui/res/cardsfolder/upcoming/silent_hallcreeper.txt
index 0b68a4fbf76..9942c170b0c 100644
--- a/forge-gui/res/cardsfolder/upcoming/silent_hallcreeper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/silent_hallcreeper.txt
@@ -1,11 +1,11 @@
-Name:Silent Hallcreeper
-ManaCost:1 U
-Types:Enchantment Creature Horror
-PT:1/1
-S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigCharm | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, ABILITY
-SVar:TrigCharm:DB$ Charm | Choices$ DBPutCounter,DBDraw,DBClone | ChoiceRestriction$ ThisGame | CharmNum$ 1
-SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on CARDNAME.
-SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
-SVar:DBClone:DB$ Clone | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control to copy | SpellDescription$ CARDNAME becomes a copy of another target creature you control.
-Oracle:Silent Hallcreeper can't be blocked.\nWhenever Silent Hallcreeper deals combat damage to a player, choose one that hasn't been chosen -\n• Put two +1/+1 counters on Silent Hallcreeper.\n• Draw a card.\n• Silent Hallcreeper becomes a copy of another target creature you control.
\ No newline at end of file
+Name:Silent Hallcreeper
+ManaCost:1 U
+Types:Enchantment Creature Horror
+PT:1/1
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigCharm | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, ABILITY
+SVar:TrigCharm:DB$ Charm | Choices$ DBPutCounter,DBDraw,DBClone | ChoiceRestriction$ ThisGame | CharmNum$ 1
+SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on CARDNAME.
+SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
+SVar:DBClone:DB$ Clone | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control to copy | SpellDescription$ CARDNAME becomes a copy of another target creature you control.
+Oracle:Silent Hallcreeper can't be blocked.\nWhenever Silent Hallcreeper deals combat damage to a player, choose one that hasn't been chosen -\n• Put two +1/+1 counters on Silent Hallcreeper.\n• Draw a card.\n• Silent Hallcreeper becomes a copy of another target creature you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/skullsnap_nuisance.txt b/forge-gui/res/cardsfolder/upcoming/skullsnap_nuisance.txt
index c24d715614f..13c60f27ac5 100644
--- a/forge-gui/res/cardsfolder/upcoming/skullsnap_nuisance.txt
+++ b/forge-gui/res/cardsfolder/upcoming/skullsnap_nuisance.txt
@@ -1,10 +1,10 @@
-Name:Skullsnap Nuisance
-ManaCost:U B
-Types:Creature Insect Skeleton
-PT:1/4
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
-T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigSurveil | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, surveil 1. (Look at the top card of your library. You may put it into your graveyard.).
-SVar:TrigSurveil:DB$ Surveil | Amount$ 1
-DeckNeeds:Type$Enchantment
-Oracle:Flying\nEerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+Name:Skullsnap Nuisance
+ManaCost:U B
+Types:Creature Insect Skeleton
+PT:1/4
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigSurveil | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, surveil 1. (Look at the top card of your library. You may put it into your graveyard.).
+SVar:TrigSurveil:DB$ Surveil | Amount$ 1
+DeckNeeds:Type$Enchantment
+Oracle:Flying\nEerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, 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/slavering_branchsnapper.txt b/forge-gui/res/cardsfolder/upcoming/slavering_branchsnapper.txt
index 2a0ce3cc972..84bed232e72 100644
--- a/forge-gui/res/cardsfolder/upcoming/slavering_branchsnapper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/slavering_branchsnapper.txt
@@ -1,7 +1,7 @@
-Name:Slavering Branchsnapper
-ManaCost:4 G G
-Types:Creature Lizard
-PT:7/6
-K:Trample
-K:TypeCycling:Forest:2
-Oracle:Trample\nForestcycling {2} ({2}, Discard this card: Search your library for a Forest card, reveal it, put it into your hand, then shuffle.)
\ No newline at end of file
+Name:Slavering Branchsnapper
+ManaCost:4 G G
+Types:Creature Lizard
+PT:7/6
+K:Trample
+K:TypeCycling:Forest:2
+Oracle:Trample\nForestcycling {2} ({2}, Discard this card: Search your library for a Forest card, reveal it, put it into your hand, then shuffle.)
diff --git a/forge-gui/res/cardsfolder/upcoming/soaring_lightbringer.txt b/forge-gui/res/cardsfolder/upcoming/soaring_lightbringer.txt
index 6dcf2075361..fddd0ea453a 100644
--- a/forge-gui/res/cardsfolder/upcoming/soaring_lightbringer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/soaring_lightbringer.txt
@@ -1,10 +1,10 @@
-Name:Soaring Lightbringer
-ManaCost:4 W
-Types:Enchantment Creature Bird Glimmer
-PT:4/5
-K:Flying
-S:Mode$ Continuous | Affected$ Enchantment.Creature+Other+YouCtrl | AddKeyword$ Flying | Description$ Other enchantment creatures you control have flying.
-T:Mode$ AttackersDeclaredOneTarget | ValidAttackers$ Creature.YouCtrl | AttackedTarget$ Player | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack a player, create a 1/1 white Glimmer enchantment creature token that's tapped and attacking that player.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_e_glimmer | TokenOwner$ You | TokenTapped$ True | TokenAttacking$ TriggeredAttackedTarget
-SVar:PlayMain1:TRUE
-Oracle:Flying\nOther enchantment creatures you control have flying.\nWhenever you attack a player, create a 1/1 white Glimmer enchantment creature token that's tapped and attacking that player.
\ No newline at end of file
+Name:Soaring Lightbringer
+ManaCost:4 W
+Types:Enchantment Creature Bird Glimmer
+PT:4/5
+K:Flying
+S:Mode$ Continuous | Affected$ Enchantment.Creature+Other+YouCtrl | AddKeyword$ Flying | Description$ Other enchantment creatures you control have flying.
+T:Mode$ AttackersDeclaredOneTarget | ValidAttackers$ Creature.YouCtrl | AttackedTarget$ Player | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack a player, create a 1/1 white Glimmer enchantment creature token that's tapped and attacking that player.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_e_glimmer | TokenOwner$ You | TokenTapped$ True | TokenAttacking$ TriggeredAttackedTarget
+SVar:PlayMain1:TRUE
+Oracle:Flying\nOther enchantment creatures you control have flying.\nWhenever you attack a player, create a 1/1 white Glimmer enchantment creature token that's tapped and attacking that player.
diff --git a/forge-gui/res/cardsfolder/upcoming/spectral_snatcher.txt b/forge-gui/res/cardsfolder/upcoming/spectral_snatcher.txt
index 5f34b72b1a5..264df4f0035 100644
--- a/forge-gui/res/cardsfolder/upcoming/spectral_snatcher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/spectral_snatcher.txt
@@ -1,7 +1,7 @@
-Name:Spectral Snatcher
-ManaCost:4 B B
-Types:Creature Spirit
-PT:6/5
-K:Ward:Discard<1/Card>
-K:TypeCycling:Swamp:2
-Oracle:Ward—Discard a card. (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player discards a card.)\nSwampcycling {2} ({2}, Discard this card: Search your library for a Swamp card, reveal it, put it into your hand, then shuffle.)
\ No newline at end of file
+Name:Spectral Snatcher
+ManaCost:4 B B
+Types:Creature Spirit
+PT:6/5
+K:Ward:Discard<1/Card>
+K:TypeCycling:Swamp:2
+Oracle:Ward—Discard a card. (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player discards a card.)\nSwampcycling {2} ({2}, Discard this card: Search your library for a Swamp card, reveal it, put it into your hand, then shuffle.)
diff --git a/forge-gui/res/cardsfolder/upcoming/spineseeker_centipede.txt b/forge-gui/res/cardsfolder/upcoming/spineseeker_centipede.txt
index aabaac59537..b68d24a3faa 100644
--- a/forge-gui/res/cardsfolder/upcoming/spineseeker_centipede.txt
+++ b/forge-gui/res/cardsfolder/upcoming/spineseeker_centipede.txt
@@ -1,10 +1,10 @@
-Name:Spineseeker Centipede
-ManaCost:2 G
-Types:Creature Insect
-PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 2 | AddKeyword$ Vigilance | Condition$ Delirium | Description$ Delirium — CARDNAME gets +1/+2 and has vigilance as long as there are four or more card types among cards in your graveyard.
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:When Spineseeker Centipede enters, search your library for a basic land card, reveal it, put it into your hand, then shuffle.\nDelirium — Spineseeker Centipede gets +1/+2 and has vigilance as long as there are four or more card types among cards in your graveyard.
+Name:Spineseeker Centipede
+ManaCost:2 G
+Types:Creature Insect
+PT:2/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 2 | AddKeyword$ Vigilance | Condition$ Delirium | Description$ Delirium — CARDNAME gets +1/+2 and has vigilance as long as there are four or more card types among cards in your graveyard.
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:When Spineseeker Centipede enters, search your library for a basic land card, reveal it, put it into your hand, then shuffle.\nDelirium — Spineseeker Centipede gets +1/+2 and has vigilance as long as there are four or more card types among cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/split_up.txt b/forge-gui/res/cardsfolder/upcoming/split_up.txt
index d7a52f15643..a69077aed84 100644
--- a/forge-gui/res/cardsfolder/upcoming/split_up.txt
+++ b/forge-gui/res/cardsfolder/upcoming/split_up.txt
@@ -1,7 +1,7 @@
-Name:Split Up
-ManaCost:1 W W
-Types:Sorcery
-A:SP$ Charm | Choices$ DBDestroyAll,DBDestroyAll2
-SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.tapped | SpellDescription$ Destroy all tapped creatures.
-SVar:DBDestroyAll2:DB$ DestroyAll | ValidCards$ Creature.untapped | SpellDescription$ Destroy all untapped creatures.
-Oracle:Choose one —\n• Destroy all tapped creatures.\n• Destroy all untapped creatures.
\ No newline at end of file
+Name:Split Up
+ManaCost:1 W W
+Types:Sorcery
+A:SP$ Charm | Choices$ DBDestroyAll,DBDestroyAll2
+SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.tapped | SpellDescription$ Destroy all tapped creatures.
+SVar:DBDestroyAll2:DB$ DestroyAll | ValidCards$ Creature.untapped | SpellDescription$ Destroy all untapped creatures.
+Oracle:Choose one —\n• Destroy all tapped creatures.\n• Destroy all untapped creatures.
diff --git a/forge-gui/res/cardsfolder/upcoming/splitskin_doll.txt b/forge-gui/res/cardsfolder/upcoming/splitskin_doll.txt
index c4aad4dd721..99456881658 100644
--- a/forge-gui/res/cardsfolder/upcoming/splitskin_doll.txt
+++ b/forge-gui/res/cardsfolder/upcoming/splitskin_doll.txt
@@ -1,8 +1,8 @@
-Name:Splitskin Doll
-ManaCost:1 W
-Types:Artifact Creature Toy
-PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card. Then discard a card unless you control another creature with power 2 or less.
-SVar:TrigDraw:DB$ Draw | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$ Discard | NumCards$ 1 | Mode$ TgtChoose | ConditionPresent$ Creature.Other+YouCtrl+powerLE2 | ConditionCompare$ EQ0
-Oracle:When Splitskin Doll enters, draw a card. Then discard a card unless you control another creature with power 2 or less.
+Name:Splitskin Doll
+ManaCost:1 W
+Types:Artifact Creature Toy
+PT:2/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card. Then discard a card unless you control another creature with power 2 or less.
+SVar:TrigDraw:DB$ Draw | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | NumCards$ 1 | Mode$ TgtChoose | ConditionPresent$ Creature.Other+YouCtrl+powerLE2 | ConditionCompare$ EQ0
+Oracle:When Splitskin Doll enters, draw a card. Then discard a card unless you control another creature with power 2 or less.
diff --git a/forge-gui/res/cardsfolder/upcoming/sporogenic_infection.txt b/forge-gui/res/cardsfolder/upcoming/sporogenic_infection.txt
index 4cae7a13b7d..cb53aa7b274 100644
--- a/forge-gui/res/cardsfolder/upcoming/sporogenic_infection.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sporogenic_infection.txt
@@ -1,13 +1,13 @@
-Name:Sporogenic Infection
-ManaCost:1 B
-Types:Enchantment Aura
-K:Enchant creature
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacrifice | TriggerDescription$ When CARDNAME enters, target player sacrifices a creature other than enchanted creature.
-SVar:TrigSacrifice:DB$ Sacrifice | ValidTgts$ Player | SacValid$ Creature.!EnchantedBy | SacMessage$ creature other than enchanted creature
-A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddSVar$ MortalDestroy
-SVar:MortalDestroy:SVar:DestroyWhenDamaged:True
-T:Mode$ DamageDoneOnce | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
-SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTargetLKICopy
-SVar:NonStackingAttachEffect:True
-Oracle:Enchant creature\nWhen Sporogenic Infection enters, target player sacrifices a creature other than enchanted creature.\nWhen enchanted creature is dealt damage, destroy it.
\ No newline at end of file
+Name:Sporogenic Infection
+ManaCost:1 B
+Types:Enchantment Aura
+K:Enchant creature
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacrifice | TriggerDescription$ When CARDNAME enters, target player sacrifices a creature other than enchanted creature.
+SVar:TrigSacrifice:DB$ Sacrifice | ValidTgts$ Player | SacValid$ Creature.!EnchantedBy | SacMessage$ creature other than enchanted creature
+A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Curse
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddSVar$ MortalDestroy
+SVar:MortalDestroy:SVar:DestroyWhenDamaged:True
+T:Mode$ DamageDoneOnce | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
+SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTargetLKICopy
+SVar:NonStackingAttachEffect:True
+Oracle:Enchant creature\nWhen Sporogenic Infection enters, target player sacrifices a creature other than enchanted creature.\nWhen enchanted creature is dealt damage, destroy it.
diff --git a/forge-gui/res/cardsfolder/upcoming/stalked_researcher.txt b/forge-gui/res/cardsfolder/upcoming/stalked_researcher.txt
index 30e6371f87d..5092a4a8936 100644
--- a/forge-gui/res/cardsfolder/upcoming/stalked_researcher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/stalked_researcher.txt
@@ -1,11 +1,11 @@
-Name:Stalked Researcher
-ManaCost:1 U
-Types:Creature Human Wizard
-PT:3/3
-K:Defender
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigEffect | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME can attack this turn as though it didn't have defender.
-T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigEffect | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME can attack this turn as though it didn't have defender.
-SVar:TrigEffect:DB$ Effect | StaticAbilities$ CanAttack | ForgetOnMoved$ Battlefield
-SVar:CanAttack:Mode$ CanAttackDefender | ValidCard$ Card.EffectSource | Description$ EFFECTSOURCE can attack this turn as though it didn't have defender.
-DeckNeeds:Type$Enchantment
-Oracle:Defender\nEerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, Stalker Researcher can attack this turn as though it didn't have defender.
+Name:Stalked Researcher
+ManaCost:1 U
+Types:Creature Human Wizard
+PT:3/3
+K:Defender
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigEffect | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME can attack this turn as though it didn't have defender.
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigEffect | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME can attack this turn as though it didn't have defender.
+SVar:TrigEffect:DB$ Effect | StaticAbilities$ CanAttack | ForgetOnMoved$ Battlefield
+SVar:CanAttack:Mode$ CanAttackDefender | ValidCard$ Card.EffectSource | Description$ EFFECTSOURCE can attack this turn as though it didn't have defender.
+DeckNeeds:Type$Enchantment
+Oracle:Defender\nEerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, Stalker Researcher can attack this turn as though it didn't have defender.
diff --git a/forge-gui/res/cardsfolder/upcoming/stay_hidden_stay_silent.txt b/forge-gui/res/cardsfolder/upcoming/stay_hidden_stay_silent.txt
index 6119653662a..d0ddb898be9 100644
--- a/forge-gui/res/cardsfolder/upcoming/stay_hidden_stay_silent.txt
+++ b/forge-gui/res/cardsfolder/upcoming/stay_hidden_stay_silent.txt
@@ -1,10 +1,10 @@
-Name:Stay Hidden, Stay Silent
-ManaCost:1 U
-Types:Enchantment Aura
-A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ KeepTapped
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
-SVar:TrigTap:DB$ Tap | Defined$ Enchanted
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
-A:AB$ ChangeZone | Cost$ 4 U U | Origin$ Battlefield | Destination$ Library | Shuffle$ True | Defined$ Enchanted | SorcerySpeed$ True | SubAbility$ DBDread | SpellDescription$ Shuffle enchanted creature into its owner's library, then manifest dread. Activate only as a sorcery.
-SVar:DBDread:DB$ ManifestDread
-Oracle:Enchant creature\nWhen Stay Hidden, Stay Silent enters, tap enchanted creature.\nEnchanted creature doesn't untap during its controller's untap step.\n{4}{U}{U}: Shuffle enchanted creature into its owner's library, then manifest dread. Activate only as a sorcery.
\ No newline at end of file
+Name:Stay Hidden, Stay Silent
+ManaCost:1 U
+Types:Enchantment Aura
+A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ KeepTapped
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
+SVar:TrigTap:DB$ Tap | Defined$ Enchanted
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
+A:AB$ ChangeZone | Cost$ 4 U U | Origin$ Battlefield | Destination$ Library | Shuffle$ True | Defined$ Enchanted | SorcerySpeed$ True | SubAbility$ DBDread | SpellDescription$ Shuffle enchanted creature into its owner's library, then manifest dread. Activate only as a sorcery.
+SVar:DBDread:DB$ ManifestDread
+Oracle:Enchant creature\nWhen Stay Hidden, Stay Silent enters, tap enchanted creature.\nEnchanted creature doesn't untap during its controller's untap step.\n{4}{U}{U}: Shuffle enchanted creature into its owner's library, then manifest dread. Activate only as a sorcery.