Formatting corrections
Set better diff'ing colours