[Piwi]: Applied some changes for more compatible with HTML5