Remove the word "Functions" from all template tag categories
Add categories to more template tags.