Fix colorscheme conflicts