diff --git a/forge-gui/res/cardsfolder/c/cryptic_annelid.txt b/forge-gui/res/cardsfolder/c/cryptic_annelid.txt
index 1491ff4b546..a8dee5d9f52 100644
--- a/forge-gui/res/cardsfolder/c/cryptic_annelid.txt
+++ b/forge-gui/res/cardsfolder/c/cryptic_annelid.txt
@@ -6,6 +6,5 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefi
 SVar:TrigScry:DB$Scry | ScryNum$ 1 | SubAbility$ DBScry2
 SVar:DBScry2:DB$Scry | ScryNum$ 2 | SubAbility$ DBScry3
 SVar:DBScry3:DB$Scry | ScryNum$ 3
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cryptic_annelid.jpg
 Oracle:When Cryptic Annelid enters the battlefield, scry 1, then scry 2, then scry 3. (To scry X, look at the top X cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.) 
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/dig_through_time.txt b/forge-gui/res/cardsfolder/d/dig_through_time.txt
index c621ce9a94c..6448bcd4f5c 100644
--- a/forge-gui/res/cardsfolder/d/dig_through_time.txt
+++ b/forge-gui/res/cardsfolder/d/dig_through_time.txt
@@ -3,6 +3,5 @@ ManaCost:6 U U
 Types:Instant
 K:Delve
 A:SP$ Dig | Cost$ 6 U U | DigNum$ 7 | ChangeNum$ 2 | SpellDescription$ Look at the top seven cards of your library. Put two of them into your hand and the rest on the bottom of your library in any order.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dig_through_time.jpg
 Oracle:Delve (Each card you exile from your graveyard while casting this spell pays for {1}.)\nLook at the top seven cards of your library. Put two of them into your hand and the rest on the bottom of your library in any order.
diff --git a/forge-gui/res/cardsfolder/f/false_mourning.txt b/forge-gui/res/cardsfolder/f/false_mourning.txt
index ab206d92d6d..9b6e911ca35 100644
--- a/forge-gui/res/cardsfolder/f/false_mourning.txt
+++ b/forge-gui/res/cardsfolder/f/false_mourning.txt
@@ -2,6 +2,5 @@ Name:False Mourning
 ManaCost:G
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ G | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0 | TgtPrompt$ Choose target card in your graveyard | ValidTgts$ Card.YouCtrl | SpellDescription$ Put target card from your graveyard on top of your library.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/false_mourning.jpg
 Oracle:Put target card from your graveyard on top of your library.
diff --git a/forge-gui/res/cardsfolder/f/fatal_frenzy.txt b/forge-gui/res/cardsfolder/f/fatal_frenzy.txt
index 5bbad84db00..cbe51e9b28c 100644
--- a/forge-gui/res/cardsfolder/f/fatal_frenzy.txt
+++ b/forge-gui/res/cardsfolder/f/fatal_frenzy.txt
@@ -1,8 +1,7 @@
 Name:Fatal Frenzy
 ManaCost:2 R
 Types:Instant
-A:SP$ Pump | Cost$ 2 R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | KW$ Trample | References$ X | AtEOT$ Sacrifice | SpellDescription$ Until end of turn, target creature you control gains trample and gets +X/+0, where X is its power. Sacrifice it at the beginning of the next end step.
+A:SP$ Pump | Cost$ 2 R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | KW$ Trample | References$ X | AtEOT$ Sacrifice | AILogic$ Berserk | SpellDescription$ Until end of turn, target creature you control gains trample and gets +X/+0, where X is its power. Sacrifice it at the beginning of the next end step.
 SVar:X:Targeted$CardPower
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fatal_frenzy.jpg
 Oracle:Until end of turn, target creature you control gains trample and gets +X/+0, where X is its power. Sacrifice it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/g/glimpse_the_sun_god.txt b/forge-gui/res/cardsfolder/g/glimpse_the_sun_god.txt
index 6b9c6b95aed..5cb34faaafb 100644
--- a/forge-gui/res/cardsfolder/g/glimpse_the_sun_god.txt
+++ b/forge-gui/res/cardsfolder/g/glimpse_the_sun_god.txt
@@ -5,6 +5,5 @@ A:SP$ Tap | Cost$ X W | ValidTgts$ Creature | TgtPrompt$ Select target creature
 SVar:DBScry:DB$ Scry | ScryNum$ 1
 SVar:X:Targeted$Amount
 SVar:MaxTgts:Count$Valid Creature
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glimpse_the_sun_god.jpg
 Oracle:Tap X target creatures. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
diff --git a/forge-gui/res/cardsfolder/k/kor_haven.txt b/forge-gui/res/cardsfolder/k/kor_haven.txt
index 636f79f7b82..850aee81dc6 100644
--- a/forge-gui/res/cardsfolder/k/kor_haven.txt
+++ b/forge-gui/res/cardsfolder/k/kor_haven.txt
@@ -2,7 +2,7 @@ Name:Kor Haven
 ManaCost:no cost
 Types:Legendary Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Pump | Cost$ 1 W T | KW$ Prevent all combat damage that would be dealt by CARDNAME. | IsCurse$True | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | SpellDescription$ Prevent all combat damage that would be dealt by target attacking creature this turn.
+A:AB$ Pump | Cost$ 1 W T | KW$ Prevent all combat damage that would be dealt by CARDNAME. | IsCurse$ True | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | SpellDescription$ Prevent all combat damage that would be dealt by target attacking creature this turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kor_haven.jpg
 Oracle:{T}: Add {C} to your mana pool.\n{1}{W}, {T}: Prevent all combat damage that would be dealt by target attacking creature this turn.
diff --git a/forge-gui/res/cardsfolder/m/mystic_speculation.txt b/forge-gui/res/cardsfolder/m/mystic_speculation.txt
index 444a84d20a8..1fc8d8aeafd 100644
--- a/forge-gui/res/cardsfolder/m/mystic_speculation.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_speculation.txt
@@ -3,6 +3,5 @@ ManaCost:U
 Types:Sorcery
 A:SP$ Scry | Cost$ U | ScryNum$ 3 | SpellDescription$ Scry 3. (Look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 K:Buyback 2
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mystic_speculation.jpg
 Oracle:Buyback {2} (You may pay an additional {2} as you cast this spell. If you do, put this card into your hand as it resolves.)\nScry 3. (Look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
diff --git a/forge-gui/res/cardsfolder/n/new_benalia.txt b/forge-gui/res/cardsfolder/n/new_benalia.txt
index add1ab47974..f32e7475c3f 100644
--- a/forge-gui/res/cardsfolder/n/new_benalia.txt
+++ b/forge-gui/res/cardsfolder/n/new_benalia.txt
@@ -4,7 +4,6 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
-SVar:TrigScry:AB$Scry | Cost$ 0 | ScryNum$ 1
-SVar:RemAIDeck:True
+SVar:TrigScry:DB$ Scry | ScryNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/new_benalia.jpg
 Oracle:New Benalia enters the battlefield tapped.\nWhen New Benalia enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {W} to your mana pool.
diff --git a/forge-gui/res/cardsfolder/o/opt.txt b/forge-gui/res/cardsfolder/o/opt.txt
index c3e3f6df2d0..9af8fd41704 100644
--- a/forge-gui/res/cardsfolder/o/opt.txt
+++ b/forge-gui/res/cardsfolder/o/opt.txt
@@ -3,6 +3,5 @@ ManaCost:U
 Types:Instant
 A:SP$ Scry | Cost$ U | ScryNum$ 1 | SubAbility$ DBDraw | SpellDescription$ Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opt.jpg
 Oracle:Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/o/oracles_insight.txt b/forge-gui/res/cardsfolder/o/oracles_insight.txt
index 70754f0e7ed..b7a40c0e43f 100644
--- a/forge-gui/res/cardsfolder/o/oracles_insight.txt
+++ b/forge-gui/res/cardsfolder/o/oracles_insight.txt
@@ -7,6 +7,5 @@ S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ ABScry | AddSV
 SVar:ABScry:AB$ Scry | Cost$ T | ScryNum$ 1 | SubAbility$ OraclesInsightDraw | SpellDescription$ Scry 1, then draw a card.
 SVar:OraclesInsightDraw:DB$ Draw | NumCards$ 1
 SVar:NonStackingAttachEffect:True
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oracles_insight.jpg
 Oracle:Enchant creature\nEnchanted creature has "{T}: Scry 1, then draw a card." (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.)
diff --git a/forge-gui/res/cardsfolder/p/preordain.txt b/forge-gui/res/cardsfolder/p/preordain.txt
index 1df052f7b7a..47e31d8fc67 100644
--- a/forge-gui/res/cardsfolder/p/preordain.txt
+++ b/forge-gui/res/cardsfolder/p/preordain.txt
@@ -3,6 +3,5 @@ ManaCost:U
 Types:Sorcery
 A:SP$ Scry | Cost$ U | ScryNum$ 2 | SpellDescription$ Scry 2, then draw a card. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.) | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/preordain.jpg
 Oracle:Scry 2, then draw a card. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
diff --git a/forge-gui/res/cardsfolder/r/roaring_primadox.txt b/forge-gui/res/cardsfolder/r/roaring_primadox.txt
index 15ca28370be..fa3d99e9488 100644
--- a/forge-gui/res/cardsfolder/r/roaring_primadox.txt
+++ b/forge-gui/res/cardsfolder/r/roaring_primadox.txt
@@ -5,5 +5,6 @@ PT:4/4
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ At the beginning of your upkeep, return a creature you control to its owner's hand.
 SVar:TrigBounce:DB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature.YouCtrl | ChangeNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/roaring_primadox.jpg
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:NeedsToPlay:Creature.YouCtrl
 Oracle:At the beginning of your upkeep, return a creature you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/s/serenity.txt b/forge-gui/res/cardsfolder/s/serenity.txt
index 2a5065c30ac..9c5cf450221 100644
--- a/forge-gui/res/cardsfolder/s/serenity.txt
+++ b/forge-gui/res/cardsfolder/s/serenity.txt
@@ -4,6 +4,6 @@ Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDestroyAll | TriggerDescription$ At the beginning of your upkeep, destroy all artifacts and enchantments. They can't be regenerated.
 SVar:TrigDestroyAll:AB$DestroyAll | Cost$ 0 | ValidCards$ Artifact,Enchantment | NoRegen$ True
 SVar:NeedsToPlay:Artifact.YouDontCtrl,Enchantment.YouDontCtrl
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/serenity.jpg
 Oracle:At the beginning of your upkeep, destroy all artifacts and enchantments. They can't be regenerated.
diff --git a/forge-gui/res/cardsfolder/s/shifting_sky.txt b/forge-gui/res/cardsfolder/s/shifting_sky.txt
index c74e9cbad62..ecc59b9dc2a 100644
--- a/forge-gui/res/cardsfolder/s/shifting_sky.txt
+++ b/forge-gui/res/cardsfolder/s/shifting_sky.txt
@@ -2,9 +2,8 @@ Name:Shifting Sky
 ManaCost:2 U
 Types:Enchantment
 K:ETBReplacement:Other:ChooseColor
-SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
+SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentKeywordInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
 S:Mode$ Continuous| Affected$ Permanent.nonLand | SetColor$ ChosenColor | Description$ All nonland permanents are the chosen color.
-SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shifting_sky.jpg
 Oracle:As Shifting Sky enters the battlefield, choose a color.\nAll nonland permanents are the chosen color.
diff --git a/forge-gui/res/cardsfolder/s/stormcaller_of_keranos.txt b/forge-gui/res/cardsfolder/s/stormcaller_of_keranos.txt
index 46437bbbc7a..4a8ac965da8 100644
--- a/forge-gui/res/cardsfolder/s/stormcaller_of_keranos.txt
+++ b/forge-gui/res/cardsfolder/s/stormcaller_of_keranos.txt
@@ -4,6 +4,5 @@ Types:Creature Human Shaman
 PT:2/2
 K:Haste
 A:AB$ Scry | Cost$ 1 U | ScryNum$ 1 | SpellDescription$ Scry 1. (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.)
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stormcaller_of_keranos.jpg
 Oracle:Haste\n{1}{U}: Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
diff --git a/forge-gui/res/cardsfolder/u/ugins_insight.txt b/forge-gui/res/cardsfolder/u/ugins_insight.txt
index 66395d993dc..f9d242b3be1 100644
--- a/forge-gui/res/cardsfolder/u/ugins_insight.txt
+++ b/forge-gui/res/cardsfolder/u/ugins_insight.txt
@@ -4,6 +4,5 @@ Types:Sorcery
 A:SP$ Scry | Cost$ 3 U U | ScryNum$ X | References$ X | SpellDescription$ Scry X, where X is the highest converted mana cost among permanents you control, then draw three cards. | SubAbility$ DBDraw
 SVar:X:Count$MaxCMCYouCtrl
 SVar:DBDraw:DB$Draw | NumCards$ 3
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ugins_insight.jpg
 Oracle:Scry X, where X is the highest converted mana cost among permanents you control, then draw three cards.