From 4fc77be4df973f2c1554ca744e2215ead99f74a0 Mon Sep 17 00:00:00 2001
From: Renato Filipe Vidal Santos <45150760+dracontes@users.noreply.github.com>
Date: Thu, 10 Oct 2024 14:04:18 +0100
Subject: [PATCH] Edit pile cleanup: part 4, folder 'upcoming' part 1 (#6221)

---
 .../upcoming/a_premonition_of_your_demise.txt | 20 ++++++-------
 .../upcoming/abandoned_campground.txt         | 16 +++++------
 .../cardsfolder/upcoming/abhorrent_oculus.txt | 18 ++++++------
 .../upcoming/acrobatic_cheerleader.txt        | 14 +++++-----
 .../upcoming/altanak_the_thrice_called.txt    | 18 ++++++------
 .../upcoming/ancient_cellarspawn.txt          | 22 +++++++--------
 .../upcoming/appendage_amalgam.txt            | 20 ++++++-------
 .../upcoming/arabella_abandoned_doll.txt      | 18 ++++++------
 .../upcoming/attack_in_the_box.txt            | 14 +++++-----
 .../cardsfolder/upcoming/balemurk_leech.txt   | 18 ++++++------
 .../cardsfolder/upcoming/balustrade_wurm.txt  | 22 +++++++--------
 .../upcoming/barbflare_gremlin.txt            | 20 ++++++-------
 .../res/cardsfolder/upcoming/baseball_bat.txt | 20 ++++++-------
 .../cardsfolder/upcoming/bashful_beastie.txt  | 14 +++++-----
 .../res/cardsfolder/upcoming/bear_trap.txt    | 14 +++++-----
 .../cardsfolder/upcoming/bedhead_beastie.txt  | 16 +++++------
 .../upcoming/betrayers_bargain.txt            | 12 ++++----
 .../cardsfolder/upcoming/blazemire_verge.txt  | 12 ++++----
 .../cardsfolder/upcoming/bleeding_woods.txt   | 16 +++++------
 .../upcoming/boilerbilges_ripper.txt          | 16 +++++------
 .../upcoming/break_down_the_door.txt          | 16 +++++------
 .../res/cardsfolder/upcoming/broodspinner.txt | 22 +++++++--------
 .../upcoming/cathartic_parting.txt            | 12 ++++----
 .../upcoming/cautious_survivor.txt            | 14 +++++-----
 .../upcoming/chaos_is_my_plaything.txt        | 16 +++++------
 .../cardsfolder/upcoming/clammy_prowler.txt   | 16 +++++------
 .../upcoming/clockwork_percussionist.txt      | 22 +++++++--------
 .../upcoming/commune_with_evil.txt            | 14 +++++-----
 .../upcoming/conductive_machete.txt           | 20 ++++++-------
 .../cardsfolder/upcoming/convert_to_slime.txt | 22 +++++++--------
 .../upcoming/coordinated_clobbering.txt       | 12 ++++----
 .../cardsfolder/upcoming/cracked_skull.txt    | 26 ++++++++---------
 .../upcoming/cryptid_inspector.txt            | 18 ++++++------
 .../res/cardsfolder/upcoming/cult_healer.txt  | 18 ++++++------
 .../cardsfolder/upcoming/curator_beastie.txt  | 24 ++++++++--------
 .../upcoming/cursed_windbreaker.txt           | 20 ++++++-------
 .../cardsfolder/upcoming/cynical_loner.txt    | 16 +++++------
 .../upcoming/daggermaw_megalodon.txt          | 16 +++++------
 .../dark_wings_bring_your_downfall.txt        | 18 ++++++------
 .../upcoming/dashing_bloodsucker.txt          | 18 ++++++------
 .../cardsfolder/upcoming/defiant_survivor.txt | 14 +++++-----
 .../cardsfolder/upcoming/deluge_of_doom.txt   | 12 ++++----
 .../cardsfolder/upcoming/demolisher_spawn.txt | 24 ++++++++--------
 .../cardsfolder/upcoming/demonic_counsel.txt  | 18 ++++++------
 .../cardsfolder/upcoming/disturbing_mirth.txt | 18 ++++++------
 .../upcoming/diversion_specialist.txt         | 20 ++++++-------
 .../upcoming/dont_make_a_sound.txt            | 12 ++++----
 .../upcoming/drag_to_the_roots.txt            | 12 ++++----
 .../upcoming/duskmourns_domination.txt        | 16 +++++------
 .../upcoming/emerge_from_the_cocoon.txt       | 14 +++++-----
 .../cardsfolder/upcoming/enduring_courage.txt | 20 ++++++-------
 .../upcoming/enduring_curiosity.txt           | 22 +++++++--------
 .../upcoming/enduring_innocence.txt           | 24 ++++++++--------
 .../upcoming/enduring_vitality.txt            | 22 +++++++--------
 .../cardsfolder/upcoming/enter_the_enigma.txt | 14 +++++-----
 .../upcoming/erratic_apparition.txt           | 22 +++++++--------
 .../cardsfolder/upcoming/etched_cornfield.txt | 16 +++++------
 .../res/cardsfolder/upcoming/exorcise.txt     | 10 +++----
 .../upcoming/fanatic_of_the_harrowing.txt     | 20 ++++++-------
 .../upcoming/fear_of_abduction.txt            | 22 +++++++--------
 .../upcoming/fear_of_being_hunted.txt         | 14 +++++-----
 .../upcoming/fear_of_burning_alive.txt        | 20 ++++++-------
 .../cardsfolder/upcoming/fear_of_exposure.txt | 14 +++++-----
 .../upcoming/fear_of_failed_tests.txt         | 16 +++++------
 .../cardsfolder/upcoming/fear_of_falling.txt  | 20 ++++++-------
 .../upcoming/fear_of_immobility.txt           | 18 ++++++------
 .../upcoming/fear_of_impostors.txt            | 18 ++++++------
 .../cardsfolder/upcoming/fear_of_infinity.txt | 22 +++++++--------
 .../upcoming/fear_of_isolation.txt            | 14 +++++-----
 .../upcoming/fear_of_lost_teeth.txt           | 16 +++++------
 .../upcoming/fear_of_surveilance.txt          | 20 ++++++-------
 .../cardsfolder/upcoming/fear_of_the_dark.txt | 14 +++++-----
 .../cardsfolder/upcoming/final_vengeance.txt  | 10 +++----
 .../cardsfolder/upcoming/flesh_burrower.txt   | 16 +++++------
 .../cardsfolder/upcoming/floodfarm_verge.txt  | 12 ++++----
 .../upcoming/floodpits_drowner.txt            | 22 +++++++--------
 .../cardsfolder/upcoming/formless_genesis.txt | 18 ++++++------
 .../cardsfolder/upcoming/found_footage.txt    | 14 +++++-----
 .../cardsfolder/upcoming/frantic_strength.txt | 16 +++++------
 .../cardsfolder/upcoming/friendly_ghost.txt   | 18 ++++++------
 .../cardsfolder/upcoming/friendly_teddy.txt   | 14 +++++-----
 .../res/cardsfolder/upcoming/ghost_vacuum.txt | 16 +++++------
 .../upcoming/giggling_skitterspike.txt        | 28 +++++++++----------
 .../upcoming/give_in_to_violence.txt          | 10 +++----
 .../cardsfolder/upcoming/gleeful_arsonist.txt | 18 ++++++------
 .../cardsfolder/upcoming/glimmer_seeker.txt   | 20 ++++++-------
 .../res/cardsfolder/upcoming/glimmerburst.txt | 12 ++++----
 .../res/cardsfolder/upcoming/glimmerlight.txt | 16 +++++------
 .../upcoming/glitch_interpreter.txt           | 22 +++++++--------
 .../cardsfolder/upcoming/gloomlake_verge.txt  | 12 ++++----
 .../cardsfolder/upcoming/grab_the_prize.txt   | 18 ++++++------
 .../upcoming/grasping_longneck.txt            | 16 +++++------
 .../cardsfolder/upcoming/gremlin_tamer.txt    | 20 ++++++-------
 .../cardsfolder/upcoming/grievous_wound.txt   | 20 ++++++-------
 .../cardsfolder/upcoming/growing_dread.txt    | 18 ++++++------
 .../cardsfolder/upcoming/hand_that_feeds.txt  | 20 ++++++-------
 .../cardsfolder/upcoming/hardened_escort.txt  | 16 +++++------
 .../cardsfolder/upcoming/haunted_screen.txt   | 16 +++++------
 .../cardsfolder/upcoming/hedge_shredder.txt   | 20 ++++++-------
 .../res/cardsfolder/upcoming/horrid_vigor.txt | 12 ++++----
 100 files changed, 864 insertions(+), 864 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/a_premonition_of_your_demise.txt b/forge-gui/res/cardsfolder/upcoming/a_premonition_of_your_demise.txt
index a134c66e025..19f3626c711 100644
--- a/forge-gui/res/cardsfolder/upcoming/a_premonition_of_your_demise.txt
+++ b/forge-gui/res/cardsfolder/upcoming/a_premonition_of_your_demise.txt
@@ -1,10 +1,10 @@
-Name:A Premonition of Your Demise
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DBDig | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, reveal the top two cards of your library and put them into your hand. When you reveal one or more nonland cards this way, this scheme deals damage equal to their total mana value to any target.
-SVar:DBDig:DB$ Dig | DigNum$ 2 | Reveal$ True | ChangeNum$ All | ChangeValid$ Card | DestinationZone$ Hand | RememberChanged$ True | SubAbility$ DBImmediateTrigger
-SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | Execute$ TrigDamage | SubAbility$ DBCleanup | SpellDescription$ When you reveal one or more nonland cards this way, this scheme deals damage equal to their total mana value to any target.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ X
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$ValidHand Card.IsRemembered+nonLand$SumCMC
-Oracle:When you set this scheme in motion, reveal the top two cards of your library and put them into your hand. When you reveal one or more nonland cards this way, this scheme deals damage equal to their total mana value to any target.
+Name:A Premonition of Your Demise
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DBDig | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, reveal the top two cards of your library and put them into your hand. When you reveal one or more nonland cards this way, this scheme deals damage equal to their total mana value to any target.
+SVar:DBDig:DB$ Dig | DigNum$ 2 | Reveal$ True | ChangeNum$ All | ChangeValid$ Card | DestinationZone$ Hand | RememberChanged$ True | SubAbility$ DBImmediateTrigger
+SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | Execute$ TrigDamage | SubAbility$ DBCleanup | SpellDescription$ When you reveal one or more nonland cards this way, this scheme deals damage equal to their total mana value to any target.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ X
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$ValidHand Card.IsRemembered+nonLand$SumCMC
+Oracle:When you set this scheme in motion, reveal the top two cards of your library and put them into your hand. When you reveal one or more nonland cards this way, this scheme deals damage equal to their total mana value to any target.
diff --git a/forge-gui/res/cardsfolder/upcoming/abandoned_campground.txt b/forge-gui/res/cardsfolder/upcoming/abandoned_campground.txt
index 2664abb2417..d830953a8e2 100644
--- a/forge-gui/res/cardsfolder/upcoming/abandoned_campground.txt
+++ b/forge-gui/res/cardsfolder/upcoming/abandoned_campground.txt
@@ -1,8 +1,8 @@
-Name:Abandoned Campground
-ManaCost:no cost
-Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
-SVar:X:PlayerCountPlayers$LowestLifeTotal
-A:AB$ Mana | Cost$ T | Produced$ Combo W U | SpellDescription$ Add {W} or {U}.
-Oracle:Abandoned Campground enters tapped unless a player has 13 or less life.\n{T}: Add {W} or {U}.
+Name:Abandoned Campground
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
+SVar:X:PlayerCountPlayers$LowestLifeTotal
+A:AB$ Mana | Cost$ T | Produced$ Combo W U | SpellDescription$ Add {W} or {U}.
+Oracle:Abandoned Campground enters tapped unless a player has 13 or less life.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/upcoming/abhorrent_oculus.txt b/forge-gui/res/cardsfolder/upcoming/abhorrent_oculus.txt
index 10f056fcba6..feb7d88e3d7 100644
--- a/forge-gui/res/cardsfolder/upcoming/abhorrent_oculus.txt
+++ b/forge-gui/res/cardsfolder/upcoming/abhorrent_oculus.txt
@@ -1,9 +1,9 @@
-Name:Abhorrent Oculus
-ManaCost:2 U
-Types:Creature Eye
-PT:5/5
-A:SP$ PermanentCreature | Cost$ 2 U ExileFromGrave<6/Card>
-K:Flying
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDread | TriggerDescription$ At the beginning of each opponent's upkeep, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature, and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-SVar:TrigDread:DB$ ManifestDread
-Oracle:As an additional cost to cast this spell, exile six cards from your graveyard.\nFlying\nAt the beginning of each opponent's upkeep, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature, and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
\ No newline at end of file
+Name:Abhorrent Oculus
+ManaCost:2 U
+Types:Creature Eye
+PT:5/5
+A:SP$ PermanentCreature | Cost$ 2 U ExileFromGrave<6/Card>
+K:Flying
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDread | TriggerDescription$ At the beginning of each opponent's upkeep, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature, and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+SVar:TrigDread:DB$ ManifestDread
+Oracle:As an additional cost to cast this spell, exile six cards from your graveyard.\nFlying\nAt the beginning of each opponent's upkeep, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature, and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
diff --git a/forge-gui/res/cardsfolder/upcoming/acrobatic_cheerleader.txt b/forge-gui/res/cardsfolder/upcoming/acrobatic_cheerleader.txt
index f6a0612be41..3d1210b1acb 100644
--- a/forge-gui/res/cardsfolder/upcoming/acrobatic_cheerleader.txt
+++ b/forge-gui/res/cardsfolder/upcoming/acrobatic_cheerleader.txt
@@ -1,7 +1,7 @@
-Name:Acrobatic Cheerleader
-ManaCost:1 W
-Types:Creature Human Survivor
-PT:2/2
-T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigPutCounter | GameActivationLimit$ 1 | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, put a flying counter on it. This ability triggers only once.
-SVar:TrigPutCounter:DB$ PutCounter | CounterType$ Flying | CounterNum$ 1
-Oracle:Survival — At the beginning of your second main phase, if Acrobatic Cheerleader is tapped, put a flying counter on it. This ability triggers only once.
+Name:Acrobatic Cheerleader
+ManaCost:1 W
+Types:Creature Human Survivor
+PT:2/2
+T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigPutCounter | GameActivationLimit$ 1 | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, put a flying counter on it. This ability triggers only once.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ Flying | CounterNum$ 1
+Oracle:Survival — At the beginning of your second main phase, if Acrobatic Cheerleader is tapped, put a flying counter on it. This ability triggers only once.
diff --git a/forge-gui/res/cardsfolder/upcoming/altanak_the_thrice_called.txt b/forge-gui/res/cardsfolder/upcoming/altanak_the_thrice_called.txt
index 2283a154b8b..a01efff44ec 100644
--- a/forge-gui/res/cardsfolder/upcoming/altanak_the_thrice_called.txt
+++ b/forge-gui/res/cardsfolder/upcoming/altanak_the_thrice_called.txt
@@ -1,9 +1,9 @@
-Name:Altanak, the Thrice-Called
-ManaCost:5 G G
-Types:Legendary Creature Insect Beast
-PT:9/9
-K:Trample
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability an opponent controls, draw a card.
-SVar:TrigDraw:DB$ Draw
-A:AB$ ChangeZone | Cost$ 1 G Discard<1/CARDNAME> | ActivationZone$ Hand | Origin$ Graveyard | Destination$ Battlefield| TgtPrompt$ Select target land card in your graveyard | ValidTgts$ Land.YouOwn | Tapped$ True | SpellDescription$ Return target land card from your graveyard to the battlefield tapped.
-Oracle:Trample\nWhenever Altanak, the Thrice-Called becomes the target of a spell or ability an opponent controls, draw a card.\n{1}{G}, Discard Altanak, the Thrice-Called: Return target land card from your graveyard to the battlefield tapped.
\ No newline at end of file
+Name:Altanak, the Thrice-Called
+ManaCost:5 G G
+Types:Legendary Creature Insect Beast
+PT:9/9
+K:Trample
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability an opponent controls, draw a card.
+SVar:TrigDraw:DB$ Draw
+A:AB$ ChangeZone | Cost$ 1 G Discard<1/CARDNAME> | ActivationZone$ Hand | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Select target land card in your graveyard | ValidTgts$ Land.YouOwn | Tapped$ True | SpellDescription$ Return target land card from your graveyard to the battlefield tapped.
+Oracle:Trample\nWhenever Altanak, the Thrice-Called becomes the target of a spell or ability an opponent controls, draw a card.\n{1}{G}, Discard Altanak, the Thrice-Called: Return target land card from your graveyard to the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/ancient_cellarspawn.txt b/forge-gui/res/cardsfolder/upcoming/ancient_cellarspawn.txt
index ee0474b1a97..63d39d6b6b9 100644
--- a/forge-gui/res/cardsfolder/upcoming/ancient_cellarspawn.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ancient_cellarspawn.txt
@@ -1,11 +1,11 @@
-Name:Ancient Cellarspawn
-ManaCost:1 B B
-Types:Enchantment Creature Horror
-PT:3/3
-S:Mode$ ReduceCost | ValidCard$ Demon,Horror,Nightmare | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Each spell you cast that's a Demon, Horror, or Nightmare costs {1} less to cast.
-T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | Execute$ TrigLoseLife | TriggerZones$ Battlefield | ValidSAonCard$ Spell.ManaSpent LTX | TriggerDescription$ Whenever you cast a spell, if the amount of mana spent to cast it was less than its mana value, target opponent loses life equal to the difference.
-SVar:TrigLoseLife:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ SVar$Y/Minus.Z
-SVar:X:Count$CardManaCost
-SVar:Y:TriggeredCard$CardManaCost
-SVar:Z:TriggeredCard$CastTotalManaSpent
-Oracle:Each spell you cast that's a Demon, Horror, or Nightmare costs {1} less to cast.\nWhenever you cast a spell, if the amount of mana spent to cast it was less than its mana value, target opponent loses life equal to the difference.
\ No newline at end of file
+Name:Ancient Cellarspawn
+ManaCost:1 B B
+Types:Enchantment Creature Horror
+PT:3/3
+S:Mode$ ReduceCost | ValidCard$ Demon,Horror,Nightmare | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Each spell you cast that's a Demon, Horror, or Nightmare costs {1} less to cast.
+T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | Execute$ TrigLoseLife | TriggerZones$ Battlefield | ValidSAonCard$ Spell.ManaSpent LTX | TriggerDescription$ Whenever you cast a spell, if the amount of mana spent to cast it was less than its mana value, target opponent loses life equal to the difference.
+SVar:TrigLoseLife:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ SVar$Y/Minus.Z
+SVar:X:Count$CardManaCost
+SVar:Y:TriggeredCard$CardManaCost
+SVar:Z:TriggeredCard$CastTotalManaSpent
+Oracle:Each spell you cast that's a Demon, Horror, or Nightmare costs {1} less to cast.\nWhenever you cast a spell, if the amount of mana spent to cast it was less than its mana value, target opponent loses life equal to the difference.
diff --git a/forge-gui/res/cardsfolder/upcoming/appendage_amalgam.txt b/forge-gui/res/cardsfolder/upcoming/appendage_amalgam.txt
index ac16e9d0da2..a86ccdc8bc3 100644
--- a/forge-gui/res/cardsfolder/upcoming/appendage_amalgam.txt
+++ b/forge-gui/res/cardsfolder/upcoming/appendage_amalgam.txt
@@ -1,10 +1,10 @@
-Name:Appendage Amalgam
-ManaCost:2 B
-Types:Enchantment Creature Horror
-PT:3/2
-K:Flash
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
-SVar:TrigSurveil:DB$ Surveil | Amount$ 1
-SVar:HasAttackEffect:TRUE
-DeckHas:Ability$Surveil|Graveyard
-Oracle:Flash\nWhenever Appendage Amalgam attacks, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
\ No newline at end of file
+Name:Appendage Amalgam
+ManaCost:2 B
+Types:Enchantment Creature Horror
+PT:3/2
+K:Flash
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
+SVar:TrigSurveil:DB$ Surveil | Amount$ 1
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Surveil|Graveyard
+Oracle:Flash\nWhenever Appendage Amalgam attacks, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/upcoming/arabella_abandoned_doll.txt b/forge-gui/res/cardsfolder/upcoming/arabella_abandoned_doll.txt
index feb4469b869..1ba4512a2f4 100644
--- a/forge-gui/res/cardsfolder/upcoming/arabella_abandoned_doll.txt
+++ b/forge-gui/res/cardsfolder/upcoming/arabella_abandoned_doll.txt
@@ -1,9 +1,9 @@
-Name:Arabella, Abandoned Doll
-ManaCost:R W
-Types:Legendary Artifact Creature Toy
-PT:1/3
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamageAll | TriggerDescription$ Whenever CARDNAME attacks, it deals X damage to each opponent and you gain X life, where X is the number of creatures you control with power 2 or less.
-SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ X | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
-SVar:X:Count$Valid Creature.YouCtrl+powerLE2
-Oracle:Whenever Arabella, Abandoned Doll attacks, it deals X damage to each opponent and you gain X life, where X is the number of creatures you control with power 2 or less.
\ No newline at end of file
+Name:Arabella, Abandoned Doll
+ManaCost:R W
+Types:Legendary Artifact Creature Toy
+PT:1/3
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamageAll | TriggerDescription$ Whenever CARDNAME attacks, it deals X damage to each opponent and you gain X life, where X is the number of creatures you control with power 2 or less.
+SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ X | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
+SVar:X:Count$Valid Creature.YouCtrl+powerLE2
+Oracle:Whenever Arabella, Abandoned Doll attacks, it deals X damage to each opponent and you gain X life, where X is the number of creatures you control with power 2 or less.
diff --git a/forge-gui/res/cardsfolder/upcoming/attack_in_the_box.txt b/forge-gui/res/cardsfolder/upcoming/attack_in_the_box.txt
index 8d0ebe61102..967ffef1be2 100644
--- a/forge-gui/res/cardsfolder/upcoming/attack_in_the_box.txt
+++ b/forge-gui/res/cardsfolder/upcoming/attack_in_the_box.txt
@@ -1,7 +1,7 @@
-Name:Attack-in-the-Box
-ManaCost:3
-Types:Artifact Creature Toy
-PT:2/4
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks, you may have it get +4/+0 until end of turn. If you do, sacrifice it at the beginning of the next end step.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 4 | NumDef$ 1 | AtEOT$ Sacrifice
-Oracle:Whenever Attack-in-the-box attacks, you may have it get +4/+0 until end of turn. If you do, sacrifice it at the beginning of the next end step.
\ No newline at end of file
+Name:Attack-in-the-Box
+ManaCost:3
+Types:Artifact Creature Toy
+PT:2/4
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks, you may have it get +4/+0 until end of turn. If you do, sacrifice it at the beginning of the next end step.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 4 | NumDef$ 1 | AtEOT$ Sacrifice
+Oracle:Whenever Attack-in-the-box attacks, you may have it get +4/+0 until end of turn. If you do, sacrifice it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/upcoming/balemurk_leech.txt b/forge-gui/res/cardsfolder/upcoming/balemurk_leech.txt
index e16619ef189..2a984006443 100644
--- a/forge-gui/res/cardsfolder/upcoming/balemurk_leech.txt
+++ b/forge-gui/res/cardsfolder/upcoming/balemurk_leech.txt
@@ -1,9 +1,9 @@
-Name:Balemurk Leech
-ManaCost:1 B
-Types:Creature Leech
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, each opponent loses 1 life.
-T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigLoseLife| TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, each opponent loses 1 life.
-SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1
-DeckNeeds:Type$Enchantment
-Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, each opponent loses 1 life.
+Name:Balemurk Leech
+ManaCost:1 B
+Types:Creature Leech
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, each opponent loses 1 life.
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, each opponent loses 1 life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1
+DeckNeeds:Type$Enchantment
+Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, each opponent loses 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/balustrade_wurm.txt b/forge-gui/res/cardsfolder/upcoming/balustrade_wurm.txt
index 8efe28611c0..17e7313e200 100644
--- a/forge-gui/res/cardsfolder/upcoming/balustrade_wurm.txt
+++ b/forge-gui/res/cardsfolder/upcoming/balustrade_wurm.txt
@@ -1,11 +1,11 @@
-Name:Balustrade Wurm
-ManaCost:3 G G
-Types:Creature Wurm
-PT:5/5
-R:Event$ Counter | ValidCard$ Card.Self | ValidSA$ Spell | Layer$ CantHappen | Description$ This spell can't be countered.
-K:Trample
-K:Haste
-A:AB$ ChangeZone | Cost$ 2 G G | PrecostDesc$ Delirium — | Activation$ Delirium | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ FINALITY | ActivationZone$ Graveyard | SorcerySpeed$ True | SpellDescription$ Return CARDNAME from your graveyard to the battlefield with a finality counter on it. Activate only if there are four or more card types among cards in your graveyard and only as a sorcery.
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:This spell can't be countered.\nTrample, haste\nDelirium — {2}{G}{G}: Return Balustrade Wurm from your graveyard to the battlefield with a finality counter on it. Activate only if there are four or more card types among cards in your graveyard and only as a sorcery.
\ No newline at end of file
+Name:Balustrade Wurm
+ManaCost:3 G G
+Types:Creature Wurm
+PT:5/5
+R:Event$ Counter | ValidCard$ Card.Self | ValidSA$ Spell | Layer$ CantHappen | Description$ This spell can't be countered.
+K:Trample
+K:Haste
+A:AB$ ChangeZone | Cost$ 2 G G | PrecostDesc$ Delirium — | Activation$ Delirium | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ FINALITY | ActivationZone$ Graveyard | SorcerySpeed$ True | SpellDescription$ Return CARDNAME from your graveyard to the battlefield with a finality counter on it. Activate only if there are four or more card types among cards in your graveyard and only as a sorcery.
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:This spell can't be countered.\nTrample, haste\nDelirium — {2}{G}{G}: Return Balustrade Wurm from your graveyard to the battlefield with a finality counter on it. Activate only if there are four or more card types among cards in your graveyard and only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/barbflare_gremlin.txt b/forge-gui/res/cardsfolder/upcoming/barbflare_gremlin.txt
index 9fdcf9c3e29..3b71ab9b64a 100644
--- a/forge-gui/res/cardsfolder/upcoming/barbflare_gremlin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/barbflare_gremlin.txt
@@ -1,10 +1,10 @@
-Name:Barbflare Gremlin
-ManaCost:3 R
-Types:Creature Gremlin
-PT:3/2
-K:First Strike
-K:Haste
-T:Mode$ TapsForMana | ValidCard$ Land | PresentDefined$ Self | IsPresent$ Card.tapped | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, if CARDNAME is tapped, that player adds one mana of any type that land produced. Then that land deals 1 damage to that player.
-SVar:TrigMana:DB$ ManaReflected | ColorOrType$ Type | ReflectProperty$ Produced | Defined$ TriggeredActivator | SubAbility$ DBDealDamage
-SVar:DBDealDamage:DB$ DealDamage | Defined$ TriggeredActivator | DamageSource$ TriggeredCard | NumDmg$ 1
-Oracle:First strike, haste\nWhenever a player taps a land for mana, if Barbflare Gremlin is tapped, that player adds one mana of any type that land produced. Then that land deals 1 damage to that player.
+Name:Barbflare Gremlin
+ManaCost:3 R
+Types:Creature Gremlin
+PT:3/2
+K:First Strike
+K:Haste
+T:Mode$ TapsForMana | ValidCard$ Land | PresentDefined$ Self | IsPresent$ Card.tapped | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, if CARDNAME is tapped, that player adds one mana of any type that land produced. Then that land deals 1 damage to that player.
+SVar:TrigMana:DB$ ManaReflected | ColorOrType$ Type | ReflectProperty$ Produced | Defined$ TriggeredActivator | SubAbility$ DBDealDamage
+SVar:DBDealDamage:DB$ DealDamage | Defined$ TriggeredActivator | DamageSource$ TriggeredCard | NumDmg$ 1
+Oracle:First strike, haste\nWhenever a player taps a land for mana, if Barbflare Gremlin is tapped, that player adds one mana of any type that land produced. Then that land deals 1 damage to that player.
diff --git a/forge-gui/res/cardsfolder/upcoming/baseball_bat.txt b/forge-gui/res/cardsfolder/upcoming/baseball_bat.txt
index 0295afea282..21de19a49b4 100644
--- a/forge-gui/res/cardsfolder/upcoming/baseball_bat.txt
+++ b/forge-gui/res/cardsfolder/upcoming/baseball_bat.txt
@@ -1,10 +1,10 @@
-Name:Baseball Bat
-ManaCost:G W
-Types:Artifact Equipment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When CARDNAME enters, attach it to target creature you control.
-SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Equipped creature gets +1/+1.
-T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigTap | TriggerDescription$ Whenever equipped creature attacks, tap up to one target creature.
-SVar:TrigTap:DB$ Tap | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature
-K:Equip:3
-Oracle:When Baseball Bat enters, attach it to target creature you control.\nEquipped creature gets +1/+1.\nWhenever equipped creature attacks, tap up to one target creature.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file
+Name:Baseball Bat
+ManaCost:G W
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When CARDNAME enters, attach it to target creature you control.
+SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Equipped creature gets +1/+1.
+T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigTap | TriggerDescription$ Whenever equipped creature attacks, tap up to one target creature.
+SVar:TrigTap:DB$ Tap | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature
+K:Equip:3
+Oracle:When Baseball Bat enters, attach it to target creature you control.\nEquipped creature gets +1/+1.\nWhenever equipped creature attacks, tap up to one target creature.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/upcoming/bashful_beastie.txt b/forge-gui/res/cardsfolder/upcoming/bashful_beastie.txt
index 2d7a0dd59c0..2fc6b9f2415 100644
--- a/forge-gui/res/cardsfolder/upcoming/bashful_beastie.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bashful_beastie.txt
@@ -1,7 +1,7 @@
-Name:Bashful Beastie
-ManaCost:4 G
-Types:Creature Beast
-PT:5/4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME dies, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-SVar:TrigDread:DB$ ManifestDread
-Oracle:When Bashful Beastie dies, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+Name:Bashful Beastie
+ManaCost:4 G
+Types:Creature Beast
+PT:5/4
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME dies, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+SVar:TrigDread:DB$ ManifestDread
+Oracle:When Bashful Beastie dies, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
diff --git a/forge-gui/res/cardsfolder/upcoming/bear_trap.txt b/forge-gui/res/cardsfolder/upcoming/bear_trap.txt
index 8cf1ccb3787..dbdacd86ee3 100644
--- a/forge-gui/res/cardsfolder/upcoming/bear_trap.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bear_trap.txt
@@ -1,7 +1,7 @@
-Name:Bear Trap
-ManaCost:1
-Types:Artifact
-K:Flash
-A:AB$ DealDamage | Cost$ 3 T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | SpellDescription$ It deals 3 damage to target creature.
-DeckHas:Ability$Sacrifice
-Oracle:Flash\n{3}, {T}, Sacrifice Bear Trap: It deals 3 damage to target creature.
\ No newline at end of file
+Name:Bear Trap
+ManaCost:1
+Types:Artifact
+K:Flash
+A:AB$ DealDamage | Cost$ 3 T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | SpellDescription$ It deals 3 damage to target creature.
+DeckHas:Ability$Sacrifice
+Oracle:Flash\n{3}, {T}, Sacrifice Bear Trap: It deals 3 damage to target creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/bedhead_beastie.txt b/forge-gui/res/cardsfolder/upcoming/bedhead_beastie.txt
index 7fa8c49c031..1878f707d9f 100644
--- a/forge-gui/res/cardsfolder/upcoming/bedhead_beastie.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bedhead_beastie.txt
@@ -1,8 +1,8 @@
-Name:Bedhead Beastie
-ManaCost:4 R R
-Types:Creature Beast
-PT:5/6
-K:Menace
-K:TypeCycling:Mountain:2
-DeckHas:Ability$Discard
-Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nMountaincycling {2} ({2}, Discard this card: Search your library for a Mountain card, reveal it, put it into your hand, then shuffle.)
\ No newline at end of file
+Name:Bedhead Beastie
+ManaCost:4 R R
+Types:Creature Beast
+PT:5/6
+K:Menace
+K:TypeCycling:Mountain:2
+DeckHas:Ability$Discard
+Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nMountaincycling {2} ({2}, Discard this card: Search your library for a Mountain card, reveal it, put it into your hand, then shuffle.)
diff --git a/forge-gui/res/cardsfolder/upcoming/betrayers_bargain.txt b/forge-gui/res/cardsfolder/upcoming/betrayers_bargain.txt
index ccbc6ae9ee4..561e01bf062 100644
--- a/forge-gui/res/cardsfolder/upcoming/betrayers_bargain.txt
+++ b/forge-gui/res/cardsfolder/upcoming/betrayers_bargain.txt
@@ -1,6 +1,6 @@
-Name:Betrayer's Bargain
-ManaCost:1 R
-Types:Instant
-K:AlternateAdditionalCost:Sac<1/Creature;Enchantment/creature or enchantment>:2
-A:SP$ DealDamage | NumDmg$ 5 | ValidTgts$ Creature | TgtPrompt$ Select target creature | ReplaceDyingDefined$ Targeted | SpellDescription$ CARDNAME deals 5 damage to target creature. If that creature would die this turn, exile it instead.
-Oracle:As an additional cost to cast this spell, sacrifice a creature or enchantment or pay {2}.\nBetrayer's Bargain deals 5 damage to target creature. If that creature would die this turn, exile it instead.
\ No newline at end of file
+Name:Betrayer's Bargain
+ManaCost:1 R
+Types:Instant
+K:AlternateAdditionalCost:Sac<1/Creature;Enchantment/creature or enchantment>:2
+A:SP$ DealDamage | NumDmg$ 5 | ValidTgts$ Creature | TgtPrompt$ Select target creature | ReplaceDyingDefined$ Targeted | SpellDescription$ CARDNAME deals 5 damage to target creature. If that creature would die this turn, exile it instead.
+Oracle:As an additional cost to cast this spell, sacrifice a creature or enchantment or pay {2}.\nBetrayer's Bargain deals 5 damage to target creature. If that creature would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/blazemire_verge.txt b/forge-gui/res/cardsfolder/upcoming/blazemire_verge.txt
index 6e87033702f..7bfa40b5474 100644
--- a/forge-gui/res/cardsfolder/upcoming/blazemire_verge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/blazemire_verge.txt
@@ -1,6 +1,6 @@
-Name:Blazemire Verge
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
-A:AB$ Mana | Cost$ T | Produced$ R | IsPresent$ Swamp.YouCtrl,Mountain.YouCtrl | SpellDescription$ Add {R}. Activate only if you control a Swamp or a Mountain.
-Oracle:{T}: Add {B}.\n{T}: Add {R}. Activate only if you control a Swamp or a Mountain.
\ No newline at end of file
+Name:Blazemire Verge
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | IsPresent$ Swamp.YouCtrl,Mountain.YouCtrl | SpellDescription$ Add {R}. Activate only if you control a Swamp or a Mountain.
+Oracle:{T}: Add {B}.\n{T}: Add {R}. Activate only if you control a Swamp or a Mountain.
diff --git a/forge-gui/res/cardsfolder/upcoming/bleeding_woods.txt b/forge-gui/res/cardsfolder/upcoming/bleeding_woods.txt
index 6ca758582f5..1ba57c7c087 100644
--- a/forge-gui/res/cardsfolder/upcoming/bleeding_woods.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bleeding_woods.txt
@@ -1,8 +1,8 @@
-Name:Bleeding Woods
-ManaCost:no cost
-Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
-SVar:X:PlayerCountPlayers$LowestLifeTotal
-A:AB$ Mana | Cost$ T | Produced$ Combo R G | SpellDescription$ Add {R} or {G}.
-Oracle:Bleeding Woods enters tapped unless a player has 13 or less life.\n{T}: Add {R} or {G}.
+Name:Bleeding Woods
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
+SVar:X:PlayerCountPlayers$LowestLifeTotal
+A:AB$ Mana | Cost$ T | Produced$ Combo R G | SpellDescription$ Add {R} or {G}.
+Oracle:Bleeding Woods enters tapped unless a player has 13 or less life.\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/upcoming/boilerbilges_ripper.txt b/forge-gui/res/cardsfolder/upcoming/boilerbilges_ripper.txt
index 639af3350f5..c86249701b6 100644
--- a/forge-gui/res/cardsfolder/upcoming/boilerbilges_ripper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/boilerbilges_ripper.txt
@@ -1,8 +1,8 @@
-Name:Boilerbilges Ripper
-ManaCost:4 R
-Types:Creature Human Assassin
-PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters, you may sacrifice another creature or enchantment. When you do, CARDNAME deals 2 damage to any target.
-SVar:TrigSac:AB$ ImmediateTrigger | Cost$ Sac<1/Creature.Other;Enchantment.Other/another creature or enchantment> | Execute$ TrigDealDamage | TriggerDescription$ When you do, CARDNAME deals 2 damage to any target.
-SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 2
-Oracle:When Boilerbilges Ripper enters, you may sacrifice another creature or enchantment. When you do, Boilerbilges Ripper deals 2 damage to any target.
\ No newline at end of file
+Name:Boilerbilges Ripper
+ManaCost:4 R
+Types:Creature Human Assassin
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters, you may sacrifice another creature or enchantment. When you do, CARDNAME deals 2 damage to any target.
+SVar:TrigSac:AB$ ImmediateTrigger | Cost$ Sac<1/Creature.Other;Enchantment.Other/another creature or enchantment> | Execute$ TrigDealDamage | TriggerDescription$ When you do, CARDNAME deals 2 damage to any target.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 2
+Oracle:When Boilerbilges Ripper enters, you may sacrifice another creature or enchantment. When you do, Boilerbilges Ripper deals 2 damage to any target.
diff --git a/forge-gui/res/cardsfolder/upcoming/break_down_the_door.txt b/forge-gui/res/cardsfolder/upcoming/break_down_the_door.txt
index cd264639e0f..155b36d1b6a 100644
--- a/forge-gui/res/cardsfolder/upcoming/break_down_the_door.txt
+++ b/forge-gui/res/cardsfolder/upcoming/break_down_the_door.txt
@@ -1,8 +1,8 @@
-Name:Break Down the Door
-ManaCost:2 G
-Types:Instant
-A:SP$ Charm | CharmNum$ 1 | Choices$ DBExileArtifact,DBExileEnchantment,DBDread
-SVar:DBExileArtifact:DB$ ChangeZone | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target artifact.
-SVar:DBExileEnchantment:DB$ ChangeZone | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target enchantment.
-SVar:DBDread:DB$ ManifestDread | SpellDescription$ Manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-Oracle:Choose one —\n• Exile target artifact.\n• Exile target enchantment.\n• Manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+Name:Break Down the Door
+ManaCost:2 G
+Types:Instant
+A:SP$ Charm | CharmNum$ 1 | Choices$ DBExileArtifact,DBExileEnchantment,DBDread
+SVar:DBExileArtifact:DB$ ChangeZone | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target artifact.
+SVar:DBExileEnchantment:DB$ ChangeZone | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target enchantment.
+SVar:DBDread:DB$ ManifestDread | SpellDescription$ Manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+Oracle:Choose one —\n• Exile target artifact.\n• Exile target enchantment.\n• Manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
diff --git a/forge-gui/res/cardsfolder/upcoming/broodspinner.txt b/forge-gui/res/cardsfolder/upcoming/broodspinner.txt
index 17c63cb1991..2bed013fad1 100644
--- a/forge-gui/res/cardsfolder/upcoming/broodspinner.txt
+++ b/forge-gui/res/cardsfolder/upcoming/broodspinner.txt
@@ -1,11 +1,11 @@
-Name:Broodspinner
-ManaCost:B G
-Types:Creature Spider
-PT:2/3
-K:Reach
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME 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 the top of your library in any order.)
-SVar:TrigSurveil:DB$ Surveil | Defined$ You | Amount$ 2
-A:AB$ Token | Cost$ 4 B G T Sac<1/CARDNAME> | TokenAmount$ X | TokenScript$ bg_1_1_insect_flying | TokenOwner$ You | SpellDescription$ Create a number of 1/1 black and green Insect creature tokens with flying equal to the number of card types among cards in your graveyard.
-SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
-DeckHas:Ability$Surveil|Graveyard
-Oracle:Reach\nWhen Broodspinner 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.)\n{4}{B}{G}, {T}, Sacrifice Broodspinner: Create a number of 1/1 black and green Insect creature tokens with flying equal to the number of card types among cards in your graveyard.
+Name:Broodspinner
+ManaCost:B G
+Types:Creature Spider
+PT:2/3
+K:Reach
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME 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 the top of your library in any order.)
+SVar:TrigSurveil:DB$ Surveil | Defined$ You | Amount$ 2
+A:AB$ Token | Cost$ 4 B G T Sac<1/CARDNAME> | TokenAmount$ X | TokenScript$ bg_1_1_insect_flying | TokenOwner$ You | SpellDescription$ Create a number of 1/1 black and green Insect creature tokens with flying equal to the number of card types among cards in your graveyard.
+SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
+DeckHas:Ability$Surveil|Graveyard
+Oracle:Reach\nWhen Broodspinner 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.)\n{4}{B}{G}, {T}, Sacrifice Broodspinner: Create a number of 1/1 black and green Insect creature tokens with flying equal to the number of card types among cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/cathartic_parting.txt b/forge-gui/res/cardsfolder/upcoming/cathartic_parting.txt
index f7a9413083d..1620e5f5365 100644
--- a/forge-gui/res/cardsfolder/upcoming/cathartic_parting.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cathartic_parting.txt
@@ -1,6 +1,6 @@
-Name:Cathartic Parting
-ManaCost:1 G
-Types:Sorcery
-A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Library | ValidTgts$ Artifact.OppCtrl,Enchantment.OppCtrl | TgtPrompt$ Select target artifact or enchantment an opponent controls | SubAbility$ DBChangeZone | Shuffle$ True | SpellDescription$ The owner of target artifact or enchantment an opponent controls shuffles it into their library. You may shuffle up to four target cards from your graveyard into your library.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Library | ValidTgts$ Card.YouOwn | TgtPrompt$ Select target card from your graveyard | TargetMin$ 0 | TargetMax$ 4 | Shuffle$ True | ShuffleNonMandatory$ True
-Oracle:The owner of target artifact or enchantment an opponent controls shuffles it into their library. You may shuffle up to four target cards from your graveyard into your library.
\ No newline at end of file
+Name:Cathartic Parting
+ManaCost:1 G
+Types:Sorcery
+A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Library | ValidTgts$ Artifact.OppCtrl,Enchantment.OppCtrl | TgtPrompt$ Select target artifact or enchantment an opponent controls | SubAbility$ DBChangeZone | Shuffle$ True | SpellDescription$ The owner of target artifact or enchantment an opponent controls shuffles it into their library. You may shuffle up to four target cards from your graveyard into your library.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Library | ValidTgts$ Card.YouOwn | TgtPrompt$ Select target card from your graveyard | TargetMin$ 0 | TargetMax$ 4 | Shuffle$ True | ShuffleNonMandatory$ True
+Oracle:The owner of target artifact or enchantment an opponent controls shuffles it into their library. You may shuffle up to four target cards from your graveyard into your library.
diff --git a/forge-gui/res/cardsfolder/upcoming/cautious_survivor.txt b/forge-gui/res/cardsfolder/upcoming/cautious_survivor.txt
index 65d4ecc0c7c..0a7216af5e1 100644
--- a/forge-gui/res/cardsfolder/upcoming/cautious_survivor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cautious_survivor.txt
@@ -1,7 +1,7 @@
-Name:Cautious Survivor
-Types:Creature Elf Survivor
-ManaCost:3 G
-PT:4/4
-T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, you gain 2 life.
-SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
-Oracle:Survival — At the beginning of your second main phase, if Cautious Survivor is tapped, you gain 2 life.
\ No newline at end of file
+Name:Cautious Survivor
+Types:Creature Elf Survivor
+ManaCost:3 G
+PT:4/4
+T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, you gain 2 life.
+SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
+Oracle:Survival — At the beginning of your second main phase, if Cautious Survivor is tapped, you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/chaos_is_my_plaything.txt b/forge-gui/res/cardsfolder/upcoming/chaos_is_my_plaything.txt
index a8d72c808e1..b05b08a63e2 100644
--- a/forge-gui/res/cardsfolder/upcoming/chaos_is_my_plaything.txt
+++ b/forge-gui/res/cardsfolder/upcoming/chaos_is_my_plaything.txt
@@ -1,8 +1,8 @@
-Name:Chaos Is My Plaything
-ManaCost:no cost
-Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, for each opponent, exile target permanent that player controls. Then each player reveals cards from the top of their library until they reveal a permanent card, puts it onto the battlefield, and puts the rest on the bottom of their library in a random order.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.OppCtrl | TgtPrompt$ Select up to one target creature each opponent controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsForEachPlayer$ True | SubAbility$ DBDigUntil
-SVar:DBDigUntil:DB$ DigUntil | Defined$ Player | Valid$ Permanent | ValidDescription$ permanent | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True | FoundDestination$ Battlefield
-SVar:OneEach:PlayerCountOpponents$Amount
-Oracle:When you set this scheme in motion, for each opponent, exile target permanent that player controls. Then each player reveals cards from the top of their library until they reveal a permanent card, puts it onto the battlefield, and puts the rest on the bottom of their library in a random order.
+Name:Chaos Is My Plaything
+ManaCost:no cost
+Types:Scheme
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, for each opponent, exile target permanent that player controls. Then each player reveals cards from the top of their library until they reveal a permanent card, puts it onto the battlefield, and puts the rest on the bottom of their library in a random order.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.OppCtrl | TgtPrompt$ Select up to one target creature each opponent controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsForEachPlayer$ True | SubAbility$ DBDigUntil
+SVar:DBDigUntil:DB$ DigUntil | Defined$ Player | Valid$ Permanent | ValidDescription$ permanent | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True | FoundDestination$ Battlefield
+SVar:OneEach:PlayerCountOpponents$Amount
+Oracle:When you set this scheme in motion, for each opponent, exile target permanent that player controls. Then each player reveals cards from the top of their library until they reveal a permanent card, puts it onto the battlefield, and puts the rest on the bottom of their library in a random order.
diff --git a/forge-gui/res/cardsfolder/upcoming/clammy_prowler.txt b/forge-gui/res/cardsfolder/upcoming/clammy_prowler.txt
index 3ef172b128e..b2cdfc3e1a4 100644
--- a/forge-gui/res/cardsfolder/upcoming/clammy_prowler.txt
+++ b/forge-gui/res/cardsfolder/upcoming/clammy_prowler.txt
@@ -1,8 +1,8 @@
-Name:Clammy Prowler
-ManaCost:3 U
-Types:Enchantment Creature Horror
-PT:2/5
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target attacking creature can't be blocked this turn.
-SVar:TrigPump:DB$ Effect | ValidTgts$ Creature.Other+attacking | TgtPrompt$ Select another target attacking non-Human creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
-SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
-Oracle:Whenever Clammy Prowler attacks, another target attacking creature can't be blocked this turn.
\ No newline at end of file
+Name:Clammy Prowler
+ManaCost:3 U
+Types:Enchantment Creature Horror
+PT:2/5
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target attacking creature can't be blocked this turn.
+SVar:TrigPump:DB$ Effect | ValidTgts$ Creature.Other+attacking | TgtPrompt$ Select another target attacking non-Human creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
+Oracle:Whenever Clammy Prowler attacks, another target attacking creature can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/clockwork_percussionist.txt b/forge-gui/res/cardsfolder/upcoming/clockwork_percussionist.txt
index 0c01dbacfe1..562264632f3 100644
--- a/forge-gui/res/cardsfolder/upcoming/clockwork_percussionist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/clockwork_percussionist.txt
@@ -1,11 +1,11 @@
-Name:Clockwork Percussionist
-ManaCost:R
-Types:Artifact Creature Monkey Toy
-PT:1/1
-K:Haste
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME dies, exile the top card of your library. You may play it until the end of your next turn.
-SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ UntilTheEndOfYourNextTurn
-SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play that card until the end of your next turn.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Haste\nWhen Clockwork Percussionist dies, exile the top card of your library. You may play it until the end of your next turn.
\ No newline at end of file
+Name:Clockwork Percussionist
+ManaCost:R
+Types:Artifact Creature Monkey Toy
+PT:1/1
+K:Haste
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME dies, exile the top card of your library. You may play it until the end of your next turn.
+SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ UntilTheEndOfYourNextTurn
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play that card until the end of your next turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Haste\nWhen Clockwork Percussionist dies, exile the top card of your library. You may play it until the end of your next turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/commune_with_evil.txt b/forge-gui/res/cardsfolder/upcoming/commune_with_evil.txt
index 01d49a67a14..90c842caa4c 100644
--- a/forge-gui/res/cardsfolder/upcoming/commune_with_evil.txt
+++ b/forge-gui/res/cardsfolder/upcoming/commune_with_evil.txt
@@ -1,7 +1,7 @@
-Name:Commune with Evil
-ManaCost:2 B
-Types:Sorcery
-A:SP$ Dig | DigNum$ 4 | ChangeNum$ 1 | DestinationZone2$ Graveyard | StackDescription$ SpellDescription | SubAbility$ DBGainLife | SpellDescription$ Look at the top four cards of your library. Put one of them into your hand and the rest into your graveyard. You gain 3 life.
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
-DeckHas:Ability$Graveyard
-Oracle:Look at the top four cards of your library. Put one of them into your hand and the rest into your graveyard. You gain 3 life.
\ No newline at end of file
+Name:Commune with Evil
+ManaCost:2 B
+Types:Sorcery
+A:SP$ Dig | DigNum$ 4 | ChangeNum$ 1 | DestinationZone2$ Graveyard | StackDescription$ SpellDescription | SubAbility$ DBGainLife | SpellDescription$ Look at the top four cards of your library. Put one of them into your hand and the rest into your graveyard. You gain 3 life.
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
+DeckHas:Ability$Graveyard
+Oracle:Look at the top four cards of your library. Put one of them into your hand and the rest into your graveyard. You gain 3 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/conductive_machete.txt b/forge-gui/res/cardsfolder/upcoming/conductive_machete.txt
index 71c8490cb96..6b8e64c867e 100644
--- a/forge-gui/res/cardsfolder/upcoming/conductive_machete.txt
+++ b/forge-gui/res/cardsfolder/upcoming/conductive_machete.txt
@@ -1,10 +1,10 @@
-Name:Conductive Machete
-ManaCost:4
-Types:Artifact Equipment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, manifest dread, then attach CARDNAME to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-SVar:TrigDread:DB$ ManifestDread | RememberManifested$ True | SubAbility$ DBAttach
-SVar:DBAttach:DB$ Attach | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 1 | Description$ Equipped creature gets +2/+1.
-K:Equip:4
-Oracle:When Conductive Machete enters, manifest dread, then attach Conductive Machete to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)\nEquipped creature gets +2/+1.\nEquip {4}
\ No newline at end of file
+Name:Conductive Machete
+ManaCost:4
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, manifest dread, then attach CARDNAME to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+SVar:TrigDread:DB$ ManifestDread | RememberManifested$ True | SubAbility$ DBAttach
+SVar:DBAttach:DB$ Attach | Defined$ Remembered | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 1 | Description$ Equipped creature gets +2/+1.
+K:Equip:4
+Oracle:When Conductive Machete enters, manifest dread, then attach Conductive Machete to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)\nEquipped creature gets +2/+1.\nEquip {4}
diff --git a/forge-gui/res/cardsfolder/upcoming/convert_to_slime.txt b/forge-gui/res/cardsfolder/upcoming/convert_to_slime.txt
index 535711c7829..fbb378092cf 100644
--- a/forge-gui/res/cardsfolder/upcoming/convert_to_slime.txt
+++ b/forge-gui/res/cardsfolder/upcoming/convert_to_slime.txt
@@ -1,11 +1,11 @@
-Name:Convert to Slime
-ManaCost:3 B G
-Types:Sorcery
-A:SP$ Pump | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Artifact | TgtPrompt$ Select target artifact to destroy | AILogic$ Destroy | IsCurse$ True | SubAbility$ DBPump1 | SpellDescription$ Destroy up to one target artifact, up to one target creature, and up to one target enchantment. Delirium — Then if there are four or more card types among cards in your graveyard, create an X/X green Ooze token, where X is the total mana value of permanents destroyed this way.
-SVar:DBPump1:DB$ Pump | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature to destroy | AILogic$ Destroy | IsCurse$ True | SubAbility$ DBPump2
-SVar:DBPump2:DB$ Pump | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment to destroy | AILogic$ Destroy | IsCurse$ True | SubAbility$ DBDestroy
-SVar:DBDestroy:DB$ Destroy | Defined$ Targeted | RememberDestroyed$ True | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | Condition$ Delirium | TokenAmount$ 1 | TokenScript$ g_x_x_ooze | TokenOwner$ You | TokenPower$ X | TokenToughness$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$SumCMC
-Oracle:Destroy up to one target artifact, up to one target creature, and up to one target enchantment.\nDelirium — Then if there are four or more card types among cards in your graveyard, create an X/X green Ooze token, where X is the total mana value of permanents destroyed this way.
+Name:Convert to Slime
+ManaCost:3 B G
+Types:Sorcery
+A:SP$ Pump | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Artifact | TgtPrompt$ Select target artifact to destroy | AILogic$ Destroy | IsCurse$ True | SubAbility$ DBPump1 | SpellDescription$ Destroy up to one target artifact, up to one target creature, and up to one target enchantment. Delirium — Then if there are four or more card types among cards in your graveyard, create an X/X green Ooze token, where X is the total mana value of permanents destroyed this way.
+SVar:DBPump1:DB$ Pump | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature to destroy | AILogic$ Destroy | IsCurse$ True | SubAbility$ DBPump2
+SVar:DBPump2:DB$ Pump | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment to destroy | AILogic$ Destroy | IsCurse$ True | SubAbility$ DBDestroy
+SVar:DBDestroy:DB$ Destroy | Defined$ Targeted | RememberDestroyed$ True | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | Condition$ Delirium | TokenAmount$ 1 | TokenScript$ g_x_x_ooze | TokenOwner$ You | TokenPower$ X | TokenToughness$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Remembered$SumCMC
+Oracle:Destroy up to one target artifact, up to one target creature, and up to one target enchantment.\nDelirium — Then if there are four or more card types among cards in your graveyard, create an X/X green Ooze token, where X is the total mana value of permanents destroyed this way.
diff --git a/forge-gui/res/cardsfolder/upcoming/coordinated_clobbering.txt b/forge-gui/res/cardsfolder/upcoming/coordinated_clobbering.txt
index a45a75b8706..178c125cac8 100644
--- a/forge-gui/res/cardsfolder/upcoming/coordinated_clobbering.txt
+++ b/forge-gui/res/cardsfolder/upcoming/coordinated_clobbering.txt
@@ -1,6 +1,6 @@
-Name:Coordinated Clobbering
-ManaCost:G
-Types:Sorcery
-A:SP$ Tap | TgtPrompt$ Select target untapped creature you control | ValidTgts$ Creature.untapped+YouCtrl | TargetMin$ 1 | TargetMax$ 2 | SubAbility$ DBEachDamage | SpellDescription$ Tap one or two target untapped creatures you control. They each deal damage equal to their power to target creature an opponent controls.
-SVar:DBEachDamage:DB$ EachDamage | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | DefinedDamagers$ ParentTarget | NumDmg$ Count$CardPower
-Oracle:Tap one or two target untapped creatures you control. They each deal damage equal to their power to target creature an opponent controls.
+Name:Coordinated Clobbering
+ManaCost:G
+Types:Sorcery
+A:SP$ Tap | TgtPrompt$ Select target untapped creature you control | ValidTgts$ Creature.untapped+YouCtrl | TargetMin$ 1 | TargetMax$ 2 | SubAbility$ DBEachDamage | SpellDescription$ Tap one or two target untapped creatures you control. They each deal damage equal to their power to target creature an opponent controls.
+SVar:DBEachDamage:DB$ EachDamage | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | DefinedDamagers$ ParentTarget | NumDmg$ Count$CardPower
+Oracle:Tap one or two target untapped creatures you control. They each deal damage equal to their power to target creature an opponent controls.
diff --git a/forge-gui/res/cardsfolder/upcoming/cracked_skull.txt b/forge-gui/res/cardsfolder/upcoming/cracked_skull.txt
index 5a429c65f66..d5c49a5c969 100644
--- a/forge-gui/res/cardsfolder/upcoming/cracked_skull.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cracked_skull.txt
@@ -1,13 +1,13 @@
-Name:Cracked Skull
-ManaCost:2 B
-Types:Enchantment Aura
-K:Enchant creature
-A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature | AILogic$ Curse
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, look at target player's hand. You may choose a nonland card from it. That player discards that card.
-SVar:TrigDiscard:DB$ Discard | ValidTgts$ Player | Mode$ RevealYouChoose | Optional$ True | DiscardValid$ Card.nonLand | DiscardValidDesc$ nonland card
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddSVar$ MortalDestroy
-SVar:MortalDestroy:SVar:DestroyWhenDamaged:True
-T:Mode$ DamageDoneOnce | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
-SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTargetLKICopy
-SVar:NonStackingAttachEffect:True
-Oracle:Enchant creature\nWhen Cracked Skull enters, look at target player's hand. You may choose a nonland card from it. That player discards that card.\nWhen enchanted creature is dealt damage, destroy it.
+Name:Cracked Skull
+ManaCost:2 B
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature | AILogic$ Curse
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, look at target player's hand. You may choose a nonland card from it. That player discards that card.
+SVar:TrigDiscard:DB$ Discard | ValidTgts$ Player | Mode$ RevealYouChoose | Optional$ True | DiscardValid$ Card.nonLand | DiscardValidDesc$ nonland card
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddSVar$ MortalDestroy
+SVar:MortalDestroy:SVar:DestroyWhenDamaged:True
+T:Mode$ DamageDoneOnce | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
+SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTargetLKICopy
+SVar:NonStackingAttachEffect:True
+Oracle:Enchant creature\nWhen Cracked Skull enters, look at target player's hand. You may choose a nonland card from it. That player discards that card.\nWhen enchanted creature is dealt damage, destroy it.
diff --git a/forge-gui/res/cardsfolder/upcoming/cryptid_inspector.txt b/forge-gui/res/cardsfolder/upcoming/cryptid_inspector.txt
index 00a0484e3bd..bf2b425426e 100644
--- a/forge-gui/res/cardsfolder/upcoming/cryptid_inspector.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cryptid_inspector.txt
@@ -1,9 +1,9 @@
-Name:Cryptid Inspector
-ManaCost:2 G
-Types:Creature Elf Warrior
-PT:2/3
-K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Permanent.faceDown+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a face-down permanent you control enters and whenever CARDNAME or another permanent you control is turned face up, put a +1/+1 counter on CARDNAME.
-T:Mode$ TurnFaceUp | ValidCard$ Card.Self,Permanent.Other+YouCtrl | Secondary$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a face-down permanent you control enters and whenever CARDNAME or another permanent you control is turned face up, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1
-Oracle:Vigilance\nWhenever a face-down permanent you control enters and whenever Cryptid Inspector or another permanent you control is turned face up, put a +1/+1 counter on Cryptid Inspector.
\ No newline at end of file
+Name:Cryptid Inspector
+ManaCost:2 G
+Types:Creature Elf Warrior
+PT:2/3
+K:Vigilance
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Permanent.faceDown+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a face-down permanent you control enters and whenever CARDNAME or another permanent you control is turned face up, put a +1/+1 counter on CARDNAME.
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self,Permanent.Other+YouCtrl | Secondary$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a face-down permanent you control enters and whenever CARDNAME or another permanent you control is turned face up, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1
+Oracle:Vigilance\nWhenever a face-down permanent you control enters and whenever Cryptid Inspector or another permanent you control is turned face up, put a +1/+1 counter on Cryptid Inspector.
diff --git a/forge-gui/res/cardsfolder/upcoming/cult_healer.txt b/forge-gui/res/cardsfolder/upcoming/cult_healer.txt
index c18ef34c9ab..5ce01c6d199 100644
--- a/forge-gui/res/cardsfolder/upcoming/cult_healer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cult_healer.txt
@@ -1,9 +1,9 @@
-Name:Cult Healer
-ManaCost:2 W
-Types:Creature Human Doctor
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gains lifelink until end of turn.
-T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gains lifelink until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Lifelink
-DeckNeeds:Type$Enchantment
-Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, Cult Healer gains lifelink until end of turn.
+Name:Cult Healer
+ManaCost:2 W
+Types:Creature Human Doctor
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gains lifelink until end of turn.
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gains lifelink until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Lifelink
+DeckNeeds:Type$Enchantment
+Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, Cult Healer gains lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/curator_beastie.txt b/forge-gui/res/cardsfolder/upcoming/curator_beastie.txt
index fc6e12ab5a4..09c968dcf5a 100644
--- a/forge-gui/res/cardsfolder/upcoming/curator_beastie.txt
+++ b/forge-gui/res/cardsfolder/upcoming/curator_beastie.txt
@@ -1,12 +1,12 @@
-Name:Curator Beastie
-ManaCost:4 G G
-Types:Creature Beast
-PT:6/6
-K:Reach
-K:ETBReplacement:Other:AddExtraCounter:Mandatory:Battlefield:Creature.Colorless+YouCtrl
-SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Colorless creatures you control enter with two additional +1/+1 counters on them.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ Whenever CARDNAME enters or attacks, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigDread | TriggerDescription$  Whenever CARDNAME enters or attacks, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-SVar:TrigDread:DB$ ManifestDread
-DeckHas:Ability$Counters
-Oracle:Reach\nColorless creatures you control enter with two additional +1/+1 counters on them.\nWhenever Curator Beastie enters or attacks, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+Name:Curator Beastie
+ManaCost:4 G G
+Types:Creature Beast
+PT:6/6
+K:Reach
+K:ETBReplacement:Other:AddExtraCounter:Mandatory:Battlefield:Creature.Colorless+YouCtrl
+SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Colorless creatures you control enter with two additional +1/+1 counters on them.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ Whenever CARDNAME enters or attacks, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigDread | TriggerDescription$ Whenever CARDNAME enters or attacks, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+SVar:TrigDread:DB$ ManifestDread
+DeckHas:Ability$Counters
+Oracle:Reach\nColorless creatures you control enter with two additional +1/+1 counters on them.\nWhenever Curator Beastie enters or attacks, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
diff --git a/forge-gui/res/cardsfolder/upcoming/cursed_windbreaker.txt b/forge-gui/res/cardsfolder/upcoming/cursed_windbreaker.txt
index bc03d481b09..a33c4e41e35 100644
--- a/forge-gui/res/cardsfolder/upcoming/cursed_windbreaker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cursed_windbreaker.txt
@@ -1,10 +1,10 @@
-Name:Cursed Windbreaker
-ManaCost:2 U
-Types:Artifact Equipment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, manifest dread, then attach CARDNAME to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-SVar:TrigDread:DB$ ManifestDread | RememberManifested$ True | SubAbility$ DBAttach
-SVar:DBAttach:DB$ Attach | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Flying | Description$ Equipped creature has flying.
-K:Equip:3
-Oracle:When Cursed Windbreaker enters, manifest dread, then attach Cursed Windbreaker to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)\nEquipped creature has flying.\nEquip {3}
\ No newline at end of file
+Name:Cursed Windbreaker
+ManaCost:2 U
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, manifest dread, then attach CARDNAME to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+SVar:TrigDread:DB$ ManifestDread | RememberManifested$ True | SubAbility$ DBAttach
+SVar:DBAttach:DB$ Attach | Defined$ Remembered | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Flying | Description$ Equipped creature has flying.
+K:Equip:3
+Oracle:When Cursed Windbreaker enters, manifest dread, then attach Cursed Windbreaker to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)\nEquipped creature has flying.\nEquip {3}
diff --git a/forge-gui/res/cardsfolder/upcoming/cynical_loner.txt b/forge-gui/res/cardsfolder/upcoming/cynical_loner.txt
index 00fb50d3271..cc67c72a4c4 100644
--- a/forge-gui/res/cardsfolder/upcoming/cynical_loner.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cynical_loner.txt
@@ -1,8 +1,8 @@
-Name:Cynical Loner
-Types:Creature Human Survivor
-ManaCost:1 B
-PT:3/1
-S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.Glimmer | Description$ CARDNAME can't be blocked by Glimmers.
-T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChangeZone | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, you may search your library for a card, put it into your graveyard, then shuffle.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True
-Oracle:Cynical Loner can't be blocked by Glimmers.\nSurvival — At the beginning of your second main phase, if Cynical Loner is tapped, you may search your library for a card, put it into your graveyard, then shuffle.
\ No newline at end of file
+Name:Cynical Loner
+Types:Creature Human Survivor
+ManaCost:1 B
+PT:3/1
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.Glimmer | Description$ CARDNAME can't be blocked by Glimmers.
+T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChangeZone | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, you may search your library for a card, put it into your graveyard, then shuffle.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True
+Oracle:Cynical Loner can't be blocked by Glimmers.\nSurvival — At the beginning of your second main phase, if Cynical Loner is tapped, you may search your library for a card, put it into your graveyard, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/daggermaw_megalodon.txt b/forge-gui/res/cardsfolder/upcoming/daggermaw_megalodon.txt
index a8ebc0e6291..5efca6b3073 100644
--- a/forge-gui/res/cardsfolder/upcoming/daggermaw_megalodon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/daggermaw_megalodon.txt
@@ -1,8 +1,8 @@
-Name:Daggermaw Megalodon
-ManaCost:4 U U
-Types:Creature Shark
-PT:5/7
-K:Vigilance
-K:TypeCycling:Island:2
-DeckHas:Ability$Discard
-Oracle:Vigilance\nIslandcycling {2} ({2}, Discard this card: Search your library for an Island card, reveal it, put it into your hand, then shuffle.)
\ No newline at end of file
+Name:Daggermaw Megalodon
+ManaCost:4 U U
+Types:Creature Shark
+PT:5/7
+K:Vigilance
+K:TypeCycling:Island:2
+DeckHas:Ability$Discard
+Oracle:Vigilance\nIslandcycling {2} ({2}, Discard this card: Search your library for an Island card, reveal it, put it into your hand, then shuffle.)
diff --git a/forge-gui/res/cardsfolder/upcoming/dark_wings_bring_your_downfall.txt b/forge-gui/res/cardsfolder/upcoming/dark_wings_bring_your_downfall.txt
index 0af2e954750..42d28852beb 100644
--- a/forge-gui/res/cardsfolder/upcoming/dark_wings_bring_your_downfall.txt
+++ b/forge-gui/res/cardsfolder/upcoming/dark_wings_bring_your_downfall.txt
@@ -1,9 +1,9 @@
-Name:Dark Wings Bring Your Downfall
-ManaCost:no cost
-Types:Ongoing Scheme
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigToken | TriggerZones$ Command | TriggerDescription$ Whenever you attack, create a 5/5 black Demon creature token with flying that's tapped and attacking.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_5_5_demon_flying | TokenOwner$ You | TokenTapped$ True | TokenAttacking$ True
-T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE2 | TriggerZones$ Command | Execute$ TrigAbandon | TriggerDescription$ At the beginning of each end step, if two or more creatures died under your control this turn, abandon this scheme.
-SVar:TrigAbandon:DB$ Abandon
-SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl
-Oracle:(An ongoing scheme remains face up until it's abandoned.)\nWhenever you attack, create a 5/5 black Demon creature token with flying that's tapped and attacking.\nAt the beginning of each end step, if two or more creatures died under your control this turn, abandon this scheme.
+Name:Dark Wings Bring Your Downfall
+ManaCost:no cost
+Types:Ongoing Scheme
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigToken | TriggerZones$ Command | TriggerDescription$ Whenever you attack, create a 5/5 black Demon creature token with flying that's tapped and attacking.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_5_5_demon_flying | TokenOwner$ You | TokenTapped$ True | TokenAttacking$ True
+T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE2 | TriggerZones$ Command | Execute$ TrigAbandon | TriggerDescription$ At the beginning of each end step, if two or more creatures died under your control this turn, abandon this scheme.
+SVar:TrigAbandon:DB$ Abandon
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl
+Oracle:(An ongoing scheme remains face up until it's abandoned.)\nWhenever you attack, create a 5/5 black Demon creature token with flying that's tapped and attacking.\nAt the beginning of each end step, if two or more creatures died under your control this turn, abandon this scheme.
diff --git a/forge-gui/res/cardsfolder/upcoming/dashing_bloodsucker.txt b/forge-gui/res/cardsfolder/upcoming/dashing_bloodsucker.txt
index 1c9410f3121..25b4ff97cca 100644
--- a/forge-gui/res/cardsfolder/upcoming/dashing_bloodsucker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/dashing_bloodsucker.txt
@@ -1,9 +1,9 @@
-Name:Dashing Bloodsucker
-ManaCost:3 B
-Types:Creature Vampire Warrior
-PT:2/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +2/+0 and gains lifelink until end of turn.
-T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ $ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +2/+0 and gains lifelink until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | KW$ Lifelink
-DeckNeeds:Type$Enchantment
-Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, Dashing Bloodsucker gets +2/+0 and gains lifelink until end of turn.
+Name:Dashing Bloodsucker
+ManaCost:3 B
+Types:Creature Vampire Warrior
+PT:2/5
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +2/+0 and gains lifelink until end of turn.
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +2/+0 and gains lifelink until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | KW$ Lifelink
+DeckNeeds:Type$Enchantment
+Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, Dashing Bloodsucker gets +2/+0 and gains lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/defiant_survivor.txt b/forge-gui/res/cardsfolder/upcoming/defiant_survivor.txt
index 501b877f7af..d2fbd4eeb10 100644
--- a/forge-gui/res/cardsfolder/upcoming/defiant_survivor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/defiant_survivor.txt
@@ -1,7 +1,7 @@
-Name:Defiant Survivor
-Types:Creature Human Survivor
-ManaCost:2 G
-PT:3/2
-T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigDread | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-SVar:TrigDread:DB$ ManifestDread
-Oracle:Survival — At the beginning of your second main phase, if Defiant Survivor is tapped, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
\ No newline at end of file
+Name:Defiant Survivor
+Types:Creature Human Survivor
+ManaCost:2 G
+PT:3/2
+T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigDread | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+SVar:TrigDread:DB$ ManifestDread
+Oracle:Survival — At the beginning of your second main phase, if Defiant Survivor is tapped, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
diff --git a/forge-gui/res/cardsfolder/upcoming/deluge_of_doom.txt b/forge-gui/res/cardsfolder/upcoming/deluge_of_doom.txt
index 3dce1bc998c..db6b797b9da 100644
--- a/forge-gui/res/cardsfolder/upcoming/deluge_of_doom.txt
+++ b/forge-gui/res/cardsfolder/upcoming/deluge_of_doom.txt
@@ -1,6 +1,6 @@
-Name:Deluge of Doom
-ManaCost:2 B
-Types:Sorcery
-A:SP$ PumpAll | ValidCards$ Creature | NumAtt$ -X | NumDef$ -X | SpellDescription$ All creatures get -X/-X until end of turn, where X is the number of card types among cards in your graveyard.
-SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
-Oracle:All creatures get -X/-X until end of turn, where X is the number of card types among cards in your graveyard.
\ No newline at end of file
+Name:Deluge of Doom
+ManaCost:2 B
+Types:Sorcery
+A:SP$ PumpAll | ValidCards$ Creature | NumAtt$ -X | NumDef$ -X | SpellDescription$ All creatures get -X/-X until end of turn, where X is the number of card types among cards in your graveyard.
+SVar:X:Count$ValidGraveyard Card.YouOwn$CardTypes
+Oracle:All creatures get -X/-X until end of turn, where X is the number of card types among cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/demolisher_spawn.txt b/forge-gui/res/cardsfolder/upcoming/demolisher_spawn.txt
index 78d2e7e8a17..25f57d11b9a 100644
--- a/forge-gui/res/cardsfolder/upcoming/demolisher_spawn.txt
+++ b/forge-gui/res/cardsfolder/upcoming/demolisher_spawn.txt
@@ -1,12 +1,12 @@
-Name:Demolisher Spawn
-ManaCost:5 G G
-Types:Enchantment Creature Horror
-PT:7/7
-K:Trample
-K:Haste
-T:Mode$ Attacks | ValidCard$ Card.Self | Delirium$ True | Execute$ TrigPumpAll | TriggerDescription$ Delirium — Whenever CARDNAME attacks, if there are four or more card types among cards in your graveyard, other attacking creatures get +4/+4 until end of turn.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ 4 | NumDef$ 4
-SVar:HasAttackEffect:TRUE
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:Trample, haste\nDelirium — Whenever Demolisher Spawn attacks, if there are four or more card types among cards in your graveyard, other attacking creatures get +4/+4 until end of turn.
\ No newline at end of file
+Name:Demolisher Spawn
+ManaCost:5 G G
+Types:Enchantment Creature Horror
+PT:7/7
+K:Trample
+K:Haste
+T:Mode$ Attacks | ValidCard$ Card.Self | Delirium$ True | Execute$ TrigPumpAll | TriggerDescription$ Delirium — Whenever CARDNAME attacks, if there are four or more card types among cards in your graveyard, other attacking creatures get +4/+4 until end of turn.
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.attacking+Other | NumAtt$ 4 | NumDef$ 4
+SVar:HasAttackEffect:TRUE
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:Trample, haste\nDelirium — Whenever Demolisher Spawn attacks, if there are four or more card types among cards in your graveyard, other attacking creatures get +4/+4 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/demonic_counsel.txt b/forge-gui/res/cardsfolder/upcoming/demonic_counsel.txt
index 997e95e54d6..5227ff9b4b5 100644
--- a/forge-gui/res/cardsfolder/upcoming/demonic_counsel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/demonic_counsel.txt
@@ -1,9 +1,9 @@
-Name:Demonic Counsel
-ManaCost:1 B
-Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Demon | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a Demon card, reveal it, put it into your hand, then shuffle. Delirium — If there are four or more card types among cards in your graveyard, instead search your library for any card, put it into your hand, then shuffle.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
-SVar:X:Count$Delirium.1.0
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:Search your library for a Demon card, reveal it, put it into your hand, then shuffle.\nDelirium — If there are four or more card types among cards in your graveyard, instead search your library for any card, put it into your hand, then shuffle.
\ No newline at end of file
+Name:Demonic Counsel
+ManaCost:1 B
+Types:Sorcery
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Demon | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a Demon card, reveal it, put it into your hand, then shuffle. Delirium — If there are four or more card types among cards in your graveyard, instead search your library for any card, put it into your hand, then shuffle.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
+SVar:X:Count$Delirium.1.0
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:Search your library for a Demon card, reveal it, put it into your hand, then shuffle.\nDelirium — If there are four or more card types among cards in your graveyard, instead search your library for any card, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/disturbing_mirth.txt b/forge-gui/res/cardsfolder/upcoming/disturbing_mirth.txt
index 5339ff384ed..5d8140051ba 100644
--- a/forge-gui/res/cardsfolder/upcoming/disturbing_mirth.txt
+++ b/forge-gui/res/cardsfolder/upcoming/disturbing_mirth.txt
@@ -1,9 +1,9 @@
-Name:Disturbing Mirth
-ManaCost:B R
-Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you may sacrifice another enchantment or creature. If you do, draw two cards.
-SVar:TrigDraw:AB$ Draw | Cost$ Sac<1/Enchantment.Other;Creature.Other/another enchantment or creature> | NumCards$ 2
-T:Mode$ Sacrificed | ValidPlayer$ You | ValidCard$ Card.Self | Execute$ TrigDread | TriggerZones$ Battlefield | TriggerDescription$ When you sacrifice CARDNAME, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-SVar:TrigDread:DB$ ManifestDread
-DeckHas:Ability$Sacrifice
-Oracle:When Disturbing Mirth enters, you may sacrifice another enchantment or creature. If you do, draw two cards.\nWhen you sacrifice Disturbing Mirth, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+Name:Disturbing Mirth
+ManaCost:B R
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you may sacrifice another enchantment or creature. If you do, draw two cards.
+SVar:TrigDraw:AB$ Draw | Cost$ Sac<1/Enchantment.Other;Creature.Other/another enchantment or creature> | NumCards$ 2
+T:Mode$ Sacrificed | ValidPlayer$ You | ValidCard$ Card.Self | Execute$ TrigDread | TriggerZones$ Battlefield | TriggerDescription$ When you sacrifice CARDNAME, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+SVar:TrigDread:DB$ ManifestDread
+DeckHas:Ability$Sacrifice
+Oracle:When Disturbing Mirth enters, you may sacrifice another enchantment or creature. If you do, draw two cards.\nWhen you sacrifice Disturbing Mirth, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
diff --git a/forge-gui/res/cardsfolder/upcoming/diversion_specialist.txt b/forge-gui/res/cardsfolder/upcoming/diversion_specialist.txt
index 80efc2acc86..7d143db417f 100644
--- a/forge-gui/res/cardsfolder/upcoming/diversion_specialist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/diversion_specialist.txt
@@ -1,10 +1,10 @@
-Name:Diversion Specialist
-ManaCost:3 R
-Types:Creature Human Warrior
-PT:4/3
-K:Menace
-A:AB$ Dig | Cost$ 1 Sac<1/Creature.Other;Enchantment.Other/another creature or enchantment> | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top card of your library. You may play that card this turn.
-SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
-SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play remembered card.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Menace (This creature can't be blocked except by two or more creatures)\n{1}, Sacrifice another creature or enchantment: Exile the top card of your library. You may play that card this turn.
+Name:Diversion Specialist
+ManaCost:3 R
+Types:Creature Human Warrior
+PT:4/3
+K:Menace
+A:AB$ Dig | Cost$ 1 Sac<1/Creature.Other;Enchantment.Other/another creature or enchantment> | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top card of your library. You may play that card this turn.
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
+SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play remembered card.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Menace (This creature can't be blocked except by two or more creatures)\n{1}, Sacrifice another creature or enchantment: Exile the top card of your library. You may play that card this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/dont_make_a_sound.txt b/forge-gui/res/cardsfolder/upcoming/dont_make_a_sound.txt
index fd5e54017c9..8f1370cab55 100644
--- a/forge-gui/res/cardsfolder/upcoming/dont_make_a_sound.txt
+++ b/forge-gui/res/cardsfolder/upcoming/dont_make_a_sound.txt
@@ -1,6 +1,6 @@
-Name:Don't Make a Sound
-ManaCost:1 U
-Types:Instant
-A:SP$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 2 | UnlessResolveSubs$ WhenPaid | SubAbility$ TrigSurveil | SpellDescription$ Counter target spell unless its controller pays {2}. If they do, 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
-Oracle:Counter target spell unless its controller pays {2}. If they do, 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.)
+Name:Don't Make a Sound
+ManaCost:1 U
+Types:Instant
+A:SP$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 2 | UnlessResolveSubs$ WhenPaid | SubAbility$ TrigSurveil | SpellDescription$ Counter target spell unless its controller pays {2}. If they do, 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
+Oracle:Counter target spell unless its controller pays {2}. If they do, 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.)
diff --git a/forge-gui/res/cardsfolder/upcoming/drag_to_the_roots.txt b/forge-gui/res/cardsfolder/upcoming/drag_to_the_roots.txt
index 45ff149116e..d60e8851fba 100644
--- a/forge-gui/res/cardsfolder/upcoming/drag_to_the_roots.txt
+++ b/forge-gui/res/cardsfolder/upcoming/drag_to_the_roots.txt
@@ -1,6 +1,6 @@
-Name:Drag to the Roots
-ManaCost:2 B G
-Types:Instant
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | Condition$ Delirium | Description$ Delirium — This spell costs {2} less to cast if there are four or more card types among cards in your graveyard.
-A:SP$ Destroy | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SpellDescription$ Destroy target nonland permanent.
-Oracle:Delirium — This spell costs {2} less to cast if there are four or more card types among cards in your graveyard.\nDestroy target nonland permanent.
+Name:Drag to the Roots
+ManaCost:2 B G
+Types:Instant
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | Condition$ Delirium | Description$ Delirium — This spell costs {2} less to cast if there are four or more card types among cards in your graveyard.
+A:SP$ Destroy | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SpellDescription$ Destroy target nonland permanent.
+Oracle:Delirium — This spell costs {2} less to cast if there are four or more card types among cards in your graveyard.\nDestroy target nonland permanent.
diff --git a/forge-gui/res/cardsfolder/upcoming/duskmourns_domination.txt b/forge-gui/res/cardsfolder/upcoming/duskmourns_domination.txt
index 9a1b16d3f9c..37857a1bf87 100644
--- a/forge-gui/res/cardsfolder/upcoming/duskmourns_domination.txt
+++ b/forge-gui/res/cardsfolder/upcoming/duskmourns_domination.txt
@@ -1,8 +1,8 @@
-Name:Duskmourn's Domination
-ManaCost:4 U U
-Types:Enchantment Aura
-K:Enchant creature
-A:SP$ Attach | Cost$ 4 U U | ValidTgts$ Creature | AILogic$ GainControl
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | GainControl$ You | Description$ You control enchanted creature.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -3 | RemoveAllAbilities$ True | Description$ Enchanted creature gets -3/-0 and loses all abilities.
-Oracle:Enchant creature\nYou control enchanted creature.\nEnchanted creature gets -3/-0 and loses all abilities.
\ No newline at end of file
+Name:Duskmourn's Domination
+ManaCost:4 U U
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ 4 U U | ValidTgts$ Creature | AILogic$ GainControl
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | GainControl$ You | Description$ You control enchanted creature.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -3 | RemoveAllAbilities$ True | Description$ Enchanted creature gets -3/-0 and loses all abilities.
+Oracle:Enchant creature\nYou control enchanted creature.\nEnchanted creature gets -3/-0 and loses all abilities.
diff --git a/forge-gui/res/cardsfolder/upcoming/emerge_from_the_cocoon.txt b/forge-gui/res/cardsfolder/upcoming/emerge_from_the_cocoon.txt
index 42d2c71ee9d..23b1a8c8d67 100644
--- a/forge-gui/res/cardsfolder/upcoming/emerge_from_the_cocoon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/emerge_from_the_cocoon.txt
@@ -1,7 +1,7 @@
-Name:Emerge from the Cocoon
-ManaCost:4 W
-Types:Sorcery
-A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SubAbility$ DBGainLife | SpellDescription$ Return target creature card from your graveyard to the battlefield. You gain 3 life.
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
-DeckHas:Ability$Graveyard
-Oracle:Return target creature card from your graveyard to the battlefield. You gain 3 life.
\ No newline at end of file
+Name:Emerge from the Cocoon
+ManaCost:4 W
+Types:Sorcery
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SubAbility$ DBGainLife | SpellDescription$ Return target creature card from your graveyard to the battlefield. You gain 3 life.
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
+DeckHas:Ability$Graveyard
+Oracle:Return target creature card from your graveyard to the battlefield. You gain 3 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/enduring_courage.txt b/forge-gui/res/cardsfolder/upcoming/enduring_courage.txt
index e09ae5cdd20..816e218e594 100644
--- a/forge-gui/res/cardsfolder/upcoming/enduring_courage.txt
+++ b/forge-gui/res/cardsfolder/upcoming/enduring_courage.txt
@@ -1,10 +1,10 @@
-Name:Enduring Courage
-ManaCost:2 R R
-Types:Enchantment Creature Dog Glimmer
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another creature you control enters, it gets +2/+0 and gains haste until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredCardLKICopy | NumAtt$ +2 | KW$ Haste
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
-SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | AnimateSubAbility$ DBAnimate
-SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Enchantment | RemoveCardTypes$ True | Duration$ Permanent
-Oracle:Whenever another creature you control enters, it gets +2/+0 and gains haste until end of turn.\nWhen Enduring Courage dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
\ No newline at end of file
+Name:Enduring Courage
+ManaCost:2 R R
+Types:Enchantment Creature Dog Glimmer
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another creature you control enters, it gets +2/+0 and gains haste until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredCardLKICopy | NumAtt$ +2 | KW$ Haste
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
+SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | AnimateSubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Enchantment | RemoveCardTypes$ True | Duration$ Permanent
+Oracle:Whenever another creature you control enters, it gets +2/+0 and gains haste until end of turn.\nWhen Enduring Courage dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
diff --git a/forge-gui/res/cardsfolder/upcoming/enduring_curiosity.txt b/forge-gui/res/cardsfolder/upcoming/enduring_curiosity.txt
index f1f605991d5..0dfa2d3975f 100644
--- a/forge-gui/res/cardsfolder/upcoming/enduring_curiosity.txt
+++ b/forge-gui/res/cardsfolder/upcoming/enduring_curiosity.txt
@@ -1,11 +1,11 @@
-Name:Enduring Curiosity
-ManaCost:2 U U
-Types:Enchantment Creature Cat Glimmer
-PT:4/3
-K:Flash
-T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a creature you control deals combat damage to a player, draw a card.
-SVar:TrigDraw:DB$ Draw | NumCards$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
-SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | AnimateSubAbility$ DBAnimate
-SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Enchantment | RemoveCardTypes$ True | Duration$ Permanent
-Oracle:Flash\nWhenever a creature you control deals combat damage to a player, draw a card.\nWhen Enduring Curiosity dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
\ No newline at end of file
+Name:Enduring Curiosity
+ManaCost:2 U U
+Types:Enchantment Creature Cat Glimmer
+PT:4/3
+K:Flash
+T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a creature you control deals combat damage to a player, draw a card.
+SVar:TrigDraw:DB$ Draw | NumCards$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
+SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | AnimateSubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Enchantment | RemoveCardTypes$ True | Duration$ Permanent
+Oracle:Flash\nWhenever a creature you control deals combat damage to a player, draw a card.\nWhen Enduring Curiosity dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
diff --git a/forge-gui/res/cardsfolder/upcoming/enduring_innocence.txt b/forge-gui/res/cardsfolder/upcoming/enduring_innocence.txt
index 88040f8bd22..0d75dca8b87 100644
--- a/forge-gui/res/cardsfolder/upcoming/enduring_innocence.txt
+++ b/forge-gui/res/cardsfolder/upcoming/enduring_innocence.txt
@@ -1,12 +1,12 @@
-Name:Enduring Innocence
-ManaCost:1 W W
-Types:Enchantment Creature Sheep Glimmer
-PT:2/1
-K:Lifelink
-T:Mode$ ChangesZoneAll | ValidCards$ Creature.powerLE2+YouCtrl+Other | Destination$ Battlefield | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigDraw | TriggerDescription$ Whenever one or more other creatures you control with power 2 or less enter, draw a card. This ability triggers only once each turn.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
-SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | AnimateSubAbility$ DBAnimate
-SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Enchantment | RemoveCardTypes$ True | Duration$ Permanent
-SVar:BuffedBy:Creature.powerLE2
-Oracle:Lifelink\nWhenever one or more other creatures you control with power 2 or less enter, draw a card. This ability triggers only once each turn.\nWhen Enduring Innocence dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
\ No newline at end of file
+Name:Enduring Innocence
+ManaCost:1 W W
+Types:Enchantment Creature Sheep Glimmer
+PT:2/1
+K:Lifelink
+T:Mode$ ChangesZoneAll | ValidCards$ Creature.powerLE2+YouCtrl+Other | Destination$ Battlefield | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigDraw | TriggerDescription$ Whenever one or more other creatures you control with power 2 or less enter, draw a card. This ability triggers only once each turn.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
+SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | AnimateSubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Enchantment | RemoveCardTypes$ True | Duration$ Permanent
+SVar:BuffedBy:Creature.powerLE2
+Oracle:Lifelink\nWhenever one or more other creatures you control with power 2 or less enter, draw a card. This ability triggers only once each turn.\nWhen Enduring Innocence dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
diff --git a/forge-gui/res/cardsfolder/upcoming/enduring_vitality.txt b/forge-gui/res/cardsfolder/upcoming/enduring_vitality.txt
index 5a361149191..b228b413acc 100644
--- a/forge-gui/res/cardsfolder/upcoming/enduring_vitality.txt
+++ b/forge-gui/res/cardsfolder/upcoming/enduring_vitality.txt
@@ -1,11 +1,11 @@
-Name:Enduring Vitality
-ManaCost:1 G G
-Types:Enchantment Creature Elk Glimmer
-PT:3/3
-K:Vigilance
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddAbility$ AnyMana | Description$ Creatures you control have "{T}: Add one mana of any color."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
-SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | AnimateSubAbility$ DBAnimate
-SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Enchantment | RemoveCardTypes$ True | Duration$ Permanent
-Oracle:Creatures you control have "{T}: Add one mana of any color."\nWhen Enduring Vitality dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
\ No newline at end of file
+Name:Enduring Vitality
+ManaCost:1 G G
+Types:Enchantment Creature Elk Glimmer
+PT:3/3
+K:Vigilance
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddAbility$ AnyMana | Description$ Creatures you control have "{T}: Add one mana of any color."
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
+SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | AnimateSubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Enchantment | RemoveCardTypes$ True | Duration$ Permanent
+Oracle:Creatures you control have "{T}: Add one mana of any color."\nWhen Enduring Vitality dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
diff --git a/forge-gui/res/cardsfolder/upcoming/enter_the_enigma.txt b/forge-gui/res/cardsfolder/upcoming/enter_the_enigma.txt
index 11b856d5273..740c6fc61ce 100644
--- a/forge-gui/res/cardsfolder/upcoming/enter_the_enigma.txt
+++ b/forge-gui/res/cardsfolder/upcoming/enter_the_enigma.txt
@@ -1,7 +1,7 @@
-Name:Enter the Enigma
-ManaCost:U
-Types:Instant
-A:SP$ Effect | ValidTgts$ Creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SubAbility$ DBDraw | SpellDescription$ Target creature can't be blocked this turn. Draw a card.
-SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
-SVar:DBDraw:DB$ Draw
-Oracle:Target creature can't be blocked this turn.\nDraw a card.
+Name:Enter the Enigma
+ManaCost:U
+Types:Instant
+A:SP$ Effect | ValidTgts$ Creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SubAbility$ DBDraw | SpellDescription$ Target creature can't be blocked this turn. Draw a card.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
+SVar:DBDraw:DB$ Draw
+Oracle:Target creature can't be blocked this turn.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/erratic_apparition.txt b/forge-gui/res/cardsfolder/upcoming/erratic_apparition.txt
index e11a3c1d47f..03d43f2f035 100644
--- a/forge-gui/res/cardsfolder/upcoming/erratic_apparition.txt
+++ b/forge-gui/res/cardsfolder/upcoming/erratic_apparition.txt
@@ -1,11 +1,11 @@
-Name:Erratic Apparition
-ManaCost:2 U
-Types:Creature Spirit
-PT:1/3
-K:Flying
-K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +1/+1 until end of turn.
-T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
-DeckNeeds:Type$Enchantment
-Oracle:Flying, vigilance\nEerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, Erratic Apparition gets +1/+1 until end of turn.
+Name:Erratic Apparition
+ManaCost:2 U
+Types:Creature Spirit
+PT:1/3
+K:Flying
+K:Vigilance
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +1/+1 until end of turn.
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, CARDNAME gets +1/+1 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
+DeckNeeds:Type$Enchantment
+Oracle:Flying, vigilance\nEerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, Erratic Apparition gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/etched_cornfield.txt b/forge-gui/res/cardsfolder/upcoming/etched_cornfield.txt
index ac666d37bb5..1ca5b9fe7b7 100644
--- a/forge-gui/res/cardsfolder/upcoming/etched_cornfield.txt
+++ b/forge-gui/res/cardsfolder/upcoming/etched_cornfield.txt
@@ -1,8 +1,8 @@
-Name:Etched Cornfield
-ManaCost:no cost
-Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
-SVar:X:PlayerCountPlayers$LowestLifeTotal
-A:AB$ Mana | Cost$ T | Produced$ Combo G W | SpellDescription$ Add {G} or {W}.
-Oracle:Etched Cornfield enters tapped unless a player has 13 or less life.\n{T}: Add {G} or {W}.
+Name:Etched Cornfield
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless a player has 13 or less life.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT13
+SVar:X:PlayerCountPlayers$LowestLifeTotal
+A:AB$ Mana | Cost$ T | Produced$ Combo G W | SpellDescription$ Add {G} or {W}.
+Oracle:Etched Cornfield enters tapped unless a player has 13 or less life.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/upcoming/exorcise.txt b/forge-gui/res/cardsfolder/upcoming/exorcise.txt
index 872a8a7d0a2..03ca50b1860 100644
--- a/forge-gui/res/cardsfolder/upcoming/exorcise.txt
+++ b/forge-gui/res/cardsfolder/upcoming/exorcise.txt
@@ -1,5 +1,5 @@
-Name:Exorcise
-ManaCost:1 W
-Types:Sorcery
-A:SP$ ChangeZone | ValidTgts$ Artifact,Enchantment,Creature.powerGE4 | TgtPrompt$ Select target artifact, enchantment, or creature with power 4 or greater | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target artifact, enchantment, or creature with power 4 or greater.
-Oracle:Exile target artifact, enchantment, or creature with power 4 or greater.
\ No newline at end of file
+Name:Exorcise
+ManaCost:1 W
+Types:Sorcery
+A:SP$ ChangeZone | ValidTgts$ Artifact,Enchantment,Creature.powerGE4 | TgtPrompt$ Select target artifact, enchantment, or creature with power 4 or greater | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target artifact, enchantment, or creature with power 4 or greater.
+Oracle:Exile target artifact, enchantment, or creature with power 4 or greater.
diff --git a/forge-gui/res/cardsfolder/upcoming/fanatic_of_the_harrowing.txt b/forge-gui/res/cardsfolder/upcoming/fanatic_of_the_harrowing.txt
index 368b30d2f13..550176727db 100644
--- a/forge-gui/res/cardsfolder/upcoming/fanatic_of_the_harrowing.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fanatic_of_the_harrowing.txt
@@ -1,10 +1,10 @@
-Name:Fanatic of the Harrowing
-ManaCost:3 B
-Types:Creature Human Cleric
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, each player discards a card. If you discarded a card this way, draw a card.
-SVar:TrigDiscard:DB$ Discard | Defined$ Player | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | Defined$ You | ConditionDefined$ Remembered | ConditionPresent$ Card.YouOwn | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:AIPreference:DiscardCost$Card.cmcLE1
-Oracle:When Fanatic of the Harrowing enters, each player discards a card. If you discarded a card this way, draw a card.
+Name:Fanatic of the Harrowing
+ManaCost:3 B
+Types:Creature Human Cleric
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, each player discards a card. If you discarded a card this way, draw a card.
+SVar:TrigDiscard:DB$ Discard | Defined$ Player | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ You | ConditionDefined$ Remembered | ConditionPresent$ Card.YouOwn | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:AIPreference:DiscardCost$Card.cmcLE1
+Oracle:When Fanatic of the Harrowing enters, each player discards a card. If you discarded a card this way, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_abduction.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_abduction.txt
index e27997faeff..4f5dbbe9d1f 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_abduction.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_abduction.txt
@@ -1,11 +1,11 @@
-Name:Fear of Abduction
-ManaCost:4 W W
-Types:Enchantment Creature Nightmare
-PT:5/5
-A:SP$ PermanentCreature | Cost$ 4 W W Exile<1/Creature>
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile target creature an opponent controls.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, put each card exiled with it into its owner's hand.
-SVar:TrigReturn:DB$ ChangeZoneAll | ChangeType$ Card.ExiledWithSource | Origin$ Exile | Destination$ Hand
-Oracle:As an additional cost to cast this spell, exile a creature you control.\nFlying\nWhen Fear of Abduction enters, exile target creature an opponent controls.\nWhen Fear of Abduction leaves the battlefield, put each card exiled with it into its owner's hand.
\ No newline at end of file
+Name:Fear of Abduction
+ManaCost:4 W W
+Types:Enchantment Creature Nightmare
+PT:5/5
+A:SP$ PermanentCreature | Cost$ 4 W W Exile<1/Creature>
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile target creature an opponent controls.
+SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, put each card exiled with it into its owner's hand.
+SVar:TrigReturn:DB$ ChangeZoneAll | ChangeType$ Card.ExiledWithSource | Origin$ Exile | Destination$ Hand
+Oracle:As an additional cost to cast this spell, exile a creature you control.\nFlying\nWhen Fear of Abduction enters, exile target creature an opponent controls.\nWhen Fear of Abduction leaves the battlefield, put each card exiled with it into its owner's hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_being_hunted.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_being_hunted.txt
index bfb31376339..1b1ea6efbb5 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_being_hunted.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_being_hunted.txt
@@ -1,7 +1,7 @@
-Name:Fear of Being Hunted
-ManaCost:1 R R
-Types:Enchantment Creature Nightmare
-PT:4/2
-K:Haste
-K:CARDNAME must be blocked if able.
-Oracle:Haste\nFear of Being Hunted must be blocked if able.
\ No newline at end of file
+Name:Fear of Being Hunted
+ManaCost:1 R R
+Types:Enchantment Creature Nightmare
+PT:4/2
+K:Haste
+K:CARDNAME must be blocked if able.
+Oracle:Haste\nFear of Being Hunted must be blocked if able.
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_burning_alive.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_burning_alive.txt
index 9cf6f0397d5..0d93f56dd16 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_burning_alive.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_burning_alive.txt
@@ -1,10 +1,10 @@
-Name:Fear of Burning Alive
-ManaCost:4 R R
-Types:Enchantment Creature Nightmare
-PT:4/4
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamageAll | TriggerDescription$ When CARDNAME enters, it deals 4 damage to each opponent.
-SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ 4
-T:Mode$ DamageDone | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ValidTarget$ Opponent | CombatDamage$ False | TriggerZones$ Battlefield | Delirium$ True | Execute$ TrigDmg | TriggerDescription$ Delirium — Whenever a source you control deals noncombat damage to an opponent, if there are four or more card types among cards in your graveyard, CARDNAME deals that amount of damage to target creature that player controls.
-SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature that player controls | TargetsWithDefinedController$ TriggeredTarget | NumDmg$ X
-SVar:X:TriggerCount$DamageAmount
-Oracle:When Fear of Burning Alive enters, it deals 4 damage to each opponent.\nDelirium — Whenever a source you control deals noncombat damage to an opponent, if there are four or more card types among cards in your graveyard, Fear of Burning Alive deals that amount of damage to target creature that player controls.
+Name:Fear of Burning Alive
+ManaCost:4 R R
+Types:Enchantment Creature Nightmare
+PT:4/4
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamageAll | TriggerDescription$ When CARDNAME enters, it deals 4 damage to each opponent.
+SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ 4
+T:Mode$ DamageDone | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ValidTarget$ Opponent | CombatDamage$ False | TriggerZones$ Battlefield | Delirium$ True | Execute$ TrigDmg | TriggerDescription$ Delirium — Whenever a source you control deals noncombat damage to an opponent, if there are four or more card types among cards in your graveyard, CARDNAME deals that amount of damage to target creature that player controls.
+SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature that player controls | TargetsWithDefinedController$ TriggeredTarget | NumDmg$ X
+SVar:X:TriggerCount$DamageAmount
+Oracle:When Fear of Burning Alive enters, it deals 4 damage to each opponent.\nDelirium — Whenever a source you control deals noncombat damage to an opponent, if there are four or more card types among cards in your graveyard, Fear of Burning Alive deals that amount of damage to target creature that player controls.
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_exposure.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_exposure.txt
index 2bff7dd6b40..36200de70a6 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_exposure.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_exposure.txt
@@ -1,7 +1,7 @@
-Name:Fear of Exposure
-ManaCost:2 G
-Types:Enchantment Creature Nightmare
-PT:5/4
-A:SP$ PermanentCreature | Cost$ 2 G tapXType<2/Creature;Land/creatures and/or lands>
-K:Trample
-Oracle:As an additional cost to cast this spell, tap two untapped creatures and/or lands you control.\nTrample
\ No newline at end of file
+Name:Fear of Exposure
+ManaCost:2 G
+Types:Enchantment Creature Nightmare
+PT:5/4
+A:SP$ PermanentCreature | Cost$ 2 G tapXType<2/Creature;Land/creatures and/or lands>
+K:Trample
+Oracle:As an additional cost to cast this spell, tap two untapped creatures and/or lands you control.\nTrample
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_failed_tests.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_failed_tests.txt
index 687a3addacf..b4c21dc0fe1 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_failed_tests.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_failed_tests.txt
@@ -1,8 +1,8 @@
-Name:Fear of Failed Tests
-ManaCost:4 U
-Types:Enchantment Creature Nightmare
-PT:2/7
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDraw | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, draw that many cards.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X
-SVar:X:TriggerCount$DamageAmount
-Oracle:Whenever Fear of Failed Tests deals combat damage to a player, draw that many cards.
\ No newline at end of file
+Name:Fear of Failed Tests
+ManaCost:4 U
+Types:Enchantment Creature Nightmare
+PT:2/7
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDraw | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, draw that many cards.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X
+SVar:X:TriggerCount$DamageAmount
+Oracle:Whenever Fear of Failed Tests deals combat damage to a player, draw that many cards.
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_falling.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_falling.txt
index 74243868e30..9eaa6c814c8 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_falling.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_falling.txt
@@ -1,10 +1,10 @@
-Name:Fear of Falling
-ManaCost:3 U U
-Types:Enchantment Creature Nightmare
-PT:4/4
-K:Flying
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, target creature defending player controls gets -2/-0 and loses flying until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.ControlledBy TriggeredDefendingPlayer | TgtPrompt$ Select target creature defending player controls | NumAtt$ -2 | IsCurse$ True | SubAbility$ DBDebuff
-SVar:DBDebuff:DB$ Debuff | Defined$ Targeted | Keywords$ Flying
-SVar:HasAttackEffect:TRUE
-Oracle:Flying\nWhenever Fear of Falling attacks, target creature defending player controls gets -2/-0 and loses flying until end of turn.
+Name:Fear of Falling
+ManaCost:3 U U
+Types:Enchantment Creature Nightmare
+PT:4/4
+K:Flying
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, target creature defending player controls gets -2/-0 and loses flying until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.ControlledBy TriggeredDefendingPlayer | TgtPrompt$ Select target creature defending player controls | NumAtt$ -2 | IsCurse$ True | SubAbility$ DBDebuff
+SVar:DBDebuff:DB$ Debuff | Defined$ Targeted | Keywords$ Flying
+SVar:HasAttackEffect:TRUE
+Oracle:Flying\nWhenever Fear of Falling attacks, target creature defending player controls gets -2/-0 and loses flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_immobility.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_immobility.txt
index a2fd2ca5c7b..be12daeb03a 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_immobility.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_immobility.txt
@@ -1,9 +1,9 @@
-Name:Fear of Immobility
-ManaCost:4 W
-Types:Enchantment Creature Nightmare
-PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap up to one target creature. If an opponent controls that creature, put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
-SVar:TrigTap:DB$ Tap | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1 | ConditionDefined$ Targeted | ConditionPresent$ Creature.OppCtrl
-SVar:PlayMain1:TRUE
-Oracle:When Fear of Immobility enters, tap up to one target creature. If an opponent controls that creature, put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
\ No newline at end of file
+Name:Fear of Immobility
+ManaCost:4 W
+Types:Enchantment Creature Nightmare
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap up to one target creature. If an opponent controls that creature, put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+SVar:TrigTap:DB$ Tap | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1 | ConditionDefined$ Targeted | ConditionPresent$ Creature.OppCtrl
+SVar:PlayMain1:TRUE
+Oracle:When Fear of Immobility enters, tap up to one target creature. If an opponent controls that creature, put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_impostors.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_impostors.txt
index 2c83a907c33..3f540f5b282 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_impostors.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_impostors.txt
@@ -1,9 +1,9 @@
-Name:Fear of Impostors
-ManaCost:1 U U
-Types:Enchantment Creature Nightmare
-PT:3/2
-K:Flash
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCounter | TriggerDescription$ When CARDNAME enters, counter target spell. Its controller manifests dread. (That player looks at the top two cards of their library, then puts one onto the battlefield face down as a 2/2 creature and the other into their graveyard. If it's a creature card, it can be turned face up any time for its mana cost.)
-SVar:TrigCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | SubAbility$ DBDread | TgtPrompt$ Select target spell
-SVar:DBDread:DB$ ManifestDread | DefinedPlayer$ TargetedController
-Oracle:Flash\nWhen Fear of Impostors enters, counter target spell. Its controller manifests dread. (That player looks at the top two cards of their library, then puts one onto the battlefield face down as a 2/2 creature and the other into their graveyard. If it's a creature card, it can be turned face up any time for its mana cost.)
\ No newline at end of file
+Name:Fear of Impostors
+ManaCost:1 U U
+Types:Enchantment Creature Nightmare
+PT:3/2
+K:Flash
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCounter | TriggerDescription$ When CARDNAME enters, counter target spell. Its controller manifests dread. (That player looks at the top two cards of their library, then puts one onto the battlefield face down as a 2/2 creature and the other into their graveyard. If it's a creature card, it can be turned face up any time for its mana cost.)
+SVar:TrigCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | SubAbility$ DBDread | TgtPrompt$ Select target spell
+SVar:DBDread:DB$ ManifestDread | DefinedPlayer$ TargetedController
+Oracle:Flash\nWhen Fear of Impostors enters, counter target spell. Its controller manifests dread. (That player looks at the top two cards of their library, then puts one onto the battlefield face down as a 2/2 creature and the other into their graveyard. If it's a creature card, it can be turned face up any time for its mana cost.)
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_infinity.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_infinity.txt
index 680caea3554..93666a513ef 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_infinity.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_infinity.txt
@@ -1,11 +1,11 @@
-Name:Fear of Infinity
-ManaCost:1 U B
-Types:Enchantment Creature Nightmare
-PT:2/2
-K:Flying
-K:Lifelink
-K:CARDNAME can't block.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | OptionalDecider$ You | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, you may return CARDNAME from your graveyard to your hand.
-T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | OptionalDecider$ You | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, you may return CARDNAME from your graveyard to your hand.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand
-Oracle:Flying, lifelink\nFear of Infinity can't block.\nEerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, you may return Fear of Infinity from your graveyard to your hand.
+Name:Fear of Infinity
+ManaCost:1 U B
+Types:Enchantment Creature Nightmare
+PT:2/2
+K:Flying
+K:Lifelink
+K:CARDNAME can't block.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | OptionalDecider$ You | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, you may return CARDNAME from your graveyard to your hand.
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | OptionalDecider$ You | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, you may return CARDNAME from your graveyard to your hand.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand
+Oracle:Flying, lifelink\nFear of Infinity can't block.\nEerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, you may return Fear of Infinity from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_isolation.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_isolation.txt
index 90fb1ed26e4..a277bb47a0c 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_isolation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_isolation.txt
@@ -1,7 +1,7 @@
-Name:Fear of Isolation
-ManaCost:1 U
-Types:Enchantment Creature Nightmare
-PT:2/3
-A:SP$ PermanentCreature | Cost$ 1 U Return<1/Permanent>
-K:Flying
-Oracle:As an additional cost to cast this spell, return a permanent you control to its owner's hand.\nFlying
\ No newline at end of file
+Name:Fear of Isolation
+ManaCost:1 U
+Types:Enchantment Creature Nightmare
+PT:2/3
+A:SP$ PermanentCreature | Cost$ 1 U Return<1/Permanent/permanent>
+K:Flying
+Oracle:As an additional cost to cast this spell, return a permanent you control to its owner's hand.\nFlying
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_lost_teeth.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_lost_teeth.txt
index 6e0c160aee4..fc4f5640fd7 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_lost_teeth.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_lost_teeth.txt
@@ -1,8 +1,8 @@
-Name:Fear of Lost Teeth
-ManaCost:B
-Types:Enchantment Creature Nightmare
-PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME dies, it deals 1 damage to any target and you gain 1 life.
-SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 1 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-Oracle:When Fear of Lost Teeth dies, it deals 1 damage to any target and you gain 1 life.
\ No newline at end of file
+Name:Fear of Lost Teeth
+ManaCost:B
+Types:Enchantment Creature Nightmare
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME dies, it deals 1 damage to any target and you gain 1 life.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+Oracle:When Fear of Lost Teeth dies, it deals 1 damage to any target and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_surveilance.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_surveilance.txt
index 3eae59778d0..77e75c2e08a 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_surveilance.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_surveilance.txt
@@ -1,10 +1,10 @@
-Name:Fear of Surveillance
-ManaCost:1 W
-Types:Enchantment Creature Nightmare
-PT:2/2
-K:Vigilance
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
-SVar:TrigSurveil:DB$ Surveil | Amount$ 1
-SVar:HasAttackEffect:TRUE
-DeckHas:Ability$Surveil|Graveyard
-Oracle:Vigilance\nWhenever Fear of Surveillance attacks, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
\ No newline at end of file
+Name:Fear of Surveillance
+ManaCost:1 W
+Types:Enchantment Creature Nightmare
+PT:2/2
+K:Vigilance
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
+SVar:TrigSurveil:DB$ Surveil | Amount$ 1
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Surveil|Graveyard
+Oracle:Vigilance\nWhenever Fear of Surveillance attacks, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/upcoming/fear_of_the_dark.txt b/forge-gui/res/cardsfolder/upcoming/fear_of_the_dark.txt
index bb21b6f832f..9ce5e3b30f4 100644
--- a/forge-gui/res/cardsfolder/upcoming/fear_of_the_dark.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fear_of_the_dark.txt
@@ -1,7 +1,7 @@
-Name:Fear of the Dark
-ManaCost:4 B
-Types:Enchantment Creature Nightmare
-PT:5/5
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | IsPresent$ Creature.Glimmer+DefenderCtrl | PresentCompare$ EQ0 | TriggerDescription$ Whenever CARDNAME attacks, if defending player controls no Glimmer creatures, it gains menace and deathtouch until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
-SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Menace & Deathtouch
-Oracle:Whenever Fear of the Dark attacks, if defending player controls no Glimmer creatures, it gains menace and deathtouch until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
\ No newline at end of file
+Name:Fear of the Dark
+ManaCost:4 B
+Types:Enchantment Creature Nightmare
+PT:5/5
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | IsPresent$ Creature.Glimmer+DefenderCtrl | PresentCompare$ EQ0 | TriggerDescription$ Whenever CARDNAME attacks, if defending player controls no Glimmer creatures, it gains menace and deathtouch until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Menace & Deathtouch
+Oracle:Whenever Fear of the Dark attacks, if defending player controls no Glimmer creatures, it gains menace and deathtouch until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/upcoming/final_vengeance.txt b/forge-gui/res/cardsfolder/upcoming/final_vengeance.txt
index ba5443a54d9..843e2fa3969 100644
--- a/forge-gui/res/cardsfolder/upcoming/final_vengeance.txt
+++ b/forge-gui/res/cardsfolder/upcoming/final_vengeance.txt
@@ -1,5 +1,5 @@
-Name:Final Vengeance
-ManaCost:B
-Types:Sorcery
-A:SP$ ChangeZone | Cost$ B Sac<1/Creature;Enchantment/creature or enchantment> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature.
-Oracle:As an additional cost to cast this spell, sacrifice a creature or enchantment.\nExile target creature.
\ No newline at end of file
+Name:Final Vengeance
+ManaCost:B
+Types:Sorcery
+A:SP$ ChangeZone | Cost$ B Sac<1/Creature;Enchantment/creature or enchantment> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature.
+Oracle:As an additional cost to cast this spell, sacrifice a creature or enchantment.\nExile target creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/flesh_burrower.txt b/forge-gui/res/cardsfolder/upcoming/flesh_burrower.txt
index da49023a79a..edf57e96b76 100644
--- a/forge-gui/res/cardsfolder/upcoming/flesh_burrower.txt
+++ b/forge-gui/res/cardsfolder/upcoming/flesh_burrower.txt
@@ -1,8 +1,8 @@
-Name:Flesh Burrower
-ManaCost:1 G
-Types:Creature Insect
-PT:2/2
-K:Deathtouch
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature you control gains deathtouch until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | KW$ Deathtouch
-Oracle:Deathtouch\nWhenever Flesh Burrower attacks, another target creature you control gains deathtouch until end of turn.
\ No newline at end of file
+Name:Flesh Burrower
+ManaCost:1 G
+Types:Creature Insect
+PT:2/2
+K:Deathtouch
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature you control gains deathtouch until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | KW$ Deathtouch
+Oracle:Deathtouch\nWhenever Flesh Burrower attacks, another target creature you control gains deathtouch until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/floodfarm_verge.txt b/forge-gui/res/cardsfolder/upcoming/floodfarm_verge.txt
index 7ad6d9533d5..69a69f82cfa 100644
--- a/forge-gui/res/cardsfolder/upcoming/floodfarm_verge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/floodfarm_verge.txt
@@ -1,6 +1,6 @@
-Name:Floodfarm Verge
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
-A:AB$ Mana | Cost$ T | Produced$ U | IsPresent$ Plains.YouCtrl,Island.YouCtrl | SpellDescription$ Add {U}. Activate only if you control a Plains or an Island.
-Oracle:{T}: Add {W}.\n{T}: Add {U}. Activate only if you control a Plains or an Island.
\ No newline at end of file
+Name:Floodfarm Verge
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | IsPresent$ Plains.YouCtrl,Island.YouCtrl | SpellDescription$ Add {U}. Activate only if you control a Plains or an Island.
+Oracle:{T}: Add {W}.\n{T}: Add {U}. Activate only if you control a Plains or an Island.
diff --git a/forge-gui/res/cardsfolder/upcoming/floodpits_drowner.txt b/forge-gui/res/cardsfolder/upcoming/floodpits_drowner.txt
index 6b364e222d7..ad7849e3c45 100644
--- a/forge-gui/res/cardsfolder/upcoming/floodpits_drowner.txt
+++ b/forge-gui/res/cardsfolder/upcoming/floodpits_drowner.txt
@@ -1,11 +1,11 @@
-Name:Floodpits Drowner
-ManaCost:1 U
-Types:Creature Merfolk
-PT:2/1
-K:Flash
-K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap target creature an opponent controls and put a stun counter on it.
-SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | SubAbility$ DBCounter
-SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1
-A:AB$ ChangeZone | Cost$ 1 U T | ValidTgts$ Creature.counters_GE1_STUN | TgtPrompt$ Select target creature with a stun counter on it | ThisDefinedAndTgts$ Self | Origin$ Battlefield | Destination$ Library | Shuffle$ True | SpellDescription$ Shuffle CARDNAME and target creature with a stun counter on it into their owners' libraries.
-Oracle:Flash\nVigilance\nWhen Floodpits Drowner enters, tap target creature an opponent controls and put a stun counter on it.\n{1}{U}, {T}: Shuffle Floodpits Drowner and target creature with a stun counter on it into their owners' libraries.
\ No newline at end of file
+Name:Floodpits Drowner
+ManaCost:1 U
+Types:Creature Merfolk
+PT:2/1
+K:Flash
+K:Vigilance
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap target creature an opponent controls and put a stun counter on it.
+SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | SubAbility$ DBCounter
+SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1
+A:AB$ ChangeZone | Cost$ 1 U T | ValidTgts$ Creature.counters_GE1_STUN | TgtPrompt$ Select target creature with a stun counter on it | ThisDefinedAndTgts$ Self | Origin$ Battlefield | Destination$ Library | Shuffle$ True | SpellDescription$ Shuffle CARDNAME and target creature with a stun counter on it into their owners' libraries.
+Oracle:Flash\nVigilance\nWhen Floodpits Drowner enters, tap target creature an opponent controls and put a stun counter on it.\n{1}{U}, {T}: Shuffle Floodpits Drowner and target creature with a stun counter on it into their owners' libraries.
diff --git a/forge-gui/res/cardsfolder/upcoming/formless_genesis.txt b/forge-gui/res/cardsfolder/upcoming/formless_genesis.txt
index 7da27839954..2588b71d67d 100644
--- a/forge-gui/res/cardsfolder/upcoming/formless_genesis.txt
+++ b/forge-gui/res/cardsfolder/upcoming/formless_genesis.txt
@@ -1,9 +1,9 @@
-Name:Formless Genesis
-ManaCost:2 G
-Types:Kindred Sorcery Shapeshifter
-K:Changeling
-A:SP$ Token | TokenAmount$ 1 | TokenScript$ c_x_x_shapeshifter_changeling_deathtouch | TokenOwner$ You | TokenPower$ X | TokenToughness$ X | SpellDescription$ Create an X/X colorless Shapeshifter creature token with changeling and deathtouch, where X is the number of land cards in your graveyard.
-K:Retrace
-SVar:X:Count$TypeInYourYard.Land
-DeckHas:Ability$Token
-Oracle:Changeling (This card is every creature type.)\nCreate an X/X colorless Shapeshifter creature token with changeling and deathtouch, where X is the number of land cards in your graveyard.\nRetrace (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
\ No newline at end of file
+Name:Formless Genesis
+ManaCost:2 G
+Types:Kindred Sorcery Shapeshifter
+K:Changeling
+A:SP$ Token | TokenAmount$ 1 | TokenScript$ c_x_x_shapeshifter_changeling_deathtouch | TokenOwner$ You | TokenPower$ X | TokenToughness$ X | SpellDescription$ Create an X/X colorless Shapeshifter creature token with changeling and deathtouch, where X is the number of land cards in your graveyard.
+K:Retrace
+SVar:X:Count$TypeInYourYard.Land
+DeckHas:Ability$Token
+Oracle:Changeling (This card is every creature type.)\nCreate an X/X colorless Shapeshifter creature token with changeling and deathtouch, where X is the number of land cards in your graveyard.\nRetrace (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
diff --git a/forge-gui/res/cardsfolder/upcoming/found_footage.txt b/forge-gui/res/cardsfolder/upcoming/found_footage.txt
index 48ff65e9b8b..470d8d71c26 100644
--- a/forge-gui/res/cardsfolder/upcoming/found_footage.txt
+++ b/forge-gui/res/cardsfolder/upcoming/found_footage.txt
@@ -1,7 +1,7 @@
-Name:Found Footage
-ManaCost:1
-Types:Artifact Clue
-S:Mode$ Continuous | Affected$ Creature.faceDown+OppCtrl | AffectedZone$ Battlefield | MayLookAt$ You | Description$ You may look at face-down creatures your opponents control any time.
-A:AB$ Surveil | Cost$ 2 Sac<1/CARDNAME> | Amount$ 2 | SubAbility$ DBDraw | SpellDescription$ Surveil 2, then draw a card. (To 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:DBDraw:DB$ Draw
-Oracle:You may look at face-down creatures your opponents control any time.\n{2}, Sacrifice Found Footage: Surveil 2, then draw a card. (To 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
+Name:Found Footage
+ManaCost:1
+Types:Artifact Clue
+S:Mode$ Continuous | Affected$ Creature.faceDown+OppCtrl | AffectedZone$ Battlefield | MayLookAt$ You | Description$ You may look at face-down creatures your opponents control any time.
+A:AB$ Surveil | Cost$ 2 Sac<1/CARDNAME> | Amount$ 2 | SubAbility$ DBDraw | SpellDescription$ Surveil 2, then draw a card. (To 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:DBDraw:DB$ Draw
+Oracle:You may look at face-down creatures your opponents control any time.\n{2}, Sacrifice Found Footage: Surveil 2, then draw a card. (To 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.)
diff --git a/forge-gui/res/cardsfolder/upcoming/frantic_strength.txt b/forge-gui/res/cardsfolder/upcoming/frantic_strength.txt
index f33fb5f2a14..0d742345208 100644
--- a/forge-gui/res/cardsfolder/upcoming/frantic_strength.txt
+++ b/forge-gui/res/cardsfolder/upcoming/frantic_strength.txt
@@ -1,8 +1,8 @@
-Name:Frantic Strength
-ManaCost:2 G
-Types:Enchantment Aura
-K:Flash
-K:Enchant creature
-A:SP$ Attach | Cost$ 2 G | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Trample | Description$ Enchanted creature gets +2/+2 and has trample.
-Oracle:Flash\nEnchant creature\nEnchanted creature gets +2/+2 and has trample.
\ No newline at end of file
+Name:Frantic Strength
+ManaCost:2 G
+Types:Enchantment Aura
+K:Flash
+K:Enchant creature
+A:SP$ Attach | Cost$ 2 G | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Trample | Description$ Enchanted creature gets +2/+2 and has trample.
+Oracle:Flash\nEnchant creature\nEnchanted creature gets +2/+2 and has trample.
diff --git a/forge-gui/res/cardsfolder/upcoming/friendly_ghost.txt b/forge-gui/res/cardsfolder/upcoming/friendly_ghost.txt
index af846ae2e34..b5ebed7529c 100644
--- a/forge-gui/res/cardsfolder/upcoming/friendly_ghost.txt
+++ b/forge-gui/res/cardsfolder/upcoming/friendly_ghost.txt
@@ -1,9 +1,9 @@
-Name:Friendly Ghost
-ManaCost:3 W
-Types:Creature Spirit
-PT:2/4
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature gets +2/+4 until end of turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 2 | NumDef$ 4
-SVar:PlayMain1:TRUE
-Oracle:Flying\nWhen Friendly Spirit enters, target creature gets +2/+4 until end of turn.
\ No newline at end of file
+Name:Friendly Ghost
+ManaCost:3 W
+Types:Creature Spirit
+PT:2/4
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature gets +2/+4 until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 2 | NumDef$ 4
+SVar:PlayMain1:TRUE
+Oracle:Flying\nWhen Friendly Spirit enters, target creature gets +2/+4 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/friendly_teddy.txt b/forge-gui/res/cardsfolder/upcoming/friendly_teddy.txt
index 28d409da95f..5ee1f9d194e 100644
--- a/forge-gui/res/cardsfolder/upcoming/friendly_teddy.txt
+++ b/forge-gui/res/cardsfolder/upcoming/friendly_teddy.txt
@@ -1,7 +1,7 @@
-Name:Friendly Teddy
-ManaCost:2
-Types:Artifact Creature Bear Toy
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, each player draws a card.
-SVar:TrigDraw:DB$ Draw | Defined$ Player
-Oracle:When Friendly Teddy dies, each player draws a card.
\ No newline at end of file
+Name:Friendly Teddy
+ManaCost:2
+Types:Artifact Creature Bear Toy
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, each player draws a card.
+SVar:TrigDraw:DB$ Draw | Defined$ Player
+Oracle:When Friendly Teddy dies, each player draws a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/ghost_vacuum.txt b/forge-gui/res/cardsfolder/upcoming/ghost_vacuum.txt
index 2f613942c95..8c179257936 100644
--- a/forge-gui/res/cardsfolder/upcoming/ghost_vacuum.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ghost_vacuum.txt
@@ -1,8 +1,8 @@
-Name:Ghost Vacuum
-ManaCost:1
-Types:Artifact
-A:AB$ ChangeZone | Cost$ T | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
-A:AB$ ChangeZoneAll | Cost$ 6 T Sac<1/CARDNAME> | ChangeType$ Creature.ExiledWithSource | Origin$ Exile | Destination$ Battlefield | GainControl$ True | SorcerySpeed$ True | WithCountersType$ Flying | AnimateSubAbility$ DBAnimate | SpellDescription$ Put each creature card exiled with CARDNAME onto the battlefield under your control with a flying counter on it. Each of them is a 1/1 Spirit in addition to its other types. Activate only as a sorcery.
-SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Power$ 1 | Toughness$ 1 | Types$ Spirit | Duration$ Permanent
-DeckHas:Ability$Counters
-Oracle:{T}: Exile target card from a graveyard.\n{6}, {T}, Sacrifice Ghost Vacuum: Put each creature card exiled with Ghost Vacuum onto the battlefield under your control with a flying counter on it. Each of them is a 1/1 Spirit in addition to its other types. Activate only as a sorcery.
\ No newline at end of file
+Name:Ghost Vacuum
+ManaCost:1
+Types:Artifact
+A:AB$ ChangeZone | Cost$ T | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
+A:AB$ ChangeZoneAll | Cost$ 6 T Sac<1/CARDNAME> | ChangeType$ Creature.ExiledWithSource | Origin$ Exile | Destination$ Battlefield | GainControl$ True | SorcerySpeed$ True | WithCountersType$ Flying | AnimateSubAbility$ DBAnimate | SpellDescription$ Put each creature card exiled with CARDNAME onto the battlefield under your control with a flying counter on it. Each of them is a 1/1 Spirit in addition to its other types. Activate only as a sorcery.
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Power$ 1 | Toughness$ 1 | Types$ Spirit | Duration$ Permanent
+DeckHas:Ability$Counters
+Oracle:{T}: Exile target card from a graveyard.\n{6}, {T}, Sacrifice Ghost Vacuum: Put each creature card exiled with Ghost Vacuum onto the battlefield under your control with a flying counter on it. Each of them is a 1/1 Spirit in addition to its other types. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/giggling_skitterspike.txt b/forge-gui/res/cardsfolder/upcoming/giggling_skitterspike.txt
index abd8dd70f86..93081ba58cb 100644
--- a/forge-gui/res/cardsfolder/upcoming/giggling_skitterspike.txt
+++ b/forge-gui/res/cardsfolder/upcoming/giggling_skitterspike.txt
@@ -1,14 +1,14 @@
-Name:Giggling Skitterspike
-ManaCost:4
-Types:Artifact Creature Toy
-PT:1/1
-K:Indestructible
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME attacks, blocks, or becomes the target of a spell, it deals damage equal to its power to each opponent.
-T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigDealDamage | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks, blocks, or becomes the target of a spell, it deals damage equal to its power to each opponent.
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigDealDamage | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks, blocks, or becomes the target of a spell, it deals damage equal to its power to each opponent.
-SVar:TrigDealDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ X
-K:Monstrosity:5:5
-SVar:X:Count$CardPower
-SVar:HasAttackEffect:TRUE
-SVar:HasBlockEffect:TRUE
-Oracle:Indestructible\nWhenever Giggling Skitterspike attacks, blocks, or becomes the target of a spell, it deals damage equal to its power to each opponent.\n{5}: Monstrosity 5. (If this creature isn't monstrous, put five +1/+1 counters on it and it becomes monstrous.)
\ No newline at end of file
+Name:Giggling Skitterspike
+ManaCost:4
+Types:Artifact Creature Toy
+PT:1/1
+K:Indestructible
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME attacks, blocks, or becomes the target of a spell, it deals damage equal to its power to each opponent.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigDealDamage | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks, blocks, or becomes the target of a spell, it deals damage equal to its power to each opponent.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigDealDamage | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks, blocks, or becomes the target of a spell, it deals damage equal to its power to each opponent.
+SVar:TrigDealDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ X
+K:Monstrosity:5:5
+SVar:X:Count$CardPower
+SVar:HasAttackEffect:TRUE
+SVar:HasBlockEffect:TRUE
+Oracle:Indestructible\nWhenever Giggling Skitterspike attacks, blocks, or becomes the target of a spell, it deals damage equal to its power to each opponent.\n{5}: Monstrosity 5. (If this creature isn't monstrous, put five +1/+1 counters on it and it becomes monstrous.)
diff --git a/forge-gui/res/cardsfolder/upcoming/give_in_to_violence.txt b/forge-gui/res/cardsfolder/upcoming/give_in_to_violence.txt
index 636adf40f6b..5433562e2d1 100644
--- a/forge-gui/res/cardsfolder/upcoming/give_in_to_violence.txt
+++ b/forge-gui/res/cardsfolder/upcoming/give_in_to_violence.txt
@@ -1,5 +1,5 @@
-Name:Give In to Violence
-ManaCost:1 B
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | KW$ Lifelink | SpellDescription$ Target creature gets +2/+2 and gains lifelink until end of turn.
-Oracle:Target creature gets +2/+2 and gains lifelink until end of turn.
\ No newline at end of file
+Name:Give In to Violence
+ManaCost:1 B
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | KW$ Lifelink | SpellDescription$ Target creature gets +2/+2 and gains lifelink until end of turn.
+Oracle:Target creature gets +2/+2 and gains lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/gleeful_arsonist.txt b/forge-gui/res/cardsfolder/upcoming/gleeful_arsonist.txt
index e1ab6cb5198..7e297ad784e 100644
--- a/forge-gui/res/cardsfolder/upcoming/gleeful_arsonist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gleeful_arsonist.txt
@@ -1,9 +1,9 @@
-Name:Gleeful Arsonist
-ManaCost:2 R
-Types:Creature Human Wizard
-PT:1/2
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever an opponent casts a noncreature spell, CARDNAME deals damage equal to its power to that player.
-SVar:TrigDealDamage:DB$ DealDamage | Defined$ TriggeredActivator | NumDmg$ X
-K:Undying
-SVar:X:Count$CardPower
-Oracle:Whenever an opponent casts a noncreature spell, Gleeful Arsonist deals damage equal to its power to that player.\nUndying (When this creature dies, if it had no +1/+1 counters on it, return it to the battlefield under its owner's control with a +1/+1 counter on it.)
+Name:Gleeful Arsonist
+ManaCost:2 R
+Types:Creature Human Wizard
+PT:1/2
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever an opponent casts a noncreature spell, CARDNAME deals damage equal to its power to that player.
+SVar:TrigDealDamage:DB$ DealDamage | Defined$ TriggeredActivator | NumDmg$ X
+K:Undying
+SVar:X:Count$CardPower
+Oracle:Whenever an opponent casts a noncreature spell, Gleeful Arsonist deals damage equal to its power to that player.\nUndying (When this creature dies, if it had no +1/+1 counters on it, return it to the battlefield under its owner's control with a +1/+1 counter on it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/glimmer_seeker.txt b/forge-gui/res/cardsfolder/upcoming/glimmer_seeker.txt
index ee4f65569b4..323b180c432 100644
--- a/forge-gui/res/cardsfolder/upcoming/glimmer_seeker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/glimmer_seeker.txt
@@ -1,10 +1,10 @@
-Name:Glimmer Seeker
-ManaCost:2 W
-Types:Creature Human Survivor
-PT:3/3
-T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You |  PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigBranch | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, draw a card if you control a Glimmer creature. If you don't control a Glimmer creature, create a 1/1 white Glimmer enchantment creature token.
-SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ DBDraw | FalseSubAbility$ DBToken
-SVar:DBDraw:DB$ Draw
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_e_glimmer | TokenOwner$ You
-SVar:X:Count$Valid Creature.Glimmer+YouCtrl
-Oracle:Survival — At the beginning of your second main phase, if Glimmer Seeker is tapped, draw a card if you control a Glimmer creature. If you don't control a Glimmer creature, create a 1/1 white Glimmer enchantment creature token.
+Name:Glimmer Seeker
+ManaCost:2 W
+Types:Creature Human Survivor
+PT:3/3
+T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigBranch | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, draw a card if you control a Glimmer creature. If you don't control a Glimmer creature, create a 1/1 white Glimmer enchantment creature token.
+SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ DBDraw | FalseSubAbility$ DBToken
+SVar:DBDraw:DB$ Draw
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_e_glimmer | TokenOwner$ You
+SVar:X:Count$Valid Creature.Glimmer+YouCtrl
+Oracle:Survival — At the beginning of your second main phase, if Glimmer Seeker is tapped, draw a card if you control a Glimmer creature. If you don't control a Glimmer creature, create a 1/1 white Glimmer enchantment creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/glimmerburst.txt b/forge-gui/res/cardsfolder/upcoming/glimmerburst.txt
index 6df76a5b4fe..8ca78482e1e 100644
--- a/forge-gui/res/cardsfolder/upcoming/glimmerburst.txt
+++ b/forge-gui/res/cardsfolder/upcoming/glimmerburst.txt
@@ -1,6 +1,6 @@
-Name:Glimmerburst
-ManaCost:3 U
-Types:Instant
-A:SP$ Draw | NumCards$ 2 | SubAbility$ DBToken | SpellDescription$ Draw two cards. Create a 1/1 white Glimmer enchantment creature token.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_e_glimmer | TokenOwner$ You
-Oracle:Draw two cards. Create a 1/1 white Glimmer enchantment creature token.
+Name:Glimmerburst
+ManaCost:3 U
+Types:Instant
+A:SP$ Draw | NumCards$ 2 | SubAbility$ DBToken | SpellDescription$ Draw two cards. Create a 1/1 white Glimmer enchantment creature token.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_e_glimmer | TokenOwner$ You
+Oracle:Draw two cards. Create a 1/1 white Glimmer enchantment creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/glimmerlight.txt b/forge-gui/res/cardsfolder/upcoming/glimmerlight.txt
index 29bc4020069..934f229e86d 100644
--- a/forge-gui/res/cardsfolder/upcoming/glimmerlight.txt
+++ b/forge-gui/res/cardsfolder/upcoming/glimmerlight.txt
@@ -1,8 +1,8 @@
-Name:Glimmerlight
-ManaCost:2
-Types:Artifact Equipment
-K:Equip:1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 white Glimmer enchantment creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_e_glimmer | TokenOwner$ You
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Equipped creature gets +1/+1.
-Oracle:When Glimmerlight enters, create a 1/1 white Glimmer enchantment creature token.\nEquipped creature gets +1/+1.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file
+Name:Glimmerlight
+ManaCost:2
+Types:Artifact Equipment
+K:Equip:1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 white Glimmer enchantment creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_e_glimmer | TokenOwner$ You
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Equipped creature gets +1/+1.
+Oracle:When Glimmerlight enters, create a 1/1 white Glimmer enchantment creature token.\nEquipped creature gets +1/+1.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/upcoming/glitch_interpreter.txt b/forge-gui/res/cardsfolder/upcoming/glitch_interpreter.txt
index a6c48738b0d..0bfe4fffef6 100644
--- a/forge-gui/res/cardsfolder/upcoming/glitch_interpreter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/glitch_interpreter.txt
@@ -1,11 +1,11 @@
-Name:Glitch Interpreter
-ManaCost:2 U
-Types:Creature Human Wizard
-PT:2/3
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | IsPresent$ Permanent.faceDown+YouCtrl | PresentCompare$ EQ0 | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, if you control no face-down permanents, return CARDNAME to its owner's hand and manifest dread.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBDread
-SVar:DBDread:DB$ ManifestDread
-T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.Colorless+YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | Execute$ TrigDraw | TriggerDescription$ Whenever one or more colorless creatures you control deal combat damage to a player, draw a card.
-SVar:TrigDraw:DB$ Draw
-SVar:PlayMain1:TRUE
-Oracle:When Glitch Interpreter enters, if you control no face-down permanents, return Glitch Interpreter to its owner's hand and manifest dread.\nWhenever one or more colorless creatures you control deal combat damage to a player, draw a card.
+Name:Glitch Interpreter
+ManaCost:2 U
+Types:Creature Human Wizard
+PT:2/3
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | IsPresent$ Permanent.faceDown+YouCtrl | PresentCompare$ EQ0 | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, if you control no face-down permanents, return CARDNAME to its owner's hand and manifest dread.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBDread
+SVar:DBDread:DB$ ManifestDread
+T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.Colorless+YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | Execute$ TrigDraw | TriggerDescription$ Whenever one or more colorless creatures you control deal combat damage to a player, draw a card.
+SVar:TrigDraw:DB$ Draw
+SVar:PlayMain1:TRUE
+Oracle:When Glitch Interpreter enters, if you control no face-down permanents, return Glitch Interpreter to its owner's hand and manifest dread.\nWhenever one or more colorless creatures you control deal combat damage to a player, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/gloomlake_verge.txt b/forge-gui/res/cardsfolder/upcoming/gloomlake_verge.txt
index 65fc3416813..e90d6d26ecf 100644
--- a/forge-gui/res/cardsfolder/upcoming/gloomlake_verge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gloomlake_verge.txt
@@ -1,6 +1,6 @@
-Name:Gloomlake Verge
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
-A:AB$ Mana | Cost$ T | Produced$ B | IsPresent$ Island.YouCtrl,Swamp.YouCtrl | SpellDescription$ Add {B}. Activate only if you control an Island or a Swamp.
-Oracle:{T}: Add {U}.\n{T}: Add {B}. Activate only if you control an Island or a Swamp.
\ No newline at end of file
+Name:Gloomlake Verge
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | IsPresent$ Island.YouCtrl,Swamp.YouCtrl | SpellDescription$ Add {B}. Activate only if you control an Island or a Swamp.
+Oracle:{T}: Add {U}.\n{T}: Add {B}. Activate only if you control an Island or a Swamp.
diff --git a/forge-gui/res/cardsfolder/upcoming/grab_the_prize.txt b/forge-gui/res/cardsfolder/upcoming/grab_the_prize.txt
index db76e4a1188..e32f0980411 100644
--- a/forge-gui/res/cardsfolder/upcoming/grab_the_prize.txt
+++ b/forge-gui/res/cardsfolder/upcoming/grab_the_prize.txt
@@ -1,9 +1,9 @@
-Name:Grab the Prize
-ManaCost:1 R
-Types:Sorcery
-A:SP$ Draw | Cost$ 1 R Discard<1/Card> | CostDesc$ As an additional cost to cast this spell, discard a card. | NumCards$ 2 | SubAbility$ DBDealDamage | SpellDescription$ Draw two cards. If the discarded card wasn't a land card, CARDNAME deals 2 damage to each opponent.
-SVar:DBDealDamage:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ X
-SVar:X:Discarded$Valid Card.nonLand/Times.2
-DeckHas:Ability$Discard
-DeckHints:Keyword$Madness & Ability$Delirium
-Oracle:As an additional cost to cast this spell, discard a card.\nDraw two cards. If the discarded card wasn't a land card, Grab the Prize deals 2 damage to each opponent.
+Name:Grab the Prize
+ManaCost:1 R
+Types:Sorcery
+A:SP$ Draw | Cost$ 1 R Discard<1/Card> | CostDesc$ As an additional cost to cast this spell, discard a card. | NumCards$ 2 | SubAbility$ DBDealDamage | SpellDescription$ Draw two cards. If the discarded card wasn't a land card, CARDNAME deals 2 damage to each opponent.
+SVar:DBDealDamage:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ X
+SVar:X:Discarded$Valid Card.nonLand/Times.2
+DeckHas:Ability$Discard
+DeckHints:Keyword$Madness & Ability$Delirium
+Oracle:As an additional cost to cast this spell, discard a card.\nDraw two cards. If the discarded card wasn't a land card, Grab the Prize deals 2 damage to each opponent.
diff --git a/forge-gui/res/cardsfolder/upcoming/grasping_longneck.txt b/forge-gui/res/cardsfolder/upcoming/grasping_longneck.txt
index 4f299a711d8..d3f1da16589 100644
--- a/forge-gui/res/cardsfolder/upcoming/grasping_longneck.txt
+++ b/forge-gui/res/cardsfolder/upcoming/grasping_longneck.txt
@@ -1,8 +1,8 @@
-Name:Grasping Longneck
-ManaCost:2 G
-Types:Enchantment Creature Horror
-PT:4/2
-K:Reach
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME dies, you gain 2 life.
-SVar:TrigSac:DB$ GainLife | Defined$ TriggeredCardController | LifeAmount$ 2
-Oracle:Reach\nWhen Grasping Longneck dies, you gain 2 life.
\ No newline at end of file
+Name:Grasping Longneck
+ManaCost:2 G
+Types:Enchantment Creature Horror
+PT:4/2
+K:Reach
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME dies, you gain 2 life.
+SVar:TrigSac:DB$ GainLife | Defined$ TriggeredCardController | LifeAmount$ 2
+Oracle:Reach\nWhen Grasping Longneck dies, you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/gremlin_tamer.txt b/forge-gui/res/cardsfolder/upcoming/gremlin_tamer.txt
index b506a000815..c0665c22fe9 100644
--- a/forge-gui/res/cardsfolder/upcoming/gremlin_tamer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gremlin_tamer.txt
@@ -1,10 +1,10 @@
-Name:Gremlin Tamer
-ManaCost:W U
-Types:Creature Human Scout
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, create a 1/1 red Gremlin creature token.
-T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, create a 1/1 red Gremlin creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_1_1_gremlin | TokenOwner$ You
-DeckHas:Ability$Token
-DeckNeeds:Type$Enchantment
-Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, create a 1/1 red Gremlin creature token.
+Name:Gremlin Tamer
+ManaCost:W U
+Types:Creature Human Scout
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, create a 1/1 red Gremlin creature token.
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, create a 1/1 red Gremlin creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_1_1_gremlin | TokenOwner$ You
+DeckHas:Ability$Token
+DeckNeeds:Type$Enchantment
+Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, create a 1/1 red Gremlin creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/grievous_wound.txt b/forge-gui/res/cardsfolder/upcoming/grievous_wound.txt
index 1f42f46a3d4..9a2a5a21064 100644
--- a/forge-gui/res/cardsfolder/upcoming/grievous_wound.txt
+++ b/forge-gui/res/cardsfolder/upcoming/grievous_wound.txt
@@ -1,10 +1,10 @@
-Name:Grievous Wound
-ManaCost:3 B B
-Types:Enchantment Aura
-K:Enchant player
-A:SP$ Attach | Cost$ 3 B B | ValidTgts$ Player | AILogic$ Curse
-S:Mode$ CantGainLife | ValidPlayer$ Player.EnchantedBy | Description$ Enchanted player can't gain life.
-T:Mode$ DamageDoneOnce | Execute$ TrigLoseLife | ValidTarget$ Player.EnchantedBy | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted player is dealt damage, they lose half their life, rounded up.
-SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredTarget | LifeAmount$ X
-SVar:X:TriggeredTarget$LifeTotal/HalfUp
-Oracle:Enchant player\nEnchanted player can't gain life.\nWhenever enchanted player is dealt damage, they lose half their life, rounded up.
+Name:Grievous Wound
+ManaCost:3 B B
+Types:Enchantment Aura
+K:Enchant player
+A:SP$ Attach | Cost$ 3 B B | ValidTgts$ Player | AILogic$ Curse
+S:Mode$ CantGainLife | ValidPlayer$ Player.EnchantedBy | Description$ Enchanted player can't gain life.
+T:Mode$ DamageDoneOnce | Execute$ TrigLoseLife | ValidTarget$ Player.EnchantedBy | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted player is dealt damage, they lose half their life, rounded up.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredTarget | LifeAmount$ X
+SVar:X:TriggeredTarget$LifeTotal/HalfUp
+Oracle:Enchant player\nEnchanted player can't gain life.\nWhenever enchanted player is dealt damage, they lose half their life, rounded up.
diff --git a/forge-gui/res/cardsfolder/upcoming/growing_dread.txt b/forge-gui/res/cardsfolder/upcoming/growing_dread.txt
index 316bab998d3..527ad886183 100644
--- a/forge-gui/res/cardsfolder/upcoming/growing_dread.txt
+++ b/forge-gui/res/cardsfolder/upcoming/growing_dread.txt
@@ -1,9 +1,9 @@
-Name:Growing Dread
-ManaCost:G U
-Types:Enchantment
-K:Flash
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
-SVar:TrigDread:DB$ ManifestDread
-T:Mode$ TurnFaceUp | ValidCard$ Permanent | ValidCause$ SpellAbility.YouCtrl | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you turn a permanent face up, put a +1/+1 counter on it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1
-Oracle:Flash\nWhen Growing Dread enters, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)\nWhenever you turn a permanent face up, put a +1/+1 counter on it.
\ No newline at end of file
+Name:Growing Dread
+ManaCost:G U
+Types:Enchantment
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+SVar:TrigDread:DB$ ManifestDread
+T:Mode$ TurnFaceUp | ValidCard$ Permanent | ValidCause$ SpellAbility.YouCtrl | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you turn a permanent face up, put a +1/+1 counter on it.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1
+Oracle:Flash\nWhen Growing Dread enters, manifest dread. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)\nWhenever you turn a permanent face up, put a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/hand_that_feeds.txt b/forge-gui/res/cardsfolder/upcoming/hand_that_feeds.txt
index fa4a1c99abf..23a6035504c 100644
--- a/forge-gui/res/cardsfolder/upcoming/hand_that_feeds.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hand_that_feeds.txt
@@ -1,10 +1,10 @@
-Name:Hand That Feeds
-ManaCost:1 R
-Types:Creature Mutant
-PT:2/2
-T:Mode$ Attacks | ValidCard$ Card.Self | Delirium$ True | Execute$ TrigPump | NoResolvingCheck$ True | TriggerDescription$ Delirium — Whenever CARDNAME attacks while there are four or more card types among cards in your graveyard, it gets +2/+0 and gains menace until end of turn. (It can't be blocked except by two or more creatures.)
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | KW$ Menace
-SVar:HasAttackEffect:TRUE
-DeckHints:Ability$Graveyard|Discard
-DeckHas:Ability$Delirium
-Oracle:Delirium — Whenever Hand That Feeds attacks while there are four or more card types among cards in your graveyard, it gets +2/+0 and gains menace until end of turn. (It can't be blocked except by two or more creatures.)
\ No newline at end of file
+Name:Hand That Feeds
+ManaCost:1 R
+Types:Creature Mutant
+PT:2/2
+T:Mode$ Attacks | ValidCard$ Card.Self | Delirium$ True | Execute$ TrigPump | NoResolvingCheck$ True | TriggerDescription$ Delirium — Whenever CARDNAME attacks while there are four or more card types among cards in your graveyard, it gets +2/+0 and gains menace until end of turn. (It can't be blocked except by two or more creatures.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | KW$ Menace
+SVar:HasAttackEffect:TRUE
+DeckHints:Ability$Graveyard|Discard
+DeckHas:Ability$Delirium
+Oracle:Delirium — Whenever Hand That Feeds attacks while there are four or more card types among cards in your graveyard, it gets +2/+0 and gains menace until end of turn. (It can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/upcoming/hardened_escort.txt b/forge-gui/res/cardsfolder/upcoming/hardened_escort.txt
index edc1a133a00..db6048a60a1 100644
--- a/forge-gui/res/cardsfolder/upcoming/hardened_escort.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hardened_escort.txt
@@ -1,8 +1,8 @@
-Name:Hardened Escort
-ManaCost:2 W
-Types:Creature Human Soldier
-PT:2/4
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, another target creature you control gets +1/+0 and gains indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | KW$ Indestructible | NumAtt$ +1
-SVar:HasAttackEffect:TRUE
-Oracle:Trample\nWhenever Hardened Escort attacks, another target creature you control gets +1/+0 and gains indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
\ No newline at end of file
+Name:Hardened Escort
+ManaCost:2 W
+Types:Creature Human Soldier
+PT:2/4
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, another target creature you control gets +1/+0 and gains indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | KW$ Indestructible | NumAtt$ +1
+SVar:HasAttackEffect:TRUE
+Oracle:Trample\nWhenever Hardened Escort attacks, another target creature you control gets +1/+0 and gains indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/haunted_screen.txt b/forge-gui/res/cardsfolder/upcoming/haunted_screen.txt
index 7ed32c81c8c..9d18c6d98c1 100644
--- a/forge-gui/res/cardsfolder/upcoming/haunted_screen.txt
+++ b/forge-gui/res/cardsfolder/upcoming/haunted_screen.txt
@@ -1,8 +1,8 @@
-Name:Haunted Screen
-ManaCost:3
-Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ Combo W B | SpellDescription$ Add {W} or {B}.
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Combo G U R | SpellDescription$ Add {G}, {U}, or {R}.
-A:AB$ PutCounter | Cost$ 7 | CounterType$ P1P1 | CounterNum$ 7 | SubAbility$ DBAnimate | GameActivationLimit$ 1 | SpellDescription$ Put seven +1/+1 counters on CARDNAME. It becomes a 0/0 Spirit creature in addition to its other types. Activate only once.
-SVar:DBAnimate:DB$ Animate | Defined$ Self | Power$ 0 | Toughness$ 0 | Types$ Creature,Spirit | Duration$ Permanent
-Oracle:{T}: Add {W} or {B}.\n{T}, Pay 1 life: Add {G}, {U}, or {R}.\n{7}: Put seven +1/+1 counters on Haunted Screen. It becomes a 0/0 Spirit creature in addition to its other types. Activate only once.
+Name:Haunted Screen
+ManaCost:3
+Types:Artifact
+A:AB$ Mana | Cost$ T | Produced$ Combo W B | SpellDescription$ Add {W} or {B}.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Combo G U R | SpellDescription$ Add {G}, {U}, or {R}.
+A:AB$ PutCounter | Cost$ 7 | CounterType$ P1P1 | CounterNum$ 7 | SubAbility$ DBAnimate | GameActivationLimit$ 1 | SpellDescription$ Put seven +1/+1 counters on CARDNAME. It becomes a 0/0 Spirit creature in addition to its other types. Activate only once.
+SVar:DBAnimate:DB$ Animate | Defined$ Self | Power$ 0 | Toughness$ 0 | Types$ Creature,Spirit | Duration$ Permanent
+Oracle:{T}: Add {W} or {B}.\n{T}, Pay 1 life: Add {G}, {U}, or {R}.\n{7}: Put seven +1/+1 counters on Haunted Screen. It becomes a 0/0 Spirit creature in addition to its other types. Activate only once.
diff --git a/forge-gui/res/cardsfolder/upcoming/hedge_shredder.txt b/forge-gui/res/cardsfolder/upcoming/hedge_shredder.txt
index a41d1816568..66f83cbe73f 100644
--- a/forge-gui/res/cardsfolder/upcoming/hedge_shredder.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hedge_shredder.txt
@@ -1,10 +1,10 @@
-Name:Hedge Shredder
-ManaCost:2 G G
-Types:Artifact Vehicle
-PT:5/5
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME attacks, you may mill two cards.
-SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You | Optional$ True
-T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn | Origin$ Library | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigChangeZoneAll | TriggerDescription$ Whenever one or more land cards are put into your graveyard from your library, put them onto the battlefield tapped.
-SVar:TrigChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Card.TriggeredCards | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True
-K:Crew:1
-Oracle:Whenever Hedge Shredder attacks, you may mill two cards.\nWhenever one or more land cards are put into your graveyard from your library, put them onto the battlefield tapped.\nCrew 1 (Tap any number of creatures you control with total power 1 or more: This Vehicle becomes an artifact creature until end of turn.)
\ No newline at end of file
+Name:Hedge Shredder
+ManaCost:2 G G
+Types:Artifact Vehicle
+PT:5/5
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME attacks, you may mill two cards.
+SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You | Optional$ True
+T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn | Origin$ Library | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigChangeZoneAll | TriggerDescription$ Whenever one or more land cards are put into your graveyard from your library, put them onto the battlefield tapped.
+SVar:TrigChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Card.TriggeredCards | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True
+K:Crew:1
+Oracle:Whenever Hedge Shredder attacks, you may mill two cards.\nWhenever one or more land cards are put into your graveyard from your library, put them onto the battlefield tapped.\nCrew 1 (Tap any number of creatures you control with total power 1 or more: This Vehicle becomes an artifact creature until end of turn.)
diff --git a/forge-gui/res/cardsfolder/upcoming/horrid_vigor.txt b/forge-gui/res/cardsfolder/upcoming/horrid_vigor.txt
index 8209d006f98..a802ec3408f 100644
--- a/forge-gui/res/cardsfolder/upcoming/horrid_vigor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/horrid_vigor.txt
@@ -1,6 +1,6 @@
-Name:Horrid Vigor
-ManaCost:1 G
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | KW$ Deathtouch & Indestructible | SpellDescription$ Target creature gains deathtouch and indestructible until end of turn.
-DeckHas:Keyword$Deathtouch|Indestructible
-Oracle:Target creature gains deathtouch and indestructible until end of turn.
\ No newline at end of file
+Name:Horrid Vigor
+ManaCost:1 G
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | KW$ Deathtouch & Indestructible | SpellDescription$ Target creature gains deathtouch and indestructible until end of turn.
+DeckHas:Keyword$Deathtouch|Indestructible
+Oracle:Target creature gains deathtouch and indestructible until end of turn.