merge color patch from mcowper