#954 Color scheme update