Version 2 of the template tools for Canvas