Rework the remaining templates