Moved to pure HTML5 syntax