Merge new template mixins