Fixes to colorscheme