Fix color inconsistencies