Fixes to the color scheme