templates updated

Updated with templates