Update the templates, add a bunch more options