rebasing the templates