Alteration to the template system

I have updated the template system to be more generic when making new
templates