Now displaying public colours
Merge branch 'develop'