cleaned up colour functions
Merge branch 'hexus'