Just a thought. Please don't use numbers in the templates, as it's probably going to be hard for folks to use. Once you get these panned out, just move the old template to this one, ie redirect. :) This goes for the Shop Item template as well.