diff --git a/forge-gui/res/cardsfolder/upcoming/balamb_garden_seed_academy_balamb_garden_airborne.txt b/forge-gui/res/cardsfolder/upcoming/balamb_garden_seed_academy_balamb_garden_airborne.txt
index b3509200f9c..b199203ef67 100644
--- a/forge-gui/res/cardsfolder/upcoming/balamb_garden_seed_academy_balamb_garden_airborne.txt
+++ b/forge-gui/res/cardsfolder/upcoming/balamb_garden_seed_academy_balamb_garden_airborne.txt
@@ -20,4 +20,4 @@ K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever NICKNAME attacks, draw a card.
 SVar:TrigDraw:DB$ Draw
 K:Crew:1
-Oracle:Flying\nWhenever Balamb Garden attacks, draw a card.\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
+Oracle:Flying\nWhenever Balamb Garden attacks, draw a card.\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/baron_airship_kingdom.txt b/forge-gui/res/cardsfolder/upcoming/baron_airship_kingdom.txt
index 4bb914f07a8..e01c8a09f17 100644
--- a/forge-gui/res/cardsfolder/upcoming/baron_airship_kingdom.txt
+++ b/forge-gui/res/cardsfolder/upcoming/baron_airship_kingdom.txt
@@ -4,4 +4,4 @@ Types:Land Town
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ Combo U R | SpellDescription$ Add {U} or {R}.
-Oracle:This land enters tapped.\n{T}: Add {U} or {R}. 
+Oracle:This land enters tapped.\n{T}: Add {U} or {R}.
diff --git a/forge-gui/res/cardsfolder/upcoming/cargo_ship.txt b/forge-gui/res/cardsfolder/upcoming/cargo_ship.txt
index fea7b2989ef..308fcf0f269 100644
--- a/forge-gui/res/cardsfolder/upcoming/cargo_ship.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cargo_ship.txt
@@ -6,4 +6,4 @@ K:Flying
 K:Vigilance
 A:AB$ Mana | Cost$ T | Produced$ C | RestrictValid$ Spell.Artifact,Activated.Artifact | SpellDescription$ Add {C}. Spend this mana only to cast an artifact spell or activate an ability of an artifact source.
 K:Crew:1
-Oracle:Flying, vigilance\n{T}: Add {C}. Spend this mana only to cast an artifact spell or activate an ability of an artifact source.\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
+Oracle:Flying, vigilance\n{T}: Add {C}. Spend this mana only to cast an artifact spell or activate an ability of an artifact source.\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/clives_hideaway.txt b/forge-gui/res/cardsfolder/upcoming/clives_hideaway.txt
index 9d9e20521b4..b176836e037 100644
--- a/forge-gui/res/cardsfolder/upcoming/clives_hideaway.txt
+++ b/forge-gui/res/cardsfolder/upcoming/clives_hideaway.txt
@@ -5,4 +5,4 @@ K:Hideaway:4
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Play | Cost$ 2 T | Defined$ ExiledWith | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE4 | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if you control four or more legendary creatures.
 SVar:X:Count$Valid Creature.Legendary+YouCtrl
-Oracle:Hideaway 4 (When this land enters, look at the top four cards of your library, exile one face down, then put the rest on the bottom in a random order.)\n{T}: Add {C}.\n{2}, {T}: You may play the exiled card without paying its mana cost if you control four or more legendary creatures.
\ No newline at end of file
+Oracle:Hideaway 4 (When this land enters, look at the top four cards of your library, exile one face down, then put the rest on the bottom in a random order.)\n{T}: Add {C}.\n{2}, {T}: You may play the exiled card without paying its mana cost if you control four or more legendary creatures.
diff --git a/forge-gui/res/cardsfolder/upcoming/gogo_master_of_mimicry.txt b/forge-gui/res/cardsfolder/upcoming/gogo_master_of_mimicry.txt
index d97c7a70b67..0ff47ef0120 100644
--- a/forge-gui/res/cardsfolder/upcoming/gogo_master_of_mimicry.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gogo_master_of_mimicry.txt
@@ -4,4 +4,4 @@ Types:Legendary Creature Wizard
 PT:2/4
 A:AB$ CopySpellAbility | CantCopy$ True | Cost$ XMin1 X X T | ValidTgts$ Card,Emblem | TgtPrompt$ Select target activated or triggered ability you control | TargetType$ Activated.YouCtrl,Triggered.YouCtrl | Amount$ X | MayChooseTarget$ True | SpellDescription$ Copy target activated or triggered ability you control X times. You may choose new targets for the copies. This ability can't be copied and X can't be 0. (Mana abilities can't be targeted.)
 SVar:X:Count$xPaid
-Oracle:{X}{X}, {T}: Copy target activated or triggered ability you control X times. You may choose new targets for the copies. This ability can't be copied and X can't be 0. (Mana abilities can't be targeted.)
\ No newline at end of file
+Oracle:{X}{X}, {T}: Copy target activated or triggered ability you control X times. You may choose new targets for the copies. This ability can't be copied and X can't be 0. (Mana abilities can't be targeted.)
diff --git a/forge-gui/res/cardsfolder/upcoming/gongaga_reactor_town.txt b/forge-gui/res/cardsfolder/upcoming/gongaga_reactor_town.txt
index c1c459b28f7..bda99523947 100644
--- a/forge-gui/res/cardsfolder/upcoming/gongaga_reactor_town.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gongaga_reactor_town.txt
@@ -4,4 +4,4 @@ Types:Land Town
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ Combo R G | SpellDescription$ Add {R} or {G}.
-Oracle:This land enters tapped.\n{T}: Add {R} or {G}. 
+Oracle:This land enters tapped.\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/upcoming/hope_estheim.txt b/forge-gui/res/cardsfolder/upcoming/hope_estheim.txt
index 27054f748c2..a5d1076f406 100644
--- a/forge-gui/res/cardsfolder/upcoming/hope_estheim.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hope_estheim.txt
@@ -6,4 +6,4 @@ K:Lifelink
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ At the beginning of your end step, each opponent mills X cards, where X is the amount of life you gained this turn.
 SVar:TrigMill:DB$ Mill | Defined$ Opponent | NumCards$ X
 SVar:X:Count$LifeYouGainedThisTurn
-Oracle:Lifelink\nAt the beginning of your end step, each opponent mills X cards, where X is the amount of life you gained this turn.
\ No newline at end of file
+Oracle:Lifelink\nAt the beginning of your end step, each opponent mills X cards, where X is the amount of life you gained this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/ignis_scientia.txt b/forge-gui/res/cardsfolder/upcoming/ignis_scientia.txt
index 4bd9cc03704..06abbe3ab4e 100644
--- a/forge-gui/res/cardsfolder/upcoming/ignis_scientia.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ignis_scientia.txt
@@ -7,4 +7,4 @@ SVar:TrigDig:DB$ Dig | DigNum$ 6 | ChangeNum$ 1 | ChangeValid$ Land | Optional$
 A:AB$ ChangeZone | PrecostDesc$ I've Come Up with a New Recipe! — | Cost$ 1 G U T | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | SubAbility$ DBToken | SpellDescription$ Exile target card from a graveyard. If a creature card was exiled this way, create a Food token.
 SVar:DBToken:DB$ Token | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ GE1 | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
 DeckHas:Ability$LifeGain|Token
-Oracle:When Ignis Scientia enters, look at the top six cards of your library. You may put a land card from among them onto the battlefield tapped. Put the rest on the bottom of your library in a random order.\nI've Come Up with a New Recipe! — {1}{G}{U}, {T}: Exile target card from a graveyard. If a creature card was exiled this way, create a Food token.
\ No newline at end of file
+Oracle:When Ignis Scientia enters, look at the top six cards of your library. You may put a land card from among them onto the battlefield tapped. Put the rest on the bottom of your library in a random order.\nI've Come Up with a New Recipe! — {1}{G}{U}, {T}: Exile target card from a graveyard. If a creature card was exiled this way, create a Food token.
diff --git a/forge-gui/res/cardsfolder/upcoming/lightning_security_sergeant.txt b/forge-gui/res/cardsfolder/upcoming/lightning_security_sergeant.txt
index e09d36ea80c..e4fa8eb7e83 100644
--- a/forge-gui/res/cardsfolder/upcoming/lightning_security_sergeant.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lightning_security_sergeant.txt
@@ -6,6 +6,6 @@ K:Menace
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, exile the top card of your library. You may play that card for as long as you control NICKNAME.
 SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | RememberObjects$ Remembered | ForgetOnMoved$ Exile | Duration$ AsLongAsControl | SubAbility$ DBCleanup
-SVar:STPlay:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play this card for as long as you control NICKNAME.
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play this card for as long as you control EFFECTSOURCE.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhenever Lightning deals combat damage to a player, exile the top card of your library. You may play that card for as long as you control Lightning.
diff --git a/forge-gui/res/cardsfolder/upcoming/ninjas_blades.txt b/forge-gui/res/cardsfolder/upcoming/ninjas_blades.txt
index 16751b3495f..0f1a3deaee4 100644
--- a/forge-gui/res/cardsfolder/upcoming/ninjas_blades.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ninjas_blades.txt
@@ -11,4 +11,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 K:Equip:2
 SVar:X:Remembered$CardManaCost
 DeckHas:Ability$Token & Type$Ninja
-Oracle:Job select\nEquipped creature gets +1/+1, is a Ninja in addition to its other types, and has "Whenever this creature deals combat damage to a player, draw a card, then discard a card. That player loses life equal to the discarded card's mana value."\nMutsunokami — Equip {2}
\ No newline at end of file
+Oracle:Job select\nEquipped creature gets +1/+1, is a Ninja in addition to its other types, and has "Whenever this creature deals combat damage to a player, draw a card, then discard a card. That player loses life equal to the discarded card's mana value."\nMutsunokami — Equip {2}
diff --git a/forge-gui/res/cardsfolder/upcoming/omega_heartless_evolution.txt b/forge-gui/res/cardsfolder/upcoming/omega_heartless_evolution.txt
index 6bbfb2172e0..45cae8952d3 100644
--- a/forge-gui/res/cardsfolder/upcoming/omega_heartless_evolution.txt
+++ b/forge-gui/res/cardsfolder/upcoming/omega_heartless_evolution.txt
@@ -9,4 +9,4 @@ SVar:DBGainLife:DB$ GainLife | LifeAmount$ X
 SVar:OneEach:PlayerCountOpponents$Amount
 SVar:X:Count$Valid Land.nonBasic+YouCtrl
 SVar:PlayMain1:TRUE
-Oracle:Wave Cannon — When Omega enters, for each opponent, tap up to one target nonland permanent that opponent controls. Put X stun counters on each of those permanents and you gain X life, where X is the number of nonbasic lands you control. (If a permanent with a stun counter would become untapped, remove one from it instead.)
\ No newline at end of file
+Oracle:Wave Cannon — When Omega enters, for each opponent, tap up to one target nonland permanent that opponent controls. Put X stun counters on each of those permanents and you gain X life, where X is the number of nonbasic lands you control. (If a permanent with a stun counter would become untapped, remove one from it instead.)
diff --git a/forge-gui/res/cardsfolder/upcoming/overkill.txt b/forge-gui/res/cardsfolder/upcoming/overkill.txt
index 6fd59295f26..9f58558bd66 100644
--- a/forge-gui/res/cardsfolder/upcoming/overkill.txt
+++ b/forge-gui/res/cardsfolder/upcoming/overkill.txt
@@ -1,5 +1,5 @@
 Name:Overkill
 ManaCost:2 B
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDef$ -9999 | IsCurse$ True | SpellDescription$ Target creature gets -0/-9999 until end of turn.
-Oracle:Target creature gets -0/-9999 until end of turn.
\ No newline at end of file
+A:SP$ Pump | ValidTgts$ Creature | NumDef$ -9999 | IsCurse$ True | SpellDescription$ Target creature gets -0/-9999 until end of turn.
+Oracle:Target creature gets -0/-9999 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/prompto_argentum.txt b/forge-gui/res/cardsfolder/upcoming/prompto_argentum.txt
index 68718f0d29a..e15f724e0f6 100644
--- a/forge-gui/res/cardsfolder/upcoming/prompto_argentum.txt
+++ b/forge-gui/res/cardsfolder/upcoming/prompto_argentum.txt
@@ -5,4 +5,4 @@ PT:2/2
 K:Haste
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | ValidSAonCard$ Spell.ManaSpent GE4 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Selfie Shot — Whenever you cast a noncreature spell, if at least four mana was spent to cast it, create a Treasure token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
-Oracle:Haste\nSelfie Shot — Whenever you cast a noncreature spell, if at least four mana was spent to cast it, create a Treasure token.
\ No newline at end of file
+Oracle:Haste\nSelfie Shot — Whenever you cast a noncreature spell, if at least four mana was spent to cast it, create a Treasure token.
diff --git a/forge-gui/res/cardsfolder/upcoming/raubahn_bull_of_ala_mhigo.txt b/forge-gui/res/cardsfolder/upcoming/raubahn_bull_of_ala_mhigo.txt
index 9b459ec0c34..f6fc23211e8 100644
--- a/forge-gui/res/cardsfolder/upcoming/raubahn_bull_of_ala_mhigo.txt
+++ b/forge-gui/res/cardsfolder/upcoming/raubahn_bull_of_ala_mhigo.txt
@@ -8,4 +8,4 @@ SVar:TrigPump:DB$ Pump | ValidTgts$ Equipment.YouCtrl | TargetMin$ 0 | TargetMax
 SVar:DBAttach:DB$ Attach | Object$ ParentTarget | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature
 SVar:X:Count$CardPower
 DeckHints:Type$Equipment
-Oracle:Ward—Pay life equal to Raubahn's power.\nWhenever Raubahn attacks, attach up to one target Equipment you control to target attacking creature.
\ No newline at end of file
+Oracle:Ward—Pay life equal to Raubahn's power.\nWhenever Raubahn attacks, attach up to one target Equipment you control to target attacking creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/ride_the_shoopuf.txt b/forge-gui/res/cardsfolder/upcoming/ride_the_shoopuf.txt
index 0e0f8f1d033..ff3575691a2 100644
--- a/forge-gui/res/cardsfolder/upcoming/ride_the_shoopuf.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ride_the_shoopuf.txt
@@ -5,4 +5,4 @@ T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Land.YouCtrl | Trigg
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ Animate | Cost$ 5 G G | Defined$ Self | Power$ 7 | Toughness$ 7 | Types$ Creature,Beast | Duration$ Permanent | SpellDescription$ This enchantment becomes a 7/7 Beast creature in addition to its other types.
 DeckHas:Ability$Counters
-Oracle:Landfall — Whenever a land you control enters, put a +1/+1 counter on target creature you control.\n{5}{G}{G}: This enchantment becomes a 7/7 Beast creature in addition to its other types.
\ No newline at end of file
+Oracle:Landfall — Whenever a land you control enters, put a +1/+1 counter on target creature you control.\n{5}{G}{G}: This enchantment becomes a 7/7 Beast creature in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/upcoming/sleep_magic.txt b/forge-gui/res/cardsfolder/upcoming/sleep_magic.txt
index f7b20494ef0..77f97fca421 100644
--- a/forge-gui/res/cardsfolder/upcoming/sleep_magic.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sleep_magic.txt
@@ -7,4 +7,4 @@ SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ DamageDoneOnce | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When enchanted creature is dealt damage, sacrifice this Aura.
 SVar:TrigSac:DB$ Sacrifice
-Oracle:Enchant creature\nWhen this Aura enters, tap enchanted creature.\nEnchanted creature doesn't untap during its controller's untap step.\nWhen enchanted creature is dealt damage, sacrifice this Aura.
\ No newline at end of file
+Oracle:Enchant creature\nWhen this Aura enters, tap enchanted creature.\nEnchanted creature doesn't untap during its controller's untap step.\nWhen enchanted creature is dealt damage, sacrifice this Aura.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_lunar_whale.txt b/forge-gui/res/cardsfolder/upcoming/the_lunar_whale.txt
index e75e0b065ed..f7857e2fa16 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_lunar_whale.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_lunar_whale.txt
@@ -6,4 +6,4 @@ K:Flying
 S:Mode$ Continuous | Affected$ Card.TopLibrary+YouCtrl | AffectedZone$ Library | MayLookAt$ You | Description$ You may look at the top card of your library any time.
 S:Mode$ Continuous | IsPresent$ Card.Self+attackedThisTurn | Affected$ Card.TopLibrary+YouCtrl | AffectedZone$ Library | MayPlay$ True | Description$ As long as CARDNAME attacked this turn, you may play the top card of your library.
 K:Crew:1
-Oracle:Flying\nYou may look at the top card of your library any time.\nAs long as The Lunar Whale attacked this turn, you may play the top card of your library.\nCrew 1
\ No newline at end of file
+Oracle:Flying\nYou may look at the top card of your library any time.\nAs long as The Lunar Whale attacked this turn, you may play the top card of your library.\nCrew 1
diff --git a/forge-gui/res/cardsfolder/upcoming/treno_dark_city.txt b/forge-gui/res/cardsfolder/upcoming/treno_dark_city.txt
index 531280cc640..8f89951c69b 100644
--- a/forge-gui/res/cardsfolder/upcoming/treno_dark_city.txt
+++ b/forge-gui/res/cardsfolder/upcoming/treno_dark_city.txt
@@ -4,4 +4,4 @@ Types:Land Town
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ Combo U B | SpellDescription$ Add {U} or {B}.
-Oracle:This land enters tapped.\n{T}: Add {U} or {B}. 
+Oracle:This land enters tapped.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/upcoming/ultros_obnoxious_octopus.txt b/forge-gui/res/cardsfolder/upcoming/ultros_obnoxious_octopus.txt
index c362b89e731..d6bbb150d8e 100644
--- a/forge-gui/res/cardsfolder/upcoming/ultros_obnoxious_octopus.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ultros_obnoxious_octopus.txt
@@ -7,4 +7,4 @@ SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | ValidSAonCard$ Spell.ManaSpent GE8 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a noncreature spell, if at least eight mana was spent to cast it, put eight +1/+1 counters on NICKNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 8
-Oracle:Whenever you cast a noncreature spell, if at least four mana was spent to cast it, tap target creature an opponent controls and put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)\nWhenever you cast a noncreature spell, if at least eight mana was spent to cast it, put eight +1/+1 counters on Ultros.
\ No newline at end of file
+Oracle:Whenever you cast a noncreature spell, if at least four mana was spent to cast it, tap target creature an opponent controls and put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)\nWhenever you cast a noncreature spell, if at least eight mana was spent to cast it, put eight +1/+1 counters on Ultros.
diff --git a/forge-gui/res/cardsfolder/upcoming/vaan_street_thief.txt b/forge-gui/res/cardsfolder/upcoming/vaan_street_thief.txt
index 35df45e8de0..b97b3d6387b 100644
--- a/forge-gui/res/cardsfolder/upcoming/vaan_street_thief.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vaan_street_thief.txt
@@ -11,4 +11,4 @@ T:Mode$ SpellCast | ValidCard$ Card.YouDontOwn | ValidActivatingPlayer$ You | Tr
 SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Scout.YouCtrl,Pirate.YouCtrl,Rogue.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
 DeckHints:Type$Scout|Pirate|Rogue
 DeckHas:Ability$Token|Sacrifice & Type$Artifact|Treasure
-Oracle:Whenever one or more Scouts, Pirates, and/or Rogues you control deal combat damage to a player, exile the top card of that player's library. You may cast it. If you don't, create a Treasure token.\nWhenever you cast a spell you don't own, put a +1/+1 counter on each Scout, Pirate, and Rogue you control.
\ No newline at end of file
+Oracle:Whenever one or more Scouts, Pirates, and/or Rogues you control deal combat damage to a player, exile the top card of that player's library. You may cast it. If you don't, create a Treasure token.\nWhenever you cast a spell you don't own, put a +1/+1 counter on each Scout, Pirate, and Rogue you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/vaynes_treachery.txt b/forge-gui/res/cardsfolder/upcoming/vaynes_treachery.txt
index f039b410af6..c8510a593f9 100644
--- a/forge-gui/res/cardsfolder/upcoming/vaynes_treachery.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vaynes_treachery.txt
@@ -2,7 +2,7 @@ Name:Vayne's Treachery
 ManaCost:1 B
 Types:Instant
 K:Kicker:Sac<1/Creature;Artifact/artifact or creature>
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -X | NumDef$ -X | IsCurse$ True | StackDescription$ REP Target creature_{c:Targeted} | SpellDescription$ Target creature gets -2/-2 until end of turn. If this spell was kicked, that creature gets -6/-6 until end of turn instead.
+A:SP$ Pump | ValidTgts$ Creature | NumAtt$ -X | NumDef$ -X | IsCurse$ True | StackDescription$ REP Target creature_{c:Targeted} | SpellDescription$ Target creature gets -2/-2 until end of turn. If this spell was kicked, that creature gets -6/-6 until end of turn instead.
 SVar:X:Count$Kicked.6.2
 DeckHas:Ability$Sacrifice
-Oracle:Kicker—Sacrifice an artifact or creature. (You may sacrifice an artifact or creature in addition to any other costs as you cast this spell.)\nTarget creature gets -2/-2 until end of turn. If this spell was kicked, that creature gets -6/-6 until end of turn instead.
\ No newline at end of file
+Oracle:Kicker—Sacrifice an artifact or creature. (You may sacrifice an artifact or creature in addition to any other costs as you cast this spell.)\nTarget creature gets -2/-2 until end of turn. If this spell was kicked, that creature gets -6/-6 until end of turn instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/weapons_vendor.txt b/forge-gui/res/cardsfolder/upcoming/weapons_vendor.txt
index 2420983bf1b..35201e4f314 100644
--- a/forge-gui/res/cardsfolder/upcoming/weapons_vendor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/weapons_vendor.txt
@@ -9,4 +9,4 @@ SVar:TrigImmediateTrigger:AB$ ImmediateTrigger | Cost$ 1 | Execute$ TrigPump | T
 SVar:TrigPump:DB$ Pump | ValidTgts$ Equipment.YouCtrl | TgtPrompt$ Select target equipment you control | SubAbility$ DBAttach
 SVar:DBAttach:DB$ Attach | Object$ ParentTarget | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control
 DeckHints:Type$Equipment
-Oracle:When this creature enters, draw a card.\nAt the beginning of combat on your turn, if you control an Equipment, you may pay {1}. When you do, attach target Equipment you control to target creature you control.
\ No newline at end of file
+Oracle:When this creature enters, draw a card.\nAt the beginning of combat on your turn, if you control an Equipment, you may pay {1}. When you do, attach target Equipment you control to target creature you control.