Added templates and partials overrides