Start using common template

Issue #68
All now use common template

Closes #68