Improved diff colors

(cherry picked from commit b3faf613e277857fa411cccca6cb86d75a966fc9)