Fixed some bad merging.  Now color is working as expected.