Added some more XHTML replacement and relative unit test. Content_type comfigurable.