diff --git a/forge-gui/res/cardsfolder/i/illusionists_gambit.txt b/forge-gui/res/cardsfolder/i/illusionists_gambit.txt
index 83bf3e05631..8f245d8a3d4 100644
--- a/forge-gui/res/cardsfolder/i/illusionists_gambit.txt
+++ b/forge-gui/res/cardsfolder/i/illusionists_gambit.txt
@@ -1,13 +1,13 @@
 Name:Illusionist's Gambit
 ManaCost:2 U U
 Types:Instant
-A:SP$ RemoveFromCombat | Cost$ 2 U U | Defined$ Valid Creature.attacking | ActivationPhases$ Declare Blockers | OpponentTurn$ True | RememberRemovedFromCombat$ True | SubAbility$ DBUntap | SpellDescription$ Cast CARDNAME only on the declare blockers step on an opponent's turn. Remove all attacking creatures from combat and untap them. After this phase, there is an additional combat phase. Each of those creatures attacks that combat if able. They can't attack you or planeswalkers you control that combat.
+A:SP$ RemoveFromCombat | Defined$ Valid Creature.attacking | ActivationPhases$ Declare Blockers | OpponentTurn$ True | RememberRemovedFromCombat$ True | SubAbility$ DBUntap | SpellDescription$ Cast CARDNAME only on the declare blockers step on an opponent's turn. Remove all attacking creatures from combat and untap them. After this phase, there is an additional combat phase. Each of those creatures attacks that combat if able. They can't attack you or planeswalkers you control that combat.
 SVar:DBUntap:DB$ Untap | Defined$ Remembered | SubAbility$ DBAddPhase
 SVar:DBAddPhase:DB$ AddPhase | ExtraPhase$ Combat | AfterPhase$ EndCombat | SubAbility$ DBDelayedEffect
 SVar:DBDelayedEffect:DB$ DelayedTrigger | Mode$ Phase | Phase$ BeginCombat | Execute$ DBEffect | Static$ True
 SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ STCantAttack,STMustAttack | SubAbility$ DBCleanup | Duration$ UntilEndOfCombat
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:STCantAttack:Mode$ CantAttack | EffectZone$ Command | ValidCard$ Creature.IsRemembered | Target$ You,Planeswalker.YouCtrl | Description$ Each of those creatures attacks that combat if able.
-SVar:STMustAttack:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.IsRemembered | AddHiddenKeyword$ CARDNAME attacks each combat if able.
+SVar:STCantAttack:Mode$ CantAttack | EffectZone$ Command | ValidCard$ Creature.IsRemembered | Target$ You,Planeswalker.YouCtrl | Description$ Each of those creatures attacks that combat if able. They can't attack you or planeswalkers you control that combat.
+SVar:STMustAttack:Mode$ MustAttack | EffectZone$ Command | Affected$ Creature.IsRemembered
 AI:RemoveDeck:All
 Oracle:Cast this spell only during the declare blockers step on an opponent's turn.\nRemove all attacking creatures from combat and untap them. After this phase, there is an additional combat phase. Each of those creatures attacks that combat if able. They can't attack you or planeswalkers you control that combat.
diff --git a/forge-gui/res/cardsfolder/i/imaginary_threats.txt b/forge-gui/res/cardsfolder/i/imaginary_threats.txt
index e4217a1eb85..1fa7f423613 100644
--- a/forge-gui/res/cardsfolder/i/imaginary_threats.txt
+++ b/forge-gui/res/cardsfolder/i/imaginary_threats.txt
@@ -1,8 +1,8 @@
 Name:Imaginary Threats
 ManaCost:2 U U
 Types:Instant
-A:SP$ Effect | Cost$ 2 U U | Name$ Imaginary Threats Effect 1 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | StaticAbilities$ MustAttack | RememberObjects$ Targeted | SubAbility$ DBEffect | SpellDescription$ Creatures target player controls attack this turn if able.
-SVar:MustAttack:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ CARDNAME attacks each combat if able. | Description$ Creatures target opponent controls attack this turn if able.
+A:SP$ Effect | Name$ Imaginary Threats Effect 1 | ValidTgts$ Opponent | StaticAbilities$ MustAttack | RememberObjects$ Targeted | SubAbility$ DBEffect | SpellDescription$ Creatures target player controls attack this turn if able.
+SVar:MustAttack:Mode$ MustAttack | EffectZone$ Command | Affected$ Creature.RememberedPlayerCtrl | Description$ Creatures target opponent controls attack this turn if able.
 SVar:DBEffect:DB$ Effect | IsCurse$ True | StaticAbilities$ DontUntap | Triggers$ RemoveEffect | Duration$ Permanent | RememberObjects$ Targeted | Name$ Imaginary Threats Effect 2 | SubAbility$ DBCleanup | SpellDescription$ During that player's next untap step, creatures they control don't untap.
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ This card doesn't untap during your next untap step. | Description$ Creatures target opponent controls don't untap during their next untap step.
 SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ Player.IsRemembered | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
diff --git a/forge-gui/res/cardsfolder/i/impending_doom.txt b/forge-gui/res/cardsfolder/i/impending_doom.txt
index e7cf411fe0c..5f62a506fde 100644
--- a/forge-gui/res/cardsfolder/i/impending_doom.txt
+++ b/forge-gui/res/cardsfolder/i/impending_doom.txt
@@ -2,8 +2,9 @@ Name:Impending Doom
 ManaCost:2 R
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ 2 R | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | AddHiddenKeyword$ CARDNAME attacks each combat if able. | Description$ Enchanted creature gets +3/+3 and attacks each combat if able.
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | Description$ Enchanted creature gets +3/+3 and attacks each combat if able.
+S:Mode$ MustAttack | Affected$ Creature.EnchantedBy | Secondary$ True
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigDamage | TriggerDescription$ When enchanted creature dies, CARDNAME deals 3 damage to that creature's controller.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredCardController | NumDmg$ 3
 Oracle:Enchant creature\nEnchanted creature gets +3/+3 and attacks each combat if able.\nWhen enchanted creature dies, Impending Doom deals 3 damage to that creature's controller.
diff --git a/forge-gui/res/cardsfolder/i/impetuous_sunchaser.txt b/forge-gui/res/cardsfolder/i/impetuous_sunchaser.txt
index 79aa3674095..07123a69e38 100644
--- a/forge-gui/res/cardsfolder/i/impetuous_sunchaser.txt
+++ b/forge-gui/res/cardsfolder/i/impetuous_sunchaser.txt
@@ -4,5 +4,5 @@ Types:Creature Human Soldier
 PT:1/1
 K:Flying
 K:Haste
-K:CARDNAME attacks each combat if able.
+S:Mode$ MustAttack | Affected$ Card.Self | Description$ CARDNAME attacks each combat if able.
 Oracle:Flying, haste\nImpetuous Sunchaser attacks each combat if able.
diff --git a/forge-gui/res/cardsfolder/i/imps_taunt.txt b/forge-gui/res/cardsfolder/i/imps_taunt.txt
index 6a1c7ff56cf..bb7acbb08a9 100644
--- a/forge-gui/res/cardsfolder/i/imps_taunt.txt
+++ b/forge-gui/res/cardsfolder/i/imps_taunt.txt
@@ -2,6 +2,7 @@ Name:Imps' Taunt
 ManaCost:1 B
 Types:Instant
 K:Buyback:3
-A:SP$ Pump | Cost$ 1 B | ValidTgts$ Creature | KW$ HIDDEN CARDNAME attacks each combat if able. | TgtPrompt$ Select target creature | SpellDescription$ Target creature attacks this turn if able.
+A:SP$ Animate | ValidTgts$ Creature | staticAbilities$ MustAttack | SpellDescription$ Target creature attacks this turn if able.
+SVar:MustAttack:Mode$ MustAttack | Affected$ Card.Self | Description$ This creature attacks this turn if able.
 AI:RemoveDeck:All
 Oracle:Buyback {3} (You may pay an additional {3} as you cast this spell. If you do, put this card into your hand as it resolves.)\nTarget creature attacks this turn if able.
diff --git a/forge-gui/res/cardsfolder/i/incite.txt b/forge-gui/res/cardsfolder/i/incite.txt
index 8ca3e7bbcfe..051fac69f61 100644
--- a/forge-gui/res/cardsfolder/i/incite.txt
+++ b/forge-gui/res/cardsfolder/i/incite.txt
@@ -1,7 +1,7 @@
 Name:Incite
 ManaCost:R
 Types:Instant
-A:SP$ Animate | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | Colors$ Red | OverwriteColors$ True | SubAbility$ DBPump | SpellDescription$ Target creature becomes red until end of turn and attacks this turn if able.
-SVar:DBPump:DB$ Pump | KW$ HIDDEN CARDNAME attacks each combat if able. | Defined$ Targeted
+A:SP$ Animate | ValidTgts$ Creature | Colors$ Red | OverwriteColors$ True | staticAbilities$ MustAttack | SpellDescription$ Target creature becomes red until end of turn and attacks this turn if able.
+SVar:MustAttack:Mode$ MustAttack | Affected$ Card.Self | Description$ This creature attacks this turn if able.
 AI:RemoveDeck:All
 Oracle:Target creature becomes red until end of turn and attacks this turn if able.
diff --git a/forge-gui/res/cardsfolder/i/incite_war.txt b/forge-gui/res/cardsfolder/i/incite_war.txt
index ceb8a538a14..bb04ccae556 100644
--- a/forge-gui/res/cardsfolder/i/incite_war.txt
+++ b/forge-gui/res/cardsfolder/i/incite_war.txt
@@ -2,9 +2,9 @@ Name:Incite War
 ManaCost:2 R
 Types:Instant
 K:Entwine:2
-A:SP$ Charm | Cost$ 2 R | Choices$ DBEffect,DBPumpAll | CharmNum$ 1
-SVar:DBEffect:DB$ Effect | Name$ Incite War Effect | ValidTgts$ Player | TgtPrompt$ Select target player | StaticAbilities$ MustAttack | RememberObjects$ Targeted | SpellDescription$ Creatures target player controls attack this turn if able.
-SVar:MustAttack:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ CARDNAME attacks each combat if able. | Description$ Creatures target player controls attack this turn if able.
+A:SP$ Charm | Choices$ DBEffect,DBPumpAll
+SVar:DBEffect:DB$ Effect | Name$ Incite War Effect | ValidTgts$ Player | StaticAbilities$ MustAttack | RememberObjects$ Targeted | SpellDescription$ Creatures target player controls attack this turn if able.
+SVar:MustAttack:Mode$ MustAttack | EffectZone$ Command | Affected$ Creature.RememberedPlayerCtrl | Description$ Creatures target player controls attack this turn if able.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ First Strike | SpellDescription$ Creatures you control gain first strike until end of turn.
 AI:RemoveDeck:All
 Oracle:Choose one —\n• Creatures target player controls attack this turn if able.\n• Creatures you control gain first strike until end of turn.\nEntwine {2} (Choose both if you pay the entwine cost.)
diff --git a/forge-gui/res/cardsfolder/i/infectious_bloodlust.txt b/forge-gui/res/cardsfolder/i/infectious_bloodlust.txt
index 97320810ee9..18fde8c56ba 100644
--- a/forge-gui/res/cardsfolder/i/infectious_bloodlust.txt
+++ b/forge-gui/res/cardsfolder/i/infectious_bloodlust.txt
@@ -2,8 +2,9 @@ Name:Infectious Bloodlust
 ManaCost:1 R
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 1 | AddKeyword$ Haste | AddHiddenKeyword$ CARDNAME attacks each combat if able. | Description$ Enchanted creature gets +2/+1, has haste, and attacks each combat if able.
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 1 | AddKeyword$ Haste | Description$ Enchanted creature gets +2/+1, has haste, and attacks each combat if able.
+S:Mode$ MustAttack | Affected$ Creature.EnchantedBy | Secondary$ True
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When enchanted creature dies, you may search your library for a card named Infectious Bloodlust, reveal it, put it into your hand, then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedInfectious Bloodlust | ChangeNum$ 1 | ShuffleNonMandatory$ True
 DeckHints:Name$Infectious Bloodlust
diff --git a/forge-gui/res/cardsfolder/i/insatiable_gorgers.txt b/forge-gui/res/cardsfolder/i/insatiable_gorgers.txt
index 9402dcb7e61..80555cb5634 100644
--- a/forge-gui/res/cardsfolder/i/insatiable_gorgers.txt
+++ b/forge-gui/res/cardsfolder/i/insatiable_gorgers.txt
@@ -2,7 +2,7 @@ Name:Insatiable Gorgers
 ManaCost:2 R R
 Types:Creature Vampire Berserker
 PT:5/3
-K:CARDNAME attacks each combat if able.
+S:Mode$ MustAttack | Affected$ Card.Self | Description$ CARDNAME attacks each combat if able.
 K:Madness:3 R
 DeckHints:Ability$Discard
 Oracle:Insatiable Gorgers attacks each combat if able.\nMadness {3}{R} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/i/instigator.txt b/forge-gui/res/cardsfolder/i/instigator.txt
index cdb6a5d32d1..9a55fde8fba 100644
--- a/forge-gui/res/cardsfolder/i/instigator.txt
+++ b/forge-gui/res/cardsfolder/i/instigator.txt
@@ -3,6 +3,6 @@ ManaCost:1 B
 Types:Creature Human Spellshaper
 PT:1/1
 A:AB$ Effect | Cost$ 1 B B T Discard<1/Card> | Name$ Instigator Effect | ValidTgts$ Player | TgtPrompt$ Select target player | StaticAbilities$ AttackThisTurn | RememberObjects$ Targeted | SpellDescription$ Creatures target player controls attack this turn if able.
-SVar:AttackThisTurn:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ CARDNAME attacks each combat if able. | Description$ Creatures targeted player controls attack this turn if able.
+SVar:AttackThisTurn:Mode$ MustAttack | EffectZone$ Command | Affected$ Creature.RememberedPlayerCtrl | Description$ Creatures targeted player controls attack this turn if able.
 AI:RemoveDeck:All
 Oracle:{1}{B}{B}, {T}, Discard a card: Creatures target player controls attack this turn if able.
diff --git a/forge-gui/res/cardsfolder/i/into_the_fray.txt b/forge-gui/res/cardsfolder/i/into_the_fray.txt
index 7ca34dbe6b2..0d20120c0f4 100644
--- a/forge-gui/res/cardsfolder/i/into_the_fray.txt
+++ b/forge-gui/res/cardsfolder/i/into_the_fray.txt
@@ -2,6 +2,7 @@ Name:Into the Fray
 ManaCost:R
 Types:Instant Arcane
 K:Splice:Arcane:R
-A:SP$ Pump | Cost$ R | ValidTgts$ Creature | KW$ HIDDEN CARDNAME attacks each combat if able. | TgtPrompt$ Select target creature | SpellDescription$ Target creature attacks this turn if able.
+A:SP$ Animate | ValidTgts$ Creature | staticAbilities$ MustAttack | SpellDescription$ Target creature attacks this turn if able.
+SVar:MustAttack:Mode$ MustAttack | Affected$ Card.Self | Description$ This creature attacks this turn if able.
 AI:RemoveDeck:All
 Oracle:Target creature attacks this turn if able.\nSplice onto Arcane {R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
diff --git a/forge-gui/res/cardsfolder/i/iron_golem.txt b/forge-gui/res/cardsfolder/i/iron_golem.txt
index 868878aa41f..a57350961ec 100644
--- a/forge-gui/res/cardsfolder/i/iron_golem.txt
+++ b/forge-gui/res/cardsfolder/i/iron_golem.txt
@@ -3,6 +3,6 @@ ManaCost:4
 Types:Artifact Creature Golem
 PT:5/3
 K:Vigilance
-K:CARDNAME attacks each combat if able.
+S:Mode$ MustAttack | Affected$ Card.Self | Description$ CARDNAME attacks each combat if able.
 K:CARDNAME blocks each combat if able.
 Oracle:Vigilance\nIron Golem attacks or blocks each combat if able.