More colorscheme cleanup