I think I will have to use your suggestion to move from a configuration based html5 publishing to a templates based one. I'll let you know