diff --git a/forge-gui/res/cardsfolder/g/galvanic_juggernaut.txt b/forge-gui/res/cardsfolder/g/galvanic_juggernaut.txt
index aca18e0b507..cd970967eb8 100644
--- a/forge-gui/res/cardsfolder/g/galvanic_juggernaut.txt
+++ b/forge-gui/res/cardsfolder/g/galvanic_juggernaut.txt
@@ -2,7 +2,7 @@ Name:Galvanic Juggernaut
 ManaCost:4
 Types:Artifact Creature Juggernaut
 PT:5/5
-K:CARDNAME attacks each combat if able.
+S:Mode$ MustAttack | Affected$ Card.Self | Description$ CARDNAME attacks each combat if able.
 K:CARDNAME doesn't untap during your untap step.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever another creature dies, untap CARDNAME
 SVar:TrigUntap:DB$ Untap | Defined$ Self
diff --git a/forge-gui/res/cardsfolder/g/goblin_assault.txt b/forge-gui/res/cardsfolder/g/goblin_assault.txt
index 407bf528377..d6ffa2cf460 100644
--- a/forge-gui/res/cardsfolder/g/goblin_assault.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_assault.txt
@@ -1,7 +1,8 @@
 Name:Goblin Assault
 ManaCost:2 R
 Types:Enchantment
-S:Mode$ Continuous | Affected$ Creature.Goblin | AddHiddenKeyword$ CARDNAME attacks each combat if able. | Description$ Goblin creatures attack each combat if able.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, create a 1/1 red Goblin creature token with haste.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_1_1_goblin_haste | TokenOwner$ You
+SVar:TrigToken:DB$ Token | TokenScript$ r_1_1_goblin_haste
+S:Mode$ MustAttack | Affected$ Creature.Goblin | Description$ Goblin creatures attack each combat if able.
+DeckHas:Ability$Token & Type$Goblin
 Oracle:At the beginning of your upkeep, create a 1/1 red Goblin creature token with haste.\nGoblin creatures attack each combat if able.
diff --git a/forge-gui/res/cardsfolder/g/goblin_brigand.txt b/forge-gui/res/cardsfolder/g/goblin_brigand.txt
index 17f0d012916..2b6ec7bf032 100644
--- a/forge-gui/res/cardsfolder/g/goblin_brigand.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_brigand.txt
@@ -2,5 +2,5 @@ Name:Goblin Brigand
 ManaCost:1 R
 Types:Creature Goblin Warrior
 PT:2/2
-K:CARDNAME attacks each combat if able.
+S:Mode$ MustAttack | Affected$ Card.Self | Description$ CARDNAME attacks each combat if able.
 Oracle:Goblin Brigand attacks each combat if able.
diff --git a/forge-gui/res/cardsfolder/g/goblin_diplomats.txt b/forge-gui/res/cardsfolder/g/goblin_diplomats.txt
index dc28cd8e6ce..8ee9a0accd8 100644
--- a/forge-gui/res/cardsfolder/g/goblin_diplomats.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_diplomats.txt
@@ -2,7 +2,7 @@ Name:Goblin Diplomats
 ManaCost:1 R
 Types:Creature Goblin
 PT:2/1
-A:AB$ Effect | Cost$ T | Name$ Goblin Diplomats Effect | StaticAbilities$ KWPump | SpellDescription$ Each creature attacks this turn if able.
-SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature | AddHiddenKeyword$ CARDNAME attacks each combat if able. | Description$ Each creature attacks this turn if able.
+A:AB$ Effect | Cost$ T | StaticAbilities$ MustAttack | SpellDescription$ Each creature attacks this turn if able.
+SVar:MustAttack:Mode$ MustAttack | EffectZone$ Command | Affected$ Creature | Description$ Each creature attacks this turn if able.
 AI:RemoveDeck:All
 Oracle:{T}: Each creature attacks this turn if able.
diff --git a/forge-gui/res/cardsfolder/g/goblin_rabblemaster.txt b/forge-gui/res/cardsfolder/g/goblin_rabblemaster.txt
index 3f362ad0d5e..a4a41ce5213 100644
--- a/forge-gui/res/cardsfolder/g/goblin_rabblemaster.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_rabblemaster.txt
@@ -2,11 +2,12 @@ Name:Goblin Rabblemaster
 ManaCost:2 R
 Types:Creature Goblin Warrior
 PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Goblin+Other+YouCtrl | AddHiddenKeyword$ CARDNAME attacks each combat if able. | Description$ Other Goblin creatures you control attack each combat if able.
+S:Mode$ MustAttack | Affected$ Creature.Goblin+Other+YouCtrl | Description$ Other Goblin creatures you control attack each combat if able.
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, create a 1/1 red Goblin creature token with haste.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | TokenScript$ r_1_1_goblin_haste
+SVar:TrigToken:DB$ Token | TokenScript$ r_1_1_goblin_haste
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+0 until end of turn for each other attacking Goblin.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X
 SVar:X:Count$Valid Goblin.attacking+Other
 SVar:PlayMain1:TRUE
+DeckHas:Ability$Token
 Oracle:Other Goblin creatures you control attack each combat if able.\nAt the beginning of combat on your turn, create a 1/1 red Goblin creature token with haste.\nWhenever Goblin Rabblemaster attacks, it gets +1/+0 until end of turn for each other attacking Goblin.
diff --git a/forge-gui/res/cardsfolder/g/grand_melee.txt b/forge-gui/res/cardsfolder/g/grand_melee.txt
index b61ac7c0cf5..e096f1fe21f 100644
--- a/forge-gui/res/cardsfolder/g/grand_melee.txt
+++ b/forge-gui/res/cardsfolder/g/grand_melee.txt
@@ -1,6 +1,7 @@
 Name:Grand Melee
 ManaCost:3 R
 Types:Enchantment
-S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ CARDNAME blocks each combat if able. & CARDNAME attacks each combat if able. | Description$ All creatures attack each combat if able. All creatures block each combat if able.
+S:Mode$ MustAttack | Affected$ Creature | Description$ All creatures attack each combat if able. All creatures block each combat if able.
+S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ CARDNAME blocks each combat if able. | Secondary$ True
 SVar:NonStackingEffect:True
 Oracle:All creatures attack each combat if able.\nAll creatures block each combat if able.
diff --git a/forge-gui/res/cardsfolder/g/grizzled_angler_grisly_anglerfish.txt b/forge-gui/res/cardsfolder/g/grizzled_angler_grisly_anglerfish.txt
index 9a1d8a04126..da25c8df685 100644
--- a/forge-gui/res/cardsfolder/g/grizzled_angler_grisly_anglerfish.txt
+++ b/forge-gui/res/cardsfolder/g/grizzled_angler_grisly_anglerfish.txt
@@ -17,5 +17,5 @@ ManaCost:no cost
 Types:Creature Eldrazi Fish
 PT:4/5
 A:AB$ Effect | Cost$ 6 | StaticAbilities$ MustAttack | SpellDescription$ Creatures your opponents control attack this turn if able.
-SVar:MustAttack:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.OppCtrl | AddHiddenKeyword$ CARDNAME attacks each combat if able. | Description$ Creatures your opponents control attack this turn if able.
+SVar:MustAttack:Mode$ MustAttack | EffectZone$ Command | Affected$ Creature.OppCtrl | Description$ Creatures your opponents control attack this turn if able.
 Oracle:{6}: Creatures your opponents control attack this turn if able.
diff --git a/forge-gui/res/cardsfolder/g/guise_of_fire.txt b/forge-gui/res/cardsfolder/g/guise_of_fire.txt
index 7bba411f27c..b9b159879d0 100644
--- a/forge-gui/res/cardsfolder/g/guise_of_fire.txt
+++ b/forge-gui/res/cardsfolder/g/guise_of_fire.txt
@@ -2,6 +2,7 @@ Name:Guise of Fire
 ManaCost:R
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ R | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ -1 | AddHiddenKeyword$ CARDNAME attacks each combat if able. | Description$ Enchanted creature gets +1/-1 and attacks each combat if able.
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Curse
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ -1 | Description$ Enchanted creature gets +1/-1 and attacks each combat if able.
+S:Mode$ MustAttack | Affected$ Creature.EnchantedBy | Secondary$ True
 Oracle:Enchant creature\nEnchanted creature gets +1/-1 and attacks each combat if able.