diff --git a/forge-ai/src/main/java/forge/ai/ability/AnimateAi.java b/forge-ai/src/main/java/forge/ai/ability/AnimateAi.java
index af09c54f30a..050f175c431 100644
--- a/forge-ai/src/main/java/forge/ai/ability/AnimateAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/AnimateAi.java
@@ -310,8 +310,9 @@ public class AnimateAi extends SpellAbilityAi {
                 // if its player turn,
                 // check if its Permanent or that creature would attack
                 if (ph.isPlayerTurn(ai)) {
-                    if (!sa.hasParam("Permanent") && 
-                            !ComputerUtilCard.doesSpecifiedCreatureAttackAI(ai, animatedCopy)) {
+                    if (!sa.hasParam("Permanent")
+                            && !ComputerUtilCard.doesSpecifiedCreatureAttackAI(ai, animatedCopy)
+                            && !sa.hasParam("UntilHostLeavesPlay")) {
                         continue;
                     }
                 }
diff --git a/forge-gui/res/cardsfolder/a/abjure.txt b/forge-gui/res/cardsfolder/a/abjure.txt
index dd325ff0797..ce0cfe28f40 100644
--- a/forge-gui/res/cardsfolder/a/abjure.txt
+++ b/forge-gui/res/cardsfolder/a/abjure.txt
@@ -2,6 +2,7 @@ Name:Abjure
 ManaCost:U
 Types:Instant
 A:SP$ Counter | Cost$ U Sac<1/Permanent.Blue/blue permanent> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Permanent.Blue+cmcLE2+YouCtrl
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abjure.jpg
 Oracle:As an additional cost to cast Abjure, sacrifice a blue permanent.\nCounter target spell.
diff --git a/forge-gui/res/cardsfolder/a/accursed_centaur.txt b/forge-gui/res/cardsfolder/a/accursed_centaur.txt
index ec9a2fadcf3..f0ecae58d3f 100644
--- a/forge-gui/res/cardsfolder/a/accursed_centaur.txt
+++ b/forge-gui/res/cardsfolder/a/accursed_centaur.txt
@@ -3,8 +3,7 @@ ManaCost:B
 Types:Creature Zombie Centaur
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice a creature.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ You | SacValid$ Creature
-SVar:RemAIDeck:True
-SVar:NeedsToPlay:Creature.YouCtrl
+SVar:TrigSac:DB$ Sacrifice | Defined$ You | SacValid$ Creature | AILogic$ ExceptSelf
+SVar:NeedsToPlay:Creature.YouCtrl+cmcLE2+powerLE1+toughnessLE2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accursed_centaur.jpg
 Oracle:When Accursed Centaur enters the battlefield, sacrifice a creature.
diff --git a/forge-gui/res/cardsfolder/a/acrobatic_maneuver.txt b/forge-gui/res/cardsfolder/a/acrobatic_maneuver.txt
index e3d980f2b64..43607abaa83 100644
--- a/forge-gui/res/cardsfolder/a/acrobatic_maneuver.txt
+++ b/forge-gui/res/cardsfolder/a/acrobatic_maneuver.txt
@@ -5,6 +5,5 @@ A:SP$ ChangeZone | Cost$ 2 W | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Destination$ Battlefield | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acrobatic_maneuver.jpg
 Oracle:Exile target creature you control, then return that card to the battlefield under its owner's control.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/a/active_volcano.txt b/forge-gui/res/cardsfolder/a/active_volcano.txt
index 1a6710541f3..abffe9b2db5 100644
--- a/forge-gui/res/cardsfolder/a/active_volcano.txt
+++ b/forge-gui/res/cardsfolder/a/active_volcano.txt
@@ -4,7 +4,6 @@ Types:Instant
 A:SP$ Charm | Cost$ R | Choices$ DBDestroy,DBChangeZone
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Permanent.Blue | TgtPrompt$ Select target blue permanent | SpellDescription$ Destroy target blue permanent.
 SVar:DBChangeZone:DB$ ChangeZone | ValidTgts$ Island | TgtPrompt$ Select target Island | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target Island to its owner's hand.
-SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/active_volcano.jpg
 Oracle:Choose one —\n• Destroy target blue permanent.\n• Return target Island to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/a/advice_from_the_fae.txt b/forge-gui/res/cardsfolder/a/advice_from_the_fae.txt
index 2393a125a5d..19b6d3961f4 100644
--- a/forge-gui/res/cardsfolder/a/advice_from_the_fae.txt
+++ b/forge-gui/res/cardsfolder/a/advice_from_the_fae.txt
@@ -5,6 +5,7 @@ A:SP$ Dig | Cost$ 2/U 2/U 2/U | DigNum$ 5 | ChangeNum$ 1 | SubAbility$ Dig2 | Co
 SVar:Dig2:DB$ Dig | DigNum$ 5 | ChangeNum$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ GTY | References$ X,Y
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:Y:PlayerCountOther$HighestValid Creature.YouCtrl
-SVar:RemAIDeck:True
+DeckNeeds:Color$Blue
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advice_from_the_fae.jpg
 Oracle:Look at the top five cards of your library. If you control more creatures than each other player, put two of those cards into your hand. Otherwise, put one of them into your hand. Then put the rest on the bottom of your library in any order.
diff --git a/forge-gui/res/cardsfolder/a/aether_barrier.txt b/forge-gui/res/cardsfolder/a/aether_barrier.txt
index fdc8b2a12b0..b7384ce0ace 100644
--- a/forge-gui/res/cardsfolder/a/aether_barrier.txt
+++ b/forge-gui/res/cardsfolder/a/aether_barrier.txt
@@ -2,7 +2,7 @@ Name:Aether Barrier
 ManaCost:2 U
 Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever a player casts a creature spell, that player sacrifices a permanent unless he or she pays {1}.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | UnlessCost$ 1 | UnlessPayer$ TriggeredActivator | Defined$ TriggeredActivator | SacValid$ Permanent
-SVar:RemAIDeck:True
+SVar:TrigSac:DB$ Sacrifice | UnlessCost$ 1 | UnlessPayer$ TriggeredActivator | Defined$ TriggeredActivator | SacValid$ Permanent
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_barrier.jpg
 Oracle:Whenever a player casts a creature spell, that player sacrifices a permanent unless he or she pays {1}.
diff --git a/forge-gui/res/cardsfolder/a/agadeem_occultist.txt b/forge-gui/res/cardsfolder/a/agadeem_occultist.txt
index 42d25f3d7bd..3262869fda7 100644
--- a/forge-gui/res/cardsfolder/a/agadeem_occultist.txt
+++ b/forge-gui/res/cardsfolder/a/agadeem_occultist.txt
@@ -6,7 +6,6 @@ A:AB$ ChangeZone | Cost$ T | Origin$ Graveyard | Destination$ Battlefield | Gain
 SVar:X:Count$Valid Ally.YouCtrl
 SVar:Y:Targeted$CardManaCost
 SVar:BuffedBy:Ally
-SVar:RemRandomDeck:True
-SVar:RemAIDeck:True
+DeckNeeds:Type$Ally
 SVar:Picture:http://www.wizards.com/global/images/magic/general/agadeem_occultist.jpg
 Oracle:{T}: Put target creature card from an opponent's graveyard onto the battlefield under your control if its converted mana cost is less than or equal to the number of Allies you control.
diff --git a/forge-gui/res/cardsfolder/a/aligned_hedron_network.txt b/forge-gui/res/cardsfolder/a/aligned_hedron_network.txt
index b900a0e2e13..85b5de62696 100644
--- a/forge-gui/res/cardsfolder/a/aligned_hedron_network.txt
+++ b/forge-gui/res/cardsfolder/a/aligned_hedron_network.txt
@@ -2,13 +2,17 @@ Name:Aligned Hedron Network
 ManaCost:4
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile all creatures with power 5 or greater until CARDNAME leaves the battlefield. (Those creatures return under their owners' control.)
-SVar:TrigExile:AB$ ChangeZoneAll | Cost$ 0 | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | ChangeType$ Creature.powerGE5 | ConditionPresent$ Card.Self | SubAbility$ DBEffect
+SVar:TrigExile:DB$ ChangeZoneAll | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | ChangeType$ Creature.powerGE5 | ConditionPresent$ Card.Self | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | Triggers$ ComeBack | RememberObjects$ Remembered | ImprintCards$ Self | SVars$ TrigReturn,ExileSelf | ConditionPresent$ Card.Self | Duration$ Permanent | ForgetOnMoved$ Exile | SubAbility$ DBCleanup
 SVar:ComeBack:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted | Execute$ TrigReturn | TriggerZones$ Command | TriggerController$ TriggeredCardController | Static$ True | TriggerDescription$ Those creatures are exiled until EFFECTSOURCE leaves the battlefield
 SVar:TrigReturn:DB$ ChangeZoneAll | Origin$ Exile | Destination$ Battlefield | ChangeType$ Card.IsRemembered | SubAbility$ ExileSelf
 SVar:ExileSelf:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:PlayMain1:TRUE
-SVar:RemAIDeck:True
+SVar:NeedsToPlayVar:Z GE1
+SVar:Z:SVar$Z1/Minus.Z2
+SVar:Z1:Count$Valid Creature.OppCtrl+powerGE5+inZoneBattlefield
+SVar:Z2:Count$Valid Creature.YouCtrl+powerGE5+inZoneBattlefield
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aligned_hedron_network.jpg
 Oracle:When Aligned Hedron Network enters the battlefield, exile all creatures with power 5 or greater until Aligned Hedron Network leaves the battlefield. (Those creatures return under their owners' control.)
diff --git a/forge-gui/res/cardsfolder/a/altar_golem.txt b/forge-gui/res/cardsfolder/a/altar_golem.txt
index 68e2c9fc293..f44977cb8be 100644
--- a/forge-gui/res/cardsfolder/a/altar_golem.txt
+++ b/forge-gui/res/cardsfolder/a/altar_golem.txt
@@ -8,7 +8,7 @@ S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$
 SVar:X:Count$Valid Creature
 A:AB$ Untap | Cost$ tapXType<5/Creature> | SpellDescription$ Untap CARDNAME.
 SVar:BuffedBy:Creature
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:NoZeroToughnessAI:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/altar_golem.jpg
 Oracle:Trample\nAltar Golem's power and toughness are each equal to the number of creatures on the battlefield.\nAltar Golem doesn't untap during your untap step.\nTap five untapped creatures you control: Untap Altar Golem.
diff --git a/forge-gui/res/cardsfolder/a/altars_reap.txt b/forge-gui/res/cardsfolder/a/altars_reap.txt
index fae3ad1292d..1aa9f60bd74 100644
--- a/forge-gui/res/cardsfolder/a/altars_reap.txt
+++ b/forge-gui/res/cardsfolder/a/altars_reap.txt
@@ -2,6 +2,6 @@ Name:Altar's Reap
 ManaCost:1 B
 Types:Instant
 A:SP$ Draw | Cost$ 1 B Sac<1/Creature> | NumCards$ 2 | SpellDescription$ Draw two cards.
-SVar:RemAIDeck:True
+SVar:AIPreference:SacCost$Creature.token+powerLE2+toughnessLE2,Creature.cmcLE2+powerLE1+toughnessLE2+inZoneBattlefield
 SVar:Picture:http://www.wizards.com/global/images/magic/general/altars_reap.jpg
 Oracle:As an additional cost to cast Altar's Reap, sacrifice a creature.\nDraw two cards.
diff --git a/forge-gui/res/cardsfolder/a/ambush.txt b/forge-gui/res/cardsfolder/a/ambush.txt
index a33d163105f..a61778f44e3 100644
--- a/forge-gui/res/cardsfolder/a/ambush.txt
+++ b/forge-gui/res/cardsfolder/a/ambush.txt
@@ -2,6 +2,5 @@ Name:Ambush
 ManaCost:3 R
 Types:Instant
 A:SP$ PumpAll | Cost$ 3 R | ValidCards$ Creature.blocking | KW$ First Strike | SpellDescription$ Blocking creatures gain first strike until end of turn.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ambush.jpg
 Oracle:Blocking creatures gain first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/ancestral_statue.txt b/forge-gui/res/cardsfolder/a/ancestral_statue.txt
index ff28811aa0a..76dd177848a 100644
--- a/forge-gui/res/cardsfolder/a/ancestral_statue.txt
+++ b/forge-gui/res/cardsfolder/a/ancestral_statue.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact Creature Golem
 PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a nonland permanent you control to its owner's hand.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Permanent.nonLand+YouCtrl
-SVar:RemAIDeck:True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Permanent.nonLand+YouCtrl | AILogic$ NeverBounceItself
+SVar:NeedsToPlay:Creature.YouCtrl+cmcLE3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ancestral_statue.jpg
 Oracle:When Ancestral Statue enters the battlefield, return a nonland permanent you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/a/ancient_stirrings.txt b/forge-gui/res/cardsfolder/a/ancient_stirrings.txt
index db2c7ae0807..cd254203eb3 100644
--- a/forge-gui/res/cardsfolder/a/ancient_stirrings.txt
+++ b/forge-gui/res/cardsfolder/a/ancient_stirrings.txt
@@ -2,6 +2,6 @@ Name:Ancient Stirrings
 ManaCost:G
 Types:Sorcery
 A:SP$ Dig | Cost$ G | DigNum$ 5 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Card.Colorless | SpellDescription$ Look at the top five cards of your library. You may reveal a colorless card from among them and put it into your hand. Then put the rest on the bottom of your library in any order. (Cards with no colored mana in their mana costs are colorless. Lands are also colorless.)
-SVar:RemAIDeck:True
+DeckHints:Color$Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ancient_stirrings.jpg
 Oracle:Look at the top five cards of your library. You may reveal a colorless card from among them and put it into your hand. Then put the rest on the bottom of your library in any order. (Cards with no colored mana in their mana costs are colorless. Lands are also colorless.)
diff --git a/forge-gui/res/cardsfolder/a/animate_land.txt b/forge-gui/res/cardsfolder/a/animate_land.txt
index 9a53f05417d..2f1376cc036 100644
--- a/forge-gui/res/cardsfolder/a/animate_land.txt
+++ b/forge-gui/res/cardsfolder/a/animate_land.txt
@@ -2,6 +2,5 @@ Name:Animate Land
 ManaCost:G
 Types:Instant
 A:SP$ Animate | Cost$ G | ValidTgts$ Land | TgtPrompt$ Select target land | Power$ 3 | Toughness$ 3 | Types$ Creature | SpellDescription$ Until end of turn, target land becomes a 3/3 creature that's still a land.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/animate_land.jpg
 Oracle:Until end of turn, target land becomes a 3/3 creature that's still a land.
diff --git a/forge-gui/res/cardsfolder/a/apocalypse.txt b/forge-gui/res/cardsfolder/a/apocalypse.txt
index 4ae76c4674f..72d316362fb 100644
--- a/forge-gui/res/cardsfolder/a/apocalypse.txt
+++ b/forge-gui/res/cardsfolder/a/apocalypse.txt
@@ -3,6 +3,6 @@ ManaCost:2 R R R
 Types:Sorcery
 A:SP$ ChangeZoneAll | Cost$ 2 R R R | ChangeType$ Permanent | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBDiscard | SpellDescription$ Exile all permanents. You discard your hand.
 SVar:DBDiscard:DB$ Discard | Mode$ Hand
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/apocalypse.jpg
 Oracle:Exile all permanents. You discard your hand.
diff --git a/forge-gui/res/cardsfolder/a/arcbound_reclaimer.txt b/forge-gui/res/cardsfolder/a/arcbound_reclaimer.txt
index e213b99a1f3..db77fbf2728 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_reclaimer.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_reclaimer.txt
@@ -6,6 +6,6 @@ A:AB$ ChangeZone | Cost$ SubCounter<1/P1P1> | TgtPrompt$ Choose target artifact
 K:Modular:2
 DeckHas:Ability$Counters
 SVar:BuffedBy:Artifact
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arcbound_reclaimer.jpg
 Oracle:Remove a +1/+1 counter from Arcbound Reclaimer: Put target artifact card from your graveyard on top of your library.\nModular 2 (This enters the battlefield with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/archmage_ascension.txt b/forge-gui/res/cardsfolder/a/archmage_ascension.txt
index b08ed3e10d4..f368da716be 100644
--- a/forge-gui/res/cardsfolder/a/archmage_ascension.txt
+++ b/forge-gui/res/cardsfolder/a/archmage_ascension.txt
@@ -6,7 +6,7 @@ R:Event$ Draw | ActiveZones$ Battlefield | ValidPlayer$ You | ReplaceWith$ Tutor
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
 SVar:Tutor:AB$ ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ValidCard$ Card.YouOwn
 SVar:X:Count$YouDrewThisTurn
-SVar:RemAIDeck:True
+#TODO: improve AI tutoring logic
 SVar:RemRandomDeck:True
 SVar:MaxQuestEffect:6
 SVar:Picture:http://www.wizards.com/global/images/magic/general/archmage_ascension.jpg
diff --git a/forge-gui/res/cardsfolder/a/argothian_elder.txt b/forge-gui/res/cardsfolder/a/argothian_elder.txt
index 009dcd7384c..2659343e8be 100644
--- a/forge-gui/res/cardsfolder/a/argothian_elder.txt
+++ b/forge-gui/res/cardsfolder/a/argothian_elder.txt
@@ -3,6 +3,5 @@ ManaCost:3 G
 Types:Creature Elf Druid
 PT:2/2
 A:AB$ Untap | Cost$ T | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Untap two target lands.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/argothian_elder.jpg
 Oracle:{T}: Untap two target lands.
diff --git a/forge-gui/res/cardsfolder/a/arnjlots_ascent.txt b/forge-gui/res/cardsfolder/a/arnjlots_ascent.txt
index 78c2bc090fa..18fd0dd3f5a 100644
--- a/forge-gui/res/cardsfolder/a/arnjlots_ascent.txt
+++ b/forge-gui/res/cardsfolder/a/arnjlots_ascent.txt
@@ -4,6 +4,7 @@ Types:Enchantment
 K:Cumulative upkeep:U
 A:AB$ Pump | Cost$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
 SVar:NonStackingEffect:True
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Creature.YouCtrl+withoutFlying
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arnjlots_ascent.jpg
 Oracle:Cumulative upkeep {U} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\n{1}: Target creature gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/avalanche.txt b/forge-gui/res/cardsfolder/a/avalanche.txt
index 1a123d002d4..cb96bc21da1 100644
--- a/forge-gui/res/cardsfolder/a/avalanche.txt
+++ b/forge-gui/res/cardsfolder/a/avalanche.txt
@@ -5,7 +5,6 @@ A:SP$ Destroy | Cost$ X 2 R R | TargetMin$ 0 | TargetMax$ MaxTgts | ValidTgts$ L
 # It may seem wrong to not use X in the target, but since the Targets are what defines X, it's redundant (and not supported by the code)
 SVar:X:Targeted$Amount
 SVar:MaxTgts:Count$Valid Land.Snow
-SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/avalanche.jpg
 Oracle:Destroy X target snow lands.
diff --git a/forge-gui/res/cardsfolder/a/aven_warcraft.txt b/forge-gui/res/cardsfolder/a/aven_warcraft.txt
index 9223593f2c4..78e662f052a 100644
--- a/forge-gui/res/cardsfolder/a/aven_warcraft.txt
+++ b/forge-gui/res/cardsfolder/a/aven_warcraft.txt
@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Instant
 A:SP$ PumpAll | Cost$ 2 W | ValidCards$ Creature.YouCtrl | NumDef$ +2 | SubAbility$ ChooseColor | SpellDescription$ Creatures you control get +0/+2 until end of turn. Threshold — If seven or more cards are in your graveyard, choose a color. Creatures you control also gain protection from the chosen color until end of turn.
 SVar:ChooseColor:DB$ ProtectionAll | Condition$ Threshold | ValidCards$ Creature.YouCtrl | Gains$ Choice | Choices$ AnyColor
-SVar:RemAIDeck:True
+DeckHints:Ability$Graveyard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_warcraft.jpg
 Oracle:Creatures you control get +0/+2 until end of turn.\nThreshold — If seven or more cards are in your graveyard, choose a color. Creatures you control also gain protection from the chosen color until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/avenger_en_dal.txt b/forge-gui/res/cardsfolder/a/avenger_en_dal.txt
index 0d335058819..8079d850874 100644
--- a/forge-gui/res/cardsfolder/a/avenger_en_dal.txt
+++ b/forge-gui/res/cardsfolder/a/avenger_en_dal.txt
@@ -5,6 +5,7 @@ PT:1/1
 A:AB$ ChangeZone | Cost$ 2 W T Discard<1/Card> | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target attacking creature. Its controller gains life equal to its toughness. | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ TargetedController | LifeAmount$ X | References$ X
 SVar:X:TargetedLKI$CardToughness
-SVar:RemAIDeck:True
+SVar:AIPreference:DiscardCost$Card
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/avenger_en_dal.jpg
 Oracle:{2}{W}, {T}, Discard a card: Exile target attacking creature. Its controller gains life equal to its toughness.
diff --git a/forge-gui/res/cardsfolder/a/awakener_druid.txt b/forge-gui/res/cardsfolder/a/awakener_druid.txt
index a35fa587da7..22b8ae39925 100644
--- a/forge-gui/res/cardsfolder/a/awakener_druid.txt
+++ b/forge-gui/res/cardsfolder/a/awakener_druid.txt
@@ -3,7 +3,6 @@ ManaCost:2 G
 Types:Creature Human Druid
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ When CARDNAME enters the battlefield, target Forest becomes a 4/5 green Treefolk creature for as long as CARDNAME is on the battlefield. It's still a land.
-SVar:TrigAnimate:AB$ Animate | Cost$ 0 | ValidTgts$ Forest | TgtPrompt$ Select target Forest | Types$ Creature,Treefolk | Power$ 4 | Toughness$ 5 | Colors$ Green | UntilHostLeavesPlay$ True
-SVar:RemAIDeck:True
+SVar:TrigAnimate:DB$ Animate | ValidTgts$ Forest | TgtPrompt$ Select target Forest | Types$ Creature,Treefolk | Power$ 4 | Toughness$ 5 | Colors$ Green | UntilHostLeavesPlay$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/awakener_druid.jpg
 Oracle:When Awakener Druid enters the battlefield, target Forest becomes a 4/5 green Treefolk creature for as long as Awakener Druid remains on the battlefield. It's still a land.
diff --git a/forge-gui/res/cardsfolder/k/kjeldoran_dead.txt b/forge-gui/res/cardsfolder/k/kjeldoran_dead.txt
index 465590d4e60..5642786d9c1 100644
--- a/forge-gui/res/cardsfolder/k/kjeldoran_dead.txt
+++ b/forge-gui/res/cardsfolder/k/kjeldoran_dead.txt
@@ -5,7 +5,6 @@ PT:3/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice a creature.
 SVar:TrigSac:DB$ Sacrifice | Defined$ You | SacValid$ Creature | AILogic$ ExceptSelf
 A:AB$ Regenerate | Cost$ B | SpellDescription$ Regenerate CARDNAME.
-SVar:RemAIDeck:True
 SVar:NeedsToPlay:Creature.YouCtrl+token+powerLE3+toughnessLE3,Creature.YouCtrl+nonToken+powerLE2+toughnessLE3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kjeldoran_dead.jpg
 Oracle:When Kjeldoran Dead enters the battlefield, sacrifice a creature.\n{B}: Regenerate Kjeldoran Dead.