continuing refactoring of the templates
Merge branch 'master' of git@github.com:diverse-project/k3.git