Update templates for Bindle2