Merge branch 't/color_cleanups'