diff --git a/forge-gui/res/cardsfolder/a/altar_golem.txt b/forge-gui/res/cardsfolder/a/altar_golem.txt
index cdabda619f4..0cf9abae3e0 100644
--- a/forge-gui/res/cardsfolder/a/altar_golem.txt
+++ b/forge-gui/res/cardsfolder/a/altar_golem.txt
@@ -3,7 +3,7 @@ ManaCost:7
 Types:Artifact Creature Golem
 PT:*/*
 K:Trample
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of creatures on the battlefield.
 SVar:X:Count$Valid Creature
 A:AB$ Untap | Cost$ tapXType<5/Creature> | SpellDescription$ Untap CARDNAME.
diff --git a/forge-gui/res/cardsfolder/b/basalt_monolith.txt b/forge-gui/res/cardsfolder/b/basalt_monolith.txt
index c39850bf3d1..1306a24f562 100644
--- a/forge-gui/res/cardsfolder/b/basalt_monolith.txt
+++ b/forge-gui/res/cardsfolder/b/basalt_monolith.txt
@@ -1,7 +1,7 @@
 Name:Basalt Monolith
 ManaCost:3
 Types:Artifact
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 A:AB$ Untap | Cost$ 3 | SpellDescription$ Untap CARDNAME.
 A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C}.
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/b/battered_golem.txt b/forge-gui/res/cardsfolder/b/battered_golem.txt
index d2d543bccd0..4a9e0e15feb 100644
--- a/forge-gui/res/cardsfolder/b/battered_golem.txt
+++ b/forge-gui/res/cardsfolder/b/battered_golem.txt
@@ -2,7 +2,7 @@ Name:Battered Golem
 ManaCost:3
 Types:Artifact Creature Golem
 PT:3/2
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact | IsPresent$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever an artifact enters the battlefield, you may untap CARDNAME.
 SVar:TrigUntap:DB$Untap | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/battered_golem.jpg
diff --git a/forge-gui/res/cardsfolder/b/black_carriage.txt b/forge-gui/res/cardsfolder/b/black_carriage.txt
index e8a47be63c8..1bdf38d4bae 100644
--- a/forge-gui/res/cardsfolder/b/black_carriage.txt
+++ b/forge-gui/res/cardsfolder/b/black_carriage.txt
@@ -3,7 +3,7 @@ ManaCost:3 B B
 Types:Creature Horse
 PT:4/4
 K:Trample
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 A:AB$ Untap | Cost$ Sac<1/Creature> | ActivationPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Untap CARDNAME. Activate this ability only during your upkeep.
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/black_carriage.jpg
diff --git a/forge-gui/res/cardsfolder/b/brass_gnat.txt b/forge-gui/res/cardsfolder/b/brass_gnat.txt
index 69db5a4e3fa..92719050b9f 100644
--- a/forge-gui/res/cardsfolder/b/brass_gnat.txt
+++ b/forge-gui/res/cardsfolder/b/brass_gnat.txt
@@ -3,7 +3,7 @@ ManaCost:1
 Types:Artifact Creature Insect
 PT:1/1
 K:Flying
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | OptionalDecider$ You | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may pay {1}. If you do, untap CARDNAME.
 SVar:TrigUntap:AB$Untap | Cost$ 1 | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brass_gnat.jpg
diff --git a/forge-gui/res/cardsfolder/b/brass_man.txt b/forge-gui/res/cardsfolder/b/brass_man.txt
index 347b5329cee..e31b594b269 100644
--- a/forge-gui/res/cardsfolder/b/brass_man.txt
+++ b/forge-gui/res/cardsfolder/b/brass_man.txt
@@ -2,7 +2,7 @@ Name:Brass Man
 ManaCost:1
 Types:Artifact Creature Construct
 PT:1/3
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | OptionalDecider$ You | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may pay {1}. If you do, untap CARDNAME.
 SVar:TrigUntap:AB$Untap | Cost$ 1 | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brass_man.jpg
diff --git a/forge-gui/res/cardsfolder/c/colossus_of_sardia.txt b/forge-gui/res/cardsfolder/c/colossus_of_sardia.txt
index d1ffcbd10fd..2710505f9a5 100644
--- a/forge-gui/res/cardsfolder/c/colossus_of_sardia.txt
+++ b/forge-gui/res/cardsfolder/c/colossus_of_sardia.txt
@@ -3,7 +3,7 @@ ManaCost:9
 Types:Artifact Creature Golem
 PT:9/9
 K:Trample
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 A:AB$ Untap | Cost$ 9 | ActivationPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Untap CARDNAME. Activate this ability only during your upkeep.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/colossus_of_sardia.jpg
 Oracle:Trample (This creature can deal excess combat damage to the player or planeswalker it's attacking.)\nColossus of Sardia doesn't untap during your untap step.\n{9}: Untap Colossus of Sardia. Activate this ability only during your upkeep.
diff --git a/forge-gui/res/cardsfolder/d/deep_slumber_titan.txt b/forge-gui/res/cardsfolder/d/deep_slumber_titan.txt
index c4c32fb2132..6e369f9c4d7 100644
--- a/forge-gui/res/cardsfolder/d/deep_slumber_titan.txt
+++ b/forge-gui/res/cardsfolder/d/deep_slumber_titan.txt
@@ -3,7 +3,7 @@ ManaCost:2 R R
 Types:Creature Giant Warrior
 PT:7/7
 K:CARDNAME enters the battlefield tapped.
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ DamageDoneOnce | ValidTarget$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME is dealt damage, untap it.
 SVar:TrigUntap:DB$ Untap | Defined$ Self
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/d/dormant_gomazoa.txt b/forge-gui/res/cardsfolder/d/dormant_gomazoa.txt
index bd87f65f906..4e43a690c7f 100644
--- a/forge-gui/res/cardsfolder/d/dormant_gomazoa.txt
+++ b/forge-gui/res/cardsfolder/d/dormant_gomazoa.txt
@@ -4,7 +4,7 @@ Types:Creature Jellyfish
 PT:5/5
 K:Flying
 K:CARDNAME enters the battlefield tapped.
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ BecomesTarget | ValidTarget$ You | SourceType$ Spell | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever you become the target of a spell, you may untap CARDNAME.
 SVar:TrigUntap:DB$Untap | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dormant_gomazoa.jpg
diff --git a/forge-gui/res/cardsfolder/d/dwarven_patrol.txt b/forge-gui/res/cardsfolder/d/dwarven_patrol.txt
index fef6ee68d03..a0657bc0eb3 100644
--- a/forge-gui/res/cardsfolder/d/dwarven_patrol.txt
+++ b/forge-gui/res/cardsfolder/d/dwarven_patrol.txt
@@ -2,7 +2,7 @@ Name:Dwarven Patrol
 ManaCost:2 R
 Types:Creature Dwarf
 PT:4/2
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ SpellCast | ValidCard$ Card.nonRed | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever you cast a nonred spell, untap CARDNAME.
 SVar:TrigUntap:DB$Untap | Defined$ Self
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/e/elaborate_firecannon.txt b/forge-gui/res/cardsfolder/e/elaborate_firecannon.txt
index f1d645f3b74..db77805d0a2 100644
--- a/forge-gui/res/cardsfolder/e/elaborate_firecannon.txt
+++ b/forge-gui/res/cardsfolder/e/elaborate_firecannon.txt
@@ -1,9 +1,9 @@
 Name:Elaborate Firecannon
 ManaCost:2
 Types:Artifact
-K:CARDNAME doesn't untap during your untap step. 
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 A:AB$ DealDamage | Cost$ 4 T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ At the beginning of your upkeep, you may discard a card. If you do, untap CARDNAME.
 SVar:TrigUntap:AB$Untap | Cost$ Discard<1/Card> | Defined$ Self 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elaborate_firecannon.jpg
-Oracle:Elaborate Firecannon doesn't untap during your untap step.\n{4}, {T}: Elaborate Firecannon deals 2 damage to any target.\nAt the beginning of your upkeep, you may discard a card. If you do, untap Elaborate Firecannon.
\ No newline at end of file
+Oracle:Elaborate Firecannon doesn't untap during your untap step.\n{4}, {T}: Elaborate Firecannon deals 2 damage to any target.\nAt the beginning of your upkeep, you may discard a card. If you do, untap Elaborate Firecannon.
diff --git a/forge-gui/res/cardsfolder/f/famished_paladin.txt b/forge-gui/res/cardsfolder/f/famished_paladin.txt
index e51541affe9..73fae30bff3 100644
--- a/forge-gui/res/cardsfolder/f/famished_paladin.txt
+++ b/forge-gui/res/cardsfolder/f/famished_paladin.txt
@@ -2,7 +2,7 @@ Name:Famished Paladin
 ManaCost:1 W
 Types:Creature Vampire Knight
 PT:3/3
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap  | TriggerDescription$ Whenever you gain life, untap CARDNAME. 
 SVar:TrigUntap:DB$ Untap | Defined$ Self
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/f/farmstead_gleaner.txt b/forge-gui/res/cardsfolder/f/farmstead_gleaner.txt
index 92bde11d0d3..6158ee918ca 100644
--- a/forge-gui/res/cardsfolder/f/farmstead_gleaner.txt
+++ b/forge-gui/res/cardsfolder/f/farmstead_gleaner.txt
@@ -2,7 +2,7 @@ Name:Farmstead Gleaner
 ManaCost:3
 Types:Artifact Creature Scarecrow
 PT:2/2
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 A:AB$ PutCounter | Cost$ 2 Q | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
 DeckHas:Ability$Counters
 Oracle:Farmstead Gleaner doesn't untap during your untap step.\n{2}, {Q}: Put a +1/+1 counter on Farmstead Gleaner. ({Q} is the untap symbol.)
diff --git a/forge-gui/res/cardsfolder/f/forsaken_city.txt b/forge-gui/res/cardsfolder/f/forsaken_city.txt
index 7428978c384..6e5e99902c7 100644
--- a/forge-gui/res/cardsfolder/f/forsaken_city.txt
+++ b/forge-gui/res/cardsfolder/f/forsaken_city.txt
@@ -1,7 +1,7 @@
 Name:Forsaken City
 ManaCost:no cost
 Types:Land
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ At the beginning of your upkeep, you may exile a card from your hand. If you do, untap CARDNAME.
 SVar:TrigUntap:AB$Untap | Cost$ ExileFromHand<1/Card> | Defined$ Self
diff --git a/forge-gui/res/cardsfolder/g/galvanic_juggernaut.txt b/forge-gui/res/cardsfolder/g/galvanic_juggernaut.txt
index aff359beb9c..90a84738087 100644
--- a/forge-gui/res/cardsfolder/g/galvanic_juggernaut.txt
+++ b/forge-gui/res/cardsfolder/g/galvanic_juggernaut.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact Creature Juggernaut
 PT:5/5
 K:CARDNAME attacks each combat if able.
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ 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
 SVar:Picture:http://www.wizards.com/global/images/magic/general/galvanic_juggernaut.jpg
diff --git a/forge-gui/res/cardsfolder/g/goblin_dirigible.txt b/forge-gui/res/cardsfolder/g/goblin_dirigible.txt
index eb3c53edc50..5c432c1bb87 100644
--- a/forge-gui/res/cardsfolder/g/goblin_dirigible.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_dirigible.txt
@@ -3,7 +3,7 @@ ManaCost:6
 Types:Artifact Creature Construct
 PT:4/4
 K:Flying
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ At the beginning of your upkeep, you may pay {4}. If you do, untap CARDNAME.
 SVar:TrigUntap:AB$Untap | Cost$ 4 | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_dirigible.jpg
diff --git a/forge-gui/res/cardsfolder/g/goblin_sharpshooter.txt b/forge-gui/res/cardsfolder/g/goblin_sharpshooter.txt
index 72875ba1136..2e6662edc7d 100644
--- a/forge-gui/res/cardsfolder/g/goblin_sharpshooter.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_sharpshooter.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Creature Goblin
 PT:1/1
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target.
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever a creature dies, untap CARDNAME.
 SVar:TrigUntap:DB$Untap | Defined$ Self
 SVar:NonCombatPriority:1
diff --git a/forge-gui/res/cardsfolder/g/goblin_war_wagon.txt b/forge-gui/res/cardsfolder/g/goblin_war_wagon.txt
index bd730ff26eb..241187dd982 100644
--- a/forge-gui/res/cardsfolder/g/goblin_war_wagon.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_war_wagon.txt
@@ -2,7 +2,7 @@ Name:Goblin War Wagon
 ManaCost:4
 Types:Artifact Creature Juggernaut
 PT:3/3
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ At the beginning of your upkeep, you may pay {2}. If you do, untap CARDNAME.
 SVar:TrigUntap:AB$Untap | Cost$ 2 | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_war_wagon.jpg
diff --git a/forge-gui/res/cardsfolder/g/grim_monolith.txt b/forge-gui/res/cardsfolder/g/grim_monolith.txt
index ca1487726f4..502dfc2ad15 100644
--- a/forge-gui/res/cardsfolder/g/grim_monolith.txt
+++ b/forge-gui/res/cardsfolder/g/grim_monolith.txt
@@ -1,7 +1,7 @@
 Name:Grim Monolith
 ManaCost:2
 Types:Artifact
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 A:AB$ Untap | Cost$ 4 | AILogic$ EOT | SpellDescription$ Untap CARDNAME.
 A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C}.
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/g/grimgrin_corpse_born.txt b/forge-gui/res/cardsfolder/g/grimgrin_corpse_born.txt
index e4fe5ff7979..a64cb567fc3 100644
--- a/forge-gui/res/cardsfolder/g/grimgrin_corpse_born.txt
+++ b/forge-gui/res/cardsfolder/g/grimgrin_corpse_born.txt
@@ -3,7 +3,7 @@ ManaCost:3 U B
 Types:Legendary Creature Zombie Warrior
 PT:5/5
 K:CARDNAME enters the battlefield tapped.
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 A:AB$ Untap | Cost$ Sac<1/Creature.Other/another creature> | SubAbility$ DBPutCounter | SpellDescription$ Untap CARDNAME and put a +1/+1 counter on it.
 SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME attacks, destroy target creature defending player controls, then put a +1/+1 counter on CARDNAME.
diff --git a/forge-gui/res/cardsfolder/i/island_fish_jasconius.txt b/forge-gui/res/cardsfolder/i/island_fish_jasconius.txt
index 10ab7b207c6..d27de9f722f 100644
--- a/forge-gui/res/cardsfolder/i/island_fish_jasconius.txt
+++ b/forge-gui/res/cardsfolder/i/island_fish_jasconius.txt
@@ -3,7 +3,7 @@ ManaCost:4 U U U
 Types:Creature Fish
 PT:6/8
 S:Mode$ CantAttack | ValidCard$ Card.Self | UnlessDefenderControls$ Island | Description$ CARDNAME can't attack unless defending player controls an Island.
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Island.YouCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When you control no Islands, sacrifice CARDNAME.
 SVar:TrigSac:DB$Sacrifice | Defined$ Self
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ At the beginning of your upkeep, you may pay {U}{U}{U}. If you do, untap CARDNAME.
diff --git a/forge-gui/res/cardsfolder/j/jokulmorder.txt b/forge-gui/res/cardsfolder/j/jokulmorder.txt
index caabd807834..3f61aaeedfe 100644
--- a/forge-gui/res/cardsfolder/j/jokulmorder.txt
+++ b/forge-gui/res/cardsfolder/j/jokulmorder.txt
@@ -6,7 +6,7 @@ K:Trample
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you sacrifice five lands.
 SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Sac<5/Land> | UnlessPayer$ You
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ LandPlayed | ValidCard$ Island.YouCtrl | Execute$ TrigUntap | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you play an Island, you may untap CARDNAME.
 SVar:TrigUntap:DB$ Untap | Defined$ Self
 SVar:NeedsToPlayVar:Y GE5
diff --git a/forge-gui/res/cardsfolder/l/leviathan.txt b/forge-gui/res/cardsfolder/l/leviathan.txt
index 53709d6109c..f3fa91f9662 100644
--- a/forge-gui/res/cardsfolder/l/leviathan.txt
+++ b/forge-gui/res/cardsfolder/l/leviathan.txt
@@ -4,7 +4,7 @@ Types:Creature Leviathan
 PT:10/10
 K:Trample
 K:CARDNAME enters the battlefield tapped.
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | OptionalDecider$ You | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may sacrifice two Islands. If you do, untap CARDNAME.
 SVar:TrigUntap:AB$ Untap | Cost$ Sac<2/Island>
 S:Mode$ CantAttackUnless | ValidCard$ Creature.Self | Target$ Player,Planeswalker | Cost$ Sac<2/Island> | Description$ CARDNAME can't attack unless you sacrifice two islands. (This cost is paid as attackers are declared.)
diff --git a/forge-gui/res/cardsfolder/m/mage_ring_responder.txt b/forge-gui/res/cardsfolder/m/mage_ring_responder.txt
index 5d52883eafc..ee6e97bc198 100644
--- a/forge-gui/res/cardsfolder/m/mage_ring_responder.txt
+++ b/forge-gui/res/cardsfolder/m/mage_ring_responder.txt
@@ -2,7 +2,7 @@ Name:Mage-Ring Responder
 ManaCost:7
 Types:Artifact Creature Golem
 PT:7/7
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 A:AB$ Untap | Cost$ 7 | SpellDescription$ Untap CARDNAME.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME attacks, it deals 7 damage to target creature defending player controls.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature.DefenderCtrl | TgtPrompt$ Select target creature defending player controls | NumDmg$ 7
diff --git a/forge-gui/res/cardsfolder/m/mana_vault.txt b/forge-gui/res/cardsfolder/m/mana_vault.txt
index 1d3d224d168..8ffc7523313 100644
--- a/forge-gui/res/cardsfolder/m/mana_vault.txt
+++ b/forge-gui/res/cardsfolder/m/mana_vault.txt
@@ -2,7 +2,7 @@ Name:Mana Vault
 ManaCost:1
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C}.
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ At the beginning of your upkeep, you may pay {4}. If you do, untap CARDNAME.
 T:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | IsPresent$ Card.Self+tapped | Execute$ TrigDamage | TriggerDescription$ At the beginning of your draw step, if CARDNAME is tapped, it deals 1 damage to you.
 SVar:TrigUntap:AB$Untap | Cost$ 4 | Defined$ Self
diff --git a/forge-gui/res/cardsfolder/m/marjhan.txt b/forge-gui/res/cardsfolder/m/marjhan.txt
index 8d0cd6fad16..6f760b53d1e 100644
--- a/forge-gui/res/cardsfolder/m/marjhan.txt
+++ b/forge-gui/res/cardsfolder/m/marjhan.txt
@@ -2,7 +2,7 @@ Name:Marjhan
 ManaCost:5 U U
 Types:Creature Serpent
 PT:8/8
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 S:Mode$ CantAttack | ValidCard$ Card.Self | UnlessDefenderControls$ Island | Description$ CARDNAME can't attack unless defending player controls an Island.
 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Island.YouCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When you control no Islands, sacrifice CARDNAME.
 SVar:TrigSac:DB$Sacrifice | Defined$ Self
diff --git a/forge-gui/res/cardsfolder/m/merieke_ri_berit.txt b/forge-gui/res/cardsfolder/m/merieke_ri_berit.txt
index 62ef6f9f744..543052310b1 100644
--- a/forge-gui/res/cardsfolder/m/merieke_ri_berit.txt
+++ b/forge-gui/res/cardsfolder/m/merieke_ri_berit.txt
@@ -2,7 +2,7 @@ Name:Merieke Ri Berit
 ManaCost:W U B
 Types:Legendary Creature Human
 PT:1/1
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 A:AB$ GainControl | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ LeavesPlay,LoseControl | DestroyTgt$ LeavesPlay,LoseControl,Untap | NoRegen$ True | SpellDescription$ Gain control of target creature for as long as you control CARDNAME. When CARDNAME leaves the battlefield or becomes untapped, destroy that creature. It can't be regenerated.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/merieke_ri_berit.jpg
 Oracle:Merieke Ri Berit doesn't untap during your untap step.\n{T}: Gain control of target creature for as long as you control Merieke Ri Berit. When Merieke Ri Berit leaves the battlefield or becomes untapped, destroy that creature. It can't be regenerated.
diff --git a/forge-gui/res/cardsfolder/n/nettle_sentinel.txt b/forge-gui/res/cardsfolder/n/nettle_sentinel.txt
index e3a02f70e0e..053fff9b4f6 100644
--- a/forge-gui/res/cardsfolder/n/nettle_sentinel.txt
+++ b/forge-gui/res/cardsfolder/n/nettle_sentinel.txt
@@ -2,7 +2,7 @@ Name:Nettle Sentinel
 ManaCost:G
 Types:Creature Elf Warrior
 PT:2/2
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ SpellCast | ValidCard$ Card.Green | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever you cast a green spell, you may untap CARDNAME.
 SVar:TrigUntap:DB$Untap | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nettle_sentinel.jpg
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_colossus.txt b/forge-gui/res/cardsfolder/p/phyrexian_colossus.txt
index 26cf479d3db..42f8d7a230b 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_colossus.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_colossus.txt
@@ -2,7 +2,7 @@ Name:Phyrexian Colossus
 ManaCost:7
 Types:Artifact Creature Golem
 PT:8/8
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 A:AB$ Untap | Cost$ PayLife<8> | SpellDescription$ Untap CARDNAME.
 K:CantBeBlockedByAmount LT3
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_ironfoot.txt b/forge-gui/res/cardsfolder/p/phyrexian_ironfoot.txt
index 5dd9f841322..e97dd9f9503 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_ironfoot.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_ironfoot.txt
@@ -2,7 +2,7 @@ Name:Phyrexian Ironfoot
 ManaCost:3
 Types:Snow Artifact Creature Construct
 PT:3/4
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 A:AB$ Untap | Cost$ 1 S | SpellDescription$ Untap CARDNAME.
 # AI can now use snow mana to pay for activated abilities.
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/s/soldevi_golem.txt b/forge-gui/res/cardsfolder/s/soldevi_golem.txt
index 33ec0c58e59..45f6e46ff0f 100644
--- a/forge-gui/res/cardsfolder/s/soldevi_golem.txt
+++ b/forge-gui/res/cardsfolder/s/soldevi_golem.txt
@@ -2,7 +2,7 @@ Name:Soldevi Golem
 ManaCost:4
 Types:Artifact Creature Golem
 PT:5/3
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | OptionalDecider$ You | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may untap target tapped creature an opponent controls. If you do, untap CARDNAME.
 SVar:TrigUntap:DB$ Untap | ValidTgts$ Creature.OppCtrl+tapped | TgtPrompt$ Select target tapped creature an opponent controls | SubAbility$ DBUntap
 SVar:DBUntap:DB$ Untap | Defined$ Self
diff --git a/forge-gui/res/cardsfolder/s/sunstrike_legionnaire.txt b/forge-gui/res/cardsfolder/s/sunstrike_legionnaire.txt
index 12b92f72285..cd1572dfe03 100644
--- a/forge-gui/res/cardsfolder/s/sunstrike_legionnaire.txt
+++ b/forge-gui/res/cardsfolder/s/sunstrike_legionnaire.txt
@@ -2,7 +2,7 @@ Name:Sunstrike Legionnaire
 ManaCost:1 W
 Types:Creature Human Soldier
 PT:1/2
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever another creature enters the battlefield, untap CARDNAME.
 A:AB$ Tap | Cost$ T | ValidTgts$ Creature.cmcLE3 | TgtPrompt$ Select target creature with converted mana cost 3 or less | SpellDescription$ Tap target creature with converted mana cost 3 or less.
 SVar:TrigUntap:DB$Untap | Defined$ Self
diff --git a/forge-gui/res/cardsfolder/t/time_vault.txt b/forge-gui/res/cardsfolder/t/time_vault.txt
index 30e898d2bfc..0f5b3a1bc8f 100644
--- a/forge-gui/res/cardsfolder/t/time_vault.txt
+++ b/forge-gui/res/cardsfolder/t/time_vault.txt
@@ -2,7 +2,7 @@ Name:Time Vault
 ManaCost:2
 Types:Artifact
 Text:If you would begin your turn while CARDNAME is tapped, you may skip that turn instead. If you do, untap CARDNAME.
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 K:CARDNAME enters the battlefield tapped.
 A:AB$ AddTurn | Cost$ T | NumTurns$ 1 | SpellDescription$ Take an extra turn after this one.
 SVar:PlayMain1:ALWAYS
diff --git a/forge-gui/res/cardsfolder/t/traxos_scourge_of_kroog.txt b/forge-gui/res/cardsfolder/t/traxos_scourge_of_kroog.txt
index 7d5fa2d92a7..21afc31ab92 100644
--- a/forge-gui/res/cardsfolder/t/traxos_scourge_of_kroog.txt
+++ b/forge-gui/res/cardsfolder/t/traxos_scourge_of_kroog.txt
@@ -4,7 +4,7 @@ Types:Legendary Artifact Creature Construct
 PT:7/7
 K:Trample
 K:CARDNAME enters the battlefield tapped.
-K:CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Card.Self | CantUntap$ True | Description$ CARDNAME doesn't untap during your untap step.
 T:Mode$ SpellCast | ValidCard$ Card.Historic | ValidActivatingPlayer$ You | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a historic spell, untap Traxos. (Artifacts, legendaries, and Sagas are historic.)
 SVar:TrigUntap:DB$ Untap | Defined$ Self
 SVar:BuffedBy:Card.Historic