more colours
Merge branch 'ege'