Remove old templates and add new

The old templates from the development version have been removed and
some new ones provided