diff --git a/.gitattributes b/.gitattributes
index 0c4e442ea3a..77e2ac58687 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1214,7 +1214,7 @@ res/cardsfolder/command_of_unsummoning.txt -text svneol=native#text/plain
 res/cardsfolder/commander_eesha.txt -text svneol=native#text/plain
 res/cardsfolder/commander_greven_il_vec.txt -text svneol=native#text/plain
 res/cardsfolder/commune_with_nature.txt -text svneol=native#text/plain
-res/cardsfolder/complex_automaton.txt svneol=native#text/plain
+res/cardsfolder/complex_automaton.txt -text svneol=native#text/plain
 res/cardsfolder/composite_golem.txt -text svneol=native#text/plain
 res/cardsfolder/compost.txt svneol=native#text/plain
 res/cardsfolder/compulsion.txt -text svneol=native#text/plain
@@ -3111,7 +3111,7 @@ res/cardsfolder/hunted_troll.txt -text svneol=native#text/plain
 res/cardsfolder/hunted_wumpus.txt -text svneol=native#text/plain
 res/cardsfolder/hunting_cheetah.txt -text svneol=native#text/plain
 res/cardsfolder/hunting_drake.txt -text svneol=native#text/plain
-res/cardsfolder/hunting_grounds.txt svneol=native#text/plain
+res/cardsfolder/hunting_grounds.txt -text svneol=native#text/plain
 res/cardsfolder/hunting_moa.txt -text svneol=native#text/plain
 res/cardsfolder/hunting_pack.txt -text svneol=native#text/plain
 res/cardsfolder/hunting_triad.txt svneol=native#text/plain
@@ -3751,7 +3751,7 @@ res/cardsfolder/lightning_hounds.txt -text svneol=native#text/plain
 res/cardsfolder/lightning_reaver.txt -text svneol=native#text/plain
 res/cardsfolder/lightning_rift.txt -text svneol=native#text/plain
 res/cardsfolder/lightning_serpent.txt -text svneol=native#text/plain
-res/cardsfolder/lightning_surge.txt svneol=native#text/plain
+res/cardsfolder/lightning_surge.txt -text svneol=native#text/plain
 res/cardsfolder/lightning_talons.txt -text svneol=native#text/plain
 res/cardsfolder/lightwielder_paladin.txt -text svneol=native#text/plain
 res/cardsfolder/lignify.txt -text svneol=native#text/plain
@@ -3984,7 +3984,7 @@ res/cardsfolder/mask_of_law_and_grace.txt -text svneol=native#text/plain
 res/cardsfolder/mask_of_memory.txt -text svneol=native#text/plain
 res/cardsfolder/mask_of_riddles.txt -text svneol=native#text/plain
 res/cardsfolder/masked_admirers.txt -text svneol=native#text/plain
-res/cardsfolder/masked_gorgon.txt svneol=native#text/plain
+res/cardsfolder/masked_gorgon.txt -text svneol=native#text/plain
 res/cardsfolder/mass_calcify.txt -text svneol=native#text/plain
 res/cardsfolder/mass_hysteria.txt -text svneol=native#text/plain
 res/cardsfolder/mass_of_ghouls.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/ankh_of_mishra.txt b/res/cardsfolder/ankh_of_mishra.txt
index 4114de8c2dd..23b51b65cc4 100644
--- a/res/cardsfolder/ankh_of_mishra.txt
+++ b/res/cardsfolder/ankh_of_mishra.txt
@@ -4,6 +4,7 @@ Types:Artifact
 Text:no text
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a land enters the battlefield, CARDNAME deals 2 damage to that land's controller.
 SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredCardController | NumDmg$ 2
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ankh_of_mishra.jpg
 SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/230.jpg
diff --git a/res/cardsfolder/balshan_griffin.txt b/res/cardsfolder/balshan_griffin.txt
index c78db9d4650..0351c97ff0a 100644
--- a/res/cardsfolder/balshan_griffin.txt
+++ b/res/cardsfolder/balshan_griffin.txt
@@ -4,7 +4,8 @@ Types:Creature Griffin
 Text:no text
 PT:3/2
 K:Flying
-A:AB$ ChangeZone | Cost$ 1 U Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return Amugaba to its owner's hand.
+A:AB$ ChangeZone | Cost$ 1 U Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balshan_griffin.jpg
 SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/67.jpg
diff --git a/res/cardsfolder/complex_automaton.txt b/res/cardsfolder/complex_automaton.txt
index 5b17347ee25..1d3056a8da8 100644
--- a/res/cardsfolder/complex_automaton.txt
+++ b/res/cardsfolder/complex_automaton.txt
@@ -1,11 +1,12 @@
-Name:Complex Automaton
-ManaCost:4
-Types:Artifact Creature Golem
-Text:no text
-PT:4/4
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Permanent.YouCtrl | PresentCompare$ GE7 | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ At the beginning of your upkeep, if you control seven or more permanents, return CARDNAME to its owner's hand.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/complex_automaton.jpg
-SetInfo:NMS|Rare|http://magiccards.info/scans/en/ne/128.jpg
+Name:Complex Automaton
+ManaCost:4
+Types:Artifact Creature Golem
+Text:no text
+PT:4/4
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Permanent.YouCtrl | PresentCompare$ GE7 | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ At the beginning of your upkeep, if you control seven or more permanents, return CARDNAME to its owner's hand.
+SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/complex_automaton.jpg
+SetInfo:NMS|Rare|http://magiccards.info/scans/en/ne/128.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/hunting_grounds.txt b/res/cardsfolder/hunting_grounds.txt
index 6b4548c1957..5f25317dd2a 100644
--- a/res/cardsfolder/hunting_grounds.txt
+++ b/res/cardsfolder/hunting_grounds.txt
@@ -1,10 +1,10 @@
-Name:Hunting Grounds
-ManaCost:G W
-Types:Enchantment
-Text:no text
-T:Mode$ SpellCast | ValidCard$ Spell.YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ Threshold - Whenever an opponent casts a spell, you may put a creature card from your hand onto the battlefield.
-SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | ChangeType$ Creature | ChangeNum$ 1 | Origin$ Hand | Destination$ Battlefield | Threshold$ True | PrecostDesc$ Threshold -
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hunting_grounds.jpg
-SetInfo:JUD|Rare|http://magiccards.info/scans/en/ju/138.jpg
+Name:Hunting Grounds
+ManaCost:G W
+Types:Enchantment
+Text:no text
+T:Mode$ SpellCast | ValidCard$ Spell.YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigChangeZone | OptionalDecider$ You | Threshold$ True | TriggerDescription$ Threshold - Whenever an opponent casts a spell, you may put a creature card from your hand onto the battlefield.
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | ChangeType$ Creature | ChangeNum$ 1 | Origin$ Hand | Destination$ Battlefield
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hunting_grounds.jpg
+SetInfo:JUD|Rare|http://magiccards.info/scans/en/ju/138.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/lightning_surge.txt b/res/cardsfolder/lightning_surge.txt
index 8c494c20503..9259bc4f262 100644
--- a/res/cardsfolder/lightning_surge.txt
+++ b/res/cardsfolder/lightning_surge.txt
@@ -1,11 +1,11 @@
-Name:Lightning Surge
-ManaCost:3 R R
-Types:Sorcery
-Text:no text
-K:Flashback:5 R R
-A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
-A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 6 | NoPrevention$ True | Threshold$ True | SpellDescription$ Threshold - If seven or more cards are in your graveyard, instead CARDNAME deals 6 damage to that creature or player and the damage can't be prevented.
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/lightning_surge.jpg
-SetInfo:JUD|Rare|http://magiccards.info/scans/en/ju/96.jpg
+Name:Lightning Surge
+ManaCost:3 R R
+Types:Sorcery
+Text:no text
+K:Flashback:5 R R
+A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
+A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 6 | NoPrevention$ True | Threshold$ True | SpellDescription$ Threshold - If seven or more cards are in your graveyard, instead CARDNAME deals 6 damage to that creature or player and the damage can't be prevented.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/lightning_surge.jpg
+SetInfo:JUD|Rare|http://magiccards.info/scans/en/ju/96.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/masked_gorgon.txt b/res/cardsfolder/masked_gorgon.txt
index 32905535483..7cc26ed822f 100644
--- a/res/cardsfolder/masked_gorgon.txt
+++ b/res/cardsfolder/masked_gorgon.txt
@@ -1,11 +1,11 @@
-Name:Masked Gorgon
-ManaCost:4 B
-Types:Creature Gorgon
-Text:no text
-PT:5/5
-K:stPumpAll:Creature.Green,Creature.White:0/0/Protection from Gorgons:No Condition:Green creatures and white creatures have protection from Gorgons.
-K:stPumpSelf:Creature:0/0/Protection from green & Protection from white:Threshold:Threshold - Masked Gorgon has protection from green and from white as long as seven or more cards are in your graveyard.
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/masked_gorgon.jpg
-SetInfo:JUD|Rare|http://magiccards.info/scans/en/ju/69.jpg
+Name:Masked Gorgon
+ManaCost:4 B
+Types:Creature Gorgon
+Text:no text
+PT:5/5
+K:stPumpAll:Creature.Green,Creature.White:0/0/Protection from Gorgons:No Condition:Green creatures and white creatures have protection from Gorgons.
+K:stPumpSelf:Creature:0/0/Protection from green & Protection from white:Threshold:Threshold - Masked Gorgon has protection from green and from white as long as seven or more cards are in your graveyard.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/masked_gorgon.jpg
+SetInfo:JUD|Rare|http://magiccards.info/scans/en/ju/69.jpg
 End
\ No newline at end of file