diff --git a/res/cardsfolder/animate_land.txt b/res/cardsfolder/animate_land.txt
index 4949dee2e3e..c18945e033c 100644
--- a/res/cardsfolder/animate_land.txt
+++ b/res/cardsfolder/animate_land.txt
@@ -2,7 +2,7 @@ Name:Animate Land
 ManaCost:G
 Types:Instant
 Text:no text
-A:SP$Animate | Cost$ G | ValidTgts$ Land | TgtPrompt$ Select target land | Power$ 3 | Toughness$ 3 | Types$ Creature | SpellDescription$ Until end of turn, target land becomes a 3/3 creature that's still a land.
+A:SP$ Animate | Cost$ G | ValidTgts$ Land | TgtPrompt$ Select target land | Power$ 3 | Toughness$ 3 | Types$ Creature | SpellDescription$ Until end of turn, target land becomes a 3/3 creature that's still a land.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/animate_land.jpg
diff --git a/res/cardsfolder/balduvian_conjurer.txt b/res/cardsfolder/balduvian_conjurer.txt
index 4034a658fd9..6ba46adbe91 100644
--- a/res/cardsfolder/balduvian_conjurer.txt
+++ b/res/cardsfolder/balduvian_conjurer.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Human Wizard
 Text:no text
 PT:0/2
-A:AB$Animate | Cost$ T | ValidTgts$ Land.Snow | TgtPrompt$ Select target snow land | Power$ 2 | Toughness$ 2 | Types$ Creature | SpellDescription$ Target snow land becomes a 2/2 creature until end of turn. It's still a land.
+A:AB$ Animate | Cost$ T | ValidTgts$ Land.Snow | TgtPrompt$ Select target snow land | Power$ 2 | Toughness$ 2 | Types$ Creature | SpellDescription$ Target snow land becomes a 2/2 creature until end of turn. It's still a land.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balduvian_conjurer.jpg
diff --git a/res/cardsfolder/balduvian_frostwaker.txt b/res/cardsfolder/balduvian_frostwaker.txt
index 2f62fcdbf64..8a90f6a408a 100644
--- a/res/cardsfolder/balduvian_frostwaker.txt
+++ b/res/cardsfolder/balduvian_frostwaker.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$Animate | Cost$ T | ValidTgts$ Land.Snow | TgtPrompt$ Select target snow land | Power$ 2 | Toughness$ 2 | Types$ Creature,Elemental | Keywords$ Flying | Permanent$ True | SpellDescription$ Target snow land becomes a 2/2 blue Elemental creature with flying. It's still a land.
+A:AB$ Animate | Cost$ T | ValidTgts$ Land.Snow | TgtPrompt$ Select target snow land | Power$ 2 | Toughness$ 2 | Types$ Creature,Elemental | Keywords$ Flying | Permanent$ True | SpellDescription$ Target snow land becomes a 2/2 blue Elemental creature with flying. It's still a land.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balduvian_frostwaker.jpg
diff --git a/res/cardsfolder/blinkmoth_nexus.txt b/res/cardsfolder/blinkmoth_nexus.txt
index cf0cbab84c0..c20d2f6fe17 100644
--- a/res/cardsfolder/blinkmoth_nexus.txt
+++ b/res/cardsfolder/blinkmoth_nexus.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$Animate | Cost$ 1 | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Artifact,Blinkmoth | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 1/1 Blinkmoth artifact creature with flying until end of turn. It's still a land.
+A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Artifact,Blinkmoth | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 1/1 Blinkmoth artifact creature with flying until end of turn. It's still a land.
 A:AB$ Pump | Cost$ 1 T | ValidTgts$ Creature.Blinkmoth | TgtPrompt$ Select target Blinkmoth creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target Blinkmoth creature gets +1/+1 until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/dst/en-us/card39439.jpg
diff --git a/res/cardsfolder/captivating_vampire.txt b/res/cardsfolder/captivating_vampire.txt
index 8ea51146b02..0c816c9a732 100644
--- a/res/cardsfolder/captivating_vampire.txt
+++ b/res/cardsfolder/captivating_vampire.txt
@@ -4,7 +4,7 @@ Types:Creature Vampire
 Text:no text
 PT:2/2
 K:stPumpAll:Creature.Vampire+Other+YouCtrl:1/1:No Condition:Other Vampire creatures you control get +1/+1.
-A:AB$GainControl | Cost$ tapXType<5/Vampire> | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ SVar=Animate | SpellDescription$ Gain control of target creature. It becomes a Vampire in addition to its other types.
+A:AB$ GainControl | Cost$ tapXType<5/Vampire> | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ SVar=Animate | SpellDescription$ Gain control of target creature. It becomes a Vampire in addition to its other types.
 SVar:Animate:DB$Animate | Defined$ Targeted | Types$ Vampire | Permanent$ True
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/celestial_colonnade.txt b/res/cardsfolder/celestial_colonnade.txt
index d22cca07d61..6b628c6821a 100644
--- a/res/cardsfolder/celestial_colonnade.txt
+++ b/res/cardsfolder/celestial_colonnade.txt
@@ -5,7 +5,7 @@ Text:no text
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
-A:AB$Animate | Cost$ 3 W U | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Colors$ White,Blue | Keywords$ Flying & Vigilance | SpellDescription$ Until end of turn, CARDNAME becomes a 4/4 white and blue Elemental creature with flying and vigilance. It's still a land.
+A:AB$ Animate | Cost$ 3 W U | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Colors$ White,Blue | Keywords$ Flying & Vigilance | SpellDescription$ Until end of turn, CARDNAME becomes a 4/4 white and blue Elemental creature with flying and vigilance. It's still a land.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/celestial_colonnade.jpg
 SetInfo:WWK|Rare|http://magiccards.info/scans/en/wwk/133.jpg
diff --git a/res/cardsfolder/chimeric_egg.txt b/res/cardsfolder/chimeric_egg.txt
index 8147d3e9912..85660c047e9 100644
--- a/res/cardsfolder/chimeric_egg.txt
+++ b/res/cardsfolder/chimeric_egg.txt
@@ -4,7 +4,7 @@ Types:Artifact
 Text:no text
 T:Mode$ SpellCast | ValidCard$ Card.nonArtifact | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent casts a nonartifact spell, put a charge counter on CARDNAME.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
-A:AB$Animate | Cost$ SubCounter<3/CHARGE> | Defined$ Self | Power$ 6 | Toughness$ 6 | Types$ Creature,Artifact,Construct | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 6/6 Construct artifact creature with trample until end of turn.
+A:AB$ Animate | Cost$ SubCounter<3/CHARGE> | Defined$ Self | Power$ 6 | Toughness$ 6 | Types$ Creature,Artifact,Construct | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 6/6 Construct artifact creature with trample until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chimeric_egg.jpg
 SetInfo:DST|Uncommon|http://magiccards.info/scans/en/ds/106.jpg
diff --git a/res/cardsfolder/chimeric_idol.txt b/res/cardsfolder/chimeric_idol.txt
index 4df8df946f6..af440c25bf5 100644
--- a/res/cardsfolder/chimeric_idol.txt
+++ b/res/cardsfolder/chimeric_idol.txt
@@ -2,7 +2,7 @@ Name:Chimeric Idol
 ManaCost:3
 Types:Artifact
 Text:no text
-A:AB$TapAll | Cost$ 0 | ValidCards$ Land.YouCtrl | SubAbility$ SVar=DBAnimate | SpellDescription$ Tap all lands you control. CARDNAME becomes a 3/3 Turtle artifact creature until end of turn.
+A:AB$ TapAll | Cost$ 0 | ValidCards$ Land.YouCtrl | SubAbility$ SVar=DBAnimate | SpellDescription$ Tap all lands you control. CARDNAME becomes a 3/3 Turtle artifact creature until end of turn.
 SVar:DBAnimate:DB$Animate | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Artifact,Turtle
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chimeric_idol.jpg
diff --git a/res/cardsfolder/chimeric_mass.txt b/res/cardsfolder/chimeric_mass.txt
index b553ffb3f41..fe0e0a57d94 100644
--- a/res/cardsfolder/chimeric_mass.txt
+++ b/res/cardsfolder/chimeric_mass.txt
@@ -5,7 +5,7 @@ Text:no text
 #CARDNAME enters the battlefield with X charge counters on it.
 K:etbCounter:CHARGE:X
 SVar:X:Count$xPaid
-A:AB$Animate | Cost$ 1 | Defined$ Self | Power$ Y | Toughness$ Y | Types$ Creature,Artifact,Construct | Keywords$ This creature's power and toughness are each equal to the number of charge counters on it. | SpellDescription$ Until end of turn, CARDNAME becomes a Construct artifact creature with "This creature's power and toughness are each equal to the number of charge counters on it."
+A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ Y | Toughness$ Y | Types$ Creature,Artifact,Construct | Keywords$ This creature's power and toughness are each equal to the number of charge counters on it. | SpellDescription$ Until end of turn, CARDNAME becomes a Construct artifact creature with "This creature's power and toughness are each equal to the number of charge counters on it."
 SVar:This creature's power and toughness are each equal to the number of charge counters on it.:stSetPT:Count$CardCounters.CHARGE:Count$CardCounters.CHARGE:This creature's power and toughness are each equal to the number of charge counters on it.
 SVar:Y:Count$CardCounters.CHARGE
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/chimeric_staff.txt b/res/cardsfolder/chimeric_staff.txt
index 28c2c581e50..60505e6cb57 100644
--- a/res/cardsfolder/chimeric_staff.txt
+++ b/res/cardsfolder/chimeric_staff.txt
@@ -2,7 +2,7 @@ Name:Chimeric Staff
 ManaCost:4
 Types:Artifact
 Text:no text
-A:AB$Animate | Cost$ X | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Construct | SpellDescription$ CARDNAME becomes an X/X Construct artifact creature until end of turn.
+A:AB$ Animate | Cost$ X | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Construct | SpellDescription$ CARDNAME becomes an X/X Construct artifact creature until end of turn.
 SVar:X:Count$xPaid
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chimeric_staff.jpg
diff --git a/res/cardsfolder/creeping_tar_pit.txt b/res/cardsfolder/creeping_tar_pit.txt
index 3422abcd398..9dc27177ac3 100644
--- a/res/cardsfolder/creeping_tar_pit.txt
+++ b/res/cardsfolder/creeping_tar_pit.txt
@@ -5,7 +5,7 @@ Text:no text
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
-A:AB$Animate | Cost$ 1 U B | Defined$ Self | Power$ 3 | Toughness$ 2 | Types$ Creature,Elemental | Color$ Blue,Black | Keywords$ HIDDEN Unblockable | SpellDescription$ Until end of turn, CARDNAME becomes a 3/2 blue and black Elemental creature and is unblockable. It's still a land.
+A:AB$ Animate | Cost$ 1 U B | Defined$ Self | Power$ 3 | Toughness$ 2 | Types$ Creature,Elemental | Color$ Blue,Black | Keywords$ HIDDEN Unblockable | SpellDescription$ Until end of turn, CARDNAME becomes a 3/2 blue and black Elemental creature and is unblockable. It's still a land.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/creeping_tar_pit.jpg
 SetInfo:WWK|Rare|http://magiccards.info/scans/en/wwk/134.jpg
diff --git a/res/cardsfolder/darksteel_brute.txt b/res/cardsfolder/darksteel_brute.txt
index ba58a5b0761..013a3f080b1 100644
--- a/res/cardsfolder/darksteel_brute.txt
+++ b/res/cardsfolder/darksteel_brute.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact
 Text:no text
 K:Indestructible
-A:AB$Animate | Cost$ 3 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Artifact,Beast | SpellDescription$ CARDNAME becomes a 2/2 Beast artifact creature until end of turn.
+A:AB$ Animate | Cost$ 3 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Artifact,Beast | SpellDescription$ CARDNAME becomes a 2/2 Beast artifact creature until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darksteel_brute.jpg
 SetInfo:DST|Uncommon|http://magiccards.info/scans/en/ds/108.jpg
diff --git a/res/cardsfolder/dread_statuary.txt b/res/cardsfolder/dread_statuary.txt
index b70e88e4b31..c6586aad3ef 100644
--- a/res/cardsfolder/dread_statuary.txt
+++ b/res/cardsfolder/dread_statuary.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$Animate | Cost$ 4 | Defined$ Self | Power$ 4 | Toughness$ 2 | Types$ Creature,Artifact,Golem | SpellDescription$ CARDNAME becomes a 4/2 Golem artifact creature until end of turn. It's still a land.
+A:AB$ Animate | Cost$ 4 | Defined$ Self | Power$ 4 | Toughness$ 2 | Types$ Creature,Artifact,Golem | SpellDescription$ CARDNAME becomes a 4/2 Golem artifact creature until end of turn. It's still a land.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dread_statuary.jpg
 SetInfo:WWK|Uncommon|http://magiccards.info/scans/en/wwk/135.jpg
diff --git a/res/cardsfolder/elvish_branchbender.txt b/res/cardsfolder/elvish_branchbender.txt
index 2940e519c20..1821e588b65 100644
--- a/res/cardsfolder/elvish_branchbender.txt
+++ b/res/cardsfolder/elvish_branchbender.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Elf Druid
 Text:no text
 PT:2/2
-A:AB$Animate | Cost$ T | ValidTgts$ Forest | TgtPrompt$ Select target Forest | Power$ X | Toughness$ X | Types$ Creature,Treefolk | SpellDescription$ Until end of turn, target Forest becomes an X/X Treefolk creature in addition to its other types, where X is the number of Elves you control.
+A:AB$ Animate | Cost$ T | ValidTgts$ Forest | TgtPrompt$ Select target Forest | Power$ X | Toughness$ X | Types$ Creature,Treefolk | SpellDescription$ Until end of turn, target Forest becomes an X/X Treefolk creature in addition to its other types, where X is the number of Elves you control.
 SVar:X:Count$Valid Elf.YouCtrl
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/faerie_conclave.txt b/res/cardsfolder/faerie_conclave.txt
index 54933923f10..9be5822a19d 100644
--- a/res/cardsfolder/faerie_conclave.txt
+++ b/res/cardsfolder/faerie_conclave.txt
@@ -4,7 +4,7 @@ Types:Land
 Text:no text
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
-A:AB$Animate | Cost$ 1 U | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Creature,Faerie | Colors$ Blue | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 2/1 blue Faerie creature with flying until end of turn. It's still a land. (It can't be blocked except by creatures with flying or reach.)
+A:AB$ Animate | Cost$ 1 U | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Creature,Faerie | Colors$ Blue | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 2/1 blue Faerie creature with flying until end of turn. It's still a land. (It can't be blocked except by creatures with flying or reach.)
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/faerie_conclave.jpg
 SetInfo:ULG|Uncommon|http://magiccards.info/scans/en/ul/139.jpg
diff --git a/res/cardsfolder/fendeep_summoner.txt b/res/cardsfolder/fendeep_summoner.txt
index 166cba6c82d..a833d359856 100644
--- a/res/cardsfolder/fendeep_summoner.txt
+++ b/res/cardsfolder/fendeep_summoner.txt
@@ -3,7 +3,7 @@ ManaCost:4 B
 Types:Creature Treefolk Shaman
 Text:no text
 PT:3/5
-A:AB$Animate | Cost$ T | ValidTgts$ Swamp | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select target Swamp | Power$ 3 | Toughness$ 5 | Types$ Creature,Warrior,Treefolk | SpellDescription$ Up to two target Swamps each become 3/5 Treefolk Warrior creatures in addition to their other types until end of turn.
+A:AB$ Animate | Cost$ T | ValidTgts$ Swamp | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select target Swamp | Power$ 3 | Toughness$ 5 | Types$ Creature,Warrior,Treefolk | SpellDescription$ Up to two target Swamps each become 3/5 Treefolk Warrior creatures in addition to their other types until end of turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fendeep_summoner.jpg
diff --git a/res/cardsfolder/forbidding_watchtower.txt b/res/cardsfolder/forbidding_watchtower.txt
index 80400dc5800..a1023ad07ca 100644
--- a/res/cardsfolder/forbidding_watchtower.txt
+++ b/res/cardsfolder/forbidding_watchtower.txt
@@ -4,7 +4,7 @@ Types:Land
 Text:no text
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
-A:AB$Animate | Cost$ 1 W | Defined$ Self | Power$ 1 | Toughness$ 5 | Types$ Creature,Soldier | Colors$ White | SpellDescription$ CARDNAME becomes a 1/5 white Soldier creature until end of turn. It's still a land.
+A:AB$ Animate | Cost$ 1 W | Defined$ Self | Power$ 1 | Toughness$ 5 | Types$ Creature,Soldier | Colors$ White | SpellDescription$ CARDNAME becomes a 1/5 white Soldier creature until end of turn. It's still a land.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forbidding_watchtower.jpg
 SetInfo:ULG|Uncommon|http://magiccards.info/scans/en/ul/140.jpg
diff --git a/res/cardsfolder/ghitu_encampment.txt b/res/cardsfolder/ghitu_encampment.txt
index a6304986fef..09c125dfa3d 100644
--- a/res/cardsfolder/ghitu_encampment.txt
+++ b/res/cardsfolder/ghitu_encampment.txt
@@ -4,7 +4,7 @@ Types:Land
 Text:no text
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
-A:AB$Animate | Cost$ 1 R | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Creature,Warrior | Colors$ Red | Keywords$ First Strike | SpellDescription$ CARDNAME becomes a 2/1 red Warrior creature with first strike until end of turn. It's still a land. (It deals combat damage before creatures without first strike.)
+A:AB$ Animate | Cost$ 1 R | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Creature,Warrior | Colors$ Red | Keywords$ First Strike | SpellDescription$ CARDNAME becomes a 2/1 red Warrior creature with first strike until end of turn. It's still a land. (It deals combat damage before creatures without first strike.)
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghitu_encampment.jpg
 SetInfo:ULG|Uncommon|http://magiccards.info/scans/en/ul/141.jpg
diff --git a/res/cardsfolder/glint_hawk_idol.txt b/res/cardsfolder/glint_hawk_idol.txt
index 75c3718ce21..a8ed4af19bf 100644
--- a/res/cardsfolder/glint_hawk_idol.txt
+++ b/res/cardsfolder/glint_hawk_idol.txt
@@ -4,7 +4,7 @@ Types:Artifact
 Text:no text
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ Whenever another artifact enters the battlefield under your control, you may have CARDNAME become a 2/2 Bird artifact creature with flying until end of turn.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Bird | Keywords$ Flying
-A:AB$Animate | Cost$ W | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Bird | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 2/2 Bird artifact creature with flying until end of turn.
+A:AB$ Animate | Cost$ W | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Bird | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 2/2 Bird artifact creature with flying until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glint_hawk_idol.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/156.jpg
diff --git a/res/cardsfolder/gruul_war_plow.txt b/res/cardsfolder/gruul_war_plow.txt
index 66cc49f45b3..337085e144e 100644
--- a/res/cardsfolder/gruul_war_plow.txt
+++ b/res/cardsfolder/gruul_war_plow.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact
 Text:no text
 K:stPumpAll:Creature.YouCtrl:0/0/Trample:No Condition:Creatures you control have trample.
-A:AB$Animate | Cost$ 1 R G | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Juggernaut | SpellDescription$ CARDNAME becomes a 4/4 Juggernaut artifact creature until end of turn.
+A:AB$ Animate | Cost$ 1 R G | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Juggernaut | SpellDescription$ CARDNAME becomes a 4/4 Juggernaut artifact creature until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gruul_war_plow.jpg
 SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/151.jpg
diff --git a/res/cardsfolder/hidden_ancients.txt b/res/cardsfolder/hidden_ancients.txt
index cbd67f7bb8e..f44ba780f27 100644
--- a/res/cardsfolder/hidden_ancients.txt
+++ b/res/cardsfolder/hidden_ancients.txt
@@ -2,7 +2,7 @@ Name:Hidden Ancients
 ManaCost:1 G
 Types:Enchantment
 Text:no text
-T:Mode$ SpellCast | ValidCard$ Enchantment | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment| Execute$ TrigAnimate | TriggerDescription$ When an opponent casts an enchantment spell, if CARDNAME is an enchantment, CARDNAME becomes a 5/5 Treefolk creature.
+T:Mode$ SpellCast | ValidCard$ Enchantment | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment | Execute$ TrigAnimate | TriggerDescription$ When an opponent casts an enchantment spell, if CARDNAME is an enchantment, CARDNAME becomes a 5/5 Treefolk creature.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 5 | Toughness$ 5 | Types$ Creature,Treefolk | OverwriteTypes$ True | Permanent$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hidden_ancients.jpg
diff --git a/res/cardsfolder/hidden_gibbons.txt b/res/cardsfolder/hidden_gibbons.txt
index 51c308b6e9a..37f4d4dda4b 100644
--- a/res/cardsfolder/hidden_gibbons.txt
+++ b/res/cardsfolder/hidden_gibbons.txt
@@ -2,7 +2,7 @@ Name:Hidden Gibbons
 ManaCost:G
 Types:Enchantment
 Text:no text
-T:Mode$ SpellCast | ValidCard$ Instant | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment| Execute$ TrigAnimate | TriggerDescription$ When an opponent casts an instant spell, if CARDNAME is an enchantment, CARDNAME becomes a 4/4 Ape creature.
+T:Mode$ SpellCast | ValidCard$ Instant | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment | Execute$ TrigAnimate | TriggerDescription$ When an opponent casts an instant spell, if CARDNAME is an enchantment, CARDNAME becomes a 4/4 Ape creature.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Ape | OverwriteTypes$ True | Permanent$ True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hidden_gibbons.jpg
diff --git a/res/cardsfolder/hidden_guerrillas.txt b/res/cardsfolder/hidden_guerrillas.txt
index e37f24c1f27..22db3d8edb6 100644
--- a/res/cardsfolder/hidden_guerrillas.txt
+++ b/res/cardsfolder/hidden_guerrillas.txt
@@ -2,7 +2,7 @@ Name:Hidden Guerrillas
 ManaCost:G
 Types:Enchantment
 Text:no text
-T:Mode$ SpellCast | ValidCard$ Artifact | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment| Execute$ TrigAnimate | TriggerDescription$ When an opponent casts an artifact spell, if CARDNAME is an enchantment, CARDNAME becomes a 5/3 Soldier creature with trample.
+T:Mode$ SpellCast | ValidCard$ Artifact | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment | Execute$ TrigAnimate | TriggerDescription$ When an opponent casts an artifact spell, if CARDNAME is an enchantment, CARDNAME becomes a 5/3 Soldier creature with trample.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 5 | Toughness$ 3 | Keywords$ Trample | Types$ Creature,Soldier | OverwriteTypes$ True | Permanent$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hidden_guerrillas.jpg
diff --git a/res/cardsfolder/hidden_herd.txt b/res/cardsfolder/hidden_herd.txt
index eef769c6ac0..9ae6d7e5067 100644
--- a/res/cardsfolder/hidden_herd.txt
+++ b/res/cardsfolder/hidden_herd.txt
@@ -2,7 +2,7 @@ Name:Hidden Herd
 ManaCost:G
 Types:Enchantment
 Text:no text
-T:Mode$ LandPlayed | ValidCard$ Land.nonBasic+YouDontCtrl | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment| Execute$ TrigAnimate | TriggerDescription$ When an opponent plays a nonbasic land, if CARDNAME is an enchantment, CARDNAME becomes a 3/3 Beast creature.
+T:Mode$ LandPlayed | ValidCard$ Land.nonBasic+YouDontCtrl | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment | Execute$ TrigAnimate | TriggerDescription$ When an opponent plays a nonbasic land, if CARDNAME is an enchantment, CARDNAME becomes a 3/3 Beast creature.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 3 | Toughness$ 3  | Types$ Creature,Beast | OverwriteTypes$ True | Permanent$ True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hidden_herd.jpg
diff --git a/res/cardsfolder/hidden_spider.txt b/res/cardsfolder/hidden_spider.txt
index e4889865062..af8907f49ab 100644
--- a/res/cardsfolder/hidden_spider.txt
+++ b/res/cardsfolder/hidden_spider.txt
@@ -2,7 +2,7 @@ Name:Hidden Spider
 ManaCost:G
 Types:Enchantment
 Text:no text
-T:Mode$ SpellCast | ValidCard$ Creature.withFlying | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment| Execute$ TrigAnimate | TriggerDescription$ When an opponent casts a creature spell with flying, if CARDNAME is an enchantment, CARDNAME becomes a 3/5 Spider creature with reach. (It can block creatures with flying.)
+T:Mode$ SpellCast | ValidCard$ Creature.withFlying | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment | Execute$ TrigAnimate | TriggerDescription$ When an opponent casts a creature spell with flying, if CARDNAME is an enchantment, CARDNAME becomes a 3/5 Spider creature with reach. (It can block creatures with flying.)
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 3 | Toughness$ 5  | Keywords$ Reach | Types$ Creature,Spider | OverwriteTypes$ True | Permanent$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hidden_spider.jpg
diff --git a/res/cardsfolder/inkmoth_nexus.txt b/res/cardsfolder/inkmoth_nexus.txt
index e8d6e7dfdea..4d66510de97 100644
--- a/res/cardsfolder/inkmoth_nexus.txt
+++ b/res/cardsfolder/inkmoth_nexus.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$Animate | Cost$ 1 | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Artifact,Blinkmoth | Keywords$ Flying & Infect | SpellDescription$ CARDNAME becomes a 1/1 Blinkmoth artifact creature with flying and infect until end of turn. It's still a land. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
+A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Artifact,Blinkmoth | Keywords$ Flying & Infect | SpellDescription$ CARDNAME becomes a 1/1 Blinkmoth artifact creature with flying and infect until end of turn. It's still a land. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inkmoth_nexus.jpg
 SetInfo:MBS|Rare|http://magiccards.info/scans/en/mbs/145.jpg
diff --git a/res/cardsfolder/jade_statue.txt b/res/cardsfolder/jade_statue.txt
index 06ccc3216d3..ae5524f90cc 100644
--- a/res/cardsfolder/jade_statue.txt
+++ b/res/cardsfolder/jade_statue.txt
@@ -2,7 +2,7 @@ Name:Jade Statue
 ManaCost:4
 Types:Artifact
 Text:no text
-A:AB$Animate | Cost$ 2 | Defined$ Self | Power$ 3 | Toughness$ 6 | Types$ Creature,Artifact,Golem | UntilEndOfCombat$ True | ActivatingPhases$ BeginCombat->EndCombat | SpellDescription$ CARDNAME becomes a 3/6 Golem artifact creature until end of combat. Activate this ability only during combat.
+A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 3 | Toughness$ 6 | Types$ Creature,Artifact,Golem | UntilEndOfCombat$ True | ActivatingPhases$ BeginCombat->EndCombat | SpellDescription$ CARDNAME becomes a 3/6 Golem artifact creature until end of combat. Activate this ability only during combat.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jade_statue.jpg
diff --git a/res/cardsfolder/kamahl_fist_of_krosa.txt b/res/cardsfolder/kamahl_fist_of_krosa.txt
index bcc312cb162..7676626fa03 100644
--- a/res/cardsfolder/kamahl_fist_of_krosa.txt
+++ b/res/cardsfolder/kamahl_fist_of_krosa.txt
@@ -3,8 +3,8 @@ ManaCost:4 G G
 Types:Legendary Creature Human Nomad
 Text:no text
 PT:4/3
-A:AB$Animate | Cost$ G | ValidTgts$ Land | TgtPrompt$ Select target land | Power$ 1 | Toughness$ 1 | Types$ Creature | SpellDescription$ Target land becomes a 1/1 creature until end of turn. It's still a land.
-A:AB$PumpAll | Cost$ 2 G G G | ValidCards$ Creature.YouCtrl | NumAtt$ +3 | NumDef$ +3 | KW$ Trample | SpellDescription$ Creatures you control get +3/+3 and gain trample until end of turn.
+A:AB$ Animate | Cost$ G | ValidTgts$ Land | TgtPrompt$ Select target land | Power$ 1 | Toughness$ 1 | Types$ Creature | SpellDescription$ Target land becomes a 1/1 creature until end of turn. It's still a land.
+A:AB$ PumpAll | Cost$ 2 G G G | ValidCards$ Creature.YouCtrl | NumAtt$ +3 | NumDef$ +3 | KW$ Trample | SpellDescription$ Creatures you control get +3/+3 and gain trample until end of turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kamahl_fist_of_krosa.jpg
diff --git a/res/cardsfolder/karn_silver_golem.txt b/res/cardsfolder/karn_silver_golem.txt
index 3f4f10c9069..55513c4aa18 100644
--- a/res/cardsfolder/karn_silver_golem.txt
+++ b/res/cardsfolder/karn_silver_golem.txt
@@ -6,7 +6,7 @@ PT:4/4
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked, it gets -4/+4 until end of turn.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked, it gets -4/+4 until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ -4 | NumDef$ 4
-A:AB$Animate | Cost$ 1 | ValidTgts$ Artifact.nonCreature | TgtPrompt$ Select noncreature artifact | Power$ X | Toughness$ X | Types$ Creature | SpellDescription$ Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn.
+A:AB$ Animate | Cost$ 1 | ValidTgts$ Artifact.nonCreature | TgtPrompt$ Select noncreature artifact | Power$ X | Toughness$ X | Types$ Creature | SpellDescription$ Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn.
 SVar:X:Targeted$CardManaCost
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/karns_touch.txt b/res/cardsfolder/karns_touch.txt
index 3cf7d82364b..27d6fa3d567 100644
--- a/res/cardsfolder/karns_touch.txt
+++ b/res/cardsfolder/karns_touch.txt
@@ -2,7 +2,7 @@ Name:Karn's Touch
 ManaCost:U U
 Types:Instant
 Text:no text
-A:SP$Animate | Cost$ U U | ValidTgts$ Artifact.nonCreature | TgtPrompt$ Select noncreature artifact | Power$ X | Toughness$ X | Types$ Creature | SpellDescription$ Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn. (It retains its abilities.)
+A:SP$ Animate | Cost$ U U | ValidTgts$ Artifact.nonCreature | TgtPrompt$ Select noncreature artifact | Power$ X | Toughness$ X | Types$ Creature | SpellDescription$ Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn. (It retains its abilities.)
 SVar:X:Targeted$CardManaCost
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/lavaclaw_reaches.txt b/res/cardsfolder/lavaclaw_reaches.txt
index c5e3ab03eb8..4c12be478a4 100644
--- a/res/cardsfolder/lavaclaw_reaches.txt
+++ b/res/cardsfolder/lavaclaw_reaches.txt
@@ -5,7 +5,7 @@ Text:no text
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
-A:AB$Animate | Cost$ 1 B R | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Black,Red | Abilities$ ABPump | SpellDescription$ Until end of turn, CARDNAME becomes a 2/2 black and red Elemental creature with "X: This creature gets +X/+0 until end of turn." It's still a land.
+A:AB$ Animate | Cost$ 1 B R | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Black,Red | Abilities$ ABPump | SpellDescription$ Until end of turn, CARDNAME becomes a 2/2 black and red Elemental creature with "X: This creature gets +X/+0 until end of turn." It's still a land.
 SVar:ABPump:AB$Pump | Cost$ X | Defined$ Self | NumAtt$ +X | SpellDescription$ This creature gets +X/+0 until end of turn.
 SVar:X:Count$xPaid
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/lifespark_spellbomb.txt b/res/cardsfolder/lifespark_spellbomb.txt
index 317d63b3467..f633e9b7833 100644
--- a/res/cardsfolder/lifespark_spellbomb.txt
+++ b/res/cardsfolder/lifespark_spellbomb.txt
@@ -2,8 +2,8 @@ Name:Lifespark Spellbomb
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$Animate | Cost$ G Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target land | Power$ 3 | Toughness$ 3 | Types$ Creature | SpellDescription$ Until end of turn, target land becomes a 3/3 creature that's still a land.
-A:AB$Draw | Cost$ 1 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
+A:AB$ Animate | Cost$ G Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target land | Power$ 3 | Toughness$ 3 | Types$ Creature | SpellDescription$ Until end of turn, target land becomes a 3/3 creature that's still a land.
+A:AB$ Draw | Cost$ 1 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lifespark_spellbomb.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/197.jpg
diff --git a/res/cardsfolder/lurking_skirge.txt b/res/cardsfolder/lurking_skirge.txt
index a0918640cfe..30e216d928e 100644
--- a/res/cardsfolder/lurking_skirge.txt
+++ b/res/cardsfolder/lurking_skirge.txt
@@ -2,7 +2,7 @@ Name:Lurking Skirge
 ManaCost:1 B
 Types:Enchantment
 Text:no text
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Creature.YouDontOwn | IsPresent$ Card.Self+Enchantment | Execute$ TrigAnimate | TriggerDescription$ When a creature is put into an opponent's graveyard from the battlefield, if Lurking Skirge is an enchantment, CARDNAME becomes a 3/2 Imp creature with flying.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Creature.YouDontOwn | IsPresent$ Card.Self+Enchantment | Execute$ TrigAnimate | TriggerDescription$ When a creature is put into an opponent's graveyard from the battlefield, if CARDNAME is an enchantment, CARDNAME becomes a 3/2 Imp creature with flying.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 3 | Toughness$ 2 | Types$ Creature,Imp | Keywords$ Flying | OverwriteTypes$ True | Permanent$ True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lurking_skirge.jpg
diff --git a/res/cardsfolder/mishras_factory.txt b/res/cardsfolder/mishras_factory.txt
index 43ff82e32ba..defa9f799de 100644
--- a/res/cardsfolder/mishras_factory.txt
+++ b/res/cardsfolder/mishras_factory.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$Animate | Cost$ 1 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Assembly-Worker | SpellDescription$ CARDNAME becomes a 2/2 Assembly-Worker artifact creature until end of turn. It's still a land.
+A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Assembly-Worker | SpellDescription$ CARDNAME becomes a 2/2 Assembly-Worker artifact creature until end of turn. It's still a land.
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature.Assembly-Worker | TgtPrompt$ Select target Assembly-Worker creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target Assembly-Worker creature gets +1/+1 until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/aq/en-us/card1074.jpg
diff --git a/res/cardsfolder/mishras_groundbreaker.txt b/res/cardsfolder/mishras_groundbreaker.txt
index 7befc02f016..c6d613f52c7 100644
--- a/res/cardsfolder/mishras_groundbreaker.txt
+++ b/res/cardsfolder/mishras_groundbreaker.txt
@@ -2,7 +2,7 @@ Name:Mishra's Groundbreaker
 ManaCost:4
 Types:Artifact
 Text:no text
-A:AB$Animate | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target land | Power$ 3 | Toughness$ 3 | Types$ Artifact,Creature | Permanent$ True | SpellDescription$ Target land becomes a 3/3 artifact creature that's still a land. (This effect lasts indefinitely.)
+A:AB$ Animate | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target land | Power$ 3 | Toughness$ 3 | Types$ Artifact,Creature | Permanent$ True | SpellDescription$ Target land becomes a 3/3 artifact creature that's still a land. (This effect lasts indefinitely.)
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mishras_groundbreaker.jpg
diff --git a/res/cardsfolder/mutavault.txt b/res/cardsfolder/mutavault.txt
index e6a7bb0a32d..be757facafb 100644
--- a/res/cardsfolder/mutavault.txt
+++ b/res/cardsfolder/mutavault.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$Animate | Cost$ 1 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature | Keywords$ Changeling | SpellDescription$ CARDNAME becomes a 2/2 creature with all creature types until end of turn. It's still a land.
+A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature | Keywords$ Changeling | SpellDescription$ CARDNAME becomes a 2/2 creature with all creature types until end of turn. It's still a land.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mutavault.jpg
 SetInfo:MOR|Rare|http://magiccards.info/scans/en/mt/148.jpg
diff --git a/res/cardsfolder/omnibian.txt b/res/cardsfolder/omnibian.txt
index acb444562e4..b857df1f933 100644
--- a/res/cardsfolder/omnibian.txt
+++ b/res/cardsfolder/omnibian.txt
@@ -3,7 +3,7 @@ ManaCost:1 G G U
 Types:Creature Frog
 Text:no text
 PT:3/3
-A:AB$Animate | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Power$ 3 | Toughness$ 3 | Types$ Creature,Frog | OverwriteTypes$ True | SpellDescription$ Target creature becomes a 3/3 Frog until end of turn.
+A:AB$ Animate | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Power$ 3 | Toughness$ 3 | Types$ Creature,Frog | OverwriteTypes$ True | SpellDescription$ Target creature becomes a 3/3 Frog until end of turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/omnibian.jpg
diff --git a/res/cardsfolder/raging_ravine.txt b/res/cardsfolder/raging_ravine.txt
index 386601106dc..91e364ee64f 100644
--- a/res/cardsfolder/raging_ravine.txt
+++ b/res/cardsfolder/raging_ravine.txt
@@ -5,7 +5,7 @@ Text:no text
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
-A:AB$Animate | Cost$ 2 R G | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Elemental | Colors$ Red,Green | Triggers$ TrigAttack | SpellDescription$ Until end of turn, CARDNAME becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land.
+A:AB$ Animate | Cost$ 2 R G | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Elemental | Colors$ Red,Green | Triggers$ TrigAttack | SpellDescription$ Until end of turn, CARDNAME becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land.
 SVar:TrigAttack:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME attacks, put a +1/+1 counter on it.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/slumbering_tora.txt b/res/cardsfolder/slumbering_tora.txt
index ef1a70d237b..2a87acc6c52 100644
--- a/res/cardsfolder/slumbering_tora.txt
+++ b/res/cardsfolder/slumbering_tora.txt
@@ -2,7 +2,7 @@ Name:Slumbering Tora
 ManaCost:3
 Types:Artifact
 Text:no text
-A:AB$Animate | Cost$ 2 Discard<1/Spirit;Arcane> | CostDesc$ 2, Discard a Spirit or Arcane card: | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Cat | SpellDescription$ CARDNAME becomes an X/X Cat artifact creature until end of turn, where X is the discarded card's converted mana cost.
+A:AB$ Animate | Cost$ 2 Discard<1/Spirit;Arcane> | CostDesc$ 2, Discard a Spirit or Arcane card: | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Cat | SpellDescription$ CARDNAME becomes an X/X Cat artifact creature until end of turn, where X is the discarded card's converted mana cost.
 SVar:X:Discarded$CardManaCost
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/spawning_pool.txt b/res/cardsfolder/spawning_pool.txt
index c14f71ff72b..facbc9a3a60 100644
--- a/res/cardsfolder/spawning_pool.txt
+++ b/res/cardsfolder/spawning_pool.txt
@@ -4,7 +4,7 @@ Types:Land
 Text:no text
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
-A:AB$Animate | Cost$ 1 B | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Skeleton | Colors$ Black | Abilities$ ABRegen | SpellDescription$ CARDNAME becomes a 1/1 black Skeleton creature with "B: Regenerate this creature" until end of turn. It's still a land. (If it regenerates, the next time it would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
+A:AB$ Animate | Cost$ 1 B | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Skeleton | Colors$ Black | Abilities$ ABRegen | SpellDescription$ CARDNAME becomes a 1/1 black Skeleton creature with "B: Regenerate this creature" until end of turn. It's still a land. (If it regenerates, the next time it would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
 SVar:ABRegen:AB$Regenerate | Cost$ B | SpellDescription$ Regenerate CARDNAME.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spawning_pool.jpg
diff --git a/res/cardsfolder/spike_tiller.txt b/res/cardsfolder/spike_tiller.txt
index 41c6b1fa843..f6eba266708 100644
--- a/res/cardsfolder/spike_tiller.txt
+++ b/res/cardsfolder/spike_tiller.txt
@@ -4,8 +4,8 @@ Types:Creature Spike
 Text:no text
 PT:0/0
 K:etbCounters:P1P1:3
-A:AB$PutCounter | Cost$ 2 SubCounter<1/P1P1> | Tgt$ TgtC | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature.
-A:AB$Animate | Cost$ 2 SubCounter<1/P1P1> | ValidTgts$ Land | TgtPrompt$ Choose target land. | Power$ 2 | Toughness$ 2 | Types$ Creature | Permanent$ True | SubAbility$SVar=DBPutCounter | SpellDescription$ Target land becomes a 2/2 creature that's still a land. Put a +1/+1 counter on it.
+A:AB$ PutCounter | Cost$ 2 SubCounter<1/P1P1> | Tgt$ TgtC | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature.
+A:AB$ Animate | Cost$ 2 SubCounter<1/P1P1> | ValidTgts$ Land | TgtPrompt$ Choose target land. | Power$ 2 | Toughness$ 2 | Types$ Creature | Permanent$ True | SubAbility$SVar=DBPutCounter | SpellDescription$ Target land becomes a 2/2 creature that's still a land. Put a +1/+1 counter on it.
 SVar:DBPutCounter:DB$PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spike_tiller.jpg
diff --git a/res/cardsfolder/stalking_stones.txt b/res/cardsfolder/stalking_stones.txt
index a624fc3abe7..f1626166613 100644
--- a/res/cardsfolder/stalking_stones.txt
+++ b/res/cardsfolder/stalking_stones.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$Animate | Cost$ 6 | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Artifact,Elemental | Permanent$ True | SpellDescription$ CARDNAME becomes a 3/3 Elemental artifact creature that's still a land. (This effect lasts indefinitely.)
+A:AB$ Animate | Cost$ 6 | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Artifact,Elemental | Permanent$ True | SpellDescription$ CARDNAME becomes a 3/3 Elemental artifact creature that's still a land. (This effect lasts indefinitely.)
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stalking_stones.jpg
 SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/284.jpg
diff --git a/res/cardsfolder/stirring_wildwood.txt b/res/cardsfolder/stirring_wildwood.txt
index b53950421ff..67e66535745 100644
--- a/res/cardsfolder/stirring_wildwood.txt
+++ b/res/cardsfolder/stirring_wildwood.txt
@@ -5,7 +5,7 @@ Text:no text
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
-A:AB$Animate | Cost$ 1 G W | Defined$ Self | Power$ 3 | Toughness$ 4 | Types$ Creature,Elemental | Keywords$ Reach | Colors$ Green,White | SpellDescription$ Until end of turn, CARDNAME becomes a 3/4 green and white Elemental creature with reach. It's still a land.
+A:AB$ Animate | Cost$ 1 G W | Defined$ Self | Power$ 3 | Toughness$ 4 | Types$ Creature,Elemental | Keywords$ Reach | Colors$ Green,White | SpellDescription$ Until end of turn, CARDNAME becomes a 3/4 green and white Elemental creature with reach. It's still a land.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stirring_wildwood.jpg
 SetInfo:WWK|Rare|http://magiccards.info/scans/en/wwk/144.jpg
diff --git a/res/cardsfolder/svogthos_the_restless_tomb.txt b/res/cardsfolder/svogthos_the_restless_tomb.txt
index 251ce5b35c0..4b78edc40e9 100644
--- a/res/cardsfolder/svogthos_the_restless_tomb.txt
+++ b/res/cardsfolder/svogthos_the_restless_tomb.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$Animate | Cost$ 3 B G | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Zombie,Plant | Colors$ Black,Green | Keywords$ This creature's power and toughness are each equal to the number of creature cards in your graveyard. | SpellDescription$ Until end of turn, CARDNAME becomes a black and green Plant Zombie creature with "This creature's power and toughness are each equal to the number of creature cards in your graveyard." It's still a land.  
+A:AB$ Animate | Cost$ 3 B G | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Zombie,Plant | Colors$ Black,Green | Keywords$ This creature's power and toughness are each equal to the number of creature cards in your graveyard. | SpellDescription$ Until end of turn, CARDNAME becomes a black and green Plant Zombie creature with "This creature's power and toughness are each equal to the number of creature cards in your graveyard." It's still a land.  
 SVar:This creature's power and toughness are each equal to the number of creature cards in your graveyard.:stSetPT:Count$TypeInYourYard.Creature:Count$TypeInYourYard.Creature:This creature's power and toughness are each equal to the number of creature cards in your graveyard.
 SVar:X:Count$TypeInYourYard.Creature
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/treetop_village.txt b/res/cardsfolder/treetop_village.txt
index db1d9b6f4ef..81510fb269c 100644
--- a/res/cardsfolder/treetop_village.txt
+++ b/res/cardsfolder/treetop_village.txt
@@ -4,7 +4,7 @@ Types:Land
 Text:no text
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
-A:AB$Animate | Cost$ 1 G | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Ape | Colors$ Green | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 3/3 green Ape creature with trample until end of turn. It's still a land. (If it would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
+A:AB$ Animate | Cost$ 1 G | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Ape | Colors$ Green | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 3/3 green Ape creature with trample until end of turn. It's still a land. (If it would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/treetop_village.jpg
 SetInfo:ULG|Uncommon|http://magiccards.info/scans/en/ul/143.jpg
diff --git a/res/cardsfolder/xanthic_statue.txt b/res/cardsfolder/xanthic_statue.txt
index 19b44d345f9..92c20a9e3ad 100644
--- a/res/cardsfolder/xanthic_statue.txt
+++ b/res/cardsfolder/xanthic_statue.txt
@@ -2,7 +2,7 @@ Name:Xanthic Statue
 ManaCost:8
 Types:Artifact
 Text:no text
-A:AB$Animate | Cost$ 5 | Defined$ Self | Power$ 8 | Toughness$ 8 | Types$ Creature,Artifact,Golem | Keywords$ Trample | SpellDescription$ Until end of turn, CARDNAME becomes an 8/8 Golem artifact creature with trample.
+A:AB$ Animate | Cost$ 5 | Defined$ Self | Power$ 8 | Toughness$ 8 | Types$ Creature,Artifact,Golem | Keywords$ Trample | SpellDescription$ Until end of turn, CARDNAME becomes an 8/8 Golem artifact creature with trample.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/xanthic_statue.jpg
 SetInfo:WTH|Rare|http://magiccards.info/scans/en/wl/163.jpg