Updated xml -> html5 conversion