Fixes to the colorscheme