creator 2.2, tidy up templates and configs