refactor templates; plus forgot to commit cpf2html.xsl :/