Themes: Reunited the small parts of default and second theme to default.xml and second.xml again to have valid XML. This is a bit of a pity because the small parts had a better understandable structure. To generate the overview use: $ xsltproc \ contrib/themes2html.xsl \ doc/conf/themes.xml \ > themes.xhtml To make this work you have to create a symlink in conf to itself: $ (cd doc/conf && ln -s . conf) TODO: We have to introduce a EntityResolver in the server code to make the inclusion independent of the current working dir of the server.