Update all demos to use the xml from the template