finished integrating colour support.
Merge branch 'develop' of https://github.com/rgrannell1/arrow into develop