modify colorscheme
Tidy up