Build colors upon request, as opposed to up-front.
Merge branch 'develop'