diff --git a/doc/gtkdoc/Mailer-docs.xml b/doc/gtkdoc/Mailer-docs.xml
index 3897045..63bee52 100644
--- a/doc/gtkdoc/Mailer-docs.xml
+++ b/doc/gtkdoc/Mailer-docs.xml
@@ -3,17 +3,18 @@
                "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 Mailer">
-  <!ENTITY version "0.1.6">
+  <!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>Mailer Reference Manual</title>
+    <title>&vendor; &package; &title;</title>
     <releaseinfo>
-      for Mailer &version;.
+      for &vendor; &package; &version;.
       The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="https://&server;/Mailer/index.html">https://&server;/Mailer/</ulink>.
+      <ulink role="online-location" url="https://&server;/&package;/">https://&server;/&package;/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -27,6 +28,12 @@
     <xi:include href="xml/plugin.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>
@@ -35,6 +42,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>
diff --git a/doc/gtkdoc/project.conf b/doc/gtkdoc/project.conf
index ec91131..7e84a0f 100644
--- a/doc/gtkdoc/project.conf
+++ b/doc/gtkdoc/project.conf
@@ -1,2 +1 @@
-subdirs=tmpl
-dist=Makefile,Mailer-docs.xml
+dist=Makefile,Mailer-docs.xml,Mailer-sections.txt,xml/gtkdocentities.ent
diff --git a/doc/gtkdoc/tmpl/Mailer-unused.sgml b/doc/gtkdoc/tmpl/Mailer-unused.sgml
deleted file mode 100644
index d713277..0000000
--- a/doc/gtkdoc/tmpl/Mailer-unused.sgml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- ##### FUNCTION folder_get_messages ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-<!-- ##### USER_FUNCTION status ##### -->
-<para>
-
-</para>
-
-@account: 
-@format: 
-@...: 
-
diff --git a/doc/gtkdoc/tmpl/Mailer.sgml b/doc/gtkdoc/tmpl/Mailer.sgml
deleted file mode 100644
index 9d7c821..0000000
--- a/doc/gtkdoc/tmpl/Mailer.sgml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Mailer
-
-<!-- ##### SECTION Short_Description ##### -->
-DeforaOS Desktop Mailer
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-e-mail client for the DeforaOS desktop.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-DeforaOS libDesktop, DeforaOS libSystem
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
diff --git a/doc/gtkdoc/tmpl/account.sgml b/doc/gtkdoc/tmpl/account.sgml
deleted file mode 100644
index aac11c3..0000000
--- a/doc/gtkdoc/tmpl/account.sgml
+++ /dev/null
@@ -1,253 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Account
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT Account ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM AccountConfigType ##### -->
-<para>
-
-</para>
-
-@ACT_NONE: 
-@ACT_STRING: 
-@ACT_PASSWORD: 
-@ACT_FILE: 
-@ACT_UINT16: 
-@ACT_BOOLEAN: 
-@ACT_SEPARATOR: 
-
-<!-- ##### ENUM AccountEventType ##### -->
-<para>
-
-</para>
-
-@AET_STARTED: 
-@AET_STOPPED: 
-@AET_STATUS: 
-
-<!-- ##### STRUCT AccountPlugin ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM AccountStatus ##### -->
-<para>
-
-</para>
-
-@AS_CONNECTING: 
-@AS_CONNECTED: 
-@AS_DISCONNECTED: 
-@AS_AUTHENTICATED: 
-@AS_IDLE: 
-
-<!-- ##### USER_FUNCTION authenticate ##### -->
-<para>
-
-</para>
-
-@account: 
-@message: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION confirm ##### -->
-<para>
-
-</para>
-
-@account: 
-@message: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION destroy ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION error ##### -->
-<para>
-
-</para>
-
-@account: 
-@message: 
-@ret: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION event ##### -->
-<para>
-
-</para>
-
-@account: 
-@event: 
-
-
-<!-- ##### USER_FUNCTION folder_delete ##### -->
-<para>
-
-</para>
-
-@folder: 
-
-
-<!-- ##### USER_FUNCTION folder_new ##### -->
-<para>
-
-</para>
-
-@account: 
-@folder: 
-@parent: 
-@type: 
-@name: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION get_config ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION get_source ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@folder: 
-@message: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION get_ssl_context ##### -->
-<para>
-
-</para>
-
-@account: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION init ##### -->
-<para>
-
-</para>
-
-@helper: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION message_delete ##### -->
-<para>
-
-</para>
-
-@message: 
-
-
-<!-- ##### USER_FUNCTION message_new ##### -->
-<para>
-
-</para>
-
-@account: 
-@folder: 
-@message: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION message_set_body ##### -->
-<para>
-
-</para>
-
-@message: 
-@buf: 
-@cnt: 
-@append: 
-@Returns: 
-
-
-<!-- ##### FUNCTION message_set_flag ##### -->
-<para>
-
-</para>
-
-@message: 
-@flag: 
-
-
-<!-- ##### USER_FUNCTION message_set_header ##### -->
-<para>
-
-</para>
-
-@message: 
-@header: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION refresh ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@folder: 
-@message: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION start ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION stop ##### -->
-<para>
-
-</para>
-
-@plugin: 
-
-
diff --git a/doc/gtkdoc/tmpl/folder.sgml b/doc/gtkdoc/tmpl/folder.sgml
deleted file mode 100644
index a890255..0000000
--- a/doc/gtkdoc/tmpl/folder.sgml
+++ /dev/null
@@ -1,86 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Folder
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT AccountFolder ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO FT_COUNT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO FT_LAST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### TYPEDEF Folder ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM FolderType ##### -->
-<para>
-
-</para>
-
-@FT_INBOX: 
-@FT_DRAFTS: 
-@FT_SENT: 
-@FT_TRASH: 
-@FT_FOLDER: 
-
-<!-- ##### FUNCTION folder_get_name ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION folder_get_type ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION folder_set_type ##### -->
-<para>
-
-</para>
-
-@folder: 
-@type: 
-
-
diff --git a/doc/gtkdoc/tmpl/helper.sgml b/doc/gtkdoc/tmpl/helper.sgml
deleted file mode 100644
index 2b82519..0000000
--- a/doc/gtkdoc/tmpl/helper.sgml
+++ /dev/null
@@ -1,59 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Helper
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION mailer_helper_get_date ##### -->
-<para>
-
-</para>
-
-@date: 
-@tm: 
-@Returns: 
-
-
-<!-- ##### FUNCTION mailer_helper_get_email ##### -->
-<para>
-
-</para>
-
-@header: 
-@Returns: 
-
-
-<!-- ##### FUNCTION mailer_helper_get_name ##### -->
-<para>
-
-</para>
-
-@header: 
-@Returns: 
-
-
-<!-- ##### FUNCTION mailer_helper_is_email ##### -->
-<para>
-
-</para>
-
-@email: 
-@Returns: 
-
-
diff --git a/doc/gtkdoc/tmpl/mailer.sgml b/doc/gtkdoc/tmpl/mailer.sgml
deleted file mode 100644
index 4833362..0000000
--- a/doc/gtkdoc/tmpl/mailer.sgml
+++ /dev/null
@@ -1,99 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Mailer
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO MFC_COUNT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MFC_LAST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MHC_COUNT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MHC_LAST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT Mailer ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT MailerFolder ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM MailerFolderColumn ##### -->
-<para>
-
-</para>
-
-@MFC_ACCOUNT: 
-@MFC_ENABLED: 
-@MFC_DELETE: 
-@MFC_FOLDER: 
-@MFC_ICON: 
-@MFC_NAME: 
-
-<!-- ##### ENUM MailerHeaderColumn ##### -->
-<para>
-
-</para>
-
-@MHC_ACCOUNT: 
-@MHC_FOLDER: 
-@MHC_MESSAGE: 
-@MHC_ICON: 
-@MHC_SUBJECT: 
-@MHC_FROM: 
-@MHC_FROM_EMAIL: 
-@MHC_TO: 
-@MHC_TO_EMAIL: 
-@MHC_DATE: 
-@MHC_DATE_DISPLAY: 
-@MHC_READ: 
-@MHC_WEIGHT: 
-
-<!-- ##### STRUCT MailerMessage ##### -->
-<para>
-
-</para>
-
-
diff --git a/doc/gtkdoc/tmpl/message.sgml b/doc/gtkdoc/tmpl/message.sgml
deleted file mode 100644
index 6387b16..0000000
--- a/doc/gtkdoc/tmpl/message.sgml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Message
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT AccountMessage ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM MailerMessageFlag ##### -->
-<para>
-
-</para>
-
-@MMF_READ: 
-@MMF_ANSWERED: 
-@MMF_URGENT: 
-@MMF_DRAFT: 
-@MMF_DELETED: 
-
-<!-- ##### TYPEDEF Message ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION message_get_flags ##### -->
-<para>
-
-</para>
-
-@message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION message_get_header ##### -->
-<para>
-
-</para>
-
-@message: 
-@header: 
-@Returns: 
-
-
-<!-- ##### FUNCTION message_save ##### -->
-<para>
-
-</para>
-
-@message: 
-@filename: 
-@Returns: 
-
-
-<!-- ##### FUNCTION message_set_flag ##### -->
-<para>
-
-</para>
-
-@message: 
-@flag: 
-
-
-<!-- ##### FUNCTION message_set_flags ##### -->
-<para>
-
-</para>
-
-@message: 
-@flags: 
-
-
diff --git a/doc/gtkdoc/tmpl/plugin.sgml b/doc/gtkdoc/tmpl/plugin.sgml
deleted file mode 100644
index 0a13744..0000000
--- a/doc/gtkdoc/tmpl/plugin.sgml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-MailerPlugin
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT MailerPlugin ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### USER_FUNCTION destroy ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION error ##### -->
-<para>
-
-</para>
-
-@account: 
-@message: 
-@ret: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION get_widget ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION init ##### -->
-<para>
-
-</para>
-
-@helper: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION refresh ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@folder: 
-@message: 
-@Returns: 
-
-
diff --git a/doc/gtkdoc/tmpl/project.conf b/doc/gtkdoc/tmpl/project.conf
deleted file mode 100644
index 9e1eaa7..0000000
--- a/doc/gtkdoc/tmpl/project.conf
+++ /dev/null
@@ -1 +0,0 @@
-dist=Makefile,Mailer.sgml
diff --git a/doc/gtkdoc/tmpl/transport.sgml b/doc/gtkdoc/tmpl/transport.sgml
deleted file mode 100644
index f87749c..0000000
--- a/doc/gtkdoc/tmpl/transport.sgml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Transport
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
diff --git a/doc/gtkdoc/xml/gtkdocentities.ent b/doc/gtkdoc/xml/gtkdocentities.ent
new file mode 100644
index 0000000..db0b85f
--- /dev/null
+++ b/doc/gtkdoc/xml/gtkdocentities.ent
@@ -0,0 +1,2 @@
+<!ENTITY server "www.defora.org/doc/gtk-doc/html">
+<!ENTITY title "Reference Manual">
diff --git a/doc/project.conf b/doc/project.conf
index 067b27e..c5c694d 100644
--- a/doc/project.conf
+++ b/doc/project.conf
@@ -1,5 +1,5 @@
 subdirs=gtkdoc
-targets=compose.1,compose.html,gtkdoc/Mailer.types,gtkdoc/tmpl.stamp,gtkdoc/sgml.stamp,gtkdoc/html.stamp,mailer.1,mailer.html
+targets=compose.1,compose.html,gtkdoc/Mailer.types,gtkdoc/tmpl.stamp,gtkdoc/html.stamp,gtkdoc/xml.stamp,mailer.1,mailer.html
 dist=Makefile,compose.css.xml,compose.xml,docbook.sh,gtkdoc.sh,mailer.css.xml,mailer.xml,manual.css.xml
 
 [compose.1]
@@ -19,22 +19,22 @@ type=script
 script=./gtkdoc.sh
 depends=../config.sh
 
-[gtkdoc/tmpl.stamp]
-type=script
-script=./gtkdoc.sh
-depends=gtkdoc/Mailer.types
-
-[gtkdoc/sgml.stamp]
-type=script
-script=./gtkdoc.sh
-depends=gtkdoc/tmpl.stamp
-
 [gtkdoc/html.stamp]
 type=script
 script=./gtkdoc.sh
-depends=gtkdoc/Mailer-docs.xml,gtkdoc/sgml.stamp
+depends=gtkdoc/Mailer-docs.xml,$(OBJDIR)gtkdoc/xml.stamp,gtkdoc/xml/gtkdocentities.ent,../config.ent
 install=
 
+[gtkdoc/tmpl.stamp]
+type=script
+script=./gtkdoc.sh
+depends=gtkdoc.sh,$(OBJDIR)gtkdoc/Mailer.types
+
+[gtkdoc/xml.stamp]
+type=script
+script=./gtkdoc.sh
+depends=gtkdoc.sh,$(OBJDIR)gtkdoc/tmpl.stamp
+
 [mailer.1]
 type=script
 script=./docbook.sh
diff --git a/project.conf b/project.conf
index e6e6052..f4d68f0 100644
--- a/project.conf
+++ b/project.conf
@@ -1,7 +1,7 @@
 vendor=Desktop
 package=Mailer
 version=0.2.0
-config=h,sh
+config=h,sh,ent
 
 subdirs=data,doc,include,po,src,src/plugins,tests
 targets=tests