more color refinements for vimdiff