Added some more XHTML replacement

I hope this is the last ContentNegotiator::xhtml() modification, I'm solving XHTML issue as far as they show up in my project. Now is seems to validate for all af its ~450 pages, so maybe there's no more issue...