diff --git a/forge-gui/res/cardsfolder/upcoming/strangled_cemetery.txt b/forge-gui/res/cardsfolder/upcoming/strangled_cemetery.txt
index 06641d6bf22..a5d7dad28fb 100644
--- a/forge-gui/res/cardsfolder/upcoming/strangled_cemetery.txt
+++ b/forge-gui/res/cardsfolder/upcoming/strangled_cemetery.txt
@@ -1,8 +1,8 @@
-Name:Strangled Cemetery
-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 G | SpellDescription$ Add {B} or {G}.
-Oracle:Strangled Cemetery enters tapped unless a player has 13 or less life.\n{T}: Add {B} or {G}.
+Name:Strangled Cemetery
+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 G | SpellDescription$ Add {B} or {G}.
+Oracle:Strangled Cemetery enters tapped unless a player has 13 or less life.\n{T}: Add {B} or {G}.
diff --git a/forge-gui/res/cardsfolder/upcoming/suspended_sentence.txt b/forge-gui/res/cardsfolder/upcoming/suspended_sentence.txt
index 71b652b45d8..8e2491cb5d1 100644
--- a/forge-gui/res/cardsfolder/upcoming/suspended_sentence.txt
+++ b/forge-gui/res/cardsfolder/upcoming/suspended_sentence.txt
@@ -1,8 +1,8 @@
-Name:Suspended Sentence
-ManaCost:3 B
-Types:Instant
-K:Suspend:3:1 B
-A:SP$ Destroy | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature an opponent controls. That player loses 3 life. Exile CARDNAME with three time counters on it.
-SVar:DBLoseLife:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ 3 | SubAbility$ DBChange
-SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | WithCountersType$ TIME | WithCountersAmount$ 3
-Oracle:Destroy target creature an opponent controls. That player loses 3 life. Exile Suspended Sentence with three time counters on it.\nSuspend 3—{1}{B} (Rather than cast this card from your hand, pay {1}{B} and exile it with three time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, you may cast it without paying its mana cost.)
+Name:Suspended Sentence
+ManaCost:3 B
+Types:Instant
+K:Suspend:3:1 B
+A:SP$ Destroy | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature an opponent controls. That player loses 3 life. Exile CARDNAME with three time counters on it.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ 3 | SubAbility$ DBChange
+SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | WithCountersType$ TIME | WithCountersAmount$ 3
+Oracle:Destroy target creature an opponent controls. That player loses 3 life. Exile Suspended Sentence with three time counters on it.\nSuspend 3—{1}{B} (Rather than cast this card from your hand, pay {1}{B} and exile it with three time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, you may cast it without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/upcoming/the_jolly_balloon_man.txt b/forge-gui/res/cardsfolder/upcoming/the_jolly_balloon_man.txt
index 3fbf148f497..f5e3c3dbd97 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_jolly_balloon_man.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_jolly_balloon_man.txt
@@ -1,8 +1,8 @@
-Name:The Jolly Balloon Man
-ManaCost:1 R W
-Types:Legendary Creature Human Clown
-PT:1/4
-K:Haste
-A:AB$ CopyPermanent | Cost$ 1 T | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | SetPower$ 1 | SetToughness$ 1 | AddTypes$ Creature & Balloon | AddColors$ Red | AddKeywords$ Flying & Haste | SorcerySpeed$ True | AtEOT$ Sacrifice | AILogic$ BeforeCombat | SpellDescription$ Create a token that's a copy of another target creature you control, except it's a 1/1 red Balloon creature in addition to its other colors and types and it has flying and haste. Sacrifice it at the beginning of the next end step. Activate only as a sorcery.
-SVar:UntapMe:True
-Oracle:Haste\n{1}, {T}: Create a token that's a copy of another target creature you control, except it's a 1/1 red Balloon creature in addition to its other colors and types and it has flying and haste. Sacrifice it at the beginning of the next end step. Activate only as a sorcery.
\ No newline at end of file
+Name:The Jolly Balloon Man
+ManaCost:1 R W
+Types:Legendary Creature Human Clown
+PT:1/4
+K:Haste
+A:AB$ CopyPermanent | Cost$ 1 T | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | SetPower$ 1 | SetToughness$ 1 | AddTypes$ Creature & Balloon | AddColors$ Red | AddKeywords$ Flying & Haste | SorcerySpeed$ True | AtEOT$ Sacrifice | AILogic$ BeforeCombat | SpellDescription$ Create a token that's a copy of another target creature you control, except it's a 1/1 red Balloon creature in addition to its other colors and types and it has flying and haste. Sacrifice it at the beginning of the next end step. Activate only as a sorcery.
+SVar:UntapMe:True
+Oracle:Haste\n{1}, {T}: Create a token that's a copy of another target creature you control, except it's a 1/1 red Balloon creature in addition to its other colors and types and it has flying and haste. Sacrifice it at the beginning of the next end step. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_lord_of_pain.txt b/forge-gui/res/cardsfolder/upcoming/the_lord_of_pain.txt
index 29b61cad008..7dd018f6d2f 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_lord_of_pain.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_lord_of_pain.txt
@@ -1,10 +1,10 @@
-Name:The Lord of Pain
-ManaCost:3 B R
-Types:Legendary Creature Human Assassin
-PT:5/5
-K:Menace
-S:Mode$ CantGainLife | ValidPlayer$ Player.Opponent | Description$ Your opponents can't gain life.
-T:Mode$ SpellCast | ValidActivatingPlayer$ Player | ActivatorThisTurnCast$ EQ1 | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player casts their first spell each turn, choose another target player. CARDNAME deals damage equal to that spell's mana value to the chosen player.
-SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Player.!TriggeredActivator | NumDmg$ X
-SVar:X:TriggeredStackInstance$CardManaCostLKI
-Oracle:Menace\nYour opponents can't gain life.\nWhenever a player casts their first spell each turn, choose another target player. The Lord of Pain deals damage equal to that spell's mana value to the chosen player.
+Name:The Lord of Pain
+ManaCost:3 B R
+Types:Legendary Creature Human Assassin
+PT:5/5
+K:Menace
+S:Mode$ CantGainLife | ValidPlayer$ Player.Opponent | Description$ Your opponents can't gain life.
+T:Mode$ SpellCast | ValidActivatingPlayer$ Player | ActivatorThisTurnCast$ EQ1 | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player casts their first spell each turn, choose another target player. CARDNAME deals damage equal to that spell's mana value to the chosen player.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Player.!TriggeredActivator | NumDmg$ X
+SVar:X:TriggeredStackInstance$CardManaCostLKI
+Oracle:Menace\nYour opponents can't gain life.\nWhenever a player casts their first spell each turn, choose another target player. The Lord of Pain deals damage equal to that spell's mana value to the chosen player.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_master_of_keys.txt b/forge-gui/res/cardsfolder/upcoming/the_master_of_keys.txt
index 49bc75d10a9..169ae1133c8 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_master_of_keys.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_master_of_keys.txt
@@ -1,12 +1,12 @@
-Name:The Master of Keys
-ManaCost:X W U B
-Types:Legendary Enchantment Creature Horror
-PT:3/3
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, put X +1/+1 counters on it and mill twice X cards.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBMill
-SVar:DBMill:DB$ Mill | NumCards$ Y
-S:Mode$ Continuous | Affected$ Enchantment.YouOwn | AffectedZone$ Graveyard | AddKeyword$ Escape:CardManaCost ExileFromGrave<3/Card.Other/other> | Description$ Each enchantment card in your graveyard has escape. The escape cost is equal to the card's mana cost plus exile three other cards from your graveyard. (You may cast cards from your graveyard for their escape cost.)
-SVar:X:Count$xPaid
-SVar:Y:SVar$X/Twice
-Oracle:Flying\nWhen The Master of Keys enters, put X +1/+1 counters on it and mill twice X cards.\nEach enchantment card in your graveyard has escape. The escape cost is equal to the card's mana cost plus exile three other cards from your graveyard. (You may cast cards from your graveyard for their escape cost.)
+Name:The Master of Keys
+ManaCost:X W U B
+Types:Legendary Enchantment Creature Horror
+PT:3/3
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, put X +1/+1 counters on it and mill twice X cards.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBMill
+SVar:DBMill:DB$ Mill | NumCards$ Y
+S:Mode$ Continuous | Affected$ Enchantment.YouOwn | AffectedZone$ Graveyard | AddKeyword$ Escape:CardManaCost ExileFromGrave<3/Card.Other/other> | Description$ Each enchantment card in your graveyard has escape. The escape cost is equal to the card's mana cost plus exile three other cards from your graveyard. (You may cast cards from your graveyard for their escape cost.)
+SVar:X:Count$xPaid
+SVar:Y:SVar$X/Twice
+Oracle:Flying\nWhen The Master of Keys enters, put X +1/+1 counters on it and mill twice X cards.\nEach enchantment card in your graveyard has escape. The escape cost is equal to the card's mana cost plus exile three other cards from your graveyard. (You may cast cards from your graveyard for their escape cost.)
diff --git a/forge-gui/res/cardsfolder/upcoming/the_mindskinner.txt b/forge-gui/res/cardsfolder/upcoming/the_mindskinner.txt
index 9af7a86b878..fce38f7d439 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_mindskinner.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_mindskinner.txt
@@ -1,9 +1,9 @@
-Name:The Mindskinner
-ManaCost:U U U
-Types:Legendary Enchantment Creature Nightmare
-PT:10/1
-S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ValidTarget$ Opponent | ReplaceWith$ Mill | PreventionEffect$ True | ExecuteMode$ PerTarget | Description$ If a source you control would deal damage to an opponent, prevent that damage and each opponent mills that many cards.
-SVar:Mill:DB$ Mill | Defined$ Opponent | NumCards$ X
-SVar:X:ReplaceCount$DamageAmount
-Oracle:The Mindskinner can't be blocked.\nIf a source you control would deal damage to an opponent, prevent that damage and each opponent mills that many cards.
\ No newline at end of file
+Name:The Mindskinner
+ManaCost:U U U
+Types:Legendary Enchantment Creature Nightmare
+PT:10/1
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ValidTarget$ Opponent | ReplaceWith$ Mill | PreventionEffect$ True | ExecuteMode$ PerTarget | Description$ If a source you control would deal damage to an opponent, prevent that damage and each opponent mills that many cards.
+SVar:Mill:DB$ Mill | Defined$ Opponent | NumCards$ X
+SVar:X:ReplaceCount$DamageAmount
+Oracle:The Mindskinner can't be blocked.\nIf a source you control would deal damage to an opponent, prevent that damage and each opponent mills that many cards.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_rollercrusher_ride.txt b/forge-gui/res/cardsfolder/upcoming/the_rollercrusher_ride.txt
index 3cf72e820ed..8548856600d 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_rollercrusher_ride.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_rollercrusher_ride.txt
@@ -1,9 +1,9 @@
-Name:The Rollercrusher Ride
-ManaCost:X 2 R
-Types:Legendary Enchantment
-R:Event$ DamageDone | Delirium$ True | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ValidTarget$ Permanent,Player | IsCombat$ False | ReplaceWith$ DamageReplace | Description$ Delirium — If a source you control would deal noncombat damage to a permanent or player while there are four or more card types among cards in your graveyard, it deals double that damage instead.
-SVar:DamageReplace:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ ReplaceCount$DamageAmount/Twice
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters, it deals X damage to each of up to X target creatures.
-SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ X | NumDmg$ X
-SVar:X:Count$xPaid
-Oracle:Delirium — If a source you control would deal noncombat damage to a permanent or player while there are four or more card types among cards in your graveyard, it deals double that damage instead.\nWhen The Rollercrusher Ride enters, it deals X damage to each of up to X target creatures.
\ No newline at end of file
+Name:The Rollercrusher Ride
+ManaCost:X 2 R
+Types:Legendary Enchantment
+R:Event$ DamageDone | Delirium$ True | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ValidTarget$ Permanent,Player | IsCombat$ False | ReplaceWith$ DamageReplace | Description$ Delirium — If a source you control would deal noncombat damage to a permanent or player while there are four or more card types among cards in your graveyard, it deals double that damage instead.
+SVar:DamageReplace:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ ReplaceCount$DamageAmount/Twice
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters, it deals X damage to each of up to X target creatures.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ X | NumDmg$ X
+SVar:X:Count$xPaid
+Oracle:Delirium — If a source you control would deal noncombat damage to a permanent or player while there are four or more card types among cards in your graveyard, it deals double that damage instead.\nWhen The Rollercrusher Ride enters, it deals X damage to each of up to X target creatures.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_swarmweaver.txt b/forge-gui/res/cardsfolder/upcoming/the_swarmweaver.txt
index 894422d0d0a..28770f02bcf 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_swarmweaver.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_swarmweaver.txt
@@ -1,10 +1,10 @@
-Name:The Swarmweaver
-ManaCost:2 B G
-Types:Legendary Artifact Creature Scarecrow
-PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create two 1/1 black and green Insect creature tokens with flying.
-SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ bg_1_1_insect_flying | TokenOwner$ You
-S:Mode$ Continuous | Condition$ Delirium | Affected$ Insect.YouCtrl,Spider.YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Deathtouch | Description$ Delirium — As long as there are four or more card types among cards in your graveyard, Insects and Spiders you control get +1/+1 and have deathtouch.
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:When The Swarmweaver enters, create two 1/1 black and green Insect creature tokens with flying.\nDelirium — As long as there are four or more card types among cards in your graveyard, Insects and Spiders you control get +1/+1 and have deathtouch.
\ No newline at end of file
+Name:The Swarmweaver
+ManaCost:2 B G
+Types:Legendary Artifact Creature Scarecrow
+PT:2/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create two 1/1 black and green Insect creature tokens with flying.
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ bg_1_1_insect_flying | TokenOwner$ You
+S:Mode$ Continuous | Condition$ Delirium | Affected$ Insect.YouCtrl,Spider.YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Deathtouch | Description$ Delirium — As long as there are four or more card types among cards in your graveyard, Insects and Spiders you control get +1/+1 and have deathtouch.
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:When The Swarmweaver enters, create two 1/1 black and green Insect creature tokens with flying.\nDelirium — As long as there are four or more card types among cards in your graveyard, Insects and Spiders you control get +1/+1 and have deathtouch.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_tale_of_tamiyo.txt b/forge-gui/res/cardsfolder/upcoming/the_tale_of_tamiyo.txt
index d12f5317b61..3487d92b346 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_tale_of_tamiyo.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_tale_of_tamiyo.txt
@@ -1,15 +1,15 @@
-Name:The Tale of Tamiyo
-ManaCost:2 U
-Types:Legendary Enchantment Saga
-K:Chapter:4:DBRepeat,DBRepeat,DBRepeat,DBChangeZone
-SVar:DBRepeat:DB$ Repeat | RepeatSubAbility$ DBCleanAndGrind | MaxRepeat$ MaxRepeats | RepeatCheckSVar$ MilledSharesType | RepeatSVarCompare$ GE2 | SubAbility$ DBCleanup | SpellDescription$ Mill two cards. If two cards that share a card type were milled this way, draw a card and repeat this process.
-SVar:DBCleanAndGrind:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBGrind
-SVar:DBGrind:DB$ Mill | NumCards$ 2 | NoReveal$ True | RememberMilled$ True | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ MilledSharesType | ConditionSVarCompare$ GE2
-SVar:MaxRepeats:Count$InYourLibrary
-SVar:MilledSharesType:Remembered$Valid Card.sharesCardTypeWithOther Remembered
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ Yard | TgtPrompt$ Select any number of target instant, sorcery, and/or Tamiyo planeswalker cards in your graveyard | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn,Planeswalker.Tamiyo+YouOwn | RememberChanged$ True | SubAbility$ DBPlay | StackDescription$ SpellDescription | SpellDescription$ Exile any number of target instant, sorcery, and/or Tamiyo planeswalker cards from your graveyard. Copy them. You may cast any number of the copies.
-SVar:DBPlay:DB$ Play | Valid$ Card.IsRemembered | ValidZone$ Exile | Controller$ You | CopyCard$ True | ValidSA$ Spell | Optional$ True | Amount$ All | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:Yard:Count$InYourYard
-Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after IV.)\nI, II, III — Mill two cards. If two cards that share a card type were milled this way, draw a card and repeat this process.\nIV — Exile any number of target instant, sorcery, and/or Tamiyo planeswalker cards from your graveyard. Copy them. You may cast any number of the copies.
+Name:The Tale of Tamiyo
+ManaCost:2 U
+Types:Legendary Enchantment Saga
+K:Chapter:4:DBRepeat,DBRepeat,DBRepeat,DBChangeZone
+SVar:DBRepeat:DB$ Repeat | RepeatSubAbility$ DBCleanAndGrind | MaxRepeat$ MaxRepeats | RepeatCheckSVar$ MilledSharesType | RepeatSVarCompare$ GE2 | SubAbility$ DBCleanup | SpellDescription$ Mill two cards. If two cards that share a card type were milled this way, draw a card and repeat this process.
+SVar:DBCleanAndGrind:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBGrind
+SVar:DBGrind:DB$ Mill | NumCards$ 2 | NoReveal$ True | RememberMilled$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ MilledSharesType | ConditionSVarCompare$ GE2
+SVar:MaxRepeats:Count$InYourLibrary
+SVar:MilledSharesType:Remembered$Valid Card.sharesCardTypeWithOther Remembered
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ Yard | TgtPrompt$ Select any number of target instant, sorcery, and/or Tamiyo planeswalker cards in your graveyard | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn,Planeswalker.Tamiyo+YouOwn | RememberChanged$ True | SubAbility$ DBPlay | StackDescription$ SpellDescription | SpellDescription$ Exile any number of target instant, sorcery, and/or Tamiyo planeswalker cards from your graveyard. Copy them. You may cast any number of the copies.
+SVar:DBPlay:DB$ Play | Valid$ Card.IsRemembered | ValidZone$ Exile | Controller$ You | CopyCard$ True | ValidSA$ Spell | Optional$ True | Amount$ All | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:Yard:Count$InYourYard
+Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after IV.)\nI, II, III — Mill two cards. If two cards that share a card type were milled this way, draw a card and repeat this process.\nIV — Exile any number of target instant, sorcery, and/or Tamiyo planeswalker cards from your graveyard. Copy them. You may cast any number of the copies.
diff --git a/forge-gui/res/cardsfolder/upcoming/they_came_from_the_pipes.txt b/forge-gui/res/cardsfolder/upcoming/they_came_from_the_pipes.txt
index 0ae12d6313b..9774e78d04e 100644
--- a/forge-gui/res/cardsfolder/upcoming/they_came_from_the_pipes.txt
+++ b/forge-gui/res/cardsfolder/upcoming/they_came_from_the_pipes.txt
@@ -1,8 +1,8 @@
-Name:They Came from the Pipes
-ManaCost:4 U
-Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, 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 | Amount$ 2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.faceDown+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a face-down creature you control enters, draw a card.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
-Oracle:When They Came from the Pipes enters, manifest dread twice. (To 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.)\nWhenever a face-down creature you control enters, draw a card.
+Name:They Came from the Pipes
+ManaCost:4 U
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, 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 | Amount$ 2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.faceDown+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a face-down creature you control enters, draw a card.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+Oracle:When They Came from the Pipes enters, manifest dread twice. (To 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.)\nWhenever a face-down creature you control enters, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/thornspire_verge.txt b/forge-gui/res/cardsfolder/upcoming/thornspire_verge.txt
index 82c1f146df5..5490182272f 100644
--- a/forge-gui/res/cardsfolder/upcoming/thornspire_verge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thornspire_verge.txt
@@ -1,6 +1,6 @@
-Name:Thornspire Verge
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
-A:AB$ Mana | Cost$ T | Produced$ G | IsPresent$ Mountain.YouCtrl,Forest.YouCtrl | SpellDescription$ Add {G}. Activate only if you control a Mountain or a Forest.
-Oracle:{T}: Add {R}.\n{T}: Add {G}. Activate only if you control a Mountain or a Forest.
\ No newline at end of file
+Name:Thornspire Verge
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | IsPresent$ Mountain.YouCtrl,Forest.YouCtrl | SpellDescription$ Add {G}. Activate only if you control a Mountain or a Forest.
+Oracle:{T}: Add {R}.\n{T}: Add {G}. Activate only if you control a Mountain or a Forest.
diff --git a/forge-gui/res/cardsfolder/upcoming/threats_around_every_corner.txt b/forge-gui/res/cardsfolder/upcoming/threats_around_every_corner.txt
index dafa83df17e..7225071fc54 100644
--- a/forge-gui/res/cardsfolder/upcoming/threats_around_every_corner.txt
+++ b/forge-gui/res/cardsfolder/upcoming/threats_around_every_corner.txt
@@ -1,8 +1,8 @@
-Name:Threats Around Every Corner
-ManaCost:3 G
-Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, manifest dread.
-SVar:TrigDread:DB$ ManifestDread
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Permanent.faceDown+YouCtrl | Execute$ TrigChange | TriggerZones$ Battlefield | TriggerDescription$ Whenever a face-down permanent you control enters, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
-Oracle:When Threats Around Every Corner enters, manifest dread.\nWhenever a face-down permanent you control enters, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+Name:Threats Around Every Corner
+ManaCost:3 G
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, manifest dread.
+SVar:TrigDread:DB$ ManifestDread
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Permanent.faceDown+YouCtrl | Execute$ TrigChange | TriggerZones$ Battlefield | TriggerDescription$ Whenever a face-down permanent you control enters, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
+Oracle:When Threats Around Every Corner enters, manifest dread.\nWhenever a face-down permanent you control enters, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/trapped_in_the_screen.txt b/forge-gui/res/cardsfolder/upcoming/trapped_in_the_screen.txt
index 72d8ed346ae..b129d137e81 100644
--- a/forge-gui/res/cardsfolder/upcoming/trapped_in_the_screen.txt
+++ b/forge-gui/res/cardsfolder/upcoming/trapped_in_the_screen.txt
@@ -1,8 +1,8 @@
-Name:Trapped in the Screen
-ManaCost:2 W
-Types:Enchantment
-K:Ward:2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile target artifact, creature, or enchantment an opponent controls until CARDNAME leaves the battlefield.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Artifact.OppCtrl,Creature.OppCtrl,Enchantment.OppCtrl | TgtPrompt$ Select target artifact, creature, or enchantment an opponent controls | Duration$ UntilHostLeavesPlay
-SVar:PlayMain1:TRUE
-Oracle:Ward {2} (Whenever this enchantment becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nWhen Trapped in the Screen enters, exile target artifact, creature, or enchantment an opponent controls until Trapped in the Screen leaves the battlefield.
\ No newline at end of file
+Name:Trapped in the Screen
+ManaCost:2 W
+Types:Enchantment
+K:Ward:2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile target artifact, creature, or enchantment an opponent controls until CARDNAME leaves the battlefield.
+SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Artifact.OppCtrl,Creature.OppCtrl,Enchantment.OppCtrl | TgtPrompt$ Select target artifact, creature, or enchantment an opponent controls | Duration$ UntilHostLeavesPlay
+SVar:PlayMain1:TRUE
+Oracle:Ward {2} (Whenever this enchantment becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nWhen Trapped in the Screen enters, exile target artifact, creature, or enchantment an opponent controls until Trapped in the Screen leaves the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/trial_of_agony.txt b/forge-gui/res/cardsfolder/upcoming/trial_of_agony.txt
index 2c5596fadc0..14aa709be91 100644
--- a/forge-gui/res/cardsfolder/upcoming/trial_of_agony.txt
+++ b/forge-gui/res/cardsfolder/upcoming/trial_of_agony.txt
@@ -1,9 +1,9 @@
-Name:Trial of Agony
-ManaCost:R
-Types:Sorcery
-A:SP$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select two target creatures controlled by the same opponent | TargetMin$ 2 | TargetMax$ 2 | TargetsFromSingleZone$ True | IsCurse$ True | RememberTargets$ True | SubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Choose two target creatures controlled by the same opponent. That player chooses one of those creatures. CARDNAME deals 5 damage to that creature, and the other can't block this turn.
-SVar:DBChoose:DB$ ChooseCard | Defined$ TargetedController | Mandatory$ True | Choices$ Creature.IsRemembered | ChoiceTitle$ Choose one to take 5 damage | ForgetChosen$ True | SubAbility$ DBDealDamage
-SVar:DBDealDamage:DB$ DealDamage | NumDmg$ 5 | Defined$ ChosenCard | SubAbility$ DBCantBlock
-SVar:DBCantBlock:DB$ Pump | Defined$ Remembered | KW$ HIDDEN CARDNAME can't block. | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Choose two target creatures controlled by the same opponent. That player chooses one of those creatures. Trial of Agony deals 5 damage to that creature, and the other can't block this turn.
+Name:Trial of Agony
+ManaCost:R
+Types:Sorcery
+A:SP$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select two target creatures controlled by the same opponent | TargetMin$ 2 | TargetMax$ 2 | TargetsFromSingleZone$ True | IsCurse$ True | RememberTargets$ True | SubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Choose two target creatures controlled by the same opponent. That player chooses one of those creatures. CARDNAME deals 5 damage to that creature, and the other can't block this turn.
+SVar:DBChoose:DB$ ChooseCard | Defined$ TargetedController | Mandatory$ True | Choices$ Creature.IsRemembered | ChoiceTitle$ Choose one to take 5 damage | ForgetChosen$ True | SubAbility$ DBDealDamage
+SVar:DBDealDamage:DB$ DealDamage | NumDmg$ 5 | Defined$ ChosenCard | SubAbility$ DBCantBlock
+SVar:DBCantBlock:DB$ Pump | Defined$ Remembered | KW$ HIDDEN CARDNAME can't block. | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Choose two target creatures controlled by the same opponent. That player chooses one of those creatures. Trial of Agony deals 5 damage to that creature, and the other can't block this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/tunnel_surveyor.txt b/forge-gui/res/cardsfolder/upcoming/tunnel_surveyor.txt
index a951ee950e1..08350413500 100644
--- a/forge-gui/res/cardsfolder/upcoming/tunnel_surveyor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tunnel_surveyor.txt
@@ -1,7 +1,7 @@
-Name:Tunnel Surveyor
-ManaCost:2 U
-Types:Creature Human Detective
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 white Glimmer enchantment creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_e_glimmer | TokenOwner$ You
-Oracle:When Tunnel Surveyor enters, create a 1/1 white Glimmer enchantment creature token.
\ No newline at end of file
+Name:Tunnel Surveyor
+ManaCost:2 U
+Types:Creature Human Detective
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 white Glimmer enchantment creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_e_glimmer | TokenOwner$ You
+Oracle:When Tunnel Surveyor enters, create a 1/1 white Glimmer enchantment creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/turn_inside_out.txt b/forge-gui/res/cardsfolder/upcoming/turn_inside_out.txt
index f008508581d..9e71af3c884 100644
--- a/forge-gui/res/cardsfolder/upcoming/turn_inside_out.txt
+++ b/forge-gui/res/cardsfolder/upcoming/turn_inside_out.txt
@@ -1,7 +1,7 @@
-Name:Turn Inside Out
-ManaCost:R
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | SubAbility$ DBDelayedTrigger | SpellDescription$ Target creature gets +3/+0 until end of turn.
-SVar:DBDelayedTrigger:DB$ DelayedTrigger | Mode$ ChangesZone | RememberObjects$ Targeted | ValidCard$ Card.IsTriggerRemembered | Origin$ Battlefield | Destination$ Graveyard | ThisTurn$ True | Execute$ DBDread | SpellDescription$ When it dies this turn, 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:DBDread:DB$ ManifestDread
-Oracle:Target creature gets +3/+0 until end of turn. When it dies this turn, 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.)
+Name:Turn Inside Out
+ManaCost:R
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | SubAbility$ DBDelayedTrigger | SpellDescription$ Target creature gets +3/+0 until end of turn.
+SVar:DBDelayedTrigger:DB$ DelayedTrigger | Mode$ ChangesZone | RememberObjects$ Targeted | ValidCard$ Card.IsTriggerRemembered | Origin$ Battlefield | Destination$ Graveyard | ThisTurn$ True | Execute$ DBDread | SpellDescription$ When it dies this turn, 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:DBDread:DB$ ManifestDread
+Oracle:Target creature gets +3/+0 until end of turn. When it dies this turn, 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/twist_reality.txt b/forge-gui/res/cardsfolder/upcoming/twist_reality.txt
index c8d2a9539c3..7ed9f4efd65 100644
--- a/forge-gui/res/cardsfolder/upcoming/twist_reality.txt
+++ b/forge-gui/res/cardsfolder/upcoming/twist_reality.txt
@@ -1,7 +1,7 @@
-Name:Twist Reality
-ManaCost:1 U U
-Types:Instant
-A:SP$ Charm | Choices$ DBCounter,DBDread
-SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | TgtPrompt$ Counter target spell | SpellDescription$ Counter target spell.
-SVar:DBDread:DB$ ManifestDread | SpellDescription$ 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.)
-Oracle:Choose one —\n• Counter target spell.\n• 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.)
+Name:Twist Reality
+ManaCost:1 U U
+Types:Instant
+A:SP$ Charm | Choices$ DBCounter,DBDread
+SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | TgtPrompt$ Counter target spell | SpellDescription$ Counter target spell.
+SVar:DBDread:DB$ ManifestDread | SpellDescription$ 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.)
+Oracle:Choose one —\n• Counter target spell.\n• 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/tyvar_the_pummeler.txt b/forge-gui/res/cardsfolder/upcoming/tyvar_the_pummeler.txt
index 88d26760a6a..627a93f1322 100644
--- a/forge-gui/res/cardsfolder/upcoming/tyvar_the_pummeler.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tyvar_the_pummeler.txt
@@ -1,9 +1,9 @@
-Name:Tyvar, the Pummeler
-ManaCost:1 G G
-Types:Legendary Creature Elf Warrior
-PT:3/3
-A:AB$ Pump | Cost$ tapXType<1/Creature.Other> | Defined$ Self | KW$ Indestructible | SubAbility$ DBTap | SpellDescription$ CARDNAME gains indestructible until end of turn. Tap it.
-SVar:DBTap:DB$ Tap | Defined$ Self
-A:AB$ PumpAll | Cost$ 2 G G G | ValidCards$ Creature.YouCtrl | NumAtt$ +X | NumDef$ +X | SpellDescription$ Creatures you control get +X/+X until end of turn, where X is the greatest power among creatures you control.
-SVar:X:Count$Valid Creature.YouCtrl$GreatestPower
-Oracle:Tap another untapped creature you control: Tyvar, the Pummeler gains indestructible until end of turn. Tap it.\n{3}{G}{G}: Creatures you control get +X/+X until end of turn, where X is the greatest power among creatures you control.
\ No newline at end of file
+Name:Tyvar, the Pummeler
+ManaCost:1 G G
+Types:Legendary Creature Elf Warrior
+PT:3/3
+A:AB$ Pump | Cost$ tapXType<1/Creature.Other> | Defined$ Self | KW$ Indestructible | SubAbility$ DBTap | SpellDescription$ CARDNAME gains indestructible until end of turn. Tap it.
+SVar:DBTap:DB$ Tap | Defined$ Self
+A:AB$ PumpAll | Cost$ 2 G G G | ValidCards$ Creature.YouCtrl | NumAtt$ +X | NumDef$ +X | SpellDescription$ Creatures you control get +X/+X until end of turn, where X is the greatest power among creatures you control.
+SVar:X:Count$Valid Creature.YouCtrl$GreatestPower
+Oracle:Tap another untapped creature you control: Tyvar, the Pummeler gains indestructible until end of turn. Tap it.\n{3}{G}{G}: Creatures you control get +X/+X until end of turn, where X is the greatest power among creatures you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/unable_to_scream.txt b/forge-gui/res/cardsfolder/upcoming/unable_to_scream.txt
index 677addcd255..97a23dbe2a2 100644
--- a/forge-gui/res/cardsfolder/upcoming/unable_to_scream.txt
+++ b/forge-gui/res/cardsfolder/upcoming/unable_to_scream.txt
@@ -1,9 +1,9 @@
-Name:Unable to Scream
-ManaCost:U
-Types:Enchantment Aura
-K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | SetPower$ 0 | SetToughness$ 2 | RemoveAllAbilities$ True | AddType$ Artifact & Creature & Toy | Description$ Enchanted creature loses all abilities and is a Toy artifact creature with base power and toughness 0/2 in addition to its other types.
-R:Event$ TurnFaceUp | ValidCard$ Card.EnchantedBy+faceDown | Layer$ CantHappen | ActiveZones$ Battlefield | Description$ As long as enchanted creature is face down, it can't be turned face up.
-DeckHas:Type$Toy
-Oracle:Enchant creature\nEnchanted creature loses all abilities and is a Toy artifact creature with base power and toughness 0/2 in addition to its other types.\nAs long as enchanted creature is face down, it can't be turned face up.
+Name:Unable to Scream
+ManaCost:U
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Curse
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | SetPower$ 0 | SetToughness$ 2 | RemoveAllAbilities$ True | AddType$ Artifact & Creature & Toy | Description$ Enchanted creature loses all abilities and is a Toy artifact creature with base power and toughness 0/2 in addition to its other types.
+R:Event$ TurnFaceUp | ValidCard$ Card.EnchantedBy+faceDown | Layer$ CantHappen | ActiveZones$ Battlefield | Description$ As long as enchanted creature is face down, it can't be turned face up.
+DeckHas:Type$Toy
+Oracle:Enchant creature\nEnchanted creature loses all abilities and is a Toy artifact creature with base power and toughness 0/2 in addition to its other types.\nAs long as enchanted creature is face down, it can't be turned face up.
diff --git a/forge-gui/res/cardsfolder/upcoming/under_the_skin.txt b/forge-gui/res/cardsfolder/upcoming/under_the_skin.txt
index f8f5e402615..18ca3734843 100644
--- a/forge-gui/res/cardsfolder/upcoming/under_the_skin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/under_the_skin.txt
@@ -1,6 +1,6 @@
-Name:Under the Skin
-ManaCost:2 G
-Types:Sorcery
-A:SP$ ManifestDread | SubAbility$ DBChangeZone | SpellDescription$ 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.) You may return a permanent card from your graveyard to your hand.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Permanent.YouOwn | Hidden$ True | Optional$ True
-Oracle: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.)\nYou may return a permanent card from your graveyard to your hand.
+Name:Under the Skin
+ManaCost:2 G
+Types:Sorcery
+A:SP$ ManifestDread | SubAbility$ DBChangeZone | SpellDescription$ 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.) You may return a permanent card from your graveyard to your hand.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Permanent.YouOwn | Hidden$ True | Optional$ True
+Oracle: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.)\nYou may return a permanent card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/unsettling_twins.txt b/forge-gui/res/cardsfolder/upcoming/unsettling_twins.txt
index 97e0167c946..b44c2c11b9a 100644
--- a/forge-gui/res/cardsfolder/upcoming/unsettling_twins.txt
+++ b/forge-gui/res/cardsfolder/upcoming/unsettling_twins.txt
@@ -1,7 +1,7 @@
-Name:Unsettling Twins
-ManaCost:3 W
-Types:Creature Human
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, 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 Unsettling Twins enters, 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:Unsettling Twins
+ManaCost:3 W
+Types:Creature Human
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, 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 Unsettling Twins enters, 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/unstoppable_slasher.txt b/forge-gui/res/cardsfolder/upcoming/unstoppable_slasher.txt
index d9cff7dcc22..df49d35195f 100644
--- a/forge-gui/res/cardsfolder/upcoming/unstoppable_slasher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/unstoppable_slasher.txt
@@ -1,11 +1,11 @@
-Name:Unstoppable Slasher
-ManaCost:2 B
-Types:Creature Zombie Assassin
-PT:2/3
-K:Deathtouch
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigLoseLifeOpp | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player loses half their life, rounded up.
-SVar:TrigLoseLifeOpp:DB$ LoseLife | Defined$ TriggeredTarget | LifeAmount$ X
-T:Mode$ ChangesZone | ValidCard$ Card.Self+!HasCounters | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME dies, if it had no counters on it, return it to the battlefield tapped under its owner's control with two stun counters on it.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | Defined$ TriggeredCard | WithCountersType$ STUN | WithCountersAmount$ 2
-SVar:X:TriggeredTarget$LifeTotal/HalfUp
-Oracle:Deathtouch\nWhenever Unstoppable Slasher deals combat damage to a player, they lose half their life, rounded up.\nWhen Unstoppable Slasher dies, if it had no counters on it, return it to the battlefield tapped under its owner's control with two stun counters on it.
\ No newline at end of file
+Name:Unstoppable Slasher
+ManaCost:2 B
+Types:Creature Zombie Assassin
+PT:2/3
+K:Deathtouch
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigLoseLifeOpp | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player loses half their life, rounded up.
+SVar:TrigLoseLifeOpp:DB$ LoseLife | Defined$ TriggeredTarget | LifeAmount$ X
+T:Mode$ ChangesZone | ValidCard$ Card.Self+!HasCounters | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME dies, if it had no counters on it, return it to the battlefield tapped under its owner's control with two stun counters on it.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | Defined$ TriggeredCard | WithCountersType$ STUN | WithCountersAmount$ 2
+SVar:X:TriggeredTarget$LifeTotal/HalfUp
+Oracle:Deathtouch\nWhenever Unstoppable Slasher deals combat damage to a player, they lose half their life, rounded up.\nWhen Unstoppable Slasher dies, if it had no counters on it, return it to the battlefield tapped under its owner's control with two stun counters on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/untimely_malfunction.txt b/forge-gui/res/cardsfolder/upcoming/untimely_malfunction.txt
index 935cf2cad3a..a8cb57c045a 100644
--- a/forge-gui/res/cardsfolder/upcoming/untimely_malfunction.txt
+++ b/forge-gui/res/cardsfolder/upcoming/untimely_malfunction.txt
@@ -1,8 +1,8 @@
-Name:Untimely Malfunction
-ManaCost:1 R
-Types:Instant
-A:SP$ Charm | Choices$ DBDestroy,DBChangeTargets,DBCantBlock
-SVar:DBDestroy:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact.
-SVar:DBChangeTargets:DB$ ChangeTargets | TargetType$ SpellAbility.singleTarget | ValidTgts$ Card,Emblem | TgtPrompt$ Select target spell or ability with a single target | SpellDescription$ Change the target of target spell or ability with a single target.
-SVar:DBCantBlock:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 1 | TargetMax$ 2 | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ One or two target creatures can't block this turn.
-Oracle:Choose one —\n• Destroy target artifact.\n• Change the target of target spell or ability with a single target.\n• One or two target creatures can't block this turn.
+Name:Untimely Malfunction
+ManaCost:1 R
+Types:Instant
+A:SP$ Charm | Choices$ DBDestroy,DBChangeTargets,DBCantBlock
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact.
+SVar:DBChangeTargets:DB$ ChangeTargets | TargetType$ SpellAbility.singleTarget | ValidTgts$ Card,Emblem | TgtPrompt$ Select target spell or ability with a single target | SpellDescription$ Change the target of target spell or ability with a single target.
+SVar:DBCantBlock:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 1 | TargetMax$ 2 | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ One or two target creatures can't block this turn.
+Oracle:Choose one —\n• Destroy target artifact.\n• Change the target of target spell or ability with a single target.\n• One or two target creatures can't block this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/unwilling_vessel.txt b/forge-gui/res/cardsfolder/upcoming/unwilling_vessel.txt
index e082b912a1b..62c9993b9da 100644
--- a/forge-gui/res/cardsfolder/upcoming/unwilling_vessel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/unwilling_vessel.txt
@@ -1,14 +1,14 @@
-Name:Unwilling Vessel
-ManaCost:2 U
-Types:Creature Human Wizard
-PT:3/2
-K:Vigilance
-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 possession counter on CARDNAME.
-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 possession counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ POSSESSION | CounterNum$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create an X/X blue Spirit creature token with flying, where X is the number of counters on CARDNAME.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_x_x_spirit_flying | TokenPower$ X | TokenToughness$ X | TokenOwner$ You
-SVar:X:TriggeredCard$CardCounters.ALL
-DeckHas:Ability$Token & Type$Spirit
-DeckNeeds:Type$Enchantment
-Oracle:Vigilance\nEerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, put a possession counter on Unwilling Vessel.\nWhen Unwilling Vessel dies, create an X/X blue Spirit creature token with flying, where X is the number of counters on Unwilling Vessel.
+Name:Unwilling Vessel
+ManaCost:2 U
+Types:Creature Human Wizard
+PT:3/2
+K:Vigilance
+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 possession counter on CARDNAME.
+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 possession counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ POSSESSION | CounterNum$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create an X/X blue Spirit creature token with flying, where X is the number of counters on CARDNAME.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_x_x_spirit_flying | TokenPower$ X | TokenToughness$ X | TokenOwner$ You
+SVar:X:TriggeredCard$CardCounters.ALL
+DeckHas:Ability$Token & Type$Spirit
+DeckNeeds:Type$Enchantment
+Oracle:Vigilance\nEerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, put a possession counter on Unwilling Vessel.\nWhen Unwilling Vessel dies, create an X/X blue Spirit creature token with flying, where X is the number of counters on Unwilling Vessel.
diff --git a/forge-gui/res/cardsfolder/upcoming/ursine_monstrosity.txt b/forge-gui/res/cardsfolder/upcoming/ursine_monstrosity.txt
index 2a38040328c..76140cab61e 100644
--- a/forge-gui/res/cardsfolder/upcoming/ursine_monstrosity.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ursine_monstrosity.txt
@@ -1,13 +1,13 @@
-Name:Ursine Monstrosity
-ManaCost:2 G
-Types:Creature Bear Mutant
-PT:3/3
-K:Trample
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, mill a card and choose an opponent at random. CARDNAME attacks that player this combat if able. Until end of turn, CARDNAME gains indestructible and gets +1/+1 for each card type among cards in your graveyard.
-SVar:TrigMill:DB$ Mill | Defined$ You | NumCards$ 1 | SubAbility$ DBChoose
-SVar:DBChoose:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | Random$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ AttackChosen | Duration$ UntilEndOfCombat | SubAbility$ DBPump
-SVar:AttackChosen:Mode$ MustAttack | ValidCreature$ Card.IsRemembered | MustAttack$ ChosenPlayer | Description$ EFFECTSOURCE attacks that player this combat if able.
-SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ X | NumDef$ X | KW$ Indestructible
-SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
-Oracle:Trample\nAt the beginning of combat on your turn, mill a card and choose an opponent at random. Ursine Monstrosity attacks that player this combat if able. Until end of turn, Ursine Monstrosity gains indestructible and gets +1/+1 for each card type among cards in your graveyard.
+Name:Ursine Monstrosity
+ManaCost:2 G
+Types:Creature Bear Mutant
+PT:3/3
+K:Trample
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, mill a card and choose an opponent at random. CARDNAME attacks that player this combat if able. Until end of turn, CARDNAME gains indestructible and gets +1/+1 for each card type among cards in your graveyard.
+SVar:TrigMill:DB$ Mill | Defined$ You | NumCards$ 1 | SubAbility$ DBChoose
+SVar:DBChoose:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | Random$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ AttackChosen | Duration$ UntilEndOfCombat | SubAbility$ DBPump
+SVar:AttackChosen:Mode$ MustAttack | ValidCreature$ Card.IsRemembered | MustAttack$ ChosenPlayer | Description$ EFFECTSOURCE attacks that player this combat if able.
+SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ X | NumDef$ X | KW$ Indestructible
+SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
+Oracle:Trample\nAt the beginning of combat on your turn, mill a card and choose an opponent at random. Ursine Monstrosity attacks that player this combat if able. Until end of turn, Ursine Monstrosity gains indestructible and gets +1/+1 for each card type among cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/valgavoth_terror_eater.txt b/forge-gui/res/cardsfolder/upcoming/valgavoth_terror_eater.txt
index 6f003372032..8b98aa759de 100644
--- a/forge-gui/res/cardsfolder/upcoming/valgavoth_terror_eater.txt
+++ b/forge-gui/res/cardsfolder/upcoming/valgavoth_terror_eater.txt
@@ -1,11 +1,11 @@
-Name:Valgavoth, Terror Eater
-ManaCost:6 B B B
-Types:Legendary Creature Elder Demon
-PT:9/9
-K:Flying
-K:Lifelink
-K:Ward:Sac<3/Permanent.nonLand/nonland permanent>
-R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Graveyard | ValidLKI$ Card.nonToken+YouDontCtrl+OppOwn | ReplaceWith$ Exile | Description$ If a card you didn't control would be put into an opponent's graveyard from anywhere, exile it instead.
-SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard
-S:Mode$ Continuous | Condition$ PlayerTurn | MayPlay$ True | Affected$ Card.ExiledWithSource | AffectedZone$ Exile | MayPlayAltManaCost$ PayLife<ConvertedManaCost> | Description$ During your turn, you may play cards exiled with NICKNAME. If you cast a spell this way, pay life equal to its mana value rather than pay its mana cost.
-Oracle:Flying, lifelink\nWard—Sacrifice three nonland permanents.\nIf a card you didn't control would be put into an opponent's graveyard from anywhere, exile it instead.\nDuring your turn, you may play cards exiled with Valgavoth. If you cast a spell this way, pay life equal to its mana value rather than pay its mana cost.
\ No newline at end of file
+Name:Valgavoth, Terror Eater
+ManaCost:6 B B B
+Types:Legendary Creature Elder Demon
+PT:9/9
+K:Flying
+K:Lifelink
+K:Ward:Sac<3/Permanent.nonLand/nonland permanent>
+R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Graveyard | ValidLKI$ Card.nonToken+YouDontCtrl+OppOwn | ReplaceWith$ Exile | Description$ If a card you didn't control would be put into an opponent's graveyard from anywhere, exile it instead.
+SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard
+S:Mode$ Continuous | Condition$ PlayerTurn | MayPlay$ True | Affected$ Card.ExiledWithSource | AffectedZone$ Exile | MayPlayAltManaCost$ PayLife<ConvertedManaCost> | Description$ During your turn, you may play cards exiled with NICKNAME. If you cast a spell this way, pay life equal to its mana value rather than pay its mana cost.
+Oracle:Flying, lifelink\nWard—Sacrifice three nonland permanents.\nIf a card you didn't control would be put into an opponent's graveyard from anywhere, exile it instead.\nDuring your turn, you may play cards exiled with Valgavoth. If you cast a spell this way, pay life equal to its mana value rather than pay its mana cost.
diff --git a/forge-gui/res/cardsfolder/upcoming/valgavoths_faithful.txt b/forge-gui/res/cardsfolder/upcoming/valgavoths_faithful.txt
index 418e79be6c1..169a13efba0 100644
--- a/forge-gui/res/cardsfolder/upcoming/valgavoths_faithful.txt
+++ b/forge-gui/res/cardsfolder/upcoming/valgavoths_faithful.txt
@@ -1,6 +1,6 @@
-Name:Valgavoth's Faithful
-ManaCost:B
-Types:Creature Human Cleric
-PT:1/1
-A:AB$ ChangeZone | Cost$ 3 B Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SorcerySpeed$ True | SpellDescription$ Return target creature card from your graveyard to the battlefield. Activate only as a sorcery.
-Oracle:{3}{B}, Sacrifice Valgavoth's Faithful: Return target creature card from your graveyard to the battlefield. Activate only as a sorcery.
\ No newline at end of file
+Name:Valgavoth's Faithful
+ManaCost:B
+Types:Creature Human Cleric
+PT:1/1
+A:AB$ ChangeZone | Cost$ 3 B Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SorcerySpeed$ True | SpellDescription$ Return target creature card from your graveyard to the battlefield. Activate only as a sorcery.
+Oracle:{3}{B}, Sacrifice Valgavoth's Faithful: Return target creature card from your graveyard to the battlefield. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/valgavoths_lair.txt b/forge-gui/res/cardsfolder/upcoming/valgavoths_lair.txt
index 567bd15c180..cc3a725377a 100644
--- a/forge-gui/res/cardsfolder/upcoming/valgavoths_lair.txt
+++ b/forge-gui/res/cardsfolder/upcoming/valgavoths_lair.txt
@@ -1,10 +1,10 @@
-Name:Valgavoth's Lair
-ManaCost:no cost
-Types:Enchantment Land
-K:Hexproof
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
-SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-K:ETBReplacement:Other:ChooseColor
-SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters, choose a color.
-A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color.
-Oracle:Hexproof\nValgavoth's Lair enters tapped. As it enters, choose a color.\n{T}: Add one mana of the chosen color.
+Name:Valgavoth's Lair
+ManaCost:no cost
+Types:Enchantment Land
+K:Hexproof
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+K:ETBReplacement:Other:ChooseColor
+SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters, choose a color.
+A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color.
+Oracle:Hexproof\nValgavoth's Lair enters tapped. As it enters, choose a color.\n{T}: Add one mana of the chosen color.
diff --git a/forge-gui/res/cardsfolder/upcoming/valgavoths_onslaught.txt b/forge-gui/res/cardsfolder/upcoming/valgavoths_onslaught.txt
index 96b8e79f6f4..2d8ce27c92e 100644
--- a/forge-gui/res/cardsfolder/upcoming/valgavoths_onslaught.txt
+++ b/forge-gui/res/cardsfolder/upcoming/valgavoths_onslaught.txt
@@ -1,8 +1,8 @@
-Name:Valgavoth's Onslaught
-ManaCost:X X G
-Types:Sorcery
-A:SP$ ManifestDread | Amount$ X | RememberManifested$ True | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ RememberedCard | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$xPaid
-Oracle:Manifest dread X times, then put X +1/+1 counters on each of those creatures. (To 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:Valgavoth's Onslaught
+ManaCost:X X G
+Types:Sorcery
+A:SP$ ManifestDread | Amount$ X | RememberManifested$ True | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ RememberedCard | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$xPaid
+Oracle:Manifest dread X times, then put X +1/+1 counters on each of those creatures. (To 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/vanish_from_sight.txt b/forge-gui/res/cardsfolder/upcoming/vanish_from_sight.txt
index 2c1ce8f0a7f..fc1516c117c 100644
--- a/forge-gui/res/cardsfolder/upcoming/vanish_from_sight.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vanish_from_sight.txt
@@ -1,7 +1,7 @@
-Name:Vanish from Sight
-ManaCost:3 U
-Types:Instant
-A:SP$ ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | AlternativeDecider$ TargetedOwner | Origin$ Battlefield | Destination$ Library | DestinationAlternative$ Library | LibraryPositionAlternative$ -1 | SubAbility$ DBSurveil | StackDescription$ {p:TargetedOwner} puts {c:Targeted} on the top or bottom of their library. | SpellDescription$ Target nonland permanent's owner puts it on the top or bottom of their library. Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
-SVar:DBSurveil:DB$ Surveil | Amount$ 1
-DeckHas:Ability$Surveil|Graveyard
-Oracle:Target nonland permanent's owner puts it on the top or bottom of their library. Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
\ No newline at end of file
+Name:Vanish from Sight
+ManaCost:3 U
+Types:Instant
+A:SP$ ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | AlternativeDecider$ TargetedOwner | Origin$ Battlefield | Destination$ Library | DestinationAlternative$ Library | LibraryPositionAlternative$ -1 | SubAbility$ DBSurveil | StackDescription$ {p:TargetedOwner} puts {c:Targeted} on the top or bottom of their library. | SpellDescription$ Target nonland permanent's owner puts it on the top or bottom of their library. Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+SVar:DBSurveil:DB$ Surveil | Amount$ 1
+DeckHas:Ability$Surveil|Graveyard
+Oracle:Target nonland permanent's owner puts it on the top or bottom of their library. 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/vengeful_possession.txt b/forge-gui/res/cardsfolder/upcoming/vengeful_possession.txt
index da96b623023..18aa63358d0 100644
--- a/forge-gui/res/cardsfolder/upcoming/vengeful_possession.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vengeful_possession.txt
@@ -1,7 +1,7 @@
-Name:Vengeful Possession
-ManaCost:2 R
-Types:Sorcery
-A:SP$ GainControl | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SubAbility$ DBDraw | SpellDescription$ Gain control of target creature until end of turn. Untap it. It gains haste until end of turn. You may discard a card. If you do, draw a card.
-SVar:DBDraw:DB$ Draw | UnlessCost$ Discard<1/Card> | UnlessSwitched$ True | UnlessPayer$ You
-SVar:PlayMain1:OPPONENTCREATURES
-Oracle:Gain control of target creature until end of turn. Untap it. It gains haste until end of turn. You may discard a card. If you do, draw a card.
\ No newline at end of file
+Name:Vengeful Possession
+ManaCost:2 R
+Types:Sorcery
+A:SP$ GainControl | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SubAbility$ DBDraw | SpellDescription$ Gain control of target creature until end of turn. Untap it. It gains haste until end of turn. You may discard a card. If you do, draw a card.
+SVar:DBDraw:DB$ Draw | UnlessCost$ Discard<1/Card> | UnlessSwitched$ True | UnlessPayer$ You
+SVar:PlayMain1:OPPONENTCREATURES
+Oracle:Gain control of target creature until end of turn. Untap it. It gains haste until end of turn. You may discard a card. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/veteran_survivor.txt b/forge-gui/res/cardsfolder/upcoming/veteran_survivor.txt
index 29e9f1e6690..0e24b62588e 100644
--- a/forge-gui/res/cardsfolder/upcoming/veteran_survivor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/veteran_survivor.txt
@@ -1,9 +1,9 @@
-Name:Veteran Survivor
-Types:Creature Human Survivor
-ManaCost:W
-PT:2/1
-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, exile up to one target card from a graveyard.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target card in a graveyard to exile
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ Hexproof | CheckSVar$ X | SVarCompare$ GE3 | Description$ As long as there are three or more cards exiled with CARDNAME, it gets +3/+3 and has hexproof. (It can't be the target of spells or abilities your opponents control.)
-SVar:X:ExiledWith$Amount
-Oracle:Survival — At the beginning of your second main phase, if Veteran Survivor is tapped, exile up to one target card from a graveyard.\nAs long as there are three or more cards exiled with Veteran Survivor, it gets +3/+3 and has hexproof. (It can't be the target of spells or abilities your opponents control.)
+Name:Veteran Survivor
+Types:Creature Human Survivor
+ManaCost:W
+PT:2/1
+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, exile up to one target card from a graveyard.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target card in a graveyard to exile
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ Hexproof | CheckSVar$ X | SVarCompare$ GE3 | Description$ As long as there are three or more cards exiled with CARDNAME, it gets +3/+3 and has hexproof. (It can't be the target of spells or abilities your opponents control.)
+SVar:X:ExiledWith$Amount
+Oracle:Survival — At the beginning of your second main phase, if Veteran Survivor is tapped, exile up to one target card from a graveyard.\nAs long as there are three or more cards exiled with Veteran Survivor, it gets +3/+3 and has hexproof. (It can't be the target of spells or abilities your opponents control.)
diff --git a/forge-gui/res/cardsfolder/upcoming/vicious_clown.txt b/forge-gui/res/cardsfolder/upcoming/vicious_clown.txt
index e02dd98555c..356b380add8 100644
--- a/forge-gui/res/cardsfolder/upcoming/vicious_clown.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vicious_clown.txt
@@ -1,8 +1,8 @@
-Name:Vicious Clown
-ManaCost:2 R
-Types:Creature Human Clown
-PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerLE2+YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another creature you control with power 2 or less enters, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
-SVar:BuffedBy:Creature.powerLE2
-Oracle:Whenever another creature you control with power 2 or less enters, Vicious Clown gets +2/+0 until end of turn.
+Name:Vicious Clown
+ManaCost:2 R
+Types:Creature Human Clown
+PT:2/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerLE2+YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another creature you control with power 2 or less enters, CARDNAME gets +2/+0 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
+SVar:BuffedBy:Creature.powerLE2
+Oracle:Whenever another creature you control with power 2 or less enters, Vicious Clown gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/victor_valgavoths_seneschal.txt b/forge-gui/res/cardsfolder/upcoming/victor_valgavoths_seneschal.txt
index fc5b61dd418..99ff61af1df 100644
--- a/forge-gui/res/cardsfolder/upcoming/victor_valgavoths_seneschal.txt
+++ b/forge-gui/res/cardsfolder/upcoming/victor_valgavoths_seneschal.txt
@@ -1,15 +1,15 @@
-Name:Victor, Valgavoth's Seneschal
-ManaCost:1 W B
-Types:Legendary Creature Human Warlock
-PT:3/3
-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 2 if this is the first time this ability has resolved this turn. If it's the second time, each opponent discards a card. If it's the third time, put a creature card from a graveyard onto the battlefield under your control.
-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 2 if this is the first time this ability has resolved this turn. If it's the second time, each opponent discards a card. If it's the third time, put a creature card from a graveyard onto the battlefield under your control.
-SVar:TrigSurveil:DB$ Surveil | Amount$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$ Discard | Defined$ Player.Opponent | Mode$ TgtChoose | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ2 | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | Mandatory$ True | GainControl$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ3 | SelectPrompt$ Select a creature card to return to the battlefield | Hidden$ True | SubAbility$ DBLog
-SVar:DBLog:DB$ StoreSVar | SVar$ X | Type$ CountSVar | Expression$ X/Plus.1
-SVar:X:Number$1
-T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True
-SVar:DBCleanup:DB$ StoreSVar | SVar$ X | Type$ Number | Expression$ 1
-DeckNeeds:Type$Enchantment
-Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, surveil 2 if this is the first time this ability has resolved this turn. If it's the second time, each opponent discards a card. If it's the third time, put a creature card from a graveyard onto the battlefield under your control.
+Name:Victor, Valgavoth's Seneschal
+ManaCost:1 W B
+Types:Legendary Creature Human Warlock
+PT:3/3
+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 2 if this is the first time this ability has resolved this turn. If it's the second time, each opponent discards a card. If it's the third time, put a creature card from a graveyard onto the battlefield under your control.
+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 2 if this is the first time this ability has resolved this turn. If it's the second time, each opponent discards a card. If it's the third time, put a creature card from a graveyard onto the battlefield under your control.
+SVar:TrigSurveil:DB$ Surveil | Amount$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | Defined$ Player.Opponent | Mode$ TgtChoose | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ2 | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | Mandatory$ True | GainControl$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ3 | SelectPrompt$ Select a creature card to return to the battlefield | Hidden$ True | SubAbility$ DBLog
+SVar:DBLog:DB$ StoreSVar | SVar$ X | Type$ CountSVar | Expression$ X/Plus.1
+SVar:X:Number$1
+T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True
+SVar:DBCleanup:DB$ StoreSVar | SVar$ X | Type$ Number | Expression$ 1
+DeckNeeds:Type$Enchantment
+Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, surveil 2 if this is the first time this ability has resolved this turn. If it's the second time, each opponent discards a card. If it's the third time, put a creature card from a graveyard onto the battlefield under your control.
diff --git a/forge-gui/res/cardsfolder/upcoming/vile_mutilator.txt b/forge-gui/res/cardsfolder/upcoming/vile_mutilator.txt
index 00769d25002..e649c0cee9b 100644
--- a/forge-gui/res/cardsfolder/upcoming/vile_mutilator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vile_mutilator.txt
@@ -1,11 +1,11 @@
-Name:Vile Mutilator
-ManaCost:5 B B
-Types:Creature Demon
-PT:6/5
-A:SP$ PermanentCreature | Cost$ 5 B B Sac<1/Creature;Enchantment/creature or enchantment>
-K:Flying
-K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacrifice | TriggerDescription$ When CARDNAME enters, each opponent sacrifices a nontoken enchantment, then sacrifices a nontoken creature.
-SVar:TrigSacrifice:DB$ Sacrifice | Defined$ Opponent | SacValid$ Enchantment.nonToken | SacMessage$ nontoken enchantment | SubAbility$ DBSacrifice
-SVar:DBSacrifice:DB$ Sacrifice | Defined$ Opponent | SacValid$ Creature.nonToken | SacMessage$ nontoken creature
-Oracle:As an additional cost to cast this spell, sacrifice a creature or enchantment.\nFlying, trample\nWhen Vile Mutilator enters, each opponent sacrifices a nontoken enchantment, then sacrifices a nontoken creature.
\ No newline at end of file
+Name:Vile Mutilator
+ManaCost:5 B B
+Types:Creature Demon
+PT:6/5
+A:SP$ PermanentCreature | Cost$ 5 B B Sac<1/Creature;Enchantment/creature or enchantment>
+K:Flying
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacrifice | TriggerDescription$ When CARDNAME enters, each opponent sacrifices a nontoken enchantment, then sacrifices a nontoken creature.
+SVar:TrigSacrifice:DB$ Sacrifice | Defined$ Opponent | SacValid$ Enchantment.nonToken | SacMessage$ nontoken enchantment | SubAbility$ DBSacrifice
+SVar:DBSacrifice:DB$ Sacrifice | Defined$ Opponent | SacValid$ Creature.nonToken | SacMessage$ nontoken creature
+Oracle:As an additional cost to cast this spell, sacrifice a creature or enchantment.\nFlying, trample\nWhen Vile Mutilator enters, each opponent sacrifices a nontoken enchantment, then sacrifices a nontoken creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/violent_urge.txt b/forge-gui/res/cardsfolder/upcoming/violent_urge.txt
index c9d8efd8cbb..ea3e2504b8a 100644
--- a/forge-gui/res/cardsfolder/upcoming/violent_urge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/violent_urge.txt
@@ -1,6 +1,6 @@
-Name:Violent Urge
-ManaCost:R
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | AILogic$ Pump | NumAtt$ +1 | KW$ First Strike | SubAbility$ DBPump | SpellDescription$ Target creature gets +1/+0 and first strike until end of turn. Delirium — If there are four or more card types in your graveyard, that creature gains double strike until end of turn.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | Condition$ Delirium | KW$ Double Strike
-Oracle:Target creature gets +1/+0 and first strike until end of turn.\nDelirium — If there are four or more card types in your graveyard, that creature gains double strike until end of turn.
\ No newline at end of file
+Name:Violent Urge
+ManaCost:R
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | AILogic$ Pump | NumAtt$ +1 | KW$ First Strike | SubAbility$ DBPump | SpellDescription$ Target creature gets +1/+0 and first strike until end of turn. Delirium — If there are four or more card types in your graveyard, that creature gains double strike until end of turn.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | Condition$ Delirium | KW$ Double Strike
+Oracle:Target creature gets +1/+0 and first strike until end of turn.\nDelirium — If there are four or more card types in your graveyard, that creature gains double strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/waltz_of_rage.txt b/forge-gui/res/cardsfolder/upcoming/waltz_of_rage.txt
index 809c63ef855..483a75d0eec 100644
--- a/forge-gui/res/cardsfolder/upcoming/waltz_of_rage.txt
+++ b/forge-gui/res/cardsfolder/upcoming/waltz_of_rage.txt
@@ -1,13 +1,13 @@
-Name:Waltz of Rage
-ManaCost:3 R R
-Types:Sorcery
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ IgnitionDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to each other creature. Until end of turn, whenever a creature you control dies, exile the top card of your library. You may play it until the end of your next turn.
-SVar:IgnitionDamage:DB$ DamageAll | ValidCards$ Creature.NotDefinedTargeted | NumDmg$ X | DamageSource$ ParentTarget | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | Triggers$ TrigDie
-SVar:TrigDie:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Command | Execute$ TrigDig | TriggerDescription$ Whenever a creature you control dies, exile the top card of your library. You may play it until the end of your next turn.
-SVar:TrigDig:DB$ Dig | 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 that card until the end of your next turn.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:ParentTargeted$CardPower
-Oracle:Target creature you control deals damage equal to its power to each other creature. Until end of turn, whenever a creature you control dies, exile the top card of your library. You may play it until the end of your next turn.
+Name:Waltz of Rage
+ManaCost:3 R R
+Types:Sorcery
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ IgnitionDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to each other creature. Until end of turn, whenever a creature you control dies, exile the top card of your library. You may play it until the end of your next turn.
+SVar:IgnitionDamage:DB$ DamageAll | ValidCards$ Creature.NotDefinedTargeted | NumDmg$ X | DamageSource$ ParentTarget | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | Triggers$ TrigDie
+SVar:TrigDie:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Command | Execute$ TrigDig | TriggerDescription$ Whenever a creature you control dies, exile the top card of your library. You may play it until the end of your next turn.
+SVar:TrigDig:DB$ Dig | 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 that card until the end of your next turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:ParentTargeted$CardPower
+Oracle:Target creature you control deals damage equal to its power to each other creature. Until end of turn, whenever a creature you control dies, 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/wary_watchdog.txt b/forge-gui/res/cardsfolder/upcoming/wary_watchdog.txt
index 354dd65d87d..668cbd5674a 100644
--- a/forge-gui/res/cardsfolder/upcoming/wary_watchdog.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wary_watchdog.txt
@@ -1,9 +1,9 @@
-Name:Wary Watchdog
-ManaCost:1 G
-Types:Creature Dog
-PT:3/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters or dies, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSurveil | Secondary$ True | TriggerDescription$ When CARDNAME enters or dies, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
-SVar:TrigSurveil:DB$ Surveil | Amount$ 1
-DeckHas:Ability$Surveil|Graveyard
-Oracle:When Wary Watchdog enters or dies, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
\ No newline at end of file
+Name:Wary Watchdog
+ManaCost:1 G
+Types:Creature Dog
+PT:3/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters or dies, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSurveil | Secondary$ True | TriggerDescription$ When CARDNAME enters or dies, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
+SVar:TrigSurveil:DB$ Surveil | Amount$ 1
+DeckHas:Ability$Surveil|Graveyard
+Oracle:When Wary Watchdog enters or dies, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/upcoming/wickerfolk_thresher.txt b/forge-gui/res/cardsfolder/upcoming/wickerfolk_thresher.txt
index 28f2290ed74..c2cd9744e39 100644
--- a/forge-gui/res/cardsfolder/upcoming/wickerfolk_thresher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wickerfolk_thresher.txt
@@ -1,10 +1,10 @@
-Name:Wickerfolk Thresher
-ManaCost:3 G
-Types:Artifact Creature Scarecrow
-PT:5/4
-T:Mode$ Attacks | ValidCard$ Card.Self | Delirium$ True | Execute$ TrigDig | TriggerDescription$ Delirium — Whenever CARDNAME attacks, if there are four or more card types among cards in your graveyard, look at the top card of your library. If it's a land card, you may put it onto the battlefield. If you don't put the card onto the battlefield, put it into your hand.
-SVar:TrigDig:DB$ Dig | DigNum$ 1 | ChangeNum$ 1 | ChangeValid$ Land | Optional$ True | DestinationZone$ Battlefield | DestinationZone2$ Hand
-SVar:HasAttackEffect:TRUE
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:Delirium — Whenever Wickerfolk Thresher attacks, if there are four or more card types among cards in your graveyard, look at the top card of your library. If it's a land card, you may put it onto the battlefield. If you don't put the card onto the battlefield, put it into your hand.
+Name:Wickerfolk Thresher
+ManaCost:3 G
+Types:Artifact Creature Scarecrow
+PT:5/4
+T:Mode$ Attacks | ValidCard$ Card.Self | Delirium$ True | Execute$ TrigDig | TriggerDescription$ Delirium — Whenever CARDNAME attacks, if there are four or more card types among cards in your graveyard, look at the top card of your library. If it's a land card, you may put it onto the battlefield. If you don't put the card onto the battlefield, put it into your hand.
+SVar:TrigDig:DB$ Dig | DigNum$ 1 | ChangeNum$ 1 | ChangeValid$ Land | Optional$ True | DestinationZone$ Battlefield | DestinationZone2$ Hand
+SVar:HasAttackEffect:TRUE
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:Delirium — Whenever Wickerfolk Thresher attacks, if there are four or more card types among cards in your graveyard, look at the top card of your library. If it's a land card, you may put it onto the battlefield. If you don't put the card onto the battlefield, put it into your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/wildfire_wickerfolk.txt b/forge-gui/res/cardsfolder/upcoming/wildfire_wickerfolk.txt
index 6566789f15e..5e8191d82db 100644
--- a/forge-gui/res/cardsfolder/upcoming/wildfire_wickerfolk.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wildfire_wickerfolk.txt
@@ -1,9 +1,9 @@
-Name:Wildfire Wickerfolk
-ManaCost:R G
-Types:Artifact Creature Scarecrow
-PT:3/2
-K:Haste
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Trample | Condition$ Delirium | Description$ Delirium — CARDNAME gets +1/+1 and has trample as long as there are four or more card types among cards in your graveyard.
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:Haste\nDelirium — Wildfire Wickerfolk gets +1/+1 and has trample as long as there are four or more card types among cards in your graveyard.
\ No newline at end of file
+Name:Wildfire Wickerfolk
+ManaCost:R G
+Types:Artifact Creature Scarecrow
+PT:3/2
+K:Haste
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Trample | Condition$ Delirium | Description$ Delirium — CARDNAME gets +1/+1 and has trample as long as there are four or more card types among cards in your graveyard.
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:Haste\nDelirium — Wildfire Wickerfolk gets +1/+1 and has trample as long as there are four or more card types among cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/winter_misanthropic_guide.txt b/forge-gui/res/cardsfolder/upcoming/winter_misanthropic_guide.txt
index b4b58f5fbb3..67de46a19eb 100644
--- a/forge-gui/res/cardsfolder/upcoming/winter_misanthropic_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/winter_misanthropic_guide.txt
@@ -1,13 +1,13 @@
-Name:Winter, Misanthropic Guide
-ManaCost:1 B R G
-Types:Legendary Creature Human Warlock
-PT:3/4
-K:Ward:2
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your upkeep, each player draws two cards.
-SVar:TrigDraw:DB$ Draw | Defined$ Player | NumCards$ 2
-S:Mode$ Continuous | Condition$ Delirium | Affected$ Opponent | SetMaxHandSize$ Y | Description$ Delirium — As long as there are four or more card types among cards in your graveyard, each opponent's maximum hand size is equal to seven minus the number of those card types.
-SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
-SVar:Y:Number$7/Minus.X
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:Ward {2}\nAt the beginning of your upkeep, each player draws two cards.\nDelirium — As long as there are four or more card types among cards in your graveyard, each opponent's maximum hand size is equal to seven minus the number of those card types.
\ No newline at end of file
+Name:Winter, Misanthropic Guide
+ManaCost:1 B R G
+Types:Legendary Creature Human Warlock
+PT:3/4
+K:Ward:2
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your upkeep, each player draws two cards.
+SVar:TrigDraw:DB$ Draw | Defined$ Player | NumCards$ 2
+S:Mode$ Continuous | Condition$ Delirium | Affected$ Opponent | SetMaxHandSize$ Y | Description$ Delirium — As long as there are four or more card types among cards in your graveyard, each opponent's maximum hand size is equal to seven minus the number of those card types.
+SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
+SVar:Y:Number$7/Minus.X
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:Ward {2}\nAt the beginning of your upkeep, each player draws two cards.\nDelirium — As long as there are four or more card types among cards in your graveyard, each opponent's maximum hand size is equal to seven minus the number of those card types.
diff --git a/forge-gui/res/cardsfolder/upcoming/withering_torment.txt b/forge-gui/res/cardsfolder/upcoming/withering_torment.txt
index 8595b479873..52647cd076a 100644
--- a/forge-gui/res/cardsfolder/upcoming/withering_torment.txt
+++ b/forge-gui/res/cardsfolder/upcoming/withering_torment.txt
@@ -1,6 +1,6 @@
-Name:Withering Torment
-ManaCost:2 B
-Types:Instant
-A:SP$ Destroy | ValidTgts$ Creature,Enchantment | TgtPrompt$ Select target creature or enchantment | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature or enchantment. You lose 2 life.
-SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 2
-Oracle:Destroy target creature or enchantment. You lose 2 life.
\ No newline at end of file
+Name:Withering Torment
+ManaCost:2 B
+Types:Instant
+A:SP$ Destroy | ValidTgts$ Creature,Enchantment | TgtPrompt$ Select target creature or enchantment | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature or enchantment. You lose 2 life.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 2
+Oracle:Destroy target creature or enchantment. You lose 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/you_are_unworthy_of_mercy.txt b/forge-gui/res/cardsfolder/upcoming/you_are_unworthy_of_mercy.txt
index ef9c014ba79..1cf094fb746 100644
--- a/forge-gui/res/cardsfolder/upcoming/you_are_unworthy_of_mercy.txt
+++ b/forge-gui/res/cardsfolder/upcoming/you_are_unworthy_of_mercy.txt
@@ -1,8 +1,8 @@
-Name:You Are Unworthy of Mercy
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigSacEach | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, each opponent sacrifices a nonland permanent. If you control six or more lands, each opponent sacrifices three nonland permanents instead.
-SVar:TrigSacEach:DB$ Sacrifice | Amount$ X | Defined$ Player.Opponent | SacValid$ Permanent.nonLand | SacMessage$ nonland permanent
-SVar:X:Count$Compare Y GE6.3.1
-SVar:Y:Count$Valid Land.YouCtrl
-Oracle:When you set this scheme in motion, each opponent sacrifices a nonland permanent. If you control six or more lands, each opponent sacrifices three nonland permanents instead.
+Name:You Are Unworthy of Mercy
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigSacEach | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, each opponent sacrifices a nonland permanent. If you control six or more lands, each opponent sacrifices three nonland permanents instead.
+SVar:TrigSacEach:DB$ Sacrifice | Amount$ X | Defined$ Player.Opponent | SacValid$ Permanent.nonLand | SacMessage$ nonland permanent
+SVar:X:Count$Compare Y GE6.3.1
+SVar:Y:Count$Valid Land.YouCtrl
+Oracle:When you set this scheme in motion, each opponent sacrifices a nonland permanent. If you control six or more lands, each opponent sacrifices three nonland permanents instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/you_cannot_hide_from_me.txt b/forge-gui/res/cardsfolder/upcoming/you_cannot_hide_from_me.txt
index cf1742e3128..d5cc1e15e3b 100644
--- a/forge-gui/res/cardsfolder/upcoming/you_cannot_hide_from_me.txt
+++ b/forge-gui/res/cardsfolder/upcoming/you_cannot_hide_from_me.txt
@@ -1,12 +1,12 @@
-Name:You Cannot Hide from Me
-ManaCost:no cost
-Types:Ongoing Scheme
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, up to one target creature gets +2/+2 and gains vigilance until end of turn. It can't be blocked this turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature | NumAtt$ 2 | NumDef$ 2 | KW$ Vigilance | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | ExileOnMoved$ Battlefield | RememberObjects$ ParentTarget | StaticAbilities$ Unblockable
-SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
-T:Mode$ Phase | Phase$ End Of Turn | ValidPlayer$ Opponent | Execute$ Abandon | TriggerZones$ Command | CheckSVar$ X | SVarCompare$ LTY | TriggerDescription$ At the beginning of each opponent's end step, if that player has less than half their starting life total, abandon this scheme.
-SVar:Abandon:DB$ Abandon
-SVar:X:PlayerCountDefinedActivePlayer$LifeTotal
-SVar:Y:PlayerCountDefinedActivePlayer$StartingLife/HalfDown
-Oracle:(An ongoing scheme remains face up until it's abandoned.)\nAt the beginning of combat on your turn, up to one target creature gets +2/+2 and gains vigilance until end of turn. It can't be blocked this turn.\nAt the beginning of each opponent's end step, if that player has less than half their starting life total, abandon this scheme.
+Name:You Cannot Hide from Me
+ManaCost:no cost
+Types:Ongoing Scheme
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, up to one target creature gets +2/+2 and gains vigilance until end of turn. It can't be blocked this turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature | NumAtt$ 2 | NumDef$ 2 | KW$ Vigilance | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | ExileOnMoved$ Battlefield | RememberObjects$ ParentTarget | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
+T:Mode$ Phase | Phase$ End Of Turn | ValidPlayer$ Opponent | Execute$ Abandon | TriggerZones$ Command | CheckSVar$ X | SVarCompare$ LTY | TriggerDescription$ At the beginning of each opponent's end step, if that player has less than half their starting life total, abandon this scheme.
+SVar:Abandon:DB$ Abandon
+SVar:X:PlayerCountDefinedActivePlayer$LifeTotal
+SVar:Y:PlayerCountDefinedActivePlayer$StartingLife/HalfDown
+Oracle:(An ongoing scheme remains face up until it's abandoned.)\nAt the beginning of combat on your turn, up to one target creature gets +2/+2 and gains vigilance until end of turn. It can't be blocked this turn.\nAt the beginning of each opponent's end step, if that player has less than half their starting life total, abandon this scheme.
diff --git a/forge-gui/res/cardsfolder/upcoming/you_exist_only_to_amuse.txt b/forge-gui/res/cardsfolder/upcoming/you_exist_only_to_amuse.txt
index 1a771ccbef8..c04fc0f0405 100644
--- a/forge-gui/res/cardsfolder/upcoming/you_exist_only_to_amuse.txt
+++ b/forge-gui/res/cardsfolder/upcoming/you_exist_only_to_amuse.txt
@@ -1,10 +1,10 @@
-Name:You Exist Only to Amuse
-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 | CharmNum$ Count$Compare X GE6.2.1 | Choices$ DBToken,DBAnimateAll | AdditionalDescription$ If you control six or more lands, choose both instead.
-SVar:DBToken:DB$ Token | TokenAmount$ 3 | TokenScript$ r_1_1_devil_burn | SpellDescription$ Create three 1/1 red Devil creature tokens with "When this creature dies, it deals 1 damage to any target."
-SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.OppCtrl | Power$ 1 | Toughness$ 1 | RemoveAllAbilities$ True | Duration$ UntilYourNextTurn | SpellDescription$ Until your next turn, creatures your opponents control have base power and toughness 1/1 and lose all abilities.
-SVar:X:Count$Valid Land.YouCtrl
-DeckHas:Ability$Token
-Oracle:When you set this scheme in motion, choose one. If you control six or more lands, choose both instead.\n• Create three 1/1 red Devil creature tokens with "When this creature dies, it deals 1 damage to any target."\n• Until your next turn, creatures your opponents control have base power and toughness 1/1 and lose all abilities.
+Name:You Exist Only to Amuse
+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 | CharmNum$ Count$Compare X GE6.2.1 | Choices$ DBToken,DBAnimateAll | AdditionalDescription$ If you control six or more lands, choose both instead.
+SVar:DBToken:DB$ Token | TokenAmount$ 3 | TokenScript$ r_1_1_devil_burn | SpellDescription$ Create three 1/1 red Devil creature tokens with "When this creature dies, it deals 1 damage to any target."
+SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.OppCtrl | Power$ 1 | Toughness$ 1 | RemoveAllAbilities$ True | Duration$ UntilYourNextTurn | SpellDescription$ Until your next turn, creatures your opponents control have base power and toughness 1/1 and lose all abilities.
+SVar:X:Count$Valid Land.YouCtrl
+DeckHas:Ability$Token
+Oracle:When you set this scheme in motion, choose one. If you control six or more lands, choose both instead.\n• Create three 1/1 red Devil creature tokens with "When this creature dies, it deals 1 damage to any target."\n• Until your next turn, creatures your opponents control have base power and toughness 1/1 and lose all abilities.
diff --git a/forge-gui/res/cardsfolder/upcoming/you_live_only_because_i_will_it.txt b/forge-gui/res/cardsfolder/upcoming/you_live_only_because_i_will_it.txt
index c709d25a4ee..482422994ae 100644
--- a/forge-gui/res/cardsfolder/upcoming/you_live_only_because_i_will_it.txt
+++ b/forge-gui/res/cardsfolder/upcoming/you_live_only_because_i_will_it.txt
@@ -1,6 +1,6 @@
-Name:You Live Only Because I Will It
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigRedistribute | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, you may redistribute any number of life totals.
-SVar:TrigRedistribute:DB$ SetLife | PlayerChoices$ Player | ChoiceAmount$ Any | ChoicePrompt$ Choose any number of players | Redistribute$ True
-Oracle:When you set this scheme in motion, you may redistribute any number of life totals.
\ No newline at end of file
+Name:You Live Only Because I Will It
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigRedistribute | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, you may redistribute any number of life totals.
+SVar:TrigRedistribute:DB$ SetLife | PlayerChoices$ Player | ChoiceAmount$ Any | ChoicePrompt$ Choose any number of players | Redistribute$ True
+Oracle:When you set this scheme in motion, you may redistribute any number of life totals.
diff --git a/forge-gui/res/cardsfolder/upcoming/you_will_know_true_suffering.txt b/forge-gui/res/cardsfolder/upcoming/you_will_know_true_suffering.txt
index e18665876b7..86d37db2ede 100644
--- a/forge-gui/res/cardsfolder/upcoming/you_will_know_true_suffering.txt
+++ b/forge-gui/res/cardsfolder/upcoming/you_will_know_true_suffering.txt
@@ -1,7 +1,7 @@
-Name:You Will Know True Suffering
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigDamageAll | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, it deals damage equal to your commander's mana value to each noncommander creature your opponents control.
-SVar:TrigDamageAll:DB$ DamageAll | ValidCards$ Creature.IsNotCommander+OppCtrl | ValidDescription$ each noncommander creature your opponents control. | NumDmg$ X
-SVar:X:Count$ValidAll Card.IsCommander+YouOwn$SumCMC
-Oracle:When you set this scheme in motion, it deals damage equal to your commander's mana value to each noncommander creature your opponents control.
\ No newline at end of file
+Name:You Will Know True Suffering
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigDamageAll | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, it deals damage equal to your commander's mana value to each noncommander creature your opponents control.
+SVar:TrigDamageAll:DB$ DamageAll | ValidCards$ Creature.IsNotCommander+OppCtrl | ValidDescription$ each noncommander creature your opponents control. | NumDmg$ X
+SVar:X:Count$ValidAll Card.IsCommander+YouOwn$SumCMC
+Oracle:When you set this scheme in motion, it deals damage equal to your commander's mana value to each noncommander creature your opponents control.
diff --git a/forge-gui/res/cardsfolder/upcoming/your_mistake_is_my_triumph.txt b/forge-gui/res/cardsfolder/upcoming/your_mistake_is_my_triumph.txt
index 953a8406668..88c9854d72e 100644
--- a/forge-gui/res/cardsfolder/upcoming/your_mistake_is_my_triumph.txt
+++ b/forge-gui/res/cardsfolder/upcoming/your_mistake_is_my_triumph.txt
@@ -1,8 +1,8 @@
-Name:Your Mistake Is My Triumph
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigMill | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, each player mills three cards. Then you put a permanent card from among the milled cards onto the battlefield under your control.
-SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ Player | RememberMilled$ True | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Hidden$ True | Origin$ Graveyard,Exile | Destination$ Hand | ChangeType$ Permanent.IsRemembered | SelectPrompt$ Select a permanent from among the milled cards |  GainControl$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:When you set this scheme in motion, each player mills three cards. Then you put a permanent card from among the milled cards onto the battlefield under your control.
\ No newline at end of file
+Name:Your Mistake Is My Triumph
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigMill | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, each player mills three cards. Then you put a permanent card from among the milled cards onto the battlefield under your control.
+SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ Player | RememberMilled$ True | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Hidden$ True | Origin$ Graveyard,Exile | Destination$ Hand | ChangeType$ Permanent.IsRemembered | SelectPrompt$ Select a permanent from among the milled cards | GainControl$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:When you set this scheme in motion, each player mills three cards. Then you put a permanent card from among the milled cards onto the battlefield under your control.
diff --git a/forge-gui/res/cardsfolder/upcoming/your_nightmares_are_delicious.txt b/forge-gui/res/cardsfolder/upcoming/your_nightmares_are_delicious.txt
index 99247fbd834..0e6df1790f7 100644
--- a/forge-gui/res/cardsfolder/upcoming/your_nightmares_are_delicious.txt
+++ b/forge-gui/res/cardsfolder/upcoming/your_nightmares_are_delicious.txt
@@ -1,10 +1,10 @@
-Name:Your Nightmares Are Delicious
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigRepeatEach | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, each opponent who has more than five cards in hand discards cards equal to the difference. Then if fewer than three cards were discarded this way, you draw three cards.
-SVar:TrigRepeatEach:DB$ RepeatEach | RepeatPlayers$ Opponent | RepeatSubAbility$ DBDiscard | SubAbility$ DBDraw
-SVar:DBDiscard:DB$ Discard | Defined$ Player.IsRemembered | NumCards$ X | Mode$ TgtChoose | RememberDiscarded$ True
-SVar:DBDraw:DB$ Draw | NumCards$ 3 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ LT3 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:PlayerCountRemembered$CardsInHand/Minus.5
-Oracle:When you set this scheme in motion, each opponent who has more than five cards in hand discards cards equal to the difference. Then if fewer than three cards were discarded this way, you draw three cards.
+Name:Your Nightmares Are Delicious
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigRepeatEach | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, each opponent who has more than five cards in hand discards cards equal to the difference. Then if fewer than three cards were discarded this way, you draw three cards.
+SVar:TrigRepeatEach:DB$ RepeatEach | RepeatPlayers$ Opponent | RepeatSubAbility$ DBDiscard | SubAbility$ DBDraw
+SVar:DBDiscard:DB$ Discard | Defined$ Player.IsRemembered | NumCards$ X | Mode$ TgtChoose | RememberDiscarded$ True
+SVar:DBDraw:DB$ Draw | NumCards$ 3 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ LT3 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:PlayerCountRemembered$CardsInHand/Minus.5
+Oracle:When you set this scheme in motion, each opponent who has more than five cards in hand discards cards equal to the difference. Then if fewer than three cards were discarded this way, you draw three cards.
diff --git a/forge-gui/res/cardsfolder/upcoming/your_own_face_mocks_you.txt b/forge-gui/res/cardsfolder/upcoming/your_own_face_mocks_you.txt
index 9300f984339..eda390767ca 100644
--- a/forge-gui/res/cardsfolder/upcoming/your_own_face_mocks_you.txt
+++ b/forge-gui/res/cardsfolder/upcoming/your_own_face_mocks_you.txt
@@ -1,10 +1,10 @@
-Name:Your Own Face Mocks You
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigCopyPermanent | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, choose up to two target creatures your opponents control. For each one, create a token that's a copy of it. If you created fewer than two tokens this way, create a number of 4/4 colorless Scarecrow artifact creature tokens with vigilance equal to the difference.
-SVar:TrigCopyPermanent:DB$ CopyPermanent | ValidTgts$ Creature.OppCtrl | NumCopies$ 1 | AILogic$ DuplicatePerms | TargetMin$ 0 | TargetMax$ 2 | RememberTokens$ True | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenAmount$ Difference | TokenScript$ c_4_4_a_scarecrow_vigilance | TokenOwner$ You | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$Amount
-SVar:Difference:Number$2/Minus.X
-Oracle:When you set this scheme in motion, choose up to two target creatures your opponents control. For each one, create a token that's a copy of it. If you created fewer than two tokens this way, create a number of 4/4 colorless Scarecrow artifact creature tokens with vigilance equal to the difference.
+Name:Your Own Face Mocks You
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigCopyPermanent | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, choose up to two target creatures your opponents control. For each one, create a token that's a copy of it. If you created fewer than two tokens this way, create a number of 4/4 colorless Scarecrow artifact creature tokens with vigilance equal to the difference.
+SVar:TrigCopyPermanent:DB$ CopyPermanent | ValidTgts$ Creature.OppCtrl | NumCopies$ 1 | AILogic$ DuplicatePerms | TargetMin$ 0 | TargetMax$ 2 | RememberTokens$ True | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ Difference | TokenScript$ c_4_4_a_scarecrow_vigilance | TokenOwner$ You | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Remembered$Amount
+SVar:Difference:Number$2/Minus.X
+Oracle:When you set this scheme in motion, choose up to two target creatures your opponents control. For each one, create a token that's a copy of it. If you created fewer than two tokens this way, create a number of 4/4 colorless Scarecrow artifact creature tokens with vigilance equal to the difference.
diff --git a/forge-gui/res/cardsfolder/upcoming/zimone_mystery_unraveler.txt b/forge-gui/res/cardsfolder/upcoming/zimone_mystery_unraveler.txt
index 76b004c004e..be5365c55de 100644
--- a/forge-gui/res/cardsfolder/upcoming/zimone_mystery_unraveler.txt
+++ b/forge-gui/res/cardsfolder/upcoming/zimone_mystery_unraveler.txt
@@ -1,10 +1,10 @@
-Name:Zimone, Mystery Unraveler
-ManaCost:2 G U
-Types:Legendary Creature Human Wizard
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDread | TriggerDescription$ Landfall — Whenever a land you control enters, manifest dread if this is the first time this ability has resolved this turn. Otherwise, you may turn a permanent you control face up. (To 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 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | SubAbility$ DBTurnFaceUp
-SVar:DBTurnFaceUp:DB$ SetState | Optional$ True | Choices$ Permanent.faceDown+YouCtrl | ChoiceTitle$ Select a face-down permanent you control | ConditionCheckSVar$ X | ConditionSVarCompare$ GT1 | Mode$ TurnFaceUp
-SVar:X:Count$ResolvedThisTurn
-SVar:BuffedBy:Land
-Oracle:Landfall — Whenever a land you control enters, manifest dread if this is the first time this ability has resolved this turn. Otherwise, you may turn a permanent you control face up. (To 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.)
+Name:Zimone, Mystery Unraveler
+ManaCost:2 G U
+Types:Legendary Creature Human Wizard
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDread | TriggerDescription$ Landfall — Whenever a land you control enters, manifest dread if this is the first time this ability has resolved this turn. Otherwise, you may turn a permanent you control face up. (To 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 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | SubAbility$ DBTurnFaceUp
+SVar:DBTurnFaceUp:DB$ SetState | Optional$ True | Choices$ Permanent.faceDown+YouCtrl | ChoiceTitle$ Select a face-down permanent you control | ConditionCheckSVar$ X | ConditionSVarCompare$ GT1 | Mode$ TurnFaceUp
+SVar:X:Count$ResolvedThisTurn
+SVar:BuffedBy:Land
+Oracle:Landfall — Whenever a land you control enters, manifest dread if this is the first time this ability has resolved this turn. Otherwise, you may turn a permanent you control face up. (To 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/zimones_hypothesis.txt b/forge-gui/res/cardsfolder/upcoming/zimones_hypothesis.txt
index 2e451ac8e49..e2c428203bd 100644
--- a/forge-gui/res/cardsfolder/upcoming/zimones_hypothesis.txt
+++ b/forge-gui/res/cardsfolder/upcoming/zimones_hypothesis.txt
@@ -1,8 +1,8 @@
-Name:Zimone's Hypothesis
-ManaCost:3 U U
-Types:Instant
-A:SP$ PutCounter | Choices$ Creature | ChoiceTitle$ Choose a creature | CounterType$ P1P1 | CounterNum$ 1 | Optional$ True | SubAbility$ DBGenericChoice | SpellDescription$ You may put a +1/+1 counter on a creature. Then choose odd or even. Return each creature with power of the chosen quality to its owner's hand. (Zero is even.)
-SVar:DBGenericChoice:DB$ GenericChoice | Choices$ Odd,Even
-SVar:Odd:DB$ ChangeZoneAll | ChangeType$ Creature.powerOdd | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Odd
-SVar:Even:DB$ ChangeZoneAll | ChangeType$ Creature.powerEven | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Even
-Oracle:You may put a +1/+1 counter on a creature. Then choose odd or even. Return each creature with power of the chosen quality to its owner's hand. (Zero is even.)
+Name:Zimone's Hypothesis
+ManaCost:3 U U
+Types:Instant
+A:SP$ PutCounter | Choices$ Creature | ChoiceTitle$ Choose a creature | CounterType$ P1P1 | CounterNum$ 1 | Optional$ True | SubAbility$ DBGenericChoice | SpellDescription$ You may put a +1/+1 counter on a creature. Then choose odd or even. Return each creature with power of the chosen quality to its owner's hand. (Zero is even.)
+SVar:DBGenericChoice:DB$ GenericChoice | Choices$ Odd,Even
+SVar:Odd:DB$ ChangeZoneAll | ChangeType$ Creature.powerOdd | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Odd
+SVar:Even:DB$ ChangeZoneAll | ChangeType$ Creature.powerEven | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Even
+Oracle:You may put a +1/+1 counter on a creature. Then choose odd or even. Return each creature with power of the chosen quality to its owner's hand. (Zero is even.)