diff --git a/forge-gui/res/cardsfolder/k/klement_novice_acolyte.txt b/forge-gui/res/cardsfolder/k/klement_novice_acolyte.txt
index 8b444cddf0b..1562fe471fe 100644
--- a/forge-gui/res/cardsfolder/k/klement_novice_acolyte.txt
+++ b/forge-gui/res/cardsfolder/k/klement_novice_acolyte.txt
@@ -33,7 +33,7 @@ Types:Legendary Creature Tiefling Cleric
 PT:3/4
 K:Vigilance
 T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigSeek | TriggerDescription$ When this creature specializes, seek three nonland permanent cards. Choose one of those cards and shuffle the rest into your library.
-SVar:TrigSeek:DB$ Seek | Num$ 3 | ChangeType$ Card.Permanent+nonLand | RememberFound$ True | SubAbility$ DBChooseCard
+SVar:TrigSeek:DB$ Seek | Num$ 3 | Type$ Card.Permanent+nonLand | RememberFound$ True | SubAbility$ DBChooseCard
 SVar:DBChooseCard:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Card.IsRemembered | ForgetChosen$ True | SubAbility$ DBShuffle
 SVar:DBShuffle:DB$ ChangeZone | Origin$ Hand | Destination$ Library | Defined$ Remembered | Shuffle$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
diff --git a/forge-gui/res/cardsfolder/upcoming/baloth_prime.txt b/forge-gui/res/cardsfolder/upcoming/baloth_prime.txt
index 09fa21b701b..3ebedce383e 100644
--- a/forge-gui/res/cardsfolder/upcoming/baloth_prime.txt
+++ b/forge-gui/res/cardsfolder/upcoming/baloth_prime.txt
@@ -1,13 +1,13 @@
-Name:Baloth Prime
-ManaCost:3 G
-Types:Creature Beast
-PT:10/10
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | Description$ This creature enters tapped with six stun counters on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
-SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter
-SVar:DBAddCounter:DB$ PutCounter | Defined$ Self | ETB$ True | CounterType$ STUN | CounterNum$ 6
-T:Mode$ Sacrificed | ValidCard$ Land | Execute$ TrigToken | TriggerZones$ Battlefield | ValidPlayer$ You | TriggerDescription$ Whenever you sacrifice a land, create a tapped 4/4 green Beast creature token and untap this creature.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_4_4_beast | TokenTapped$ True | SubAbility$ DBUntap | TokenOwner$ You
-SVar:DBUntap:DB$ Untap
-A:AB$ GainLife | Cost$ 4 Sac<1/Land> | Defined$ You | LifeAmount$ 2 | SpellDescription$ You gain 2 life.
-DeckHas:Ability$Counters|Token|Lifegain
+Name:Baloth Prime
+ManaCost:3 G
+Types:Creature Beast
+PT:10/10
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | Description$ This creature enters tapped with six stun counters on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter
+SVar:DBAddCounter:DB$ PutCounter | Defined$ Self | ETB$ True | CounterType$ STUN | CounterNum$ 6
+T:Mode$ Sacrificed | ValidCard$ Land | Execute$ TrigToken | TriggerZones$ Battlefield | ValidPlayer$ You | TriggerDescription$ Whenever you sacrifice a land, create a tapped 4/4 green Beast creature token and untap this creature.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_4_4_beast | TokenTapped$ True | SubAbility$ DBUntap | TokenOwner$ You
+SVar:DBUntap:DB$ Untap
+A:AB$ GainLife | Cost$ 4 Sac<1/Land> | Defined$ You | LifeAmount$ 2 | SpellDescription$ You gain 2 life.
+DeckHas:Ability$Counters|Token|Lifegain
 Oracle:This creature enters tapped with six stun counters on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)\nWhenever you sacrifice a land, create a tapped 4/4 green Beast creature token and untap this creature.\n{4}, Sacrifice a land: You gain 2 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/debris_field_crusher.txt b/forge-gui/res/cardsfolder/upcoming/debris_field_crusher.txt
index ac5f7f03fe0..7bce9078729 100644
--- a/forge-gui/res/cardsfolder/upcoming/debris_field_crusher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/debris_field_crusher.txt
@@ -1,10 +1,10 @@
-Name:Debris Field Crusher
-ManaCost:4 R
-Types:Artifact Spacecraft
-PT:1/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When this Spacecraft enters, it deals 3 damage to any target.
-SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 3
-K:Station:8
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE8_CHARGE | AddType$ Creature | AddKeyword$ Flying | AddAbility$ CrusherPump | Description$ STATION 8+ Flying,,,{1}{R}: This Spacecraft gets +2/+0 until end of turn.
-SVar:CrusherPump:AB$ Pump | Cost$ 1 R | NumAtt$ +2 | SpellDescription$ This Spacecraft gets +2/+0 until end of turn.
+Name:Debris Field Crusher
+ManaCost:4 R
+Types:Artifact Spacecraft
+PT:1/5
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When this Spacecraft enters, it deals 3 damage to any target.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 3
+K:Station:8
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE8_CHARGE | AddType$ Creature | AddKeyword$ Flying | AddAbility$ CrusherPump | Description$ STATION 8+ Flying,,,{1}{R}: This Spacecraft gets +2/+0 until end of turn.
+SVar:CrusherPump:AB$ Pump | Cost$ 1 R | NumAtt$ +2 | SpellDescription$ This Spacecraft gets +2/+0 until end of turn.
 Oracle:When this Spacecraft enters, it deals 3 damage to any target.\nStation (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery. It's an artifact creature at 8+.)\nSTATION 8+\nFlying\n{1}{R}: This Spacecraft gets +2/+0 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/eumidian_hatchery.txt b/forge-gui/res/cardsfolder/upcoming/eumidian_hatchery.txt
index c4626fb02a9..e329ac0aaf4 100644
--- a/forge-gui/res/cardsfolder/upcoming/eumidian_hatchery.txt
+++ b/forge-gui/res/cardsfolder/upcoming/eumidian_hatchery.txt
@@ -1,10 +1,10 @@
-Name:Eumidian Hatchery
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ B | SubAbility$ DBPutCounter | SpellDescription$ Add {B}. Put a hatchling counter on this land.
-SVar:DBPutCounter:DB$ PutCounter | CounterType$ HATCHLING | CounterNum$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this land is put into a graveyard from the battlefield, for each hatchling counter on it, create a 1/1 black Insect creature token with flying.
-SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ b_1_1_insect_flying | TokenOwner$ You
-SVar:X:Count$CardCounters.HATCHLING
-DeckHas:Ability$Counters|Token
+Name:Eumidian Hatchery
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ B | SubAbility$ DBPutCounter | SpellDescription$ Add {B}. Put a hatchling counter on this land.
+SVar:DBPutCounter:DB$ PutCounter | CounterType$ HATCHLING | CounterNum$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this land is put into a graveyard from the battlefield, for each hatchling counter on it, create a 1/1 black Insect creature token with flying.
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ b_1_1_insect_flying | TokenOwner$ You
+SVar:X:Count$CardCounters.HATCHLING
+DeckHas:Ability$Counters|Token
 Oracle:{T}, Pay 1 life: Add {B}. Put a hatchling counter on this land.\nWhen this land is put into a graveyard from the battlefield, for each hatchling counter on it, create a 1/1 black Insect creature token with flying.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/evendo_brushrazer.txt b/forge-gui/res/cardsfolder/upcoming/evendo_brushrazer.txt
index 18d4ebff126..b9c61812082 100644
--- a/forge-gui/res/cardsfolder/upcoming/evendo_brushrazer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/evendo_brushrazer.txt
@@ -1,10 +1,10 @@
-Name:Evendo Brushrazer
-ManaCost:2 R
-Types:Creature Insect Warrior
-PT:2/2
-T:Mode$ Sacrificed | ValidCard$ Permanent.!token | Execute$ TrigExile | TriggerZones$ Battlefield | ValidPlayer$ You | TriggerDescription$ Whenever you sacrifice a nontoken permanent, exile the top card of your library.
-SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile
-S:Mode$ Continuous | Affected$ Card.ExiledWithSource | AffectedZone$ Exile | Condition$ PlayerTurn | MayPlay$ True | CheckSVar$ X | Description$ During your turn, as long as you've sacrificed a nontoken permanent this turn, you may play cards exiled with this creature.
-A:AB$ Mana | Cost$ T Sac<1/Land> | Produced$ R R | SpellDescription$ Add {R}{R}.
-SVar:X:PlayerCountPropertyYou$SacrificedThisTurn Permanent.!token
+Name:Evendo Brushrazer
+ManaCost:2 R
+Types:Creature Insect Warrior
+PT:2/2
+T:Mode$ Sacrificed | ValidCard$ Permanent.!token | Execute$ TrigExile | TriggerZones$ Battlefield | ValidPlayer$ You | TriggerDescription$ Whenever you sacrifice a nontoken permanent, exile the top card of your library.
+SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile
+S:Mode$ Continuous | Affected$ Card.ExiledWithSource | AffectedZone$ Exile | Condition$ PlayerTurn | MayPlay$ True | CheckSVar$ X | Description$ During your turn, as long as you've sacrificed a nontoken permanent this turn, you may play cards exiled with this creature.
+A:AB$ Mana | Cost$ T Sac<1/Land> | Produced$ R R | SpellDescription$ Add {R}{R}.
+SVar:X:PlayerCountPropertyYou$SacrificedThisTurn Permanent.!token
 Oracle:Whenever you sacrifice a nontoken permanent, exile the top card of your library.\nDuring your turn, as long as you've sacrificed a nontoken permanent this turn, you may play cards exiled with this creature.\n{T}, Sacrifice a land: Add {R}{R}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/exploration_broodship.txt b/forge-gui/res/cardsfolder/upcoming/exploration_broodship.txt
index 9c8c7e6853b..c135cf946e7 100644
--- a/forge-gui/res/cardsfolder/upcoming/exploration_broodship.txt
+++ b/forge-gui/res/cardsfolder/upcoming/exploration_broodship.txt
@@ -1,10 +1,10 @@
-Name:Exploration Broodship
-ManaCost:G
-Types:Artifact Spacecraft
-PT:4/4
-K:Station:8
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE3_CHARGE | AddStaticAbility$ ExplorationStatic | Description$ STATION 3+ You may play an additional land on each of your turns.
-SVar:ExplorationStatic:Mode$ Continuous | Affected$ You | AdjustLandPlays$ 1 | Description$ You may play an additional land on each of your turns.
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE8_CHARGE | AddType$ Creature | AddKeyword$ Flying | AddStaticAbility$ BroodshipStatic | Description$ STATION 8+ Flying,,,Once during each of your turns, you may cast a permanent spell from your graveyard by sacrificing a land in addition to paying its other costs.
-SVar:BroodshipStatic:Mode$ Continuous | Affected$ Permanent.nonLand+YouOwn | Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | RaiseCost$ Sac<1/Land> | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ Once during each of your turns, you may cast a permanent spell from your graveyard by sacrificing a land in addition to paying its other costs.
-Oracle:Station (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery. It's an artifact creature at 8+.)\nSTATION 3+\nYou may play an additional land on each of your turns.\nSTATION 8+\nFlying\nOnce during each of your turns, you may cast a permanent spell from your graveyard by sacrificing a land in addition to paying its other costs.
+Name:Exploration Broodship
+ManaCost:G
+Types:Artifact Spacecraft
+PT:4/4
+K:Station:8
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE3_CHARGE | AddStaticAbility$ ExplorationStatic | Description$ STATION 3+ You may play an additional land on each of your turns.
+SVar:ExplorationStatic:Mode$ Continuous | Affected$ You | AdjustLandPlays$ 1 | Description$ You may play an additional land on each of your turns.
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE8_CHARGE | AddType$ Creature | AddKeyword$ Flying | AddStaticAbility$ BroodshipStatic | Description$ STATION 8+ Flying,,,Once during each of your turns, you may cast a permanent spell from your graveyard by sacrificing a land in addition to paying its other costs.
+SVar:BroodshipStatic:Mode$ Continuous | Affected$ Permanent.nonLand+YouOwn | Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | RaiseCost$ Sac<1/Land> | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ Once during each of your turns, you may cast a permanent spell from your graveyard by sacrificing a land in addition to paying its other costs.
+Oracle:Station (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery. It's an artifact creature at 8+.)\nSTATION 3+\nYou may play an additional land on each of your turns.\nSTATION 8+\nFlying\nOnce during each of your turns, you may cast a permanent spell from your graveyard by sacrificing a land in addition to paying its other costs.
diff --git a/forge-gui/res/cardsfolder/upcoming/festering_thicket.txt b/forge-gui/res/cardsfolder/upcoming/festering_thicket.txt
index d50bb8e89f6..a41212f8489 100644
--- a/forge-gui/res/cardsfolder/upcoming/festering_thicket.txt
+++ b/forge-gui/res/cardsfolder/upcoming/festering_thicket.txt
@@ -1,7 +1,7 @@
-Name:Festering Thicket
-ManaCost:no cost
-Types:Land Swamp Forest
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
-SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-K:Cycling:2
+Name:Festering Thicket
+ManaCost:no cost
+Types:Land Swamp Forest
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+K:Cycling:2
 Oracle:({T}: Add {B} or {G}.)\nThis land enters tapped.\nCycling {2} ({2}, Discard this card: Draw a card.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/horizon_explorer.txt b/forge-gui/res/cardsfolder/upcoming/horizon_explorer.txt
index 8ddd46c95fb..e3dfce083ef 100644
--- a/forge-gui/res/cardsfolder/upcoming/horizon_explorer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/horizon_explorer.txt
@@ -1,10 +1,10 @@
-Name:Horizon Explorer
-ManaCost:2 G
-Types:Creature Insect Scout
-PT:2/4
-R:Event$ Moved | ValidCard$ Land.YouCtrl | Destination$ Battlefield | ReplaceWith$ ETBUntapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Lands you control enter untapped.
-SVar:ETBUntapped:DB$ Untap | ETB$ True | Defined$ ReplacedCard
-T:Mode$ AttackersDeclaredOneTarget | ValidAttackers$ Creature.YouCtrl | AttackedTarget$ Player | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack a player, create a Lander token. (It's an artifact with "{2}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.")
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_lander_sac_search | TokenOwner$ You
-DeckHas:Ability$Token
+Name:Horizon Explorer
+ManaCost:2 G
+Types:Creature Insect Scout
+PT:2/4
+R:Event$ Moved | ValidCard$ Land.YouCtrl | Destination$ Battlefield | ReplaceWith$ ETBUntapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Lands you control enter untapped.
+SVar:ETBUntapped:DB$ Untap | ETB$ True | Defined$ ReplacedCard
+T:Mode$ AttackersDeclaredOneTarget | ValidAttackers$ Creature.YouCtrl | AttackedTarget$ Player | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack a player, create a Lander token. (It's an artifact with "{2}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_lander_sac_search | TokenOwner$ You
+DeckHas:Ability$Token
 Oracle:Lands you control enter untapped.\nWhenever you attack a player, create a Lander token. (It's an artifact with "{2}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.")
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/hullcarver.txt b/forge-gui/res/cardsfolder/upcoming/hullcarver.txt
index a75df15e15d..79072a835ec 100644
--- a/forge-gui/res/cardsfolder/upcoming/hullcarver.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hullcarver.txt
@@ -1,6 +1,6 @@
-Name:Hullcarver
-ManaCost:B
-Types:Artifact Creature Robot Assassin
-PT:1/1
-K:Deathtouch
+Name:Hullcarver
+ManaCost:B
+Types:Artifact Creature Robot Assassin
+PT:1/1
+K:Deathtouch
 Oracle:Deathtouch
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/illvoi_galeblade.txt b/forge-gui/res/cardsfolder/upcoming/illvoi_galeblade.txt
index 64dffc9574a..8c38b98efb1 100644
--- a/forge-gui/res/cardsfolder/upcoming/illvoi_galeblade.txt
+++ b/forge-gui/res/cardsfolder/upcoming/illvoi_galeblade.txt
@@ -1,8 +1,8 @@
-Name:Illvoi Galeblade
-ManaCost:U
-Types:Creature Jellyfish Warrior
-PT:1/1
-K:Flash
-K:Flying
-A:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | SpellDescription$ Draw a card.
+Name:Illvoi Galeblade
+ManaCost:U
+Types:Creature Jellyfish Warrior
+PT:1/1
+K:Flash
+K:Flying
+A:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | SpellDescription$ Draw a card.
 Oracle:Flash\nFlying\n{2}, Sacrifice this creature: Draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/mouth_of_the_storm.txt b/forge-gui/res/cardsfolder/upcoming/mouth_of_the_storm.txt
index f9ff377fefd..3565802bd9c 100644
--- a/forge-gui/res/cardsfolder/upcoming/mouth_of_the_storm.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mouth_of_the_storm.txt
@@ -1,10 +1,10 @@
-Name:Mouth of the Storm
-ManaCost:6 U
-Types:Creature Elemental
-PT:6/6
-K:Flying
-K:Ward:2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When this creature enters, creatures your opponents control get -3/-0 until your next turn.
-SVar:TrigPumpAll:DB$ PumpAll | NumAtt$ -3 | ValidCards$ Creature.OppCtrl | IsCurse$ True | Duration$ UntilYourNextTurn
-SVar:PlayMain1:TRUE
-Oracle:Flying\nWard {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nWhen this creature enters, creatures your opponents control get -3/-0 until your next turn.
+Name:Mouth of the Storm
+ManaCost:6 U
+Types:Creature Elemental
+PT:6/6
+K:Flying
+K:Ward:2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When this creature enters, creatures your opponents control get -3/-0 until your next turn.
+SVar:TrigPumpAll:DB$ PumpAll | NumAtt$ -3 | ValidCards$ Creature.OppCtrl | IsCurse$ True | Duration$ UntilYourNextTurn
+SVar:PlayMain1:TRUE
+Oracle:Flying\nWard {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nWhen this creature enters, creatures your opponents control get -3/-0 until your next turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/nutrient_block.txt b/forge-gui/res/cardsfolder/upcoming/nutrient_block.txt
index e5c110cdb55..a237e80b6eb 100644
--- a/forge-gui/res/cardsfolder/upcoming/nutrient_block.txt
+++ b/forge-gui/res/cardsfolder/upcoming/nutrient_block.txt
@@ -1,9 +1,9 @@
-Name:Nutrient Block
-ManaCost:1
-Types:Artifact Food
-K:Indestructible
-A:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME> | Defined$ You | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When this artifact is put into a graveyard from the battlefield, draw a card.
-SVar:TrigDraw:DB$ Draw
-DeckHas:Ability$LifeGain
+Name:Nutrient Block
+ManaCost:1
+Types:Artifact Food
+K:Indestructible
+A:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME> | Defined$ You | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When this artifact is put into a graveyard from the battlefield, draw a card.
+SVar:TrigDraw:DB$ Draw
+DeckHas:Ability$LifeGain
 Oracle:Indestructible (Effects that say "destroy" don't destroy this artifact.)\n{2}, {T}, Sacrifice this artifact: You gain 3 life.\nWhen this artifact is put into a graveyard from the battlefield, draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/planetary_annihilation.txt b/forge-gui/res/cardsfolder/upcoming/planetary_annihilation.txt
index bf24c5357f3..3ed927a2eca 100644
--- a/forge-gui/res/cardsfolder/upcoming/planetary_annihilation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/planetary_annihilation.txt
@@ -1,8 +1,8 @@
-Name:Planetary Annihilation
-ManaCost:3 R R
-Types:Sorcery
-A:SP$ ChooseCard | Defined$ Player | Choices$ Land | ControlledByPlayer$ Chooser | Amount$ 6 | ChoiceTitle$ Choose six lands to keep | Mandatory$ True | Reveal$ True | SubAbility$ DBSac | StackDescription$ SpellDescription | SpellDescription$ Each player chooses six lands they control, then sacrifices the rest. CARDNAME deals 6 damage to each creature.
-SVar:DBSac:DB$ SacrificeAll | ValidCards$ Land.nonChosenCard | SubAbility$ DBDamageAll
-SVar:DBDamageAll:DB$ DamageAll | ValidCards$ Creature | NumDmg$ 6 | ValidDescription$ each creature.
-DeckHas:Ability$Sacrifice
-Oracle:Each player chooses six lands they control, then sacrifices the rest. Planetary Annihilation deals 6 damage to each creature.
+Name:Planetary Annihilation
+ManaCost:3 R R
+Types:Sorcery
+A:SP$ ChooseCard | Defined$ Player | Choices$ Land | ControlledByPlayer$ Chooser | Amount$ 6 | ChoiceTitle$ Choose six lands to keep | Mandatory$ True | Reveal$ True | SubAbility$ DBSac | StackDescription$ SpellDescription | SpellDescription$ Each player chooses six lands they control, then sacrifices the rest. CARDNAME deals 6 damage to each creature.
+SVar:DBSac:DB$ SacrificeAll | ValidCards$ Land.nonChosenCard | SubAbility$ DBDamageAll
+SVar:DBDamageAll:DB$ DamageAll | ValidCards$ Creature | NumDmg$ 6 | ValidDescription$ each creature.
+DeckHas:Ability$Sacrifice
+Oracle:Each player chooses six lands they control, then sacrifices the rest. Planetary Annihilation deals 6 damage to each creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/scouring_swarm.txt b/forge-gui/res/cardsfolder/upcoming/scouring_swarm.txt
index 012518527db..5b18dc2d0ad 100644
--- a/forge-gui/res/cardsfolder/upcoming/scouring_swarm.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scouring_swarm.txt
@@ -1,12 +1,12 @@
-Name:Scouring Swarm
-ManaCost:1 B G
-Types:Creature Insect
-PT:1/1
-K:Flying
-T:Mode$ Sacrificed | ValidCard$ Land | Execute$ TrigBranch | TriggerZones$ Battlefield | ValidPlayer$ You | TriggerDescription$ Whenever you sacrifice a land, create a tapped token that's a copy of this creature if seven or more land cards are in your graveyard. Otherwise, create a tapped 1/1 black Insect creature token with flying.
-SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE7 | TrueSubAbility$ DBCopy | FalseSubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_insect_flying | TokenOwner$ You
-SVar:DBCopy:DB$ CopyPermanent | Defined$ Self | NumCopies$ 1
-SVar:X:Count$ValidGraveyard Land.YouOwn
-DeckHas:Ability$Token
+Name:Scouring Swarm
+ManaCost:1 B G
+Types:Creature Insect
+PT:1/1
+K:Flying
+T:Mode$ Sacrificed | ValidCard$ Land | Execute$ TrigBranch | TriggerZones$ Battlefield | ValidPlayer$ You | TriggerDescription$ Whenever you sacrifice a land, create a tapped token that's a copy of this creature if seven or more land cards are in your graveyard. Otherwise, create a tapped 1/1 black Insect creature token with flying.
+SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE7 | TrueSubAbility$ DBCopy | FalseSubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_insect_flying | TokenOwner$ You
+SVar:DBCopy:DB$ CopyPermanent | Defined$ Self | NumCopies$ 1
+SVar:X:Count$ValidGraveyard Land.YouOwn
+DeckHas:Ability$Token
 Oracle:Flying\nWhenever you sacrifice a land, create a tapped token that's a copy of this creature if seven or more land cards are in your graveyard. Otherwise, create a tapped 1/1 black Insect creature token with flying.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/systems_override.txt b/forge-gui/res/cardsfolder/upcoming/systems_override.txt
index 31b8aaa8586..424aa0431e5 100644
--- a/forge-gui/res/cardsfolder/upcoming/systems_override.txt
+++ b/forge-gui/res/cardsfolder/upcoming/systems_override.txt
@@ -1,9 +1,9 @@
-Name:Systems Override
-ManaCost:2 R
-Types:Sorcery
-A:SP$ GainControl | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SubAbility$ DBPutCounter | SpellDescription$ Gain control of target artifact or creature until end of turn. Untap that permanent. It gains haste until end of turn. If it's a Spacecraft, put ten charge counters on it. If you do, remove ten charge counters from it at the beginning of the next end step.
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted.Spacecraft | CounterType$ CHARGE | CounterNum$ 10 | RememberPut$ True | SubAbility$ DBDelTrig
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigRemoveCounter | RememberObjects$ RememberedLKI | ConditionDefined$ Remembered | ConditionPresent$ Card | TriggerDescription$ Remove ten charge counters from it at the beginning of the next end step. | SubAbility$ DBCleanup
-SVar:TrigRemoveCounter:DB$ RemoveCounter | Defined$ DelayTriggerRememberedLKI | CounterType$ CHARGE | CounterNum$ 10
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Gain control of target artifact or creature until end of turn. Untap that permanent. It gains haste until end of turn. If it's a Spacecraft, put ten charge counters on it. If you do, remove ten charge counters from it at the beginning of the next end step.
+Name:Systems Override
+ManaCost:2 R
+Types:Sorcery
+A:SP$ GainControl | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SubAbility$ DBPutCounter | SpellDescription$ Gain control of target artifact or creature until end of turn. Untap that permanent. It gains haste until end of turn. If it's a Spacecraft, put ten charge counters on it. If you do, remove ten charge counters from it at the beginning of the next end step.
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted.Spacecraft | CounterType$ CHARGE | CounterNum$ 10 | RememberPut$ True | SubAbility$ DBDelTrig
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigRemoveCounter | RememberObjects$ RememberedLKI | ConditionDefined$ Remembered | ConditionPresent$ Card | TriggerDescription$ Remove ten charge counters from it at the beginning of the next end step. | SubAbility$ DBCleanup
+SVar:TrigRemoveCounter:DB$ RemoveCounter | Defined$ DelayTriggerRememberedLKI | CounterType$ CHARGE | CounterNum$ 10
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Gain control of target artifact or creature until end of turn. Untap that permanent. It gains haste until end of turn. If it's a Spacecraft, put ten charge counters on it. If you do, remove ten charge counters from it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/upcoming/terrapact_intimidator.txt b/forge-gui/res/cardsfolder/upcoming/terrapact_intimidator.txt
index 4b304c149da..ea47f49fb93 100644
--- a/forge-gui/res/cardsfolder/upcoming/terrapact_intimidator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/terrapact_intimidator.txt
@@ -1,9 +1,9 @@
-Name:Terrapact Intimidator
-ManaCost:1 R
-Types:Creature Kavu Scout
-PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBChoice | TriggerDescription$ When this creature enters, target opponent may have you create two Lander tokens. If they don't, put two +1/+1 counters on this creature. (A Lander token is an artifact with "{2}, {T}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.")
-SVar:DBChoice:DB$ GenericChoice | ValidTgts$ Opponent | Choices$ TerrapactToken,TerrapactPutCounter
-SVar:TerrapactToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_a_lander_sac_search | TokenOwner$ You | SpellDescription$ CARDNAME's controller creates two Lander tokens.
-SVar:TerrapactPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ CARDNAME's controller puts two +1/+1 counters on it.
+Name:Terrapact Intimidator
+ManaCost:1 R
+Types:Creature Kavu Scout
+PT:2/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBChoice | TriggerDescription$ When this creature enters, target opponent may have you create two Lander tokens. If they don't, put two +1/+1 counters on this creature. (A Lander token is an artifact with "{2}, {T}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.")
+SVar:DBChoice:DB$ GenericChoice | ValidTgts$ Opponent | Choices$ TerrapactToken,TerrapactPutCounter
+SVar:TerrapactToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_a_lander_sac_search | TokenOwner$ You | SpellDescription$ CARDNAME's controller creates two Lander tokens.
+SVar:TerrapactPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ CARDNAME's controller puts two +1/+1 counters on it.
 Oracle:When this creature enters, target opponent may have you create two Lander tokens. If they don't, put two +1/+1 counters on this creature. (A Lander token is an artifact with "{2}, {T}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.")
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/umbral_collar_zealot.txt b/forge-gui/res/cardsfolder/upcoming/umbral_collar_zealot.txt
index a236e91b2f8..cd33f13ea0c 100644
--- a/forge-gui/res/cardsfolder/upcoming/umbral_collar_zealot.txt
+++ b/forge-gui/res/cardsfolder/upcoming/umbral_collar_zealot.txt
@@ -1,6 +1,6 @@
-Name:Umbral Collar Zealot
-ManaCost:1 B
-Types:Creature Human Cleric
-PT:3/2
-A:AB$ Surveil | Cost$ Sac<1/Creature.Other;Artifact.Other/another creature or artifact> | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
-Oracle:Sacrifice another creature or artifact: Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+Name:Umbral Collar Zealot
+ManaCost:1 B
+Types:Creature Human Cleric
+PT:3/2
+A:AB$ Surveil | Cost$ Sac<1/Creature.Other;Artifact.Other/another creature or artifact> | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+Oracle:Sacrifice another creature or artifact: 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/vernal_fen.txt b/forge-gui/res/cardsfolder/upcoming/vernal_fen.txt
index b744d8bdc43..a57c225c022 100644
--- a/forge-gui/res/cardsfolder/upcoming/vernal_fen.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vernal_fen.txt
@@ -1,6 +1,6 @@
-Name:Vernal Fen
-ManaCost:no cost
-Types:Land Swamp Forest
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ This land enters tapped unless you control two or more basic lands.
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Land.Basic+YouCtrl | ConditionCompare$ LE1
+Name:Vernal Fen
+ManaCost:no cost
+Types:Land Swamp Forest
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ This land enters tapped unless you control two or more basic lands.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Land.Basic+YouCtrl | ConditionCompare$ LE1
 Oracle:({T}: Add {B} or {G}.)\nThis land enters tapped unless you control two or more basic lands.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/warmaker_gunship.txt b/forge-gui/res/cardsfolder/upcoming/warmaker_gunship.txt
index ebba9291871..2e1fb956ddc 100644
--- a/forge-gui/res/cardsfolder/upcoming/warmaker_gunship.txt
+++ b/forge-gui/res/cardsfolder/upcoming/warmaker_gunship.txt
@@ -1,10 +1,10 @@
-Name:Warmaker Gunship
-ManaCost:2 R
-Types:Artifact Spacecraft
-PT:4/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When this Spacecraft enters, it deals damage equal to the number of artifacts you control to target creature an opponent controls.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumDmg$ X
-K:Station:6
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE6_CHARGE | AddType$ Creature | AddKeyword$ Flying | Description$ STATION 6+ Flying
-SVar:X:Count$Valid Artifact.YouCtrl
+Name:Warmaker Gunship
+ManaCost:2 R
+Types:Artifact Spacecraft
+PT:4/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When this Spacecraft enters, it deals damage equal to the number of artifacts you control to target creature an opponent controls.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumDmg$ X
+K:Station:6
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE6_CHARGE | AddType$ Creature | AddKeyword$ Flying | Description$ STATION 6+ Flying
+SVar:X:Count$Valid Artifact.YouCtrl
 Oracle:When this Spacecraft enters, it deals damage equal to the number of artifacts you control to target creature an opponent controls.\nStation (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery. It's an artifact creature at 6+.)\nSTATION 6+\nFlying
\ No newline at end of file