Remove green highlight
Remove commented out values
Add iterm colors
More OSX tweaks