Update with last app-templates modifications