Color scheme rework