Fix templates to work with Git and the new node list