Updated html5 generation