Fix problem in template generation, add more colors