Dumped "xhtml" output type from sample app and introduced a replacement, closes #802