diff --git a/forge-gui/res/cardsfolder/upcoming/acolyte_hybrid.txt b/forge-gui/res/cardsfolder/upcoming/acolyte_hybrid.txt
index 3d209b514da..922c71c721a 100644
--- a/forge-gui/res/cardsfolder/upcoming/acolyte_hybrid.txt
+++ b/forge-gui/res/cardsfolder/upcoming/acolyte_hybrid.txt
@@ -3,8 +3,8 @@ ManaCost:2 R
 Types:Creature Tyranid Human
 PT:2/2
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ Heavy Rock Cutter — Whenever CARDNAME attacks, destroy up to one target artifact. If an artifact is destroyed this way, its controller draws a card.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact | TargetMin$ 0 | TargetMax$ 1 | RememberDestroyed$ True | SubAbility$ DBDraw
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select up to one target artifact | TargetMin$ 0 | TargetMax$ 1 | RememberDestroyed$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ RememberedController | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-HasAttackEffect:True
+SVar:HasAttackEffect:TRUE
 Oracle:Heavy Rock Cutter — Whenever Acolyte Hybrid attacks, destroy up to one target artifact. If an artifact is destroyed this way, its controller draws a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/atlan_jackal.txt b/forge-gui/res/cardsfolder/upcoming/atalan_jackal.txt
similarity index 61%
rename from forge-gui/res/cardsfolder/upcoming/atlan_jackal.txt
rename to forge-gui/res/cardsfolder/upcoming/atalan_jackal.txt
index 3d0a5698afd..f83d9b42e5d 100644
--- a/forge-gui/res/cardsfolder/upcoming/atlan_jackal.txt
+++ b/forge-gui/res/cardsfolder/upcoming/atalan_jackal.txt
@@ -4,7 +4,6 @@ Types:Creature Human Tyranid Scout
 PT:2/2
 K:Trample
 K:Haste
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigSearch | CombatDamage$ True | TriggerDescription$ Skilled Outrider — Whenever CARDNAME deals combat damage to a player, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | Optional$ True | ChangeType$ Land.Basic | ChangeNum$ 1
-HasAttackEffect:True
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigSearch | CombatDamage$ True | OptionalDecider$ You | TriggerDescription$ Skilled Outrider — Whenever CARDNAME deals combat damage to a player, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
 Oracle:Trample, haste\nSkilled Outrider — Whenever Atalan Jackal deals combat damage to a player, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/Belakor_the_dark_master.txt b/forge-gui/res/cardsfolder/upcoming/belakor_the_dark_master.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/Belakor_the_dark_master.txt
rename to forge-gui/res/cardsfolder/upcoming/belakor_the_dark_master.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/biophagus.txt b/forge-gui/res/cardsfolder/upcoming/biophagus.txt
index 3b9ed9f1008..6311b333e99 100644
--- a/forge-gui/res/cardsfolder/upcoming/biophagus.txt
+++ b/forge-gui/res/cardsfolder/upcoming/biophagus.txt
@@ -3,9 +3,9 @@ ManaCost:1 G
 Types:Creature Human Tyranid Wizard
 PT:1/3
 A:AB$ Mana | Cost$ T | Produced$ Any | PrecostDesc$ Genomic Enhancement — | TriggersWhenSpent$ TrigSpent | SpellDescription$ Add one mana of any color. If this mana is spent to cast a creature spell, that creature enters the battlefield with an additional +1/+1 counter on it.
-SVar:TrigSpent:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigEffect | TriggerDescription$ If this mana is spent to cast a creature spell, that creature enters the battlefield with an additional +1/+1 counter on it.
+SVar:TrigSpent:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigEffect | Static$ True
 SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | ForgetOnMoved$ Stack | ReplacementEffects$ ETBCreat
 SVar:ETBCreat:Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplaceWith$ DBPutP1P1 | ReplacementResult$ Updated | Description$ That creature enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn.
-SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True | CounterNum$ 1
-DeckHas:Ability$Counter
+SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True
+DeckHas:Ability$Counters
 Oracle:Genomic Enhancement — {T}: Add one mana of any color. If this mana is spent to cast a creature spell, that creature enters the battlefield with an additional +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/bone_sabres.txt b/forge-gui/res/cardsfolder/upcoming/bone_sabres.txt
index f27a0163d7d..604c993213e 100644
--- a/forge-gui/res/cardsfolder/upcoming/bone_sabres.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bone_sabres.txt
@@ -4,6 +4,7 @@ Types:Artifact Equipment
 K:Equip:3
 T:Mode$ Attacks | ValidCard$ Creature.EquippedBy | Execute$ TrigCounter | TriggerDescription$ Whenever equipped creature attacks, put four +1/+1 counters on it.
 SVar:TrigCounter:DB$ PutCounter | Defined$ Equipped | CounterType$ P1P1 | CounterNum$ 4
-DeckHas:Ability$Counter
-HasAttackEffect:True
+DeckHas:Ability$Counters
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddSVar$ AE
+SVar:AE:SVar:HasAttackEffect:TRUE
 Oracle:Whenever equipped creature attacks, put four +1/+1 counters on it.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/upcoming/marneus_calgar.txt b/forge-gui/res/cardsfolder/upcoming/marneus_calgar.txt
index 3223dc5199d..e48cd4699c4 100644
--- a/forge-gui/res/cardsfolder/upcoming/marneus_calgar.txt
+++ b/forge-gui/res/cardsfolder/upcoming/marneus_calgar.txt
@@ -6,6 +6,6 @@ K:Double Strike
 T:Mode$ ChangesZoneAll | ValidCards$ Card.token+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ DBDraw | TriggerDescription$ Master Tactician — Whenever one or more tokens enter the battlefield under your control, draw a card.
 SVar:DBDraw:DB$ Draw
 A:AB$ Token | Cost$ 6 | PrecostDesc$ Chapter Master — | TokenAmount$ 2 | TokenScript$ w_2_2_astartes_warrior_vigilance | TokenOwner$ You | SpellDescription$ Create two 2/2 white Astartes Warrior creature tokens with vigilance.
-DeckHints:Ability$Tokens
-DeckHas:Ability$Tokens
+DeckHints:Ability$Token
+DeckHas:Ability$Token
 Oracle:Double strike\nMaster Tactician — Whenever one or more tokens enter the battlefield under your control, draw a card.\nChapter Master — {6}: Create two 2/2 white Astartes Warrior creature tokens with vigilance.
diff --git a/forge-gui/res/cardsfolder/upcoming/noise_marine.txt b/forge-gui/res/cardsfolder/upcoming/noise_marine.txt
index e38b950d008..57ed369b91e 100644
--- a/forge-gui/res/cardsfolder/upcoming/noise_marine.txt
+++ b/forge-gui/res/cardsfolder/upcoming/noise_marine.txt
@@ -3,7 +3,8 @@ ManaCost:4 R
 Types:Creature Astartes Warrior
 PT:3/2
 K:Cascade
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Sonic Blaster — When CARDNAME enters the battlefield, it deals damage equal to the number of spells you’ve cast this turn to any target.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Sonic Blaster — When CARDNAME enters the battlefield, it deals damage equal to the number of spells you've cast this turn to any target.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X
 SVar:X:Count$ThisTurnCast_Card.YouCtrl
-Oracle:Cascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom of your library in a random order.)\nSonic Blaster — When Noise Marine enters the battlefield, it deals damage equal to the number of spells you’ve cast this turn to any target.
\ No newline at end of file
+Oracle:Cascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom of your library in a random order.)\nSonic Blast
+er — When Noise Marine enters the battlefield, it deals damage equal to the number of spells you've cast this turn to any target.
diff --git a/forge-gui/res/cardsfolder/upcoming/toxicrene.txt b/forge-gui/res/cardsfolder/upcoming/toxicrene.txt
index 8dc47d1ea36..6f3058d516a 100644
--- a/forge-gui/res/cardsfolder/upcoming/toxicrene.txt
+++ b/forge-gui/res/cardsfolder/upcoming/toxicrene.txt
@@ -5,5 +5,5 @@ PT:2/4
 K:Reach
 K:Deathtouch
 S:Mode$ Continuous | Affected$ Land | AddAbility$ Mana | RemoveAllAbilities$ True | Description$ Hypertoxic Miasma — All lands have "{T}: Add one mana of any color" and lose all other abilities.
-SVar:Mana:AB$Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
+SVar:Mana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 Oracle:Reach, deathtouch\nAll lands have "{T}: Add one mana of any color" and lose all other abilities.