Update to HTML5 Base code general