diff --git a/src/main/java/appeng/coremod/asm/ASMIntegration.java b/src/main/java/appeng/coremod/transformer/IntegrationTransformer.java
similarity index 100%
rename from src/main/java/appeng/coremod/asm/ASMIntegration.java
rename to src/main/java/appeng/coremod/transformer/IntegrationTransformer.java
diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
index f919dcc7..b376755d 100644
--- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
+++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
@@ -27,6 +27,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.lang3.text.WordUtils;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockColored;
 import net.minecraft.block.BlockStainedGlass;
@@ -86,15 +88,13 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
 
 	static
 	{
-
-		for( final AEColor col : AEColor.values() )
+		for( final AEColor color : AEColor.VALID_COLORS )
 		{
-			if( col == AEColor.TRANSPARENT )
-			{
-				continue;
-			}
+			final String dyeName = color.dye.getUnlocalizedName();
+			final String oreDictName = "dye" + WordUtils.capitalize( dyeName );
+			final int oreDictId = OreDictionary.getOreID( oreDictName );
 
-			ORE_TO_COLOR.put( OreDictionary.getOreID( "dye" + col.name() ), col );
+			ORE_TO_COLOR.put( oreDictId, color );
 		}
 	}
 
@@ -277,7 +277,8 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
 					list.add( i );
 				}
 
-				Collections.sort( list, new Comparator<IAEItemStack>(){
+				Collections.sort( list, new Comparator<IAEItemStack>()
+				{
 
 					@Override
 					public int compare( final IAEItemStack a, final IAEItemStack b )