fixed issues with color scheme