Various fixes, added iterm2 theme.