diff --git a/doc/gtkdoc/libDesktop-docs.xml b/doc/gtkdoc/libDesktop-docs.xml
index ef04757..b26ec96 100644
--- a/doc/gtkdoc/libDesktop-docs.xml
+++ b/doc/gtkdoc/libDesktop-docs.xml
@@ -3,22 +3,23 @@
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
   <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-  <!ENTITY server "www.defora.org/doc/gtk-doc/html">
-  <!ENTITY title "DeforaOS libDesktop">
-  <!ENTITY version "0.4.0">
+  <!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
+  %gtkdocentities;
+  <!ENTITY % configentities SYSTEM "config.ent">
+  %configentities;
 ]>
-<book id="index">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>libDesktop Reference Manual</title>
+    <title>&vendor; &package; &title;</title>
     <releaseinfo>
-      for libDesktop &version;.
+      for &vendor; &package; &version;.
       The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="https://&server;/libDesktop/index.html">https://&server;/libDesktop/</ulink>.
+      <ulink role="online-location" url="https://&server;/&package;/">https://&server;/&package;/</ulink>.
     </releaseinfo>
   </bookinfo>
 
   <chapter>
-    <title>&title;</title>
+    <title>&vendor; &package;</title>
     <xi:include href="xml/about.xml"/>
     <xi:include href="xml/accel.xml"/>
     <xi:include href="xml/compat.xml"/>
@@ -29,6 +30,12 @@
     <xi:include href="xml/toolbar.xml"/>
 
   </chapter>
+  <!-- enable this when you use gobject types
+  <chapter id="object-tree">
+    <title>Object Hierarchy</title>
+    <xi:include href="xml/tree_index.sgml"/>
+  </chapter>
+  -->
   <index id="api-index-full">
     <title>API Index</title>
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
@@ -37,6 +44,7 @@
     <title>Index of deprecated API</title>
     <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
   </index>
-
+  <!-- enable this when you use gobject introspection annotations
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+  -->
 </book>