Fix diff colors
Fix FoldColumn
Fix typo on NonText