Added Aliases for Several New Templates
Merge branch 'more-templates'