Update project templates (WIP)

TBR

Uncontroversial changes in project templates