Switched templates to master