Straightened out the colors situation