More work on color mode.