new colorscheme
merge conflicts