diff --git a/forge-gui/res/cardsfolder/upcoming/aerith_last_ancient.txt b/forge-gui/res/cardsfolder/upcoming/aerith_last_ancient.txt
index eeafc4325aa..5db47bd9fee 100644
--- a/forge-gui/res/cardsfolder/upcoming/aerith_last_ancient.txt
+++ b/forge-gui/res/cardsfolder/upcoming/aerith_last_ancient.txt
@@ -1,12 +1,12 @@
-Name:Aerith, Last Ancient
-ManaCost:2 G W
-Types:Legendary Creature Human Cleric Druid
-PT:3/5
-K:Lifelink
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigChangeZone | TriggerDescription$ Raise — At the beginning of your end step, if you gained life this turn, return target creature card from your graveyard to your hand. If you gained 7 or more life this turn, return that card to the battlefield instead.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouOwn | ConditionCheckSVar$ X | ConditionSVarCompare$ LT7 | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Defined$ Targeted | Origin$ Graveyard | Destination$ Battlefield | ConditionCheckSVar$ X | ConditionSVarCompare$ GE7
-SVar:X:Count$LifeYouGainedThisTurn
-DeckHas:Ability$LifeGain
-DeckHints:Ability$LifeGain
+Name:Aerith, Last Ancient
+ManaCost:2 G W
+Types:Legendary Creature Human Cleric Druid
+PT:3/5
+K:Lifelink
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigChangeZone | TriggerDescription$ Raise — At the beginning of your end step, if you gained life this turn, return target creature card from your graveyard to your hand. If you gained 7 or more life this turn, return that card to the battlefield instead.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouOwn | ConditionCheckSVar$ X | ConditionSVarCompare$ LT7 | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ Targeted | Origin$ Graveyard | Destination$ Battlefield | ConditionCheckSVar$ X | ConditionSVarCompare$ GE7
+SVar:X:Count$LifeYouGainedThisTurn
+DeckHas:Ability$LifeGain
+DeckHints:Ability$LifeGain
 Oracle:Lifelink\nRaise — At the beginning of your end step, if you gained life this turn, return target creature card from your graveyard to your hand. If you gained 7 or more life this turn, return that card to the battlefield instead.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/alisaie_leveilleur.txt b/forge-gui/res/cardsfolder/upcoming/alisaie_leveilleur.txt
index e712ba8443d..9172f5f712e 100644
--- a/forge-gui/res/cardsfolder/upcoming/alisaie_leveilleur.txt
+++ b/forge-gui/res/cardsfolder/upcoming/alisaie_leveilleur.txt
@@ -1,10 +1,10 @@
-Name:Alisaie Leveilleur
-ManaCost:2 W
-Types:Legendary Creature Elf Wizard
-PT:3/2
-K:Partner:Alphinaud Leveilleur
-K:First Strike
-S:Mode$ ReduceCost | ValidCard$ Card | Type$ Spell | Activator$ You | Amount$ 2 | CheckSVar$ YouCastThisTurn | SVarCompare$ EQ1 | Description$ Dualcast — The second spell you cast each turn costs {2} less to cast.
-SVar:YouCastThisTurn:Count$ThisTurnCast_Card.YouCtrl
-SVar:PlayMain1:TRUE
+Name:Alisaie Leveilleur
+ManaCost:2 W
+Types:Legendary Creature Elf Wizard
+PT:3/2
+K:Partner:Alphinaud Leveilleur
+K:First Strike
+S:Mode$ ReduceCost | ValidCard$ Card | Type$ Spell | Activator$ You | Amount$ 2 | CheckSVar$ YouCastThisTurn | SVarCompare$ EQ1 | Description$ Dualcast — The second spell you cast each turn costs {2} less to cast.
+SVar:YouCastThisTurn:Count$ThisTurnCast_Card.YouCtrl
+SVar:PlayMain1:TRUE
 Oracle:Partner with Alphinaud Leveilleur (When this creature enters, target player may put Alphinaud Leveilleur into their hand from their library, then shuffle.)\nFirst strike\nDualcast — The second spell you cast each turn costs {2} less to cast.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/alphinaud_leveilleur.txt b/forge-gui/res/cardsfolder/upcoming/alphinaud_leveilleur.txt
index 096aa53f248..bd923bbb42b 100644
--- a/forge-gui/res/cardsfolder/upcoming/alphinaud_leveilleur.txt
+++ b/forge-gui/res/cardsfolder/upcoming/alphinaud_leveilleur.txt
@@ -1,9 +1,9 @@
-Name:Alphinaud Leveilleur
-ManaCost:3 U
-Types:Legendary Creature Elf Wizard
-PT:3/2
-K:Partner:Alisaie Leveilleur
-K:Vigilance
-T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | ValidActivatingPlayer$ You | ActivatorThisTurnCast$ EQ2 | TriggerDescription$ Eukrasia — Whenever you cast your second spell each turn, draw a card.
-SVar:TrigDraw:DB$ Draw
-Oracle:Partner with Alisaie Leveilleur (When this creature enters, target player may put Alisaie Leveilleur into their hand from their library, then shuffle.)\nVigilance\nEukrasia — Whenever you cast your second spell each turn, draw a card.
+Name:Alphinaud Leveilleur
+ManaCost:3 U
+Types:Legendary Creature Elf Wizard
+PT:3/2
+K:Partner:Alisaie Leveilleur
+K:Vigilance
+T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | ValidActivatingPlayer$ You | ActivatorThisTurnCast$ EQ2 | TriggerDescription$ Eukrasia — Whenever you cast your second spell each turn, draw a card.
+SVar:TrigDraw:DB$ Draw
+Oracle:Partner with Alisaie Leveilleur (When this creature enters, target player may put Alisaie Leveilleur into their hand from their library, then shuffle.)\nVigilance\nEukrasia — Whenever you cast your second spell each turn, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/ardbert_warrior_of_darkness.txt b/forge-gui/res/cardsfolder/upcoming/ardbert_warrior_of_darkness.txt
index ed68fc949ff..41be1b064e5 100644
--- a/forge-gui/res/cardsfolder/upcoming/ardbert_warrior_of_darkness.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ardbert_warrior_of_darkness.txt
@@ -1,11 +1,11 @@
-Name:Ardbert, Warrior of Darkness
-ManaCost:1 W B
-Types:Legendary Creature Spirit Warrior
-PT:2/2
-T:Mode$ SpellCast | ValidCard$ Card.White | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCountersAll1 | TriggerDescription$ Whenever you cast a white spell, put a +1/+1 counter on each legendary creature you control. They gain vigilance until end of turn.
-SVar:TrigPutCountersAll1:DB$ PutCounterAll | ValidCards$ Creature.Legendary+YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPumpAll1
-SVar:DBPumpAll1:DB$ PumpAll | ValidCards$ Creature.Legendary+YouCtrl | KW$ Vigilance
-T:Mode$ SpellCast | ValidCard$ Card.Black | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCountersAll2 | TriggerDescription$ Whenever you cast a black spell, put a +1/+1 counter on each legendary creature you control. They gain menace until end of turn.
-SVar:TrigPutCountersAll2:DB$ PutCounterAll | ValidCards$ Creature.Legendary+YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPumpAll2
-SVar:DBPumpAll2:DB$ PumpAll | ValidCards$ Creature.Legendary+YouCtrl | KW$ Menace
+Name:Ardbert, Warrior of Darkness
+ManaCost:1 W B
+Types:Legendary Creature Spirit Warrior
+PT:2/2
+T:Mode$ SpellCast | ValidCard$ Card.White | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCountersAll1 | TriggerDescription$ Whenever you cast a white spell, put a +1/+1 counter on each legendary creature you control. They gain vigilance until end of turn.
+SVar:TrigPutCountersAll1:DB$ PutCounterAll | ValidCards$ Creature.Legendary+YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPumpAll1
+SVar:DBPumpAll1:DB$ PumpAll | ValidCards$ Creature.Legendary+YouCtrl | KW$ Vigilance
+T:Mode$ SpellCast | ValidCard$ Card.Black | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCountersAll2 | TriggerDescription$ Whenever you cast a black spell, put a +1/+1 counter on each legendary creature you control. They gain menace until end of turn.
+SVar:TrigPutCountersAll2:DB$ PutCounterAll | ValidCards$ Creature.Legendary+YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPumpAll2
+SVar:DBPumpAll2:DB$ PumpAll | ValidCards$ Creature.Legendary+YouCtrl | KW$ Menace
 Oracle:Whenever you cast a white spell, put a +1/+1 counter on each legendary creature you control. They gain vigilance until end of turn.\nWhenever you cast a black spell, put a +1/+1 counter on each legendary creature you control. They gain menace until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/astrologians_planisphere.txt b/forge-gui/res/cardsfolder/upcoming/astrologians_planisphere.txt
index dcb213e0402..bb710c521de 100644
--- a/forge-gui/res/cardsfolder/upcoming/astrologians_planisphere.txt
+++ b/forge-gui/res/cardsfolder/upcoming/astrologians_planisphere.txt
@@ -1,11 +1,11 @@
-Name:Astrologian's Planisphere
-ManaCost:1 U
-Types:Artifact Equipment
-K:Job select
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddType$ Wizard | AddTrigger$ TrigSpellCast & TrigDrawn | Description$ Equipped creature is a Wizard in addition to its other types and has "Whenever you cast a noncreature spell and whenever you draw your third card each turn, put a +1/+1 counter on this creature."
-SVar:TrigSpellCast:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell and whenever you draw your third card each turn, put a +1/+1 counter on this creature.
-SVar:TrigDrawn:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 3 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever you cast a noncreature spell and whenever you draw your third card each turn, put a +1/+1 counter on this creature.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-K:Equip:3
-DeckHas:Ability$Token & Type$Wizard
+Name:Astrologian's Planisphere
+ManaCost:1 U
+Types:Artifact Equipment
+K:Job select
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddType$ Wizard | AddTrigger$ TrigSpellCast & TrigDrawn | Description$ Equipped creature is a Wizard in addition to its other types and has "Whenever you cast a noncreature spell and whenever you draw your third card each turn, put a +1/+1 counter on this creature."
+SVar:TrigSpellCast:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell and whenever you draw your third card each turn, put a +1/+1 counter on this creature.
+SVar:TrigDrawn:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 3 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever you cast a noncreature spell and whenever you draw your third card each turn, put a +1/+1 counter on this creature.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+K:Equip:3
+DeckHas:Ability$Token & Type$Wizard
 Oracle:Job select (When this Equipment enters, create a 1/1 colorless Hero creature token, then attach this to it.)\nEquipped creature is a Wizard in addition to its other types and has "Whenever you cast a noncreature spell and whenever you draw your third card each turn, put a +1/+1 counter on this creature."\nDiana — Equip {3}
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/banon_the_returners_leader.txt b/forge-gui/res/cardsfolder/upcoming/banon_the_returners_leader.txt
index 859b762ae59..8d01ca95cba 100644
--- a/forge-gui/res/cardsfolder/upcoming/banon_the_returners_leader.txt
+++ b/forge-gui/res/cardsfolder/upcoming/banon_the_returners_leader.txt
@@ -1,10 +1,10 @@
-Name:Banon, the Returners' Leader
-ManaCost:R W
-Types:Legendary Creature Human Cleric Rebel
-PT:1/3
-S:Mode$ Continuous | Affected$ Creature.nonLand+ThisTurnEntered+!ThisTurnEnteredFrom_Battlefield | Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ Pray — Once during each of your turns, you may cast a creature spell from among cards in your graveyard that were put there from anywhere other than the battlefield this turn.
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, you may pay {1} and discard a card. If you do, draw a card.
-SVar:TrigDraw:AB$ Draw | Cost$ 1 Discard<1/Card>
-DeckHas:Ability$Discard
-DeckHints:Ability$Graveyard|Mill|Discard
-Oracle:Pray — Once during each of your turns, you may cast a creature spell from among cards in your graveyard that were put there from anywhere other than the battlefield this turn.\nWhenever you attack, you may pay {1} and discard a card. If you do, draw a card.
+Name:Banon, the Returners' Leader
+ManaCost:R W
+Types:Legendary Creature Human Cleric Rebel
+PT:1/3
+S:Mode$ Continuous | Affected$ Creature.nonLand+ThisTurnEntered+!ThisTurnEnteredFrom_Battlefield | Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ Pray — Once during each of your turns, you may cast a creature spell from among cards in your graveyard that were put there from anywhere other than the battlefield this turn.
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, you may pay {1} and discard a card. If you do, draw a card.
+SVar:TrigDraw:AB$ Draw | Cost$ 1 Discard<1/Card>
+DeckHas:Ability$Discard
+DeckHints:Ability$Graveyard|Mill|Discard
+Oracle:Pray — Once during each of your turns, you may cast a creature spell from among cards in your graveyard that were put there from anywhere other than the battlefield this turn.\nWhenever you attack, you may pay {1} and discard a card. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/barret_avalanche_leader.txt b/forge-gui/res/cardsfolder/upcoming/barret_avalanche_leader.txt
index e07b2d3137c..27f4606650f 100644
--- a/forge-gui/res/cardsfolder/upcoming/barret_avalanche_leader.txt
+++ b/forge-gui/res/cardsfolder/upcoming/barret_avalanche_leader.txt
@@ -1,13 +1,13 @@
-Name:Barret, Avalanche Leader
-ManaCost:2 R G
-Types:Legendary Creature Human Rebel
-PT:4/4
-K:Reach
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Equipment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Avalanche! — Whenever an Equipment you control enters, create a 2/2 red Rebel creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_2_2_rebel | TokenOwner$ You
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, attach up to one target Equipment you control to target Rebel you control.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Equipment.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target equipment you control | SubAbility$ DBAttach
-SVar:DBAttach:DB$ Attach | Object$ ParentTarget | ValidTgts$ Rebel.YouCtrl | TgtPrompt$ Select target Rebel you control.
-DeckHas:Ability$Token
-DeckNeeds:Type$Equipment
+Name:Barret, Avalanche Leader
+ManaCost:2 R G
+Types:Legendary Creature Human Rebel
+PT:4/4
+K:Reach
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Equipment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Avalanche! — Whenever an Equipment you control enters, create a 2/2 red Rebel creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_2_2_rebel | TokenOwner$ You
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, attach up to one target Equipment you control to target Rebel you control.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Equipment.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target equipment you control | SubAbility$ DBAttach
+SVar:DBAttach:DB$ Attach | Object$ ParentTarget | ValidTgts$ Rebel.YouCtrl | TgtPrompt$ Select target Rebel you control.
+DeckHas:Ability$Token
+DeckNeeds:Type$Equipment
 Oracle:Reach\nAvalanche! — Whenever an Equipment you control enters, create a 2/2 red Rebel creature token.\nAt the beginning of combat on your turn, attach up to one target Equipment you control to target Rebel you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/barret_wallace.txt b/forge-gui/res/cardsfolder/upcoming/barret_wallace.txt
index 1b1639afbdf..b5813c96d6e 100644
--- a/forge-gui/res/cardsfolder/upcoming/barret_wallace.txt
+++ b/forge-gui/res/cardsfolder/upcoming/barret_wallace.txt
@@ -1,10 +1,10 @@
-Name:Barret Wallace
-ManaCost:3 R
-Types:Legendary Creature Human Rebel
-PT:4/4
-K:Reach
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME attacks, it deals damage equal to the number of equipped creatures you control to defending player.
-SVar:TrigDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ X
-SVar:X:Count$Valid Creature.YouCtrl+equipped
-DeckNeeds:Type$Equipment
+Name:Barret Wallace
+ManaCost:3 R
+Types:Legendary Creature Human Rebel
+PT:4/4
+K:Reach
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME attacks, it deals damage equal to the number of equipped creatures you control to defending player.
+SVar:TrigDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ X
+SVar:X:Count$Valid Creature.YouCtrl+equipped
+DeckNeeds:Type$Equipment
 Oracle:Reach\nWhenever Barret Wallace attacks, it deals damage equal to the number of equipped creatures you control to defending player.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/bartz_and_boko.txt b/forge-gui/res/cardsfolder/upcoming/bartz_and_boko.txt
index b35d8c75639..50696b5e95b 100644
--- a/forge-gui/res/cardsfolder/upcoming/bartz_and_boko.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bartz_and_boko.txt
@@ -1,10 +1,10 @@
-Name:Bartz and Boko
-ManaCost:3 G G
-Types:Legendary Creature Human Bird
-PT:4/3
-K:Affinity:Bird
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, each other Bird you control deals damage equal to its power to target creature an opponent controls.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls | SubAbility$ DBEachDamage
-SVar:DBEachDamage:DB$ EachDamage | DefinedDamagers$ Valid Bird.Other+YouCtrl | Defined$ ParentTarget | NumDmg$ Count$CardPower
-DeckHints:Type$Bird
+Name:Bartz and Boko
+ManaCost:3 G G
+Types:Legendary Creature Human Bird
+PT:4/3
+K:Affinity:Bird
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, each other Bird you control deals damage equal to its power to target creature an opponent controls.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls | SubAbility$ DBEachDamage
+SVar:DBEachDamage:DB$ EachDamage | DefinedDamagers$ Valid Bird.Other+YouCtrl | Defined$ ParentTarget | NumDmg$ Count$CardPower
+DeckHints:Type$Bird
 Oracle:Affinity for Birds (This spell costs {1} less to cast for each Bird you control.)\nWhen Bartz and Boko enters, each other Bird you control deals damage equal to its power to target creature an opponent controls.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/beatrix_loyal_general.txt b/forge-gui/res/cardsfolder/upcoming/beatrix_loyal_general.txt
index efb9947dddd..48a456c718c 100644
--- a/forge-gui/res/cardsfolder/upcoming/beatrix_loyal_general.txt
+++ b/forge-gui/res/cardsfolder/upcoming/beatrix_loyal_general.txt
@@ -1,9 +1,9 @@
-Name:Beatrix, Loyal General
-ManaCost:4 W W
-Types:Legendary Creature Human Soldier
-PT:4/4
-K:Vigilance
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigAttach | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ At the beginning of combat on your turn, you may attach any number of Equipment you control to target creature you control.
-SVar:TrigAttach:DB$ Attach | Defined$ Targeted | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Object$ Valid Equipment.YouCtrl | Optional$ True
-DeckHints:Type$Equipment
+Name:Beatrix, Loyal General
+ManaCost:4 W W
+Types:Legendary Creature Human Soldier
+PT:4/4
+K:Vigilance
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigAttach | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ At the beginning of combat on your turn, you may attach any number of Equipment you control to target creature you control.
+SVar:TrigAttach:DB$ Attach | Defined$ Targeted | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Object$ Valid Equipment.YouCtrl | Optional$ True
+DeckHints:Type$Equipment
 Oracle:Vigilance (Attacking doesn't cause this creature to tap.)\nAt the beginning of combat on your turn, you may attach any number of Equipment you control to target creature you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/blue_mages_cane.txt b/forge-gui/res/cardsfolder/upcoming/blue_mages_cane.txt
index 49037b1e5f0..7af3818d0f6 100644
--- a/forge-gui/res/cardsfolder/upcoming/blue_mages_cane.txt
+++ b/forge-gui/res/cardsfolder/upcoming/blue_mages_cane.txt
@@ -1,13 +1,13 @@
-Name:Blue Mage's Cane
-ManaCost:2 U
-Types:Artifact Equipment
-K:Job select
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddToughness$ 2 | AddType$ Wizard | AddTrigger$ TrigAttack | AddSVar$ AE | Description$ Equipped creature gets +0/+2, is a Wizard in addition to its other types, and has "Whenever this creature attacks, exile up to one target instant or sorcery card from defending player's graveyard. If you do, copy it. You may cast the copy by paying {3} rather than paying its mana cost."
-SVar:TrigAttack:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever this creature attacks, exile up to one target instant or sorcery card from defending player's graveyard. If you do, copy it. You may cast the copy by paying {3} rather than paying its mana cost.
-SVar:TrigExile:DB$ ChangeZone | DefinedPlayer$ You | TargetMin$ 0 | TargetMax$ 1 | Destination$ Exile | ChangeNum$ 1 | ValidTgts$ Instant,Sorcery | TargetsWithDefinedController$ TriggeredDefendingPlayer | TgtPrompt$ Select target instant or sorcery card from the defending player's graveyard | Origin$ Graveyard | RememberChanged$ True | SubAbility$ DBPlay
-SVar:DBPlay:DB$ Play | Defined$ Remembered | Controller$ You | CopyCard$ True | ValidSA$ Spell | Optional$ True | PlayCost$ 3 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-K:Equip:2
-SVar:AE:SVar:HasAttackEffect:TRUE
-DeckHas:Type$Wizard
-Oracle:Job select\nEquipped creature gets +0/+2, is a Wizard in addition to its other types, and has "Whenever this creature attacks, exile up to one target instant or sorcery card from defending player's graveyard. If you do, copy it. You may cast the copy by paying {3} rather than paying its mana cost."\nSpirit of the Whalaqee — Equip {2}
+Name:Blue Mage's Cane
+ManaCost:2 U
+Types:Artifact Equipment
+K:Job select
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddToughness$ 2 | AddType$ Wizard | AddTrigger$ TrigAttack | AddSVar$ AE | Description$ Equipped creature gets +0/+2, is a Wizard in addition to its other types, and has "Whenever this creature attacks, exile up to one target instant or sorcery card from defending player's graveyard. If you do, copy it. You may cast the copy by paying {3} rather than paying its mana cost."
+SVar:TrigAttack:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever this creature attacks, exile up to one target instant or sorcery card from defending player's graveyard. If you do, copy it. You may cast the copy by paying {3} rather than paying its mana cost.
+SVar:TrigExile:DB$ ChangeZone | DefinedPlayer$ You | TargetMin$ 0 | TargetMax$ 1 | Destination$ Exile | ChangeNum$ 1 | ValidTgts$ Instant,Sorcery | TargetsWithDefinedController$ TriggeredDefendingPlayer | TgtPrompt$ Select target instant or sorcery card from the defending player's graveyard | Origin$ Graveyard | RememberChanged$ True | SubAbility$ DBPlay
+SVar:DBPlay:DB$ Play | Defined$ Remembered | Controller$ You | CopyCard$ True | ValidSA$ Spell | Optional$ True | PlayCost$ 3 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+K:Equip:2
+SVar:AE:SVar:HasAttackEffect:TRUE
+DeckHas:Type$Wizard
+Oracle:Job select\nEquipped creature gets +0/+2, is a Wizard in addition to its other types, and has "Whenever this creature attacks, exile up to one target instant or sorcery card from defending player's graveyard. If you do, copy it. You may cast the copy by paying {3} rather than paying its mana cost."\nSpirit of the Whalaqee — Equip {2}
diff --git a/forge-gui/res/cardsfolder/upcoming/bugenhagen_wise_elder.txt b/forge-gui/res/cardsfolder/upcoming/bugenhagen_wise_elder.txt
index 0f1be69365b..c316c30a1f9 100644
--- a/forge-gui/res/cardsfolder/upcoming/bugenhagen_wise_elder.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bugenhagen_wise_elder.txt
@@ -1,9 +1,9 @@
-Name:Bugenhagen, Wise Elder
-ManaCost:1 G
-Types:Legendary Creature Human Shaman
-PT:1/3
-K:Reach
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Creature.YouCtrl+powerGE7 | PresentCompare$ GE1 | Execute$ TrigDraw | TriggerDescription$ At the beginning of your upkeep, if you control a creature with power 7 or greater, draw a card.
-SVar:TrigDraw:DB$ Draw
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
-Oracle:Reach\nAt the beginning of your upkeep, if you control a creature with power 7 or greater, draw a card.\n{T}: Add one mana of any color.
+Name:Bugenhagen, Wise Elder
+ManaCost:1 G
+Types:Legendary Creature Human Shaman
+PT:1/3
+K:Reach
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Creature.YouCtrl+powerGE7 | PresentCompare$ GE1 | Execute$ TrigDraw | TriggerDescription$ At the beginning of your upkeep, if you control a creature with power 7 or greater, draw a card.
+SVar:TrigDraw:DB$ Draw
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
+Oracle:Reach\nAt the beginning of your upkeep, if you control a creature with power 7 or greater, draw a card.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/upcoming/cait_sith_fortune_teller.txt b/forge-gui/res/cardsfolder/upcoming/cait_sith_fortune_teller.txt
index 7e1d1ea505a..0e241285627 100644
--- a/forge-gui/res/cardsfolder/upcoming/cait_sith_fortune_teller.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cait_sith_fortune_teller.txt
@@ -1,14 +1,14 @@
-Name:Cait Sith, Fortune Teller
-ManaCost:3 R
-Types:Legendary Artifact Creature Cat Moogle
-PT:3/3
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigScry | TriggerDescription$ Lucky Slots — At the beginning of combat on your turn, scry 1, then exile the top card of your library. You may play that card this turn. When you exile a card this way, target creature you control gets +X/+0 until end of turn, where X is that card's mana value.
-SVar:TrigScry:DB$ Scry | ScryNum$ 1 | SubAbility$ DBExile
-SVar:DBExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffectYou
-SVar:DBEffectYou:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBImmediateTrigger | ExileOnMoved$ Exile
-SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play the exiled card this turn.
-SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ TrigPump | RememberObjects$ RememberedCard | SubAbility$ DBCleanup | SpellDescription$ When you exile a card this way, target creature you control gets +X/+0 until end of turn, where X is that card's mana value.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:TriggerRemembered$CardManaCost
+Name:Cait Sith, Fortune Teller
+ManaCost:3 R
+Types:Legendary Artifact Creature Cat Moogle
+PT:3/3
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigScry | TriggerDescription$ Lucky Slots — At the beginning of combat on your turn, scry 1, then exile the top card of your library. You may play that card this turn. When you exile a card this way, target creature you control gets +X/+0 until end of turn, where X is that card's mana value.
+SVar:TrigScry:DB$ Scry | ScryNum$ 1 | SubAbility$ DBExile
+SVar:DBExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffectYou
+SVar:DBEffectYou:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBImmediateTrigger | ExileOnMoved$ Exile
+SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play the exiled card this turn.
+SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ TrigPump | RememberObjects$ RememberedCard | SubAbility$ DBCleanup | SpellDescription$ When you exile a card this way, target creature you control gets +X/+0 until end of turn, where X is that card's mana value.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:TriggerRemembered$CardManaCost
 Oracle:Lucky Slots — At the beginning of combat on your turn, scry 1, then exile the top card of your library. You may play that card this turn. When you exile a card this way, target creature you control gets +X/+0 until end of turn, where X is that card's mana value.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/champions_from_beyond.txt b/forge-gui/res/cardsfolder/upcoming/champions_from_beyond.txt
index 8315a44d1cc..98e70411402 100644
--- a/forge-gui/res/cardsfolder/upcoming/champions_from_beyond.txt
+++ b/forge-gui/res/cardsfolder/upcoming/champions_from_beyond.txt
@@ -1,13 +1,13 @@
-Name:Champions from Beyond
-ManaCost:X W W
-Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this enchantment enters, create X 1/1 colorless Hero creature tokens.
-SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ c_1_1_hero | TokenOwner$ You
-T:Mode$ AttackersDeclared | Execute$ TrigScry | ValidAttackers$ Creature | ValidAttackersAmount$ GE4 | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Light Party — Whenever you attack with four or more creatures, scry 2, then draw a card.
-SVar:TrigScry:DB$ Scry | ScryNum$ 2 | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw
-T:Mode$ AttackersDeclared | Execute$ TrigPump | ValidAttackers$ Creature | ValidAttackersAmount$ GE8 | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Full Party — Whenever you attack with eight or more creatures, those creatures get +4/+4 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackers | NumAtt$ +4 | NumDef$ +4
-SVar:X:Count$xPaid
-DeckHas:Ability$Token & Type$Hero
+Name:Champions from Beyond
+ManaCost:X W W
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this enchantment enters, create X 1/1 colorless Hero creature tokens.
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ c_1_1_hero | TokenOwner$ You
+T:Mode$ AttackersDeclared | Execute$ TrigScry | ValidAttackers$ Creature | ValidAttackersAmount$ GE4 | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Light Party — Whenever you attack with four or more creatures, scry 2, then draw a card.
+SVar:TrigScry:DB$ Scry | ScryNum$ 2 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw
+T:Mode$ AttackersDeclared | Execute$ TrigPump | ValidAttackers$ Creature | ValidAttackersAmount$ GE8 | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Full Party — Whenever you attack with eight or more creatures, those creatures get +4/+4 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackers | NumAtt$ +4 | NumDef$ +4
+SVar:X:Count$xPaid
+DeckHas:Ability$Token & Type$Hero
 Oracle:When this enchantment enters, create X 1/1 colorless Hero creature tokens.\nLight Party — Whenever you attack with four or more creatures, scry 2, then draw a card.\nFull Party — Whenever you attack with eight or more creatures, those creatures get +4/+4 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/cid_freeflier_pilot.txt b/forge-gui/res/cardsfolder/upcoming/cid_freeflier_pilot.txt
index fe62af10919..e1e3a7521da 100644
--- a/forge-gui/res/cardsfolder/upcoming/cid_freeflier_pilot.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cid_freeflier_pilot.txt
@@ -1,9 +1,9 @@
-Name:Cid, Freeflier Pilot
-ManaCost:1 W
-Types:Legendary Creature Human Warrior Pilot
-PT:2/2
-S:Mode$ ReduceCost | ValidCard$ Equipment,Vehicle | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Equipment and Vehicle spells you cast cost {1} less to cast.
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | Condition$ PlayerTurn | Description$ Jump — During your turn, NICKNAME has flying.
-A:AB$ ChangeZone | Cost$ 2 T | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target Equipment or Vehicle card in your graveyard | ValidTgts$ Equipment.YouOwn,Vehicle.YouOwn | SpellDescription$ Return target Equipment or Vehicle card from your graveyard to your hand.
-DeckHints:Type$Instant|Sorcery
+Name:Cid, Freeflier Pilot
+ManaCost:1 W
+Types:Legendary Creature Human Warrior Pilot
+PT:2/2
+S:Mode$ ReduceCost | ValidCard$ Equipment,Vehicle | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Equipment and Vehicle spells you cast cost {1} less to cast.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | Condition$ PlayerTurn | Description$ Jump — During your turn, NICKNAME has flying.
+A:AB$ ChangeZone | Cost$ 2 T | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target Equipment or Vehicle card in your graveyard | ValidTgts$ Equipment.YouOwn,Vehicle.YouOwn | SpellDescription$ Return target Equipment or Vehicle card from your graveyard to your hand.
+DeckHints:Type$Instant|Sorcery
 Oracle:Equipment and Vehicle spells you cast cost {1} less to cast.\nJump — During your turn, Cid has flying.\n{2}, {T}: Return target Equipment or Vehicle card from your graveyard to your hand.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/circle_of_power.txt b/forge-gui/res/cardsfolder/upcoming/circle_of_power.txt
index 05c4b688224..66af8ed2a24 100644
--- a/forge-gui/res/cardsfolder/upcoming/circle_of_power.txt
+++ b/forge-gui/res/cardsfolder/upcoming/circle_of_power.txt
@@ -1,8 +1,8 @@
-Name:Circle of Power
-ManaCost:3 B
-Types:Sorcery
-A:SP$ Draw | NumCards$ 2 | SubAbility$ DBLoseLife | SpellDescription$ You draw two cards and you lose 2 life. Create a 0/1 black Wizard creature token with "Whenever you cast a noncreature spell, this token deals 1 damage to each opponent." Wizards you control get +1/+0 and gain lifelink until end of turn.
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_0_1_wizard_snipe | TokenOwner$ You | SubAbility$ DBPumpAll
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Wizard.YouCtrl | NumAtt$ +1 | KW$ Lifelink
+Name:Circle of Power
+ManaCost:3 B
+Types:Sorcery
+A:SP$ Draw | NumCards$ 2 | SubAbility$ DBLoseLife | SpellDescription$ You draw two cards and you lose 2 life. Create a 0/1 black Wizard creature token with "Whenever you cast a noncreature spell, this token deals 1 damage to each opponent." Wizards you control get +1/+0 and gain lifelink until end of turn.
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_0_1_wizard_snipe | TokenOwner$ You | SubAbility$ DBPumpAll
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Wizard.YouCtrl | NumAtt$ +1 | KW$ Lifelink
 Oracle:You draw two cards and you lose 2 life. Create a 0/1 black Wizard creature token with "Whenever you cast a noncreature spell, this token deals 1 damage to each opponent."\nWizards you control get +1/+0 and gain lifelink until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/cloud_midgar_mercenary.txt b/forge-gui/res/cardsfolder/upcoming/cloud_midgar_mercenary.txt
index de11c6e03da..c204b4dd716 100644
--- a/forge-gui/res/cardsfolder/upcoming/cloud_midgar_mercenary.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cloud_midgar_mercenary.txt
@@ -1,9 +1,9 @@
-Name:Cloud, Midgar Mercenary
-ManaCost:W W
-Types:Legendary Creature Human Soldier Mercenary
-PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When NICKNAME enters, search your library for an Equipment card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Equipment | ChangeNum$ 1
-S:Mode$ Panharmonicon | ValidCard$ Card.Self+equipped,Equipment.Attached | Description$ As long as NICKNAME is equipped, if an ability of NICKNAME or an Equipment attached to it triggers, that ability triggers an additional time.
-DeckHints:Type$Equipment
-Oracle:When Cloud enters, search your library for an Equipment card, reveal it, put it into your hand, then shuffle.\nAs long as Cloud is equipped, if an ability of Cloud or an Equipment attached to it triggers, that ability triggers an additional time.
+Name:Cloud, Midgar Mercenary
+ManaCost:W W
+Types:Legendary Creature Human Soldier Mercenary
+PT:2/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When NICKNAME enters, search your library for an Equipment card, reveal it, put it into your hand, then shuffle.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Equipment | ChangeNum$ 1
+S:Mode$ Panharmonicon | ValidCard$ Card.Self+equipped,Equipment.Attached | Description$ As long as NICKNAME is equipped, if an ability of NICKNAME or an Equipment attached to it triggers, that ability triggers an additional time.
+DeckHints:Type$Equipment
+Oracle:When Cloud enters, search your library for an Equipment card, reveal it, put it into your hand, then shuffle.\nAs long as Cloud is equipped, if an ability of Cloud or an Equipment attached to it triggers, that ability triggers an additional time.
diff --git a/forge-gui/res/cardsfolder/upcoming/clouds_limit_break.txt b/forge-gui/res/cardsfolder/upcoming/clouds_limit_break.txt
index bc50f4f3ee1..27e16b5324f 100644
--- a/forge-gui/res/cardsfolder/upcoming/clouds_limit_break.txt
+++ b/forge-gui/res/cardsfolder/upcoming/clouds_limit_break.txt
@@ -1,10 +1,10 @@
-Name:Cloud's Limit Break
-ManaCost:1 W
-Types:Instant
-K:Tiered
-A:SP$ Charm | Choices$ DBCrossSlash,DBBladeBeam,DBOmnislash
-SVar:DBCrossSlash:DB$ Destroy | PrecostDesc$ Cross-Slash | ModeCost$ 0 | ValidTgts$ Creature.tapped | TgtPrompt$ Select target tapped creature | SpellDescription$ Destroy target tapped creature.
-SVar:DBBladeBeam:DB$ Destroy | PrecostDesc$ Blade Beam | ModeCost$ 1 | ValidTgts$ Creature.tapped | TargetMin$ 0 | TargetMax$ MaxTgt | TargetsWithDifferentControllers$ True | TgtPrompt$ Select any number of target tapped creatures with different controllers | SpellDescription$ Destroy any number of target tapped creatures with different controllers.
-SVar:DBOmnislash:DB$ DestroyAll | PrecostDesc$ Omnislash | ModeCost$ 3 W | ValidCards$ Creature.tapped | SpellDescription$ Destroy all tapped creatures.
-SVar:MaxTgt:PlayerCountPlayers$Amount
+Name:Cloud's Limit Break
+ManaCost:1 W
+Types:Instant
+K:Tiered
+A:SP$ Charm | Choices$ DBCrossSlash,DBBladeBeam,DBOmnislash
+SVar:DBCrossSlash:DB$ Destroy | PrecostDesc$ Cross-Slash | ModeCost$ 0 | ValidTgts$ Creature.tapped | TgtPrompt$ Select target tapped creature | SpellDescription$ Destroy target tapped creature.
+SVar:DBBladeBeam:DB$ Destroy | PrecostDesc$ Blade Beam | ModeCost$ 1 | ValidTgts$ Creature.tapped | TargetMin$ 0 | TargetMax$ MaxTgt | TargetsWithDifferentControllers$ True | TgtPrompt$ Select any number of target tapped creatures with different controllers | SpellDescription$ Destroy any number of target tapped creatures with different controllers.
+SVar:DBOmnislash:DB$ DestroyAll | PrecostDesc$ Omnislash | ModeCost$ 3 W | ValidCards$ Creature.tapped | SpellDescription$ Destroy all tapped creatures.
+SVar:MaxTgt:PlayerCountPlayers$Amount
 Oracle:Tiered (Choose one additional cost.)\n• Cross-Slash — {0} — Destroy target tapped creature.\n• Blade Beam — {1} — Destroy any number of target tapped creatures with different controllers.\n• Omnislash — {3}{W} — Destroy all tapped creatures.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/commune_with_beavers.txt b/forge-gui/res/cardsfolder/upcoming/commune_with_beavers.txt
index b66c6e4d967..5410d284b32 100644
--- a/forge-gui/res/cardsfolder/upcoming/commune_with_beavers.txt
+++ b/forge-gui/res/cardsfolder/upcoming/commune_with_beavers.txt
@@ -1,5 +1,5 @@
-Name:Commune with Beavers
-ManaCost:G
-Types:Sorcery
-A:SP$ Dig | DigNum$ 3 | ChangeNum$ 1 | ChangeValid$ Artifact,Creature,Land | Optional$ True | SpellDescription$ Look at the top three cards of your library. You may reveal an artifact, creature, or land card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
+Name:Commune with Beavers
+ManaCost:G
+Types:Sorcery
+A:SP$ Dig | DigNum$ 3 | ChangeNum$ 1 | ChangeValid$ Artifact,Creature,Land | Optional$ True | SpellDescription$ Look at the top three cards of your library. You may reveal an artifact, creature, or land card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
 Oracle:Look at the top three cards of your library. You may reveal an artifact, creature, or land card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/conformer_shuriken.txt b/forge-gui/res/cardsfolder/upcoming/conformer_shuriken.txt
index 5b0a2b9a21b..dfb5d5a4252 100644
--- a/forge-gui/res/cardsfolder/upcoming/conformer_shuriken.txt
+++ b/forge-gui/res/cardsfolder/upcoming/conformer_shuriken.txt
@@ -1,13 +1,13 @@
-Name:Conformer Shuriken
-ManaCost:2
-Types:Legendary Artifact Equipment
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddTrigger$ TrigAttack | AddSVar$ AE | Description$ Equipped creature has "Whenever this creature attacks, tap target creature defending player controls. If that creature has greater power than this creature, put a number of +1/+1 counters on this creature equal to the difference."
-SVar:TrigAttack:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever this creature attacks, tap target creature defending player controls. If that creature has greater power than this creature, put a number of +1/+1 counters on this creature equal to the difference.
-SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.ControlledBy TriggeredDefendingPlayer | TgtPrompt$ Select target creature defending player controls | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ Z
-SVar:X:Count$CardPower
-SVar:Y:ParentTargeted$CardPower
-SVar:Z:SVar$Y/Minus.X
-SVar:AE:SVar:HasAttackEffect:TRUE
-K:Equip:2
-Oracle:Equipped creature has "Whenever this creature attacks, tap target creature defending player controls. If that creature has greater power than this creature, put a number of +1/+1 counters on this creature equal to the difference."\nEquip {2}
+Name:Conformer Shuriken
+ManaCost:2
+Types:Legendary Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddTrigger$ TrigAttack | AddSVar$ AE | Description$ Equipped creature has "Whenever this creature attacks, tap target creature defending player controls. If that creature has greater power than this creature, put a number of +1/+1 counters on this creature equal to the difference."
+SVar:TrigAttack:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever this creature attacks, tap target creature defending player controls. If that creature has greater power than this creature, put a number of +1/+1 counters on this creature equal to the difference.
+SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.ControlledBy TriggeredDefendingPlayer | TgtPrompt$ Select target creature defending player controls | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ Z
+SVar:X:Count$CardPower
+SVar:Y:ParentTargeted$CardPower
+SVar:Z:SVar$Y/Minus.X
+SVar:AE:SVar:HasAttackEffect:TRUE
+K:Equip:2
+Oracle:Equipped creature has "Whenever this creature attacks, tap target creature defending player controls. If that creature has greater power than this creature, put a number of +1/+1 counters on this creature equal to the difference."\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/upcoming/cyan_vengeful_samurai.txt b/forge-gui/res/cardsfolder/upcoming/cyan_vengeful_samurai.txt
index 4741695ccf5..8b521525d0d 100644
--- a/forge-gui/res/cardsfolder/upcoming/cyan_vengeful_samurai.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cyan_vengeful_samurai.txt
@@ -1,10 +1,10 @@
-Name:Cyan, Vengeful Samurai
-ManaCost:6 W
-Types:Legendary Creature Human Samurai
-PT:3/3
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each creature card in your graveyard.
-K:Double Strike
-T:Mode$ ChangesZoneAll | Origin$ Graveyard | Destination$ Any | ValidCards$ Creature.YouOwn | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more creature cards leave your graveyard, put a +1/+1 counter on NICKNAME.
-SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1
-SVar:X:Count$ValidGraveyard Creature.YouOwn
+Name:Cyan, Vengeful Samurai
+ManaCost:6 W
+Types:Legendary Creature Human Samurai
+PT:3/3
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each creature card in your graveyard.
+K:Double Strike
+T:Mode$ ChangesZoneAll | Origin$ Graveyard | Destination$ Any | ValidCards$ Creature.YouOwn | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more creature cards leave your graveyard, put a +1/+1 counter on NICKNAME.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1
+SVar:X:Count$ValidGraveyard Creature.YouOwn
 Oracle:This spell costs {1} less to cast for each creature card in your graveyard.\nDouble strike\nWhenever one or more creature cards leave your graveyard, put a +1/+1 counter on Cyan.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/dancers_chakrams.txt b/forge-gui/res/cardsfolder/upcoming/dancers_chakrams.txt
index fedbddb141d..51457a4d0d5 100644
--- a/forge-gui/res/cardsfolder/upcoming/dancers_chakrams.txt
+++ b/forge-gui/res/cardsfolder/upcoming/dancers_chakrams.txt
@@ -1,9 +1,9 @@
-Name:Dancer's Chakram
-ManaCost:3 W
-Types:Artifact Equipment
-K:Job select
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Lifelink | AddType$ Performer | AddStaticAbility$ StaticPump | Description$ Equipped creature gets +2/+2, has lifelink and "Other commanders you control get +2/+2 and have lifelink," and is a Performer in addition to its other types.
-SVar:StaticPump:Mode$ Continuous | Affected$ Card.Other+IsCommander+YouCtrl | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Lifelink | Description$ Other commanders you control get +2/+2 and have lifelink.
-K:Equip:3
-DeckHas:Ability$Token & Type$Performer
-Oracle:Job select (When this Equipment enters, create a 1/1 colorless Hero creature token, then attach this to it.)\nEquipped creature gets +2/+2, has lifelink and "Other commanders you control get +2/+2 and have lifelink," and is a Performer in addition to its other types.\nKrishna — Equip {3}
+Name:Dancer's Chakram
+ManaCost:3 W
+Types:Artifact Equipment
+K:Job select
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Lifelink | AddType$ Performer | AddStaticAbility$ StaticPump | Description$ Equipped creature gets +2/+2, has lifelink and "Other commanders you control get +2/+2 and have lifelink," and is a Performer in addition to its other types.
+SVar:StaticPump:Mode$ Continuous | Affected$ Card.Other+IsCommander+YouCtrl | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Lifelink | Description$ Other commanders you control get +2/+2 and have lifelink.
+K:Equip:3
+DeckHas:Ability$Token & Type$Performer
+Oracle:Job select (When this Equipment enters, create a 1/1 colorless Hero creature token, then attach this to it.)\nEquipped creature gets +2/+2, has lifelink and "Other commanders you control get +2/+2 and have lifelink," and is a Performer in addition to its other types.\nKrishna — Equip {3}
diff --git a/forge-gui/res/cardsfolder/upcoming/deadly_embrace.txt b/forge-gui/res/cardsfolder/upcoming/deadly_embrace.txt
index 5af9da40b01..e696c96150b 100644
--- a/forge-gui/res/cardsfolder/upcoming/deadly_embrace.txt
+++ b/forge-gui/res/cardsfolder/upcoming/deadly_embrace.txt
@@ -1,7 +1,7 @@
-Name:Deadly Embrace
-ManaCost:3 B B
-Types:Sorcery
-A:SP$ Destroy | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBDraw | SpellDescription$ Destroy target creature an opponent controls. Then draw a card for each creature that died this turn.
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X
-SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature
+Name:Deadly Embrace
+ManaCost:3 B B
+Types:Sorcery
+A:SP$ Destroy | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBDraw | SpellDescription$ Destroy target creature an opponent controls. Then draw a card for each creature that died this turn.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature
 Oracle:Destroy target creature an opponent controls. Then draw a card for each creature that died this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/dragoons_wyvern.txt b/forge-gui/res/cardsfolder/upcoming/dragoons_wyvern.txt
index fd0d2594124..489f903b586 100644
--- a/forge-gui/res/cardsfolder/upcoming/dragoons_wyvern.txt
+++ b/forge-gui/res/cardsfolder/upcoming/dragoons_wyvern.txt
@@ -1,8 +1,8 @@
-Name:Dragoon's Wyvern
-ManaCost:2 U
-Types:Creature Drake
-PT:2/1
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature enters, create a 1/1 colorless Hero creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_hero | TokenOwner$ You
+Name:Dragoon's Wyvern
+ManaCost:2 U
+Types:Creature Drake
+PT:2/1
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature enters, create a 1/1 colorless Hero creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_hero | TokenOwner$ You
 Oracle:Flying\nWhen this creature enters, create a 1/1 colorless Hero creature token.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/edgar_master_machinist.txt b/forge-gui/res/cardsfolder/upcoming/edgar_master_machinist.txt
index 11055d06b59..f8c1a50ccd4 100644
--- a/forge-gui/res/cardsfolder/upcoming/edgar_master_machinist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/edgar_master_machinist.txt
@@ -1,15 +1,15 @@
-Name:Edgar, Master Machinist
-ManaCost:2 R W
-Types:Legendary Creature Human Artificer Noble
-PT:2/4
-S:Mode$ Continuous | Affected$ Artifact.nonLand | Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ Once during each of your turns, you may cast an artifact spell from your graveyard. If you cast a spell this way, that artifact enters tapped.
-T:Mode$ SpellCast | ValidCard$ Card.CastSa Spell.MayPlaySource | Execute$ TrigEffect | Static$ True | TriggerZones$ Battlefield
-SVar:TrigEffect:DB$ Effect | ReplacementEffects$ ReMoved | RememberObjects$ TriggeredCard
-SVar:ReMoved:Event$ Moved | Origin$ Stack | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped
-SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard | SubAbility$ RemoveSelf
-SVar:RemoveSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Tools — Whenever NICKNAME attacks, it gets +X/+0 until end of turn, where X is the greatest mana value among artifacts you control.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X
-SVar:X:Count$Valid Artifact.YouCtrl$GreatestCMC
-DeckHints:Type$Artifact
-Oracle:Once during each of your turns, you may cast an artifact spell from your graveyard. If you cast a spell this way, that artifact enters tapped.\nTools — Whenever Edgar attacks, it gets +X/+0 until end of turn, where X is the greatest mana value among artifacts you control.
+Name:Edgar, Master Machinist
+ManaCost:2 R W
+Types:Legendary Creature Human Artificer Noble
+PT:2/4
+S:Mode$ Continuous | Affected$ Artifact.nonLand | Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ Once during each of your turns, you may cast an artifact spell from your graveyard. If you cast a spell this way, that artifact enters tapped.
+T:Mode$ SpellCast | ValidCard$ Card.CastSa Spell.MayPlaySource | Execute$ TrigEffect | Static$ True | TriggerZones$ Battlefield
+SVar:TrigEffect:DB$ Effect | ReplacementEffects$ ReMoved | RememberObjects$ TriggeredCard
+SVar:ReMoved:Event$ Moved | Origin$ Stack | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard | SubAbility$ RemoveSelf
+SVar:RemoveSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Tools — Whenever NICKNAME attacks, it gets +X/+0 until end of turn, where X is the greatest mana value among artifacts you control.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X
+SVar:X:Count$Valid Artifact.YouCtrl$GreatestCMC
+DeckHints:Type$Artifact
+Oracle:Once during each of your turns, you may cast an artifact spell from your graveyard. If you cast a spell this way, that artifact enters tapped.\nTools — Whenever Edgar attacks, it gets +X/+0 until end of turn, where X is the greatest mana value among artifacts you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/elena_turk_recruit.txt b/forge-gui/res/cardsfolder/upcoming/elena_turk_recruit.txt
index 77118e6f068..9a29dc212e5 100644
--- a/forge-gui/res/cardsfolder/upcoming/elena_turk_recruit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/elena_turk_recruit.txt
@@ -1,9 +1,9 @@
-Name:Elena, Turk Recruit
-ManaCost:2 W
-Types:Legendary Creature Human Assassin
-PT:1/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When NICKNAME enters, return target non-Assassin historic card from your graveyard to your hand. (Artifacts, legendaries, and Sagas are historic.)
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.Historic+nonAssassin+YouOwn
-T:Mode$ SpellCast | ValidCard$ Card.Historic | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a historic spell, put a +1/+1 counter on NICKNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+Name:Elena, Turk Recruit
+ManaCost:2 W
+Types:Legendary Creature Human Assassin
+PT:1/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When NICKNAME enters, return target non-Assassin historic card from your graveyard to your hand. (Artifacts, legendaries, and Sagas are historic.)
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.Historic+nonAssassin+YouOwn
+T:Mode$ SpellCast | ValidCard$ Card.Historic | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a historic spell, put a +1/+1 counter on NICKNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:When Elena enters, return target non-Assassin historic card from your graveyard to your hand. (Artifacts, legendaries, and Sagas are historic.)\nWhenever you cast a historic spell, put a +1/+1 counter on Elena.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/emet_selch_of_the_third_seat.txt b/forge-gui/res/cardsfolder/upcoming/emet_selch_of_the_third_seat.txt
index d1ac7940c02..58cba62bcbb 100644
--- a/forge-gui/res/cardsfolder/upcoming/emet_selch_of_the_third_seat.txt
+++ b/forge-gui/res/cardsfolder/upcoming/emet_selch_of_the_third_seat.txt
@@ -1,8 +1,8 @@
-Name:Emet-Selch of the Third Seat
-ManaCost:2 U B
-Types:Legendary Creature Elder Wizard
-PT:3/4
-S:Mode$ ReduceCost | ValidCard$ Card.wasCastFromYourGraveyard | Type$ Spell | Activator$ You | Amount$ 2 | Description$ Spells you cast from your graveyard cost {2} less to cast.
-T:Mode$ LifeLostAll | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPlay | OptionalDecider$ You | ResolvedLimit$ 1 | TriggerDescription$ Whenever one or more opponents lose life, you may cast target instant or sorcery card from your graveyard. If that spell would be put into your graveyard, exile it instead. Do this only once each turn.
-SVar:TrigPlay:DB$ Play | TgtZone$ Graveyard | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | ValidSA$ Spell | TgtPrompt$ Choose target instant or sorcery card from your graveyard | Optional$ True | ReplaceGraveyard$ Exile | AILogic$ ReplaySpell
+Name:Emet-Selch of the Third Seat
+ManaCost:2 U B
+Types:Legendary Creature Elder Wizard
+PT:3/4
+S:Mode$ ReduceCost | ValidCard$ Card.wasCastFromYourGraveyard | Type$ Spell | Activator$ You | Amount$ 2 | Description$ Spells you cast from your graveyard cost {2} less to cast.
+T:Mode$ LifeLostAll | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPlay | OptionalDecider$ You | ResolvedLimit$ 1 | TriggerDescription$ Whenever one or more opponents lose life, you may cast target instant or sorcery card from your graveyard. If that spell would be put into your graveyard, exile it instead. Do this only once each turn.
+SVar:TrigPlay:DB$ Play | TgtZone$ Graveyard | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | ValidSA$ Spell | TgtPrompt$ Choose target instant or sorcery card from your graveyard | Optional$ True | ReplaceGraveyard$ Exile | AILogic$ ReplaySpell
 Oracle:Spells you cast from your graveyard cost {2} less to cast.\nWhenever one or more opponents lose life, you may cast target instant or sorcery card from your graveyard. If that spell would be put into your graveyard, exile it instead. Do this only once each turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/esper_origins_summon_esper_maduin.txt b/forge-gui/res/cardsfolder/upcoming/esper_origins_summon_esper_maduin.txt
index 791192f1fce..a9b26d82504 100644
--- a/forge-gui/res/cardsfolder/upcoming/esper_origins_summon_esper_maduin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/esper_origins_summon_esper_maduin.txt
@@ -1,25 +1,25 @@
-Name:Esper Origins
-ManaCost:1 G
-Types:Sorcery
-A:SP$ Surveil | Amount$ 2 | SubAbility$ DBGainLife | SpellDescription$ Surveil 2. You gain 2 life. If this spell was cast from a graveyard, exile it, then put it onto the battlefield transformed under its owner's control with a finality counter on it. (If a creature with a finality counter on it would die, exile it instead.)
-SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2 | SubAbility$ DBExile
-SVar:DBExile:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | RememberChanged$ True | ConditionDefined$ Self | ConditionPresent$ Card.wasCastFromGraveyard | SubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | WithCountersType$ FINALITY | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-K:Flashback:3 G
-AlternateMode:DoubleFaced
-DeckHas:Ability$Surveil|Graveyard|LifeGain|Counters
-Oracle:Surveil 2. You gain 2 life. If this spell was cast from a graveyard, exile it, then put it onto the battlefield transformed under its owner's control with a finality counter on it. (If a creature with a finality counter on it would die, exile it instead.)\nFlashback {3}{G} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
-
-ALTERNATE
-
-Name:Summon: Esper Maduin
-ManaCost:no cost
-Colors:green
-Types:Enchantment Creature Saga Elemental
-PT:4/4
-K:Chapter:3:DBDig,DBMana,DBPumpAll
-SVar:DBDig:DB$ Dig | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Permanent | DestinationZone$ Hand | LibraryPosition2$ 0 | SpellDescription$ Reveal the top card of your library. If it's a permanent card, put it into your hand.
-SVar:DBMana:DB$ Mana | Produced$ G G | SpellDescription$ Add {G}{G}.
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.Other+YouCtrl | NumAtt$ +2 | NumDef$ +2 | KW$ Trample | SpellDescription$ Other creatures you control get +2/+2 and gain trample until end of turn.
-Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — Reveal the top card of your library. If it's a permanent card, put it into your hand.\nII — Add {G}{G}.\nIII — Other creatures you control get +2/+2 and gain trample until end of turn.
+Name:Esper Origins
+ManaCost:1 G
+Types:Sorcery
+A:SP$ Surveil | Amount$ 2 | SubAbility$ DBGainLife | SpellDescription$ Surveil 2. You gain 2 life. If this spell was cast from a graveyard, exile it, then put it onto the battlefield transformed under its owner's control with a finality counter on it. (If a creature with a finality counter on it would die, exile it instead.)
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2 | SubAbility$ DBExile
+SVar:DBExile:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | RememberChanged$ True | ConditionDefined$ Self | ConditionPresent$ Card.wasCastFromGraveyard | SubAbility$ DBReturn
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | WithCountersType$ FINALITY | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+K:Flashback:3 G
+AlternateMode:DoubleFaced
+DeckHas:Ability$Surveil|Graveyard|LifeGain|Counters
+Oracle:Surveil 2. You gain 2 life. If this spell was cast from a graveyard, exile it, then put it onto the battlefield transformed under its owner's control with a finality counter on it. (If a creature with a finality counter on it would die, exile it instead.)\nFlashback {3}{G} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+
+ALTERNATE
+
+Name:Summon: Esper Maduin
+ManaCost:no cost
+Colors:green
+Types:Enchantment Creature Saga Elemental
+PT:4/4
+K:Chapter:3:DBDig,DBMana,DBPumpAll
+SVar:DBDig:DB$ Dig | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Permanent | DestinationZone$ Hand | LibraryPosition2$ 0 | SpellDescription$ Reveal the top card of your library. If it's a permanent card, put it into your hand.
+SVar:DBMana:DB$ Mana | Produced$ G G | SpellDescription$ Add {G}{G}.
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.Other+YouCtrl | NumAtt$ +2 | NumDef$ +2 | KW$ Trample | SpellDescription$ Other creatures you control get +2/+2 and gain trample until end of turn.
+Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — Reveal the top card of your library. If it's a permanent card, put it into your hand.\nII — Add {G}{G}.\nIII — Other creatures you control get +2/+2 and gain trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/espers_to_magicite.txt b/forge-gui/res/cardsfolder/upcoming/espers_to_magicite.txt
index b593062dc6e..ab9d53d7c22 100644
--- a/forge-gui/res/cardsfolder/upcoming/espers_to_magicite.txt
+++ b/forge-gui/res/cardsfolder/upcoming/espers_to_magicite.txt
@@ -1,8 +1,8 @@
-Name:Espers to Magicite
-ManaCost:3 B
-Types:Instant
-A:SP$ ChangeZoneAll | ChangeType$ Card.OppOwn | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | SubAbility$ DBImmediateTrigger | SpellDescription$ Exile each opponent's graveyard. When you do, choose up to one target creature card exiled this way. Create a token that's a copy of that card, except it's an artifact and it loses all other card types.
-SVar:DBImmediateTrigger:DB$ ImmediateTrigger | RememberObjects$ Remembered | Execute$ TrigCopy | SubAbility$ DBCleanup | TriggerDescription$ When you do, choose up to one target creature card exiled this way. Create a token that's a copy of that card, except it's an artifact and it loses all other card types.
-SVar:TrigCopy:DB$ CopyPermanent | ValidTgts$ Creature.IsTriggerRemembered | TgtZone$ Exile | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature card exiled with CARDNAME | NumCopies$ 1 | AddTypes$ Artifact | RemoveCardTypes$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Name:Espers to Magicite
+ManaCost:3 B
+Types:Instant
+A:SP$ ChangeZoneAll | ChangeType$ Card.OppOwn | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | SubAbility$ DBImmediateTrigger | SpellDescription$ Exile each opponent's graveyard. When you do, choose up to one target creature card exiled this way. Create a token that's a copy of that card, except it's an artifact and it loses all other card types.
+SVar:DBImmediateTrigger:DB$ ImmediateTrigger | RememberObjects$ Remembered | Execute$ TrigCopy | SubAbility$ DBCleanup | TriggerDescription$ When you do, choose up to one target creature card exiled this way. Create a token that's a copy of that card, except it's an artifact and it loses all other card types.
+SVar:TrigCopy:DB$ CopyPermanent | ValidTgts$ Creature.IsTriggerRemembered | TgtZone$ Exile | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature card exiled with CARDNAME | NumCopies$ 1 | AddTypes$ Artifact | RemoveCardTypes$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Exile each opponent's graveyard. When you do, choose up to one target creature card exiled this way. Create a token that's a copy of that card, except it's an artifact and it loses all other card types.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/firion_wild_rose_warrior.txt b/forge-gui/res/cardsfolder/upcoming/firion_wild_rose_warrior.txt
index d0b2da4740d..ac78baa89f0 100644
--- a/forge-gui/res/cardsfolder/upcoming/firion_wild_rose_warrior.txt
+++ b/forge-gui/res/cardsfolder/upcoming/firion_wild_rose_warrior.txt
@@ -1,14 +1,14 @@
-Name:Firion, Wild Rose Warrior
-ManaCost:2 R
-Types:Legendary Creature Human Rebel Warrior
-PT:3/3
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+equipped | AddKeyword$ Haste | Description$ Equipped creatures you control have haste.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Equipment.YouCtrl+!token+Other | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken Equipment you control enters, create a token that's a copy of it, except it has "This Equipment's equip abilities cost {2} less to activate." Sacrifice that token at the beginning of the next upkeep.
-SVar:TrigCopy:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | AddStaticAbilities$ EquipReduce | RememberTokens$ True | SubAbility$ TrigDelay
-SVar:EquipReduce:Mode$ ReduceCost | ValidCard$ Card.Self | ValidSpell$ Activated.Equip | Amount$ 2 | Description$ This Equipment's equip abilities cost {2} less to activate.
-SVar:TrigDelay:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | RememberObjects$ RememberedLKI | Execute$ TrigSac | SubAbility$ DBCleanup | TriggerDescription$ Sacrifice that token at the beginning of the next upkeep.
-SVar:TrigSac:DB$ Sacrifice | Defined$ DelayTriggerRememberedLKI
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Token
-DeckNeeds:Type$Equipment
+Name:Firion, Wild Rose Warrior
+ManaCost:2 R
+Types:Legendary Creature Human Rebel Warrior
+PT:3/3
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+equipped | AddKeyword$ Haste | Description$ Equipped creatures you control have haste.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Equipment.YouCtrl+!token+Other | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken Equipment you control enters, create a token that's a copy of it, except it has "This Equipment's equip abilities cost {2} less to activate." Sacrifice that token at the beginning of the next upkeep.
+SVar:TrigCopy:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | AddStaticAbilities$ EquipReduce | RememberTokens$ True | SubAbility$ TrigDelay
+SVar:EquipReduce:Mode$ ReduceCost | ValidCard$ Card.Self | ValidSpell$ Activated.Equip | Amount$ 2 | Description$ This Equipment's equip abilities cost {2} less to activate.
+SVar:TrigDelay:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | RememberObjects$ RememberedLKI | Execute$ TrigSac | SubAbility$ DBCleanup | TriggerDescription$ Sacrifice that token at the beginning of the next upkeep.
+SVar:TrigSac:DB$ Sacrifice | Defined$ DelayTriggerRememberedLKI
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Token
+DeckNeeds:Type$Equipment
 Oracle:Equipped creatures you control have haste.\nWhenever a nontoken Equipment you control enters, create a token that's a copy of it, except it has "This Equipment's equip abilities cost {2} less to activate." Sacrifice that token at the beginning of the next upkeep.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/gilgamesh_master_at_arms.txt b/forge-gui/res/cardsfolder/upcoming/gilgamesh_master_at_arms.txt
index d3180b06973..fd9dfabfdfe 100644
--- a/forge-gui/res/cardsfolder/upcoming/gilgamesh_master_at_arms.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gilgamesh_master_at_arms.txt
@@ -1,13 +1,13 @@
-Name:Gilgamesh, Master-at-Arms
-ManaCost:4 R R
-Types:Legendary Creature Human Samurai
-PT:6/6
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ Whenever NICKNAME enters or attacks, look at the top six cards of your library. You may put any number of Equipment cards from among them onto the battlefield. Put the rest on the bottom of your library in a random order. When you put one or more Equipment onto the battlefield this way, you may attach one of them to a Samurai you control.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDig | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever NICKNAME enters or attacks, look at the top six cards of your library. You may put any number of Equipment cards from among them onto the battlefield. Put the rest on the bottom of your library in a random order. When you put one or more Equipment onto the battlefield this way, you may attach one of them to a Samurai you control.
-SVar:TrigDig:DB$ Dig | DigNum$ 6 | ChangeValid$ Equipment | ForceRevealToController$ True | AnyNumber$ True | RestRandomOrder$ True | DestinationZone$ Battlefield | RememberChanged$ True | SubAbility$ DBImmediateTrigger
-SVar:DBImmediateTrigger:DB$ ImmediateTrigger | Execute$ TrigChoose | ConditionDefined$ Remembered | ConditionPresent$ Equipment | ConditionCompare$ GE1 | TriggerDescription$ When you put one or more Equipment onto the battlefield this way, you may attach one of them to a Samurai you control.
-SVar:TrigChoose:DB$ ChooseCard | Choices$ Creature.Samurai+YouCtrl | ChoiceTitle$ Choose a creature you control to attach an Equipment to | Amount$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Equipment | ConditionCompare$ GE1 | SubAbility$ DBAttach
-SVar:DBAttach:DB$ Attach | Choices$ Equipment.YouCtrl+IsRemembered | Defined$ ChosenCard | ChoiceTitle$ Choose an equipment to attach to this creature | Optional$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
-SVar:HasAttackEffect:TRUE
+Name:Gilgamesh, Master-at-Arms
+ManaCost:4 R R
+Types:Legendary Creature Human Samurai
+PT:6/6
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ Whenever NICKNAME enters or attacks, look at the top six cards of your library. You may put any number of Equipment cards from among them onto the battlefield. Put the rest on the bottom of your library in a random order. When you put one or more Equipment onto the battlefield this way, you may attach one of them to a Samurai you control.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDig | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever NICKNAME enters or attacks, look at the top six cards of your library. You may put any number of Equipment cards from among them onto the battlefield. Put the rest on the bottom of your library in a random order. When you put one or more Equipment onto the battlefield this way, you may attach one of them to a Samurai you control.
+SVar:TrigDig:DB$ Dig | DigNum$ 6 | ChangeValid$ Equipment | ForceRevealToController$ True | AnyNumber$ True | RestRandomOrder$ True | DestinationZone$ Battlefield | RememberChanged$ True | SubAbility$ DBImmediateTrigger
+SVar:DBImmediateTrigger:DB$ ImmediateTrigger | Execute$ TrigChoose | ConditionDefined$ Remembered | ConditionPresent$ Equipment | ConditionCompare$ GE1 | TriggerDescription$ When you put one or more Equipment onto the battlefield this way, you may attach one of them to a Samurai you control.
+SVar:TrigChoose:DB$ ChooseCard | Choices$ Creature.Samurai+YouCtrl | ChoiceTitle$ Choose a creature you control to attach an Equipment to | Amount$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Equipment | ConditionCompare$ GE1 | SubAbility$ DBAttach
+SVar:DBAttach:DB$ Attach | Choices$ Equipment.YouCtrl+IsRemembered | Defined$ ChosenCard | ChoiceTitle$ Choose an equipment to attach to this creature | Optional$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
+SVar:HasAttackEffect:TRUE
 Oracle:Whenever Gilgamesh enters or attacks, look at the top six cards of your library. You may put any number of Equipment cards from among them onto the battlefield. Put the rest on the bottom of your library in a random order. When you put one or more Equipment onto the battlefield this way, you may attach one of them to a Samurai you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/hermes_overseer_of_elpis.txt b/forge-gui/res/cardsfolder/upcoming/hermes_overseer_of_elpis.txt
index e4b1b7d88c2..ab5eec3726e 100644
--- a/forge-gui/res/cardsfolder/upcoming/hermes_overseer_of_elpis.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hermes_overseer_of_elpis.txt
@@ -1,11 +1,11 @@
-Name:Hermes, Overseer of Elpis
-ManaCost:3 U
-Types:Legendary Creature Elder Wizard
-PT:2/4
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you cast a noncreature spell, create a 1/1 blue Bird creature token with flying and vigilance.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_bird_flying_vigilance | TokenOwner$ You
-T:Mode$ AttackersDeclared | ValidAttackers$ Creature.Bird+YouCtrl | Execute$ TrigScry | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack with one or more Birds, scry 2.
-SVar:TrigScry:DB$ Scry | ScryNum$ 2
-DeckHas:Ability$Token
-DeckHints:Type$Instant|Sorcery
+Name:Hermes, Overseer of Elpis
+ManaCost:3 U
+Types:Legendary Creature Elder Wizard
+PT:2/4
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you cast a noncreature spell, create a 1/1 blue Bird creature token with flying and vigilance.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_bird_flying_vigilance | TokenOwner$ You
+T:Mode$ AttackersDeclared | ValidAttackers$ Creature.Bird+YouCtrl | Execute$ TrigScry | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack with one or more Birds, scry 2.
+SVar:TrigScry:DB$ Scry | ScryNum$ 2
+DeckHas:Ability$Token
+DeckHints:Type$Instant|Sorcery
 Oracle:Whenever you cast a noncreature spell, create a 1/1 blue Bird creature token with flying and vigilance.\nWhenever you attack with one or more Birds, scry 2.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/hraesvelgr_of_the_first_brood.txt b/forge-gui/res/cardsfolder/upcoming/hraesvelgr_of_the_first_brood.txt
index ffa083cdd49..f08187c4f0d 100644
--- a/forge-gui/res/cardsfolder/upcoming/hraesvelgr_of_the_first_brood.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hraesvelgr_of_the_first_brood.txt
@@ -1,15 +1,15 @@
-Name:Hraesvelgr of the First Brood
-ManaCost:3 U
-Types:Legendary Creature Elder Dragon
-PT:5/5
-K:Flying
-K:Vigilance
-K:Ward:2
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Shiva's Aid — When NICKNAME enters and whenever you cast a noncreature spell, target creature gets +1/+0 until end of turn and can't be blocked this turn.
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Shiva's Aid — When NICKNAME enters and whenever you cast a noncreature spell, target creature gets +1/+0 until end of turn and can't be blocked this turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | NumAtt$ +1 | SubAbility$ DBUnblockable
-SVar:DBUnblockable:DB$ Effect | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
-SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
-DeckHas:Ability$Token
-DeckHints:Type$Card.nonLand+nonCreature
+Name:Hraesvelgr of the First Brood
+ManaCost:3 U
+Types:Legendary Creature Elder Dragon
+PT:5/5
+K:Flying
+K:Vigilance
+K:Ward:2
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Shiva's Aid — When NICKNAME enters and whenever you cast a noncreature spell, target creature gets +1/+0 until end of turn and can't be blocked this turn.
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Shiva's Aid — When NICKNAME enters and whenever you cast a noncreature spell, target creature gets +1/+0 until end of turn and can't be blocked this turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | NumAtt$ +1 | SubAbility$ DBUnblockable
+SVar:DBUnblockable:DB$ Effect | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
+DeckHas:Ability$Token
+DeckHints:Type$Card.nonLand+nonCreature
 Oracle:Flying, vigilance, ward {2}\nShiva's Aid — When Hraesvelgr enters and whenever you cast a noncreature spell, target creature gets +1/+0 until end of turn and can't be blocked this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/ice_magic.txt b/forge-gui/res/cardsfolder/upcoming/ice_magic.txt
index 8bd31a0c561..86aa7f1bb7e 100644
--- a/forge-gui/res/cardsfolder/upcoming/ice_magic.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ice_magic.txt
@@ -1,9 +1,9 @@
-Name:Ice Magic
-ManaCost:1 U
-Types:Instant
-K:Tiered
-A:SP$ Charm | Choices$ DBBlizzard,DBBlizzara,DBBlizzaga
-SVar:DBBlizzard:DB$ ChangeZone | PrecostDesc$ Blizzard | ModeCost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
-SVar:DBBlizzara:DB$ ChangeZone | PrecostDesc$ Blizzara | ModeCost$ 2 | ValidTgts$ Creature | AlternativeDecider$ TargetedOwner | Origin$ Battlefield | Destination$ Library | DestinationAlternative$ Library | LibraryPositionAlternative$ -1 | SpellDescription$ Target creature's owner puts it on the top or bottom of their library.
-SVar:DBBlizzaga:DB$ ChangeZone | PrecostDesc$ Blizzaga | ModeCost$ 5 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | Shuffle$ True | SpellDescription$ Target creature's owner shuffles it into their library.
+Name:Ice Magic
+ManaCost:1 U
+Types:Instant
+K:Tiered
+A:SP$ Charm | Choices$ DBBlizzard,DBBlizzara,DBBlizzaga
+SVar:DBBlizzard:DB$ ChangeZone | PrecostDesc$ Blizzard | ModeCost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
+SVar:DBBlizzara:DB$ ChangeZone | PrecostDesc$ Blizzara | ModeCost$ 2 | ValidTgts$ Creature | AlternativeDecider$ TargetedOwner | Origin$ Battlefield | Destination$ Library | DestinationAlternative$ Library | LibraryPositionAlternative$ -1 | SpellDescription$ Target creature's owner puts it on the top or bottom of their library.
+SVar:DBBlizzaga:DB$ ChangeZone | PrecostDesc$ Blizzaga | ModeCost$ 5 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | Shuffle$ True | SpellDescription$ Target creature's owner shuffles it into their library.
 Oracle:Tiered (Choose one additional cost.)\n• Blizzard — {0} — Return target creature to its owner's hand.\n• Blizzara — {2} — Target creature's owner puts it on their choice of the top or bottom of their library.\n• Blizzaga — {5}{U} — Target creature's owner shuffles it into their library.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/interceptor_shadows_hound.txt b/forge-gui/res/cardsfolder/upcoming/interceptor_shadows_hound.txt
index 750fa578c98..2c0ad21f326 100644
--- a/forge-gui/res/cardsfolder/upcoming/interceptor_shadows_hound.txt
+++ b/forge-gui/res/cardsfolder/upcoming/interceptor_shadows_hound.txt
@@ -1,13 +1,13 @@
-Name:Interceptor, Shadow's Hound
-ManaCost:2 B B
-Types:Legendary Creature Dog
-PT:4/3
-K:Menace
-S:Mode$ Continuous | Affected$ Assassin.YouCtrl | AddKeyword$ Menace | Description$ Assassins you control have menace.
-T:Mode$ AttackersDeclared | ValidAttackers$ Creature.Legendary+YouCtrl | Execute$ TrigChangeZone | TriggerZones$ Graveyard | TriggerDescription$ Whenever you attack with one or more legendary creatures, you may pay {2}{B}. If you do, return this card from your graveyard to the battlefield tapped and attacking.
-SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | Attacking$ True
-SVar:PlayMain1:TRUE
-SVar:SacMe:3
-SVar:DiscardMe:3
-DeckHints:Type$Assassin|Legendary
+Name:Interceptor, Shadow's Hound
+ManaCost:2 B B
+Types:Legendary Creature Dog
+PT:4/3
+K:Menace
+S:Mode$ Continuous | Affected$ Assassin.YouCtrl | AddKeyword$ Menace | Description$ Assassins you control have menace.
+T:Mode$ AttackersDeclared | ValidAttackers$ Creature.Legendary+YouCtrl | Execute$ TrigChangeZone | TriggerZones$ Graveyard | TriggerDescription$ Whenever you attack with one or more legendary creatures, you may pay {2}{B}. If you do, return this card from your graveyard to the battlefield tapped and attacking.
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | Attacking$ True
+SVar:PlayMain1:TRUE
+SVar:SacMe:3
+SVar:DiscardMe:3
+DeckHints:Type$Assassin|Legendary
 Oracle:Menace\nAssassins you control have menace.\nWhenever you attack with one or more legendary creatures, you may pay {2}{B}. If you do, return this card from your graveyard to the battlefield tapped and attacking.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/ishgard_the_holy_see_faith_grief.txt b/forge-gui/res/cardsfolder/upcoming/ishgard_the_holy_see_faith_grief.txt
index 8bb7d636317..6cfa198be53 100644
--- a/forge-gui/res/cardsfolder/upcoming/ishgard_the_holy_see_faith_grief.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ishgard_the_holy_see_faith_grief.txt
@@ -1,16 +1,16 @@
-Name:Ishgard, the Holy See
-ManaCost:no cost
-Types:Land Town
-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
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
-AlternateMode:Adventure
-Oracle:This land enters tapped.\n{T}: Add {W}.
-
-ALTERNATE
-
-Name:Faith & Grief
-ManaCost:3 W W
-Types:Sorcery Adventure
-A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target artifact or enchantment card in your graveyard | ValidTgts$ Artifact.YouOwn,Enchantment.YouOwn | SpellDescription$ Return up to two target artifact and/or enchantment cards from your graveyard to your hand. (Then exile this card. You may play the land later from exile.)
+Name:Ishgard, the Holy See
+ManaCost:no cost
+Types:Land Town
+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
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+AlternateMode:Adventure
+Oracle:This land enters tapped.\n{T}: Add {W}.
+
+ALTERNATE
+
+Name:Faith & Grief
+ManaCost:3 W W
+Types:Sorcery Adventure
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target artifact or enchantment card in your graveyard | ValidTgts$ Artifact.YouOwn,Enchantment.YouOwn | SpellDescription$ Return up to two target artifact and/or enchantment cards from your graveyard to your hand. (Then exile this card. You may play the land later from exile.)
 Oracle:Return up to two target artifact and/or enchantment cards from your graveyard to your hand. (Then exile this card. You may play the land later from exile.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/jidoor_aristocratic_capital_overture.txt b/forge-gui/res/cardsfolder/upcoming/jidoor_aristocratic_capital_overture.txt
index 52d1ab057a9..36382398fd1 100644
--- a/forge-gui/res/cardsfolder/upcoming/jidoor_aristocratic_capital_overture.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jidoor_aristocratic_capital_overture.txt
@@ -1,17 +1,17 @@
-Name:Jidoor, Aristocratic Capital
-ManaCost:no cost
-Types:Land Town
-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
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
-AlternateMode:Adventure
-Oracle:This land enters tapped.\n{T}: Add {U}.
-
-ALTERNATE
-
-Name:Overture
-ManaCost:4 U U
-Types:Sorcery Adventure
-A:SP$ Mill | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumCards$ X | SpellDescription$ Target player mills half their library, rounded down.
-SVar:X:TargetedPlayer$CardsInLibrary/HalfDown
-Oracle:Target opponent mills half their library, rounded down.
+Name:Jidoor, Aristocratic Capital
+ManaCost:no cost
+Types:Land Town
+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
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+AlternateMode:Adventure
+Oracle:This land enters tapped.\n{T}: Add {U}.
+
+ALTERNATE
+
+Name:Overture
+ManaCost:4 U U
+Types:Sorcery Adventure
+A:SP$ Mill | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumCards$ X | SpellDescription$ Target player mills half their library, rounded down.
+SVar:X:TargetedPlayer$CardsInLibrary/HalfDown
+Oracle:Target opponent mills half their library, rounded down.
diff --git a/forge-gui/res/cardsfolder/upcoming/judgment_bolt.txt b/forge-gui/res/cardsfolder/upcoming/judgment_bolt.txt
index f1843e13a69..7af808da477 100644
--- a/forge-gui/res/cardsfolder/upcoming/judgment_bolt.txt
+++ b/forge-gui/res/cardsfolder/upcoming/judgment_bolt.txt
@@ -1,8 +1,8 @@
-Name:Judgment Bolt
-ManaCost:3 R
-Types:Instant
-A:SP$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 5 | DamageMap$ True | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 5 damage to target creature and X damage to that creature's controller, where X is the number of Equipment you control.
-SVar:DBDealDamage:DB$ DealDamage | Defined$ TargetedController | NumDmg$ X | SubAbility$ DBDamageResolve
-SVar:DBDamageResolve:DB$ DamageResolve
-SVar:X:Count$Valid Equipment.YouCtrl
+Name:Judgment Bolt
+ManaCost:3 R
+Types:Instant
+A:SP$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 5 | DamageMap$ True | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 5 damage to target creature and X damage to that creature's controller, where X is the number of Equipment you control.
+SVar:DBDealDamage:DB$ DealDamage | Defined$ TargetedController | NumDmg$ X | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
+SVar:X:Count$Valid Equipment.YouCtrl
 Oracle:Judgment Bolt deals 5 damage to target creature and X damage to that creature's controller, where X is the number of Equipment you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/kain_traitorous_dragoon.txt b/forge-gui/res/cardsfolder/upcoming/kain_traitorous_dragoon.txt
index 76e55135a95..ec8d00a0021 100644
--- a/forge-gui/res/cardsfolder/upcoming/kain_traitorous_dragoon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/kain_traitorous_dragoon.txt
@@ -1,13 +1,13 @@
-Name:Kain, Traitorous Dragoon
-ManaCost:2 B
-Types:Legendary Creature Human Knight
-PT:2/4
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | Condition$ PlayerTurn | Description$ Jump — During your turn, NICKNAME has flying.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigControl | TriggerDescription$ Whenever Kain deals combat damage to a player, that player gains control of Kain. If they do, you draw that many cards, create that many tapped Treasure tokens, then lose that much life.
-SVar:TrigControl:DB$ GainControl | Defined$ Self | NewController$ TriggeredTarget | RememberControlled$ True | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | NumCards$ X | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenScript$ c_a_treasure_sac | TokenAmount$ X | TokenTapped$ True | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:TriggerCount$DamageAmount
+Name:Kain, Traitorous Dragoon
+ManaCost:2 B
+Types:Legendary Creature Human Knight
+PT:2/4
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | Condition$ PlayerTurn | Description$ Jump — During your turn, NICKNAME has flying.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigControl | TriggerDescription$ Whenever Kain deals combat damage to a player, that player gains control of Kain. If they do, you draw that many cards, create that many tapped Treasure tokens, then lose that much life.
+SVar:TrigControl:DB$ GainControl | Defined$ Self | NewController$ TriggeredTarget | RememberControlled$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ X | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenScript$ c_a_treasure_sac | TokenAmount$ X | TokenTapped$ True | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:TriggerCount$DamageAmount
 Oracle:Jump — During your turn, Kain has flying.\nWhenever Kain deals combat damage to a player, that player gains control of Kain. If they do, you draw that many cards, create that many tapped Treasure tokens, then lose that much life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/kefka_court_mage_kefka_ruler_of_ruin.txt b/forge-gui/res/cardsfolder/upcoming/kefka_court_mage_kefka_ruler_of_ruin.txt
index 12d8a5a51c1..84c82f98883 100644
--- a/forge-gui/res/cardsfolder/upcoming/kefka_court_mage_kefka_ruler_of_ruin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/kefka_court_mage_kefka_ruler_of_ruin.txt
@@ -1,29 +1,29 @@
-Name:Kefka, Court Mage
-ManaCost:2 U B R
-Types:Legendary Creature Human Wizard
-PT:4/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ Whenever NICKNAME enters or attacks, each player discards a card. Then you draw a card for each card type among cards discarded this way.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever NICKNAME enters or attacks, each player discards a card. Then you draw a card for each card type among cards discarded this way.
-SVar:TrigDiscard:DB$ Discard | Defined$ Player | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | NumCards$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-A:AB$ Sacrifice | Cost$ 8 | SacValid$ Permanent | SacMessage$ Permanent | Defined$ Player.Opponent | SorcerySpeed$ True | SubAbility$ DBTransform | SpellDescription$ Each opponent sacrifices a permanent of their choice. Transform NICKNAME. Activate only as a sorcery.
-SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform
-SVar:X:Remembered$CardTypes
-AlternateMode:DoubleFaced
-SVar:HasAttackEffect:TRUE
-DeckHas:Ability$Discard|Sacrifice
-Oracle:Whenever Kefka enters or attacks, each player discards a card. Then you draw a card for each card type among cards discarded this way.\n{8}: Each opponent sacrifices a permanent of their choice. Transform Kefka. Activate only as a sorcery.
-
-ALTERNATE
-
-Name:Kefka, Ruler of Ruin
-ManaCost:no cost
-Colors:blue,black,red
-Types:Legendary Creature Avatar Wizard
-PT:5/7
-K:Flying
-T:Mode$ LifeLost | ValidPlayer$ Opponent | PlayerTurn$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent loses life during your turn, you draw that many cards.
-SVar:TrigDraw:DB$ Draw | NumCards$ Y 
-SVar:Y:TriggerCount$LifeAmount
+Name:Kefka, Court Mage
+ManaCost:2 U B R
+Types:Legendary Creature Human Wizard
+PT:4/5
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ Whenever NICKNAME enters or attacks, each player discards a card. Then you draw a card for each card type among cards discarded this way.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever NICKNAME enters or attacks, each player discards a card. Then you draw a card for each card type among cards discarded this way.
+SVar:TrigDiscard:DB$ Discard | Defined$ Player | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ Sacrifice | Cost$ 8 | SacValid$ Permanent | SacMessage$ Permanent | Defined$ Player.Opponent | SorcerySpeed$ True | SubAbility$ DBTransform | SpellDescription$ Each opponent sacrifices a permanent of their choice. Transform NICKNAME. Activate only as a sorcery.
+SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform
+SVar:X:Remembered$CardTypes
+AlternateMode:DoubleFaced
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Discard|Sacrifice
+Oracle:Whenever Kefka enters or attacks, each player discards a card. Then you draw a card for each card type among cards discarded this way.\n{8}: Each opponent sacrifices a permanent of their choice. Transform Kefka. Activate only as a sorcery.
+
+ALTERNATE
+
+Name:Kefka, Ruler of Ruin
+ManaCost:no cost
+Colors:blue,black,red
+Types:Legendary Creature Avatar Wizard
+PT:5/7
+K:Flying
+T:Mode$ LifeLost | ValidPlayer$ Opponent | PlayerTurn$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent loses life during your turn, you draw that many cards.
+SVar:TrigDraw:DB$ Draw | NumCards$ Y 
+SVar:Y:TriggerCount$LifeAmount
 Oracle:Flying\nWhenever an opponent loses life during your turn, you draw that many cards.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/krile_baldesion.txt b/forge-gui/res/cardsfolder/upcoming/krile_baldesion.txt
index d9e4c9367cd..39fd8ed24e0 100644
--- a/forge-gui/res/cardsfolder/upcoming/krile_baldesion.txt
+++ b/forge-gui/res/cardsfolder/upcoming/krile_baldesion.txt
@@ -1,9 +1,9 @@
-Name:Krile Baldesion
-ManaCost:W U
-Types:Legendary Creature Dwarf Wizard
-PT:2/1
-K:Lifelink
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChangeZone | ResolvedLimit$ 1 | OptionalDecider$ You | TriggerDescription$ Trace Aether — Whenever you cast a noncreature spell, you may return target creature card with mana value equal to that spell's mana value from your graveyard to your hand. Do this only once each turn.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card with mana value equal to the spell's mana value in your graveyard | ValidTgts$ Creature.cmcEQX+YouOwn
-SVar:X:TriggeredStackInstance$CardManaCostLKI
+Name:Krile Baldesion
+ManaCost:W U
+Types:Legendary Creature Dwarf Wizard
+PT:2/1
+K:Lifelink
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChangeZone | ResolvedLimit$ 1 | OptionalDecider$ You | TriggerDescription$ Trace Aether — Whenever you cast a noncreature spell, you may return target creature card with mana value equal to that spell's mana value from your graveyard to your hand. Do this only once each turn.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card with mana value equal to the spell's mana value in your graveyard | ValidTgts$ Creature.cmcEQX+YouOwn
+SVar:X:TriggeredStackInstance$CardManaCostLKI
 Oracle:Lifelink\nTrace Aether — Whenever you cast a noncreature spell, you may return target creature card with mana value equal to that spell's mana value from your graveyard to your hand. Do this only once each turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/kuja_genome_sorcerer_trance_kuja_fate_defied.txt b/forge-gui/res/cardsfolder/upcoming/kuja_genome_sorcerer_trance_kuja_fate_defied.txt
index 52768de8ef5..66d4a17441a 100644
--- a/forge-gui/res/cardsfolder/upcoming/kuja_genome_sorcerer_trance_kuja_fate_defied.txt
+++ b/forge-gui/res/cardsfolder/upcoming/kuja_genome_sorcerer_trance_kuja_fate_defied.txt
@@ -1,22 +1,22 @@
-Name:Kuja, Genome Sorcerer
-ManaCost:2 B R
-Types:Legendary Creature Human Mutant Wizard
-PT:3/4
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, create a tapped 0/1 black Wizard creature token with "Whenever you cast a noncreature spell, this token deals 1 damage to each opponent." Then if you control four or more Wizards, transform Kuja.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | Tapped$ True | TokenScript$ b_0_1_wizard_snipe | TokenOwner$ You | SubAbility$ DBTransform
-SVar:DBTransform:DB$ SetState | Defined$ Self | ConditionPresent$ Card.Wizard+YouCtrl | ConditionCompare$ GE4 | Mode$ Transform
-DeckHints:Type$Wizard
-AlternateMode:DoubleFaced
-Oracle:At the beginning of your end step, create a tapped 0/1 black Wizard creature token with "Whenever you cast a noncreature spell, this token deals 1 damage to each opponent." Then if you control four or more Wizards, transform Kuja.
-
-ALTERNATE
-
-Name:Trance Kuja, Fate Defied
-ManaCost:no cost
-Colors:black,red
-Types:Legendary Creature Avatar Wizard
-PT:4/6
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Wizard.YouCtrl | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ Flame Star — If a Wizard you control would deal damage to a permanent or player, it deals double that damage instead.
-SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X
-SVar:X:ReplaceCount$DamageAmount/Twice
+Name:Kuja, Genome Sorcerer
+ManaCost:2 B R
+Types:Legendary Creature Human Mutant Wizard
+PT:3/4
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, create a tapped 0/1 black Wizard creature token with "Whenever you cast a noncreature spell, this token deals 1 damage to each opponent." Then if you control four or more Wizards, transform Kuja.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | Tapped$ True | TokenScript$ b_0_1_wizard_snipe | TokenOwner$ You | SubAbility$ DBTransform
+SVar:DBTransform:DB$ SetState | Defined$ Self | ConditionPresent$ Card.Wizard+YouCtrl | ConditionCompare$ GE4 | Mode$ Transform
+DeckHints:Type$Wizard
+AlternateMode:DoubleFaced
+Oracle:At the beginning of your end step, create a tapped 0/1 black Wizard creature token with "Whenever you cast a noncreature spell, this token deals 1 damage to each opponent." Then if you control four or more Wizards, transform Kuja.
+
+ALTERNATE
+
+Name:Trance Kuja, Fate Defied
+ManaCost:no cost
+Colors:black,red
+Types:Legendary Creature Avatar Wizard
+PT:4/6
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Wizard.YouCtrl | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ Flame Star — If a Wizard you control would deal damage to a permanent or player, it deals double that damage instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X
+SVar:X:ReplaceCount$DamageAmount/Twice
 Oracle:Flame Star — If a Wizard you control would deal damage to a permanent or player, it deals double that damage instead.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/laughing_mad.txt b/forge-gui/res/cardsfolder/upcoming/laughing_mad.txt
index 316b57f3601..41ef547bfb8 100644
--- a/forge-gui/res/cardsfolder/upcoming/laughing_mad.txt
+++ b/forge-gui/res/cardsfolder/upcoming/laughing_mad.txt
@@ -1,8 +1,8 @@
-Name:Laughing Mad
-ManaCost:2 R
-Types:Instant
-A:SP$ Draw | Cost$ 2 R Discard<1/Card/card> | NumCards$ 2 | Defined$ You | SpellDescription$ Draw two cards.
-K:Flashback:3 R
-DeckHas:Ability$Discard|Graveyard
-DeckHints:Keyword$Madness & Ability$Delirium
+Name:Laughing Mad
+ManaCost:2 R
+Types:Instant
+A:SP$ Draw | Cost$ 2 R Discard<1/Card/card> | NumCards$ 2 | Defined$ You | SpellDescription$ Draw two cards.
+K:Flashback:3 R
+DeckHas:Ability$Discard|Graveyard
+DeckHints:Keyword$Madness & Ability$Delirium
 Oracle:As an additional cost to cast this spell, discard a card.\nDraw two cards.\nFlashback {3}{R} (You may cast this card from your graveyard for its flashback cost and any additional costs. Then exile it.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/lightning_army_of_one.txt b/forge-gui/res/cardsfolder/upcoming/lightning_army_of_one.txt
index afd8c8c48db..110f1d35592 100644
--- a/forge-gui/res/cardsfolder/upcoming/lightning_army_of_one.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lightning_army_of_one.txt
@@ -1,13 +1,13 @@
-Name:Lightning, Army of One
-ManaCost:1 R W
-Types:Legendary Creature Human Soldier
-PT:3/2
-K:First Strike
-K:Trample
-K:Lifelink
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigEffect | CombatDamage$ True | TriggerDescription$ Stagger — Whenever NICKNAME deals combat damage to a player, until your next turn, if a source would deal damage to that player or a permanent that player controls, it deals double that damage instead.
-SVar:TrigEffect:DB$ Effect | ReplacementEffects$ Stagger | RememberObjects$ TriggeredTarget | Duration$ UntilYourNextTurn
-SVar:Stagger:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card,Emblem | ValidTarget$ Player.IsRemembered,Permanent.ControlledBy Player.IsRemembered | ReplaceWith$ DmgTwice | Description$ Until your next turn, if a source would deal damage to that player or a permanent that player controls, it deals double that damage instead.
-SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ StaggerX
-SVar:StaggerX:ReplaceCount$DamageAmount/Twice
+Name:Lightning, Army of One
+ManaCost:1 R W
+Types:Legendary Creature Human Soldier
+PT:3/2
+K:First Strike
+K:Trample
+K:Lifelink
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigEffect | CombatDamage$ True | TriggerDescription$ Stagger — Whenever NICKNAME deals combat damage to a player, until your next turn, if a source would deal damage to that player or a permanent that player controls, it deals double that damage instead.
+SVar:TrigEffect:DB$ Effect | ReplacementEffects$ Stagger | RememberObjects$ TriggeredTarget | Duration$ UntilYourNextTurn
+SVar:Stagger:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card,Emblem | ValidTarget$ Player.IsRemembered,Permanent.ControlledBy Player.IsRemembered | ReplaceWith$ DmgTwice | Description$ Until your next turn, if a source would deal damage to that player or a permanent that player controls, it deals double that damage instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ StaggerX
+SVar:StaggerX:ReplaceCount$DamageAmount/Twice
 Oracle:First strike, trample, lifelink\nStagger — Whenever Lightning deals combat damage to a player, until your next turn, if a source would deal damage to that player or a permanent that player controls, it deals double that damage instead.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/lightning_security_sergeant.txt b/forge-gui/res/cardsfolder/upcoming/lightning_security_sergeant.txt
index aed2bd07685..e09d36ea80c 100644
--- a/forge-gui/res/cardsfolder/upcoming/lightning_security_sergeant.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lightning_security_sergeant.txt
@@ -1,11 +1,11 @@
-Name:Lightning, Security Sergeant
-ManaCost:2 R
-Types:Legendary Creature Human Soldier
-PT:2/3
-K:Menace
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, exile the top card of your library. You may play that card for as long as you control NICKNAME.
-SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | RememberObjects$ Remembered | ForgetOnMoved$ Exile | Duration$ AsLongAsControl | SubAbility$ DBCleanup
-SVar:STPlay:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play this card for as long as you control NICKNAME.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhenever Lightning deals combat damage to a player, exile the top card of your library. You may play that card for as long as you control Lightning.
+Name:Lightning, Security Sergeant
+ManaCost:2 R
+Types:Legendary Creature Human Soldier
+PT:2/3
+K:Menace
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, exile the top card of your library. You may play that card for as long as you control NICKNAME.
+SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | RememberObjects$ Remembered | ForgetOnMoved$ Exile | Duration$ AsLongAsControl | SubAbility$ DBCleanup
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play this card for as long as you control NICKNAME.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhenever Lightning deals combat damage to a player, exile the top card of your library. You may play that card for as long as you control Lightning.
diff --git a/forge-gui/res/cardsfolder/upcoming/malboro.txt b/forge-gui/res/cardsfolder/upcoming/malboro.txt
index 34875f8026c..4a420281549 100644
--- a/forge-gui/res/cardsfolder/upcoming/malboro.txt
+++ b/forge-gui/res/cardsfolder/upcoming/malboro.txt
@@ -1,10 +1,10 @@
-Name:Malboro
-ManaCost:4 B B
-Types:Creature Plant Horror
-PT:4/4
-K:TypeCycling:Swamp:2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ Bad Breath — When this creature enters, each opponent discards a card, loses 2 life, and exiles the top three cards of their library.
-SVar:TrigDiscard:DB$ Discard | Defined$ Opponent | Mode$ TgtChoose | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ Opponent | SubAbility$ DBExile
-SVar:DBExile:DB$ Dig | Defined$ Player.Opponent | DigNum$ 3 | ChangeNum$ All | DestinationZone$ Exile
+Name:Malboro
+ManaCost:4 B B
+Types:Creature Plant Horror
+PT:4/4
+K:TypeCycling:Swamp:2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ Bad Breath — When this creature enters, each opponent discards a card, loses 2 life, and exiles the top three cards of their library.
+SVar:TrigDiscard:DB$ Discard | Defined$ Opponent | Mode$ TgtChoose | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ Opponent | SubAbility$ DBExile
+SVar:DBExile:DB$ Dig | Defined$ Player.Opponent | DigNum$ 3 | ChangeNum$ All | DestinationZone$ Exile
 Oracle:Bad Breath — When this creature enters, each opponent discards a card, loses 2 life, and exiles the top three cards of their library.\nSwampcycling {2} ({2}, Discard this card: Search your library for a Swamp card, reveal it, put it into your hand, then shuffle.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/matoya_archon_elder.txt b/forge-gui/res/cardsfolder/upcoming/matoya_archon_elder.txt
index a98e1f270fd..594ffee9a34 100644
--- a/forge-gui/res/cardsfolder/upcoming/matoya_archon_elder.txt
+++ b/forge-gui/res/cardsfolder/upcoming/matoya_archon_elder.txt
@@ -1,8 +1,8 @@
-Name:Matoya, Archon Elder
-ManaCost:2 U
-Types:Legendary Creature Human Warlock
-PT:1/4
-T:Mode$ Scry | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever you scry or surveil, draw a card. (Draw after you scry or surveil.)
-T:Mode$ Surveil | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | Secondary$ True | TriggerDescription$ Whenever you scry or surveil, draw a card. (Draw after you scry or surveil.)
-SVar:TrigDraw:DB$ Draw
+Name:Matoya, Archon Elder
+ManaCost:2 U
+Types:Legendary Creature Human Warlock
+PT:1/4
+T:Mode$ Scry | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever you scry or surveil, draw a card. (Draw after you scry or surveil.)
+T:Mode$ Surveil | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | Secondary$ True | TriggerDescription$ Whenever you scry or surveil, draw a card. (Draw after you scry or surveil.)
+SVar:TrigDraw:DB$ Draw
 Oracle:Whenever you scry or surveil, draw a card. (Draw after you scry or surveil.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/noctis_prince_of_lucis.txt b/forge-gui/res/cardsfolder/upcoming/noctis_prince_of_lucis.txt
index 1aa7311131f..66b2ef63c7f 100644
--- a/forge-gui/res/cardsfolder/upcoming/noctis_prince_of_lucis.txt
+++ b/forge-gui/res/cardsfolder/upcoming/noctis_prince_of_lucis.txt
@@ -1,12 +1,12 @@
-Name:Noctis, Prince of Lucis
-ManaCost:1 W U B
-Types:Legendary Creature Human Noble
-PT:4/3
-K:Lifelink
-S:Mode$ Continuous | Affected$ Artifact.YouCtrl | MayPlay$ True | EffectZone$ Battlefield | AffectedZone$ Graveyard | RaiseCost$ PayLife<3> | Description$ You may cast artifact spells from your graveyard by paying 3 life in addition to paying their other costs. If you cast a spell this way, that artifact enters with a finality counter on it.
-T:Mode$ SpellCast | ValidCard$ Card.CastSa Spell.MayPlaySource | Execute$ TrigEffect | Static$ True | TriggerZones$ Battlefield
-SVar:TrigEffect:DB$ Effect | ReplacementEffects$ ReMoved | RememberObjects$ TriggeredCard
-SVar:ReMoved:Event$ Moved | Origin$ Stack | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBCounter
-SVar:ETBCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ FINALITY | CounterNum$ 1 | SubAbility$ RemoveSelf
-SVar:RemoveSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-Oracle:Lifelink\nYou may cast artifact spells from your graveyard by paying 3 life in addition to paying their other costs. If you cast a spell this way, that artifact enters with a finality counter on it.
+Name:Noctis, Prince of Lucis
+ManaCost:1 W U B
+Types:Legendary Creature Human Noble
+PT:4/3
+K:Lifelink
+S:Mode$ Continuous | Affected$ Artifact.YouCtrl | MayPlay$ True | EffectZone$ Battlefield | AffectedZone$ Graveyard | RaiseCost$ PayLife<3> | Description$ You may cast artifact spells from your graveyard by paying 3 life in addition to paying their other costs. If you cast a spell this way, that artifact enters with a finality counter on it.
+T:Mode$ SpellCast | ValidCard$ Card.CastSa Spell.MayPlaySource | Execute$ TrigEffect | Static$ True | TriggerZones$ Battlefield
+SVar:TrigEffect:DB$ Effect | ReplacementEffects$ ReMoved | RememberObjects$ TriggeredCard
+SVar:ReMoved:Event$ Moved | Origin$ Stack | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBCounter
+SVar:ETBCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ FINALITY | CounterNum$ 1 | SubAbility$ RemoveSelf
+SVar:RemoveSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+Oracle:Lifelink\nYou may cast artifact spells from your graveyard by paying 3 life in addition to paying their other costs. If you cast a spell this way, that artifact enters with a finality counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/rinoa_heartilly.txt b/forge-gui/res/cardsfolder/upcoming/rinoa_heartilly.txt
index 23ab7573584..6c4e03ac78b 100644
--- a/forge-gui/res/cardsfolder/upcoming/rinoa_heartilly.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rinoa_heartilly.txt
@@ -1,10 +1,10 @@
-Name:Rinoa Heartilly
-ManaCost:3 G W
-Types:Legendary Creature Human Rebel Warlock
-PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create Angelo, a legendary 1/1 green and white Dog creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ angelo | TokenOwner$ You
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature you control gets +1/+1 until end of turn for each creature you control.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | NumAtt$ +X | NumDef$ +X
-SVar:X:Count$Valid Creature.YouCtrl
+Name:Rinoa Heartilly
+ManaCost:3 G W
+Types:Legendary Creature Human Rebel Warlock
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create Angelo, a legendary 1/1 green and white Dog creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ angelo | TokenOwner$ You
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature you control gets +1/+1 until end of turn for each creature you control.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | NumAtt$ +X | NumDef$ +X
+SVar:X:Count$Valid Creature.YouCtrl
 Oracle:When Rinoa Heartilly enters, create Angelo, a legendary 1/1 green and white Dog creature token.\nAngelo Cannon — Whenever Rinoa Heartilly attacks, another target creature you control gets +1/+1 until end of turn for each creature you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sabin_master_monk.txt b/forge-gui/res/cardsfolder/upcoming/sabin_master_monk.txt
index e28b0ced4d4..80a96b74397 100644
--- a/forge-gui/res/cardsfolder/upcoming/sabin_master_monk.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sabin_master_monk.txt
@@ -1,9 +1,9 @@
-Name:Sabin, Master Monk
-ManaCost:4 R
-Types:Legendary Creature Human Noble Monk
-PT:4/3
-K:Double Strike
-K:Blitz:2 R R Discard<1/Card>
-S:Mode$ Continuous | Affected$ Card.Self | MayPlay$ True | ValidSA$ Spell.Blitz | AffectedZone$ Graveyard | EffectZone$ Graveyard | Description$ You may cast CARDNAME from your graveyard using its blitz ability.
-DeckHas:Ability$Sacrifice|Graveyard
+Name:Sabin, Master Monk
+ManaCost:4 R
+Types:Legendary Creature Human Noble Monk
+PT:4/3
+K:Double Strike
+K:Blitz:2 R R Discard<1/Card>
+S:Mode$ Continuous | Affected$ Card.Self | MayPlay$ True | ValidSA$ Spell.Blitz | AffectedZone$ Graveyard | EffectZone$ Graveyard | Description$ You may cast CARDNAME from your graveyard using its blitz ability.
+DeckHas:Ability$Sacrifice|Graveyard
 Oracle:Double strike\nBlitz—{2}{R}{R}, Discard a card. (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)\nYou may cast this card from your graveyard using its blitz ability.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sages_nouliths.txt b/forge-gui/res/cardsfolder/upcoming/sages_nouliths.txt
index 7920536dc75..98e4e29ba27 100644
--- a/forge-gui/res/cardsfolder/upcoming/sages_nouliths.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sages_nouliths.txt
@@ -1,11 +1,11 @@
-Name:Sage's Nouliths
-ManaCost:1 U
-Types:Artifact Equipment
-K:Job select
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddType$ Cleric | AddTrigger$ TrigAttack | AddSVar$ AE | Description$ Equipped creature gets +1/+0, has "Whenever this creature attacks, untap target attacking creature," and is a Cleric in addition to its other types.
-SVar:TrigAttack:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever this creature attacks, untap target attacking creature.
-SVar:TrigUntap:DB$ Untap | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature
-K:Equip:3
-SVar:AE:SVar:HasAttackEffect:TRUE
-DeckHas:Type$Cleric
-Oracle:Job select (When this Equipment enters, create a 1/1 colorless Hero creature token, then attach this to it.)\nEquipped creature gets +1/+0, has "Whenever this creature attacks, untap target attacking creature," and is a Cleric in addition to its other types.\nHagneia — Equip {3}
+Name:Sage's Nouliths
+ManaCost:1 U
+Types:Artifact Equipment
+K:Job select
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddType$ Cleric | AddTrigger$ TrigAttack | AddSVar$ AE | Description$ Equipped creature gets +1/+0, has "Whenever this creature attacks, untap target attacking creature," and is a Cleric in addition to its other types.
+SVar:TrigAttack:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever this creature attacks, untap target attacking creature.
+SVar:TrigUntap:DB$ Untap | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature
+K:Equip:3
+SVar:AE:SVar:HasAttackEffect:TRUE
+DeckHas:Type$Cleric
+Oracle:Job select (When this Equipment enters, create a 1/1 colorless Hero creature token, then attach this to it.)\nEquipped creature gets +1/+0, has "Whenever this creature attacks, untap target attacking creature," and is a Cleric in addition to its other types.\nHagneia — Equip {3}
diff --git a/forge-gui/res/cardsfolder/upcoming/sephiroth_fabled_soldier_sephiroth_one_winged_angel.txt b/forge-gui/res/cardsfolder/upcoming/sephiroth_fabled_soldier_sephiroth_one_winged_angel.txt
index 96a5e676b80..13ebb4bd512 100644
--- a/forge-gui/res/cardsfolder/upcoming/sephiroth_fabled_soldier_sephiroth_one_winged_angel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sephiroth_fabled_soldier_sephiroth_one_winged_angel.txt
@@ -1,34 +1,34 @@
-Name:Sephiroth, Fabled SOLDIER
-ManaCost:2 B
-Types:Legendary Creature Human Avatar Soldier
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw1 | TriggerDescription$ Whenever NICKNAME enters or attacks, you may sacrifice another creature. If you do, draw a card.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw1 | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever NICKNAME enters or attacks, you may sacrifice another creature. If you do, draw a card.
-SVar:TrigDraw1:AB$ Draw | Cost$ Sac<1/Creature.Other/another creature>
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever another creature dies, target opponent loses 1 life and you gain 1 life. If this is the fourth time this ability has resolved this turn, transform Sephiroth.
-SVar:TrigLoseLife:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1 | SubAbility$ DBTransform
-SVar:DBTransform:DB$ SetState | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ4 | Mode$ Transform
-SVar:X:Count$ResolvedThisTurn
-AlternateMode:DoubleFaced
-SVar:HasAttackEffect:TRUE
-DeckHas:Ability$Sacrifice
-Oracle:Whenever Sephiroth enters or attacks, you may sacrifice another creature. If you do, draw a card.\nWhenever another creature dies, target opponent loses 1 life and you gain 1 life. If this is the fourth time this ability has resolved this turn, transform Sephiroth.
-
-ALTERNATE
-
-Name:Sephiroth, One-Winged Angel
-ManaCost:no cost
-Colors:black
-Types:Legendary Creature Angel Nightmare Avatar
-PT:5/5
-K:Flying
-R:Event$ Transform | ValidCard$ Card.Self | ReplaceWith$ DBEffect | Description$ Super Nova — As this creature transforms into CARDNAME, you get an emblem with "Whenever a creature dies, target opponent loses 1 life and you gain 1 life."
-SVar:DBEffect:DB$ Effect | Name$ Emblem — Sephiroth, One-Winged Angel | Image$ emblem_sephiroth_one_winged_angel | Triggers$ TrigChangesZone | Duration$ Permanent
-SVar:TrigChangesZone:Mode$ ChangesZone | ValidCard$ Creature | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigLoseLifeEmblem | TriggerZones$ Command | TriggerDescription$ Whenever a creature dies, target opponent loses 1 life and you gain 1 life.
-SVar:TrigLoseLifeEmblem:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLifeEmblem
-SVar:DBGainLifeEmblem:DB$ GainLife | Defined$ You | LifeAmount$ 1
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw2 | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME attacks, you may sacrifice any number of other creatures. If you do, draw that many cards.
-SVar:TrigDraw2:AB$ Draw | Cost$ Sac<X/Creature.Other/another creature> | NumCards$ X
-SVar:X:Count$xPaid
+Name:Sephiroth, Fabled SOLDIER
+ManaCost:2 B
+Types:Legendary Creature Human Avatar Soldier
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw1 | TriggerDescription$ Whenever NICKNAME enters or attacks, you may sacrifice another creature. If you do, draw a card.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw1 | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever NICKNAME enters or attacks, you may sacrifice another creature. If you do, draw a card.
+SVar:TrigDraw1:AB$ Draw | Cost$ Sac<1/Creature.Other/another creature>
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever another creature dies, target opponent loses 1 life and you gain 1 life. If this is the fourth time this ability has resolved this turn, transform Sephiroth.
+SVar:TrigLoseLife:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1 | SubAbility$ DBTransform
+SVar:DBTransform:DB$ SetState | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ4 | Mode$ Transform
+SVar:X:Count$ResolvedThisTurn
+AlternateMode:DoubleFaced
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Sacrifice
+Oracle:Whenever Sephiroth enters or attacks, you may sacrifice another creature. If you do, draw a card.\nWhenever another creature dies, target opponent loses 1 life and you gain 1 life. If this is the fourth time this ability has resolved this turn, transform Sephiroth.
+
+ALTERNATE
+
+Name:Sephiroth, One-Winged Angel
+ManaCost:no cost
+Colors:black
+Types:Legendary Creature Angel Nightmare Avatar
+PT:5/5
+K:Flying
+R:Event$ Transform | ValidCard$ Card.Self | ReplaceWith$ DBEffect | Description$ Super Nova — As this creature transforms into CARDNAME, you get an emblem with "Whenever a creature dies, target opponent loses 1 life and you gain 1 life."
+SVar:DBEffect:DB$ Effect | Name$ Emblem — Sephiroth, One-Winged Angel | Image$ emblem_sephiroth_one_winged_angel | Triggers$ TrigChangesZone | Duration$ Permanent
+SVar:TrigChangesZone:Mode$ ChangesZone | ValidCard$ Creature | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigLoseLifeEmblem | TriggerZones$ Command | TriggerDescription$ Whenever a creature dies, target opponent loses 1 life and you gain 1 life.
+SVar:TrigLoseLifeEmblem:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLifeEmblem
+SVar:DBGainLifeEmblem:DB$ GainLife | Defined$ You | LifeAmount$ 1
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw2 | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME attacks, you may sacrifice any number of other creatures. If you do, draw that many cards.
+SVar:TrigDraw2:AB$ Draw | Cost$ Sac<X/Creature.Other/another creature> | NumCards$ X
+SVar:X:Count$xPaid
 Oracle:Flying\nSuper Nova — As this creature transforms into Sephiroth, One-Winged Angel, you get an emblem with "Whenever a creature dies, target opponent loses 1 life and you gain 1 life."\nWhenever Sephiroth attacks, you may sacrifice any number of other creatures. If you do, draw that many cards.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sephiroth_fallen_hero.txt b/forge-gui/res/cardsfolder/upcoming/sephiroth_fallen_hero.txt
index 1a99c5635ef..0bf58762618 100644
--- a/forge-gui/res/cardsfolder/upcoming/sephiroth_fallen_hero.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sephiroth_fallen_hero.txt
@@ -1,10 +1,10 @@
-Name:Sephiroth, Fallen Hero
-ManaCost:3 R W
-Types:Legendary Creature Human Avatar Soldier
-PT:7/5
-T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPutCounter | TriggerDescription$ Jenova Cells — Whenever NICKNAME attacks, you may put a cell counter on target creature. Until end of turn, each modified creature you control has base power and toughness 7/5. (Equipment, Auras you control, and counters are modifications.)
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select a creature | CounterType$ CELL | CounterNum$ 1 | Optional$ True | SubAbility$ DBAnimateAll
-SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.modified+YouCtrl | Power$ 7 | Toughness$ 5
-A:AB$ ChangeZone | PrecostDesc$ The Reunion | Cost$ 3 Sac<1/Creature.modified/a modified creature> | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | Tapped$ True | SpellDescription$ Return this card from your graveyard to the battlefield tapped.
-SVar:HasAttackEffect:TRUE
-Oracle:Jenova Cells — Whenever Sephiroth attacks, you may put a cell counter on target creature. Until end of turn, each modified creature you control has base power and toughness 7/5. (Equipment, Auras you control, and counters are modifications.)\nThe Reunion — {3}, Sacrifice a modified creature: Return this card from your graveyard to the battlefield tapped.
+Name:Sephiroth, Fallen Hero
+ManaCost:3 R W
+Types:Legendary Creature Human Avatar Soldier
+PT:7/5
+T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPutCounter | TriggerDescription$ Jenova Cells — Whenever NICKNAME attacks, you may put a cell counter on target creature. Until end of turn, each modified creature you control has base power and toughness 7/5. (Equipment, Auras you control, and counters are modifications.)
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select a creature | CounterType$ CELL | CounterNum$ 1 | Optional$ True | SubAbility$ DBAnimateAll
+SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.modified+YouCtrl | Power$ 7 | Toughness$ 5
+A:AB$ ChangeZone | PrecostDesc$ The Reunion | Cost$ 3 Sac<1/Creature.modified/a modified creature> | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | Tapped$ True | SpellDescription$ Return this card from your graveyard to the battlefield tapped.
+SVar:HasAttackEffect:TRUE
+Oracle:Jenova Cells — Whenever Sephiroth attacks, you may put a cell counter on target creature. Until end of turn, each modified creature you control has base power and toughness 7/5. (Equipment, Auras you control, and counters are modifications.)\nThe Reunion — {3}, Sacrifice a modified creature: Return this card from your graveyard to the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/setzer_wandering_gambler.txt b/forge-gui/res/cardsfolder/upcoming/setzer_wandering_gambler.txt
index c875a3db369..fe6a4618943 100644
--- a/forge-gui/res/cardsfolder/upcoming/setzer_wandering_gambler.txt
+++ b/forge-gui/res/cardsfolder/upcoming/setzer_wandering_gambler.txt
@@ -1,11 +1,11 @@
-Name:Setzer, Wandering Gambler
-ManaCost:1 B R
-Types:Legendary Creature Human Rogue Pilot
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken1 | TriggerDescription$ When NICKNAME enters, create The Blackjack, a legendary 3/3 colorless Vehicle artifact token with flying and crew 2.
-SVar:TrigToken1:DB$ Token | TokenAmount$ 1 | TokenScript$ the_blackjack | TokenOwner$ You
-T:Mode$ DamageDone | ValidSource$ Vehicle.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigFlip | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Vehicle you control deals combat damage to a player, flip a coin.
-SVar:TrigFlip:DB$ FlipACoin
-T:Mode$ FlippedCoin | ValidPlayer$ You | ValidResult$ Win | TriggerZones$ Battlefield | Execute$ TrigToken2 | TriggerDescription$ Whenever you win a coin flip, create two tapped Treasure tokens.
-SVar:TrigToken2:DB$ Token | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenTapped$ True
+Name:Setzer, Wandering Gambler
+ManaCost:1 B R
+Types:Legendary Creature Human Rogue Pilot
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken1 | TriggerDescription$ When NICKNAME enters, create The Blackjack, a legendary 3/3 colorless Vehicle artifact token with flying and crew 2.
+SVar:TrigToken1:DB$ Token | TokenAmount$ 1 | TokenScript$ the_blackjack | TokenOwner$ You
+T:Mode$ DamageDone | ValidSource$ Vehicle.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigFlip | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Vehicle you control deals combat damage to a player, flip a coin.
+SVar:TrigFlip:DB$ FlipACoin
+T:Mode$ FlippedCoin | ValidPlayer$ You | ValidResult$ Win | TriggerZones$ Battlefield | Execute$ TrigToken2 | TriggerDescription$ Whenever you win a coin flip, create two tapped Treasure tokens.
+SVar:TrigToken2:DB$ Token | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenTapped$ True
 Oracle:When Setzer enters, create The Blackjack, a legendary 3/3 colorless Vehicle artifact token with flying and crew 2.\nWhenever a Vehicle you control deals combat damage to a player, flip a coin.\nWhenever you win a coin flip, create two tapped Treasure tokens.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/seymour_flux.txt b/forge-gui/res/cardsfolder/upcoming/seymour_flux.txt
index e34be63dfff..f95c387a9d0 100644
--- a/forge-gui/res/cardsfolder/upcoming/seymour_flux.txt
+++ b/forge-gui/res/cardsfolder/upcoming/seymour_flux.txt
@@ -1,8 +1,8 @@
-Name:Seymour Flux
-ManaCost:4 B
-Types:Legendary Creature Spirit Avatar
-PT:5/5
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your upkeep, you may pay 1 life. If you do, draw a card and put a +1/+1 counter on CARDNAME.
-SVar:TrigDraw:AB$ Draw | Cost$ PayLife<1> | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+Name:Seymour Flux
+ManaCost:4 B
+Types:Legendary Creature Spirit Avatar
+PT:5/5
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your upkeep, you may pay 1 life. If you do, draw a card and put a +1/+1 counter on CARDNAME.
+SVar:TrigDraw:AB$ Draw | Cost$ PayLife<1> | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:At the beginning of your upkeep, you may pay 1 life. If you do, draw a card and put a +1/+1 counter on Seymour Flux.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/shadow_mysterious_assassin.txt b/forge-gui/res/cardsfolder/upcoming/shadow_mysterious_assassin.txt
index b09fa234fa0..35cde6f704a 100644
--- a/forge-gui/res/cardsfolder/upcoming/shadow_mysterious_assassin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shadow_mysterious_assassin.txt
@@ -1,10 +1,10 @@
-Name:Shadow, Mysterious Assassin
-ManaCost:2 B
-Types:Legendary Creature Human Assassin
-PT:3/3
-K:Deathtouch
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Throw — Whenever NICKNAME deals combat damage to a player, you may sacrifice another nonland permanent. If you do, draw two cards and each opponent loses life equal to the mana value of the sacrificed permanent.
-SVar:TrigDraw:AB$ Draw | Cost$ Sac<1/Permanent.Other+nonLand/another nonland permanent> | NumCards$ 2 | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ X
-SVar:X:Sacrificed$CardManaCost
+Name:Shadow, Mysterious Assassin
+ManaCost:2 B
+Types:Legendary Creature Human Assassin
+PT:3/3
+K:Deathtouch
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Throw — Whenever NICKNAME deals combat damage to a player, you may sacrifice another nonland permanent. If you do, draw two cards and each opponent loses life equal to the mana value of the sacrificed permanent.
+SVar:TrigDraw:AB$ Draw | Cost$ Sac<1/Permanent.Other+nonLand/another nonland permanent> | NumCards$ 2 | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ X
+SVar:X:Sacrificed$CardManaCost
 Oracle:Deathtouch\nThrow — Whenever Shadow deals combat damage to a player, you may sacrifice another nonland permanent. If you do, draw two cards and each opponent loses life equal to the mana value of the sacrificed permanent.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/shantotto_tactician_magician.txt b/forge-gui/res/cardsfolder/upcoming/shantotto_tactician_magician.txt
index 8a0bb4c8e9a..057f78bbd77 100644
--- a/forge-gui/res/cardsfolder/upcoming/shantotto_tactician_magician.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shantotto_tactician_magician.txt
@@ -1,9 +1,9 @@
-Name:Shantotto, Tactician Magician
-ManaCost:1 U R
-Types:Legendary Creature Dwarf Wizard
-PT:0/4
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a noncreature spell, NICKNAME gets +X/+0 until end of turn, where X is the amount of mana spent to cast that spell. If X is 4 or more, draw a card.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ X | ConditionSVarCompare$ GE4
-SVar:X:TriggeredCard$CastTotalManaSpent
+Name:Shantotto, Tactician Magician
+ManaCost:1 U R
+Types:Legendary Creature Dwarf Wizard
+PT:0/4
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a noncreature spell, NICKNAME gets +X/+0 until end of turn, where X is the amount of mana spent to cast that spell. If X is 4 or more, draw a card.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ X | ConditionSVarCompare$ GE4
+SVar:X:TriggeredCard$CastTotalManaSpent
 Oracle:Whenever you cast a noncreature spell, Shantotto gets +X/+0 until end of turn, where X is the amount of mana spent to cast that spell. If X is 4 or more, draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/siegfried_famed_swordsman.txt b/forge-gui/res/cardsfolder/upcoming/siegfried_famed_swordsman.txt
index 6ad5da99dae..314704c29c2 100644
--- a/forge-gui/res/cardsfolder/upcoming/siegfried_famed_swordsman.txt
+++ b/forge-gui/res/cardsfolder/upcoming/siegfried_famed_swordsman.txt
@@ -1,11 +1,11 @@
-Name:Siegfried, Famed Swordsman
-ManaCost:3 B
-Types:Legendary Creature Human Warrior Rogue
-PT:2/2
-K:Menace
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When NICKNAME enters, mill three cards. Then put X +1/+1 counters on NICKNAME, where X is twice the number of creature cards in your graveyard.
-SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X
-SVar:X:Count$ValidGraveyard Creature.YouOwn/Times.2
-DeckHas:Ability$Mill|Graveyard
+Name:Siegfried, Famed Swordsman
+ManaCost:3 B
+Types:Legendary Creature Human Warrior Rogue
+PT:2/2
+K:Menace
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When NICKNAME enters, mill three cards. Then put X +1/+1 counters on NICKNAME, where X is twice the number of creature cards in your graveyard.
+SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X
+SVar:X:Count$ValidGraveyard Creature.YouOwn/Times.2
+DeckHas:Ability$Mill|Graveyard
 Oracle:When Siegfried enters, mill three cards. Then put X +1/+1 counters on Siegfried, where X is twice the number of creature cards in your graveyard.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/tataru_taru.txt b/forge-gui/res/cardsfolder/upcoming/tataru_taru.txt
index 07969dc46d4..1d450f8e416 100644
--- a/forge-gui/res/cardsfolder/upcoming/tataru_taru.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tataru_taru.txt
@@ -1,10 +1,10 @@
-Name:Tataru Taru
-ManaCost:1 W
-Types:Legendary Creature Dwarf Advisor
-PT:0/3
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you draw a card and target opponent may draw a card.
-SVar:TrigDraw:DB$ Draw | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | NumCards$ 1 | ValidTgts$ Opponent | OptionalDecider$ Opponent
-T:Mode$ Drawn | ValidCard$ Card.OwnedBy Opponent.NonActive | TriggerZones$ Battlefield | Execute$ TrigToken | ActivationLimit$ 1 | TriggerDescription$ Scions' Secretary — Whenever an opponent draws a card, if it isn't that player's turn, create a tapped Treasure token. This ability triggers only once each turn.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenTapped$ True
+Name:Tataru Taru
+ManaCost:1 W
+Types:Legendary Creature Dwarf Advisor
+PT:0/3
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you draw a card and target opponent may draw a card.
+SVar:TrigDraw:DB$ Draw | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ 1 | ValidTgts$ Opponent | OptionalDecider$ Opponent
+T:Mode$ Drawn | ValidCard$ Card.OwnedBy Opponent.NonActive | TriggerZones$ Battlefield | Execute$ TrigToken | ActivationLimit$ 1 | TriggerDescription$ Scions' Secretary — Whenever an opponent draws a card, if it isn't that player's turn, create a tapped Treasure token. This ability triggers only once each turn.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenTapped$ True
 Oracle:When Tataru Taru enters, you draw a card and target opponent may draw a card.\nScions' Secretary — Whenever an opponent draws a card, if it isn't that player's turn, create a tapped Treasure token. This ability triggers only once each turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/thancred_waters.txt b/forge-gui/res/cardsfolder/upcoming/thancred_waters.txt
index 7409b4e1a31..0d8474a6206 100644
--- a/forge-gui/res/cardsfolder/upcoming/thancred_waters.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thancred_waters.txt
@@ -1,11 +1,11 @@
-Name:Thancred Waters
-ManaCost:4 W
-Types:Legendary Creature Human Warrior
-PT:3/5
-K:Flash
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump1 | TriggerDescription$ Royal Guard — When CARDNAME enters, another target legendary permanent you control gains indestructible for as long as you control CARDNAME.
-SVar:TrigPump1:DB$ Pump | ValidTgts$ Permanent.Legendary+Other+YouCtrl | TgtPrompt$ Select another target legendary permanent you control | KW$ Indestructible | Duration$ AsLongAsControl
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump2 | TriggerDescription$ Whenever you cast a noncreature spell, CARDNAME gains indestructible until end of turn.
-SVar:TrigPump2:DB$ Pump | KW$ Indestructible | Defined$ Self
-SVar:PlayMain1:TRUE
+Name:Thancred Waters
+ManaCost:4 W
+Types:Legendary Creature Human Warrior
+PT:3/5
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump1 | TriggerDescription$ Royal Guard — When CARDNAME enters, another target legendary permanent you control gains indestructible for as long as you control CARDNAME.
+SVar:TrigPump1:DB$ Pump | ValidTgts$ Permanent.Legendary+Other+YouCtrl | TgtPrompt$ Select another target legendary permanent you control | KW$ Indestructible | Duration$ AsLongAsControl
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump2 | TriggerDescription$ Whenever you cast a noncreature spell, CARDNAME gains indestructible until end of turn.
+SVar:TrigPump2:DB$ Pump | KW$ Indestructible | Defined$ Self
+SVar:PlayMain1:TRUE
 Oracle:Flash\nRoyal Guard — When Thancred Waters enters, another target legendary permanent you control gains indestructible for as long as you control Thancred Waters.\nWhenever you cast a noncreature spell, Thancred Waters gains indestructible until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/the_warring_triad.txt b/forge-gui/res/cardsfolder/upcoming/the_warring_triad.txt
index 6cbfff1a28f..f630015cd19 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_warring_triad.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_warring_triad.txt
@@ -1,11 +1,11 @@
-Name:The Warring Triad
-ManaCost:3
-Types:Legendary Artifact Creature God
-PT:5/5
-K:Flying
-K:Trample
-K:Haste
-S:Mode$ Continuous | Affected$ Card.Self | RemoveType$ Creature | CheckSVar$ X | SVarCompare$ LT8 | Description$ As long as there are fewer than eight cards in your graveyard, CARDNAME isn't a creature.
-A:AB$ Mana | Cost$ T Mill<1> | Defined$ Targeted | ValidTgts$ Player | Produced$ Any | SpellDescription$ Target player adds one mana of any color.
-SVar:X:Count$ValidGraveyard Card.YouOwn
-Oracle:Flying, trample, haste\nAs long as there are fewer than eight cards in your graveyard, The Warring Triad isn't a creature.\n{T}, Mill a card: Target player adds one mana of any color.
+Name:The Warring Triad
+ManaCost:3
+Types:Legendary Artifact Creature God
+PT:5/5
+K:Flying
+K:Trample
+K:Haste
+S:Mode$ Continuous | Affected$ Card.Self | RemoveType$ Creature | CheckSVar$ X | SVarCompare$ LT8 | Description$ As long as there are fewer than eight cards in your graveyard, CARDNAME isn't a creature.
+A:AB$ Mana | Cost$ T Mill<1> | Defined$ Targeted | ValidTgts$ Player | Produced$ Any | SpellDescription$ Target player adds one mana of any color.
+SVar:X:Count$ValidGraveyard Card.YouOwn
+Oracle:Flying, trample, haste\nAs long as there are fewer than eight cards in your graveyard, The Warring Triad isn't a creature.\n{T}, Mill a card: Target player adds one mana of any color.
diff --git a/forge-gui/res/cardsfolder/upcoming/transpose.txt b/forge-gui/res/cardsfolder/upcoming/transpose.txt
index 36b7ea10daf..24856958063 100644
--- a/forge-gui/res/cardsfolder/upcoming/transpose.txt
+++ b/forge-gui/res/cardsfolder/upcoming/transpose.txt
@@ -1,9 +1,9 @@
-Name:Transpose
-ManaCost:2 B
-Types:Instant
-A:SP$ Draw | SubAbility$ DBDiscard | SpellDescription$ Draw a card, then discard a card. You lose 1 life. If this spell was cast from your hand, create a 0/1 black Wizard creature token with "Whenever you cast a noncreature spell, this token deals 1 damage to each opponent."
-SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1 | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_0_1_wizard_snipe | TokenOwner$ You | ConditionDefined$ Self | ConditionPresent$ Card.wasCastFromYourHand | ConditionCompare$ EQ1
-K:Rebound
+Name:Transpose
+ManaCost:2 B
+Types:Instant
+A:SP$ Draw | SubAbility$ DBDiscard | SpellDescription$ Draw a card, then discard a card. You lose 1 life. If this spell was cast from your hand, create a 0/1 black Wizard creature token with "Whenever you cast a noncreature spell, this token deals 1 damage to each opponent."
+SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1 | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_0_1_wizard_snipe | TokenOwner$ You | ConditionDefined$ Self | ConditionPresent$ Card.wasCastFromYourHand | ConditionCompare$ EQ1
+K:Rebound
 Oracle:Draw a card, then discard a card. You lose 1 life. If this spell was cast from your hand, create a 0/1 black Wizard creature token with "Whenever you cast a noncreature spell, this token deals 1 damage to each opponent."\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/valkyrie_aerial_unit.txt b/forge-gui/res/cardsfolder/upcoming/valkyrie_aerial_unit.txt
index e4ac891e770..c6bc77fdbc8 100644
--- a/forge-gui/res/cardsfolder/upcoming/valkyrie_aerial_unit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/valkyrie_aerial_unit.txt
@@ -1,10 +1,10 @@
-Name:Valkyrie Aerial Unit
-ManaCost:5 U U
-Types:Artifact Creature Construct
-PT:5/4
-K:Affinity:Artifact
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When this creature enters, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
-SVar:TrigSurveil:DB$ Surveil | Amount$ 2
-DeckHas:Ability$Surveil|Graveyard
+Name:Valkyrie Aerial Unit
+ManaCost:5 U U
+Types:Artifact Creature Construct
+PT:5/4
+K:Affinity:Artifact
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When this creature enters, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
+SVar:TrigSurveil:DB$ Surveil | Amount$ 2
+DeckHas:Ability$Surveil|Graveyard
 Oracle:Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.)\nFlying\nWhen this creature enters, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
\ No newline at end of file