diff --git a/forge-gui/res/cardsfolder/upcoming/depthshaker_titan.txt b/forge-gui/res/cardsfolder/upcoming/depthshaker_titan.txt
index f83974cd5d0..6ed9f972ea6 100644
--- a/forge-gui/res/cardsfolder/upcoming/depthshaker_titan.txt
+++ b/forge-gui/res/cardsfolder/upcoming/depthshaker_titan.txt
@@ -1,10 +1,10 @@
-Name:Depthshaker Titan
-ManaCost:5 R R
-Types:Artifact Creature Robot
-PT:5/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBAnimate | TriggerDescription$ When this creature enters, any number of target noncreature artifacts you control become 3/3 artifact creatures. Sacrifice them at the beginning of the next end step.
-SVar:DBAnimate:DB$ Animate | ValidTgts$ Artifact.nonCreature+YouControl | TgtPrompt$ Select target noncreature artifact you control | TargetMin$ 0 | TargetMax$ MaxTargets | Power$ 3 | Toughness$ 3 | Types$ Creature | AtEOT$ Sacrifice
-S:Mode$ Continuous | Affected$ Creature.Artifact+YouCtrl | AddKeyword$ Melee & Trample & Haste | Description$ Each artifact creature you control has melee, trample, and haste. (Whenever a creature with melee attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)
-SVar:MaxTargets:Count$Valid Artifact.nonCreature+YouCtrl
-DeckHints:Type$Artifact
-Oracle:When this creature enters, any number of target noncreature artifacts you control become 3/3 artifact creatures. Sacrifice them at the beginning of the next end step.\nEach artifact creature you control has melee, trample, and haste. (Whenever a creature with melee attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)
+Name:Depthshaker Titan
+ManaCost:5 R R
+Types:Artifact Creature Robot
+PT:5/5
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBAnimate | TriggerDescription$ When this creature enters, any number of target noncreature artifacts you control become 3/3 artifact creatures. Sacrifice them at the beginning of the next end step.
+SVar:DBAnimate:DB$ Animate | ValidTgts$ Artifact.nonCreature+YouControl | TgtPrompt$ Select target noncreature artifact you control | TargetMin$ 0 | TargetMax$ MaxTargets | Power$ 3 | Toughness$ 3 | Types$ Creature | AtEOT$ Sacrifice
+S:Mode$ Continuous | Affected$ Creature.Artifact+YouCtrl | AddKeyword$ Melee & Trample & Haste | Description$ Each artifact creature you control has melee, trample, and haste. (Whenever a creature with melee attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)
+SVar:MaxTargets:Count$Valid Artifact.nonCreature+YouCtrl
+DeckHints:Type$Artifact
+Oracle:When this creature enters, any number of target noncreature artifacts you control become 3/3 artifact creatures. Sacrifice them at the beginning of the next end step.\nEach artifact creature you control has melee, trample, and haste. (Whenever a creature with melee attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)
diff --git a/forge-gui/res/cardsfolder/upcoming/glittering_massif.txt b/forge-gui/res/cardsfolder/upcoming/glittering_massif.txt
index 63cb666df03..14b20417327 100644
--- a/forge-gui/res/cardsfolder/upcoming/glittering_massif.txt
+++ b/forge-gui/res/cardsfolder/upcoming/glittering_massif.txt
@@ -1,7 +1,7 @@
-Name:Glittering Massif
-ManaCost:no cost
-Types:Land Mountain Plains
-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:Glittering Massif
+ManaCost:no cost
+Types:Land Mountain Plains
+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 {R} or {W}.)\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/gravkill.txt b/forge-gui/res/cardsfolder/upcoming/gravkill.txt
index 3be9a94d984..6c68ccb6c74 100644
--- a/forge-gui/res/cardsfolder/upcoming/gravkill.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gravkill.txt
@@ -1,5 +1,5 @@
-Name:Gravkill
-ManaCost:3 B
-Types:Instant
-A:SP$ ChangeZone | ValidTgts$ Creature,Spacecraft | TgtPrompt$ Select target creature or Spacecraft | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature or Spacecraft.
-Oracle:Exile target creature or Spacecraft.
+Name:Gravkill
+ManaCost:3 B
+Types:Instant
+A:SP$ ChangeZone | ValidTgts$ Creature,Spacecraft | TgtPrompt$ Select target creature or Spacecraft | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature or Spacecraft.
+Oracle:Exile target creature or Spacecraft.
diff --git a/forge-gui/res/cardsfolder/upcoming/insight_engine.txt b/forge-gui/res/cardsfolder/upcoming/insight_engine.txt
index b492ad5ecf1..63cd42c0892 100644
--- a/forge-gui/res/cardsfolder/upcoming/insight_engine.txt
+++ b/forge-gui/res/cardsfolder/upcoming/insight_engine.txt
@@ -1,8 +1,8 @@
-Name:Insight Engine
-ManaCost:2 U
-Types:Artifact
-A:AB$ PutCounter | Cost$ 2 T | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1 | SubAbility$ DBDraw | SpellDescription$ Put a charge counter on this artifact, then draw a card for each charge counter on it.
-SVar:DBDraw:DB$ Draw | NumCards$ X
-SVar:X:Count$CardCounters.CHARGE
-DeckHas:Ability$Counters
+Name:Insight Engine
+ManaCost:2 U
+Types:Artifact
+A:AB$ PutCounter | Cost$ 2 T | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1 | SubAbility$ DBDraw | SpellDescription$ Put a charge counter on this artifact, then draw a card for each charge counter on it.
+SVar:DBDraw:DB$ Draw | NumCards$ X
+SVar:X:Count$CardCounters.CHARGE
+DeckHas:Ability$Counters
 Oracle:{2}, {T}: Put a charge counter on this artifact, then draw a card for each charge counter on it.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/long_range_sensor.txt b/forge-gui/res/cardsfolder/upcoming/long_range_sensor.txt
index dabb3cbc555..3b595fe23cb 100644
--- a/forge-gui/res/cardsfolder/upcoming/long_range_sensor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/long_range_sensor.txt
@@ -1,8 +1,8 @@
-Name:Long-Range Sensor
-ManaCost:2 R
-Types:Artifact
-T:Mode$ AttackersDeclaredOneTarget | ValidAttackers$ Creature.YouCtrl | AttackedTarget$ Player | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack a player, put a charge counter on this artifact.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
-A:AB$ Discover | Cost$ 1 SubCounter<2/CHARGE> | Num$ 4 | SorcerySpeed$ True | SpellDescription$ Discover 4. Activate only as a sorcery. (Exile cards from the top of your library until you exile a nonland card with mana value 4 or less. Cast it without paying its mana cost or put it into your hand. Put the rest on the bottom in a random order.)
-DeckHas:Ability$Counters
+Name:Long-Range Sensor
+ManaCost:2 R
+Types:Artifact
+T:Mode$ AttackersDeclaredOneTarget | ValidAttackers$ Creature.YouCtrl | AttackedTarget$ Player | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack a player, put a charge counter on this artifact.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
+A:AB$ Discover | Cost$ 1 SubCounter<2/CHARGE> | Num$ 4 | SorcerySpeed$ True | SpellDescription$ Discover 4. Activate only as a sorcery. (Exile cards from the top of your library until you exile a nonland card with mana value 4 or less. Cast it without paying its mana cost or put it into your hand. Put the rest on the bottom in a random order.)
+DeckHas:Ability$Counters
 Oracle:Whenever you attack a player, put a charge counter on this artifact.\n{1}, Remove two charge counters from this artifact: Discover 4. Activate only as a sorcery. (Exile cards from the top of your library until you exile a nonland card with mana value 4 or less. Cast it without paying its mana cost or put it into your hand. Put the rest on the bottom in a random order.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/patrolling_peacemaker.txt b/forge-gui/res/cardsfolder/upcoming/patrolling_peacemaker.txt
index dd659ab5c25..a3bc32a09f5 100644
--- a/forge-gui/res/cardsfolder/upcoming/patrolling_peacemaker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/patrolling_peacemaker.txt
@@ -1,9 +1,9 @@
-Name:Patrolling Peacemaker
-ManaCost:2 W
-Types:Artifact Creature Robot Soldier
-PT:0/0
-K:etbCounter:P1P1:2
-T:Mode$ CommitCrime | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigProliferate | TriggerDescription$ Whenever an opponent commits a crime, proliferate. (They commit a crime if they target an opponent, anything an opponent controls, and/or cards in an opponent's graveyard. To proliferate, you choose any number of permanents and/or players, then give each another counter of each kind already there.)
-SVar:TrigProliferate:DB$ Proliferate
-DeckHas:Ability$Proliferate|Counters
-Oracle:This creature enters with two +1/+1 counters on it.\nWhenever an opponent commits a crime, proliferate. (They commit a crime if they target an opponent, anything an opponent controls, and/or cards in an opponent's graveyard. To proliferate, you choose any number of permanents and/or players, then give each another counter of each kind already there.)
+Name:Patrolling Peacemaker
+ManaCost:2 W
+Types:Artifact Creature Robot Soldier
+PT:0/0
+K:etbCounter:P1P1:2
+T:Mode$ CommitCrime | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigProliferate | TriggerDescription$ Whenever an opponent commits a crime, proliferate. (They commit a crime if they target an opponent, anything an opponent controls, and/or cards in an opponent's graveyard. To proliferate, you choose any number of permanents and/or players, then give each another counter of each kind already there.)
+SVar:TrigProliferate:DB$ Proliferate
+DeckHas:Ability$Proliferate|Counters
+Oracle:This creature enters with two +1/+1 counters on it.\nWhenever an opponent commits a crime, proliferate. (They commit a crime if they target an opponent, anything an opponent controls, and/or cards in an opponent's graveyard. To proliferate, you choose any number of permanents and/or players, then give each another counter of each kind already there.)
diff --git a/forge-gui/res/cardsfolder/upcoming/radiant_summit.txt b/forge-gui/res/cardsfolder/upcoming/radiant_summit.txt
index 27009dfbca0..7de34157538 100644
--- a/forge-gui/res/cardsfolder/upcoming/radiant_summit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/radiant_summit.txt
@@ -1,6 +1,6 @@
-Name:Radiant Summit
-ManaCost:no cost
-Types:Land Mountain Plains
-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:Radiant Summit
+ManaCost:no cost
+Types:Land Mountain Plains
+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 {R} or {W}.)\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/scout_for_survivors.txt b/forge-gui/res/cardsfolder/upcoming/scout_for_survivors.txt
index bd8d1741880..40e7a5592a8 100644
--- a/forge-gui/res/cardsfolder/upcoming/scout_for_survivors.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scout_for_survivors.txt
@@ -1,7 +1,7 @@
-Name:Scout for Survivors
-ManaCost:2 W
-Types:Sorcery
-A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TargetMin$ 0 | TargetMax$ 3 | MaxTotalTargetCMC$ 3 | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select up to three target creature cards with total mana value 3 or less | SubAbility$ DBPutCounter | StackDescription$ SpellDescription | SpellDescription$ Return up to three target creature cards with total mana value 3 or less from your graveyard to the battlefield. Put a +1/+1 counter on each of them.
-SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | Defined$ Targeted
-DeckHas:Ability$Counters
+Name:Scout for Survivors
+ManaCost:2 W
+Types:Sorcery
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TargetMin$ 0 | TargetMax$ 3 | MaxTotalTargetCMC$ 3 | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select up to three target creature cards with total mana value 3 or less | SubAbility$ DBPutCounter | StackDescription$ SpellDescription | SpellDescription$ Return up to three target creature cards with total mana value 3 or less from your graveyard to the battlefield. Put a +1/+1 counter on each of them.
+SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | Defined$ Targeted
+DeckHas:Ability$Counters
 Oracle:Return up to three target creature cards with total mana value 3 or less from your graveyard to the battlefield. Put a +1/+1 counter on each of them.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/solar_array.txt b/forge-gui/res/cardsfolder/upcoming/solar_array.txt
index 21a39ed2fd4..b472c6ef840 100644
--- a/forge-gui/res/cardsfolder/upcoming/solar_array.txt
+++ b/forge-gui/res/cardsfolder/upcoming/solar_array.txt
@@ -1,8 +1,8 @@
-Name:Solar Array
-ManaCost:3
-Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ Any | SubAbility$ DBEffect | SpellDescription$ Add one mana of any color. When you next cast an artifact spell this turn, that spell gains sunburst. (If it's a creature, it enters with a +1/+1 counter on it for each color of mana spent to cast it. Otherwise, it enters with that many charge counters on it.)
-SVar:DBEffect:DB$ Effect | Triggers$ SpellCast
-SVar:SpellCast:Mode$ SpellCast | ValidCard$ Artifact | ValidActivatingPlayer$ You | TriggerZones$ Command | OneOff$ True | Execute$ DBAnimate | TriggerDescription$ When you next cast an artifact spell this turn, that spell gains sunburst. (If it's a creature, it enters with a +1/+1 counter on it for each color of mana spent to cast it. Otherwise, it enters with that many charge counters on it.)
-SVar:DBAnimate:DB$ Animate | Defined$ TriggeredCardLKICopy | Keywords$ Sunburst | Duration$ Permanent
-Oracle:{T}: Add one mana of any color. When you next cast an artifact spell this turn, that spell gains sunburst. (If it's a creature, it enters with a +1/+1 counter on it for each color of mana spent to cast it. Otherwise, it enters with that many charge counters on it.)
+Name:Solar Array
+ManaCost:3
+Types:Artifact
+A:AB$ Mana | Cost$ T | Produced$ Any | SubAbility$ DBEffect | SpellDescription$ Add one mana of any color. When you next cast an artifact spell this turn, that spell gains sunburst. (If it's a creature, it enters with a +1/+1 counter on it for each color of mana spent to cast it. Otherwise, it enters with that many charge counters on it.)
+SVar:DBEffect:DB$ Effect | Triggers$ SpellCast
+SVar:SpellCast:Mode$ SpellCast | ValidCard$ Artifact | ValidActivatingPlayer$ You | TriggerZones$ Command | OneOff$ True | Execute$ DBAnimate | TriggerDescription$ When you next cast an artifact spell this turn, that spell gains sunburst. (If it's a creature, it enters with a +1/+1 counter on it for each color of mana spent to cast it. Otherwise, it enters with that many charge counters on it.)
+SVar:DBAnimate:DB$ Animate | Defined$ TriggeredCardLKICopy | Keywords$ Sunburst | Duration$ Permanent
+Oracle:{T}: Add one mana of any color. When you next cast an artifact spell this turn, that spell gains sunburst. (If it's a creature, it enters with a +1/+1 counter on it for each color of mana spent to cast it. Otherwise, it enters with that many charge counters on it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/surge_conductor.txt b/forge-gui/res/cardsfolder/upcoming/surge_conductor.txt
index 768ac92a6b7..6dc62fa2988 100644
--- a/forge-gui/res/cardsfolder/upcoming/surge_conductor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/surge_conductor.txt
@@ -1,9 +1,9 @@
-Name:Surge Conductor
-ManaCost:3
-Types:Artifact Creature Robot
-PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+!token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigProliferate | TriggerDescription$ Whenever another nontoken artifact you control enters, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
-SVar:TrigProliferate:DB$ Proliferate
-DeckHas:Ability$Proliferate
-DeckHints:Ability$Counters & Type$Artifact
-Oracle:Whenever another nontoken artifact you control enters, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
+Name:Surge Conductor
+ManaCost:3
+Types:Artifact Creature Robot
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+!token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigProliferate | TriggerDescription$ Whenever another nontoken artifact you control enters, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
+SVar:TrigProliferate:DB$ Proliferate
+DeckHas:Ability$Proliferate
+DeckHints:Ability$Counters & Type$Artifact
+Oracle:Whenever another nontoken artifact you control enters, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
diff --git a/forge-gui/res/cardsfolder/upcoming/uthros_research_craft.txt b/forge-gui/res/cardsfolder/upcoming/uthros_research_craft.txt
index 88aed956678..95461d0bf76 100644
--- a/forge-gui/res/cardsfolder/upcoming/uthros_research_craft.txt
+++ b/forge-gui/res/cardsfolder/upcoming/uthros_research_craft.txt
@@ -1,13 +1,13 @@
-Name:Uthros Research Craft
-ManaCost:2 U
-Types:Artifact Spacecraft
-PT:0/8
-K:Station:12
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE3_CHARGE | AddTrigger$ CastTrig | Description$ STATION 3+ Whenever you cast an artifact spell, draw a card. Put a charge counter on this Spacecraft.
-SVar:CastTrig:Mode$ SpellCast | ValidCard$ Artifact | ValidActivatingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an artifact spell, draw a card. Put a charge counter on this Spacecraft.
-SVar:TrigDraw:DB$ Draw | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE12_CHARGE | AddType$ Creature | AddKeyword$ Flying | AddStaticAbility$ CraftStatic | Description$ STATION 12+ Flying,,,This Spacecraft gets +1/+0 for each artifact you control.
-SVar:CraftStatic:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | Description$ This Spacecraft gets +1/+0 for each artifact you control.
-SVar:X:Count$Valid Artifact.YouCtrl
+Name:Uthros Research Craft
+ManaCost:2 U
+Types:Artifact Spacecraft
+PT:0/8
+K:Station:12
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE3_CHARGE | AddTrigger$ CastTrig | Description$ STATION 3+ Whenever you cast an artifact spell, draw a card. Put a charge counter on this Spacecraft.
+SVar:CastTrig:Mode$ SpellCast | ValidCard$ Artifact | ValidActivatingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an artifact spell, draw a card. Put a charge counter on this Spacecraft.
+SVar:TrigDraw:DB$ Draw | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE12_CHARGE | AddType$ Creature | AddKeyword$ Flying | AddStaticAbility$ CraftStatic | Description$ STATION 12+ Flying,,,This Spacecraft gets +1/+0 for each artifact you control.
+SVar:CraftStatic:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | Description$ This Spacecraft gets +1/+0 for each artifact you control.
+SVar:X:Count$Valid Artifact.YouCtrl
 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 12+.)\nSTATION 3+\nWhenever you cast an artifact spell, draw a card. Put a charge counter on this Spacecraft.\nSTATION 12+\nFlying\nThis Spacecraft gets +1/+0 for each artifact you control.
\ No newline at end of file