diff --git a/forge-gui/res/cardsfolder/upcoming/andrios_roaming_explorer.txt b/forge-gui/res/cardsfolder/upcoming/andrios_roaming_explorer.txt
index 4bbff9e1694..49841a5bc20 100644
--- a/forge-gui/res/cardsfolder/upcoming/andrios_roaming_explorer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/andrios_roaming_explorer.txt
@@ -3,7 +3,7 @@ ManaCost:5 G
 Types:Legendary Artifact Creature Wizard
 PT:4/3
 K:Reach
-S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ 16 | SetToughness$ 9 | IsPresent$ Card.Self+attacking | Affected$ Creature.basePowerEQ4+baseToughnessEQ3+tapped+YouCtrl | Description$ As long as NICKNAME is attacking, tapped creatures you control with base power and toughness 4/3 have base power and toughness 16/9. 
+S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ 16 | SetToughness$ 9 | IsPresent$ Card.Self+attacking | Affected$ Creature.basePowerEQ4+baseToughnessEQ3+tapped+YouCtrl | Description$ As long as NICKNAME is attacking, tapped creatures you control with base power and toughness 4/3 have base power and toughness 16/9.
 A:AB$ Mana | Cost$ T | Produced$ W U B R G | TriggersWhenSpent$ TrigChange | SpellDescription$ Add {W}{U}{B}{R}{G}. Creature spells you spend this mana to cast have their base power and toughness become 4/3.
 SVar:TrigChange:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigAnimate | TriggerDescription$ Creature spells you spend this mana to cast have their base power and toughness become 4/3.
 SVar:TrigAnimate:DB$ Animate | Defined$ TriggeredCard | Duration$ Permanent | Power$ 4 | Toughness$ 3
diff --git a/forge-gui/res/cardsfolder/upcoming/argentum_masticore.txt b/forge-gui/res/cardsfolder/upcoming/argentum_masticore.txt
index d74028da427..27f9ea50f14 100644
--- a/forge-gui/res/cardsfolder/upcoming/argentum_masticore.txt
+++ b/forge-gui/res/cardsfolder/upcoming/argentum_masticore.txt
@@ -4,10 +4,10 @@ Types:Artifact Creature Phyrexian Masticore
 PT:5/5
 K:First strike
 K:Protection:Card.MultiColor:Protection from multicolored
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSacrifice | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME unless you discard a card. When you discard a card this way, destroy target nonland permanent an opponent controls with mana value less than or equal to the mana value of the discarded card. 
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSacrifice | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME unless you discard a card. When you discard a card this way, destroy target nonland permanent an opponent controls with mana value less than or equal to the mana value of the discarded card.
 SVar:TrigSacrifice:DB$ Sacrifice | UnlessCost$ Discard<1/Card> | UnlessPayer$ You | OrString$ Sacrifice it. | SubAbility$ TrigImmediateTrig
-SVar:TrigImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Discarded | ConditionPresent$ Card | ConditionCompare$ GE1 | RememberObjects$ Discarded | Execute$ TrigDestroy | TriggerDescription$ When you discard a card this way, destroy target nonland permanent an opponent controls with mana value less than or equal to the mana value of the discarded card. 
+SVar:TrigImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Discarded | ConditionPresent$ Card | ConditionCompare$ GE1 | RememberObjects$ Discarded | Execute$ TrigDestroy | TriggerDescription$ When you discard a card this way, destroy target nonland permanent an opponent controls with mana value less than or equal to the mana value of the discarded card.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Permanent.nonLand+cmcLEX+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls with mana value less or equal to the discarded card
 SVar:X:TriggerRemembered$CardManaCost
 DeckHas:Ability$Discard|Sacrifice
-Oracle:First strike, protection from multicolored\nAt the beginning of your upkeep, sacrifice Argentum Masticore unless you discard a card. When you discard a card this way, destroy target nonland permanent an opponent controls with mana value less than or equal to the mana value of the discarded card. 
+Oracle:First strike, protection from multicolored\nAt the beginning of your upkeep, sacrifice Argentum Masticore unless you discard a card. When you discard a card this way, destroy target nonland permanent an opponent controls with mana value less than or equal to the mana value of the discarded card.
diff --git a/forge-gui/res/cardsfolder/upcoming/carnivorous_canopy.txt b/forge-gui/res/cardsfolder/upcoming/carnivorous_canopy.txt
index 1051343c4e8..b1a9796e73e 100644
--- a/forge-gui/res/cardsfolder/upcoming/carnivorous_canopy.txt
+++ b/forge-gui/res/cardsfolder/upcoming/carnivorous_canopy.txt
@@ -1,7 +1,7 @@
 Name:Carnivorous Canopy
 ManaCost:2 G
 Types:Sorcery
-A:SP$ Destroy | ValidTgts$ Artifact,Enchantment,Creature.withFlying | TgtPrompt$ Select target artifact, enchantment, or creature with flying. | SubAbility$ DBProliferate | SpellDescription$ Destroy target artifact, enchantment, or creature with flying. 
+A:SP$ Destroy | ValidTgts$ Artifact,Enchantment,Creature.withFlying | TgtPrompt$ Select target artifact, enchantment, or creature with flying. | SubAbility$ DBProliferate | SpellDescription$ Destroy target artifact, enchantment, or creature with flying.
 SVar:DBProliferate:DB$ Proliferate | ConditionDefined$ Targeted | ConditionPresent$ Permanent.cmcLE3 | SpellDescription$ If that permanent's mana value was 3 or less, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
-DeckHas:Ability$Proliferate 
+DeckHas:Ability$Proliferate
 Oracle:Destroy target artifact, enchantment, or creature with flying.\nIf that permanent's mana value was 3 or less, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/cinderslash_ravager.txt b/forge-gui/res/cardsfolder/upcoming/cinderslash_ravager.txt
index 37eb5ca004a..55a8b432dd6 100644
--- a/forge-gui/res/cardsfolder/upcoming/cinderslash_ravager.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cinderslash_ravager.txt
@@ -5,7 +5,7 @@ PT:5/5
 K:Vigilance
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each permanent you control with oil counters on it.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to each creature your opponents control.
-SVar:TrigDamage:DB$ DamageAll | ValidCards$ Creature.OppCtrl | NumDmg$ 1 
+SVar:TrigDamage:DB$ DamageAll | ValidCards$ Creature.OppCtrl | NumDmg$ 1
 SVar:X:Count$Valid Permanent.YouCtrl+counters_GE1_OIL
 DeckHints:Ability$Counters
 Oracle:This spell costs {1} less to cast for each permanent you control with oil counters on it.\nVigilance\nWhen Cinderslash Ravager enters the battlefield, it deals 1 damage to each creature your opponents control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/dross_skullbomb.txt b/forge-gui/res/cardsfolder/upcoming/dross_skullbomb.txt
index 0862e357958..2e60992f4b3 100644
--- a/forge-gui/res/cardsfolder/upcoming/dross_skullbomb.txt
+++ b/forge-gui/res/cardsfolder/upcoming/dross_skullbomb.txt
@@ -4,6 +4,6 @@ Types:Artifact
 A:AB$ Draw | Cost$ 1 Sac<1/CARDNAME> | SpellDescription$ Draw a card.
 A:AB$ ChangeZone | Cost$ 1 B Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SorcerySpeed$ True | SubAbility$ DBDraw | SpellDescription$ Return target creature card from your graveyard to your hand. Draw a card. Activate only as a sorcery.
 SVar:DBDraw:DB$ Draw
-DeckNeeds:Color$Black 
+DeckNeeds:Color$Black
 DeckHas:Ability$Sacrifice|Graveyard
 Oracle:{1}, Sacrifice Dross Skullbomb: Draw a card.\n{2}{B}, Sacrifice Dross Skullbomb: Return target creature card from your graveyard to your hand. Draw a card. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/escaped_experiment.txt b/forge-gui/res/cardsfolder/upcoming/escaped_experiment.txt
index fdc68abae17..49bfcd4a09c 100644
--- a/forge-gui/res/cardsfolder/upcoming/escaped_experiment.txt
+++ b/forge-gui/res/cardsfolder/upcoming/escaped_experiment.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Artifact Creature Phyrexian Beast
 PT:2/1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDebuff | TriggerDescription$ Whenever CARDNAME attacks, target creature an opponent controls gets -X/-0 until end of turn, where X is the number of artifacts you control.
-SVar:TrigDebuff:DB$ Pump | NumAtt$ -X | NumDef$ -0 | ValidTgts$ Creature.OppCtrl 
+SVar:TrigDebuff:DB$ Pump | NumAtt$ -X | NumDef$ -0 | ValidTgts$ Creature.OppCtrl
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:HasAttackEffect:TRUE
 DeckHints:Type$Artifact
diff --git a/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt b/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt
index fc68119799d..a05987dc004 100644
--- a/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt
+++ b/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt
@@ -3,7 +3,7 @@ ManaCost:1 B B
 Types:Legendary Creature Phyrexian Zombie
 PT:3/4
 S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddPower$ -1 | AddToughness$ -1 | Description$ Other creatures you control get -1/-1.
-A:AB$ ChangeZone | Cost$ 1 B B T | Origin$ Graveyard | SorcerySpeed$ True | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | SubAbility$ DBAnimate | SpellDescription$ Return target creature card from your graveyard to the battlefield. It gains "If this creature would leave the battlefield, exile it instead of putting it anywhere else." Activate only as a sorcery. 
+A:AB$ ChangeZone | Cost$ 1 B B T | Origin$ Graveyard | SorcerySpeed$ True | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | SubAbility$ DBAnimate | SpellDescription$ Return target creature card from your graveyard to the battlefield. It gains "If this creature would leave the battlefield, exile it instead of putting it anywhere else." Activate only as a sorcery.
 SVar:DBAnimate:DB$ Animate | Replacements$ ReplaceLeaves | Defined$ Targeted | Duration$ Permanent
 SVar:ReplaceLeaves:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ Exile | Description$ If this creature would leave the battlefield, exile it instead.
 SVar:Exile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ ReplacedCard
diff --git a/forge-gui/res/cardsfolder/upcoming/gleeful_demolition.txt b/forge-gui/res/cardsfolder/upcoming/gleeful_demolition.txt
index 9aa7d88b076..8091f2486af 100644
--- a/forge-gui/res/cardsfolder/upcoming/gleeful_demolition.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gleeful_demolition.txt
@@ -2,8 +2,8 @@ Name:Gleeful Demolition
 ManaCost:R
 Types:Sorcery
 K:For Mirrodin
-A:SP$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ DBToken | RememberLKI$ True | AlwaysRemember$ True | SpellDescription$ Destroy target artifact. If you controlled that artifact, creature three 1/1 red Phyrexian Goblin creature tokens. 
-SVar:DBToken:DB$ Token | TokenAmount$ 3 | TokenScript$ r_1_1_phyrexian_goblin | TokenOwner$ You | ConditionDefined$ RememberedLKI | ConditionPresent$ Card.YouCtrl | SubAbility$ DBCleanup | SpellDescription$ If you controlled that artifact, creature three 1/1 red Phyrexian Goblin creature tokens. 
+A:SP$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ DBToken | RememberLKI$ True | AlwaysRemember$ True | SpellDescription$ Destroy target artifact. If you controlled that artifact, creature three 1/1 red Phyrexian Goblin creature tokens.
+SVar:DBToken:DB$ Token | TokenAmount$ 3 | TokenScript$ r_1_1_phyrexian_goblin | TokenOwner$ You | ConditionDefined$ RememberedLKI | ConditionPresent$ Card.YouCtrl | SubAbility$ DBCleanup | SpellDescription$ If you controlled that artifact, creature three 1/1 red Phyrexian Goblin creature tokens.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Type$Goblin|Phryexian & Ability$Token
 Oracle:Destroy target artifact. If you controlled that artifact, creature three 1/1 red Phyrexian Goblin creature tokens.
diff --git a/forge-gui/res/cardsfolder/upcoming/goldwardens_gambit.txt b/forge-gui/res/cardsfolder/upcoming/goldwardens_gambit.txt
index 07a3da64b59..1d94b56b72a 100644
--- a/forge-gui/res/cardsfolder/upcoming/goldwardens_gambit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/goldwardens_gambit.txt
@@ -5,7 +5,7 @@ K:Affinity:Equipment
 A:SP$ Token | TokenScript$ r_2_2_rebel | TokenOwner$ You | RememberTokens$ True | TokenAmount$ 5 | SubAbility$ DBRepeat | PumpKeywords$ Haste | PumpDuration$ EOT | SpellDescription$ Create five 2/2 red Rebel creature tokens. They gain haste until end of turn. For each of those tokens, you may attach an Equipment you control to it.
 SVar:DBRepeat:DB$ RepeatEach | UseImprinted$ True | DefinedCards$ DirectRemembered | RepeatSubAbility$ DBAttach | SubAbility$ DBCleanup
 SVar:DBAttach:DB$ Attach | Choices$ Equipment.YouCtrl+!IsRemembered | Defined$ Imprinted | RememberAttached$ True | ChoiceTitle$ Select an equipment to attach to this token | Optional$ True
-SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True | ClearRemembered$ True 
+SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True | ClearRemembered$ True
 DeckHas:Ability$Token & Type$Rebel & Color$Red
 DeckNeeds:Type$Equipment
 Oracle:Affinity for Equipment (This spell costs {1} less to cast for each Equipment you control.)\nCreate five 2/2 red Rebel creature tokens. They gain haste until end of turn. For each of those tokens, you may attach an Equipment you control to it.
diff --git a/forge-gui/res/cardsfolder/upcoming/hurkyls_prodigy.txt b/forge-gui/res/cardsfolder/upcoming/hurkyls_prodigy.txt
index e86e5347fbf..9c22db7d020 100644
--- a/forge-gui/res/cardsfolder/upcoming/hurkyls_prodigy.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hurkyls_prodigy.txt
@@ -4,11 +4,11 @@ Types:Creature Human Soldier
 PT:1/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a tapped Powerstone token.
 SVar:TrigToken:DB$ Token | TokenTapped$ True | TokenScript$ c_a_powerstone
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUnblockable | TriggerDescription$ Whenever CARDNAME attacks, you may pay {3}. If you do, CARDNAME can't be blocked this turn and it perpetually gets +2/+0. 
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUnblockable | TriggerDescription$ Whenever CARDNAME attacks, you may pay {3}. If you do, CARDNAME can't be blocked this turn and it perpetually gets +2/+0.
 SVar:TrigUnblockable:AB$ Effect | Cost$ 3 | StaticAbilities$ Unblockable | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualPump | Duration$ Permanent | Name$ Hurkyl's Prodigy's Perpetual Effect
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ This creature can't be blocked.
 SVar:PerpetualPump:Mode$ Continuous | Affected$ Card.EffectSource | AddPower$ 2 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ EFFECTSOURCE perpetually gets +2/+0.
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Token & Type$Artifact|Powerstone
-Oracle:When Hurkyl's Prodigy enter the battlefield, create a tapped Powerstone token.\nWhenever Hurkyl's Prodigy attacks, you may pay {3}. If you do, Hurkyl's Prodigy can't be blocked this turn and it perpetually gets +2/+0. 
+Oracle:When Hurkyl's Prodigy enter the battlefield, create a tapped Powerstone token.\nWhenever Hurkyl's Prodigy attacks, you may pay {3}. If you do, Hurkyl's Prodigy can't be blocked this turn and it perpetually gets +2/+0.
diff --git a/forge-gui/res/cardsfolder/upcoming/jarsyl_dark_age_scion.txt b/forge-gui/res/cardsfolder/upcoming/jarsyl_dark_age_scion.txt
index cd3fc16fe5f..93a509ba64a 100644
--- a/forge-gui/res/cardsfolder/upcoming/jarsyl_dark_age_scion.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jarsyl_dark_age_scion.txt
@@ -5,7 +5,7 @@ PT:3/3
 K:Starting intensity:1
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigChoose | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, you may cast a spell with mana value equal to CARDNAME's intensity from your graveyard without paying its mana cost. If you do, perpetually increase NICKNAME's intensity by 1.
 SVar:TrigChoose:DB$ ChooseCard | ChoiceZone$ Graveyard | Choices$ Card.YouCtrl+cmcEQX | ChoiceTitle$ Choose a spell with mana value equal to Jarsyl, Dark Age Scion's intensity | MinAmount$ 1 | Amount$ 1 | SubAbility$ DBPlay
-SVar:DBPlay:DB$ Play | Defined$ ChosenCard  | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | AILogic$ ReplaySpell | SubAbility$ DBIncrease | RememberPlayed$ True 
+SVar:DBPlay:DB$ Play | Defined$ ChosenCard  | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | AILogic$ ReplaySpell | SubAbility$ DBIncrease | RememberPlayed$ True
 SVar:DBIncrease:DB$ Intensify | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
 SVar:X:Count$Intensity
diff --git a/forge-gui/res/cardsfolder/upcoming/mirrex.txt b/forge-gui/res/cardsfolder/upcoming/mirrex.txt
index 8d9c6522ad8..7a3f23a7ea0 100644
--- a/forge-gui/res/cardsfolder/upcoming/mirrex.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mirrex.txt
@@ -1,6 +1,6 @@
 Name:Mirrex
 ManaCost:no cost
-Types:Land Sphere 
+Types:Land Sphere
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ T | Produced$ Any | IsPresent$ Card.Self+ThisTurnEntered | SpellDescription$ Add one mana of any color. Activate only if CARDNAME entered the battlefield this turn.
 A:AB$ Token | Cost$ 3 T | TokenScript$ c_1_1_a_phyrexian_mite_toxic_noblock | TokenOwner$ You | SpellDescription$ Create a 1/1 colorless Phyrexian Mite artifact creature token with toxic 1 and "This creature can't block." (Players dealt combat damage by it also get a poison counter.)
diff --git a/forge-gui/res/cardsfolder/upcoming/monumental_corruption.txt b/forge-gui/res/cardsfolder/upcoming/monumental_corruption.txt
index cf9d74af505..87337d22b3a 100644
--- a/forge-gui/res/cardsfolder/upcoming/monumental_corruption.txt
+++ b/forge-gui/res/cardsfolder/upcoming/monumental_corruption.txt
@@ -1,7 +1,7 @@
 Name:Monumental Corruption
 ManaCost:3 B B
 Types:Sorcery
-A:SP$ Draw | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ X | SubAbility$ DBLoseLife | SpellDescription$ Target player draws X cards and loses X life, where X is the number of artifacts you control. 
+A:SP$ Draw | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ X | SubAbility$ DBLoseLife | SpellDescription$ Target player draws X cards and loses X life, where X is the number of artifacts you control.
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | Defined$ Targeted
 SVar:X:Count$Valid Artifact.YouCtrl
 DeckNeeds:Type$Artifact
diff --git a/forge-gui/res/cardsfolder/upcoming/myr_convert.txt b/forge-gui/res/cardsfolder/upcoming/myr_convert.txt
index 81826d19471..989e09f45c3 100644
--- a/forge-gui/res/cardsfolder/upcoming/myr_convert.txt
+++ b/forge-gui/res/cardsfolder/upcoming/myr_convert.txt
@@ -4,4 +4,4 @@ Types:Artifact Creature Phyrexian Myr
 PT:2/1
 K:Toxic:1
 A:AB$ Mana | Cost$ T PayLife<2> | Produced$ Any | SpellDescription$ Add one mana of any color.
-Oracle:Toxic 1 (Players dealt combat damage by this creature also get a poison counter.)\n{T}, Pay 2 life: Add one mana of any color. 
+Oracle:Toxic 1 (Players dealt combat damage by this creature also get a poison counter.)\n{T}, Pay 2 life: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/upcoming/ossification.txt b/forge-gui/res/cardsfolder/upcoming/ossification.txt
index abbf6b41908..43f18ac576e 100644
--- a/forge-gui/res/cardsfolder/upcoming/ossification.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ossification.txt
@@ -2,7 +2,7 @@ Name:Ossification
 ManaCost:1 W
 Types:Enchantment Aura
 K:Enchant basic land you control
-A:SP$ Attach | ValidTgts$ Land.YouCtrl+Basic | TgtPrompt$ Select target basic land you control | AILogic$ Pump 
+A:SP$ Attach | ValidTgts$ Land.YouCtrl+Basic | TgtPrompt$ Select target basic land you control | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target creature or planeswalker an opponent controls until CARDNAME leaves the battlefield.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.OppCtrl,Planeswalker.OppCtrl | TgtPrompt$ Select target creature or planeswalker an opponent controls | Duration$ UntilHostLeavesPlay
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/upcoming/perilous_iteration.txt b/forge-gui/res/cardsfolder/upcoming/perilous_iteration.txt
index ee1c210f68a..76b485ed71f 100644
--- a/forge-gui/res/cardsfolder/upcoming/perilous_iteration.txt
+++ b/forge-gui/res/cardsfolder/upcoming/perilous_iteration.txt
@@ -3,7 +3,7 @@ ManaCost:R G
 Types:Sorcery
 A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeType$ Card.YouOwn+cmcLE2 | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBSeek | SpellDescription$ Seek a card with mana value 2 or less and a card with mana value 3 or greater. Discard those cards at the beginning of your next turn's end step.
 SVar:DBSeek:DB$ ChangeZone | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeType$ Card.YouOwn+cmcGE3 | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBDelay
-SVar:DBDelay:DB$ DelayedTrigger | DelayedTriggerDefinedPlayer$ You | Mode$ Phase | Phase$ End of Turn | Execute$ TrigDiscard | RememberObjects$ Remembered | TriggerDescription$ Discard those cards at the beginning of your next turn's end step. 
+SVar:DBDelay:DB$ DelayedTrigger | DelayedTriggerDefinedPlayer$ You | Mode$ Phase | Phase$ End of Turn | Execute$ TrigDiscard | RememberObjects$ Remembered | TriggerDescription$ Discard those cards at the beginning of your next turn's end step.
 SVar:TrigDiscard:DB$ Discard | Mode$ Defined | DefinedCards$ DelayTriggerRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Seek a card with mana value 2 or less and a card with mana value 3 or greater. Discard those cards at the beginning of your next turn's end step.
diff --git a/forge-gui/res/cardsfolder/upcoming/reject_imperfection.txt b/forge-gui/res/cardsfolder/upcoming/reject_imperfection.txt
index 81f0209925f..ad0f86a6b43 100644
--- a/forge-gui/res/cardsfolder/upcoming/reject_imperfection.txt
+++ b/forge-gui/res/cardsfolder/upcoming/reject_imperfection.txt
@@ -2,7 +2,7 @@ Name:Reject Imperfection
 ManaCost:1 U U
 Types:Instant
 A:SP$ Counter | TargetType$ Spell | ValidTgts$ Card | SubAbility$ DBProliferate | SpellDescription$ Counter target spell. If that spell's mana value was 3 or less, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
-SVar:DBProliferate:DB$ Proliferate | ConditionCheckSVar$ X | ConditionSVarCompare$ LE3 
+SVar:DBProliferate:DB$ Proliferate | ConditionCheckSVar$ X | ConditionSVarCompare$ LE3
 SVar:X:SpellTargeted$CardManaCostLKI
 AI:RemoveDeck:All
 Oracle:Counter target spell. If that spell's mana value was 3 or less, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/staff_of_the_storyteller.txt b/forge-gui/res/cardsfolder/upcoming/staff_of_the_storyteller.txt
index b4259702ffc..ecce10636bf 100644
--- a/forge-gui/res/cardsfolder/upcoming/staff_of_the_storyteller.txt
+++ b/forge-gui/res/cardsfolder/upcoming/staff_of_the_storyteller.txt
@@ -4,7 +4,7 @@ Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 white Spirit creature token with flying.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You
 T:Mode$ TokenCreatedOnce | ValidToken$ Creature.YouOwn | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you create one or more creature tokens, put a story counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter  | Defined$ Self | CounterType$ STORY | CounterNum$ 1 
+SVar:TrigPutCounter:DB$ PutCounter  | Defined$ Self | CounterType$ STORY | CounterNum$ 1
 A:AB$ Draw | Cost$ W T SubCounter<1/STORY> | SpellDescription$ Draw a card.
 DeckHas:Ability$Counters|Token & Type$Spirit
 Oracle:When Staff of the Storyteller enters the battlefield, create a 1/1 white Spirit creature token with flying.\nWhenever you create one or more creature tokens, put a story counter on Staff of the Storyteller.\n{W}, {T}, Remove a story counter from Staff of the Storyteller: Draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/synthesis_pod.txt b/forge-gui/res/cardsfolder/upcoming/synthesis_pod.txt
index 326ce2d9b0c..4dcf5d99673 100644
--- a/forge-gui/res/cardsfolder/upcoming/synthesis_pod.txt
+++ b/forge-gui/res/cardsfolder/upcoming/synthesis_pod.txt
@@ -1,7 +1,7 @@
 Name:Synthesis Pod
 ManaCost:3 UP
 Types:Artifact
-A:AB$ DigUntil | Cost$ 1 UP T ExileFromStack<1/Card.YouCtrl/spell you control> | ValidTgts$ Opponent | Valid$ Card.cmcEQX | FoundDestination$ Exile | RevealedDestination$ Library | ImprintFound$ True | Shuffle$ True | SubAbility$ DBPlay | SpellDescription$ Target opponent reveals cards from the top of their library until they reveal a card with mana value equal to 1 plus the exiled spell's mana value. Exile that card, then that player shuffles. You may cast that exiled card without paying its mana cost. 
+A:AB$ DigUntil | Cost$ 1 UP T ExileFromStack<1/Card.YouCtrl/spell you control> | ValidTgts$ Opponent | Valid$ Card.cmcEQX | FoundDestination$ Exile | RevealedDestination$ Library | ImprintFound$ True | Shuffle$ True | SubAbility$ DBPlay | SpellDescription$ Target opponent reveals cards from the top of their library until they reveal a card with mana value equal to 1 plus the exiled spell's mana value. Exile that card, then that player shuffles. You may cast that exiled card without paying its mana cost.
 SVar:DBPlay:DB$ Play | Defined$ Imprinted | WithoutManaCost$ True | Optional$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
 SVar:X:Exiled$CardManaCost/Plus.1
diff --git a/forge-gui/res/cardsfolder/upcoming/the_mycosynth_gardens.txt b/forge-gui/res/cardsfolder/upcoming/the_mycosynth_gardens.txt
index 7ab9cd7c146..d5141b5ffbe 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_mycosynth_gardens.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_mycosynth_gardens.txt
@@ -1,6 +1,6 @@
 Name:The Mycosynth Gardens
 ManaCost:no cost
-Types:Land Sphere 
+Types:Land Sphere
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 A:AB$ Clone | Cost$ X T | ValidTgts$ Artifact.YouCtrl+cmcEQX+nonToken | TgtPrompt$ Select target nontoken artifact you control | SpellDescription$ CARDNAME becomes a copy of target nontoken artifact you control with mana value X.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_seedcore.txt b/forge-gui/res/cardsfolder/upcoming/the_seedcore.txt
index 02660202b47..b4dadc52408 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_seedcore.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_seedcore.txt
@@ -1,6 +1,6 @@
 Name:The Seedcore
 ManaCost:no cost
-Types:Land Sphere 
+Types:Land Sphere
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Spell.Creature+Phyrexian | SpellDescription$ Add one mana of any color. Spend this mana only to cast Phyrexian creature spells.
 A:AB$ Pump | Cost$ T | PrecostDesc$ Corrupted — | CheckSVar$ X | SVarCompare$ GE3 | ValidTgts$ Creature.powerEQ1+toughnessEQ1 | TgtPrompt$ Select target 1/1 creature  | NumAtt$ +2 | NumDef$ +1 | SpellDescription$ Target 1/1 creature gets +2/+1 until end of turn. Activate only if an opponent has three or more poison counters.
diff --git a/forge-gui/res/cardsfolder/upcoming/tomakul_phoenix.txt b/forge-gui/res/cardsfolder/upcoming/tomakul_phoenix.txt
index a26e07dc5fe..c265dd5a838 100644
--- a/forge-gui/res/cardsfolder/upcoming/tomakul_phoenix.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tomakul_phoenix.txt
@@ -1,5 +1,5 @@
 Name:Tomakul Phoenix
-ManaCost:1 R R 
+ManaCost:1 R R
 Types:Creature Phoenix
 PT:2/2
 K:Flying
diff --git a/forge-gui/res/cardsfolder/upcoming/unctus_grand_metatect.txt b/forge-gui/res/cardsfolder/upcoming/unctus_grand_metatect.txt
index d17ceeb1505..4b282d677fa 100644
--- a/forge-gui/res/cardsfolder/upcoming/unctus_grand_metatect.txt
+++ b/forge-gui/res/cardsfolder/upcoming/unctus_grand_metatect.txt
@@ -4,7 +4,7 @@ Types:Legendary Artifact Creature Phyrexian Vedalken
 PT:2/4
 S:Mode$ Continuous | Affected$ Creature.Other+Blue+YouCtrl | AddTrigger$ LootTrig | Description$ Other blue creatures you control have "Whenever this creature becomes tapped, draw a card, then discard a card."
 SVar:LootTrig:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever this creature becomes tapped, draw a card, then discard a card.
-SVar:TrigDraw:DB$ Draw | SubAbility$ DBDiscard 
+SVar:TrigDraw:DB$ Draw | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose
 S:Mode$ Continuous | Affected$ Creature.Artifact+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other artifact creatures you control get +1/+1.
 A:AB$ Animate | Cost$ UP | ValidTgts$ Creature.YouCtrl | Colors$ Blue | Types$ Artifact | SorcerySpeed$ True | SpellDescription$ Until end of turn, target creature you control becomes a blue artifact in addition to its other colors and types. Activate only as a sorcery. ({U/P} can be paid with either {U} or 2 life.)
diff --git a/forge-gui/res/cardsfolder/upcoming/veil_of_assimilation.txt b/forge-gui/res/cardsfolder/upcoming/veil_of_assimilation.txt
index 4768d30f7f3..f3f2c2555dd 100644
--- a/forge-gui/res/cardsfolder/upcoming/veil_of_assimilation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/veil_of_assimilation.txt
@@ -1,5 +1,5 @@
 Name:Veil of Assimilation
-ManaCost:1 W 
+ManaCost:1 W
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Artifact.YouCtrl+Other | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another artifact enters the battlefield under your control, target creature you control gets +1/+1 and gains vigilance until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Vigilance
diff --git a/forge-gui/res/cardsfolder/upcoming/venser_corpse_puppet.txt b/forge-gui/res/cardsfolder/upcoming/venser_corpse_puppet.txt
index 6233e685152..1106c751c8b 100644
--- a/forge-gui/res/cardsfolder/upcoming/venser_corpse_puppet.txt
+++ b/forge-gui/res/cardsfolder/upcoming/venser_corpse_puppet.txt
@@ -7,6 +7,6 @@ K:Toxic:1
 T:Mode$ Proliferate | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ Whenever you proliferate, ABILITY
 SVar:TrigChoose:DB$ Charm | Choices$ DBToken,DBPump
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ the_hollow_sentinel | TokenOwner$ You | ConditionPresent$ Creature.YouCtrl+namedThe Hollow Sentinel | ConditionCompare$ EQ0 | SpellDescription$ If you don't control a creature named The Hollow Sentinel, create The Hollow Sentinel, a legendary 3/3 colorless Phyrexian Golem artifact creature token.
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature.Artifact+YouCtrl | TgtPrompt$ Select target artifact creature you control | KW$ Flying & Lifelink | SpellDescription$ Target artifact creature you control gains flying and lifelink until end of turn. 
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature.Artifact+YouCtrl | TgtPrompt$ Select target artifact creature you control | KW$ Flying & Lifelink | SpellDescription$ Target artifact creature you control gains flying and lifelink until end of turn.
 Oracle:Lifelink, toxic 1\nWhenever you proliferate, choose one -\n• If you don't control a creature named The Hollow Sentinel, create The Hollow Sentinel, a legendary 3/3 colorless Phyrexian Golem artifact creature token.\n• Target artifact creature you control gains flying and lifelink until end of turn.
 
diff --git a/forge-gui/res/cardsfolder/upcoming/voidwing_hybrid.txt b/forge-gui/res/cardsfolder/upcoming/voidwing_hybrid.txt
index 203d8728b7f..189e0ebd2f6 100644
--- a/forge-gui/res/cardsfolder/upcoming/voidwing_hybrid.txt
+++ b/forge-gui/res/cardsfolder/upcoming/voidwing_hybrid.txt
@@ -4,7 +4,7 @@ Types:Creature Phyrexian Bat
 PT:2/1
 K:Flying
 K:Toxic:1
-T:Mode$ Proliferate | ValidPlayer$ You | Execute$ TrigReturn | TriggerZones$ Graveyard | IsPresent$ Card.StrictlySelf | PresentZone$ Graveyard | PresentPlayer$ You | TriggerDescription$ When you proliferate, return CARDNAME from your graveyard to your hand. 
+T:Mode$ Proliferate | ValidPlayer$ You | Execute$ TrigReturn | TriggerZones$ Graveyard | IsPresent$ Card.StrictlySelf | PresentZone$ Graveyard | PresentPlayer$ You | TriggerDescription$ When you proliferate, return CARDNAME from your graveyard to your hand.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
 DeckHas:Ability$Graveyard
 DeckHints:Ability$Proliferate