Merge "Fix color option contrast by updating color mapping (2/2)" into main