diff --git a/Mage.Sets/src/mage/cards/c/ConsignToDream.java b/Mage.Sets/src/mage/cards/c/ConsignToDream.java
index 43d77bfd38e..0d86a531b5f 100644
--- a/Mage.Sets/src/mage/cards/c/ConsignToDream.java
+++ b/Mage.Sets/src/mage/cards/c/ConsignToDream.java
@@ -28,7 +28,6 @@
 package mage.cards.c;
 
 import java.util.UUID;
-import mage.ObjectColor;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.CardImpl;
@@ -69,8 +68,6 @@ public class ConsignToDream extends CardImpl {
 
 class ConsignToDreamEffect extends OneShotEffect {
 
-    boolean applied = false;
-
     public ConsignToDreamEffect() {
         super(Outcome.ReturnToHand);
         this.staticText = "Return target permanent to its owner's hand. If that permanent is red or green, put it on top of its owner's library instead";
@@ -87,10 +84,10 @@ class ConsignToDreamEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
+        boolean applied = false;
         Permanent target = game.getPermanent(source.getFirstTarget());
         if (target != null) {
-            if (target.getColor(game).contains(ObjectColor.RED)
-                    || target.getColor(game).contains(ObjectColor.GREEN)) {
+            if (target.getColor(game).isRed() || target.getColor(game).isGreen()) {
                 applied = target.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true);
             } else {
                 applied = target.moveToZone(Zone.HAND, source.getSourceId(), game, false);
diff --git a/Mage.Sets/src/mage/cards/c/CrystalRod.java b/Mage.Sets/src/mage/cards/c/CrystalRod.java
index 5c3f96a75aa..46eb132f01c 100644
--- a/Mage.Sets/src/mage/cards/c/CrystalRod.java
+++ b/Mage.Sets/src/mage/cards/c/CrystalRod.java
@@ -28,7 +28,6 @@
 package mage.cards.c;
 
 import java.util.UUID;
-import mage.ObjectColor;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.DoIfCostPaid;
@@ -89,7 +88,7 @@ class CrystalRodAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Spell spell = game.getStack().getSpell(event.getTargetId());
-        return spell != null && spell.getColor(game).contains(ObjectColor.BLUE);
+        return spell != null && spell.getColor(game).isBlue();
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java b/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java
index 2d9664f2869..465fb31098b 100644
--- a/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java
+++ b/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java
@@ -29,7 +29,6 @@ package mage.cards.f;
 
 import java.util.UUID;
 import mage.MageInt;
-import mage.ObjectColor;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
@@ -122,8 +121,7 @@ class FiendslayerPaladinEffect extends ContinuousRuleModifyingEffectImpl {
         Card targetCard = game.getCard(event.getTargetId());
         StackObject stackObject = (StackObject) game.getStack().getStackObject(event.getSourceId());
         if (targetCard != null && stackObject != null && targetCard.getId().equals(source.getSourceId())) {
-            if (stackObject.getColor(game).contains(ObjectColor.BLACK)
-                    || stackObject.getColor(game).contains(ObjectColor.RED)) {
+            if (stackObject.getColor(game).isBlack() || stackObject.getColor(game).isRed()) {
                 if (!stackObject.getControllerId().equals(source.getControllerId())
                         && stackObject.getCardType().contains(CardType.INSTANT)
                         || stackObject.getCardType().contains(CardType.SORCERY)) {
diff --git a/Mage.Sets/src/mage/cards/i/InquisitorsSnare.java b/Mage.Sets/src/mage/cards/i/InquisitorsSnare.java
index 64170f132aa..61475dc57d7 100644
--- a/Mage.Sets/src/mage/cards/i/InquisitorsSnare.java
+++ b/Mage.Sets/src/mage/cards/i/InquisitorsSnare.java
@@ -28,7 +28,6 @@
 package mage.cards.i;
 
 import java.util.UUID;
-import mage.ObjectColor;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect;
@@ -95,8 +94,7 @@ class InquisitorsSnareEffect extends OneShotEffect {
             FilterCreaturePermanent filter = new FilterCreaturePermanent();
             filter.add(new PermanentIdPredicate(targetCreature.getId()));
             game.addEffect(new PreventAllDamageByAllPermanentsEffect(filter, Duration.EndOfTurn, false), source);
-            if (targetCreature.getColor(game).contains(ObjectColor.BLACK)
-                    || targetCreature.getColor(game).contains(ObjectColor.RED)) {
+            if (targetCreature.getColor(game).isBlack() || targetCreature.getColor(game).isRed()) {
                 return targetCreature.destroy(source.getSourceId(), game, false);
             }
         }
diff --git a/Mage.Sets/src/mage/cards/i/IronStar.java b/Mage.Sets/src/mage/cards/i/IronStar.java
index 33962f16401..1be68f6dd40 100644
--- a/Mage.Sets/src/mage/cards/i/IronStar.java
+++ b/Mage.Sets/src/mage/cards/i/IronStar.java
@@ -28,7 +28,6 @@
 package mage.cards.i;
 
 import java.util.UUID;
-import mage.ObjectColor;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.DoIfCostPaid;
@@ -45,7 +44,6 @@ import mage.game.stack.Spell;
 /**
  *
  * @author KholdFuzion
-
  */
 public class IronStar extends CardImpl {
 
@@ -89,7 +87,7 @@ class IronStarAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Spell spell = game.getStack().getSpell(event.getTargetId());
-        return spell != null && spell.getColor(game).contains(ObjectColor.RED);
+        return spell != null && spell.getColor(game).isRed();
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/i/IvoryCup.java b/Mage.Sets/src/mage/cards/i/IvoryCup.java
index b5b5488fad4..079672c67f7 100644
--- a/Mage.Sets/src/mage/cards/i/IvoryCup.java
+++ b/Mage.Sets/src/mage/cards/i/IvoryCup.java
@@ -88,7 +88,7 @@ class IvoryCupAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Spell spell = game.getStack().getSpell(event.getTargetId());
-        return spell != null && spell.getColor(game).contains(ObjectColor.WHITE);
+        return spell != null && spell.getColor(game).isWhite();
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/t/ThroneOfBone.java b/Mage.Sets/src/mage/cards/t/ThroneOfBone.java
index c8e92f0735d..6ca8a8adc8f 100644
--- a/Mage.Sets/src/mage/cards/t/ThroneOfBone.java
+++ b/Mage.Sets/src/mage/cards/t/ThroneOfBone.java
@@ -28,7 +28,6 @@
 package mage.cards.t;
 
 import java.util.UUID;
-import mage.ObjectColor;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.DoIfCostPaid;
@@ -89,7 +88,7 @@ class ThroneOfBoneAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Spell spell = game.getStack().getSpell(event.getTargetId());
-        return spell != null && spell.getColor(game).contains(ObjectColor.BLACK);
+        return spell != null && spell.getColor(game).isBlack();
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/w/WoodenSphere.java b/Mage.Sets/src/mage/cards/w/WoodenSphere.java
index 80326f9f54d..7431c63710f 100644
--- a/Mage.Sets/src/mage/cards/w/WoodenSphere.java
+++ b/Mage.Sets/src/mage/cards/w/WoodenSphere.java
@@ -28,7 +28,6 @@
 package mage.cards.w;
 
 import java.util.UUID;
-import mage.ObjectColor;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.DoIfCostPaid;
@@ -89,7 +88,7 @@ class WoodenSphereAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Spell spell = game.getStack().getSpell(event.getTargetId());
-        return spell != null && spell.getColor(game).contains(ObjectColor.GREEN);
+        return spell != null && spell.getColor(game).isGreen();
     }
 
     @Override