Fix templates, bump version