unfortunately adding all of the color stuff, which was done in master and note on branch...