Fix up terminal colours

Vim still seems off
Update color theme.

Latest version fixes some of the issues I Was having