Update colors

All sorts of changes that make tmux and vim happy.