Support revised header menu markup to valid HTML5 for png.