Color scheme fixes