New colorscheme and some tweaks