changed colorscheme and added non-default colorscheme
Merge branch 'UI'