HTML->XHTML preparation (still *A LOT* to convert