Fixed trailing whitespace
Improved diff colors