- Removing unnecessary "HIDDEN" strings (WIP).

res/cardsfolder/d/dance_of_the_dead.txt

@@ -2,7 +2,7 @@ Name:Dance of the Dead
 ManaCost:1 B
 Types:Enchantment Aura
 Text:Enchant creature card in a graveyard\r\n\r\nWhen CARDNAME enters the battlefield, if it's on the battlefield, it loses "enchant creature card in a graveyard" and gains "enchant creature put onto the battlefield with CARDNAME." Return enchanted creature card to the battlefield tapped under your control and attach CARDNAME to it. When CARDNAME leaves the battlefield, that creature's controller sacrifices it.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature gets +1/+1 and doesn't untap during its controller's untap step.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature gets +1/+1 and doesn't untap during its controller's untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedController | TriggerZones$ Battlefield | OptionalDecider$ EnchantedController | Execute$ TrigUntap | TriggerDescription$ At the beginning of the upkeep of enchanted creature's controller, that player may pay 1 B. If he or she does, untap that creature.
 SVar:TrigUntap:AB$Untap | Cost$ 1 B | Defined$ Enchanted
 SVar:Rarity:Uncommon

res/cardsfolder/d/darksteel_forge.txt

@@ -2,7 +2,7 @@ Name:Darksteel Forge
 ManaCost:9
 Types:Artifact
 Text:no text
-S:Mode$ Continuous | Affected$ Artifact.YouCtrl | AddHiddenKeyword$ HIDDEN Indestructible | Description$ Artifacts you control are indestructible.
+S:Mode$ Continuous | Affected$ Artifact.YouCtrl | AddHiddenKeyword$ Indestructible | Description$ Artifacts you control are indestructible.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darksteel_forge.jpg
 SetInfo:DST|Rare|http://magiccards.info/scans/en/ds/110.jpg

res/cardsfolder/d/darksteel_plate.txt

@@ -4,7 +4,7 @@ Types:Artifact Equipment
 Text:no text
 K:Indestructible
 K:Equip 2
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ HIDDEN Indestructible | Description$ Equipped creature is indestructible.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ Indestructible | Description$ Equipped creature is indestructible.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darksteel_plate.jpg
 SetInfo:MBS|Rare|http://magiccards.info/scans/en/mbs/104.jpg

res/cardsfolder/d/dauntless_escort.txt

@@ -4,7 +4,7 @@ Types:Creature Rhino Soldier
 Text:no text
 PT:3/3
 A:AB$ Effect | Cost$ Sac<1/CARDNAME> | Name$ Dauntless Escort Effect | StaticAbilities$ KWPump | SpellDescription$ Creatures you control are indestructible this turn.
-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:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dauntless_escort.jpg

res/cardsfolder/d/dead_reveler.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:2/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/dead_reveler.jpg

res/cardsfolder/d/death_pits_of_rath.txt

@@ -2,7 +2,7 @@ Name:Death Pits of Rath
 ManaCost:3 B B
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ HIDDEN When CARDNAME is dealt damage, destroy it. It can't be regenerated. | Description$ Whenever a creature is dealt damage, destroy it. It can't be regenerated.
+S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ When CARDNAME is dealt damage, destroy it. It can't be regenerated. | Description$ Whenever a creature is dealt damage, destroy it. It can't be regenerated.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/death_pits_of_rath.jpg

res/cardsfolder/d/deepwood_legate.txt

@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Shade
 Text:no text
 PT:1/1
-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 a Swamp, 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 a Swamp, you may cast CARDNAME without paying its mana cost.
 A:AB$ Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
 SVar:X:Count$Valid Forest.OppCtrl
 SVar:Y:Count$Valid Swamp.YouCtrl

res/cardsfolder/d/dehydration.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 3 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/dehydration.jpg
 SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/75.jpg

res/cardsfolder/d/demonfire.txt

@@ -5,7 +5,7 @@ Text:no text
 A:SP$ DealDamage | Cost$ X R | Tgt$ TgtCP | NumDmg$ X | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | SubAbility$ DBDemonfire | References$ X,Y | SpellDescription$ CARDNAME deals X damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead. Hellbent - If you have no cards in hand, CARDNAME can't be countered by spells or abilities and the damage can't be prevented.
 SVar:DBDemonfire:DB$ DealDamage | Defined$ Targeted | NumDmg$ X | NoPrevention$ True | ConditionCheckSVar$ Y | References$ X,Y | ConditionSVarCompare$ EQ0 | SubAbility$ Annihilate
 SVar:Annihilate:DB$ Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
-S:Mode$ Continuous | Affected$ Self | AffectedZone$ Stack | EffectZone$ All | CharacteristicDefining$ True | AddHiddenKeyword$ HIDDEN CARDNAME can't be countered. | CheckSVar$ Y | SVarCompare$ EQ0 | Description$ Hellbent - If you have no cards in hand, CARDNAME can't be countered by spells or abilities and the damage can't be prevented.
+S:Mode$ Continuous | Affected$ Self | AffectedZone$ Stack | EffectZone$ All | CharacteristicDefining$ True | AddHiddenKeyword$ CARDNAME can't be countered. | CheckSVar$ Y | SVarCompare$ EQ0 | Description$ Hellbent - If you have no cards in hand, CARDNAME can't be countered by spells or abilities and the damage can't be prevented.
 SVar:X:Count$xPaid
 SVar:Y:Count$InYourHand
 SVar:Rarity:Rare

res/cardsfolder/d/demonic_torment.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. & HIDDEN Prevent all combat damage that would be dealt by CARDNAME. | Description$ Enchanted creature can't attack. Prevent all combat damage that would be dealt by enchanted creature.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack. & Prevent all combat damage that would be dealt by CARDNAME. | Description$ Enchanted creature can't attack. Prevent all combat damage that would be dealt by enchanted creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/demonic_torment.jpg
 SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/9.jpg

res/cardsfolder/d/dense_canopy.txt

@@ -2,7 +2,7 @@ Name:Dense Canopy
 ManaCost:1 G
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.withFlying | AddHiddenKeyword$ HIDDEN CARDNAME can block only creatures with flying. | Description$ Creatures with flying can block only creatures with flying.
+S:Mode$ Continuous | Affected$ Creature.withFlying | AddHiddenKeyword$ CARDNAME can block only creatures with flying. | Description$ Creatures with flying can block only creatures with flying.
 SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon

res/cardsfolder/d/detainment_spell.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ W | ValidTgts$ Creature | AILogic$ Curse
-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.
 A:AB$ Attach | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ Curse | SpellDescription$ Attach CARDNAME to target creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/d/dream_halls.txt

@@ -2,7 +2,7 @@ Name:Dream Halls
 ManaCost:3 U U
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Card.YouCtrl | AddHiddenKeyword$ HIDDEN Alternative Cost Discard<1/Card.SharesColorWith/color sharing> | AffectedZone$ Hand,Graveyard,Exile,Library | Description$ Rather than pay the mana cost for a spell, its controller may discard a card that shares a color with that spell.
+S:Mode$ Continuous | Affected$ Card.YouCtrl | AddHiddenKeyword$ Alternative Cost Discard<1/Card.SharesColorWith/color sharing> | AffectedZone$ Hand,Graveyard,Exile,Library | Description$ Rather than pay the mana cost for a spell, its controller may discard a card that shares a color with that spell.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_halls.jpg

res/cardsfolder/d/dust_corona.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ R | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddHiddenKeyword$ HIDDEN CantBeBlockedBy Creature.withFlying | Description$ Enchanted creature gets +2/+0 and can't be blocked by creatures with flying.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddHiddenKeyword$ CantBeBlockedBy Creature.withFlying | Description$ Enchanted creature gets +2/+0 and can't be blocked by creatures with flying.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dust_corona.jpg
 SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/97.jpg

res/cardsfolder/e/echo_circlet.txt

@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact Equipment
 Text:no text
 K:Equip 1
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ HIDDEN CARDNAME can block an additional creature. | Description$ Equipped creature can block an additional creature.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ CARDNAME can block an additional creature. | Description$ Equipped creature can block an additional creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/echo_circlet.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/153.jpg

res/cardsfolder/e/eldrazi_monument.txt

@@ -7,7 +7,7 @@ SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ You | SacValid$ Creature | SubAbi
 SVar:DBSacSelf:DB$ Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ DBCleanup | ConditionCheckSVar$ X | ConditionSVarCompare$ LT1 | SubAbility$ DBCleanup | References$ X
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying | AddHiddenKeyword$ HIDDEN Indestructible | Description$ Creatures you control get +1/+1, have flying, and are indestructible.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying | AddHiddenKeyword$ Indestructible | Description$ Creatures you control get +1/+1, have flying, and are indestructible.
 SVar:PlayMain1:TRUE
 SVar:NeedsToPlayVar:Y GE3
 SVar:Y:Count$Valid Creature.YouCtrl

res/cardsfolder/e/ember_gale.txt

@@ -4,7 +4,7 @@ Types:Sorcery
 Text:no text
 A:SP$ Effect | Cost$ 3 R | Name$ Ember Gale Effect | ValidTgts$ Player | TgtPrompt$ Select target player | AILogic$ Evasion | StaticAbilities$ CantBlock | RememberObjects$ Targeted | SubAbility$ DBDamage | SpellDescription$ Creatures target player controls can't block this turn. CARDNAME deals 1 damage to each white and/or blue creature that player controls.
 SVar:DBDamage:DB$ DamageAll | NumDmg$ 1 | ValidCards$ Creature.White+TargetedPlayerCtrl,Creature.Blue+TargetedPlayerCtrl | ValidDescription$ each creature that's white or blue that player controls.
-SVar:CantBlock:Mode$ Continuous | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | SubAbility$ DBDamage | SpellDescription$ Creatures targeted player controls can't block this turn.
+SVar:CantBlock:Mode$ Continuous | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ CARDNAME can't block. | SubAbility$ DBDamage | SpellDescription$ Creatures targeted player controls can't block this turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ember_gale.jpg
 SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/91.jpg

res/cardsfolder/e/encrust.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant artifact or creature
 A:SP$ Attach | Cost$ 1 U U | ValidTgts$ Creature,Artifact | TgtPrompt$ Select target artifact or creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. & HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Enchanted permanent doesn't untap during its controller's untap step and its activated abilities can't be activated.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. & HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Enchanted permanent doesn't untap during its controller's untap step and its activated abilities can't be activated.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/encrust.jpg
 SetInfo:M13|Common|http://magiccards.info/scans/en/m13/49.jpg

res/cardsfolder/e/ensnaring_bridge.txt

@@ -2,7 +2,7 @@ Name:Ensnaring Bridge
 ManaCost:3
 Types:Artifact
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.powerGTX | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures with power greater than the number of cards in your hand can't attack.
+S:Mode$ Continuous | Affected$ Creature.powerGTX | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Creatures with power greater than the number of cards in your hand can't attack.
 SVar:X:Count$InYourHand
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare

res/cardsfolder/e/entangler.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 CARDNAME can block any number of creatures. | Description$ Enchanted creature can block any number of creatures.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can block any number of creatures. | Description$ Enchanted creature can block any number of creatures.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/entangler.jpg
 SetInfo:PCY|Uncommon|http://magiccards.info/scans/en/pr/7.jpg

res/cardsfolder/e/entangling_vines.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant tapped creature
 A:SP$ Attach | Cost$ 3 G | ValidTgts$ Creature.tapped | 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/entangling_vines.jpg
 SetInfo:M10|Common|http://magiccards.info/scans/en/m10/181.jpg

res/cardsfolder/e/errantry.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$ 3 | AddHiddenKeyword$ HIDDEN CARDNAME can only attack alone. | Description$ Enchanted creature gets +3/+0 and can only attack alone.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddHiddenKeyword$ CARDNAME can only attack alone. | Description$ Enchanted creature gets +3/+0 and can only attack alone.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/errantry.jpg
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/224.jpg

res/cardsfolder/e/evil_eye_of_orms_by_gore.txt

@@ -4,7 +4,7 @@ Types:Creature Eye
 Text:CARDNAME can't be blocked except by Walls.
 PT:3/6
 K:CantBeBlockedBy Creature.nonWall
-S:Mode$ Continuous | Affected$ Creature.nonEye+YouCtrl | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Non-Eye creatures you control can't attack.
+S:Mode$ Continuous | Affected$ Creature.nonEye+YouCtrl | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Non-Eye creatures you control can't attack.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/evil_eye_of_orms_by_gore.jpg
 SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/21.jpg

res/cardsfolder/e/evil_eye_of_urborg.txt

@@ -3,7 +3,7 @@ ManaCost:4 B
 Types:Creature Eye
 Text:no text
 PT:6/3
-S:Mode$ Continuous | Affected$ Creature.nonEye+YouCtrl | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Non-Eye creatures you control can't attack.
+S:Mode$ Continuous | Affected$ Creature.nonEye+YouCtrl | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Non-Eye creatures you control can't attack.
 T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigDestroyBlocker | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, destroy that creature.
 SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker
 SVar:Rarity:Uncommon

res/cardsfolder/f/faiths_fetters.txt

@@ -7,7 +7,7 @@ A:SP$ Attach | Cost$ 3 W | ValidTgts$ Permanent | AITgts$ Creature | AILogic$ Cu
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 4 life.
 SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | LifeAmount$ 4
 S:Mode$ CantBeActivated | ValidCard$ Card.EnchantedBy | NonMana$ True | Description$ Enchanted permanent's activated abilities can't be activated unless they're mana abilities. If enchanted permanent 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$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/faiths_fetters.jpg
 SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/16.jpg

res/cardsfolder/f/falter.txt

@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Instant
 Text:no text
 A:SP$ Effect | Cost$ 1 R | Name$ Falter Effect | StaticAbilities$ KWPump | AILogic$ Evasion | SpellDescription$ Creatures without flying can't block this turn.
-SVar:KWPump:Mode$ Continuous | Affected$ Creature.withoutFlying | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | Description$ Creatures without flying can't block this turn.
+SVar:KWPump:Mode$ Continuous | Affected$ Creature.withoutFlying | AddHiddenKeyword$ CARDNAME can't block. | Description$ Creatures without flying can't block this turn.
 SVar:PlayMain1:TRUE
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/f/familiar_ground.txt

@@ -2,7 +2,7 @@ Name:Familiar Ground
 ManaCost:2 G
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ HIDDEN CARDNAME can't be blocked by more than one creature. | Description$ Each creature you control can't be blocked by more than one creature.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ CARDNAME can't be blocked by more than one creature. | Description$ Each creature you control can't be blocked by more than one creature.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/familiar_ground.jpg

res/cardsfolder/f/festival.txt

@@ -3,7 +3,7 @@ ManaCost:W
 Types:Instant
 Text:Cast Festival only during an opponent's upkeep.
 A:SP$ Effect | Cost$ W | Name$ Festival Effect | StaticAbilities$ KWPump | OpponentTurn$ True | ActivationPhases$ Upkeep | SpellDescription$ Creatures can't attack this turn.
-SVar:KWPump:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures can't attack this turn.
+SVar:KWPump:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Creatures can't attack this turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/festival.jpg

res/cardsfolder/f/field_of_reality.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 U | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CantBeBlockedBy Spirit | Description$ Enchanted creature can't be blocked by Spirits.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CantBeBlockedBy Spirit | Description$ Enchanted creature can't be blocked by Spirits.
 A:AB$ ChangeZone | Cost$ 1 U | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:RemRandomDeck:True
 SVar:Rarity:Common

res/cardsfolder/f/fist_ of_suns.txt

@@ -2,7 +2,7 @@ Name:Fist of Suns
 ManaCost:3
 Types:Artifact
 Text:no text
-S:Mode$ Continuous | Affected$ Card.YouCtrl | AddHiddenKeyword$ HIDDEN Alternative Cost W U B R G | AffectedZone$ Hand,Graveyard,Exile,Library | Description$ You may pay W U B R G rather than pay the mana cost for spells that you cast.
+S:Mode$ Continuous | Affected$ Card.YouCtrl | AddHiddenKeyword$ Alternative Cost W U B R G | AffectedZone$ Hand,Graveyard,Exile,Library | Description$ You may pay W U B R G rather than pay the mana cost for spells that you cast.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fist_of_suns.jpg

res/cardsfolder/f/flowering_lumberknot.txt

@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Creature Treefolk
 Text:no text
 PT:5/5
-S:Mode$ Continuous | Affected$ Creature.Self+NotPaired | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. | Description$ CARDNAME can't attack or block unless it's paired with a creature with soulbond.
+S:Mode$ Continuous | Affected$ Creature.Self+NotPaired | AddHiddenKeyword$ CARDNAME can't attack or block. | Description$ CARDNAME can't attack or block unless it's paired with a creature with soulbond.
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flowering_lumberknot.jpg

res/cardsfolder/f/forced_worship.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. | Description$ Enchanted creature can't attack.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Enchanted creature can't attack.
 A:AB$ ChangeZone | Cost$ 2 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/forced_worship.jpg

res/cardsfolder/f/foriysian_totem.txt

@@ -4,7 +4,7 @@ Types:Artifact
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
 A:AB$ Animate | Cost$ 4 R | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Giant | Colors$ Red | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 4/4 red Giant artifact creature with trample until end of turn.
-S:Mode$ Continuous | Affected$ Creature.Self | AddHiddenKeyword$ HIDDEN CARDNAME can block an additional creature. | Description$ As long as CARDNAME is a creature, it can block an additional creature.
+S:Mode$ Continuous | Affected$ Creature.Self | AddHiddenKeyword$ CARDNAME can block an additional creature. | Description$ As long as CARDNAME is a creature, it can block an additional creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/foriysian_totem.jpg

res/cardsfolder/f/frenetic_raptor.txt

@@ -3,7 +3,7 @@ ManaCost:5 R
 Types:Creature Lizard Beast
 Text:no text
 PT:6/6
-S:Mode$ Continuous | Affected$ Creature.Beast | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | Description$ Beasts can't block.
+S:Mode$ Continuous | Affected$ Creature.Beast | AddHiddenKeyword$ CARDNAME can't block. | Description$ Beasts can't block.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/frenetic_raptor.jpg
 SetInfo:LGN|Uncommon|http://magiccards.info/scans/en/le/93.jpg

res/cardsfolder/f/frozen_solid.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:When enchanted creature is dealt damage, destroy it.
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 U U | ValidTgts$ Creature | AILogic$ KeepTapped
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. & HIDDEN When CARDNAME is dealt damage, destroy it. | 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. & HIDDEN When CARDNAME is dealt damage, destroy it. | 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/frozen_solid.jpg
 SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/36.jpg

res/cardsfolder/f/fumiko_the_lowblood.txt

@@ -3,7 +3,7 @@ ManaCost:2 R R
 Types:Legendary Creature Human Samurai
 Text:no text
 PT:3/2
-S:Mode$ Continuous | Affected$ Creature.OppCtrl | AddHiddenKeyword$ HIDDEN CARDNAME attacks each turn if able. | Description$ Creatures your opponents control attack each turn if able.
+S:Mode$ Continuous | Affected$ Creature.OppCtrl | AddHiddenKeyword$ CARDNAME attacks each turn if able. | Description$ Creatures your opponents control attack each turn if able.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ CARDNAME has bushido X, where X is the number of attacking creatures. (When this blocks or becomes blocked, it gets +X/+X until end of turn.)
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | Secondary$ True | TriggerDescription$ CARDNAME has bushido X, where X is the number of attacking creatures. (When this blocks or becomes blocked, it gets +X/+X until end of turn.)
 SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ X | NumDef$ X | References$ X

res/cardsfolder/f/furor_of_the_bitten.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ R | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddHiddenKeyword$ HIDDEN CARDNAME attacks each turn if able. | Description$ Enchanted creature gets +2/+2 and attacks each turn if able.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddHiddenKeyword$ CARDNAME attacks each turn if able. | Description$ Enchanted creature gets +2/+2 and attacks each turn if able.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/furor_of_the_bitten.jpg
 SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/143.jpg

res/cardsfolder/f/future_sight.txt

@@ -3,7 +3,7 @@ ManaCost:2 U U U
 Types:Enchantment
 Text:no text
 K:Play with the top card of your library revealed.
-S:Mode$ Continuous | Affected$ Card.TopLibrary+YouCtrl | AffectedZone$ Library | AddHiddenKeyword$ HIDDEN May be played | Description$ You may play the top card of your library.
+S:Mode$ Continuous | Affected$ Card.TopLibrary+YouCtrl | AffectedZone$ Library | AddHiddenKeyword$ May be played | Description$ You may play the top card of your library.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/future_sight.jpg
 SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/84.jpg

res/cardsfolder/g/gaeas_herald.txt

@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Elf
 Text:no text
 PT:1/1
-S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ HIDDEN CARDNAME can't be countered. | AffectedZone$ Stack | Description$ Creature spells can't be countered.
+S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ CARDNAME can't be countered. | AffectedZone$ Stack | Description$ Creature spells can't be countered.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gaeas_herald.jpg
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/252.jpg

res/cardsfolder/g/garruks_horde.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:7/7
 K:Trample
 K:Play with the top card of your library revealed.
-S:Mode$ Continuous | Affected$ Creature.TopLibrary+YouCtrl | AffectedZone$ Library | AddHiddenKeyword$ HIDDEN May be played | Description$ You may cast the top card of your library if it's a creature card. (Do this only any time you could cast that creature card. You still pay the spell's costs.)
+S:Mode$ Continuous | Affected$ Creature.TopLibrary+YouCtrl | AffectedZone$ Library | AddHiddenKeyword$ May be played | Description$ You may cast the top card of your library if it's a creature card. (Do this only any time you could cast that creature card. You still pay the spell's costs.)
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/garruks_horde.jpg
 SetInfo:M12|Rare|http://magiccards.info/scans/en/m12/176.jpg

res/cardsfolder/g/gaseous_form.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 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/gaseous_form.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/65.jpg

res/cardsfolder/g/gelid_shackles.txt

@@ -4,7 +4,7 @@ Types:Snow Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ W | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't block. & HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature can't block and its activated abilities can't be activated.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't block. & CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature can't block and its activated abilities can't be activated.
 A:AB$ Pump | Cost$ S | Defined$ Enchanted | KW$ Defender | IsCurse$ True | SpellDescription$ Enchanted creature gains defender until end of turn.
 # AI can now use snow mana to pay for activated abilities.
 SVar:RemRandomDeck:True

res/cardsfolder/g/generals_kabuto.txt

@@ -1,9 +1,9 @@
 Name:General's Kabuto
 ManaCost:4
 Types:Artifact Equipment
-Text:Equipped creature has shroud. (It can't be the target of spells or abilities.)\r\n\r\nPrevent all combat damage that would be dealt to equipped creature.
+Text:no text
 K:Equip 2
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Shroud | AddHiddenKeyword$ HIDDEN Prevent all combat damage that would be dealt to CARDNAME.  
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Shroud | AddHiddenKeyword$ Prevent all combat damage that would be dealt to CARDNAME. | Description$ Equipped creature has shroud. (It can't be the target of spells or abilities.) Prevent all combat damage that would be dealt to equipped creature. 
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/generals_kabuto.jpg
 SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/251.jpg

res/cardsfolder/g/ghostly_possession.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | AddHiddenKeyword$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME. | Description$ Enchanted creature has flying. Prevent all combat damage that would be dealt to and dealt by enchanted creature.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | AddHiddenKeyword$ Prevent all combat damage that would be dealt to and dealt by CARDNAME. | Description$ Enchanted creature has flying. Prevent all combat damage that would be dealt to and dealt by enchanted creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghostly_possession.jpg

res/cardsfolder/g/giant_turtle.txt

@@ -3,7 +3,7 @@ ManaCost:1 G G
 Types:Creature Turtle
 Text:no text
 PT:2/4
-S:Mode$ Continuous | Affected$ Card.Self+attackedLastTurn | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ CARDNAME can't attack if it attacked during your last turn.
+S:Mode$ Continuous | Affected$ Card.Self+attackedLastTurn | AddHiddenKeyword$ CARDNAME can't attack. | Description$ CARDNAME can't attack if it attacked during your last turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/giant_turtle.jpg
 SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/102.jpg

res/cardsfolder/g/gift_of_the_deity.txt

@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 4 BG | ValidTgts$ Creature |  AITgts$ Card.Black,Card.Green | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy+Black | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Deathtouch | Description$ As long as enchanted creature is black, it gets +1/+1 and has deathtouch. (Any amount of damage it deals to a creature is enough to destroy that creature.)
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy+Green | AddPower$ 1 | AddToughness$ 1 | AddHiddenKeyword$ HIDDEN All creatures able to block CARDNAME do so. | Description$ As long as enchanted creature is green, it gets +1/+1 and all creatures able to block it do so.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy+Green | AddPower$ 1 | AddToughness$ 1 | AddHiddenKeyword$ All creatures able to block CARDNAME do so. | Description$ As long as enchanted creature is green, it gets +1/+1 and all creatures able to block it do so.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gift_of_the_deity.jpg
 SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/122.jpg

res/cardsfolder/g/glacial_chasm.txt

@@ -5,7 +5,7 @@ Text:no text
 K:Cumulative upkeep:PayLife<2>:Pay 2 life.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice a land.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | SacValid$ Land | ChangeNum$ 1
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures you control can't attack.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Creatures you control can't attack.
 S:Mode$ PreventDamage | Target$ You | Description$ Prevent all damage that would be dealt to you.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon

res/cardsfolder/g/glimmerdust_nap.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant tapped creature
 A:SP$ Attach | Cost$ 2 U | ValidTgts$ Creature.tapped | 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/glimmerdust_nap.jpg
 SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/68.jpg

res/cardsfolder/g/goblin_assault.txt

@@ -2,7 +2,7 @@ Name:Goblin Assault
 ManaCost:2 R
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.Goblin | AddHiddenKeyword$ HIDDEN CARDNAME attacks each turn if able. | Description$ Goblin creatures attack each turn if able.
+S:Mode$ Continuous | Affected$ Creature.Goblin | AddHiddenKeyword$ CARDNAME attacks each turn if able. | Description$ Goblin creatures attack each turn if able.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, put a 1/1 red Goblin creature token with haste onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Haste
 SVar:Rarity:Rare

res/cardsfolder/g/goblin_cohort.txt

@@ -3,7 +3,7 @@ ManaCost:R
 Types:Creature Goblin Warrior
 Text:no text
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't attack unless you've cast a creature spell this turn.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't attack unless you've cast a creature spell this turn.
 SVar:X:Count$ThisTurnCast_Creature.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_cohort.jpg

res/cardsfolder/g/goblin_rock_sled.txt

@@ -4,8 +4,8 @@ Types:Creature Goblin
 Text:no text
 PT:3/1
 K:Trample
-S:Mode$ Continuous | Affected$ Card.Self+attackedLastTurn | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ CARDNAME doesn't untap during your untap step if it attacked during your last turn.
+S:Mode$ Continuous | Affected$ Card.Self+attackedLastTurn | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ CARDNAME doesn't untap during your untap step if it attacked during your last turn.
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ LT1 | Description$ CARDNAME can't attack unless defending player controls a Mountain.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ LT1 | Description$ CARDNAME can't attack unless defending player controls a Mountain.
 SVar:X:Count$Valid Mountain.YouDontCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_rock_sled.jpg

res/cardsfolder/g/goblin_war_drums.txt

@@ -2,7 +2,7 @@ Name:Goblin War Drums
 ManaCost:2 R
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ HIDDEN CARDNAME can't be blocked except by two or more creatures. | Description$ Each creature you control can't be blocked except by two or more creatures.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ CARDNAME can't be blocked except by two or more creatures. | Description$ Each creature you control can't be blocked except by two or more creatures.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_war_drums.jpg

res/cardsfolder/g/gore_house_chainwalker.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:2/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:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gore_house_chainwalker.jpg

res/cardsfolder/g/gorilla_war_cry.txt

@@ -4,7 +4,7 @@ Types:Instant
 Text:no text
 A:SP$ Effect | Cost$ 1 R | Name$ Gorilla War Cry Effect | StaticAbilities$ Blocking | ActivationPhases$ BeginCombat->Declare Attackers - Play Instants and Abilities | AILogic$ Evasion | SubAbility$ DBDraw | SpellDescription$ Cast CARDNAME only during combat before blockers are declared. Creatures can't be blocked this turn except by two or more creatures.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
-SVar:Blocking:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ HIDDEN CARDNAME can't be blocked except by two or more creatures. | Description$ Creatures can't be blocked this turn except by two or more creatures.
+SVar:Blocking:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ CARDNAME can't be blocked except by two or more creatures. | Description$ Creatures can't be blocked this turn except by two or more creatures.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gorilla_war_cry.jpg
 SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/108.jpg|2

res/cardsfolder/g/grand_melee.txt

@@ -2,7 +2,7 @@ Name:Grand Melee
 ManaCost:3 R
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ HIDDEN CARDNAME blocks each turn if able. & HIDDEN CARDNAME attacks each turn if able. | Description$ All creatures attack each turn if able. All creatures block each turn if able.
+S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ CARDNAME blocks each turn if able. & CARDNAME attacks each turn if able. | Description$ All creatures attack each turn if able. All creatures block each turn if able.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grand_melee.jpg
 SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/211.jpg

res/cardsfolder/g/gravecrawler.txt

@@ -4,7 +4,7 @@ Types:Creature Zombie
 Text:no text
 PT:2/1
 K:CARDNAME can't block.
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Graveyard | AddHiddenKeyword$ HIDDEN May be played | CheckSVar$ X | SVarCompare$ GE1 | Description$ You may cast CARDNAME from you graveyard as long as you control a Zombie.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Graveyard | AddHiddenKeyword$ May be played | CheckSVar$ X | SVarCompare$ GE1 | Description$ You may cast CARDNAME from you graveyard as long as you control a Zombie.
 SVar:X:Count$Valid Zombie.YouCtrl
 SVar:SacMe:3
 SVar:DiscardMe:3

res/cardsfolder/g/greater_stone_spirit.txt

@@ -3,7 +3,7 @@ ManaCost:4 R R
 Types:Creature Elemental Spirit
 Text:no text
 PT:4/4
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CantBeBlockedBy Creature.withFlying | Description$ CARDNAME can't be blocked by creatures with flying.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CantBeBlockedBy Creature.withFlying | Description$ CARDNAME can't be blocked by creatures with flying.
 A:AB$ Pump | Cost$ 2 R | ValidTgts$ Creature | NumDef$ 2 | SubAbility$ DBAnimate | SpellDescription$ Until end of turn, target creature gets +0/+2 and gains "R: This creature gets +1/+0 until end of turn."
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Abilities$ Pump
 SVar:Pump:AB$ Pump | Cost$ R | NumAtt$ 1 | SpellDescription$ This creature gets +1/+0 until end of turn.

res/cardsfolder/g/green_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 green creatures. | Description$ Enchanted creature can't be blocked by green creatures.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't be blocked by green creatures. | Description$ Enchanted creature can't be blocked by green creatures.
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | CheckSVar$ X | SVarCompare$ GE1 | Description$ Enchanted creature gets +2/+2 as long as an opponent controls a green permanent.
 SVar:X:Count$Valid Permanent.Green+OppCtrl
 SVar:RemRandomDeck:True

res/cardsfolder/g/grim_roustabout.txt

@@ -6,7 +6,7 @@ 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.)
 A:AB$ Regenerate | Cost$ 1 B | Defined$ Self | SpellDescription$ Regenerate CARDNAME.
-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/grim_roustabout.jpg

res/cardsfolder/g/guise_of_fire.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ R | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ -1 | AddHiddenKeyword$ HIDDEN CARDNAME attacks each turn if able. | Description$ Enchanted creature gets +1/-1 and attacks each turn if able.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ -1 | AddHiddenKeyword$ CARDNAME attacks each turn if able. | Description$ Enchanted creature gets +1/-1 and attacks each turn if able.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/guise_of_fire.jpg
 SetInfo:AVR|Common|http://magiccards.info/scans/en/avr/137.jpg

res/cardsfolder/g/gwafa_hazid_profiteer.txt

@@ -3,7 +3,7 @@ ManaCost:1 W U
 Types:Legendary Creature Human Rogue
 Text:no text
 PT:2/2
-S:Mode$ Continuous | Affected$ Creature.counters_GE1_BRIBERY | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. | Description$ Creatures with bribery counters on them can't attack or block.
+S:Mode$ Continuous | Affected$ Creature.counters_GE1_BRIBERY | AddHiddenKeyword$ CARDNAME can't attack or block. | Description$ Creatures with bribery counters on them can't attack or block.
 A:AB$ PutCounter | Cost$ W U T | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control. | CounterType$ BRIBERY | CounterNum$ 1 | SubAbility$ DBDraw | SpellDescription$ Put a bribery counter on target creature you don't control. Its controller draws a card.
 SVar:DBDraw:DB$Draw | Defined$ TargetedController | NumCards$ 1
 SVar:Rarity:Rare

src/main/java/forge/card/abilityfactory/ai/PumpAiBase.java

@@ -547,7 +547,7 @@ public abstract class PumpAiBase extends SpellAiLogic {
         for (final String keyword : keywords) {
             // since most keywords are combat relevant check for those that are
             // not
-            if (keyword.equals("HIDDEN This card doesn't untap during your next untap step.")
+            if (keyword.endsWith("This card doesn't untap during your next untap step.")
                     || keyword.endsWith("Shroud") || keyword.endsWith("Hexproof")) {
                 return true;
             }

src/main/java/forge/card/abilityfactory/effects/AnimateEffectBase.java

@@ -101,7 +101,7 @@ public abstract class AnimateEffectBase extends SpellEffect {
         c.addChangedCardKeywords(keywords, removeKeywords, sa.hasParam("RemoveAllAbilities"), timestamp);
 
         for (final String k : hiddenKeywords) {
-            c.addExtrinsicKeyword(k);
+            c.addHiddenExtrinsicKeyword(k);
         }
 
         final long colorTimestamp = c.addColor(colors, c, !sa.hasParam("OverwriteColors"), true);
@@ -133,7 +133,7 @@ public abstract class AnimateEffectBase extends SpellEffect {
      *            a long.
      */
     void doUnanimate(final Card c, SpellAbility sa, final String colorDesc,
-            final ArrayList<String> addedKeywords, final ArrayList<SpellAbility> addedAbilities,
+            final ArrayList<String> hiddenKeywords, final ArrayList<SpellAbility> addedAbilities,
             final ArrayList<Trigger> addedTriggers, final long colorTimestamp, final boolean givesStAbs,
             final ArrayList<SpellAbility> removedAbilities, final long timestamp) {
 
@@ -153,8 +153,8 @@ public abstract class AnimateEffectBase extends SpellEffect {
 
         c.removeColor(colorDesc, c, !sa.hasParam("OverwriteColors"), colorTimestamp);
 
-        for (final String k : addedKeywords) {
+        for (final String k : hiddenKeywords) {
-            c.removeExtrinsicKeyword(k);
+            c.removeHiddenExtrinsicKeyword(k);
         }
 
         for (final SpellAbility saAdd : addedAbilities) {

src/main/java/forge/card/abilityfactory/effects/CloneEffect.java

@@ -232,7 +232,7 @@ public class CloneEffect extends SpellEffect {
                     keywords.remove(k);
                 }
                 if (keywords.get(i).startsWith("HIDDEN")) {
-                    tgtCard.addExtrinsicKeyword(keywords.get(i));
+                    tgtCard.addHiddenExtrinsicKeyword(keywords.get(i));
                 }
                 else {
                     tgtCard.addIntrinsicKeyword(keywords.get(i));