Remove template hyphens and add more templates