cleanup and new colorscheme