Revert "Revert "updated template files""

This reverts commit 587d96d612f9fc78b28c200bb56b28bed1a9b600.