added templates
Merge branch 'themeTemplates'