Add some alternate iterm colors
Remove dup iterm colours
Clean things up