More changes to color ro make gvim/vim scheme consistant