Refine generator
Make the default color definitions less error prone
Deliver new build