updated templates with color