More color scheme changes