diff --git a/res/cardsfolder/m/magistrates_veto.txt b/res/cardsfolder/m/magistrates_veto.txt
index da651838471..cc55aaaa3b0 100644
--- a/res/cardsfolder/m/magistrates_veto.txt
+++ b/res/cardsfolder/m/magistrates_veto.txt
@@ -2,7 +2,7 @@ Name:Magistrate's Veto
 ManaCost:2 R
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.White,Creature.Blue | AddKeyword$ HIDDEN CARDNAME can't block. | Description$ White creatures and blue creatures can't block.
+S:Mode$ Continuous | Affected$ Creature.White,Creature.Blue | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | Description$ White creatures and blue creatures can't block.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magistrates_veto.jpg
diff --git a/res/cardsfolder/m/magus_of_the_moat.txt b/res/cardsfolder/m/magus_of_the_moat.txt
index 0673a613449..9c0014bf42e 100644
--- a/res/cardsfolder/m/magus_of_the_moat.txt
+++ b/res/cardsfolder/m/magus_of_the_moat.txt
@@ -3,7 +3,7 @@ ManaCost:2 W W
 Types:Creature Human Wizard
 Text:no text
 PT:0/3
-S:Mode$ Continuous | Affected$ Creature.withoutFlying | AddKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures without flying can't attack.
+S:Mode$ Continuous | Affected$ Creature.withoutFlying | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures without flying can't attack.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_moat.jpg
diff --git a/res/cardsfolder/m/mana_leech.txt b/res/cardsfolder/m/mana_leech.txt
index c34f7fdb9a1..9af873bd4bb 100644
--- a/res/cardsfolder/m/mana_leech.txt
+++ b/res/cardsfolder/m/mana_leech.txt
@@ -6,7 +6,7 @@ PT:1/1
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Pump | Cost$ T | ValidTgts$ Land | TgtPrompt$ Select target land | RememberTargets$ True |  SubAbility$ DBTap | SpellDescription$ Tap target land. It doesn't untap during its controller's untap step for as long as CARDNAME remains tapped.
 SVar:DBTap:DB$Tap | Defined$ Targeted
-S:Mode$ Continuous | Affected$ Land.IsRemembered | AddKeyword$ HIDDEN This card doesn't untap during your next untap step.
+S:Mode$ Continuous | Affected$ Land.IsRemembered | AddHiddenKeyword$ HIDDEN This card doesn't untap during your next untap step.
 T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigClearRemember | Static$ True
 SVar:TrigClearRemember:DB$Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/m/manacles_of_decay.txt b/res/cardsfolder/m/manacles_of_decay.txt
index c07849e1a5e..a25c1870b15 100644
--- a/res/cardsfolder/m/manacles_of_decay.txt
+++ b/res/cardsfolder/m/manacles_of_decay.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME can't attack. | Description$ Enchanted creature can't attack.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Enchanted creature can't attack.
 A:AB$ Pump | Cost$ B | Defined$ Enchanted | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Enchanted creature gets -1/-1 until end of turn.
 A:AB$ Pump | Cost$ R | Defined$ Enchanted | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ Enchanted creature can't block this turn.
 SVar:Rarity:Common
diff --git a/res/cardsfolder/m/maniacal_rage.txt b/res/cardsfolder/m/maniacal_rage.txt
index ba2e03a1662..c49e39f9030 100644
--- a/res/cardsfolder/m/maniacal_rage.txt
+++ b/res/cardsfolder/m/maniacal_rage.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ HIDDEN CARDNAME can't block. | Description$ Enchanted creature gets +2/+2 and can't block.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | Description$ Enchanted creature gets +2/+2 and can't block.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/maniacal_rage.jpg
 SetInfo:EXO|Common|http://magiccards.info/scans/en/ex/87.jpg
diff --git a/res/cardsfolder/m/melancholy.txt b/res/cardsfolder/m/melancholy.txt
index 372eba7ff1e..1fb48ee876f 100644
--- a/res/cardsfolder/m/melancholy.txt
+++ b/res/cardsfolder/m/melancholy.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature | AILogic$ KeepTapped
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap enchanted creature.
 SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ Enchanted
 K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay B
diff --git a/res/cardsfolder/m/mire_blight.txt b/res/cardsfolder/m/mire_blight.txt
index 44c212c84ea..cf4556f420c 100644
--- a/res/cardsfolder/m/mire_blight.txt
+++ b/res/cardsfolder/m/mire_blight.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ B | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN When CARDNAME is dealt damage, destroy it. | Description$ When enchanted creature is dealt damage, destroy it.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN When CARDNAME is dealt damage, destroy it. | Description$ When enchanted creature is dealt damage, destroy it.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mire_blight.jpg
 SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/104.jpg
diff --git a/res/cardsfolder/m/moat.txt b/res/cardsfolder/m/moat.txt
index f6ee72dd06b..4238e6b8075 100644
--- a/res/cardsfolder/m/moat.txt
+++ b/res/cardsfolder/m/moat.txt
@@ -2,7 +2,7 @@ Name:Moat
 ManaCost:2 W W
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.withoutFlying | AddKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures without flying can't attack.
+S:Mode$ Continuous | Affected$ Creature.withoutFlying | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures without flying can't attack.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/moat.jpg
diff --git a/res/cardsfolder/m/mole_worms.txt b/res/cardsfolder/m/mole_worms.txt
index 5704fc7c808..dad2a3a981c 100644
--- a/res/cardsfolder/m/mole_worms.txt
+++ b/res/cardsfolder/m/mole_worms.txt
@@ -6,7 +6,7 @@ PT:1/1
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Pump | Cost$ T | ValidTgts$ Land | TgtPrompt$ Select target land | RememberTargets$ True |  SubAbility$ DBTap | SpellDescription$ Tap target land. It doesn't untap during its controller's untap step for as long as CARDNAME remains tapped.
 SVar:DBTap:DB$Tap | Defined$ Targeted
-S:Mode$ Continuous | Affected$ Land.IsRemembered | AddKeyword$ HIDDEN This card doesn't untap during your next untap step.
+S:Mode$ Continuous | Affected$ Land.IsRemembered | AddHiddenKeyword$ HIDDEN This card doesn't untap during your next untap step.
 T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigClearRemember | Static$ True
 SVar:TrigClearRemember:DB$Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/m/mortal_wound.txt b/res/cardsfolder/m/mortal_wound.txt
index 8e18c611a4e..5ed10430a15 100644
--- a/res/cardsfolder/m/mortal_wound.txt
+++ b/res/cardsfolder/m/mortal_wound.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ G | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN When CARDNAME is dealt damage, destroy it. | Description$ When enchanted creature is dealt damage, destroy it.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN When CARDNAME is dealt damage, destroy it. | Description$ When enchanted creature is dealt damage, destroy it.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mortal_wound.jpg
 SetInfo:VIS|Common|http://magiccards.info/scans/en/vi/63.jpg
diff --git a/res/cardsfolder/m/murkfiend_liege.txt b/res/cardsfolder/m/murkfiend_liege.txt
index 681ec36ee45..f57a68c9a3b 100644
--- a/res/cardsfolder/m/murkfiend_liege.txt
+++ b/res/cardsfolder/m/murkfiend_liege.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:4/4
 S:Mode$ Continuous | Affected$ Creature.Green+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other green creatures you control get +1/+1.
 S:Mode$ Continuous | Affected$ Creature.Blue+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other blue creatures you control get +1/+1.
-S:Mode$ Continuous | Affected$ Creature.Green+YouCtrl,Creature.Blue+YouCtrl | AddKeyword$ HIDDEN CARDNAME untaps during each other player's untap step. | Description$ Untap all green and/or blue creatures you control during each other player's untap step.
+S:Mode$ Continuous | Affected$ Creature.Green+YouCtrl,Creature.Blue+YouCtrl | AddHiddenKeyword$ HIDDEN CARDNAME untaps during each other player's untap step. | Description$ Untap all green and/or blue creatures you control during each other player's untap step.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/murkfiend_liege.jpg
diff --git a/res/cardsfolder/m/muzzle.txt b/res/cardsfolder/m/muzzle.txt
index fe3f29f87d2..ab3b5961878 100644
--- a/res/cardsfolder/m/muzzle.txt
+++ b/res/cardsfolder/m/muzzle.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN Prevent all damage that would be dealt by CARDNAME. | Description$ Prevent all damage that would be dealt by enchanted creature.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN Prevent all damage that would be dealt by CARDNAME. | Description$ Prevent all damage that would be dealt by enchanted creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/muzzle.jpg
 SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/30.jpg
diff --git a/res/cardsfolder/m/mystic_restraints.txt b/res/cardsfolder/m/mystic_restraints.txt
index afd1fe154d4..7d757b32fc6 100644
--- a/res/cardsfolder/m/mystic_restraints.txt
+++ b/res/cardsfolder/m/mystic_restraints.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Flash
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 U U | ValidTgts$ Creature | AILogic$ KeepTapped
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap enchanted creature.
 SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ Enchanted
 SVar:Rarity:Common
diff --git a/res/cardsfolder/n/neurok_spy.txt b/res/cardsfolder/n/neurok_spy.txt
index 7419ce553e1..7f0232598d3 100644
--- a/res/cardsfolder/n/neurok_spy.txt
+++ b/res/cardsfolder/n/neurok_spy.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Rogue
 Text:no text
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ HIDDEN Unblockable | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME is unblockable as long as defending player controls an artifact.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN Unblockable | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME is unblockable as long as defending player controls an artifact.
 SVar:X:Count$Valid Artifact.YouDontCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neurok_spy.jpg
diff --git a/res/cardsfolder/n/null_rod.txt b/res/cardsfolder/n/null_rod.txt
index e8aa90ae8e6..26949c24401 100644
--- a/res/cardsfolder/n/null_rod.txt
+++ b/res/cardsfolder/n/null_rod.txt
@@ -2,7 +2,7 @@ Name:Null Rod
 ManaCost:2
 Types:Artifact
 Text:no text
-S:Mode$ Continuous | Affected$ Artifact | AddKeyword$ HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Activated abilities of artifacts can't be activated.
+S:Mode$ Continuous | Affected$ Artifact | AddHiddenKeyword$ HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Activated abilities of artifacts can't be activated.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/null_rod.jpg
diff --git a/res/cardsfolder/n/numbing_dose.txt b/res/cardsfolder/n/numbing_dose.txt
index f2ef9b0ce22..1dde0c51001 100644
--- a/res/cardsfolder/n/numbing_dose.txt
+++ b/res/cardsfolder/n/numbing_dose.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant artifact or creature
 A:SP$ Attach | Cost$ 3 U U | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | AILogic$ KeepTapped
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted permanent doesn't untap during its controller's untap step.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted permanent doesn't untap during its controller's untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedController | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of the upkeep of enchanted permanent's controller, that player loses 1 life.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ TriggeredPlayer | LifeAmount$ 1
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/p/pacifism.txt b/res/cardsfolder/p/pacifism.txt
index 350736cc415..c38a029806d 100644
--- a/res/cardsfolder/p/pacifism.txt
+++ b/res/cardsfolder/p/pacifism.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME can't attack or block. | Description$ Enchanted creature can't attack or block.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. | Description$ Enchanted creature can't attack or block.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pacifism.jpg
 SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/33.jpg
diff --git a/res/cardsfolder/p/paralyzing_grasp.txt b/res/cardsfolder/p/paralyzing_grasp.txt
index 10990ebd1f9..0430ddcd215 100644
--- a/res/cardsfolder/p/paralyzing_grasp.txt
+++ b/res/cardsfolder/p/paralyzing_grasp.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 U | ValidTgts$ Creature | AILogic$ KeepTapped
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/paralyzing_grasp.jpg
 SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/58.jpg
diff --git a/res/cardsfolder/p/phyrexian_gremlins.txt b/res/cardsfolder/p/phyrexian_gremlins.txt
index 211b4158d1a..067d3c96730 100644
--- a/res/cardsfolder/p/phyrexian_gremlins.txt
+++ b/res/cardsfolder/p/phyrexian_gremlins.txt
@@ -6,7 +6,7 @@ PT:1/1
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Pump | Cost$ T | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | RememberTargets$ True |  SubAbility$ DBTap | SpellDescription$ Tap target artifact. It doesn't untap during its controller's untap step for as long as CARDNAME remains tapped.
 SVar:DBTap:DB$Tap | Defined$ Targeted
-S:Mode$ Continuous | Affected$ Creature.IsRemembered | AddKeyword$ HIDDEN This card doesn't untap during your next untap step.
+S:Mode$ Continuous | Affected$ Creature.IsRemembered | AddHiddenKeyword$ HIDDEN This card doesn't untap during your next untap step.
 T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigClearRemember | Static$ True
 SVar:TrigClearRemember:DB$Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/p/pillory_of_the_sleepless.txt b/res/cardsfolder/p/pillory_of_the_sleepless.txt
index fa4581a9124..ff7a8b4e3ba 100644
--- a/res/cardsfolder/p/pillory_of_the_sleepless.txt
+++ b/res/cardsfolder/p/pillory_of_the_sleepless.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 W B | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME can't attack. & HIDDEN CARDNAME can't block. | AddTrigger$ TriggerLoseLife | AddSVar$ TrigLoseLife | Description$ Enchanted creature can't attack or block. Enchanted creature has "At the beginning of your upkeep, you lose 1 life."
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. & HIDDEN CARDNAME can't block. | AddTrigger$ TriggerLoseLife | AddSVar$ TrigLoseLife | Description$ Enchanted creature can't attack or block. Enchanted creature has "At the beginning of your upkeep, you lose 1 life."
 SVar:TriggerLoseLife:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you lose 1 life.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Common
diff --git a/res/cardsfolder/p/plumes_of_peace.txt b/res/cardsfolder/p/plumes_of_peace.txt
index 3be7d729933..07101ce892d 100644
--- a/res/cardsfolder/p/plumes_of_peace.txt
+++ b/res/cardsfolder/p/plumes_of_peace.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 W U | ValidTgts$ Creature | AILogic$ KeepTapped
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
 A:AB$ Tap | Cost$ W U | TgtPrompt$ Choose target creature | ValidTgts$ Creature | ActivationZone$ Hand | ActivationLimit$ 1 | PlayerTurn$ True | ActivationPhases$ Upkeep | PrecostDesc$ Forecast - | CostDesc$ W U, Reveal CARDNAME from your hand: | SpellDescription$ Tap target creature. (Activate this ability only during your upkeep and only once each turn.)
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/plumes_of_peace.jpg
diff --git a/res/cardsfolder/p/protective_bubble.txt b/res/cardsfolder/p/protective_bubble.txt
index 5d8c4485b78..a22c0472a80 100644
--- a/res/cardsfolder/p/protective_bubble.txt
+++ b/res/cardsfolder/p/protective_bubble.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 3 U | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN Unblockable & Shroud | Description$ Enchanted creature is unblockable and has shroud.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN Unblockable & Shroud | Description$ Enchanted creature is unblockable and has shroud.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/protective_bubble.jpg
 SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/80.jpg
diff --git a/res/cardsfolder/p/psychic_overload.txt b/res/cardsfolder/p/psychic_overload.txt
index 8af0084d290..a3fa66d469e 100644
--- a/res/cardsfolder/p/psychic_overload.txt
+++ b/res/cardsfolder/p/psychic_overload.txt
@@ -6,7 +6,7 @@ K:Enchant permanent
 A:SP$ Attach | Cost$ 3 U | ValidTgts$ Permanent | AILogic$ KeepTapped
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap enchanted permanent.
 SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ Enchanted
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | AddAbility$ Untap | Description$ Enchanted permanent doesn't untap during its controller's untap step. Enchanted permanent has "Discard two artifact cards: Untap this permanent."
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | AddAbility$ Untap | Description$ Enchanted permanent doesn't untap during its controller's untap step. Enchanted permanent has "Discard two artifact cards: Untap this permanent."
 SVar:Untap:AB$Untap | Cost$ Discard<2/Artifact> | Defined$ Self | SpellDescription$ Discard two artifact cards: Untap this permanent.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/p/putrid_imp.txt b/res/cardsfolder/p/putrid_imp.txt
index 4074bb1260c..712b3651799 100644
--- a/res/cardsfolder/p/putrid_imp.txt
+++ b/res/cardsfolder/p/putrid_imp.txt
@@ -4,7 +4,7 @@ Types:Creature Zombie Imp
 Text:no text
 PT:1/1
 A:AB$ Pump | Cost$ Discard<1/Card> | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ HIDDEN CARDNAME can't block. | Threshold$ True | Description$ Threshold - As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1 and can't block.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | Threshold$ True | Description$ Threshold - As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1 and can't block.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/putrid_imp.jpg
diff --git a/res/cardsfolder/q/quest_for_renewal.txt b/res/cardsfolder/q/quest_for_renewal.txt
index 0b01f5fb2c2..17fa63874ca 100644
--- a/res/cardsfolder/q/quest_for_renewal.txt
+++ b/res/cardsfolder/q/quest_for_renewal.txt
@@ -2,7 +2,7 @@ Name:Quest for Renewal
 ManaCost:1 G
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ HIDDEN CARDNAME untaps during each other player's untap step. | CheckSVar$ X | SVarCompare$ EQ1 | Description$ As long as there are four or more quest counters on CARDNAME, untap all creatures you control during each other player's untap step.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ HIDDEN CARDNAME untaps during each other player's untap step. | CheckSVar$ X | SVarCompare$ EQ1 | Description$ As long as there are four or more quest counters on CARDNAME, untap all creatures you control during each other player's untap step.
 T:Mode$ Taps | ValidCard$ Creature.YouCtrl | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature you control becomes tapped, you may put a quest counter on CARDNAME.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
 SVar:X:Count$Valid Card.Self+countersGE4QUEST
diff --git a/res/cardsfolder/q/quick_sliver.txt b/res/cardsfolder/q/quick_sliver.txt
index 0717f3ba1ba..b34ec1d2605 100644
--- a/res/cardsfolder/q/quick_sliver.txt
+++ b/res/cardsfolder/q/quick_sliver.txt
@@ -4,7 +4,7 @@ Types:Creature Sliver
 Text:no text
 PT:1/1
 K:Flash
-S:Mode$ Continuous | Affected$ Sliver | AddKeyword$ HIDDEN Flash | AffectedZone$ Hand,Graveyard,Exile | Description$ Any player may play Sliver cards as though they had flash.
+S:Mode$ Continuous | Affected$ Sliver | AddHiddenKeyword$ HIDDEN Flash | AffectedZone$ Hand,Graveyard,Exile | Description$ Any player may play Sliver cards as though they had flash.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/quick_sliver.jpg
diff --git a/res/cardsfolder/r/razorjaw_oni.txt b/res/cardsfolder/r/razorjaw_oni.txt
index fc257af940b..2d4dee7c1b5 100644
--- a/res/cardsfolder/r/razorjaw_oni.txt
+++ b/res/cardsfolder/r/razorjaw_oni.txt
@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Demon Spirit
 Text:no text
 PT:4/5
-S:Mode$ Continuous | Affected$ Creature.Black | AddKeyword$ HIDDEN CARDNAME can't block. | Description$ Black creatures can't block.
+S:Mode$ Continuous | Affected$ Creature.Black | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | Description$ Black creatures can't block.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/razorjaw_oni.jpg
diff --git a/res/cardsfolder/r/recumbent_bliss.txt b/res/cardsfolder/r/recumbent_bliss.txt
index bcda7e792e5..414255d03a3 100644
--- a/res/cardsfolder/r/recumbent_bliss.txt
+++ b/res/cardsfolder/r/recumbent_bliss.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME can't attack or block. | Description$ Enchanted creature can't attack or block.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. | Description$ Enchanted creature can't attack or block.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ At the beginning of your upkeep, you may gain 1 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Common
diff --git a/res/cardsfolder/r/rimescale_dragon.txt b/res/cardsfolder/r/rimescale_dragon.txt
index b85450a5ae3..da81fb2595a 100644
--- a/res/cardsfolder/r/rimescale_dragon.txt
+++ b/res/cardsfolder/r/rimescale_dragon.txt
@@ -4,7 +4,7 @@ Types:Snow Creature Dragon
 Text:no text
 PT:5/5
 K:Flying
-S:Mode$ Continuous | Affected$ Creature.countersGE1ICE | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Creatures with ice counters on them don't untap during their controllers' untap steps.
+S:Mode$ Continuous | Affected$ Creature.countersGE1ICE | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Creatures with ice counters on them don't untap during their controllers' untap steps.
 A:AB$ PutCounter | Cost$ 2 S | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ ICE | CounterNum$ 1 | SubAbility$ SVar=DBTap | SpellDescription$ Put an ice counter on target creature. Tap that creature.
 SVar:DBTap:DB$Tap | Defined$ Targeted
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/r/river_delta.txt b/res/cardsfolder/r/river_delta.txt
index 0b2b35bda9f..72f54d6225b 100644
--- a/res/cardsfolder/r/river_delta.txt
+++ b/res/cardsfolder/r/river_delta.txt
@@ -2,7 +2,7 @@ Name:River Delta
 ManaCost:no cost
 Types:Land
 Text:no text
-S:Mode$ Continuous | Affected$ Card.Self+countersGE1DEPLETION | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ CARDNAME doesn't untap during your untap step if it has a depletion counter on it.
+S:Mode$ Continuous | Affected$ Card.Self+countersGE1DEPLETION | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ CARDNAME doesn't untap during your untap step if it has a depletion counter on it.
 A:AB$ Mana | Cost$ T | Produced$ U | Amount$ 1 | SubAbility$ SVar=AddCounter | SpellDescription$ Add U to your mana pool. Put a depletion counter on CARDNAME.
 A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SubAbility$ SVar=AddCounter | SpellDescription$ Add B to your mana pool. Put a depletion counter on CARDNAME.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSubCounter | TriggerDescription$ At the beginning of your upkeep, remove a depletion counter from CARDNAME.
diff --git a/res/cardsfolder/r/rolling_stones.txt b/res/cardsfolder/r/rolling_stones.txt
index 42e38a292f6..5dfdf3c27b1 100644
--- a/res/cardsfolder/r/rolling_stones.txt
+++ b/res/cardsfolder/r/rolling_stones.txt
@@ -2,7 +2,7 @@ Name:Rolling Stones
 ManaCost:1 W
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.Wall | AddKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Description$ Wall creatures can attack as though they didn't have defender.
+S:Mode$ Continuous | Affected$ Creature.Wall | AddHiddenKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Description$ Wall creatures can attack as though they didn't have defender.
 SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/r/root_sliver.txt b/res/cardsfolder/r/root_sliver.txt
index 6288604e864..31356e4c759 100644
--- a/res/cardsfolder/r/root_sliver.txt
+++ b/res/cardsfolder/r/root_sliver.txt
@@ -4,7 +4,7 @@ Types:Creature Sliver
 Text:no text
 PT:2/2
 K:CARDNAME can't be countered.
-S:Mode$ Continuous | Affected$ Sliver | AddKeyword$ HIDDEN CARDNAME can't be countered. | AffectedZone$ Hand,Graveyard,Exile,Stack | Description$ Sliver spells can't be countered by spells or abilities.
+S:Mode$ Continuous | Affected$ Sliver | AddHiddenKeyword$ HIDDEN CARDNAME can't be countered. | AffectedZone$ Hand,Graveyard,Exile,Stack | Description$ Sliver spells can't be countered by spells or abilities.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/root_sliver.jpg
 SetInfo:LGN|Uncommon|http://magiccards.info/scans/en/le/137.jpg
diff --git a/res/cardsfolder/r/roots.txt b/res/cardsfolder/r/roots.txt
index cfc4a46c221..1cea007cb3f 100644
--- a/res/cardsfolder/r/roots.txt
+++ b/res/cardsfolder/r/roots.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature without flying
 A:SP$ Attach | Cost$ 3 G | ValidTgts$ Creature.withoutFlying | AILogic$ KeepTapped
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap enchanted creature.
 SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ Enchanted
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/r/rust_tick.txt b/res/cardsfolder/r/rust_tick.txt
index aa5b58bc021..cf6c41f65ae 100644
--- a/res/cardsfolder/r/rust_tick.txt
+++ b/res/cardsfolder/r/rust_tick.txt
@@ -6,7 +6,7 @@ PT:1/3
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Pump | Cost$ 1 T | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | RememberTargets$ True |  SubAbility$ DBTap | SpellDescription$ Tap target artifact. It doesn't untap during its controller's untap step for as long as CARDNAME remains tapped.
 SVar:DBTap:DB$Tap | Defined$ Targeted
-S:Mode$ Continuous | Affected$ Artifact.IsRemembered | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | Affected$ Artifact.IsRemembered | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step.
 T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigClearRemember | Static$ True
 SVar:TrigClearRemember:DB$Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/s/sand_squid.txt b/res/cardsfolder/s/sand_squid.txt
index 9a74ef8d404..b4405103f0b 100644
--- a/res/cardsfolder/s/sand_squid.txt
+++ b/res/cardsfolder/s/sand_squid.txt
@@ -7,7 +7,7 @@ K:Islandwalk
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberTargets$ True |  SubAbility$ DBTap | SpellDescription$ Tap target creature. That creature doesn't untap during its controller's untap step for as long as CARDNAME remains tapped.
 SVar:DBTap:DB$Tap | Defined$ Targeted
-S:Mode$ Continuous | Affected$ Creature.IsRemembered | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | Affected$ Creature.IsRemembered | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step.
 T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigClearRemember | Static$ True
 SVar:TrigClearRemember:DB$Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/s/sandskin.txt b/res/cardsfolder/s/sandskin.txt
index 82054a691b5..695726a9f30 100644
--- a/res/cardsfolder/s/sandskin.txt
+++ b/res/cardsfolder/s/sandskin.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME. | Description$ Prevent all combat damage that would be dealt to and dealt by enchanted creature.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME. | Description$ Prevent all combat damage that would be dealt to and dealt by enchanted creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sandskin.jpg
 SetInfo:ONS|Common|http://magiccards.info/scans/en/on/52.jpg
diff --git a/res/cardsfolder/s/scrapdiver_serpent.txt b/res/cardsfolder/s/scrapdiver_serpent.txt
index e5df8e5091f..4590cf4a71a 100644
--- a/res/cardsfolder/s/scrapdiver_serpent.txt
+++ b/res/cardsfolder/s/scrapdiver_serpent.txt
@@ -3,7 +3,7 @@ ManaCost:5 U U
 Types:Creature Serpent
 Text:no text
 PT:5/5
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ HIDDEN Unblockable | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME is unblockable as long as defending player controls an artifact.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN Unblockable | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME is unblockable as long as defending player controls an artifact.
 SVar:X:Count$Valid Artifact.YouDontCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scrapdiver_serpent.jpg
diff --git a/res/cardsfolder/s/seedborn_muse.txt b/res/cardsfolder/s/seedborn_muse.txt
index 0c0a6e86558..e0f9b813807 100644
--- a/res/cardsfolder/s/seedborn_muse.txt
+++ b/res/cardsfolder/s/seedborn_muse.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G
 Types:Creature Spirit
 Text:no text
 PT:2/4
-S:Mode$ Continuous | Affected$ Permanent.YouCtrl | AddKeyword$ HIDDEN CARDNAME untaps during each other player's untap step. | Description$ Untap all permanents you control during each other player's untap step.
+S:Mode$ Continuous | Affected$ Permanent.YouCtrl | AddHiddenKeyword$ HIDDEN CARDNAME untaps during each other player's untap step. | Description$ Untap all permanents you control during each other player's untap step.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seedborn_muse.jpg
 SetInfo:LGN|Rare|http://magiccards.info/scans/en/le/138.jpg
diff --git a/res/cardsfolder/s/seeker.txt b/res/cardsfolder/s/seeker.txt
index 04871412929..764b870f950 100644
--- a/res/cardsfolder/s/seeker.txt
+++ b/res/cardsfolder/s/seeker.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 W W | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CantBeBlockedBy Creature.nonArtifact+nonWhite | Description$ Enchanted creature can't be blocked except by artifact creatures and/or white creatures.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CantBeBlockedBy Creature.nonArtifact+nonWhite | Description$ Enchanted creature can't be blocked except by artifact creatures and/or white creatures.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seeker.jpg
 SetInfo:4ED|Common|http://magiccards.info/scans/en/4e/299.jpg
diff --git a/res/cardsfolder/s/setons_desire.txt b/res/cardsfolder/s/setons_desire.txt
index 839bc11824f..ac17ebcdeea 100644
--- a/res/cardsfolder/s/setons_desire.txt
+++ b/res/cardsfolder/s/setons_desire.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | Description$ Enchanted creature gets +2/+2.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN All creatures able to block CARDNAME do so. | Threshold$ True | Description$ Threshold - As long as seven or more cards are in your graveyard, all creatures able to block enchanted creature do so.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN All creatures able to block CARDNAME do so. | Threshold$ True | Description$ Threshold - As long as seven or more cards are in your graveyard, all creatures able to block enchanted creature do so.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/setons_desire.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/268.jpg
diff --git a/res/cardsfolder/s/shackles.txt b/res/cardsfolder/s/shackles.txt
index d762cc7e00b..7984fc9d93e 100644
--- a/res/cardsfolder/s/shackles.txt
+++ b/res/cardsfolder/s/shackles.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AILogic$ KeepTapped
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
 A:AB$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shackles.jpg
diff --git a/res/cardsfolder/s/shauku_endbringer.txt b/res/cardsfolder/s/shauku_endbringer.txt
index 9f8f0022303..f7944a6f182 100644
--- a/res/cardsfolder/s/shauku_endbringer.txt
+++ b/res/cardsfolder/s/shauku_endbringer.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Vampire
 Text:no text
 PT:5/5
 K:Flying
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ GT1 | Description$ CARDNAME can't attack if another creature is on the battlefield.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ GT1 | Description$ CARDNAME can't attack if another creature is on the battlefield.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your upkeep, you lose 3 life.
 A:AB$ ChangeZone | Cost$ T | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature | SubAbility$ SVar=DBCounter | SpellDescription$ Exile target creature and put a +1/+1 counter on CARDNAME.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 3
diff --git a/res/cardsfolder/s/shield_of_kaldra.txt b/res/cardsfolder/s/shield_of_kaldra.txt
index 2367c757d00..76f02baa556 100644
--- a/res/cardsfolder/s/shield_of_kaldra.txt
+++ b/res/cardsfolder/s/shield_of_kaldra.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Legendary Artifact Equipment
 Text:Equipped creature is indestructible.
 K:eqPump 4:HIDDEN Indestructible
-S:Mode$ Continuous | Affected$ Equipment.namedSword of Kaldra,Equipment.namedShield of Kaldra,Equipment.namedHelm of Kaldra | AddKeyword$ HIDDEN Indestructible | Description$ Equipment named Sword of Kaldra, Shield of Kaldra, and Helm of Kaldra are indestructible.
+S:Mode$ Continuous | Affected$ Equipment.namedSword of Kaldra,Equipment.namedShield of Kaldra,Equipment.namedHelm of Kaldra | AddHiddenKeyword$ HIDDEN Indestructible | Description$ Equipment named Sword of Kaldra, Shield of Kaldra, and Helm of Kaldra are indestructible.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shield_of_kaldra.jpg
 SetInfo:DST|Rare|http://magiccards.info/scans/en/ds/139.jpg
diff --git a/res/cardsfolder/s/shield_of_the_oversoul.txt b/res/cardsfolder/s/shield_of_the_oversoul.txt
index 6127bb9269d..8224eb88cf1 100644
--- a/res/cardsfolder/s/shield_of_the_oversoul.txt
+++ b/res/cardsfolder/s/shield_of_the_oversoul.txt
@@ -4,8 +4,8 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 GW | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy+Green | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ HIDDEN Indestructible | Description$ As long as enchanted creature is green, it gets +1/+1 and is indestructible. (Lethal damage and effects that say "destroy" don't destroy it. If its toughness is 0 or less, it's still put into its owner's graveyard.)
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy+White | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying | Description$ As long as enchanted creature is white, it gets +1/+1 and has flying.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy+Green | AddPower$ 1 | AddToughness$ 1 | AddHiddenKeyword$ HIDDEN Indestructible | Description$ As long as enchanted creature is green, it gets +1/+1 and is indestructible. (Lethal damage and effects that say "destroy" don't destroy it. If its toughness is 0 or less, it's still put into its owner's graveyard.)
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy+White | AddPower$ 1 | AddToughness$ 1 | AddHiddenKeyword$ Flying | Description$ As long as enchanted creature is white, it gets +1/+1 and has flying.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shield_of_the_oversoul.jpg
diff --git a/res/cardsfolder/s/shielding_plax.txt b/res/cardsfolder/s/shielding_plax.txt
index 4f0fe11acd4..6a4b64985ce 100644
--- a/res/cardsfolder/s/shielding_plax.txt
+++ b/res/cardsfolder/s/shielding_plax.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 GU | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN Hexproof | Description$ Enchanted creature can't be the target of spells or abilities your opponents control.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN Hexproof | Description$ Enchanted creature can't be the target of spells or abilities your opponents control.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/shimmer_myr.txt b/res/cardsfolder/s/shimmer_myr.txt
index ce93d71cd12..6be3cf6528e 100644
--- a/res/cardsfolder/s/shimmer_myr.txt
+++ b/res/cardsfolder/s/shimmer_myr.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Myr
 Text:no text
 PT:2/2
 K:Flash
-S:Mode$ Continuous | Affected$ Artifact.YouCtrl | AffectedZone$ Hand,Graveyard,Exile | AddKeyword$ HIDDEN Flash | Description$ You may cast artifact cards as though they had flash.
+S:Mode$ Continuous | Affected$ Artifact.YouCtrl | AffectedZone$ Hand,Graveyard,Exile | AddHiddenKeyword$ HIDDEN Flash | Description$ You may cast artifact cards as though they had flash.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shimmer_myr.jpg
 SetInfo:MBS|Rare|http://magiccards.info/scans/en/mbs/129.jpg
diff --git a/res/cardsfolder/s/sinking_feeling.txt b/res/cardsfolder/s/sinking_feeling.txt
index 407c4b78945..179b4b2e7d7 100644
--- a/res/cardsfolder/s/sinking_feeling.txt
+++ b/res/cardsfolder/s/sinking_feeling.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 U | ValidTgts$ Creature | AILogic$ KeepTapped
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ Untap | Description$ Enchanted creature has "1, Put a -1/-1 counter on this creature: Untap this creature."
 SVar:Untap:AB$ Untap | Cost$ 1 AddCounter<1/M1M1> | SpellDescription$ Untap CARDNAME.
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/sleeping_potion.txt b/res/cardsfolder/s/sleeping_potion.txt
index 56a9f35ac2e..bd0f6be4b31 100644
--- a/res/cardsfolder/s/sleeping_potion.txt
+++ b/res/cardsfolder/s/sleeping_potion.txt
@@ -6,7 +6,7 @@ K:Enchant creature
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap enchanted creature.
 SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ Enchanted
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ KeepTapped
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ SpellAbilityCast | TargetsValid$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When enchanted creature becomes the target of a spell or ability, sacrifice CARDNAME.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/slithering_shade.txt b/res/cardsfolder/s/slithering_shade.txt
index 5229a4f44e0..336ae57f03c 100644
--- a/res/cardsfolder/s/slithering_shade.txt
+++ b/res/cardsfolder/s/slithering_shade.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:0/1
 K:Defender
 A:AB$ Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Hellbent$ True | Description$ Hellbent - CARDNAME can attack as though it didn't have defender as long as you have no cards in hand.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Hellbent$ True | Description$ Hellbent - CARDNAME can attack as though it didn't have defender as long as you have no cards in hand.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slithering_shade.jpg
diff --git a/res/cardsfolder/s/slow_motion.txt b/res/cardsfolder/s/slow_motion.txt
index 40b95cdd47b..a44f342d26a 100644
--- a/res/cardsfolder/s/slow_motion.txt
+++ b/res/cardsfolder/s/slow_motion.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 U | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN At the beginning of your upkeep, sacrifice CARDNAME unless you pay 2 | Description$ At the beginning of the upkeep of enchanted creature's controller, that player sacrifices that creature unless he or she pays 2.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN At the beginning of your upkeep, sacrifice CARDNAME unless you pay 2 | Description$ At the beginning of the upkeep of enchanted creature's controller, that player sacrifices that creature unless he or she pays 2.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand
 SVar:SacMe:2
diff --git a/res/cardsfolder/s/sluggishness.txt b/res/cardsfolder/s/sluggishness.txt
index 234b5be003d..0030996b167 100644
--- a/res/cardsfolder/s/sluggishness.txt
+++ b/res/cardsfolder/s/sluggishness.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME can't block. | Description$ Enchanted creature can't block.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | Description$ Enchanted creature can't block.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand
 SVar:SacMe:2
diff --git a/res/cardsfolder/s/song_of_serenity.txt b/res/cardsfolder/s/song_of_serenity.txt
index 360ba0d54db..6f49898d849 100644
--- a/res/cardsfolder/s/song_of_serenity.txt
+++ b/res/cardsfolder/s/song_of_serenity.txt
@@ -2,7 +2,7 @@ Name:Song of Serenity
 ManaCost:1 G
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.enchanted | AddKeyword$ HIDDEN CARDNAME can't attack or block. | Description$ Creatures that are enchanted can't attack or block.
+S:Mode$ Continuous | Affected$ Creature.enchanted | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. | Description$ Creatures that are enchanted can't attack or block.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/song_of_serenity.jpg
diff --git a/res/cardsfolder/s/spectral_shield.txt b/res/cardsfolder/s/spectral_shield.txt
index 9e8568e688c..ba691294c2b 100644
--- a/res/cardsfolder/s/spectral_shield.txt
+++ b/res/cardsfolder/s/spectral_shield.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 W U | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddToughness$ 2 | AddKeyword$ HIDDEN CARDNAME can't be the target of spells. | Description$ Enchanted creature gets +0/+2 and can't be the target of spells.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddToughness$ 2 | AddHiddenKeyword$ HIDDEN CARDNAME can't be the target of spells. | Description$ Enchanted creature gets +0/+2 and can't be the target of spells.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spectral_shield.jpg
 SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/380.jpg
diff --git a/res/cardsfolder/s/spellbreaker_behemoth.txt b/res/cardsfolder/s/spellbreaker_behemoth.txt
index e4d449267b9..d655d6aa62c 100644
--- a/res/cardsfolder/s/spellbreaker_behemoth.txt
+++ b/res/cardsfolder/s/spellbreaker_behemoth.txt
@@ -4,7 +4,7 @@ Types:Creature Beast
 Text:no text
 PT:5/5
 K:CARDNAME can't be countered.
-S:Mode$ Continuous | Affected$ Creature.powerGE5+YouCtrl | AffectedZone$ Stack | AddKeyword$ HIDDEN CARDNAME can't be countered. | Description$ Creature spells you control with power 5 or greater can't be countered.
+S:Mode$ Continuous | Affected$ Creature.powerGE5+YouCtrl | AffectedZone$ Stack | AddHiddenKeyword$ HIDDEN CARDNAME can't be countered. | Description$ Creature spells you control with power 5 or greater can't be countered.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spellbreaker_behemoth.jpg
 SetInfo:ARB|Rare|http://magiccards.info/scans/en/arb/60.jpg
diff --git a/res/cardsfolder/s/spire_serpent.txt b/res/cardsfolder/s/spire_serpent.txt
index 48c37e55be5..b6baf09658d 100644
--- a/res/cardsfolder/s/spire_serpent.txt
+++ b/res/cardsfolder/s/spire_serpent.txt
@@ -4,7 +4,7 @@ Types:Creature Serpent
 Text:no text
 PT:3/5
 K:Defender
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Metalcraft$ True | Description$ Metalcraft - As long as you control three or more artifacts, CARDNAME gets +2/+2 and can attack as though it didn't have defender.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddHiddenKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Metalcraft$ True | Description$ Metalcraft - As long as you control three or more artifacts, CARDNAME gets +2/+2 and can attack as though it didn't have defender.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spire_serpent.jpg
diff --git a/res/cardsfolder/s/stasis_cocoon.txt b/res/cardsfolder/s/stasis_cocoon.txt
index c1233ed35d0..19b22a54171 100644
--- a/res/cardsfolder/s/stasis_cocoon.txt
+++ b/res/cardsfolder/s/stasis_cocoon.txt
@@ -4,8 +4,8 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant artifact
 A:SP$ Attach | Cost$ 1 W | ValidTgts$ Artifact | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Enchanted artifact's activated abilities can't be activated. If enchanted artifact is a creature, it can't attack or block.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME can't attack or block.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Enchanted artifact's activated abilities can't be activated. If enchanted artifact is a creature, it can't attack or block.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stasis_cocoon.jpg
 SetInfo:5DN|Common|http://magiccards.info/scans/en/5dn/18.jpg
diff --git a/res/cardsfolder/s/statecraft.txt b/res/cardsfolder/s/statecraft.txt
index f20b61dab99..8456c21c5a9 100644
--- a/res/cardsfolder/s/statecraft.txt
+++ b/res/cardsfolder/s/statecraft.txt
@@ -2,7 +2,7 @@ Name:Statecraft
 ManaCost:3 U
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME. | Description$ Prevent all combat damage that would be dealt to and dealt by creatures you control.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME. | Description$ Prevent all combat damage that would be dealt to and dealt by creatures you control.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/statecraft.jpg
diff --git a/res/cardsfolder/s/steel_of_the_godhead.txt b/res/cardsfolder/s/steel_of_the_godhead.txt
index bdd475d48bd..f3d3ff6c4fb 100644
--- a/res/cardsfolder/s/steel_of_the_godhead.txt
+++ b/res/cardsfolder/s/steel_of_the_godhead.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 WU | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy+White | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Lifelink | Description$ As long as enchanted creature is white, it gets +1/+1 and has lifelink.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy+Blue | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ HIDDEN Unblockable | Description$ As long as enchanted creature is blue, it gets +1/+1 and is unblockable.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy+Blue | AddPower$ 1 | AddToughness$ 1 | AddHiddenKeyword$ HIDDEN Unblockable | Description$ As long as enchanted creature is blue, it gets +1/+1 and is unblockable.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/steel_of_the_godhead.jpg
diff --git a/res/cardsfolder/s/steelclad_serpent.txt b/res/cardsfolder/s/steelclad_serpent.txt
index 2b81b741cc1..fdd2f1a31fa 100644
--- a/res/cardsfolder/s/steelclad_serpent.txt
+++ b/res/cardsfolder/s/steelclad_serpent.txt
@@ -3,7 +3,7 @@ ManaCost:5 U
 Types:Artifact Creature Serpent
 Text:no text
 PT:4/5
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't attack unless you control another artifact.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't attack unless you control another artifact.
 SVar:X:Count$Valid Artifact.YouCtrl+Other
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/stone_tongue_basilisk.txt b/res/cardsfolder/s/stone_tongue_basilisk.txt
index e1db9f6b51d..e24d8d77da0 100644
--- a/res/cardsfolder/s/stone_tongue_basilisk.txt
+++ b/res/cardsfolder/s/stone_tongue_basilisk.txt
@@ -3,7 +3,7 @@ ManaCost:4 G G G
 Types:Creature Basilisk
 Text:no text
 PT:4/5
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ HIDDEN All creatures able to block CARDNAME do so. | Threshold$ True | Description$ Threshold - As long as seven or more cards are in your graveyard, all creatures able to block CARDNAME do so.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN All creatures able to block CARDNAME do so. | Threshold$ True | Description$ Threshold - As long as seven or more cards are in your graveyard, all creatures able to block CARDNAME do so.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
 SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | Execute$ TrigDestroy | TriggerDescription$ Destroy damaged creature at end of combat.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredTarget
diff --git a/res/cardsfolder/s/stormtide_leviathan.txt b/res/cardsfolder/s/stormtide_leviathan.txt
index 6d5dd69ba88..6821b9100e5 100644
--- a/res/cardsfolder/s/stormtide_leviathan.txt
+++ b/res/cardsfolder/s/stormtide_leviathan.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:8/8
 K:Islandwalk
 S:Mode$ Continuous | Affected$ Land | AddType$ Island | Description$ All lands are Islands in addition to their other types.
-S:Mode$ Continuous | Affected$ Creature.withoutFlying+withoutIslandwalk | AddKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures without flying or islandwalk can't attack.
+S:Mode$ Continuous | Affected$ Creature.withoutFlying+withoutIslandwalk | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures without flying or islandwalk can't attack.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stormtide_leviathan.jpg
 SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/74.jpg
diff --git a/res/cardsfolder/s/stupefying_touch.txt b/res/cardsfolder/s/stupefying_touch.txt
index 31369b5aeb2..5574fdf61d2 100644
--- a/res/cardsfolder/s/stupefying_touch.txt
+++ b/res/cardsfolder/s/stupefying_touch.txt
@@ -7,7 +7,7 @@ A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature's activated abilities can't be activated.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature's activated abilities can't be activated.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stupefying_touch.jpg