Move shared template properties into ‘Base’ template

* hide ‘Base’ template by removing ‘Concrete’ key from list
Combine two templates into options of a single template