Organizing Templates

I LOVE love love this feature.   Would love it if we could make our own categories for the types of features -- or at least if you could expand the options.  

It would also be great if there was a way to organize / reorder the templates that you create so that you can maintain a flow without having to search through your template library.....