Improve color scheme