Added xhtml templates