Color is now part of the input data
Minor changes