[mallard] Rename pages to .page, XSLT fixed for Yelp

78 files changed, 17 insertions, 137 deletions

diff --git a/doc/mallard/C/details.xml b/doc/mallard/C/details.page
index ac936c0..ac936c0 100644
--- a/doc/mallard/C/details.xml
+++ b/doc/mallard/C/details.page
diff --git a/doc/mallard/C/explore.xml b/doc/mallard/C/explore.page
index 31e8f78..31e8f78 100644
--- a/doc/mallard/C/explore.xml
+++ b/doc/mallard/C/explore.page
diff --git a/doc/mallard/C/i18n.xml b/doc/mallard/C/i18n.page
index 664f645..664f645 100644
--- a/doc/mallard/C/i18n.xml
+++ b/doc/mallard/C/i18n.page
diff --git a/doc/mallard/C/index.xml b/doc/mallard/C/index.page
index 0244a49..0244a49 100644
--- a/doc/mallard/C/index.xml
+++ b/doc/mallard/C/index.page
diff --git a/doc/mallard/C/its.xml b/doc/mallard/C/its.page
index eafd936..eafd936 100644
--- a/doc/mallard/C/its.xml
+++ b/doc/mallard/C/its.page
diff --git a/doc/mallard/C/l10n.xml b/doc/mallard/C/l10n.page
index 9b8c249..9b8c249 100644
--- a/doc/mallard/C/l10n.xml
+++ b/doc/mallard/C/l10n.page
diff --git a/doc/mallard/C/links.xml b/doc/mallard/C/links.page
index 2a27edd..2a27edd 100644
--- a/doc/mallard/C/links.xml
+++ b/doc/mallard/C/links.page
diff --git a/doc/mallard/C/mal_TODO.xml b/doc/mallard/C/mal_TODO.page
index 982f841..982f841 100644
--- a/doc/mallard/C/mal_TODO.xml
+++ b/doc/mallard/C/mal_TODO.page
diff --git a/doc/mallard/C/mal_attr_link.xml b/doc/mallard/C/mal_attr_link.page
index 191f99f..191f99f 100644
--- a/doc/mallard/C/mal_attr_link.xml
+++ b/doc/mallard/C/mal_attr_link.page
diff --git a/doc/mallard/C/mal_block.xml b/doc/mallard/C/mal_block.page
index e64d88e..e64d88e 100644
--- a/doc/mallard/C/mal_block.xml
+++ b/doc/mallard/C/mal_block.page
diff --git a/doc/mallard/C/mal_block_cite.xml b/doc/mallard/C/mal_block_cite.page
index 91c6ef8..91c6ef8 100644
--- a/doc/mallard/C/mal_block_cite.xml
+++ b/doc/mallard/C/mal_block_cite.page
diff --git a/doc/mallard/C/mal_block_code.xml b/doc/mallard/C/mal_block_code.page
index d3e3956..d3e3956 100644
--- a/doc/mallard/C/mal_block_code.xml
+++ b/doc/mallard/C/mal_block_code.page
diff --git a/doc/mallard/C/mal_block_comment.xml b/doc/mallard/C/mal_block_comment.page
index 3ba6ba0..3ba6ba0 100644
--- a/doc/mallard/C/mal_block_comment.xml
+++ b/doc/mallard/C/mal_block_comment.page
diff --git a/doc/mallard/C/mal_block_desc.xml b/doc/mallard/C/mal_block_desc.page
index c321239..c321239 100644
--- a/doc/mallard/C/mal_block_desc.xml
+++ b/doc/mallard/C/mal_block_desc.page
diff --git a/doc/mallard/C/mal_block_example.xml b/doc/mallard/C/mal_block_example.page
index cd79943..cd79943 100644
--- a/doc/mallard/C/mal_block_example.xml
+++ b/doc/mallard/C/mal_block_example.page
diff --git a/doc/mallard/C/mal_block_figure.xml b/doc/mallard/C/mal_block_figure.page
index 18856c1..18856c1 100644
--- a/doc/mallard/C/mal_block_figure.xml
+++ b/doc/mallard/C/mal_block_figure.page
diff --git a/doc/mallard/C/mal_block_list.xml b/doc/mallard/C/mal_block_list.page
index 050f62d..050f62d 100644
--- a/doc/mallard/C/mal_block_list.xml
+++ b/doc/mallard/C/mal_block_list.page
diff --git a/doc/mallard/C/mal_block_listing.xml b/doc/mallard/C/mal_block_listing.page
index 9498255..9498255 100644
--- a/doc/mallard/C/mal_block_listing.xml
+++ b/doc/mallard/C/mal_block_listing.page
diff --git a/doc/mallard/C/mal_block_media.xml b/doc/mallard/C/mal_block_media.page
index f99a5e8..f99a5e8 100644
--- a/doc/mallard/C/mal_block_media.xml
+++ b/doc/mallard/C/mal_block_media.page
diff --git a/doc/mallard/C/mal_block_note.xml b/doc/mallard/C/mal_block_note.page
index 00e0132..00e0132 100644
--- a/doc/mallard/C/mal_block_note.xml
+++ b/doc/mallard/C/mal_block_note.page
diff --git a/doc/mallard/C/mal_block_p.xml b/doc/mallard/C/mal_block_p.page
index 1eba7cd..1eba7cd 100644
--- a/doc/mallard/C/mal_block_p.xml
+++ b/doc/mallard/C/mal_block_p.page
diff --git a/doc/mallard/C/mal_block_quote.xml b/doc/mallard/C/mal_block_quote.page
index 8e6dfc8..8e6dfc8 100644
--- a/doc/mallard/C/mal_block_quote.xml
+++ b/doc/mallard/C/mal_block_quote.page
diff --git a/doc/mallard/C/mal_block_screen.xml b/doc/mallard/C/mal_block_screen.page
index e6413e0..e6413e0 100644
--- a/doc/mallard/C/mal_block_screen.xml
+++ b/doc/mallard/C/mal_block_screen.page
diff --git a/doc/mallard/C/mal_block_steps.xml b/doc/mallard/C/mal_block_steps.page
index f6d13d9..f6d13d9 100644
--- a/doc/mallard/C/mal_block_steps.xml
+++ b/doc/mallard/C/mal_block_steps.page
diff --git a/doc/mallard/C/mal_block_subtitle.xml b/doc/mallard/C/mal_block_subtitle.page
index 0daadf2..0daadf2 100644
--- a/doc/mallard/C/mal_block_subtitle.xml
+++ b/doc/mallard/C/mal_block_subtitle.page
diff --git a/doc/mallard/C/mal_block_synopsis.xml b/doc/mallard/C/mal_block_synopsis.page
index fdb00d8..fdb00d8 100644
--- a/doc/mallard/C/mal_block_synopsis.xml
+++ b/doc/mallard/C/mal_block_synopsis.page
diff --git a/doc/mallard/C/mal_block_terms.xml b/doc/mallard/C/mal_block_terms.page
index 34e8e9f..34e8e9f 100644
--- a/doc/mallard/C/mal_block_terms.xml
+++ b/doc/mallard/C/mal_block_terms.page
diff --git a/doc/mallard/C/mal_block_title.xml b/doc/mallard/C/mal_block_title.page
index 2296809..2296809 100644
--- a/doc/mallard/C/mal_block_title.xml
+++ b/doc/mallard/C/mal_block_title.page
diff --git a/doc/mallard/C/mal_block_tree.xml b/doc/mallard/C/mal_block_tree.page
index 2def2f8..2def2f8 100644
--- a/doc/mallard/C/mal_block_tree.xml
+++ b/doc/mallard/C/mal_block_tree.page
diff --git a/doc/mallard/C/mal_external.xml b/doc/mallard/C/mal_external.page
index d07aa30..d07aa30 100644
--- a/doc/mallard/C/mal_external.xml
+++ b/doc/mallard/C/mal_external.page
diff --git a/doc/mallard/C/mal_info.xml b/doc/mallard/C/mal_info.page
index adb20c4..adb20c4 100644
--- a/doc/mallard/C/mal_info.xml
+++ b/doc/mallard/C/mal_info.page
diff --git a/doc/mallard/C/mal_info_copyright.xml b/doc/mallard/C/mal_info_copyright.page
index 2dd4945..2dd4945 100644
--- a/doc/mallard/C/mal_info_copyright.xml
+++ b/doc/mallard/C/mal_info_copyright.page
diff --git a/doc/mallard/C/mal_info_credit.xml b/doc/mallard/C/mal_info_credit.page
index 7ecebb3..7ecebb3 100644
--- a/doc/mallard/C/mal_info_credit.xml
+++ b/doc/mallard/C/mal_info_credit.page
diff --git a/doc/mallard/C/mal_info_desc.xml b/doc/mallard/C/mal_info_desc.page
index b9030fe..b9030fe 100644
--- a/doc/mallard/C/mal_info_desc.xml
+++ b/doc/mallard/C/mal_info_desc.page
diff --git a/doc/mallard/C/mal_info_license.xml b/doc/mallard/C/mal_info_license.page
index e0c8829..e0c8829 100644
--- a/doc/mallard/C/mal_info_license.xml
+++ b/doc/mallard/C/mal_info_license.page
diff --git a/doc/mallard/C/mal_info_link.xml b/doc/mallard/C/mal_info_link.page
index 40207d0..40207d0 100644
--- a/doc/mallard/C/mal_info_link.xml
+++ b/doc/mallard/C/mal_info_link.page
diff --git a/doc/mallard/C/mal_info_revision.xml b/doc/mallard/C/mal_info_revision.page
index d59563b..d59563b 100644
--- a/doc/mallard/C/mal_info_revision.xml
+++ b/doc/mallard/C/mal_info_revision.page
diff --git a/doc/mallard/C/mal_info_title.xml b/doc/mallard/C/mal_info_title.page
index 3eaffb5..3eaffb5 100644
--- a/doc/mallard/C/mal_info_title.xml
+++ b/doc/mallard/C/mal_info_title.page
diff --git a/doc/mallard/C/mal_inline.xml b/doc/mallard/C/mal_inline.page
index 9963320..9963320 100644
--- a/doc/mallard/C/mal_inline.xml
+++ b/doc/mallard/C/mal_inline.page
diff --git a/doc/mallard/C/mal_inline_app.xml b/doc/mallard/C/mal_inline_app.page
index 22676c4..22676c4 100644
--- a/doc/mallard/C/mal_inline_app.xml
+++ b/doc/mallard/C/mal_inline_app.page
diff --git a/doc/mallard/C/mal_inline_cmd.xml b/doc/mallard/C/mal_inline_cmd.page
index 230728c..230728c 100644
--- a/doc/mallard/C/mal_inline_cmd.xml
+++ b/doc/mallard/C/mal_inline_cmd.page
diff --git a/doc/mallard/C/mal_inline_code.xml b/doc/mallard/C/mal_inline_code.page
index 51d2e13..51d2e13 100644
--- a/doc/mallard/C/mal_inline_code.xml
+++ b/doc/mallard/C/mal_inline_code.page
diff --git a/doc/mallard/C/mal_inline_em.xml b/doc/mallard/C/mal_inline_em.page
index 4a1eacf..4a1eacf 100644
--- a/doc/mallard/C/mal_inline_em.xml
+++ b/doc/mallard/C/mal_inline_em.page
diff --git a/doc/mallard/C/mal_inline_file.xml b/doc/mallard/C/mal_inline_file.page
index 09a451a..09a451a 100644
--- a/doc/mallard/C/mal_inline_file.xml
+++ b/doc/mallard/C/mal_inline_file.page
diff --git a/doc/mallard/C/mal_inline_gui.xml b/doc/mallard/C/mal_inline_gui.page
index 9331b75..9331b75 100644
--- a/doc/mallard/C/mal_inline_gui.xml
+++ b/doc/mallard/C/mal_inline_gui.page
diff --git a/doc/mallard/C/mal_inline_guiseq.xml b/doc/mallard/C/mal_inline_guiseq.page
index 824b390..824b390 100644
--- a/doc/mallard/C/mal_inline_guiseq.xml
+++ b/doc/mallard/C/mal_inline_guiseq.page
diff --git a/doc/mallard/C/mal_inline_input.xml b/doc/mallard/C/mal_inline_input.page
index 50d88c8..50d88c8 100644
--- a/doc/mallard/C/mal_inline_input.xml
+++ b/doc/mallard/C/mal_inline_input.page
diff --git a/doc/mallard/C/mal_inline_key.xml b/doc/mallard/C/mal_inline_key.page
index 70ea08e..70ea08e 100644
--- a/doc/mallard/C/mal_inline_key.xml
+++ b/doc/mallard/C/mal_inline_key.page
diff --git a/doc/mallard/C/mal_inline_keyseq.xml b/doc/mallard/C/mal_inline_keyseq.page
index fd37518..fd37518 100644
--- a/doc/mallard/C/mal_inline_keyseq.xml
+++ b/doc/mallard/C/mal_inline_keyseq.page
diff --git a/doc/mallard/C/mal_inline_link.xml b/doc/mallard/C/mal_inline_link.page
index 1428d23..1428d23 100644
--- a/doc/mallard/C/mal_inline_link.xml
+++ b/doc/mallard/C/mal_inline_link.page
diff --git a/doc/mallard/C/mal_inline_media.xml b/doc/mallard/C/mal_inline_media.page
index 75722df..75722df 100644
--- a/doc/mallard/C/mal_inline_media.xml
+++ b/doc/mallard/C/mal_inline_media.page
diff --git a/doc/mallard/C/mal_inline_output.xml b/doc/mallard/C/mal_inline_output.page
index 2f1d8ad..2f1d8ad 100644
--- a/doc/mallard/C/mal_inline_output.xml
+++ b/doc/mallard/C/mal_inline_output.page
diff --git a/doc/mallard/C/mal_inline_span.xml b/doc/mallard/C/mal_inline_span.page
index bab628c..bab628c 100644
--- a/doc/mallard/C/mal_inline_span.xml
+++ b/doc/mallard/C/mal_inline_span.page
diff --git a/doc/mallard/C/mal_inline_sys.xml b/doc/mallard/C/mal_inline_sys.page
index 70dbbfb..70dbbfb 100644
--- a/doc/mallard/C/mal_inline_sys.xml
+++ b/doc/mallard/C/mal_inline_sys.page
diff --git a/doc/mallard/C/mal_inline_var.xml b/doc/mallard/C/mal_inline_var.page
index ba0d6ca..ba0d6ca 100644
--- a/doc/mallard/C/mal_inline_var.xml
+++ b/doc/mallard/C/mal_inline_var.page
diff --git a/doc/mallard/C/mal_page.xml b/doc/mallard/C/mal_page.page
index e46ba80..e46ba80 100644
--- a/doc/mallard/C/mal_page.xml
+++ b/doc/mallard/C/mal_page.page
diff --git a/doc/mallard/C/mal_section.xml b/doc/mallard/C/mal_section.page
index a0f1424..a0f1424 100644
--- a/doc/mallard/C/mal_section.xml
+++ b/doc/mallard/C/mal_section.page
diff --git a/doc/mallard/C/mal_table.xml b/doc/mallard/C/mal_table.page
index f02980e..f02980e 100644
--- a/doc/mallard/C/mal_table.xml
+++ b/doc/mallard/C/mal_table.page
diff --git a/doc/mallard/C/mal_table_col.xml b/doc/mallard/C/mal_table_col.page
index d40633b..d40633b 100644
--- a/doc/mallard/C/mal_table_col.xml
+++ b/doc/mallard/C/mal_table_col.page
diff --git a/doc/mallard/C/mal_table_td.xml b/doc/mallard/C/mal_table_td.page
index 41ef509..41ef509 100644
--- a/doc/mallard/C/mal_table_td.xml
+++ b/doc/mallard/C/mal_table_td.page
diff --git a/doc/mallard/C/mal_table_tr.xml b/doc/mallard/C/mal_table_tr.page
index b76611a..b76611a 100644
--- a/doc/mallard/C/mal_table_tr.xml
+++ b/doc/mallard/C/mal_table_tr.page
diff --git a/doc/mallard/C/principle-guide.xml b/doc/mallard/C/principle-guide.page
index c1d2d93..c1d2d93 100644
--- a/doc/mallard/C/principle-guide.xml
+++ b/doc/mallard/C/principle-guide.page
diff --git a/doc/mallard/C/principle-justenough.xml b/doc/mallard/C/principle-justenough.page
index 81f7d89..81f7d89 100644
--- a/doc/mallard/C/principle-justenough.xml
+++ b/doc/mallard/C/principle-justenough.page
diff --git a/doc/mallard/C/principle-redundancy.xml b/doc/mallard/C/principle-redundancy.page
index a612b06..a612b06 100644
--- a/doc/mallard/C/principle-redundancy.xml
+++ b/doc/mallard/C/principle-redundancy.page
diff --git a/doc/mallard/C/principles.xml b/doc/mallard/C/principles.page
index d08d4ae..d08d4ae 100644
--- a/doc/mallard/C/principles.xml
+++ b/doc/mallard/C/principles.page
diff --git a/doc/mallard/C/spec.xml b/doc/mallard/C/spec.page
index eb46b3e..eb46b3e 100644
--- a/doc/mallard/C/spec.xml
+++ b/doc/mallard/C/spec.page
diff --git a/doc/mallard/C/tenminutes.xml b/doc/mallard/C/tenminutes.page
index 8bd6aff..8bd6aff 100644
--- a/doc/mallard/C/tenminutes.xml
+++ b/doc/mallard/C/tenminutes.page
diff --git a/sandbox/mallard/html/Makefile b/sandbox/mallard/html/Makefile
index f5921c6..4aff311 100644
--- a/sandbox/mallard/html/Makefile
+++ b/sandbox/mallard/html/Makefile
@@ -1,7 +1,7 @@
 xslts=$(wildcard ../../../xslt/mallard/common/*.xsl) $(wildcard ../../../xslt/mallard/html/*.xsl)
-specs=$(filter-out ../../../doc/mallard/C/legal.xml, $(wildcard ../../../doc/mallard/C/*.xml))
-pages=$(patsubst %.xml,%.html, $(notdir $(specs)))
-xhtmls=$(patsubst %.xml,%.xhtml, $(notdir $(specs)))
+specs=$(wildcard ../../../doc/mallard/C/*.page)
+pages=$(patsubst %.page,%.html, $(notdir $(specs)))
+xhtmls=$(patsubst %.page,%.xhtml, $(notdir $(specs)))
 icons=admon-bug.png admon-caution.png admon-important.png admon-note.png admon-tip.png admon-warning.png
 marks=watermark-blockquote-201C.png watermark-code.png
 
@@ -23,7 +23,7 @@ $(marks):
 	ln -sf ../../../data/watermarks/$@ $@
 
 $(pages) : mallard.cache $(xslts)
-$(pages) : %.html : ../../../doc/mallard/C/%.xml
+$(pages) : %.html : ../../../doc/mallard/C/%.page
 	xsltproc \
 	  --stringparam mal.cache.file `pwd`/mallard.cache \
 	  --stringparam theme.icon.admon.path '' \
@@ -33,7 +33,7 @@ $(pages) : %.html : ../../../doc/mallard/C/%.xml
 	  ../../../xslt/mallard/html/mal2html.xsl $<
 
 $(xhtmls) : mallard.cache $(xslts)
-$(xhtmls) : %.xhtml : ../../../doc/mallard/C/%.xml
+$(xhtmls) : %.xhtml : ../../../doc/mallard/C/%.page
 	xsltproc \
 	  --stringparam mal.cache.file `pwd`/mallard.cache \
 	  --stringparam theme.icon.admon.path '' \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4053179..04ea4c3 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,7 +10,7 @@ bin_SCRIPTS = gnome-doc-prepare gnome-doc-tool
 
 endif
 
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = gnome-doc-utils.pc
 
 EXTRA_DIST =			\
diff --git a/xslt/Makefile.am b/xslt/Makefile.am
index 328783f..d9466fd 100644
--- a/xslt/Makefile.am
+++ b/xslt/Makefile.am
@@ -1 +1 @@
-SUBDIRS = gettext docbook common # gettext needs to be first
+SUBDIRS = gettext docbook mallard common # gettext needs to be first
diff --git a/xslt/common/Makefile.am b/xslt/common/Makefile.am
index cd17dd8..0414184 100644
--- a/xslt/common/Makefile.am
+++ b/xslt/common/Makefile.am
@@ -1,6 +1,6 @@
 xsldir=$(datadir)/xml/gnome/xslt/common
 
-xsl_DATA = theme.xsl
+xsl_DATA = theme.xsl utils.xsl
 
 EXTRA_DIST=$(xsl_DATA)
 
diff --git a/xslt/mallard/html/util.xsl b/xslt/common/utils.xsl
index 2816d06..55315d5 100644
--- a/xslt/mallard/html/util.xsl
+++ b/xslt/common/utils.xsl
@@ -27,7 +27,7 @@ REMARK: Describe this module
 
 
 <!--**==========================================================================
-util.strip_newlines
+utils.strip_newlines
 Strips leading or trailing newlines from a string
 $string: The string to strip newlines from
 $leading: Whether to strip leading newlines
@@ -37,7 +37,7 @@ This template strips at most one leading and one trailing newline from
 ${string}.  This is useful for preformatted block elements where leading and
 trailing newlines are ignored to make source formatting easier for authors.
 -->
-<xsl:template name="util.strip_newlines">
+<xsl:template name="utils.strip_newlines">
   <xsl:param name="string"/>
   <xsl:param name="leading" select="false()"/>
   <xsl:param name="trailing" select="false()"/>
@@ -55,7 +55,7 @@ trailing newlines are ignored to make source formatting easier for authors.
       </xsl:variable>
       <xsl:choose>
         <xsl:when test="$trailing">
-          <xsl:call-template name="util.strip_newlines">
+          <xsl:call-template name="utils.strip_newlines">
             <xsl:with-param name="string" select="$new"/>
             <xsl:with-param name="leading" select="false()"/>
             <xsl:with-param name="trailing" select="true()"/>
diff --git a/xslt/mallard/html/Makefile.am b/xslt/mallard/html/Makefile.am
index 23b1346..2ac76a7 100644
--- a/xslt/mallard/html/Makefile.am
+++ b/xslt/mallard/html/Makefile.am
@@ -8,6 +8,7 @@ xsl_DATA =				\
 	mal2html-media.xsl		\
 	mal2html-page.xsl		\
 	mal2html-table.xsl		\
-	mal2html.xsl
+	mal2html.xsl			\
+	mal2xhtml.xsl
 
 EXTRA_DIST=$(xsl_DATA)
diff --git a/xslt/mallard/html/mal2html-block.xsl b/xslt/mallard/html/mal2html-block.xsl
index e64825f..49c39fe 100644
--- a/xslt/mallard/html/mal2html-block.xsl
+++ b/xslt/mallard/html/mal2html-block.xsl
@@ -181,7 +181,7 @@ FIXME
       </xsl:if>
     </xsl:attribute>
     <xsl:if test="$first">
-      <xsl:call-template name="util.strip_newlines">
+      <xsl:call-template name="utils.strip_newlines">
         <xsl:with-param name="string" select="$first"/>
         <xsl:with-param name="leading" select="true()"/>
         <xsl:with-param name="trailing" select="count(node()) = 1"/>
@@ -190,7 +190,7 @@ FIXME
     <xsl:apply-templates mode="mal2html.inline.mode"
                          select="node()[not(self::text() and (position() = 1 or position() = last()))]"/>
     <xsl:if test="$last and (count(node()) != 1)">
-      <xsl:call-template name="util.strip_newlines">
+      <xsl:call-template name="utils.strip_newlines">
         <xsl:with-param name="string" select="$last"/>
         <xsl:with-param name="leading" select="false()"/>
         <xsl:with-param name="trailing" select="true()"/>
diff --git a/xslt/mallard/html/mal2html.xsl b/xslt/mallard/html/mal2html.xsl
index 6a4e5de..7952520 100644
--- a/xslt/mallard/html/mal2html.xsl
+++ b/xslt/mallard/html/mal2html.xsl
@@ -59,7 +59,7 @@ REMARK: Describe this module
 <xsl:include href="mal2html-table.xsl"/>
 
 <xsl:include href="../../common/theme.xsl"/>
-<xsl:include href="util.xsl"/>
+<xsl:include href="../../common/utils.xsl"/>
 
 <!-- FIXME -->
 <xsl:template match="*">
diff --git a/xslt/mallard/html/mal2xhtml.xsl b/xslt/mallard/html/mal2xhtml.xsl
index 2f556e7..4cca1b7 100644
--- a/xslt/mallard/html/mal2xhtml.xsl
+++ b/xslt/mallard/html/mal2xhtml.xsl
@@ -58,7 +58,7 @@ REMARK: Describe this module
 <xsl:include href="mal2html-table.xsl"/>
 
 <xsl:include href="../../common/theme.xsl"/>
-<xsl:include href="util.xsl"/>
+<xsl:include href="../../common/utils.xsl"/>
 
 <!-- FIXME -->
 <xsl:template match="*">
diff --git a/xslt/mallard/html/theme.xml b/xslt/mallard/html/theme.xml
deleted file mode 100644
index 355857f..0000000
--- a/xslt/mallard/html/theme.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><!-- -*- indent-tabs-mode: nil -*- -->
-<theme xmlns="http://www.gnome.org/~shaunm/gnome-doc-utils/theme">
-
-  <color id="background"    value="#ffffff"/>
-  <color id="link"          value="#1f609f"/>
-  <color id="link-visited"  value="#9f1f6f"/>
-  <color id="text"          value="#000000"/>
-  <color id="text-light"    value="#3f3f3f"/>
-
-  <color id="blue-background"   value="#f0f9ff"/>
-  <color id="blue-border"       value="#c0c9ff"/>
-  <color id="gray-background"   value="#f9f9f6"/>
-  <color id="gray-border"       value="#e0e0df"/>
-  <color id="red-background"    value="#fff0f0"/>
-  <color id="red-border"        value="#ffc0c0"/>
-  <color id="yellow-background" value="#fffff0"/>
-  <color id="yellow-border"     value="#ffffc0"/>
-
-
-  <!-- notes/admonitions -->
-  <icon id="bug"       width="48" height="48" src=""/>
-  <icon id="caution"   width="48" height="48" src=""/>
-  <icon id="important" width="48" height="48" src=""/>
-  <icon id="note"      width="48" height="48" src=""/>
-  <icon id="tip"       width="48" height="48" src=""/>
-  <icon id="warning"   width="48" height="48" src=""/>
-
-  <!-- status information -->
-  <icon id="status-stub"       width="16" height="16" src=""/>
-  <icon id="status-draft"      width="16" height="16" src=""/>
-  <icon id="status-incomplete" width="16" height="16" src=""/>
-  <icon id="status-review"     width="16" height="16" src=""/>
-
-  <!-- watermarks -->
-  <icon id="watermark-code"       src=""/>
-  <icon id="watermark-quote-00AB" src=""/>
-  <icon id="watermark-quote-00BB" src=""/>
-  <icon id="watermark-quote-201C" src=""/>
-  <icon id="watermark-quote-201D" src=""/>
-  <icon id="watermark-quote-201E" src=""/>
-  <icon id="waterkmark-screen"    src=""/>
-
-</theme>
diff --git a/xslt/mallard/html/theme.xsl b/xslt/mallard/html/theme.xsl
deleted file mode 100644
index 53adf26..0000000
--- a/xslt/mallard/html/theme.xsl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><!-- -*- indent-tabs-mode: nil -*- -->
-<!--
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program; see the file COPYING.LGPL.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:theme="http://www.gnome.org/~shaunm/gnome-doc-utils/theme"
-                version="1.0">
-
-<!--!!==========================================================================
-Themes
-
-REMARK: Describe this module
--->
-
-
-<xsl:variable name="theme" select="document('theme.xml')"/>
-
-<xsl:key name="theme_key" match="*[@id]" use="@id"/>
-
-
-<!--**==========================================================================
-theme.get_color
--->
-<xsl:template name="theme.get_color">
-  <xsl:param name="id"/>
-  <xsl:for-each select="$theme">
-    <xsl:value-of select="key('theme_key', $id)/@value"/>
-  </xsl:for-each>
-</xsl:template>
-
-
-<!--**==========================================================================
-theme.get_icon_src
--->
-<xsl:template name="theme.get_icon_src">
-  <xsl:param name="id"/>
-  <xsl:for-each select="$theme">
-    <xsl:value-of select="key('theme_key', $id)/@src"/>
-  </xsl:for-each>
-</xsl:template>
-
-
-<!--**==========================================================================
-theme.get_icon_width
--->
-<xsl:template name="theme.get_icon_width">
-  <xsl:param name="id"/>
-  <xsl:for-each select="$theme">
-    <xsl:value-of select="key('theme_key', $id)/@width"/>
-  </xsl:for-each>
-</xsl:template>
-
-
-<!--**==========================================================================
-theme.get_icon_height
--->
-<xsl:template name="theme.get_height">
-  <xsl:param name="id"/>
-  <xsl:for-each select="$theme">
-    <xsl:value-of select="key('theme_key', $id)/@height"/>
-  </xsl:for-each>
-</xsl:template>
-
-</xsl:stylesheet>