Added missing template files from last commit