Color scheme-related changes