Revise color settings
Merge branch 'color' into mac