diff --git a/forge-core/src/main/java/forge/card/MagicColor.java b/forge-core/src/main/java/forge/card/MagicColor.java
index c21dedeac97..408b00d8080 100644
--- a/forge-core/src/main/java/forge/card/MagicColor.java
+++ b/forge-core/src/main/java/forge/card/MagicColor.java
@@ -139,16 +139,22 @@ public final class MagicColor {
         public static final ImmutableList<String> SNOW_LANDS = ImmutableList.of("Snow-Covered Plains", "Snow-Covered Island", "Snow-Covered Swamp", "Snow-Covered Mountain", "Snow-Covered Forest");
         public static final ImmutableMap<String, String> ANY_COLOR_CONVERSION = new ImmutableMap.Builder<String, String>()
                 .put("ManaColorConversion", "Additive")
-                .put("WhiteConversion", "All")
-                .put("BlueConversion", "All")
-                .put("BlackConversion", "All")
-                .put("RedConversion", "All")
-                .put("GreenConversion", "All")
+                .put("WhiteConversion", "Color")
+                .put("BlueConversion", "Color")
+                .put("BlackConversion", "Color")
+                .put("RedConversion", "Color")
+                .put("GreenConversion", "Color")
+                .put("ColorlessConversion", "Color")
                 .build();
 
         public static final ImmutableMap<String, String> ANY_TYPE_CONVERSION = new ImmutableMap.Builder<String, String>()
-                .putAll(ANY_COLOR_CONVERSION)
-                .put("ColorlessConversion", "All")
+                .put("ManaColorConversion", "Additive")
+                .put("WhiteConversion", "Type")
+                .put("BlueConversion", "Type")
+                .put("BlackConversion", "Type")
+                .put("RedConversion", "Type")
+                .put("GreenConversion", "Type")
+                .put("ColorlessConversion", "Type")
                 .build();
         /**
          * Private constructor to prevent instantiation.
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 f47aa76e15a..c858f2db593 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -1802,9 +1802,12 @@ public class AbilityUtils {
             if (params.containsKey(key)) {
                 String convertTo = params.get(key);
                 byte convertByte = 0;
-                if ("All".equals(convertTo)) {
+                if ("Type".equals(convertTo)) {
                     // IMPORTANT! We need to use Mana Color here not Card Color.
                     convertByte = ManaAtom.ALL_MANA_TYPES;
+                } else if ("Color".equals(convertTo)) {
+                    // IMPORTANT! We need to use Mana Color here not Card Color.
+                    convertByte = ManaAtom.ALL_MANA_COLORS;
                 } else {
                     for (final String convertColor : convertTo.split(",")) {
                         convertByte |= ManaAtom.fromName(convertColor);