Add automatic solarized dumbing-down in OSX terminal, rearrange options a little