fix a few more uses, restore templates


git-svn-id: svn://svn.code.sf.net/p/cp2k/code/trunk@14050 bac0169d-1eea-4375-b5f6-f89d2ced9994