consistently use xhtml everywhere