Correct formatting
Correct the diffing colours