more vimdiff color changes