diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 1af50662bd9..255fdd911dd 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -1100,7 +1100,7 @@ public class CardFactoryUtil {
         if (sq[0].contains("ColorsCtrl")) {
             final String restriction = l[0].substring(11);
             final String[] rest = restriction.split(",");
-            final CardCollection list = CardLists.getValidCards(cc.getGame().getCardsInGame(), rest, cc, c, null);
+            final CardCollection list = CardLists.getValidCards(cc.getCardsIn(ZoneType.Battlefield), rest, cc, c, null);
             byte n = 0;
             for (final Card card : list) {
                 n |= card.determineColor().getColor();
@@ -1540,15 +1540,6 @@ public class CardFactoryUtil {
             SpellAbility castSA = c.getCastSA();
             return doXMath(castSA == null ? 0 : castSA.getPayingColors().countColors(), m, c);
         }
-        // Count$ColoredCreatures *a DOMAIN for creatures*
-        if (sq[0].contains("ColoredCreatures")) {
-            int mask = 0;
-            CardCollection someCards = CardLists.filter(cc.getCardsIn(ZoneType.Battlefield), Presets.CREATURES);
-            for (final Card crd : someCards) {
-                mask |= CardUtil.getColors(crd).getColor();
-            }
-            return doXMath(ColorSet.fromMask(mask).countColors(), m, c);
-        }
 
         // Count$CardMulticolor.<numMC>.<numNotMC>
         if (sq[0].contains("CardMulticolor")) {
diff --git a/forge-gui/res/cardsfolder/c/chromatic_orrery.txt b/forge-gui/res/cardsfolder/c/chromatic_orrery.txt
index 68f184423fb..d364c3cb044 100755
--- a/forge-gui/res/cardsfolder/c/chromatic_orrery.txt
+++ b/forge-gui/res/cardsfolder/c/chromatic_orrery.txt
@@ -5,5 +5,5 @@ S:Mode$ Continuous | Affected$ You | ManaColorConversion$ Additive | WhiteConver
 SVar:NonStackingEffect:True
 A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 5 | SpellDescription$ Add {C}{C}{C}{C}{C}.
 A:AB$ Draw | Cost$ 5 T | NumCards$ X | References$ X | SpellDescription$ Draw a card for each color among permanents you control.
-SVar:X:Count$ColorsCtrl Permanent.YouCtrl+inZoneBattlefield
+SVar:X:Count$ColorsCtrl Permanent
 Oracle:You may spend mana as though it were mana of any color.\n{T}: Add {C}{C}{C}{C}{C}.\n{5}, {T}: Draw a card for each color among permanents you control.
diff --git a/forge-gui/res/cardsfolder/c/coalition_victory.txt b/forge-gui/res/cardsfolder/c/coalition_victory.txt
index 2e9d71d3316..8b038c972bf 100644
--- a/forge-gui/res/cardsfolder/c/coalition_victory.txt
+++ b/forge-gui/res/cardsfolder/c/coalition_victory.txt
@@ -2,9 +2,8 @@ Name:Coalition Victory
 ManaCost:3 W U B R G
 Types:Sorcery
 A:SP$ WinsGame | Cost$ 3 W U B R G | Defined$ You | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ10 | References$ X,Y,Z | SpellDescription$ You win the game if you control a land of each basic land type and a creature of each color.
-SVar:Z:Count$ColoredCreatures
+SVar:Z:Count$ColorsCtrl Creature
 SVar:Y:Count$Domain
 SVar:X:SVar$Y/Plus.Z
 AI:RemoveDeck:Random
-SVar:Picture:http://www.wizards.com/global/images/magic/general/coalition_victory.jpg
 Oracle:You win the game if you control a land of each basic land type and a creature of each color.
diff --git a/forge-gui/res/cardsfolder/c/conquerors_flail.txt b/forge-gui/res/cardsfolder/c/conquerors_flail.txt
index e1aad141b8c..a7936dda2c6 100644
--- a/forge-gui/res/cardsfolder/c/conquerors_flail.txt
+++ b/forge-gui/res/cardsfolder/c/conquerors_flail.txt
@@ -3,7 +3,6 @@ ManaCost:2
 Types:Artifact Equipment
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ X | AddToughness$ X | References$ X | Description$ Equipped creature gets +1/+1 for each color among permanents you control.
 S:Mode$ CantBeCast | ValidCard$ Card | Condition$ PlayerTurn | Caster$ Opponent | IsPresent$ Card.Self+AttachedTo Creature | Description$ As long as Conqueror's Flail is attached to a creature, your opponents can't cast spells during your turn.
-SVar:X:Count$ColorsCtrl Permanent.YouCtrl+inZoneBattlefield
+SVar:X:Count$ColorsCtrl Permanent
 K:Equip:2
-SVar:Picture:http://www.wizards.com/global/images/magic/general/conquerors_flail.jpg
 Oracle:Equipped creature gets +1/+1 for each color among permanents you control.\nAs long as Conqueror's Flail is attached to a creature, your opponents can't cast spells during your turn.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/f/faeburrow_elder.txt b/forge-gui/res/cardsfolder/f/faeburrow_elder.txt
index 46ee607e76c..3b65c041662 100644
--- a/forge-gui/res/cardsfolder/f/faeburrow_elder.txt
+++ b/forge-gui/res/cardsfolder/f/faeburrow_elder.txt
@@ -4,7 +4,7 @@ Types:Creature Treefolk Druid
 PT:0/0
 K:Vigilance
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ CARDNAME gets +1/+1 for each color among permanents you control.
-SVar:X:Count$ColorsCtrl Permanent.YouCtrl+inZoneBattlefield
+SVar:X:Count$ColorsCtrl Permanent
 A:AB$ Mana | Cost$ T | Produced$ Special EachColorAmong_Permanent.YouCtrl | SpellDescription$ For each color among permanents you control, add one mana of that color.
 AI:RemoveDeck:All
 Oracle:Vigilance\nFaeburrow Elder gets +1/+1 for each color among permanents you control.\n{T}: For each color among permanents you control, add one mana of that color.
diff --git a/forge-gui/res/cardsfolder/h/happily_ever_after.txt b/forge-gui/res/cardsfolder/h/happily_ever_after.txt
index 30b5e69da1b..683fd942c34 100644
--- a/forge-gui/res/cardsfolder/h/happily_ever_after.txt
+++ b/forge-gui/res/cardsfolder/h/happily_ever_after.txt
@@ -6,7 +6,7 @@ SVar:TrigGainLife:DB$ GainLife | Defined$ Player | LifeAmount$ 5 | SubAbility$ D
 SVar:DBDraw:DB$ Draw | Defined$ Player | NumCards$ 1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ Z | SVarCompare$ EQ11 | LifeTotal$ You | LifeAmount$ GEW | References$ X,Y,Z,W | Execute$ TrigWin | TriggerDescription$ At the beginning of your upkeep, if there are five colors among permanents you control, there are six or more card types among permanents you control and/or cards in your graveyard, and your life total is greater than or equal to your starting life total, you win the game.
 SVar:TrigWin:DB$ WinsGame | Defined$ You
-SVar:X:Count$ColorsCtrl Permanent.YouCtrl+inZoneBattlefield/LimitMax.5
+SVar:X:Count$ColorsCtrl Permanent/LimitMax.5
 SVar:Y:Count$CardControllerTypes.Battlefield,Graveyard/LimitMax.6
 SVar:Z:SVar$X/Plus.Y
 SVar:W:Count$YourStartingLife
diff --git a/forge-gui/res/cardsfolder/r/ramos_dragon_engine.txt b/forge-gui/res/cardsfolder/r/ramos_dragon_engine.txt
index 07b0157aee1..4c8af5bad34 100644
--- a/forge-gui/res/cardsfolder/r/ramos_dragon_engine.txt
+++ b/forge-gui/res/cardsfolder/r/ramos_dragon_engine.txt
@@ -5,7 +5,6 @@ PT:4/4
 K:Flying
 T:Mode$ SpellCast | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell, put a +1/+1 counter on CARDNAME for each of that spell's colors.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | References$ X
-SVar:X:TriggeredCard$ColorsCtrl Card.Self
+SVar:X:TriggeredCard$CardNumColors
 A:AB$ Mana | Cost$ SubCounter<5/P1P1> | Produced$ W W U U B B R R G G | ActivationLimit$ 1 | SpellDescription$ Add {W}{W}{U}{U}{B}{B}{R}{R}{G}{G}. Activate this ability only once each turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ramos_dragon_engine.jpg
 Oracle:Flying\nWhenever you cast a spell, put a +1/+1 counter on Ramos, Dragon Engine for each of that spell's colors.\nRemove five +1/+1 counters from Ramos: Add {W}{W}{U}{U}{B}{B}{R}{R}{G}{G}. Activate this ability only once each turn.
diff --git a/forge-gui/res/cardsfolder/s/sisay_weatherlight_captain.txt b/forge-gui/res/cardsfolder/s/sisay_weatherlight_captain.txt
index d92106ac331..fb6bff9ed7d 100644
--- a/forge-gui/res/cardsfolder/s/sisay_weatherlight_captain.txt
+++ b/forge-gui/res/cardsfolder/s/sisay_weatherlight_captain.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Legendary Creature Human Soldier
 PT:2/2
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | References$ X | Description$ CARDNAME gets +1/+1 for each color among other legendary permanents you control.
-SVar:X:Count$ColorsCtrl Permanent.YouCtrl+Other+Legendary+inZoneBattlefield
+SVar:X:Count$ColorsCtrl Permanent.Other+Legendary
 A:AB$ ChangeZone | Cost$ W U B R G | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Legendary+cmcLTY | ChangeNum$ 1 | References$ Y |  SpellDescription$ Search your library for a legendary permanent card with converted mana cost less than NICKNAME's power, put that card onto the battlefield, then shuffle your library.
 SVar:Y:Count$CardPower
 DeckHints:Type$Legendary
diff --git a/forge-gui/res/cardsfolder/s/soul_of_ravnica.txt b/forge-gui/res/cardsfolder/s/soul_of_ravnica.txt
index 8175bcba7fe..5e73aa3d942 100644
--- a/forge-gui/res/cardsfolder/s/soul_of_ravnica.txt
+++ b/forge-gui/res/cardsfolder/s/soul_of_ravnica.txt
@@ -5,7 +5,6 @@ PT:6/6
 K:Flying
 A:AB$ Draw | Cost$ 5 U U | NumCards$ X | References$ X | SpellDescription$ Draw a card for each color among permanents you control.
 A:AB$ Draw | Cost$ 5 U U ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | NumCards$ X | References$ X | SpellDescription$ Draw a card for each color among permanents you control.
-SVar:X:Count$ColorsCtrl Permanent.YouCtrl+inZoneBattlefield
+SVar:X:Count$ColorsCtrl Permanent
 DeckNeeds:Color$White|Red|Green|Black
-SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_ravnica.jpg
 Oracle:Flying\n{5}{U}{U}: Draw a card for each color among permanents you control.\n{5}{U}{U}, Exile Soul of Ravnica from your graveyard: Draw a card for each color among permanents you control.