Rework templates for new design