RC1 back to xhtml