convert rest of templates into new tag style
Merge branch '4.3' of git://github.com/atk4/atk4 into 4.3