Aligning template with those from TFS