colours are now ambient
colours are now ambient
Merge branch 'colours'