Add mode tag to osx funct
file content verification script
Add zsh styles
Fix merge conflict from origin/master