#1923 Change color scheme