Color master rules!

Check out the changes included to clean up the color directories.