Finished off the html5 support