Some changes
Don't highlight magit's diffs
Fix font issues