colorscheme
fix
merge