diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index b286ac79f22..11bde8d8ca9 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -2849,6 +2849,12 @@ public class AbilityUtils {
             return doXMath(CardUtil.getColorsFromCards(list).countColors(), expr, c, ctb);
         }
 
+        if (sq[0].startsWith("ColorsDefined")) {
+            final String restriction = l[0].substring(14);
+            final CardCollection list = getDefinedCards(c, restriction, ctb);
+            return doXMath(CardUtil.getColorsFromCards(list).countColors(), expr, c, ctb);
+        }
+
         // TODO move below to handlePaid
         if (sq[0].startsWith("SumPower")) {
             final String[] restrictions = l[0].split("_");
diff --git a/forge-gui/res/cardsfolder/upcoming/altar_of_the_wretched_wretched_bonemass.txt b/forge-gui/res/cardsfolder/upcoming/altar_of_the_wretched_wretched_bonemass.txt
index 9345ebc3c63..26812a96bdf 100644
--- a/forge-gui/res/cardsfolder/upcoming/altar_of_the_wretched_wretched_bonemass.txt
+++ b/forge-gui/res/cardsfolder/upcoming/altar_of_the_wretched_wretched_bonemass.txt
@@ -1,7 +1,7 @@
 Name:Altar of the Wretched
 ManaCost:2 B
 Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield,  you may sacrifice a nontoken creature. If you do, draw X cards, then mill X cards, where X is that creature's power.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, you may sacrifice a nontoken creature. If you do, draw X cards, then mill X cards, where X is that creature's power.
 SVar:TrigDraw:AB$ Draw | Cost$ Sac<1/Creature.nonToken/nontoken creature> | NumCards$ Y | SubAbility$ DBMill
 SVar:DBMill:DB$ Mill | NumCards$ Y
 SVar:Y:Sacrificed$CardPower
diff --git a/forge-gui/res/cardsfolder/upcoming/masters_guide_mural_masters_manufactory.txt b/forge-gui/res/cardsfolder/upcoming/masters_guide_mural_masters_manufactory.txt
index fed682682f5..079e3035940 100644
--- a/forge-gui/res/cardsfolder/upcoming/masters_guide_mural_masters_manufactory.txt
+++ b/forge-gui/res/cardsfolder/upcoming/masters_guide_mural_masters_manufactory.txt
@@ -15,5 +15,5 @@ Name:Master's Manufactory
 ManaCost:no cost
 Colors:white,blue
 Types:Artifact
-A:AB$ Token | Cost$ T | TokenScript$ wu_4_4_a_golem | CheckSVar$ Count$ThisTurnEntered_Battlefield_Artifact.YouCtrl | SpellDescription$ Create a 4/4 white and blue Golem artifact creature token. Activate only if CARDNAME or another artifact entered the battlefield under your control this turn.
+A:AB$ Token | Cost$ T | TokenScript$ wu_4_4_a_golem | CheckSVar$ Count$ThisTurnEntered_Battlefield_Card.Self+YouCtrl,Artifact.YouCtrl+Other | SpellDescription$ Create a 4/4 white and blue Golem artifact creature token. Activate only if CARDNAME or another artifact entered the battlefield under your control this turn.
 Oracle:{T}: Create a 4/4 white and blue Golem artifact creature token. Activate only if Master's Manufactory or another artifact entered the battlefield under your control this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/sunbird_standard_sunbird_effigy.txt b/forge-gui/res/cardsfolder/upcoming/sunbird_standard_sunbird_effigy.txt
index fae664836ca..6e4f01682b1 100644
--- a/forge-gui/res/cardsfolder/upcoming/sunbird_standard_sunbird_effigy.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sunbird_standard_sunbird_effigy.txt
@@ -20,6 +20,6 @@ K:Flying
 K:Vigilance
 K:Haste
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of colors among the exiled cards used to craft it.
-SVar:X:ExiledWith$CardNumColors
+SVar:X:Count$ColorsDefined ExiledWith
 A:AB$ Mana | Cost$ T | Produced$ Special EachColorAmongDefined_ExiledWith | SpellDescription$ For each color among the exiled cards used to craft CARDNAME, add one mana of that color.
 Oracle:Flying, vigilance, haste\nSunbird Effigy's power and toughness are each equal to the number of colors among the exiled cards used to craft it.\n{T}: For each color among the exiled cards used to craft Sunbird Effigy, add one mana of that color.