Updated most of the templates for the new color system; also tweaked the hybrid blends a bit for some templates