Move to html5 / utf8