Template updates

To match the new files