Improved the color scheme