Improve color scheme setting