s: formatting of templates changed. This closes #17