Bring submodule up to date
Use new templates