diff --git a/forge-gui/res/cardsfolder/b/balduvian_conjurer.txt b/forge-gui/res/cardsfolder/b/balduvian_conjurer.txt
index 291e3b4c00d..606e0f52988 100644
--- a/forge-gui/res/cardsfolder/b/balduvian_conjurer.txt
+++ b/forge-gui/res/cardsfolder/b/balduvian_conjurer.txt
@@ -3,7 +3,6 @@ ManaCost:1 U
 Types:Creature Human Wizard
 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.
-SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balduvian_conjurer.jpg
 Oracle:{T}: Target snow land becomes a 2/2 creature until end of turn. It's still a land.
diff --git a/forge-gui/res/cardsfolder/b/balduvian_frostwaker.txt b/forge-gui/res/cardsfolder/b/balduvian_frostwaker.txt
index 0fb0c4504ff..0c4549a0bf0 100644
--- a/forge-gui/res/cardsfolder/b/balduvian_frostwaker.txt
+++ b/forge-gui/res/cardsfolder/b/balduvian_frostwaker.txt
@@ -2,8 +2,7 @@ Name:Balduvian Frostwaker
 ManaCost:2 U
 Types:Creature Human Wizard
 PT:1/1
-A:AB$ Animate | Cost$ U T | ValidTgts$ Land.Snow | TgtPrompt$ Select target snow land | Power$ 2 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Blue | 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$ U T | ValidTgts$ Land.Snow | TgtPrompt$ Select target snow land | Power$ 2 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Blue | Keywords$ Flying | Permanent$ True | AILogic$ EOT | SpellDescription$ Target snow land becomes a 2/2 blue Elemental creature with flying. It's still a land.
 SVar:RemRandomDeck:True
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balduvian_frostwaker.jpg
 Oracle:{U}, {T}: Target snow land becomes a 2/2 blue Elemental creature with flying. It's still a land.
diff --git a/forge-gui/res/cardsfolder/b/balduvian_hydra.txt b/forge-gui/res/cardsfolder/b/balduvian_hydra.txt
index 7af362f9ada..b0aae509a9f 100644
--- a/forge-gui/res/cardsfolder/b/balduvian_hydra.txt
+++ b/forge-gui/res/cardsfolder/b/balduvian_hydra.txt
@@ -6,6 +6,6 @@ K:etbCounter:P1P0:X
 A:AB$ PreventDamage | Cost$ SubCounter<1/P1P0> | Defined$ Self | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to CARDNAME this turn.
 A:AB$ PutCounter | Cost$ R R R | CounterType$ P1P0 | CounterNum$ 1 | PlayerTurn$ True | ActivationPhases$ Upkeep | SpellDescription$ Put a +1/+0 counter on CARDNAME. Activate this ability only during your upkeep.
 SVar:X:Count$xPaid
-SVar:RemAIDeck:True
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balduvian_hydra.jpg
 Oracle:Balduvian Hydra enters the battlefield with X +1/+0 counters on it.\nRemove a +1/+0 counter from Balduvian Hydra: Prevent the next 1 damage that would be dealt to Balduvian Hydra this turn.\n{R}{R}{R}: Put a +1/+0 counter on Balduvian Hydra. Activate this ability only during your upkeep.
diff --git a/forge-gui/res/cardsfolder/b/balduvian_trading_post.txt b/forge-gui/res/cardsfolder/b/balduvian_trading_post.txt
index ce60bd66922..083372ae6fd 100644
--- a/forge-gui/res/cardsfolder/b/balduvian_trading_post.txt
+++ b/forge-gui/res/cardsfolder/b/balduvian_trading_post.txt
@@ -4,11 +4,11 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C R | SpellDescription$ Add {C}{R} to your mana pool.
 A:AB$ DealDamage | Cost$ 1 T | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking creature.
 R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ PayBeforeETB | Description$ If CARDNAME would enter the battlefield, sacrifice an untapped Mountain instead. If you do, put CARDNAME onto the battlefield. If you don't, put it into its owner's graveyard.
-SVar:PayBeforeETB:AB$ Sacrifice | Cost$ 0 | SacValid$ Mountain.untapped | Defined$ You | RememberSacrificed$ True | SubAbility$ MoveToGraveyard
-SVar:MoveToGraveyard:DB$ ChangeZone | Origin$ All | Destination$ Graveyard | Defined$ ReplacedCard | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ MoveToBattlefield
-SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | SubAbility$ DBCleanup
+SVar:PayBeforeETB:DB$ Sacrifice | SacValid$ Mountain.untapped | Defined$ You | RememberSacrificed$ True | SubAbility$ MoveToGraveyard
+SVar:MoveToGraveyard:DB$ ChangeZone | Origin$ All | Destination$ Graveyard | Defined$ ReplacedCard | ConditionCheckSVar$ X | References$ X | ConditionSVarCompare$ EQ0 | SubAbility$ MoveToBattlefield
+SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | ConditionCheckSVar$ X | References$ X | ConditionSVarCompare$ EQ1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Mountain.YouCtrl+inZoneBattlefield+untapped
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balduvian_trading_post.jpg
 Oracle:If Balduvian Trading Post would enter the battlefield, sacrifice an untapped Mountain instead. If you do, put Balduvian Trading Post onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {C}{R} to your mana pool.\n{1}, {T}: Balduvian Trading Post deals 1 damage to target attacking creature.
diff --git a/forge-gui/res/cardsfolder/b/battlefield_scrounger.txt b/forge-gui/res/cardsfolder/b/battlefield_scrounger.txt
index 2a50691c742..ef7bc337325 100644
--- a/forge-gui/res/cardsfolder/b/battlefield_scrounger.txt
+++ b/forge-gui/res/cardsfolder/b/battlefield_scrounger.txt
@@ -3,6 +3,5 @@ ManaCost:3 G G
 Types:Creature Centaur
 PT:3/3
 A:AB$ Pump | Cost$ PutCardToLibFromGrave<3/-1/Card> | Activation$ Threshold | ActivationLimit$ 1 | NumAtt$ +3 | NumDef$ +3 | PrecostDesc$ Threshold — | SpellDescription$ CARDNAME gets +3/+3 until end of turn. Activate this ability only once each turn and only if seven or more cards are in your graveyard.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/battlefield_scrounger.jpg
 Oracle:Threshold — Put three cards from your graveyard on the bottom of your library: Battlefield Scrounger gets +3/+3 until end of turn. Activate this ability only once each turn and only if seven or more cards are in your graveyard.
diff --git a/forge-gui/res/cardsfolder/b/benevolent_offering.txt b/forge-gui/res/cardsfolder/b/benevolent_offering.txt
index 031e136ac5b..b15da6e6fde 100644
--- a/forge-gui/res/cardsfolder/b/benevolent_offering.txt
+++ b/forge-gui/res/cardsfolder/b/benevolent_offering.txt
@@ -12,4 +12,4 @@ SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/benevolent_offering.jpg
-Oracle:Choose an opponent. You and that player each create three 1/1 white Spirit creature tokens with flying.\nChoose an opponent. Choose an opponent. You gain 2 life for each creature you control and that player gains 2 life for each creature he or she controls.
+Oracle:Choose an opponent. You and that player each create three 1/1 white Spirit creature tokens with flying.\nChoose an opponent. You gain 2 life for each creature you control and that player gains 2 life for each creature he or she controls.
diff --git a/forge-gui/res/cardsfolder/b/blessings_of_nature.txt b/forge-gui/res/cardsfolder/b/blessings_of_nature.txt
index 51ace1d6b4f..e88427e4325 100644
--- a/forge-gui/res/cardsfolder/b/blessings_of_nature.txt
+++ b/forge-gui/res/cardsfolder/b/blessings_of_nature.txt
@@ -3,6 +3,6 @@ ManaCost:4 G
 Types:Sorcery
 K:Miracle:G
 A:SP$ PutCounter | Cost$ 4 G | ValidTgts$ Creature | TgtPrompt$ Select target creature to distribute counters to | CounterType$ P1P1 | CounterNum$ 4 | TargetMin$ 1 | TargetMax$ 4 | DividedAsYouChoose$ 4 | SpellDescription$ Distribute four +1+1 counters among any number of target creatures.
-SVar:RemAIDeck:True
+#TODO: The AI uses this card well, but it only distributes all counters to a single creature, it seems. Might be improved.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blessings_of_nature.jpg
 Oracle:Distribute four +1/+1 counters among any number of target creatures.\nMiracle {G} (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.)
diff --git a/forge-gui/res/cardsfolder/b/bloodcurdler.txt b/forge-gui/res/cardsfolder/b/bloodcurdler.txt
index 6de4bb38b8c..789919badfe 100644
--- a/forge-gui/res/cardsfolder/b/bloodcurdler.txt
+++ b/forge-gui/res/cardsfolder/b/bloodcurdler.txt
@@ -8,7 +8,6 @@ SVar:CurdledMill:DB$ Mill | Defined$ You | NumCards$ 1
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ EndScream | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME gets +1/+1 and has "At the beginning of your end step, exile two cards from your graveyard."
 SVar:EndScream:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ BloodExile | Secondary$ True | TriggerDescription$ At the beginning of your end step, exile two cards from your graveyard.
 SVar:BloodExile:DB$ ChangeZone | Hidden$ True | Mandatory$ True | ChangeType$ Card.YouCtrl | ChangeNum$ 2 | DefinedPlayer$ You | Origin$ Graveyard | Destination$ Exile
-SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodcurdler.jpg
 Oracle:Flying\nAt the beginning of your upkeep, put the top card of your library into your graveyard.\nThreshold — As long as seven or more cards are in your graveyard, Bloodcurdler gets +1/+1 and has "At the beginning of your end step, exile two cards from your graveyard."
diff --git a/forge-gui/res/cardsfolder/b/bone_mask.txt b/forge-gui/res/cardsfolder/b/bone_mask.txt
index f0ea828ede6..5cd8118324f 100644
--- a/forge-gui/res/cardsfolder/b/bone_mask.txt
+++ b/forge-gui/res/cardsfolder/b/bone_mask.txt
@@ -8,6 +8,5 @@ SVar:ExileFromLibInstead:DB$ Mill | Defined$ You | Destination$ Exile | NumCards
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:X:ReplaceCount$DamageAmount
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bone_mask.jpg
 Oracle:{2}, {T}: The next time a source of your choice would deal damage to you this turn, prevent that damage. Exile cards from the top of your library equal to the damage prevented this way.
diff --git a/forge-gui/res/cardsfolder/b/bramblesnap.txt b/forge-gui/res/cardsfolder/b/bramblesnap.txt
index f009c763523..b0f32c9b71e 100644
--- a/forge-gui/res/cardsfolder/b/bramblesnap.txt
+++ b/forge-gui/res/cardsfolder/b/bramblesnap.txt
@@ -4,6 +4,6 @@ Types:Creature Elemental
 PT:1/1
 K:Trample
 A:AB$ Pump | Cost$ tapXType<1/Creature> | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bramblesnap.jpg
 Oracle:Trample\nTap an untapped creature you control: Bramblesnap gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/b/bribers_purse.txt b/forge-gui/res/cardsfolder/b/bribers_purse.txt
index e590cbbe68f..2256784d580 100644
--- a/forge-gui/res/cardsfolder/b/bribers_purse.txt
+++ b/forge-gui/res/cardsfolder/b/bribers_purse.txt
@@ -4,6 +4,7 @@ Types:Artifact
 K:etbCounter:GEM:X
 SVar:X:Count$xPaid
 A:AB$ Pump | Cost$ 1 T SubCounter<1/GEM> | ValidTgts$ Creature | TgtPrompt$ Select target creature | IsCurse$ True | KW$ HIDDEN CARDNAME can't attack or block. | SpellDescription$ Target creature can't attack or block this turn.
-SVar:RemAIDeck:True
+SVar:NeedsToPlayVar:Z GE4
+SVar:Z:Count$Valid Land.YouCtrl+untapped
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bribers_purse.jpg
 Oracle:Briber's Purse enters the battlefield with X gem counters on it.\n{1}, {T}, Remove a gem counter from Briber's Purse: Target creature can't attack or block this turn.
diff --git a/forge-gui/res/cardsfolder/s/survival_of_the_fittest.txt b/forge-gui/res/cardsfolder/s/survival_of_the_fittest.txt
index 6f0e8982edd..3c4357d5028 100644
--- a/forge-gui/res/cardsfolder/s/survival_of_the_fittest.txt
+++ b/forge-gui/res/cardsfolder/s/survival_of_the_fittest.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Enchantment
 A:AB$ ChangeZone | Cost$ G Discard<1/Creature> | Origin$ Library | Destination$ Hand | ChangeType$ Creature | ChangeNum$ 1 | AILogic$ SurvivalOfTheFittest | SpellDescription$ Search your library for a Creature card and put it into your hand. Then shuffle your library.
 SVar:RemRandomDeck:True
-SVar:AICastPreference:MaxControlled$ 1
+SVar:NonStackingEffect:True
 SVar:AIPreference:DiscardCost$Special:SurvivalOfTheFittest
 SVar:Picture:http://www.wizards.com/global/images/magic/general/survival_of_the_fittest.jpg
 Oracle:{G}, Discard a creature card: Search your library for a creature card, reveal that card, and put it into your hand. Then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/t/treasure_trove.txt b/forge-gui/res/cardsfolder/t/treasure_trove.txt
index 11b2b8d74cc..38afce2b22f 100644
--- a/forge-gui/res/cardsfolder/t/treasure_trove.txt
+++ b/forge-gui/res/cardsfolder/t/treasure_trove.txt
@@ -2,6 +2,6 @@ Name:Treasure Trove
 ManaCost:2 U U
 Types:Enchantment
 A:AB$ Draw | Cost$ 2 U U | NumCards$ 1 | AILogic$ AlwaysAtOppEOT | SpellDescription$ Draw a card.
-SVar:AICastPreference:MaxControlled$ 1
+SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/treasure_trove.jpg
 Oracle:{2}{U}{U}: Draw a card.