diff --git a/res/cardsfolder/o/ogre_jailbreaker.txt b/res/cardsfolder/o/ogre_jailbreaker.txt
index c5d517e597e..8f57dc41733 100644
--- a/res/cardsfolder/o/ogre_jailbreaker.txt
+++ b/res/cardsfolder/o/ogre_jailbreaker.txt
@@ -4,7 +4,7 @@ Types:Creature Ogre Rogue
 Text:no text
 PT:4/4
 K:Defender
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME can attack as though it didn't have defender as long as you control a Gate.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can attack as though it didn't have defender. | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME can attack as though it didn't have defender as long as you control a Gate.
 SVar:X:Count$Valid Gate.YouCtrl
 DeckHints:Type$Gate
 SVar:Rarity:Common
diff --git a/res/cardsfolder/o/omniscience.txt b/res/cardsfolder/o/omniscience.txt
index 010f5fc1626..d904cd1538d 100644
--- a/res/cardsfolder/o/omniscience.txt
+++ b/res/cardsfolder/o/omniscience.txt
@@ -2,7 +2,7 @@ Name:Omniscience
 ManaCost:7 U U U
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Card.nonLand+YouOwn | AddHiddenKeyword$ HIDDEN May be played without paying its mana cost | AffectedZone$ Hand | Description$ You may cast nonland cards from your hand without paying their mana costs.
+S:Mode$ Continuous | Affected$ Card.nonLand+YouOwn | AddHiddenKeyword$ May be played without paying its mana cost | AffectedZone$ Hand | Description$ You may cast nonland cards from your hand without paying their mana costs.
 SVar:RemRandomDeck:True
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/omniscience.jpg
diff --git a/res/cardsfolder/o/oracle_of_mul_daya.txt b/res/cardsfolder/o/oracle_of_mul_daya.txt
index 2def9b3e1dd..0bf74518792 100644
--- a/res/cardsfolder/o/oracle_of_mul_daya.txt
+++ b/res/cardsfolder/o/oracle_of_mul_daya.txt
@@ -5,7 +5,7 @@ Text:no text
 S:Mode$ Continuous | Affected$ You | AddKeyword$ AdjustLandPlays:1 | Description$ You may play an additional land on each of your turns.
 PT:2/2
 K:Play with the top card of your library revealed.
-S:Mode$ Continuous | Affected$ Land.TopLibrary+YouCtrl | AffectedZone$ Library | AddHiddenKeyword$ HIDDEN May be played | Description$ You may play the top card of your library if it's a land card.
+S:Mode$ Continuous | Affected$ Land.TopLibrary+YouCtrl | AffectedZone$ Library | AddHiddenKeyword$ May be played | Description$ You may play the top card of your library if it's a land card.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oracle_of_mul_daya.jpg
 SetInfo:ZEN|Rare|http://magiccards.info/scans/en/zen/172.jpg
diff --git a/res/cardsfolder/o/orims_chant.txt b/res/cardsfolder/o/orims_chant.txt
index 40b7b32e28d..5c45051f7eb 100644
--- a/res/cardsfolder/o/orims_chant.txt
+++ b/res/cardsfolder/o/orims_chant.txt
@@ -1,13 +1,13 @@
-Name:Orim's Chant
-ManaCost:W
-Types:Instant
-Text:no text
-A:SP$ Effect | Cost$ W | Name$ Orim's Chant Effect | IsCurse$ True | StaticAbilities$ CantBeCast | ValidTgts$ Player | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | SpellDescription$ Target player can't cast spells this turn. If CARDNAME was kicked, creatures can't attack this turn.
-SVar:CantBeCast:Mode$ CantBeCast | ValidCard$ Card | Caster$ Player.IsRemembered | Description$ Target player can't cast spells this turn.
-A:SP$ Effect | Cost$ W W | SetAsKicked$ True | Name$ Orim's Chant Effect | IsCurse$ True | StaticAbilities$ CantBeCast,CantAttack | ValidTgts$ Player | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | SpellDescription$ Kicker W W (You may pay an additional W W as you cast this spell.)
-SVar:CantAttack:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures can't attack this turn.
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/orims_chant.jpg
-SetInfo:PLS|Rare|http://magiccards.info/scans/en/ps/11.jpg
-Oracle:Kicker {W} (You may pay an additional {W} as you cast this spell.)\nTarget player can't cast spells this turn.\nIf Orim's Chant was kicked, creatures can't attack this turn.
+Name:Orim's Chant
+ManaCost:W
+Types:Instant
+Text:no text
+A:SP$ Effect | Cost$ W | Name$ Orim's Chant Effect | IsCurse$ True | StaticAbilities$ CantBeCast | ValidTgts$ Player | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | SpellDescription$ Target player can't cast spells this turn. If CARDNAME was kicked, creatures can't attack this turn.
+SVar:CantBeCast:Mode$ CantBeCast | ValidCard$ Card | Caster$ Player.IsRemembered | Description$ Target player can't cast spells this turn.
+A:SP$ Effect | Cost$ W W | SetAsKicked$ True | Name$ Orim's Chant Effect | IsCurse$ True | StaticAbilities$ CantBeCast,CantAttack | ValidTgts$ Player | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | SpellDescription$ Kicker W W (You may pay an additional W W as you cast this spell.)
+SVar:CantAttack:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Creatures can't attack this turn.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/orims_chant.jpg
+SetInfo:PLS|Rare|http://magiccards.info/scans/en/ps/11.jpg
+Oracle:Kicker {W} (You may pay an additional {W} as you cast this spell.)\nTarget player can't cast spells this turn.\nIf Orim's Chant was kicked, creatures can't attack this turn.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/o/oriss_samite_guardian.txt b/res/cardsfolder/o/oriss_samite_guardian.txt
index 64aabf19e90..c2382a16d09 100644
--- a/res/cardsfolder/o/oriss_samite_guardian.txt
+++ b/res/cardsfolder/o/oriss_samite_guardian.txt
@@ -6,7 +6,7 @@ PT:1/3
 A:AB$ Pump | Cost$ T | KW$ HIDDEN Prevent all damage that would be dealt to CARDNAME. | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Prevent all damage that would be dealt to target creature this turn.
 A:AB$ Effect | Cost$ Discard<1/Card.namedOriss, Samite Guardian> | CostDesc$ Grandeur - Discard another card named CARDNAME:| Name$ Oriss Effect | IsCurse$ True | StaticAbilities$ CantBeCast,CantAttack | ValidTgts$ Player | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | SpellDescription$ Target player can't cast spells this turn, and creatures that player controls can't attack this turn.
 SVar:CantBeCast:Mode$ CantBeCast | ValidCard$ Card | Caster$ Player.IsRemembered | Description$ Targeted player can't cast spells this turn.
-SVar:CantAttack:Mode$ Continuous | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures targeted player controls can't attack this turn.
+SVar:CantAttack:Mode$ Continuous | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Creatures targeted player controls can't attack this turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oriss_samite_guardian.jpg
diff --git a/res/cardsfolder/p/pacifism.txt b/res/cardsfolder/p/pacifism.txt
index 3d69dca6bd3..588c33e265e 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 | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. | Description$ Enchanted creature can't attack or block.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ 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 04f47a8afe6..cc27782d8f9 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 | 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 | AddHiddenKeyword$ 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/peacekeeper.txt b/res/cardsfolder/p/peacekeeper.txt
index d31404cd6ae..5377424c642 100644
--- a/res/cardsfolder/p/peacekeeper.txt
+++ b/res/cardsfolder/p/peacekeeper.txt
@@ -4,7 +4,7 @@ Types:Creature Human
 Text:no text
 PT:1/1
 K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay 1 W
-S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures can't attack.
+S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Creatures can't attack.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/peacekeeper.jpg
diff --git a/res/cardsfolder/p/phyrexian_gremlins.txt b/res/cardsfolder/p/phyrexian_gremlins.txt
index b825670dc76..4e71b1499bc 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$ Card.IsRemembered | AddHiddenKeyword$ HIDDEN This card doesn't untap during your next untap step.
+S:Mode$ Continuous | Affected$ Card.IsRemembered | AddHiddenKeyword$ 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 1dc5f8e08f0..46224ca8b75 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 | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. | AddTrigger$ TriggerTheSleepless | AddSVar$ PilloryLoseLife | 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$ CARDNAME can't attack or block. | AddTrigger$ TriggerTheSleepless | AddSVar$ PilloryLoseLife | Description$ Enchanted creature can't attack or block. Enchanted creature has "At the beginning of your upkeep, you lose 1 life."
 SVar:TriggerTheSleepless:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ PilloryLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you lose 1 life.
 SVar:PilloryLoseLife: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 07101ce892d..c23dc68e46a 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 | 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 | AddHiddenKeyword$ 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/predatory_focus.txt b/res/cardsfolder/p/predatory_focus.txt
index 3f5b3956a5d..68843c4091e 100644
--- a/res/cardsfolder/p/predatory_focus.txt
+++ b/res/cardsfolder/p/predatory_focus.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G
 Types:Sorcery
 Text:no text
 A:SP$ Effect | Cost$ 3 G G | Name$ Predatory Focus Effect | StaticAbilities$ KWPump | AILogic$ Evasion | SpellDescription$ You may have creatures you control assign their combat damage this turn as though they weren't blocked.
-SVar:KWPump:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ HIDDEN You may have CARDNAME assign its combat damage as though it weren't blocked. | Description$ You may have creatures you control assign their combat damage this turn as though they weren't blocked.
+SVar:KWPump:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ You may have CARDNAME assign its combat damage as though it weren't blocked. | Description$ You may have creatures you control assign their combat damage this turn as though they weren't blocked.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/predatory_focus.jpg
 SetInfo:GPT|Uncommon|http://magiccards.info/scans/en/gp/92.jpg
diff --git a/res/cardsfolder/p/predatory_rampage.txt b/res/cardsfolder/p/predatory_rampage.txt
index 092701b77c2..971317b2335 100644
--- a/res/cardsfolder/p/predatory_rampage.txt
+++ b/res/cardsfolder/p/predatory_rampage.txt
@@ -4,7 +4,7 @@ Types:Sorcery
 Text:no text
 A:SP$ PumpAll | Cost$ 3 G G | ValidCards$ Creature.YouCtrl | NumAtt$ +3 | NumDef$ +3 | SubAbility$ OppBlock | SpellDescription$ Creatures you control get +3/+3 until end of turn. Each creature your opponents control blocks this turn if able.
 SVar:OppBlock:DB$ Effect | Name$ Predatory Rampage Effect | StaticAbilities$ KWPump
-SVar:KWPump:Mode$ Continuous | Affected$ Creature.OppCtrl | AddHiddenKeyword$ HIDDEN CARDNAME blocks each turn if able. | Description$ Each creature your opponents control blocks this turn if able.
+SVar:KWPump:Mode$ Continuous | Affected$ Creature.OppCtrl | AddHiddenKeyword$ CARDNAME blocks each turn if able. | Description$ Each creature your opponents control blocks this turn if able.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/predatory_rampage.jpg
 SetInfo:M13|Rare|http://magiccards.info/scans/en/m13/180.jpg
diff --git a/res/cardsfolder/p/prison_term.txt b/res/cardsfolder/p/prison_term.txt
index de8a073475a..c1a36e04e15 100644
--- a/res/cardsfolder/p/prison_term.txt
+++ b/res/cardsfolder/p/prison_term.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 W W | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. & HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature can't attack or block and its activated abilities can't be activated.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block. & CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature can't attack or block and its activated abilities can't be activated.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigAttach | OptionalDecider$ You | TriggerDescription$ Whenever a creature enters the battlefield under an opponent's control, you may attach CARDNAME to that creature.
 SVar:TrigAttach:DB$ Attach | Cost$ 0 | Defined$ TriggeredCard
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/p/protective_bubble.txt b/res/cardsfolder/p/protective_bubble.txt
index a22c0472a80..12475f58f74 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 | AddHiddenKeyword$ HIDDEN Unblockable & Shroud | Description$ Enchanted creature is unblockable and has shroud.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ Unblockable | AddKeyword$ 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 a3fa66d469e..041faa9e4ff 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 | 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."
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ 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 65bb8b9826b..c1a5e99addd 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 | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | Condition$ Threshold | 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$ CARDNAME can't block. | Condition$ Threshold | 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/qasali_ambusher.txt b/res/cardsfolder/q/qasali_ambusher.txt
index 6c0ff077acf..22ff78fb3a4 100644
--- a/res/cardsfolder/q/qasali_ambusher.txt
+++ b/res/cardsfolder/q/qasali_ambusher.txt
@@ -4,7 +4,7 @@ Types:Creature Cat Warrior
 Text:no text
 PT:2/3
 K:Reach
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | CheckSVar$ X | CheckSecondSVar2$ Y | CheckThirdSVar$ Z | References$ X,Y,Z | AddHiddenKeyword$ HIDDEN May be played without paying its mana cost and as though it has flash | Description$ If a creature is attacking you and you control a Forest and a Plains, you may cast CARDNAME without paying its mana cost and as though it had flash.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | CheckSVar$ X | CheckSecondSVar2$ Y | CheckThirdSVar$ Z | References$ X,Y,Z | AddHiddenKeyword$ May be played without paying its mana cost and as though it has flash | Description$ If a creature is attacking you and you control a Forest and a Plains, you may cast CARDNAME without paying its mana cost and as though it had flash.
 SVar:X:Count$Valid Creature.attackingYou
 SVar:Y:Count$Valid Forest.YouCtrl
 SVar:Z:Count$Valid Plains.YouCtrl
diff --git a/res/cardsfolder/q/quest_for_renewal.txt b/res/cardsfolder/q/quest_for_renewal.txt
index 115a2826fd0..ff81af21353 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 | AddHiddenKeyword$ HIDDEN CARDNAME untaps during each other player's untap step. | CheckSVar$ X | SVarCompare$ EQ1 | References$ X | 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$ CARDNAME untaps during each other player's untap step. | CheckSVar$ X | SVarCompare$ EQ1 | References$ X | 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+counters_GE4_QUEST
diff --git a/res/cardsfolder/q/quick_sliver.txt b/res/cardsfolder/q/quick_sliver.txt
index 3b6a0bd20db..91183519c28 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 | AddHiddenKeyword$ HIDDEN Flash | AffectedZone$ Exile,Graveyard,Hand,Library | Description$ Any player may play Sliver cards as though they had flash.
+S:Mode$ Continuous | Affected$ Sliver | AddHiddenKeyword$ Flash | AffectedZone$ Exile,Graveyard,Hand,Library | 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/q/quicken.txt b/res/cardsfolder/q/quicken.txt
index ba548cc49ef..d5c02843ce1 100644
--- a/res/cardsfolder/q/quicken.txt
+++ b/res/cardsfolder/q/quicken.txt
@@ -4,7 +4,7 @@ Types:Instant
 Text:no text
 A:SP$Effect | Cost$ U | Name$ Quicken effect | StaticAbilities$ QuickenStA | Triggers$ SpellCastTrig | SVars$ Quickened | SubAbility$ DBDraw | SpellDescription$ The next sorcery card you cast this turn can be cast as though it had flash.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:QuickenStA:Mode$ Continuous | Affected$ Sorcery.YouCtrl | AffectedZone$ Hand,Graveyard,Exile | AddHiddenKeyword$ HIDDEN Flash
+SVar:QuickenStA:Mode$ Continuous | Affected$ Sorcery.YouCtrl | AffectedZone$ Hand,Graveyard,Exile | AddHiddenKeyword$ Flash
 SVar:SpellCastTrig:Mode$ SpellCast | ValidCard$ Sorcery | ValidActivatingPlayer$ You | Execute$ Quickened | Static$ True | TriggerDescription$ The next sorcery card you cast this turn can be cast as though it had flash.
 SVar:Quickened:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Graveyard
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/r/rakdos_cackler.txt b/res/cardsfolder/r/rakdos_cackler.txt
index d17e9ad29e9..c06b71d90eb 100644
--- a/res/cardsfolder/r/rakdos_cackler.txt
+++ b/res/cardsfolder/r/rakdos_cackler.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:1/1
 K:ETBReplacement:Other:Unleash:Optional
 SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.)
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X
 SVar:X:Count$NumCounters.P1P1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_cackler.jpg
diff --git a/res/cardsfolder/r/razorjaw_oni.txt b/res/cardsfolder/r/razorjaw_oni.txt
index 2d4dee7c1b5..1abd5259a77 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 | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | Description$ Black creatures can't block.
+S:Mode$ Continuous | Affected$ Creature.Black | AddHiddenKeyword$ 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 5f801fabbbf..c667e7fab34 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 | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. | Description$ Enchanted creature can't attack or block.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ 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/red_scarab.txt b/res/cardsfolder/r/red_scarab.txt
index de96cadb029..bd77ea6946f 100644
--- a/res/cardsfolder/r/red_scarab.txt
+++ b/res/cardsfolder/r/red_scarab.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ W | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't be blocked by red creatures. | Description$ Enchanted creature can't be blocked by red creatures.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't be blocked by red creatures. | Description$ Enchanted creature can't be blocked by red creatures.
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | CheckSVar$ X | SVarCompare$ GE1 | References$ X | Description$ Enchanted creature gets +2/+2 as long as an opponent controls a red permanent.
 SVar:X:Count$Valid Permanent.Red+OppCtrl
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/r/refreshing_rain.txt b/res/cardsfolder/r/refreshing_rain.txt
index 45e56aa421f..4436f38e6f5 100644
--- a/res/cardsfolder/r/refreshing_rain.txt
+++ b/res/cardsfolder/r/refreshing_rain.txt
@@ -2,7 +2,7 @@ Name:Refreshing Rain
 ManaCost:3 G
 Types:Instant
 Text:no text
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddHiddenKeyword$ HIDDEN Alternative Cost 0 | CheckSVar$ X | CheckSecondSVar$ Y | References$ X,Y | Description$ If an opponent controls a Swamp and you control a Forest, you may cast CARDNAME without paying its mana cost.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddHiddenKeyword$ Alternative Cost 0 | CheckSVar$ X | CheckSecondSVar$ Y | References$ X,Y | Description$ If an opponent controls a Swamp and you control a Forest, you may cast CARDNAME without paying its mana cost.
 SVar:X:Count$Valid Swamp.OppCtrl
 SVar:Y:Count$Valid Forest.YouCtrl
 A:SP$ GainLife | Cost$ 3 G | LifeAmount$ 6 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player gains 6 life.
diff --git a/res/cardsfolder/r/rimescale_dragon.txt b/res/cardsfolder/r/rimescale_dragon.txt
index 3aed8ad1525..d0f160223d6 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.counters_GE1_ICE | 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.
+S:Mode$ Continuous | Affected$ Creature.counters_GE1_ICE | AddHiddenKeyword$ 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 | IsCurse$ True | TgtPrompt$ Select target creature | CounterType$ ICE | CounterNum$ 1 | SubAbility$ DBTap | SpellDescription$ Put an ice counter on target creature. Tap that creature.
 SVar:DBTap:DB$ Tap | Defined$ Targeted
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/r/rising_waters.txt b/res/cardsfolder/r/rising_waters.txt
index 4b8e319904f..80d7c9efebd 100644
--- a/res/cardsfolder/r/rising_waters.txt
+++ b/res/cardsfolder/r/rising_waters.txt
@@ -2,7 +2,7 @@ Name:Rising Waters
 ManaCost:3 U
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Land | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Lands don't untap during their controller's untap steps.
+S:Mode$ Continuous | Affected$ Land | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Lands don't untap during their controller's untap steps.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self | Execute$ TrigUntap | TriggerDescription$ At the beginning of each player's upkeep, that player untaps a land he or she controls.
 SVar:TrigUntap:AB$ Untap | Cost$ 0 | UntapUpTo$ True | UntapType$ Land | Amount$ 1 | Defined$ TriggeredPlayer
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/r/river_delta.txt b/res/cardsfolder/r/river_delta.txt
index c8c4d64cf11..5ce03e4485d 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+counters_GE1_DEPLETION | 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.
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_DEPLETION | AddHiddenKeyword$ 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$ AddCounter | SpellDescription$ Add U to your mana pool. Put a depletion counter on CARDNAME.
 A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SubAbility$ 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 5dfdf3c27b1..8fc6521ce14 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 | AddHiddenKeyword$ 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$ 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/ronom_serpent.txt b/res/cardsfolder/r/ronom_serpent.txt
index 39b05771f0e..7ac02c12293 100644
--- a/res/cardsfolder/r/ronom_serpent.txt
+++ b/res/cardsfolder/r/ronom_serpent.txt
@@ -3,7 +3,7 @@ ManaCost:5 U
 Types:Snow Creature Serpent
 Text:no text
 PT:5/6
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ LT1 | References$ X | Description$ CARDNAME can't attack unless defending player controls a snow land.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ LT1 | References$ X | Description$ CARDNAME can't attack unless defending player controls a snow land.
 SVar:X:Count$Valid Land.Snow+YouDontCtrl
 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Land.Snow+YouCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When you control no snow lands, sacrifice Ronom Serpent.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
diff --git a/res/cardsfolder/r/rooftop_storm.txt b/res/cardsfolder/r/rooftop_storm.txt
index ca562f85d63..1ad96c3ac3e 100644
--- a/res/cardsfolder/r/rooftop_storm.txt
+++ b/res/cardsfolder/r/rooftop_storm.txt
@@ -2,7 +2,7 @@ Name:Rooftop Storm
 ManaCost:5 U
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+Zombie | AddHiddenKeyword$ HIDDEN Alternative Cost 0 | AffectedZone$ Hand,Graveyard,Exile,Library | Description$ You may pay 0 rather than pay the mana cost for Zombie creature spells you cast.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+Zombie | AddHiddenKeyword$ Alternative Cost 0 | AffectedZone$ Hand,Graveyard,Exile,Library | Description$ You may pay 0 rather than pay the mana cost for Zombie creature spells you cast.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rooftop_storm.jpg
diff --git a/res/cardsfolder/r/root_sliver.txt b/res/cardsfolder/r/root_sliver.txt
index 6077db1ce79..aec6d863d24 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 | AddHiddenKeyword$ HIDDEN CARDNAME can't be countered. | AffectedZone$ Stack | Description$ Sliver spells can't be countered by spells or abilities.
+S:Mode$ Continuous | Affected$ Sliver | AddHiddenKeyword$ CARDNAME can't be countered. | AffectedZone$ 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/rootborn_defenses.txt b/res/cardsfolder/r/rootborn_defenses.txt
index 2a0d6d048f4..1c760f40a35 100644
--- a/res/cardsfolder/r/rootborn_defenses.txt
+++ b/res/cardsfolder/r/rootborn_defenses.txt
@@ -6,7 +6,7 @@ A:SP$ ChooseCard | Cost$ 2 W | Defined$ You | Amount$ 1 | Choices$ Creature.toke
 SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | NumCopies$ 1 | SubAbility$ DBPumpAll
 SVar:DBPumpAll:DB$ Effect | Name$ Rootborn Defenses Effect | StaticAbilities$ KWPump | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:KWPump:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ HIDDEN Indestructible | Description$ Creatures you control are indestructible this turn.
+SVar:KWPump:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ Indestructible | Description$ Creatures you control are indestructible this turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rootborn_defenses.jpg
 SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/19.jpg
diff --git a/res/cardsfolder/r/roots.txt b/res/cardsfolder/r/roots.txt
index 1cea007cb3f..8b137e350d1 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 | 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 | AddHiddenKeyword$ 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/rootwater_shaman.txt b/res/cardsfolder/r/rootwater_shaman.txt
index dc385400cb0..4bb46c88f03 100644
--- a/res/cardsfolder/r/rootwater_shaman.txt
+++ b/res/cardsfolder/r/rootwater_shaman.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Merfolk Shaman
 Text:no text
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Aura+withEnchant creature+YouCtrl | AddHiddenKeyword$ HIDDEN Flash | AffectedZone$ Exile,Graveyard,Hand,Library | Description$ You may cast Aura cards with enchant creature as though they had flash.
+S:Mode$ Continuous | Affected$ Card.Aura+withEnchant creature+YouCtrl | AddHiddenKeyword$ Flash | AffectedZone$ Exile,Graveyard,Hand,Library | Description$ You may cast Aura cards with enchant creature as though they had flash.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rootwater_shaman.jpg
 SetInfo:TMP|Rare|http://magiccards.info/scans/en/tp/84.jpg
diff --git a/res/cardsfolder/r/rune_tail_kitsune_ascendant_rune_tails_essence.txt b/res/cardsfolder/r/rune_tail_kitsune_ascendant_rune_tails_essence.txt
index 8453bf215b3..b7e0a1b2509 100644
--- a/res/cardsfolder/r/rune_tail_kitsune_ascendant_rune_tails_essence.txt
+++ b/res/cardsfolder/r/rune_tail_kitsune_ascendant_rune_tails_essence.txt
@@ -17,7 +17,7 @@ ManaCost:2 W
 Colors:white
 Types:Legendary Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ HIDDEN Prevent all damage that would be dealt to CARDNAME. | Description$ Prevent all damage that would be dealt to creatures you control.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ Prevent all damage that would be dealt to CARDNAME. | Description$ Prevent all damage that would be dealt to creatures you control.
 SVar:Picture:http://www.marc-fowler-design.com/cardforge/flippedcards/SOK/rune_tails_essence.jpg
 # This link may be a temporary solution and could change in the near future.
 SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/166.jpg
diff --git a/res/cardsfolder/r/rushwood_legate.txt b/res/cardsfolder/r/rushwood_legate.txt
index a36152583a4..682213dddcb 100644
--- a/res/cardsfolder/r/rushwood_legate.txt
+++ b/res/cardsfolder/r/rushwood_legate.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Dryad
 Text:no text
 PT:2/1
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddHiddenKeyword$ HIDDEN Alternative Cost 0 | CheckSVar$ X | CheckSecondSVar$ Y | References$ X,Y | Description$ If an opponent controls an Island and you control a Forest, you may cast CARDNAME without paying its mana cost.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddHiddenKeyword$ Alternative Cost 0 | CheckSVar$ X | CheckSecondSVar$ Y | References$ X,Y | Description$ If an opponent controls an Island and you control a Forest, you may cast CARDNAME without paying its mana cost.
 SVar:X:Count$Valid Island.OppCtrl
 SVar:Y:Count$Valid Forest.YouCtrl
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/r/rust_tick.txt b/res/cardsfolder/r/rust_tick.txt
index cf6c41f65ae..004349ec314 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 | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | Affected$ Artifact.IsRemembered | AddHiddenKeyword$ 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 b4405103f0b..7de4559aca3 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 | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step.
+S:Mode$ Continuous | Affected$ Creature.IsRemembered | AddHiddenKeyword$ 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 695726a9f30..9efa7cc6e71 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 | 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.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ 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/saprazzan_legate.txt b/res/cardsfolder/s/saprazzan_legate.txt
index 9fdf161af37..402394caf60 100644
--- a/res/cardsfolder/s/saprazzan_legate.txt
+++ b/res/cardsfolder/s/saprazzan_legate.txt
@@ -4,7 +4,7 @@ Types:Creature Merfolk Soldier
 Text:no text
 PT:1/3
 K:Flying
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddHiddenKeyword$ HIDDEN Alternative Cost 0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Mountain and you control an Island, you may cast CARDNAME without paying its mana cost.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddHiddenKeyword$ Alternative Cost 0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Mountain and you control an Island, you may cast CARDNAME without paying its mana cost.
 SVar:X:Count$Valid Mountain.OppCtrl
 SVar:Y:Count$Valid Island.YouCtrl
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/s/scouts_warning.txt b/res/cardsfolder/s/scouts_warning.txt
index 355e35858ca..6209028adfd 100644
--- a/res/cardsfolder/s/scouts_warning.txt
+++ b/res/cardsfolder/s/scouts_warning.txt
@@ -4,7 +4,7 @@ Types:Instant
 Text:no text
 A:SP$Effect | Cost$ W | Name$ Scout's Warning effect | StaticAbilities$ ScoutFlash | Triggers$ SpellCastTrig | SVars$ WarningGiven | SubAbility$ DBDraw | SpellDescription$ The next creature card you play this turn can be played as though it had flash.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:ScoutFlash:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Hand,Graveyard,Exile | AddHiddenKeyword$ HIDDEN Flash
+SVar:ScoutFlash:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Hand,Graveyard,Exile | AddHiddenKeyword$ Flash
 SVar:SpellCastTrig:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ WarningGiven | Static$ True | TriggerDescription$ The next creature card you play this turn can be played as though it had flash.
 SVar:WarningGiven:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Graveyard
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/s/scrapdiver_serpent.txt b/res/cardsfolder/s/scrapdiver_serpent.txt
index 4590cf4a71a..8b5c59638bc 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 | AddHiddenKeyword$ 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$ 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 e0f9b813807..e70f23718a6 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 | AddHiddenKeyword$ 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$ 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 764b870f950..a9c8087424d 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 | AddHiddenKeyword$ 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$ 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/serra_bestiary.txt b/res/cardsfolder/s/serra_bestiary.txt
index 72255f7011c..4358cb4642b 100644
--- a/res/cardsfolder/s/serra_bestiary.txt
+++ b/res/cardsfolder/s/serra_bestiary.txt
@@ -1,15 +1,15 @@
-Name:Serra Bestiary
-ManaCost:W W
-Types:Enchantment Aura
-Text:no text
-K:Enchant creature
-K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay W W
-A:SP$ Attach | Cost$ W W | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. | Description$ Enchanted creature can't attack or block, and its activated abilities with T in their costs can't be activated.
-S:Mode$ CantBeActivated | ValidCard$ Card.EnchantedBy | TapAbility$ True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/serra_bestiary.jpg
-SetInfo:HML|Uncommon|http://magiccards.info/scans/en/hl/119.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/336.jpg
-Oracle:Enchant creature\nAt the beginning of your upkeep, sacrifice Serra Bestiary unless you pay {W}{W}.\nEnchanted creature can't attack or block, and its activated abilities with {T} in their costs can't be activated.
+Name:Serra Bestiary
+ManaCost:W W
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay W W
+A:SP$ Attach | Cost$ W W | ValidTgts$ Creature | AILogic$ Curse
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block. | Description$ Enchanted creature can't attack or block, and its activated abilities with T in their costs can't be activated.
+S:Mode$ CantBeActivated | ValidCard$ Card.EnchantedBy | TapAbility$ True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/serra_bestiary.jpg
+SetInfo:HML|Uncommon|http://magiccards.info/scans/en/hl/119.jpg
+SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/336.jpg
+Oracle:Enchant creature\nAt the beginning of your upkeep, sacrifice Serra Bestiary unless you pay {W}{W}.\nEnchanted creature can't attack or block, and its activated abilities with {T} in their costs can't be activated.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/setons_desire.txt b/res/cardsfolder/s/setons_desire.txt
index 9f106485a02..0382621dbde 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 | AddHiddenKeyword$ HIDDEN All creatures able to block CARDNAME do so. | Condition$ Threshold | 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$ All creatures able to block CARDNAME do so. | Condition$ Threshold | 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 7984fc9d93e..96b145a5285 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 | 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 | AddHiddenKeyword$ 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 61f330044c4..4cf441ea8b9 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 | AddHiddenKeyword$ 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$ 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$ 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 3aacb066512..55ea7d32155 100644
--- a/res/cardsfolder/s/shield_of_kaldra.txt
+++ b/res/cardsfolder/s/shield_of_kaldra.txt
@@ -3,8 +3,8 @@ ManaCost:4
 Types:Legendary Artifact Equipment
 Text:no text
 K:Equip 4
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ HIDDEN Indestructible | Description$ Equipped creature is 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.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ Indestructible | Description$ Equipped creature is indestructible.
+S:Mode$ Continuous | Affected$ Equipment.namedSword of Kaldra,Equipment.namedShield of Kaldra,Equipment.namedHelm of Kaldra | AddHiddenKeyword$ 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 6eb1842fe58..57e206686a2 100644
--- a/res/cardsfolder/s/shield_of_the_oversoul.txt
+++ b/res/cardsfolder/s/shield_of_the_oversoul.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 GW | ValidTgts$ Creature | AITgts$ Card.Green,Card.White | AILogic$ Pump
-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+Green | AddPower$ 1 | AddToughness$ 1 | AddHiddenKeyword$ 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:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shield_of_the_oversoul.jpg
diff --git a/res/cardsfolder/s/shifting_sliver.txt b/res/cardsfolder/s/shifting_sliver.txt
index 99960b178ce..0749b401547 100644
--- a/res/cardsfolder/s/shifting_sliver.txt
+++ b/res/cardsfolder/s/shifting_sliver.txt
@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Creature Sliver
 Text:no text
 PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Sliver | AddHiddenKeyword$ HIDDEN CantBeBlockedBy Creature.nonSliver | Description$ Slivers can't be blocked except by Slivers.
+S:Mode$ Continuous | Affected$ Creature.Sliver | AddHiddenKeyword$ CantBeBlockedBy Creature.nonSliver | Description$ Slivers can't be blocked except by Slivers.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shifting_sliver.jpg
 SetInfo:LGN|Uncommon|http://magiccards.info/scans/en/le/52.jpg
diff --git a/res/cardsfolder/s/shimmer_myr.txt b/res/cardsfolder/s/shimmer_myr.txt
index b7b35a7e81f..4bcfb65ec9e 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$ Exile,Graveyard,Hand,Library | AddHiddenKeyword$ HIDDEN Flash | Description$ You may cast artifact cards as though they had flash.
+S:Mode$ Continuous | Affected$ Artifact.YouCtrl | AffectedZone$ Exile,Graveyard,Hand,Library | AddHiddenKeyword$ 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 179b4b2e7d7..5827588ce1c 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 | 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 | AddHiddenKeyword$ 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/sivvis_ruse.txt b/res/cardsfolder/s/sivvis_ruse.txt
index dc29e52c103..1841087d90a 100644
--- a/res/cardsfolder/s/sivvis_ruse.txt
+++ b/res/cardsfolder/s/sivvis_ruse.txt
@@ -2,7 +2,7 @@ Name:Sivvi's Ruse
 ManaCost:2 W W
 Types:Instant
 Text:no text
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddHiddenKeyword$ HIDDEN Alternative Cost 0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Mountain and you control a Plains, you may cast CARDNAME without paying its mana cost.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddHiddenKeyword$ Alternative Cost 0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Mountain and you control a Plains, you may cast CARDNAME without paying its mana cost.
 A:SP$ Effect | Cost$ 2 W W | Name$ Sivvi's Ruse Effect | StaticAbilities$ STPrevent | SpellDescription$ Prevent all damage that would be dealt this turn to creatures you control.
 SVar:STPrevent:Mode$ PreventDamage | Target$ Creature.YouCtrl | Description$ Prevent all damage that would be dealt this turn to creatures you control.
 SVar:X:Count$Valid Mountain.OppCtrl
diff --git a/res/cardsfolder/s/sleeping_potion.txt b/res/cardsfolder/s/sleeping_potion.txt
index bd0f6be4b31..0910512d3f6 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 | 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 | AddHiddenKeyword$ 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 5fd4229b418..4ad7da3d578 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 | AddHiddenKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Condition$ Hellbent | 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$ CARDNAME can attack as though it didn't have defender. | Condition$ Hellbent | 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 d790731d376..07558bc3486 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 | 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.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ 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 | TriggerController$ TriggeredCardController | 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 18e44fdb16b..6a801933563 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 | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | Description$ Enchanted creature can't block.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't block. | Description$ Enchanted creature can't block.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | 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/slumbering_dragon.txt b/res/cardsfolder/s/slumbering_dragon.txt
index 9863fcc1547..4fcc7adf3d3 100644
--- a/res/cardsfolder/s/slumbering_dragon.txt
+++ b/res/cardsfolder/s/slumbering_dragon.txt
@@ -4,7 +4,7 @@ Types:Creature Dragon
 Text:no text
 PT:3/3
 K:Flying
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ LT5 | References$ X | Description$ CARDNAME can't attack or block unless it has five or more +1/+1 counters on it.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ LT5 | References$ X | Description$ CARDNAME can't attack or block unless it has five or more +1/+1 counters on it.
 T:Mode$ Attacks | ValidCard$ Creature | Attacked$ You,Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ DragonWake | TriggerDescription$ Whenever a creature attacks you or a planeswalker you control, put a +1/+1 counter on CARDNAME.
 SVar:DragonWake:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:X:Count$NumCounters.P1P1
diff --git a/res/cardsfolder/s/song_of_serenity.txt b/res/cardsfolder/s/song_of_serenity.txt
index 6f49898d849..4dbdc5d6e98 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 | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. | Description$ Creatures that are enchanted can't attack or block.
+S:Mode$ Continuous | Affected$ Creature.enchanted | AddHiddenKeyword$ 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/spawn_of_rix_maadi.txt b/res/cardsfolder/s/spawn_of_rix_maadi.txt
index 85e68dc38ef..723705f5411 100644
--- a/res/cardsfolder/s/spawn_of_rix_maadi.txt
+++ b/res/cardsfolder/s/spawn_of_rix_maadi.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:5/3
 K:ETBReplacement:Other:Unleash:Optional
 SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.)
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X
 SVar:X:Count$NumCounters.P1P1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spawn_of_rix_maadi.jpg
diff --git a/res/cardsfolder/s/spectral_prison.txt b/res/cardsfolder/s/spectral_prison.txt
index 8561ed6609a..e63411d13de 100644
--- a/res/cardsfolder/s/spectral_prison.txt
+++ b/res/cardsfolder/s/spectral_prison.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Curse
-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 | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ SpellCast | TargetsValid$ Card.EnchantedBy | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever enchanted creature becomes the target of a spell, sacrifice CARDNAME.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/spectral_shield.txt b/res/cardsfolder/s/spectral_shield.txt
index ba691294c2b..aea5fa24e76 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 | AddHiddenKeyword$ 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$ 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 d655d6aa62c..d25f5b078b6 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 | AddHiddenKeyword$ 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$ 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 3eeec226568..cc423aa0b8d 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 | AddHiddenKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Condition$ Metalcraft | 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$ CARDNAME can attack as though it didn't have defender. | Condition$ Metalcraft | 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/splatter_thug.txt b/res/cardsfolder/s/splatter_thug.txt
index b9129557ded..594211a17aa 100644
--- a/res/cardsfolder/s/splatter_thug.txt
+++ b/res/cardsfolder/s/splatter_thug.txt
@@ -6,7 +6,7 @@ PT:2/2
 K:First Strike
 K:ETBReplacement:Other:Unleash:Optional
 SVar:Unleash:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Unleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.)
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ GE1 | References$ X
 SVar:X:Count$NumCounters.P1P1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/splatter_thug.jpg
diff --git a/res/cardsfolder/s/stasis_cell.txt b/res/cardsfolder/s/stasis_cell.txt
index 6c22ec62abd..c9d12ae3e5a 100644
--- a/res/cardsfolder/s/stasis_cell.txt
+++ b/res/cardsfolder/s/stasis_cell.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 4 U | ValidTgts$ Creature | AILogic$ KeepTapped
-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 | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
 A:AB$ Attach | Cost$ 3 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ KeepTapped | SpellDescription$ Attach CARDNAME to target creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/stasis_cocoon.txt b/res/cardsfolder/s/stasis_cocoon.txt
index 965cf876701..fdcedce63e8 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 | AITgts$ Creature,Card.hasActivatedAbility | AILogic$ Curse
-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.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ 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$ 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 8456c21c5a9..aa5d7d6a2e6 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 | 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.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ 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 040478d0b5d..67304c5ed8d 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 | AITgts$ Card.White,Card.Blue | 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 | AddHiddenKeyword$ 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$ Unblockable | Description$ As long as enchanted creature is blue, it gets +1/+1 and is unblockable.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/steel_of_the_godhead.jpg
 SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/150.jpg
diff --git a/res/cardsfolder/s/steelclad_serpent.txt b/res/cardsfolder/s/steelclad_serpent.txt
index fdd2f1a31fa..77b586982d5 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 | AddHiddenKeyword$ 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$ 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 9127367cd6f..ae8843543c4 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 | AddHiddenKeyword$ HIDDEN All creatures able to block CARDNAME do so. | Condition$ Threshold | 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$ All creatures able to block CARDNAME do so. | Condition$ Threshold | 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$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy damaged creature at end of combat.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredTarget
diff --git a/res/cardsfolder/s/stony_silence.txt b/res/cardsfolder/s/stony_silence.txt
index e813c422975..3f363e84c47 100644
--- a/res/cardsfolder/s/stony_silence.txt
+++ b/res/cardsfolder/s/stony_silence.txt
@@ -1,11 +1,11 @@
-Name:Stony Silence
-ManaCost:1 W
-Types:Enchantment
-Text:no text
-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/stony_silence.jpg
-SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/36.jpg
-Oracle:Activated abilities of artifacts can't be activated.
+Name:Stony Silence
+ManaCost:1 W
+Types:Enchantment
+Text:no text
+S:Mode$ Continuous | Affected$ Artifact | AddHiddenKeyword$ 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/stony_silence.jpg
+SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/36.jpg
+Oracle:Activated abilities of artifacts can't be activated.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/stormtide_leviathan.txt b/res/cardsfolder/s/stormtide_leviathan.txt
index c30ee45895a..89b7861688b 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 | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures without flying or islandwalk can't attack.
+S:Mode$ Continuous | Affected$ Creature.withoutFlying+withoutIslandwalk | AddHiddenKeyword$ 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 04b6eb51659..87d5d7acce7 100644
--- a/res/cardsfolder/s/stupefying_touch.txt
+++ b/res/cardsfolder/s/stupefying_touch.txt
@@ -6,7 +6,7 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AITgts$ Card.hasActivatedAbility | AILogic$ Curse
 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
-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.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature's activated abilities can't be activated.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stupefying_touch.jpg
 SetInfo:TOR|Uncommon|http://magiccards.info/scans/en/tr/48.jpg
diff --git a/res/cardsfolder/s/submerge.txt b/res/cardsfolder/s/submerge.txt
index 28e0e38cfeb..aeb36b08f96 100644
--- a/res/cardsfolder/s/submerge.txt
+++ b/res/cardsfolder/s/submerge.txt
@@ -2,7 +2,7 @@ Name:Submerge
 ManaCost:4 U
 Types:Instant
 Text:no text
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddHiddenKeyword$ HIDDEN Alternative Cost 0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Forest and you control an Island, you may cast CARDNAME without paying its mana cost.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddHiddenKeyword$ Alternative Cost 0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Forest and you control an Island, you may cast CARDNAME without paying its mana cost.
 SVar:X:Count$Valid Forest.OppCtrl
 SVar:Y:Count$Valid Island.YouCtrl
 A:SP$ ChangeZone | Cost$ 4 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put target creature on top of its owner's library.
diff --git a/res/cardsfolder/s/summit_apes.txt b/res/cardsfolder/s/summit_apes.txt
index 502b6dc44d8..c34bc252546 100644
--- a/res/cardsfolder/s/summit_apes.txt
+++ b/res/cardsfolder/s/summit_apes.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Creature Ape
 Text:no text
 PT:5/2
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can't be blocked except by two or more creatures. | CheckSVar$ X | SVarCompare$ GE1 | Description$ As long as you control a Mountain, CARDNAME can't be blocked except by two or more creatures.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't be blocked except by two or more creatures. | CheckSVar$ X | SVarCompare$ GE1 | Description$ As long as you control a Mountain, CARDNAME can't be blocked except by two or more creatures.
 SVar:X:Count$Valid Mountain.YouCtrl
 SVar:BuffedBy:Mountain
 SVar:Rarity:Uncommon