diff --git a/res/cardsfolder/starlight.txt b/res/cardsfolder/starlight.txt
index d2a30fc9844..82c522fc631 100644
--- a/res/cardsfolder/starlight.txt
+++ b/res/cardsfolder/starlight.txt
@@ -2,9 +2,9 @@ Name:Starlight
 ManaCost:1 W
 Types:Sorcery
 Text:no text
-A:SP$GainLife | Cost$ 1 W | LifeAmount$ X | SpellDescription$ You gain 3 life for each black creature target opponent controls.
+A:SP$ GainLife | Cost$ 1 W | LifeAmount$ X | SpellDescription$ You gain 3 life for each black creature target opponent controls.
 SVar:X:Count$BlackTypeOppCtrl.Creature/Times.3
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/starlight.jpg
 SetInfo:POR|Uncommon|http://magiccards.info/scans/en/po/191.jpg
diff --git a/res/cardsfolder/starlit_sanctum.txt b/res/cardsfolder/starlit_sanctum.txt
index 507ecf181fd..556eae44662 100644
--- a/res/cardsfolder/starlit_sanctum.txt
+++ b/res/cardsfolder/starlit_sanctum.txt
@@ -6,7 +6,7 @@ A:AB$ GainLife | Cost$ W T Sac<1/Creature.cleric> | LifeAmount$ X | SpellDescrip
 SVar:X:Sacrificed$CardToughness
 A:AB$ LoseLife | Cost$ B T Sac<1/Creature.cleric> | ValidTgts$ Player | LifeAmount$ X | TgtPrompt$ Select a player | SpellDescription$ Target player loses life equal to the sacrificed creature's power.
 SVar:X:Sacrificed$CardPower
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/starlit_sanctum.jpg
 SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/325.jpg
diff --git a/res/cardsfolder/starstorm.txt b/res/cardsfolder/starstorm.txt
index e36b0a03ee3..cf85cf22f34 100644
--- a/res/cardsfolder/starstorm.txt
+++ b/res/cardsfolder/starstorm.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Cycling:3
 A:SP$ DamageAll | Cost$ X R R | ValidCards$ Creature | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to each creature.
 SVar:X:Count$xPaid
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/starstorm.jpg
 SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/238.jpg
diff --git a/res/cardsfolder/starved_rusalka.txt b/res/cardsfolder/starved_rusalka.txt
index 444959ff1af..97c0d6c6ef8 100644
--- a/res/cardsfolder/starved_rusalka.txt
+++ b/res/cardsfolder/starved_rusalka.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
 Text:no text
 PT:1/1
 A:AB$GainLife | Cost$ G Sac<1/Creature> | LifeAmount$ 1 | SpellDescription$ You gain 1 life.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/starved_rusalka.jpg
 SetInfo:GPT|Uncommon|http://magiccards.info/scans/en/gp/97.jpg
diff --git a/res/cardsfolder/stasis.txt b/res/cardsfolder/stasis.txt
index aa25536dda7..b86b969a85b 100644
--- a/res/cardsfolder/stasis.txt
+++ b/res/cardsfolder/stasis.txt
@@ -3,6 +3,7 @@ ManaCost:1 U
 Types:Enchantment
 Text:Players skip their untap steps.
 K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay U
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stasis.jpg
 SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/81.jpg
diff --git a/res/cardsfolder/statecraft.txt b/res/cardsfolder/statecraft.txt
index 728ebc46bb6..f07f2df8ac1 100644
--- a/res/cardsfolder/statecraft.txt
+++ b/res/cardsfolder/statecraft.txt
@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Enchantment
 Text:no text
 K:stPumpAll:Creature.YouCtrl:0/0/HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME.:No Condition:Prevent all combat damage that would be dealt to and dealt by creatures you control.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/statecraft.jpg
 SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/106.jpg
diff --git a/res/cardsfolder/steamclaw.txt b/res/cardsfolder/steamclaw.txt
index 5ed37e07666..f4e283e5c71 100644
--- a/res/cardsfolder/steamclaw.txt
+++ b/res/cardsfolder/steamclaw.txt
@@ -2,9 +2,9 @@ Name:Steamclaw
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$ChangeZone | Cost$ 3 T | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
-A:AB$ChangeZone | Cost$ 1 Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
-SVar:RemAIDeck:True
+A:AB$ ChangeZone | Cost$ 3 T | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
+A:AB$ ChangeZone | Cost$ 1 Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/steamclaw.jpg
 SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/310.jpg
diff --git a/res/cardsfolder/steelshapers_gift.txt b/res/cardsfolder/steelshapers_gift.txt
index acdd0f700c5..688a8901f4f 100644
--- a/res/cardsfolder/steelshapers_gift.txt
+++ b/res/cardsfolder/steelshapers_gift.txt
@@ -2,8 +2,8 @@ Name:Steelshaper's Gift
 ManaCost:W
 Types:Sorcery
 Text:no text
-A:SP$ChangeZone | Cost$ W | Origin$ Library | Destination$ Hand | ChangeType$ Equipment | ChangeNum$ 1 | SpellDescription$ Search your library for an Equipment card, reveal that card, and put it into your hand. Then shuffle your library.
-SVar:RemAIDeck:True
+A:SP$ ChangeZone | Cost$ W | Origin$ Library | Destination$ Hand | ChangeType$ Equipment | ChangeNum$ 1 | SpellDescription$ Search your library for an Equipment card, reveal that card, and put it into your hand. Then shuffle your library.
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/steelshapers_gift.jpg
 SetInfo:5DN|Uncommon|http://magiccards.info/scans/en/5dn/19.jpg
diff --git a/res/cardsfolder/stench_of_decay.txt b/res/cardsfolder/stench_of_decay.txt
index 3a8289f5c61..9f37dab1552 100644
--- a/res/cardsfolder/stench_of_decay.txt
+++ b/res/cardsfolder/stench_of_decay.txt
@@ -2,9 +2,9 @@ Name:Stench of Decay
 ManaCost:1 B B
 Types:Instant
 Text:no text
-A:SP$PumpAll | Cost$ 1 B B | ValidCards$ Creature.nonArtifact | IsCurse$ True | NumAtt$ -1 | NumDef$ -1 | SpellDescription$ Nonartifact creatures get -1/-1 until end of turn.
+A:SP$ PumpAll | Cost$ 1 B B | ValidCards$ Creature.nonArtifact | IsCurse$ True | NumAtt$ -1 | NumDef$ -1 | SpellDescription$ Nonartifact creatures get -1/-1 until end of turn.
+SVar:RemRandomDeck:True
 SVar:Rarity:Common
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stench_of_decay.jpg
 SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/27.jpg|2
 End
\ No newline at end of file
diff --git a/res/cardsfolder/sterling_grove.txt b/res/cardsfolder/sterling_grove.txt
index 85686d35aab..bb0040fe782 100644
--- a/res/cardsfolder/sterling_grove.txt
+++ b/res/cardsfolder/sterling_grove.txt
@@ -3,8 +3,8 @@ ManaCost:W G
 Types:Enchantment
 Text:no text
 K:stPumpAll:Enchantment.Other+YouCtrl:0/0/Shroud:No Condition:Other enchantments you control have shroud. (They can't be the targets of spells or abilities.)
-A:AB$ChangeZone | Cost$ 1 Sac<1/CARDNAME> | Origin$ Library | Destination$ Library | ChangeType$ Enchantment | ChangeNum$ 1 | SpellDescription$ Search your library for an enchantment card and reveal that card. Shuffle your library, then put the card on top of it.
-SVar:RemAIDeck:True
+A:AB$ ChangeZone | Cost$ 1 Sac<1/CARDNAME> | Origin$ Library | Destination$ Library | ChangeType$ Enchantment | ChangeNum$ 1 | SpellDescription$ Search your library for an enchantment card and reveal that card. Shuffle your library, then put the card on top of it.
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sterling_grove.jpg
 SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/278.jpg