Tidy up colour section, add iTerm-specific colour code