diff --git a/forge-gui/res/cardsfolder/a/abzan_banner.txt b/forge-gui/res/cardsfolder/a/abzan_banner.txt
index f4b5dcd1142..e74cdbe725e 100644
--- a/forge-gui/res/cardsfolder/a/abzan_banner.txt
+++ b/forge-gui/res/cardsfolder/a/abzan_banner.txt
@@ -5,5 +5,7 @@ A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
 A:AB$ Draw | Cost$ W B G T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:RemRandomDeck:True
+DeckNeeds:Color$White|Black|Green
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abzan_banner.jpg
 Oracle:{T}: Add {W}, {B}, or {G} to your mana pool.\n{W}{B}{G}, {T}, Sacrifice Abzan Banner: Draw a card.
diff --git a/forge-gui/res/cardsfolder/c/chief_of_the_edge.txt b/forge-gui/res/cardsfolder/c/chief_of_the_edge.txt
index 7d9dee3d1f1..53c2609cbc8 100644
--- a/forge-gui/res/cardsfolder/c/chief_of_the_edge.txt
+++ b/forge-gui/res/cardsfolder/c/chief_of_the_edge.txt
@@ -4,5 +4,6 @@ Types:Creature Human Warrior
 PT:3/2
 S:Mode$ Continuous | Affected$ Creature.Warrior+Other+YouCtrl | AddPower$ 1 | Description$ Other Warrior creatures you control get +1/+0.
 SVar:PlayMain1:TRUE
+DeckHints:Type$Warrior
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chief_of_the_edge.jpg
 Oracle:Other Warrior creatures you control get +1/+0.
diff --git a/forge-gui/res/cardsfolder/c/chief_of_the_scale.txt b/forge-gui/res/cardsfolder/c/chief_of_the_scale.txt
index 7fcf1721604..fe3f7ec2429 100644
--- a/forge-gui/res/cardsfolder/c/chief_of_the_scale.txt
+++ b/forge-gui/res/cardsfolder/c/chief_of_the_scale.txt
@@ -4,5 +4,6 @@ Types:Creature Human Warrior
 PT:2/3
 S:Mode$ Continuous | Affected$ Creature.Warrior+Other+YouCtrl | AddToughness$ 1 | Description$ Other Warrior creatures you control get +0/+1.
 SVar:PlayMain1:TRUE
+DeckHints:Type$Warrior
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chief_of_the_scale.jpg
 Oracle:Other Warrior creatures you control get +0/+1.
diff --git a/forge-gui/res/cardsfolder/f/firehoof_cavalry.txt b/forge-gui/res/cardsfolder/f/firehoof_cavalry.txt
index cf955000ee5..bbe97954957 100644
--- a/forge-gui/res/cardsfolder/f/firehoof_cavalry.txt
+++ b/forge-gui/res/cardsfolder/f/firehoof_cavalry.txt
@@ -3,5 +3,7 @@ ManaCost:W
 Types:Creature Human Berserker
 PT:1/1
 A:AB$ Pump | Cost$ 3 R | NumAtt$ +2 | KW$ Trample | SpellDescription$ CARDNAME gets +2/+0 and gains trample until end of turn.
+SVar:RemRandomDeck:True
+DeckNeeds:Color$Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/firehoof_cavalry.jpg
 Oracle:{3}{R}: Firehoof Cavalry gets +2/+0 and gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/j/jeskai_banner.txt b/forge-gui/res/cardsfolder/j/jeskai_banner.txt
index 03b8af56857..8f6ee137428 100644
--- a/forge-gui/res/cardsfolder/j/jeskai_banner.txt
+++ b/forge-gui/res/cardsfolder/j/jeskai_banner.txt
@@ -5,5 +5,7 @@ A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
 A:AB$ Draw | Cost$ U R W T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:RemRandomDeck:True
+DeckNeeds:Color$Blue|Red|White
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jeskai_banner.jpg
 Oracle:{T}: Add {U}, {R}, or {W} to your mana pool.\n{U}{R}{W}, {T}, Sacrifice Jeskai Banner: Draw a card.
diff --git a/forge-gui/res/cardsfolder/m/mardu_banner.txt b/forge-gui/res/cardsfolder/m/mardu_banner.txt
index 062d229b05c..87409391051 100644
--- a/forge-gui/res/cardsfolder/m/mardu_banner.txt
+++ b/forge-gui/res/cardsfolder/m/mardu_banner.txt
@@ -5,5 +5,7 @@ A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
 A:AB$ Draw | Cost$ R W B T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:RemRandomDeck:True
+DeckNeeds:Color$Red|White|Black
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mardu_banner.jpg
 Oracle:{T}: Add {R}, {W}, or {B} to your mana pool.\n{R}{W}{B}, {T}, Sacrifice Mardu Banner: Draw a card.
diff --git a/forge-gui/res/cardsfolder/m/mardu_hateblade.txt b/forge-gui/res/cardsfolder/m/mardu_hateblade.txt
index 94e6e8c4e76..251d6fe2c36 100644
--- a/forge-gui/res/cardsfolder/m/mardu_hateblade.txt
+++ b/forge-gui/res/cardsfolder/m/mardu_hateblade.txt
@@ -3,5 +3,7 @@ ManaCost:W
 Types:Creature Human Warrior
 PT:1/1
 A:AB$ Pump | Cost$ B | KW$ Deathtouch | SpellDescription$ CARDNAME gains deathtouch until end of turn.
+SVar:RemRandomDeck:True
+DeckNeeds:Color$Black
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mardu_hateblade.jpg
 Oracle:{B}: Mardu Hateblade gains deathtouch until end of turn. (Any amount of damage it deals to a creature is enough to destroy it.)
diff --git a/forge-gui/res/cardsfolder/r/rush_of_battle.txt b/forge-gui/res/cardsfolder/r/rush_of_battle.txt
index 2d4c03747fe..13a5ff0e2d6 100644
--- a/forge-gui/res/cardsfolder/r/rush_of_battle.txt
+++ b/forge-gui/res/cardsfolder/r/rush_of_battle.txt
@@ -3,5 +3,7 @@ ManaCost:3 W
 Types:Sorcery
 A:SP$ PumpAll | Cost$ 3 W | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ +1 | SubAbility$ DBPump | SpellDescription$ Creatures you control get +2/+1 until end of turn. Warrior creatures you control gain lifelink until end of turn.
 SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl+Warrior | KW$ Lifelink
+SVar:RemRandomDeck:True
+DeckNeeds:Type$Warrior
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rush_of_battle.jpg
 Oracle:Creatures you control get +2/+1 until end of turn. Warrior creatures you control gain lifelink until end of turn. (Damage dealt by those Warriors also causes their controller to gain that much life.)
diff --git a/forge-gui/res/cardsfolder/s/secret_plans.txt b/forge-gui/res/cardsfolder/s/secret_plans.txt
index d26164db8d0..18c8c23e6b2 100644
--- a/forge-gui/res/cardsfolder/s/secret_plans.txt
+++ b/forge-gui/res/cardsfolder/s/secret_plans.txt
@@ -6,5 +6,6 @@ T:Mode$ TurnFaceUp | ValidCard$ Permanent.YouCtrl | Execute$ TrigDraw | TriggerZ
 SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
+DeckNeeds:Keyword$Morph
 SVar:Picture:http://www.wizards.com/global/images/magic/general/secret_plans.jpg
 Oracle:Face-down creatures you control get +0/+1.\nWhenever a permanent you control is turned face up, draw a card.
diff --git a/forge-gui/res/cardsfolder/s/sultai_banner.txt b/forge-gui/res/cardsfolder/s/sultai_banner.txt
index 1cefaa0bdb6..f2c1aad04c3 100644
--- a/forge-gui/res/cardsfolder/s/sultai_banner.txt
+++ b/forge-gui/res/cardsfolder/s/sultai_banner.txt
@@ -5,5 +5,7 @@ A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
 A:AB$ Draw | Cost$ B G U T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:RemRandomDeck:True
+DeckNeeds:Color$Black|Green|Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sultai_banner.jpg
 Oracle:{T}: Add {B}, {G}, or {U} to your mana pool.\n{B}{G}{U}, {T}, Sacrifice Sultai Banner: Draw a card.
diff --git a/forge-gui/res/cardsfolder/t/temur_banner.txt b/forge-gui/res/cardsfolder/t/temur_banner.txt
index 362d5f259b1..719c73d262a 100644
--- a/forge-gui/res/cardsfolder/t/temur_banner.txt
+++ b/forge-gui/res/cardsfolder/t/temur_banner.txt
@@ -5,5 +5,7 @@ A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
 A:AB$ Draw | Cost$ G U R T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:RemRandomDeck:True
+DeckNeeds:Color$Green|Blue|Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temur_banner.jpg
 Oracle:{T}: Add {G}, {U}, or {R} to your mana pool.\n{G}{U}{R}, {T}, Sacrifice Temur Banner: Draw a card.
diff --git a/forge-gui/res/cardsfolder/t/trail_of_mystery.txt b/forge-gui/res/cardsfolder/t/trail_of_mystery.txt
index cb03562632d..5a7a2247cd6 100644
--- a/forge-gui/res/cardsfolder/t/trail_of_mystery.txt
+++ b/forge-gui/res/cardsfolder/t/trail_of_mystery.txt
@@ -6,5 +6,6 @@ SVar:TrigChange:AB$ ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand |
 T:Mode$ TurnFaceUp | ValidCard$ Permanent.Creature+YouCtrl | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever a permanent you control is turned face up, if it's a creature, it gets +2/+2 until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ TriggeredCard | NumAtt$ +2 | NumDef$ +2 | ConditionDefined$ TriggeredCard | ConditionPresent$ Creature | ConditionCompare$ GE1
 SVar:RemRandomDeck:True
+DeckNeeds:Keyword$Morph
 SVar:Picture:http://www.wizards.com/global/images/magic/general/trail_of_mystery.jpg
 Oracle:Whenever a face-down creature enters the battlefield under your control, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle your library.\nWhenever a permanent you control is turned face up, if it's a creature, it gets +2/+2 until end of turn.