fix some colorscheme and highlighting problems