Improved color scheme