diff --git a/.gitattributes b/.gitattributes
index fcdcd6014a2..b321f6558f3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -752,7 +752,7 @@ res/cardsfolder/boggart_arsonists.txt -text svneol=native#text/plain
 res/cardsfolder/boggart_birth_rite.txt -text svneol=native#text/plain
 res/cardsfolder/boggart_harbinger.txt -text svneol=native#text/plain
 res/cardsfolder/boggart_loggers.txt -text svneol=native#text/plain
-res/cardsfolder/boggart_mob.txt svneol=native#text/plain
+res/cardsfolder/boggart_mob.txt -text svneol=native#text/plain
 res/cardsfolder/boggart_ram_gang.txt -text svneol=native#text/plain
 res/cardsfolder/boggart_shenanigans.txt svneol=native#text/plain
 res/cardsfolder/boggart_sprite_chaser.txt -text svneol=native#text/plain
@@ -910,7 +910,7 @@ res/cardsfolder/cabal_slaver.txt -text svneol=native#text/plain
 res/cardsfolder/cabal_surgeon.txt -text svneol=native#text/plain
 res/cardsfolder/cabal_torturer.txt -text svneol=native#text/plain
 res/cardsfolder/cabal_trainee.txt -text svneol=native#text/plain
-res/cardsfolder/cache_raiders.txt svneol=native#text/plain
+res/cardsfolder/cache_raiders.txt -text svneol=native#text/plain
 res/cardsfolder/cackling_fiend.txt -text svneol=native#text/plain
 res/cardsfolder/cackling_flames.txt -text svneol=native#text/plain
 res/cardsfolder/cackling_imp.txt -text svneol=native#text/plain
@@ -936,7 +936,7 @@ res/cardsfolder/call_to_the_netherworld.txt -text svneol=native#text/plain
 res/cardsfolder/caller_of_gales.txt -text svneol=native#text/plain
 res/cardsfolder/caller_of_the_claw.txt -text svneol=native#text/plain
 res/cardsfolder/callous_giant.txt -text svneol=native#text/plain
-res/cardsfolder/caltrops.txt svneol=native#text/plain
+res/cardsfolder/caltrops.txt -text svneol=native#text/plain
 res/cardsfolder/cancel.txt -text svneol=native#text/plain
 res/cardsfolder/candelabra_of_tawnos.txt -text svneol=native#text/plain
 res/cardsfolder/canopy_spider.txt -text svneol=native#text/plain
@@ -954,7 +954,7 @@ res/cardsfolder/capricious_sorcerer.txt -text svneol=native#text/plain
 res/cardsfolder/capsize.txt -text svneol=native#text/plain
 res/cardsfolder/captain_of_the_watch.txt -text svneol=native#text/plain
 res/cardsfolder/captain_sisay.txt -text svneol=native#text/plain
-res/cardsfolder/captivating_vampire.txt svneol=native#text/plain
+res/cardsfolder/captivating_vampire.txt -text svneol=native#text/plain
 res/cardsfolder/captive_flame.txt -text svneol=native#text/plain
 res/cardsfolder/capture_of_jingzhou.txt -text svneol=native#text/plain
 res/cardsfolder/captured_sunlight.txt -text svneol=native#text/plain
@@ -1027,7 +1027,7 @@ res/cardsfolder/celestial_purge.txt -text svneol=native#text/plain
 res/cardsfolder/celestial_sword.txt -text svneol=native#text/plain
 res/cardsfolder/cemetery_gate.txt -text svneol=native#text/plain
 res/cardsfolder/cemetery_reaper.txt -text svneol=native#text/plain
-res/cardsfolder/cenns_enlistment.txt svneol=native#text/plain
+res/cardsfolder/cenns_enlistment.txt -text svneol=native#text/plain
 res/cardsfolder/cenns_heir.txt -text svneol=native#text/plain
 res/cardsfolder/centaur_archer.txt -text svneol=native#text/plain
 res/cardsfolder/centaur_courser.txt -text svneol=native#text/plain
@@ -1109,7 +1109,7 @@ res/cardsfolder/chittering_rats.txt -text svneol=native#text/plain
 res/cardsfolder/cho_arrim_bruiser.txt -text svneol=native#text/plain
 res/cardsfolder/cho_manno_revolutionary.txt -text svneol=native#text/plain
 res/cardsfolder/choke.txt -text svneol=native#text/plain
-res/cardsfolder/choking_fumes.txt svneol=native#text/plain
+res/cardsfolder/choking_fumes.txt -text svneol=native#text/plain
 res/cardsfolder/choking_sands.txt -text svneol=native#text/plain
 res/cardsfolder/choking_tethers.txt -text svneol=native#text/plain
 res/cardsfolder/chorus_of_woe.txt -text svneol=native#text/plain
@@ -1217,7 +1217,7 @@ res/cardsfolder/compost.txt svneol=native#text/plain
 res/cardsfolder/compulsion.txt -text svneol=native#text/plain
 res/cardsfolder/compulsive_research.txt -text svneol=native#text/plain
 res/cardsfolder/concentrate.txt -text svneol=native#text/plain
-res/cardsfolder/conch_horn.txt svneol=native#text/plain
+res/cardsfolder/conch_horn.txt -text svneol=native#text/plain
 res/cardsfolder/concordant_crossroads.txt -text svneol=native#text/plain
 res/cardsfolder/condemn.txt -text svneol=native#text/plain
 res/cardsfolder/condescend.txt -text svneol=native#text/plain
@@ -1231,7 +1231,7 @@ res/cardsfolder/conquering_manticore.txt svneol=native#text/plain
 res/cardsfolder/conquerors_pledge.txt -text svneol=native#text/plain
 res/cardsfolder/consecrated_sphinx.txt -text svneol=native#text/plain
 res/cardsfolder/conspiracy.txt -text svneol=native#text/plain
-res/cardsfolder/constant_mists.txt svneol=native#text/plain
+res/cardsfolder/constant_mists.txt -text svneol=native#text/plain
 res/cardsfolder/constricting_tendrils.txt -text svneol=native#text/plain
 res/cardsfolder/consult_the_necrosages.txt -text svneol=native#text/plain
 res/cardsfolder/consume_the_meek.txt -text svneol=native#text/plain
@@ -1266,7 +1266,7 @@ res/cardsfolder/coral_trickster.txt svneol=native#text/plain
 res/cardsfolder/coralhelm_commander.txt -text svneol=native#text/plain
 res/cardsfolder/core_prowler.txt -text svneol=native#text/plain
 res/cardsfolder/coretapper.txt -text svneol=native#text/plain
-res/cardsfolder/corpse_connoisseur.txt svneol=native#text/plain
+res/cardsfolder/corpse_connoisseur.txt -text svneol=native#text/plain
 res/cardsfolder/corpse_cur.txt -text svneol=native#text/plain
 res/cardsfolder/corpse_harvester.txt -text svneol=native#text/plain
 res/cardsfolder/corpsehatch.txt -text svneol=native#text/plain
@@ -1374,7 +1374,7 @@ res/cardsfolder/cryptic_annelid.txt svneol=native#text/plain
 res/cardsfolder/cryptic_command.txt svneol=native#text/plain
 res/cardsfolder/cryptwailing.txt -text svneol=native#text/plain
 res/cardsfolder/crystal_ball.txt -text svneol=native#text/plain
-res/cardsfolder/crystal_chimes.txt svneol=native#text/plain
+res/cardsfolder/crystal_chimes.txt -text svneol=native#text/plain
 res/cardsfolder/crystal_quarry.txt -text svneol=native#text/plain
 res/cardsfolder/crystal_rod.txt -text svneol=native#text/plain
 res/cardsfolder/crystal_seer.txt svneol=native#text/plain
@@ -1391,10 +1391,10 @@ res/cardsfolder/cumber_stone.txt -text svneol=native#text/plain
 res/cardsfolder/cunning_advisor.txt -text svneol=native#text/plain
 res/cardsfolder/cunning_lethemancer.txt -text svneol=native#text/plain
 res/cardsfolder/cunning_sparkmage.txt -text svneol=native#text/plain
-res/cardsfolder/curfew.txt svneol=native#text/plain
+res/cardsfolder/curfew.txt -text svneol=native#text/plain
 res/cardsfolder/curiosity.txt -text svneol=native#text/plain
 res/cardsfolder/curse_of_chains.txt -text svneol=native#text/plain
-res/cardsfolder/curse_of_marit_lage.txt svneol=native#text/plain
+res/cardsfolder/curse_of_marit_lage.txt -text svneol=native#text/plain
 res/cardsfolder/curse_of_wizardry.txt -text svneol=native#text/plain
 res/cardsfolder/cursecatcher.txt -text svneol=native#text/plain
 res/cardsfolder/cursed_flesh.txt -text svneol=native#text/plain
@@ -1405,7 +1405,7 @@ res/cardsfolder/cursed_scroll.txt -text svneol=native#text/plain
 res/cardsfolder/customs_depot.txt -text svneol=native#text/plain
 res/cardsfolder/cut_the_earthly_bond.txt -text svneol=native#text/plain
 res/cardsfolder/cutthroat_il_dal.txt -text svneol=native#text/plain
-res/cardsfolder/cyclical_evolution.txt svneol=native#text/plain
+res/cardsfolder/cyclical_evolution.txt -text svneol=native#text/plain
 res/cardsfolder/cyclopean_mummy.txt svneol=native#text/plain
 res/cardsfolder/cyclopean_snare.txt svneol=native#text/plain
 res/cardsfolder/cylian_elf.txt -text svneol=native#text/plain
@@ -2373,7 +2373,7 @@ res/cardsfolder/forgotten_cave.txt -text svneol=native#text/plain
 res/cardsfolder/forgotten_harvest.txt svneol=native#text/plain
 res/cardsfolder/fork.txt -text svneol=native#text/plain
 res/cardsfolder/forked_branch_garami.txt -text svneol=native#text/plain
-res/cardsfolder/form_of_the_dragon.txt svneol=native#text/plain
+res/cardsfolder/form_of_the_dragon.txt -text svneol=native#text/plain
 res/cardsfolder/forsaken_city.txt -text svneol=native#text/plain
 res/cardsfolder/fortify.txt -text svneol=native#text/plain
 res/cardsfolder/fortitude.txt svneol=native#text/plain
diff --git a/res/cardsfolder/bereavement.txt b/res/cardsfolder/bereavement.txt
index f90cf5e8dd4..ff7d4373b1b 100644
--- a/res/cardsfolder/bereavement.txt
+++ b/res/cardsfolder/bereavement.txt
@@ -6,7 +6,7 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigOppDiscard | TriggerDescription$ its controller discards a card.
 SVar:TrigYouDiscard:AB$Discard | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:TrigOppDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1 
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bereavement.jpg
 SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/117.jpg
diff --git a/res/cardsfolder/boggart_mob.txt b/res/cardsfolder/boggart_mob.txt
index ff6bbf77441..bfff7c69921 100644
--- a/res/cardsfolder/boggart_mob.txt
+++ b/res/cardsfolder/boggart_mob.txt
@@ -1,12 +1,13 @@
-Name:Boggart Mob
-ManaCost:3 B
-Types:Creature Goblin Warrior
-Text:no text
-PT:5/5
-K:Champion:Goblin
-T:Mode$ DamageDone | ValidSource$ Goblin.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever a Goblin you control deals combat damage to a player, you may put a 1/1 black Goblin Rogue creature token onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Goblin Rogue | TokenTypes$ Creature,Goblin,Rogue | TokenOwner$ You | TokenColors$ Black | TokenPower$ 1 | TokenToughness$ 1
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/boggart_mob.jpg
-SetInfo:LRW|Rare|http://magiccards.info/scans/en/lw/104.jpg
+Name:Boggart Mob
+ManaCost:3 B
+Types:Creature Goblin Warrior
+Text:no text
+PT:5/5
+K:Champion:Goblin
+T:Mode$ DamageDone | ValidSource$ Goblin.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever a Goblin you control deals combat damage to a player, you may put a 1/1 black Goblin Rogue creature token onto the battlefield.
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Goblin Rogue | TokenTypes$ Creature,Goblin,Rogue | TokenOwner$ You | TokenColors$ Black | TokenPower$ 1 | TokenToughness$ 1
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/boggart_mob.jpg
+SetInfo:LRW|Rare|http://magiccards.info/scans/en/lw/104.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/cabal_patriarch.txt b/res/cardsfolder/cabal_patriarch.txt
index 512a10b41f9..586262e6f0e 100644
--- a/res/cardsfolder/cabal_patriarch.txt
+++ b/res/cardsfolder/cabal_patriarch.txt
@@ -1,12 +1,12 @@
-Name:Cabal Patriarch
-ManaCost:3 B B B
-Types:Legendary Creature Human Wizard
-Text:no text
-PT:5/5
-A:AB$ Pump | Cost$ 2 B Sac<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn.
-A:AB$ Pump | Cost$ 2 B ExileFromGrave<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn.
-SVar:RemAIDeck:True
+Name:Cabal Patriarch
+ManaCost:3 B B B
+Types:Legendary Creature Human Wizard
+Text:no text
+PT:5/5
+A:AB$ Pump | Cost$ 2 B Sac<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn.
+A:AB$ Pump | Cost$ 2 B ExileFromGrave<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn.
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cabal_patriarch.jpg
 SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/120.jpg
-End
+End
diff --git a/res/cardsfolder/cache_raiders.txt b/res/cardsfolder/cache_raiders.txt
index 633e55999e5..1e45a56d611 100644
--- a/res/cardsfolder/cache_raiders.txt
+++ b/res/cardsfolder/cache_raiders.txt
@@ -1,12 +1,12 @@
-Name:Cache Raiders
-ManaCost:3 U U
-Types:Creature Merfolk Rogue
-Text:no text
-PT:4/4
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ At the beginning of your upkeep, return a permanent you control to its owner's hand.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | ChangeType$ Permanent.YouCtrl | ChangeNum$ 1 | Hidden$ True
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/cache_raiders.jpg
-SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/18.jpg
+Name:Cache Raiders
+ManaCost:3 U U
+Types:Creature Merfolk Rogue
+Text:no text
+PT:4/4
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ At the beginning of your upkeep, return a permanent you control to its owner's hand.
+SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | ChangeType$ Permanent.YouCtrl | ChangeNum$ 1 | Hidden$ True
+SVar:RemRandomDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/cache_raiders.jpg
+SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/18.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/call_to_the_grave.txt b/res/cardsfolder/call_to_the_grave.txt
index eedaf316b81..3e4bebb2233 100644
--- a/res/cardsfolder/call_to_the_grave.txt
+++ b/res/cardsfolder/call_to_the_grave.txt
@@ -6,7 +6,7 @@ T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigSac | T
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | SacValid$ Creature.nonZombie | Defined$ TriggeredPlayer
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | IsPresent$ Creature | PresentCompare$ EQ0 | Execute$ TrigSacSelf | TriggerDescription$ At the beginning of the end step, if no creatures are on the battlefield, sacrifice CARDNAME.
 SVar:TrigSacSelf:AB$Sacrifice | Cost$ 0 | Defined$ Self
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/call_to_the_grave.jpg
 SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/58.jpg
diff --git a/res/cardsfolder/caltrops.txt b/res/cardsfolder/caltrops.txt
index d16e2ee896d..9ec9f921aa3 100644
--- a/res/cardsfolder/caltrops.txt
+++ b/res/cardsfolder/caltrops.txt
@@ -1,12 +1,12 @@
-Name:Caltrops
-ManaCost:3
-Types:Artifact
-Text:no text
-T:Mode$ Attacks | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature attacks, CARDNAME deals 1 damage to it.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredAttacker | NumDmg$ 1
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/caltrops.jpg
-SetInfo:UDS|Uncommon|http://magiccards.info/scans/en/ud/129.jpg
-SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/288.jpg
+Name:Caltrops
+ManaCost:3
+Types:Artifact
+Text:no text
+T:Mode$ Attacks | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature attacks, CARDNAME deals 1 damage to it.
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredAttacker | NumDmg$ 1
+SVar:RemRandomDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/caltrops.jpg
+SetInfo:UDS|Uncommon|http://magiccards.info/scans/en/ud/129.jpg
+SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/288.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/canyon_drake.txt b/res/cardsfolder/canyon_drake.txt
index 49ba2b11b13..fb76d85ea80 100644
--- a/res/cardsfolder/canyon_drake.txt
+++ b/res/cardsfolder/canyon_drake.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:1/2
 K:Flying
 A:AB$Pump | Cost$ 1 Discard<1/Random> | NumAtt$ +2 | SpellDescription$ CARDNAME gets +2/+0 until end of turn.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/canyon_drake.jpg
 SetInfo:TMP|Rare|http://magiccards.info/scans/en/tp/166.jpg
diff --git a/res/cardsfolder/captivating_vampire.txt b/res/cardsfolder/captivating_vampire.txt
index dedb035ff44..8ea51146b02 100644
--- a/res/cardsfolder/captivating_vampire.txt
+++ b/res/cardsfolder/captivating_vampire.txt
@@ -1,13 +1,13 @@
-Name:Captivating Vampire
-ManaCost:1 B B
-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.
-SVar:Animate:DB$Animate | Defined$ Targeted | Types$ Vampire | Permanent$ True
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/captivating_vampire.jpg
-SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/87.jpg
+Name:Captivating Vampire
+ManaCost:1 B B
+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.
+SVar:Animate:DB$Animate | Defined$ Targeted | Types$ Vampire | Permanent$ True
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/captivating_vampire.jpg
+SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/87.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/carnage_altar.txt b/res/cardsfolder/carnage_altar.txt
index 7f4491d917e..93c0fe3b763 100644
--- a/res/cardsfolder/carnage_altar.txt
+++ b/res/cardsfolder/carnage_altar.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact
 Text:no text
 A:AB$Draw | Cost$ 3 Sac<1/Creature> | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/carnage_altar.jpg
 SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/198.jpg
diff --git a/res/cardsfolder/carrier_pigeons.txt b/res/cardsfolder/carrier_pigeons.txt
index 1e4f562c301..43473bc7989 100644
--- a/res/cardsfolder/carrier_pigeons.txt
+++ b/res/cardsfolder/carrier_pigeons.txt
@@ -6,7 +6,6 @@ PT:1/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 1 | NextUpkeep$ True
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/carrier_pigeons.jpg
 SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/125.jpg|2
diff --git a/res/cardsfolder/catapult_master.txt b/res/cardsfolder/catapult_master.txt
index ae50f6ac127..2f576baf697 100644
--- a/res/cardsfolder/catapult_master.txt
+++ b/res/cardsfolder/catapult_master.txt
@@ -4,7 +4,7 @@ Types:Creature Human Soldier
 Text:no text
 PT:3/3
 A:AB$ChangeZone | Cost$ tapXType<5/Soldier> | ValidTgts$ Creature | TgtPrompt$ Select target Creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/catapult_master.jpg
 SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/10.jpg
diff --git a/res/cardsfolder/catapult_squad.txt b/res/cardsfolder/catapult_squad.txt
index db0c7f83681..a98a951ed42 100644
--- a/res/cardsfolder/catapult_squad.txt
+++ b/res/cardsfolder/catapult_squad.txt
@@ -4,7 +4,7 @@ Types:Creature Human Soldier
 Text:no text
 PT:2/1
 A:AB$DealDamage | Cost$ tapXType<2/Soldier> | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/catapult_squad.jpg
 SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/11.jpg
diff --git a/res/cardsfolder/cateran_summons.txt b/res/cardsfolder/cateran_summons.txt
index 60f67ee945f..1ba2c74c4a5 100644
--- a/res/cardsfolder/cateran_summons.txt
+++ b/res/cardsfolder/cateran_summons.txt
@@ -3,7 +3,7 @@ ManaCost:B
 Types:Sorcery
 Text:no text
 A:SP$ChangeZone | Cost$ B | Origin$ Library | Destination$ Hand | ChangeType$ Mercenary | ChangeNum$ 1 | SpellDescription$ Search your library for a Mercenary card, reveal that card, and put it into your hand. Then shuffle your library.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cateran_summons.jpg
 SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/126.jpg
diff --git a/res/cardsfolder/caverns_of_despair.txt b/res/cardsfolder/caverns_of_despair.txt
index d01fa0402fa..97ec7312d9a 100644
--- a/res/cardsfolder/caverns_of_despair.txt
+++ b/res/cardsfolder/caverns_of_despair.txt
@@ -2,7 +2,7 @@ Name:Caverns of Despair
 ManaCost:2 R R
 Types:World Enchantment
 Text:No more than two creatures can attack each combat. No more than two creatures can block each combat.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/caverns_of_despair.jpg
 SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/136.jpg
diff --git a/res/cardsfolder/cenns_enlistment.txt b/res/cardsfolder/cenns_enlistment.txt
index c32b0b4f935..a72392d577d 100644
--- a/res/cardsfolder/cenns_enlistment.txt
+++ b/res/cardsfolder/cenns_enlistment.txt
@@ -1,11 +1,10 @@
-Name:Cenn's Enlistment
-ManaCost:3 W
-Types:Sorcery
-Text:no text
-A:SP$ Token | Cost$ 3 W | TokenImage$ W 1 1 Kithkin Soldier | TokenAmount$ 2 | TokenName$ Kithkin Soldier | TokenTypes$ Creature,Kithkin,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put two 1/1 white Kithkin Soldier creature tokens onto the battlefield.
-A:SP$ Token | Cost$ 3 W Discard<1/Land> | CostDesc$ Retrace | TokenImage$ W 1 1 Kithkin Soldier | TokenAmount$ 2 | TokenName$ Kithkin Soldier | TokenTypes$ Creature,Kithkin,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | ActivatingZone$ Graveyard | SpellDescription$ (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/cenns_enlistment.jpg
-SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/3.jpg
+Name:Cenn's Enlistment
+ManaCost:3 W
+Types:Sorcery
+Text:no text
+A:SP$ Token | Cost$ 3 W | TokenImage$ W 1 1 Kithkin Soldier | TokenAmount$ 2 | TokenName$ Kithkin Soldier | TokenTypes$ Creature,Kithkin,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put two 1/1 white Kithkin Soldier creature tokens onto the battlefield.
+A:SP$ Token | Cost$ 3 W Discard<1/Land> | CostDesc$ Retrace | TokenImage$ W 1 1 Kithkin Soldier | TokenAmount$ 2 | TokenName$ Kithkin Soldier | TokenTypes$ Creature,Kithkin,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | ActivatingZone$ Graveyard | SpellDescription$ (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/cenns_enlistment.jpg
+SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/3.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/champions_victory.txt b/res/cardsfolder/champions_victory.txt
index 660954328ad..ede886e96c4 100644
--- a/res/cardsfolder/champions_victory.txt
+++ b/res/cardsfolder/champions_victory.txt
@@ -3,7 +3,6 @@ ManaCost:U
 Types:Instant
 Text:no text
 A:SP$ChangeZone | Cost$ U | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Hand | OpponentTurn$ True | ActivatingPhases$ Declare Attackers - Play Instants and Abilities | SpellDescription$ Cast Champion's Victory only during the declare attackers step and only if you've been attacked this step. Return target attacking creature to its owner's hand.
-SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/champions_victory.jpg
 SetInfo:PTK|Uncommon|http://magiccards.info/scans/en/p3k/39.jpg
diff --git a/res/cardsfolder/chaosphere.txt b/res/cardsfolder/chaosphere.txt
index 8ea26c40e95..f4becc75270 100644
--- a/res/cardsfolder/chaosphere.txt
+++ b/res/cardsfolder/chaosphere.txt
@@ -5,7 +5,7 @@ Text:no text
 K:stPumpAll:Creature.withFlying:0/0/HIDDEN CARDNAME can block only creatures with flying.:No Condition:Creatures with flying can block only creatures with flying.
 K:stPumpAll:Creature.withoutFlying:0/0/Reach:No Condition:Creatures without flying have reach. (They can block creatures with flying.)
 SVar:PlayMain1:TRUE
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chaosphere.jpg
 SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/164.jpg
diff --git a/res/cardsfolder/chastise.txt b/res/cardsfolder/chastise.txt
index 27ff6390949..ee310dc3ec9 100644
--- a/res/cardsfolder/chastise.txt
+++ b/res/cardsfolder/chastise.txt
@@ -4,10 +4,9 @@ Types:Instant
 Text:no text
 A:SP$Destroy | Cost$ 3 W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | SubAbility$ YouGainLife/dX | SpellDescription$ Destroy target attacking creature. You gain life equal to its power.
 SVar:dX:Count$TgtCardPower
-SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chastise.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/9.jpg
 SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/9.jpg
 SetInfo:JUD|Uncommon|http://magiccards.info/scans/en/ju/8.jpg
-End
+End
diff --git a/res/cardsfolder/chill.txt b/res/cardsfolder/chill.txt
index 6bb3d5f55f9..ce093ee8035 100644
--- a/res/cardsfolder/chill.txt
+++ b/res/cardsfolder/chill.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Enchantment
 Text:Red spells cost 2 more to cast.
 K:CostChange:All:More:2:Spell:red:All:NoSpecial
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chill.jpg
 SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/56.jpg
diff --git a/res/cardsfolder/choke.txt b/res/cardsfolder/choke.txt
index 98505061ed1..5c52e6ced9c 100644
--- a/res/cardsfolder/choke.txt
+++ b/res/cardsfolder/choke.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Enchantment
 Text:Islands don't untap during their controllers' untap steps.
 K:Permanents don't untap during their controllers' untap steps:Island
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/choke.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/237.jpg
diff --git a/res/cardsfolder/choking_fumes.txt b/res/cardsfolder/choking_fumes.txt
index 58bc1885765..fdd5f994dab 100644
--- a/res/cardsfolder/choking_fumes.txt
+++ b/res/cardsfolder/choking_fumes.txt
@@ -1,10 +1,9 @@
-Name:Choking Fumes
-ManaCost:2 W
-Types:Instant
-Text:no text
-A:SP$PutCounterAll | Cost$ 2 W | ValidCards$ Creature.attacking | CounterType$ M1M1 | CounterNum$ 1 | SpellDescription$ Put a -1/-1 counter on each attacking creature.
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/choking_fumes.jpg
-SetInfo:MBS|Uncommon|http://magiccards.info/scans/en/mbs/4.jpg
+Name:Choking Fumes
+ManaCost:2 W
+Types:Instant
+Text:no text
+A:SP$PutCounterAll | Cost$ 2 W | ValidCards$ Creature.attacking | CounterType$ M1M1 | CounterNum$ 1 | SpellDescription$ Put a -1/-1 counter on each attacking creature.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/choking_fumes.jpg
+SetInfo:MBS|Uncommon|http://magiccards.info/scans/en/mbs/4.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/churning_eddy.txt b/res/cardsfolder/churning_eddy.txt
index f5caffdf3e3..21e384df028 100644
--- a/res/cardsfolder/churning_eddy.txt
+++ b/res/cardsfolder/churning_eddy.txt
@@ -4,7 +4,6 @@ Types:Sorcery
 Text:no text
 A:SP$ChangeZone | Cost$ 3 U | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Return target creature and target land to their owners' hands. | SubAbility$ SVar=spBounce
 SVar:spBounce:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Land | TgtPrompt$ Select target land
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/churning_eddy.jpg
 SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/32.jpg
diff --git a/res/cardsfolder/cleanse.txt b/res/cardsfolder/cleanse.txt
index 48f7f5f51e3..e6b03fb26b9 100644
--- a/res/cardsfolder/cleanse.txt
+++ b/res/cardsfolder/cleanse.txt
@@ -3,8 +3,8 @@ ManaCost:2 W W
 Types:Sorcery
 Text:no text
 A:SP$DestroyAll | Cost$ 2 W W | ValidCards$ Creature.Black | SpellDescription$ Destroy all black creatures.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cleanse.jpg
 SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/174.jpg
-End
+End
diff --git a/res/cardsfolder/clutch_of_undeath.txt b/res/cardsfolder/clutch_of_undeath.txt
index 9016a4ed4fa..a15e4beb1ac 100644
--- a/res/cardsfolder/clutch_of_undeath.txt
+++ b/res/cardsfolder/clutch_of_undeath.txt
@@ -6,7 +6,7 @@ K:Enchant creature
 K:enPump:+0/+0
 K:stPumpEnchanted:Creature.Zombie:3/3:No Condition:Enchanted creature gets +3/+3 as long as it's a Zombie. Otherwise, it gets -3/-3.
 K:stPumpEnchanted:Creature.nonZombie:-3/-3:No Condition:no text
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/clutch_of_undeath.jpg
 SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/61.jpg
diff --git a/res/cardsfolder/coffin_puppets.txt b/res/cardsfolder/coffin_puppets.txt
index 24fce9387c5..f0471d5cbf1 100644
--- a/res/cardsfolder/coffin_puppets.txt
+++ b/res/cardsfolder/coffin_puppets.txt
@@ -4,7 +4,7 @@ Types:Creature Zombie
 Text:no text
 PT:3/3
 A:AB$ChangeZone | Cost$ Sac<2/Land> | Origin$ Graveyard | Destination$ Battlefield | ActivatingZone$ Graveyard | PlayerTurn$ True | ActivatingPhases$ Upkeep | IsPresent$ Swamp.YouCtrl | SpellDescription$ Return Coffin Puppets from your graveyard to the battlefield. Activate this ability only during your upkeep and only if you control a Swamp.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coffin_puppets.jpg
 SetInfo:PCY|Rare|http://magiccards.info/scans/en/pr/60.jpg
diff --git a/res/cardsfolder/coffin_purge.txt b/res/cardsfolder/coffin_purge.txt
index c053bc6eab2..6c3bf7e28b6 100644
--- a/res/cardsfolder/coffin_purge.txt
+++ b/res/cardsfolder/coffin_purge.txt
@@ -4,7 +4,7 @@ Types:Instant
 Text:no text
 A:SP$ChangeZone | Cost$ B | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
 A:SP$ChangeZone | Cost$ B | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | Flashback$ True | CostDesc$ Flashback B | SpellDescription$ (You may cast this card from your graveyard for its flashback cost. Then exile it.)
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coffin_purge.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/124.jpg
diff --git a/res/cardsfolder/collective_unconscious.txt b/res/cardsfolder/collective_unconscious.txt
index ffd545a1169..5e6c9c09600 100644
--- a/res/cardsfolder/collective_unconscious.txt
+++ b/res/cardsfolder/collective_unconscious.txt
@@ -4,9 +4,9 @@ Types:Sorcery
 Text:no text
 A:SP$Draw | Cost$ 4 G G | NumCards$ X | SpellDescription$ Draw a card for each creature you control.
 SVar:X:Count$TypeYouCtrl.Creature
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/collective_unconscious.jpg
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/238.jpg
 SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/236.jpg
-End
+End
diff --git a/res/cardsfolder/colossus_of_sardia.txt b/res/cardsfolder/colossus_of_sardia.txt
index c486fad8787..07b327fea38 100644
--- a/res/cardsfolder/colossus_of_sardia.txt
+++ b/res/cardsfolder/colossus_of_sardia.txt
@@ -6,7 +6,7 @@ PT:9/9
 K:Trample
 K:CARDNAME doesn't untap during your untap step.
 A:AB$ Untap | Cost$ 9 | ActivatingPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Untap CARDNAME. Activate this ability only during your upkeep.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/colossus_of_sardia.jpg
 SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/358.jpg
diff --git a/res/cardsfolder/combust.txt b/res/cardsfolder/combust.txt
index c476d12b47d..b28c7642c5d 100644
--- a/res/cardsfolder/combust.txt
+++ b/res/cardsfolder/combust.txt
@@ -4,7 +4,7 @@ Types:Instant
 Text:no text
 K:CARDNAME can't be countered.
 A:SP$DealDamage | Cost$ 1 R | ValidTgts$ Creature.White,Creature.Blue | NumDmg$ 5 | NoPrevention$ True | TgtPrompt$ Select target white or blue creature. | SpellDescription$ CARDNAME deals 5 damage to target white or blue creature.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/combust.jpg
 SetInfo:M11|Uncommon|http://magiccards.info/scans/en/m11/130.jpg
diff --git a/res/cardsfolder/command_of_unsummoning.txt b/res/cardsfolder/command_of_unsummoning.txt
index 63220ae1b78..9e028b0bad6 100644
--- a/res/cardsfolder/command_of_unsummoning.txt
+++ b/res/cardsfolder/command_of_unsummoning.txt
@@ -3,7 +3,6 @@ ManaCost:2 U
 Types:Instant
 Text:no text
 A:SP$ChangeZone | Cost$ 2 U | TargetMin$ 1 | TargetMax$ 2 | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Hand | OpponentTurn$ True | ActivatingPhases$ Declare Attackers - Play Instants and Abilities | SpellDescription$ Cast Command of Unsummoning only during the declare attackers step and only if you've been attacked this step. Return one or two target attacking creatures to their owner's hand.
-SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://serv3.tcgimages.eu/img/cards/Portal/command_of_unsummoning.jpg
 SetInfo:POR|Uncommon|http://magiccards.info/scans/en/po/49.jpg
diff --git a/res/cardsfolder/conch_horn.txt b/res/cardsfolder/conch_horn.txt
index 1422043eea1..d590178e08d 100644
--- a/res/cardsfolder/conch_horn.txt
+++ b/res/cardsfolder/conch_horn.txt
@@ -1,11 +1,11 @@
-Name:Conch Horn
-ManaCost:2
-Types:Artifact
-Text:no text
-A:AB$Draw | Cost$ 1 T Sac<1/CARDNAME> | NumCards$ 2 | SubAbility$ SVar=DBTop | SpellDescription$ Draw two cards, then put a card from your hand on top of your library.
-SVar:DBTop:DB$ChangeZone | Origin$ Hand | Destination$ Library | ChangeType$ Card | ChangeNum$ 1
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/conch_horn.jpg
-SetInfo:FEM|Rare|http://magiccards.info/scans/en/fe/168.jpg
+Name:Conch Horn
+ManaCost:2
+Types:Artifact
+Text:no text
+A:AB$Draw | Cost$ 1 T Sac<1/CARDNAME> | NumCards$ 2 | SubAbility$ SVar=DBTop | SpellDescription$ Draw two cards, then put a card from your hand on top of your library.
+SVar:DBTop:DB$ChangeZone | Origin$ Hand | Destination$ Library | ChangeType$ Card | ChangeNum$ 1
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/conch_horn.jpg
+SetInfo:FEM|Rare|http://magiccards.info/scans/en/fe/168.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/condemn.txt b/res/cardsfolder/condemn.txt
index e9e0c437514..31ba77a262a 100644
--- a/res/cardsfolder/condemn.txt
+++ b/res/cardsfolder/condemn.txt
@@ -4,7 +4,6 @@ Types:Instant
 Text:no text
 A:SP$ChangeZone | Cost$ W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put target attacking creature on the bottom of its owner's library. Its controller gains life equal to its toughness. | SubAbility$ GainLifeTgtOwner/dX
 SVar:dX:Count$TgtCardToughness
-SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/condemn.jpg
 SetInfo:M11|Uncommon|http://magiccards.info/scans/en/m11/11.jpg
diff --git a/res/cardsfolder/constant_mists.txt b/res/cardsfolder/constant_mists.txt
index 54dda9e4be2..13615c12eb8 100644
--- a/res/cardsfolder/constant_mists.txt
+++ b/res/cardsfolder/constant_mists.txt
@@ -1,12 +1,11 @@
-Name:Constant Mists
-ManaCost:1 G
-Types:Instant
-Text:no text
-A:SP$ Fog | Cost$ 1 G | SpellDescription$ Prevent all combat damage that would be dealt this turn.
-A:SP$ Fog | Cost$ 1 G Sac<1/Land> | CostDesc$ Buyback | SubAbility$ SVar=DBBuyback | SpellDescription$ - sacrifice a land
-SVar:DBBuyback:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | Defined$ Self
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/constant_mists.jpg
-SetInfo:STH|Uncommon|http://magiccards.info/scans/en/sh/54.jpg
+Name:Constant Mists
+ManaCost:1 G
+Types:Instant
+Text:no text
+A:SP$ Fog | Cost$ 1 G | SpellDescription$ Prevent all combat damage that would be dealt this turn.
+A:SP$ Fog | Cost$ 1 G Sac<1/Land> | CostDesc$ Buyback | SubAbility$ SVar=DBBuyback | SpellDescription$ - sacrifice a land
+SVar:DBBuyback:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | Defined$ Self
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/constant_mists.jpg
+SetInfo:STH|Uncommon|http://magiccards.info/scans/en/sh/54.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/convincing_mirage.txt b/res/cardsfolder/convincing_mirage.txt
index 1f4d3f3c7f7..22fd5642f1f 100644
--- a/res/cardsfolder/convincing_mirage.txt
+++ b/res/cardsfolder/convincing_mirage.txt
@@ -1,7 +1,7 @@
 Name:Convincing Mirage
 ManaCost:1 U
 Types:Enchantment Aura
-Text:As CARDNAME enters the battlefield, choose a basic land type..\r\nEnchanted land is the chosen type.
+Text:As CARDNAME enters the battlefield, choose a basic land type.\r\nEnchanted land is the chosen type.
 K:Enchant land
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/convolute.txt b/res/cardsfolder/convolute.txt
index 6ed24b6e9b8..f1b02373744 100644
--- a/res/cardsfolder/convolute.txt
+++ b/res/cardsfolder/convolute.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Instant
 Text:no text
 A:SP$Counter | Cost$ 2 U | Type$ Spell | UnlessCost$ 4 | SpellDescription$ Counter target spell unless its controller pays 4.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/convolute.jpg
 SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/41.jpg
diff --git a/res/cardsfolder/copper_carapace.txt b/res/cardsfolder/copper_carapace.txt
index cbf61015097..9e06d5f878c 100644
--- a/res/cardsfolder/copper_carapace.txt
+++ b/res/cardsfolder/copper_carapace.txt
@@ -3,7 +3,7 @@ ManaCost:1
 Types:Artifact Equipment
 Text:Equipped creature gets +2/+2 and can't block.
 K:eqPump 3:+2/+2/HIDDEN CARDNAME can't block.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/copper_carapace.jpg
 SetInfo:MBS|Common|http://magiccards.info/scans/en/mbs/102.jpg
diff --git a/res/cardsfolder/coral_helm.txt b/res/cardsfolder/coral_helm.txt
index 46cdaee2822..fc5cc59e40c 100644
--- a/res/cardsfolder/coral_helm.txt
+++ b/res/cardsfolder/coral_helm.txt
@@ -3,10 +3,10 @@ ManaCost:3
 Types:Artifact
 Text:no text
 A:AB$Pump | Cost$ 3 Discard<1/Random> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coral_helm.jpg
 SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/359.jpg
 SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/328.jpg
 SetInfo:ATQ|Rare|http://magiccards.info/scans/en/aq/12.jpg
-End
+End
diff --git a/res/cardsfolder/coretapper.txt b/res/cardsfolder/coretapper.txt
index ebafc21c4b8..e45af73b664 100644
--- a/res/cardsfolder/coretapper.txt
+++ b/res/cardsfolder/coretapper.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:1/1
 A:AB$PutCounter | Cost$ T | ValidTgts$ Artifact | TgtPrompt$ Select target Artifact | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on target artifact.
 A:AB$PutCounter | Cost$ Sac<1/CARDNAME> | ValidTgts$ Artifact | TgtPrompt$ Select target Artifact | CounterType$ CHARGE | CounterNum$ 2 | SpellDescription$ Put two charge counters on target artifact.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coretapper.jpg
 SetInfo:DST|Uncommon|http://magiccards.info/scans/en/ds/107.jpg
diff --git a/res/cardsfolder/corpse_connoisseur.txt b/res/cardsfolder/corpse_connoisseur.txt
index 378e0043cb0..63660bb2a38 100644
--- a/res/cardsfolder/corpse_connoisseur.txt
+++ b/res/cardsfolder/corpse_connoisseur.txt
@@ -1,13 +1,13 @@
-Name:Corpse Connoisseur
-ManaCost:4 B
-Types:Creature Zombie Wizard
-Text:no text
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a creature card and put that card into your graveyard. If you do, shuffle your library.
-SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Graveyard | ChangeType$ Creature | ChangeNum$ 1
-K:Unearth:3 B
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/corpse_connoisseur.jpg
-SetInfo:ALA|Uncommon|http://magiccards.info/scans/en/ala/68.jpg
+Name:Corpse Connoisseur
+ManaCost:4 B
+Types:Creature Zombie Wizard
+Text:no text
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a creature card and put that card into your graveyard. If you do, shuffle your library.
+SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Graveyard | ChangeType$ Creature | ChangeNum$ 1
+K:Unearth:3 B
+SVar:RemRandomDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/corpse_connoisseur.jpg
+SetInfo:ALA|Uncommon|http://magiccards.info/scans/en/ala/68.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/covetous_dragon.txt b/res/cardsfolder/covetous_dragon.txt
index cb2f8256ec3..75241b4c97d 100644
--- a/res/cardsfolder/covetous_dragon.txt
+++ b/res/cardsfolder/covetous_dragon.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:6/5
 K:Flying
 K:When you control no artifacts, sacrifice CARDNAME.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/covetous_dragon.jpg
 SetInfo:UDS|Rare|http://magiccards.info/scans/en/ud/80.jpg
diff --git a/res/cardsfolder/cowardice.txt b/res/cardsfolder/cowardice.txt
index 6db175b406c..b5cc5cc71cc 100644
--- a/res/cardsfolder/cowardice.txt
+++ b/res/cardsfolder/cowardice.txt
@@ -2,7 +2,7 @@ Name:Cowardice
 ManaCost:3 U U
 Types:Enchantment
 Text:Whenever a creature becomes the target of a spell or ability, return that creature to its owner's hand. (It won't be affected by the spell or ability.)
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cowardice.jpg
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/71.jpg
diff --git a/res/cardsfolder/crack_the_earth.txt b/res/cardsfolder/crack_the_earth.txt
index 98ab831356d..ef5dd73e947 100644
--- a/res/cardsfolder/crack_the_earth.txt
+++ b/res/cardsfolder/crack_the_earth.txt
@@ -2,7 +2,7 @@ Name:Crack the Earth
 ManaCost:R
 Types:Sorcery Arcane
 A:SP$Sacrifice | Cost$ R | SacValid$ Permanent | Defined$ Each | SpellDescription$ Each player sacrifices a permanent.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crack_the_earth.jpg
 SetInfo:BOK|Common|http://magiccards.info/scans/en/bok/98.jpg
diff --git a/res/cardsfolder/crackdown.txt b/res/cardsfolder/crackdown.txt
index eb723a80d05..de34f64f82b 100644
--- a/res/cardsfolder/crackdown.txt
+++ b/res/cardsfolder/crackdown.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Enchantment
 Text:Nonwhite creatures with power 3 or greater don't untap during their controllers' untap steps.
 K:Permanents don't untap during their controllers' untap steps:Creature.powerGE3+nonWhite
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crackdown.jpg
 SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/15.jpg
diff --git a/res/cardsfolder/crackling_club.txt b/res/cardsfolder/crackling_club.txt
index 09183d60439..19b8622db2a 100644
--- a/res/cardsfolder/crackling_club.txt
+++ b/res/cardsfolder/crackling_club.txt
@@ -5,7 +5,6 @@ Text:no text
 K:Enchant creature
 K:enPump:+1/+0
 A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SpellDescription$ Crackling Club deals 1 damage to target creature.
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crackling_club.jpg
 SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/93.jpg
diff --git a/res/cardsfolder/cradle_to_grave.txt b/res/cardsfolder/cradle_to_grave.txt
index bbb56ac54c1..2b1a97d9664 100644
--- a/res/cardsfolder/cradle_to_grave.txt
+++ b/res/cardsfolder/cradle_to_grave.txt
@@ -3,8 +3,7 @@ ManaCost:1 B
 Types:Instant
 Text:no text
 A:SP$Destroy | Cost$ 1 B | ValidTgts$ Creature.nonBlack+enteredBattlefieldThisTurn | TgtPrompt$ Select target nonblack creature that entered the battlefield this turn | SpellDescription$ Destroy target nonblack creature that entered the battlefield this turn.
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cradle_to_grave.jpg
 SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/67.jpg
-End
+End
diff --git a/res/cardsfolder/crevasse.txt b/res/cardsfolder/crevasse.txt
index 991e49a4241..364af882c83 100644
--- a/res/cardsfolder/crevasse.txt
+++ b/res/cardsfolder/crevasse.txt
@@ -2,7 +2,7 @@ Name:Crevasse
 ManaCost:2 R
 Types:Enchantment
 Text:Creatures with mountainwalk can be blocked as though they didn't have mountainwalk.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crevasse.jpg
 SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/138.jpg
diff --git a/res/cardsfolder/crimson_manticore.txt b/res/cardsfolder/crimson_manticore.txt
index d48fe290a36..e90ec40b40d 100644
--- a/res/cardsfolder/crimson_manticore.txt
+++ b/res/cardsfolder/crimson_manticore.txt
@@ -5,7 +5,6 @@ Text:no text
 PT:2/2
 K:Flying
 A:AB$DealDamage | Cost$ R T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
-SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crimson_manticore.jpg
 SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/217.jpg
diff --git a/res/cardsfolder/crop_rotation.txt b/res/cardsfolder/crop_rotation.txt
index 2a6e22dfb98..83a52ab1445 100644
--- a/res/cardsfolder/crop_rotation.txt
+++ b/res/cardsfolder/crop_rotation.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Instant
 Text:no text
 A:SP$ChangeZone | Cost$ G Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land | ChangeNum$ 1 | SpellDescription$ Search your library for a land card and put that card onto the battlefield. Then shuffle your library.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crop_rotation.jpg
 SetInfo:ULG|Common|http://magiccards.info/scans/en/ul/98.jpg
diff --git a/res/cardsfolder/crossbow_ambush.txt b/res/cardsfolder/crossbow_ambush.txt
index dc6f6b010ab..6f62af7e44b 100644
--- a/res/cardsfolder/crossbow_ambush.txt
+++ b/res/cardsfolder/crossbow_ambush.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Instant
 Text:no text
 A:SP$PumpAll | Cost$ G | ValidCards$ Creature.YouCtrl | KW$ Reach | SpellDescription$ Creatures you control gain reach until end of turn.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crossbow_ambush.jpg
 SetInfo:STH|Common|http://magiccards.info/scans/en/sh/55.jpg
diff --git a/res/cardsfolder/crossbow_infantry.txt b/res/cardsfolder/crossbow_infantry.txt
index 55a7db98351..6d6cbaafb82 100644
--- a/res/cardsfolder/crossbow_infantry.txt
+++ b/res/cardsfolder/crossbow_infantry.txt
@@ -4,7 +4,6 @@ Types:Creature Human Soldier Archer
 Text:no text
 PT:1/1
 A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crossbow_infantry.jpg
 SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/15.jpg
diff --git a/res/cardsfolder/crosswinds.txt b/res/cardsfolder/crosswinds.txt
index b4464b75e75..a073b729ef4 100644
--- a/res/cardsfolder/crosswinds.txt
+++ b/res/cardsfolder/crosswinds.txt
@@ -4,7 +4,7 @@ Types:Enchantment
 Text:no text
 K:stPumpAll:Creature.withFlying:-2/0/:No Condition:Creatures with flying get -2/-0.
 SVar:PlayMain1:TRUE
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crosswinds.jpg
 SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/246.jpg
diff --git a/res/cardsfolder/crucible_of_fire.txt b/res/cardsfolder/crucible_of_fire.txt
index 959f4eae7fc..e42af2818d3 100644
--- a/res/cardsfolder/crucible_of_fire.txt
+++ b/res/cardsfolder/crucible_of_fire.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Enchantment
 Text:no text
 K:stPumpAll:Creature.Dragon+YouCtrl:3/3:No Condition:Dragon creatures you control get +3/+3.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crucible_of_fire.jpg
diff --git a/res/cardsfolder/crumbling_sanctuary.txt b/res/cardsfolder/crumbling_sanctuary.txt
index f60fffdd82b..7197647e08c 100644
--- a/res/cardsfolder/crumbling_sanctuary.txt
+++ b/res/cardsfolder/crumbling_sanctuary.txt
@@ -2,7 +2,7 @@ Name:Crumbling Sanctuary
 ManaCost:5
 Types:Artifact
 Text:For each 1 damage that would be dealt to a player, that player exiles the top card of his or her library instead.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crumbling_sanctuary.jpg
 SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/292.jpg
diff --git a/res/cardsfolder/crusading_knight.txt b/res/cardsfolder/crusading_knight.txt
index 561011c9862..3ef1cd8657a 100644
--- a/res/cardsfolder/crusading_knight.txt
+++ b/res/cardsfolder/crusading_knight.txt
@@ -6,7 +6,7 @@ PT:2/2
 K:Protection from black
 K:stPumpSelf:Creature:X/X:no Condition:Crusading Knight gets +1/+1 for each Swamp your opponents control.
 SVar:X:Count$Valid Swamp.YouDontCtrl
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crusading_knight.jpg
 SetInfo:INV|Rare|http://magiccards.info/scans/en/in/12.jpg
diff --git a/res/cardsfolder/crystal_chimes.txt b/res/cardsfolder/crystal_chimes.txt
index 9bea548b818..5e07df8a98d 100644
--- a/res/cardsfolder/crystal_chimes.txt
+++ b/res/cardsfolder/crystal_chimes.txt
@@ -1,10 +1,10 @@
-Name:Crystal Chimes
-ManaCost:3
-Types:Artifact
-Text:no text
-A:AB$ChangeZoneAll | Cost$ 3 T Sac<1/CARDNAME> | ChangeType$ Enchantment.YouOwn | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return all enchantment cards from your graveyard to your hand.
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/crystal_chimes.jpg
-SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/292.jpg
+Name:Crystal Chimes
+ManaCost:3
+Types:Artifact
+Text:no text
+A:AB$ChangeZoneAll | Cost$ 3 T Sac<1/CARDNAME> | ChangeType$ Enchantment.YouOwn | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return all enchantment cards from your graveyard to your hand.
+SVar:RemRandomDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/crystal_chimes.jpg
+SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/292.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/crystal_rod.txt b/res/cardsfolder/crystal_rod.txt
index dbc805b8827..0e9332b735b 100644
--- a/res/cardsfolder/crystal_rod.txt
+++ b/res/cardsfolder/crystal_rod.txt
@@ -4,7 +4,7 @@ Types:Artifact
 Text:no text
 T:Mode$ SpellCast | ValidCard$ Card.Blue | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ Whenever a player casts a blue spell, you may pay 1. If you do, you gain 1 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 1 | Defined$ You | LifeAmount$ 1
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crystal_rod.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/295.jpg
diff --git a/res/cardsfolder/curfew.txt b/res/cardsfolder/curfew.txt
index 6bb18585906..cd6c9ef7ccf 100644
--- a/res/cardsfolder/curfew.txt
+++ b/res/cardsfolder/curfew.txt
@@ -1,11 +1,11 @@
-Name:Curfew
-ManaCost:U
-Types:Instant
-Text:no text
-A:SP$ChangeZone | Cost$ U | Origin$ Battlefield | Destination$ Hand | ChangeType$ Creature | ChangeNum$ 1 | Hidden$ True | IsCurse$ True | SubAbility$ SVar=DBChangeZone | SpellDescription$ Each player returns a creature he or she controls to its owner's hand.
-SVar:DBChangeZone:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ Opponent | ChangeType$ Creature | ChangeNum$ 1 | Hidden$ True | IsCurse$ True
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/curfew.jpg
-SetInfo:USG|Common|http://magiccards.info/scans/en/us/68.jpg
+Name:Curfew
+ManaCost:U
+Types:Instant
+Text:no text
+A:SP$ChangeZone | Cost$ U | Origin$ Battlefield | Destination$ Hand | ChangeType$ Creature | ChangeNum$ 1 | Hidden$ True | IsCurse$ True | SubAbility$ SVar=DBChangeZone | SpellDescription$ Each player returns a creature he or she controls to its owner's hand.
+SVar:DBChangeZone:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ Opponent | ChangeType$ Creature | ChangeNum$ 1 | Hidden$ True | IsCurse$ True
+SVar:RemRandomDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/curfew.jpg
+SetInfo:USG|Common|http://magiccards.info/scans/en/us/68.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/curse_of_marit_lage.txt b/res/cardsfolder/curse_of_marit_lage.txt
index 812f0033504..87305ceb2fc 100644
--- a/res/cardsfolder/curse_of_marit_lage.txt
+++ b/res/cardsfolder/curse_of_marit_lage.txt
@@ -1,12 +1,12 @@
-Name:Curse of Marit Lage
-ManaCost:3 R R
-Types:Enchantment
-Text:Islands don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Island
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTapAll | TriggerDescription$ When CARDNAME enters the battlefield, tap all Islands.
-SVar:TrigTapAll:AB$TapAll | Cost$ 0 | ValidCards$ Island
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_marit_lage.jpg
-SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/181.jpg
+Name:Curse of Marit Lage
+ManaCost:3 R R
+Types:Enchantment
+Text:Islands don't untap during their controllers' untap steps.
+K:Permanents don't untap during their controllers' untap steps:Island
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTapAll | TriggerDescription$ When CARDNAME enters the battlefield, tap all Islands.
+SVar:TrigTapAll:AB$TapAll | Cost$ 0 | ValidCards$ Island
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_marit_lage.jpg
+SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/181.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/customs_depot.txt b/res/cardsfolder/customs_depot.txt
index e25ff955eb7..b0e89287600 100755
--- a/res/cardsfolder/customs_depot.txt
+++ b/res/cardsfolder/customs_depot.txt
@@ -5,8 +5,8 @@ Text:no text
 T:Mode$ SpellCast | ValidCard$ Creature.YouCtrl | Execute$ TrigLoot | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a creature spell, you may pay 1. If you do, draw a card, then discard a card.
 SVar:TrigLoot:AB$Draw | Cost$ 1 | NumCards$ 1 | SubAbility$ SVar=DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/customs_depot.jpg
 SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/71.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/cyclical_evolution.txt b/res/cardsfolder/cyclical_evolution.txt
index 0de36b6e4ad..5a4c5506501 100644
--- a/res/cardsfolder/cyclical_evolution.txt
+++ b/res/cardsfolder/cyclical_evolution.txt
@@ -1,13 +1,13 @@
-Name:Cyclical Evolution
-ManaCost:3 G G
-Types:Sorcery
-Text:no text
-K:Suspend:3:2 G
-A:SP$ Pump | Cost$ 3 G G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | SubAbility$ SVar=DBTimeCounters | SpellDescription$ Target creature gets +3/+3 until end of turn. Exile CARDNAME with three time counters on it.
-SVar:DBTimeCounters:DB$PutCounter | Defined$ Self | CounterType$ TIME | CounterNum$ 3 | SubAbility$ SVar=DBExile
-SVar:DBExile:DB$ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Exile
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/cyclical_evolution.jpg
-SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/125.jpg
+Name:Cyclical Evolution
+ManaCost:3 G G
+Types:Sorcery
+Text:no text
+K:Suspend:3:2 G
+A:SP$ Pump | Cost$ 3 G G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | SubAbility$ SVar=DBTimeCounters | SpellDescription$ Target creature gets +3/+3 until end of turn. Exile CARDNAME with three time counters on it.
+SVar:DBTimeCounters:DB$PutCounter | Defined$ Self | CounterType$ TIME | CounterNum$ 3 | SubAbility$ SVar=DBExile
+SVar:DBExile:DB$ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Exile
+SVar:RemRandomDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/cyclical_evolution.jpg
+SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/125.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/form_of_the_dragon.txt b/res/cardsfolder/form_of_the_dragon.txt
index 9a963a8cdf0..ef36f4a97f5 100644
--- a/res/cardsfolder/form_of_the_dragon.txt
+++ b/res/cardsfolder/form_of_the_dragon.txt
@@ -1,15 +1,14 @@
-Name:Form of the Dragon
-ManaCost:4 R R R
-Types:Enchantment
-Text:no text
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 5 damage to target creature or player.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 5
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Each | TriggerZones$ Battlefield | Execute$ TrigLife | TriggerDescription$ At the beginning of each end step, your life total becomes 5.
-SVar:TrigLife:AB$SetLife | Cost$ 0 | Defined$ You | LifeAmount$ 5
-K:stPumpAll:Creature.withoutFlying+YouDontCtrl:0/0/HIDDEN CARDNAME can't attack.:No Condition:Creatures without flying can't attack.
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/form_of_the_dragon.jpg
-SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/93.jpg
-SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/187.jpg
+Name:Form of the Dragon
+ManaCost:4 R R R
+Types:Enchantment
+Text:no text
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 5 damage to target creature or player.
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 5
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Each | TriggerZones$ Battlefield | Execute$ TrigLife | TriggerDescription$ At the beginning of each end step, your life total becomes 5.
+SVar:TrigLife:AB$SetLife | Cost$ 0 | Defined$ You | LifeAmount$ 5
+K:stPumpAll:Creature.withoutFlying+YouDontCtrl:0/0/HIDDEN CARDNAME can't attack.:No Condition:Creatures without flying can't attack you.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/form_of_the_dragon.jpg
+SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/93.jpg
+SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/187.jpg
 End
\ No newline at end of file