Fix templates, make them use project model