diff highlighting update and theme