Fix for new helm naming convention
Revert diff's faces
Fix for git-gutter