diff --git a/forge-gui/res/cardsfolder/d/deadly_rollick.txt b/forge-gui/res/cardsfolder/d/deadly_rollick.txt
index 6a4bf7543d6..5d70062ae5d 100644
--- a/forge-gui/res/cardsfolder/d/deadly_rollick.txt
+++ b/forge-gui/res/cardsfolder/d/deadly_rollick.txt
@@ -1,6 +1,7 @@
 Name:Deadly Rollick
 ManaCost:3 B
 Types:Instant
-S:Mode$ Continuous | CharacteristicDefining$ True | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | Description$ If you control a commander, you may cast this spell without paying its mana cost.
 A:SP$ ChangeZone | Cost$ 3 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature.
+SVar:X:Count$Valid Card.IsCommander+YouCtrl
 Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nExile target creature.
diff --git a/forge-gui/res/cardsfolder/d/deflecting_swat.txt b/forge-gui/res/cardsfolder/d/deflecting_swat.txt
index 02de0439a89..33b2c79c840 100755
--- a/forge-gui/res/cardsfolder/d/deflecting_swat.txt
+++ b/forge-gui/res/cardsfolder/d/deflecting_swat.txt
@@ -1,6 +1,7 @@
 Name:Deflecting Swat
 ManaCost:2 R
 Types:Instant
-S:Mode$ Continuous | CharacteristicDefining$ True | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True |AddKeyword$ Alternative Cost:0 | CheckSVar$ X | Description$ If you control a commander, you may cast this spell without paying its mana cost.
 A:SP$ ChangeTargets | Cost$ 2 R | TargetType$ Spell,Activated,Triggered | Optional$ True | ValidTgts$ Card | TgtPrompt$ Select target spell or ability | SpellDescription$ You may choose new targets for target spell or ability.
+SVar:X:Count$Valid Card.IsCommander+YouCtrl
 Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nYou may choose new targets for target spell or ability.
diff --git a/forge-gui/res/cardsfolder/f/fierce_guardianship.txt b/forge-gui/res/cardsfolder/f/fierce_guardianship.txt
index 5624538c8e9..5abe2812cd5 100644
--- a/forge-gui/res/cardsfolder/f/fierce_guardianship.txt
+++ b/forge-gui/res/cardsfolder/f/fierce_guardianship.txt
@@ -1,6 +1,7 @@
 Name:Fierce Guardianship
 ManaCost:2 U
 Types:Instant
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | Description$ If you control a commander, you may cast this spell without paying its mana cost.
 A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target noncreature Spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
+SVar:X:Count$Valid Card.IsCommander+YouCtrl
 Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nCounter target noncreature spell.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/flawless_maneuver.txt b/forge-gui/res/cardsfolder/f/flawless_maneuver.txt
index e500193d7f1..1dba675b08c 100755
--- a/forge-gui/res/cardsfolder/f/flawless_maneuver.txt
+++ b/forge-gui/res/cardsfolder/f/flawless_maneuver.txt
@@ -1,6 +1,7 @@
 Name:Flawless Maneuver
 ManaCost:2 W
 Types:Instant
-S:Mode$ Continuous | CharacteristicDefining$ True | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | Description$ If you control a commander, you may cast this spell without paying its mana cost.
 A:SP$ PumpAll | Cost$ 2 W | ValidCards$ Creature.YouCtrl | KW$ Indestructible | SpellDescription$ Creatures you control gain indestructible until end of turn.
+SVar:X:Count$Valid Card.IsCommander+YouCtrl
 Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nCreatures you control gain indestructible until end of turn.
diff --git a/forge-gui/res/cardsfolder/o/obscuring_haze.txt b/forge-gui/res/cardsfolder/o/obscuring_haze.txt
index 67f04d51372..437319c2b9b 100755
--- a/forge-gui/res/cardsfolder/o/obscuring_haze.txt
+++ b/forge-gui/res/cardsfolder/o/obscuring_haze.txt
@@ -1,7 +1,8 @@
 Name:Obscuring Haze
 ManaCost:2 G
 Types:Instant
-S:Mode$ Continuous | CharacteristicDefining$ True | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | Description$ If you control a commander, you may cast this spell without paying its mana cost.
 A:SP$ Effect | Cost$ 2 G | ReplacementEffects$ RPrevent | AILogic$ Fog | SpellDescription$ Prevent all damage that would be dealt this turn by creatures your opponents control.
+SVar:X:Count$Valid Card.IsCommander+YouCtrl
 SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidSource$ Creature.OppCtrl | Description$ Prevent all damage that would be dealt this turn by creatures your opponents control.
 Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nPrevent all damage that would be dealt this turn by creatures your opponents control.