Template selector
Merge branch 'features/templates-selector'