Index: general.ent
===================================================================
--- general.ent	(revision bb9728099f29795aaa463687b87e662613785838)
+++ general.ent	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -25,4 +25,5 @@
 <!ENTITY sources-anduin-http  "http://anduin.&lfs-domainname;/sources/BLFS/svn">
 <!ENTITY sources-anduin-ftp   "ftp://anduin.&lfs-domainname;/BLFS/svn">
+<!ENTITY sources-anduin-other-http "http://anduin.&lfs-domainname;/other">
 <!ENTITY sources-anduin-other "ftp://anduin.&lfs-domainname;/other">
 <!ENTITY files-anduin         "http://anduin.&lfs-domainname;/files/BLFS/svn">
@@ -735,14 +736,14 @@
 <!-- Xfce core -->
 <!ENTITY xfce4-version                "4.10">
-<!ENTITY exo-version                  "0.8.0">
+<!ENTITY exo-version                  "0.10.2">
 <!ENTITY garcon-version               "0.2.0">
-<!ENTITY gtk-xfce-engine-version      "3.0.0">
+<!ENTITY gtk-xfce-engine-version      "3.0.1">
 <!ENTITY libwnck2-version             "2.30.7">
 <!ENTITY libxfce4ui-version           "4.10.0">
 <!ENTITY libxfce4util-version         "4.10.0">
 <!ENTITY libxfcegui4-version          "4.10.0">
-<!ENTITY thunar-version               "1.4.0">
+<!ENTITY thunar-version               "1.6.2">
 <!ENTITY thunar-volman-version        "0.8.0">
-<!ENTITY tumbler-version              "0.1.25">
+<!ENTITY tumbler-version              "0.1.27">
 <!ENTITY xfce4-appfinder-version      "4.10.0">
 <!ENTITY xfce4-panel-version          "4.10.0">
@@ -751,5 +752,5 @@
 <!ENTITY xfce4-settings-version       "4.10.0">
 <!ENTITY xfconf-version               "4.10.0">
-<!ENTITY xfdesktop-version            "4.10.0">
+<!ENTITY xfdesktop-version            "4.10.2">
 <!ENTITY xfwm4-version                "4.10.0">
 
Index: xfce/core/exo.xml
===================================================================
--- xfce/core/exo.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/exo.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,13 +6,13 @@
 
   <!ENTITY exo-download-http
-    "http://archive.xfce.org/src/xfce/exo/0.8/exo-&exo-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/exo/0.10/exo-&exo-version;.tar.bz2">
   <!ENTITY exo-download-ftp  " ">
-  <!ENTITY exo-md5sum        "189bd19210e1d7d8601be1cdf27bf259">
-  <!ENTITY exo-size          "1 MB">
-  <!ENTITY exo-buildsize     "25.3 MB">
+  <!ENTITY exo-md5sum        "c70f2a217811bfba2e62f938d4b8f748">
+  <!ENTITY exo-size          "1.2 MB">
+  <!ENTITY exo-buildsize     "26 MB">
   <!ENTITY exo-time          "0.3 SBU">
 ]>
 
-<sect1 id="exo" xreflabel="exo-&exo-version;">
+<sect1 id="exo" xreflabel="Exo-&exo-version;">
   <?dbhtml filename="exo.html"?>
 
@@ -22,12 +22,12 @@
   </sect1info>
 
-  <title>exo-&exo-version;</title>
+  <title>Exo-&exo-version;</title>
 
   <indexterm zone="exo">
-    <primary sortas="a-exo">exo</primary>
+    <primary sortas="a-Exo">Exo</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to exo</title>
+    <title>Introduction to Exo</title>
 
     <para>
@@ -73,5 +73,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">exo Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Exo Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -84,6 +84,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="pygtk"/>.
+      <xref linkend="gtk-doc"/>
     </para>
 
@@ -94,13 +93,12 @@
 
   <sect2 role="installation">
-    <title>Installation of exo</title>
-
-    <para>
-      Install <application>exo</application> by running the following
+    <title>Installation of Exo</title>
+
+    <para>
+      Install <application>Exo</application> by running the following
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
-  --disable-static --docdir=/usr/share/doc/exo-&exo-version; &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make</userinput></screen>
 
@@ -114,4 +112,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -120,8 +119,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
@@ -137,16 +134,17 @@
         <seg>
           exo-csource, exo-desktop-item-edit, exo-open and
-          exo-preferred-applications.
+          exo-preferred-applications
         </seg>
-        <seg>libexo-1.so.</seg>
+        <seg>
+          libexo-1.so
+        </seg>
         <seg>
           /etc/xdg/xfce4,
           /usr/include/exo-1,
-          /usr/lib/xfce4,
+          /usr/lib/xfce4/exo-1,
           /usr/share/doc/exo-&exo-version;,
-          /usr/share/gtk-doc/exo,
-          /usr/share/pixmaps/exo-1,
-          /usr/share/pygtk/2.0/defs/exo-0.6 and
-          /usr/share/xfce4.
+          /usr/share/gtk-doc/html/exo-1,
+          /usr/share/pixmaps/exo-1 and
+          /usr/share/xfce4
         </seg>
       </seglistitem>
@@ -225,5 +223,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
-  </sect2>
+
+  </sect2>
+
 </sect1>
Index: xfce/core/garcon.xml
===================================================================
--- xfce/core/garcon.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/garcon.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,5 +6,5 @@
 
   <!ENTITY garcon-download-http
-    "http://archive.xfce.org/src/xfce/garcon/0.2/garcon-&garcon-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/garcon/0.2/garcon-&garcon-version;.tar.bz2">
   <!ENTITY garcon-download-ftp  " ">
   <!ENTITY garcon-md5sum        "301e7b8015060dd30407b68dd8c4bdb7">
@@ -14,5 +14,5 @@
 ]>
 
-<sect1 id="garcon" xreflabel="garcon-&garcon-version;">
+<sect1 id="garcon" xreflabel="Garcon-&garcon-version;">
   <?dbhtml filename="garcon.html"?>
 
@@ -22,8 +22,8 @@
   </sect1info>
 
-  <title>garcon-&garcon-version;</title>
+  <title>Garcon-&garcon-version;</title>
 
   <indexterm zone="garcon">
-    <primary sortas="a-garcon">garcon</primary>
+    <primary sortas="a-Garcon">Garcon</primary>
   </indexterm>
 
@@ -80,8 +80,7 @@
     </para>
 
-    <!-- As required -->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/>.
+      <xref linkend="gtk-doc"/>
     </para>
 
@@ -99,5 +98,7 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -111,4 +112,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -120,5 +122,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
@@ -132,7 +135,13 @@
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libgarcon-1.so</seg>
-        <seg>/usr/share/gtk-doc/html/garcon</seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libgarcon-1.so
+        </seg>
+        <seg>
+          /usr/share/gtk-doc/html/garcon
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -156,5 +165,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: xfce/core/gtk-xfce-engine.xml
===================================================================
--- xfce/core/gtk-xfce-engine.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/gtk-xfce-engine.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gtk-xfce-engine-download-http
-    "http://archive.xfce.org/src/xfce/gtk-xfce-engine/3.0/gtk-xfce-engine-&gtk-xfce-engine-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/gtk-xfce-engine/3.0/gtk-xfce-engine-&gtk-xfce-engine-version;.tar.bz2">
   <!ENTITY gtk-xfce-engine-download-ftp  " ">
-  <!ENTITY gtk-xfce-engine-md5sum        "c02dec13f063c285de44d5388902822a">
-  <!ENTITY gtk-xfce-engine-size          "360 KB">
-  <!ENTITY gtk-xfce-engine-buildsize     "6.7 MB">
+  <!ENTITY gtk-xfce-engine-md5sum        "174e774d0debb052ec457640275f065d">
+  <!ENTITY gtk-xfce-engine-size          "364 KB">
+  <!ENTITY gtk-xfce-engine-buildsize     "7.3 MB">
   <!ENTITY gtk-xfce-engine-time          "0.1 SBU">
 ]>
@@ -28,12 +28,11 @@
   </indexterm>
 
-  <!--Required section-->
   <sect2 role="package">
-    <title>Introduction to GTK-Xfce-Engine</title>
+    <title>Introduction to GTK Xfce Engine</title>
 
     <para>
-      The <application>GTK-Xfce-Engine</application> package contains several
-      <application>GTK+-2</application> themes and the applications and
-      libraries needed to display them.
+      The <application>GTK Xfce Engine</application> package contains several
+      <application>GTK+ 2</application> and <application>GTK+ 3</application>
+      themes and libraries needed to display them.
       This is useful for customising the appearance of your
       <application>Xfce</application> desktop.
@@ -76,9 +75,14 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">GTK-Xfce-Engine Dependencies</bridgehead>
+    <bridgehead renderas="sect3">GTK Xfce Engine Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/>.
+      <xref linkend="gtk2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gtk3"/>
     </para>
 
@@ -89,12 +93,12 @@
 
   <sect2 role="installation">
-    <title>Installation of GTK-Xfce-Engine</title>
+    <title>Installation of GTK Xfce Engine</title>
 
     <para>
-      Install <application>GTK-Xfce-Engine</application> by running the
+      Install <application>GTK Xfce Engine</application> by running the
       following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -108,11 +112,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
 
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
   </sect2>
 
@@ -126,13 +124,16 @@
 
       <seglistitem>
-        <seg>None</seg>
         <seg>
-          libxfce.so (in /usr/lib/gtk-&gtk2-libdir;/engines).
+          None
         </seg>
         <seg>
-          Xfce, Xfce-4.6, Xfce-curve, Xfce-kolors, Xfce-saltlake, Xfce-4.0,
-          Xfce-b5, Xfce-dawn, Xfce-light, Xfce-smooth, Xfce-4.2, Xfce-basic,
-          Xfce-dusk, Xfce-orange, Xfce-stellar, Xfce-4.4, Xfce-cadmium,
-          Xfce-kde2, Xfce-redmondxp and Xfce-winter.
+          libxfce.so (in /usr/lib/gtk-&gtk2-libdir;/engines and
+          /usr/lib/gtk-3.0/3.0.0/theming-engines)
+        </seg>
+        <seg>
+          Xfce, Xfce-4.0, Xfce-4.2, Xfce-4.4, Xfce-4.6, Xfce-b5, Xfce-basic,
+          Xfce-cadmium, Xfce-curve, Xfce-dawn, Xfce-dusk, Xfce-kde2,
+          Xfce-kolors, Xfce-light, Xfce-orange, Xfce-redmondxp, Xfce-saltlake,
+          Xfce-smooth, Xfce-stellar, Xfce-winter in /usr/share/themes
         </seg>
       </seglistitem>
@@ -149,5 +150,6 @@
           <para>
             contains functions that allow <application>Xfce</application> to
-            apply and change <application>Gtk+-2</application> themes.
+            apply and change <application>GTK+ 2</application> and
+            <application>GTK+ 3</application> themes.
           </para>
           <indexterm zone="gtk-xfce-engine libxfce">
@@ -156,5 +158,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: xfce/core/libwnck2.xml
===================================================================
--- xfce/core/libwnck2.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/libwnck2.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,7 +6,7 @@
 
   <!ENTITY libwnck2-download-http
-    "&gnome-download-http;/libwnck/2.30/libwnck-&libwnck2-version;.tar.xz">
+           "&gnome-download-http;/libwnck/2.30/libwnck-&libwnck2-version;.tar.xz">
   <!ENTITY libwnck2-download-ftp
-    "&gnome-download-ftp;/libwnck/2.30/libwnck-&libwnck2-version;.tar.xz">
+           "&gnome-download-ftp;/libwnck/2.30/libwnck-&libwnck2-version;.tar.xz">
   <!ENTITY libwnck2-md5sum        "3d20f26105a2fd878899d6ecdbe9a082">
   <!ENTITY libwnck2-size          "612 KB">
@@ -26,12 +26,12 @@
 
   <indexterm zone="libwnck2">
-    <primary sortas="a-Libwnck">Libwnck</primary>
+    <primary sortas="a-libwnck">libwnck</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Libwnck</title>
-
-    <para>
-      The <application>Libwnck</application> package contains a Window Navigator
+    <title>Introduction to libwnck</title>
+
+    <para>
+      The <application>libwnck</application> package contains a Window Navigator
       Construction Kit.
     </para>
@@ -42,54 +42,75 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libwnck2-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libwnck2-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libwnck2-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libwnck2-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libwnck2-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libwnck2-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&libwnck2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libwnck2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libwnck2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libwnck2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libwnck2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libwnck2-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Libwnck Dependencies</bridgehead>
+    <bridgehead renderas="sect3">libwnck Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="gtk2"/> and
-      <xref linkend="intltool"/>.
+      <xref linkend="intltool"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="startup-notification"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="startup-notification"/>.
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gtk-doc"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libwnck2"/></para>
+      <ulink url="&blfs-wiki;/libwnck2"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Libwnck</title>
-
-    <para>
-      Install <application>Libwnck</application> by running the following
+    <title>Installation of libwnck</title>
+
+    <para>
+      Install <application>libwnck</application> by running the following
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static --program-suffix=-1 &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --disable-static \
+            --program-suffix=-1 &amp;&amp;
 make GETTEXT_PACKAGE=libwnck-1</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
     <para>
@@ -98,4 +119,5 @@
 
 <screen role="root"><userinput>make GETTEXT_PACKAGE=libwnck-1 install</userinput></screen>
+
   </sect2>
 
@@ -120,4 +142,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
@@ -131,9 +154,13 @@
 
       <seglistitem>
-        <seg>wnckprop-1 and wnck-urgency-monitor-1.</seg>
-        <seg>libwnck-1.so.</seg>
+        <seg>
+          wnckprop-1 and wnck-urgency-monitor-1
+        </seg>
+        <seg>
+          libwnck-1.so
+        </seg>
         <seg>
           /usr/include/libwnck-1.0 and
-          /usr/share/gtk-doc/html/libwnck-1.0.
+          /usr/share/gtk-doc/html/libwnck-1.0
         </seg>
       </seglistitem>
@@ -159,7 +186,9 @@
 
       <varlistentry id="libwnck-1">
-        <term><filename class='libraryfile'>libwnck-1.so</filename></term>
+        <term><filename class="libraryfile">libwnck-1.so</filename></term>
         <listitem>
-          <para>contains functions for writing pagers and task lists.</para>
+          <para>
+            contains functions for writing pagers and task lists.
+          </para>
           <indexterm zone="libwnck libwnck-1">
             <primary sortas="c-libwnck-1">libwnck-1.so</primary>
@@ -167,5 +196,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
-  </sect2>
+
+  </sect2>
+
 </sect1>
Index: xfce/core/libxfce4ui.xml
===================================================================
--- xfce/core/libxfce4ui.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/libxfce4ui.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,5 +6,5 @@
 
   <!ENTITY libxfce4ui-download-http
-    "http://archive.xfce.org/src/xfce/libxfce4ui/&xfce4-version;/libxfce4ui-&libxfce4ui-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/libxfce4ui/&xfce4-version;/libxfce4ui-&libxfce4ui-version;.tar.bz2">
   <!ENTITY libxfce4ui-download-ftp  " ">
   <!ENTITY libxfce4ui-md5sum        "6df1ce474a3d4885aee31cda9dbc9192">
@@ -29,9 +29,9 @@
 
   <sect2 role="package">
-    <title>Introduction to LibXfce4UI</title>
+    <title>Introduction to libxfce4ui</title>
 
     <para>
-      The <application>LibXfce4UI</application> package contains
-      <application>Gtk 2</application> widgets that are used by other
+      The <application>libxfce4ui</application> package contains
+      <application>GTK+ 2</application> widgets that are used by other
       <application>Xfce</application> applications.
     </para>
@@ -73,5 +73,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">LibXfce4UI Dependencies</bridgehead>
+    <bridgehead renderas="sect3">libxfce4ui Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -81,8 +81,12 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="startup-notification"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="startup-notification"/>.
+      <xref linkend="gtk-doc"/>
     </para>
 
@@ -93,8 +97,8 @@
 
   <sect2 role="installation">
-    <title>Installation of LibXfce4UI</title>
+    <title>Installation of libxfce4ui</title>
 
     <para>
-      Install <application>LibXfce4UI</application> by running the following
+      Install <application>libxfce4ui</application> by running the following
       commands:
     </para>
@@ -112,4 +116,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -121,5 +126,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
@@ -137,5 +143,5 @@
         </seg>
         <seg>
-          libxfce4kbd-private-2.so and libxfce4ui-1.so.
+          libxfce4kbd-private-2.so and libxfce4ui-1.so
         </seg>
         <seg>
@@ -143,5 +149,5 @@
           /usr/include/xfce4/libxfce4kbd-private-2,
           /usr/include/xfce4/libxfce4ui-1 and
-          /usr/share/gtk-doc/html/libxfce4ui.
+          /usr/share/gtk-doc/html/libxfce4ui
         </seg>
       </seglistitem>
@@ -159,5 +165,5 @@
             is a private <application>Xfce</application> library for sharing
             code between <application>Xfwm4</application> and
-            <application>Xfce4-Settings</application>.
+            <application>Xfce4 Settings</application>.
           </para>
           <indexterm zone="libxfce4ui libxfce4kbd-private-2">
@@ -179,5 +185,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: xfce/core/libxfce4util.xml
===================================================================
--- xfce/core/libxfce4util.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/libxfce4util.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,5 +6,5 @@
 
   <!ENTITY libxfce4util-download-http
-    "http://archive.xfce.org/src/xfce/libxfce4util/&xfce4-version;/libxfce4util-&libxfce4util-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/libxfce4util/&xfce4-version;/libxfce4util-&libxfce4util-version;.tar.bz2">
   <!ENTITY libxfce4util-download-ftp  " ">
   <!ENTITY libxfce4util-md5sum        "2e8defcd40cbf6afedde531b27314511">
@@ -29,8 +29,8 @@
 
   <sect2 role="package">
-    <title>Introduction to LibXfce4Util</title>
+    <title>Introduction to libxfce4util</title>
 
     <para>
-      The <application>LibXfce4Util</application> package is a basic utility
+      The <application>libxfce4util</application> package is a basic utility
       library for the <application>Xfce</application> desktop environment.
     </para>
@@ -72,8 +72,9 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">LibXfce4Util Dependencies</bridgehead>
+    <bridgehead renderas="sect3">libxfce4util Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="glib2"/>,
       <xref linkend="intltool"/> and
       <xref linkend="pkgconfig"/>
@@ -81,5 +82,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/></para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
 
     <para condition="html" role="usernotes">
@@ -89,8 +92,8 @@
 
   <sect2 role="installation">
-    <title>Installation of LibXfce4Util</title>
+    <title>Installation of libxfce4util</title>
 
     <para>
-      Install <application>LibXfce4Util</application> by running the following
+      Install <application>libxfce4util</application> by running the following
       commands:
     </para>
@@ -108,4 +111,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -117,5 +121,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
@@ -129,7 +134,14 @@
 
       <seglistitem>
-        <seg>xfce4-kiosk-query.</seg>
-        <seg>libxfce4util.so.</seg>
-        <seg>/usr/include/xfce4 and /usr/share/gtk-doc/html/libxfce4util.</seg>
+        <seg>
+          xfce4-kiosk-query
+        </seg>
+        <seg>
+          libxfce4util.so
+        </seg>
+        <seg>
+          /usr/include/xfce4 and
+          /usr/share/gtk-doc/html/libxfce4util
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -167,5 +179,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: xfce/core/libxfcegui4.xml
===================================================================
--- xfce/core/libxfcegui4.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/libxfcegui4.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,5 +6,5 @@
 
   <!ENTITY libxfcegui4-download-http
-    "http://archive.xfce.org/src/xfce/libxfcegui4/&xfce4-version;/libxfcegui4-&libxfcegui4-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/libxfcegui4/&xfce4-version;/libxfcegui4-&libxfcegui4-version;.tar.bz2">
   <!ENTITY libxfcegui4-download-ftp  " ">
   <!ENTITY libxfcegui4-md5sum        "4025b9d6811f051c914cdd700d437e61">
@@ -29,9 +29,9 @@
 
   <sect2 role="package">
-    <title>Introduction to LibXfceGUI4</title>
+    <title>Introduction to libxfcegui4</title>
 
     <para>
-      The <application>LibXfceGUI4</application> package provides the basic GUI
-      functions used by <application>Xfce</application>.
+      The <application>libxfcegui4</application> package provides the
+      basic GUI functions used by <application>Xfce</application>.
     </para>
 
@@ -72,15 +72,16 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">LibXfceGUI4 Dependencies</bridgehead>
+    <bridgehead renderas="sect3">libxfcegui4 Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/>,
       <xref linkend="libglade"/> and
-      <xref linkend="libxfce4util"/>.
+      <xref linkend="libxfce4util"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/>.</para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
 
     <para condition="html" role="usernotes">
@@ -90,8 +91,8 @@
 
   <sect2 role="installation">
-    <title>Installation of LibXfceGUI4</title>
+    <title>Installation of libxfcegui4</title>
 
     <para>
-      Install <application>LibXfceGUI4</application> by running the following
+      Install <application>libxfcegui4</application> by running the following
       commands:
     </para>
@@ -109,4 +110,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -118,5 +120,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
@@ -130,8 +133,13 @@
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libxfcegui4.so and libxfce4.so</seg>
-        <seg>/usr/include/xfce4/libxfcegui4 and
-        /usr/share/gtk-doc/html/libxfcegui4
+        <seg>
+          None
+        </seg>
+        <seg>
+          libxfcegui4.so and libxfce4.so
+        </seg>
+        <seg>
+          /usr/include/xfce4/libxfcegui4 and
+          /usr/share/gtk-doc/html/libxfcegui4
         </seg>
       </seglistitem>
@@ -155,5 +163,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: xfce/core/thunar-volman.xml
===================================================================
--- xfce/core/thunar-volman.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/thunar-volman.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -5,5 +5,6 @@
   %general-entities;
 
-  <!ENTITY thunar-volman-download-http "http://archive.xfce.org/src/xfce/thunar-volman/0.8/thunar-volman-&thunar-volman-version;.tar.bz2">
+  <!ENTITY thunar-volman-download-http
+           "http://archive.xfce.org/src/xfce/thunar-volman/0.8/thunar-volman-&thunar-volman-version;.tar.bz2">
   <!ENTITY thunar-volman-download-ftp  " ">
   <!ENTITY thunar-volman-md5sum        "250af757ea629c7c27f554d17119080c">
@@ -78,11 +79,18 @@
       <xref linkend="exo"/>,
       <xref linkend="libxfce4ui"/> and
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for gudev).
+      <xref linkend="udev"/> or
+      <xref linkend="udev-extras"/> (for GUdev)
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
       <xref linkend="libnotify"/> and
       <xref linkend="startup-notification"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
+    <para role="optional">
+      <xref linkend="gvfs"/> and
+      <xref linkend="polkit-gnome"/>
     </para>
 
@@ -112,4 +120,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -123,7 +132,13 @@
 
       <seglistitem>
-        <seg>thunar-volman and thunar-volman-settings</seg>
-        <seg>None</seg>
-        <seg>None</seg>
+        <seg>
+          thunar-volman and thunar-volman-settings
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -151,6 +166,6 @@
         <listitem>
           <para>
-            is a small <application>Gtk 2</application> application for changing
-            your <application>Thunar Volume Manager</application>.
+            is a small <application>GTK+ 2</application> application for changing
+            <application>Thunar Volume Manager</application> settings.
           </para>
           <indexterm zone="thunar-volman thunar-volman-settings">
@@ -159,5 +174,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: xfce/core/thunar.xml
===================================================================
--- xfce/core/thunar.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/thunar.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -5,13 +5,14 @@
   %general-entities;
 
-  <!ENTITY thunar-download-http "http://archive.xfce.org/src/xfce/thunar/1.4/Thunar-&thunar-version;.tar.bz2">
+  <!ENTITY thunar-download-http
+           "http://archive.xfce.org/src/xfce/thunar/1.6/Thunar-&thunar-version;.tar.bz2">
   <!ENTITY thunar-download-ftp  " ">
-  <!ENTITY thunar-md5sum        "737ad2c36ed36b10fef82e860b9e990a">
-  <!ENTITY thunar-size          "1.8 MB">
-  <!ENTITY thunar-buildsize     "58 MB">
+  <!ENTITY thunar-md5sum        "a446103ab90855cc8ba484dfeedb82d8">
+  <!ENTITY thunar-size          "1.9 MB">
+  <!ENTITY thunar-buildsize     "60 MB">
   <!ENTITY thunar-time          "0.7 SBU">
 ]>
 
-<sect1 id="thunar" xreflabel="thunar-&thunar-version;">
+<sect1 id="thunar" xreflabel="Thunar-&thunar-version;">
   <?dbhtml filename="thunar.html"?>
 
@@ -24,5 +25,5 @@
 
   <indexterm zone="thunar">
-    <primary sortas="a-thunar">thunar</primary>
+    <primary sortas="a-Thunar">Thunar</primary>
   </indexterm>
 
@@ -32,5 +33,5 @@
     <para>
       <application>Thunar</application> is the <application>Xfce</application>
-      file manager, a <application>Gtk 2</application> GUI to organise the files
+      file manager, a <application>GTK+ 2</application> GUI to organise the files
       on your computer.
     </para>
@@ -80,9 +81,16 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libnotify"/>,
+      <xref linkend="startup-notification"/>,
+      <xref linkend="udev"/> or
+      <xref linkend="udev-extras"/> (for GUdev) and
+      <xref linkend="xfce4-panel"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libnotify"/>,
-      <xref linkend="startup-notification"/>, and
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for gudev).
+      <xref linkend="libexif"/>
     </para>
 
@@ -100,6 +108,7 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
-  --docdir=/usr/share/doc/Thunar-&thunar-version; &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --docdir=/usr/share/doc/Thunar-&thunar-version; &amp;&amp;
 make</userinput></screen>
 
@@ -113,4 +122,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -119,8 +129,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -136,7 +143,9 @@
       <seglistitem>
         <seg>
-          Thunar, thunar and thunar-settings.
+          Thunar, thunar and thunar-settings
         </seg>
-        <seg>libthunarx-2.so.</seg>
+        <seg>
+          libthunarx-2.so
+        </seg>
         <seg>
           /etc/xdg/Thunar,
@@ -144,8 +153,8 @@
           /usr/lib/Thunar,
           /usr/lib/thunarx-2,
+          /usr/share/doc/Thunar-&thunar-version;,
           /usr/share/gtk-doc/html/thunarx,
-          /usr/share/doc/Thunar-&thunar-version;,
           /usr/share/pixmaps/Thunar and
-          /usr/share/Thunar.
+          /usr/share/Thunar
         </seg>
       </seglistitem>
@@ -207,5 +216,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
-  </sect2>
+
+  </sect2>
+
 </sect1>
Index: xfce/core/tumbler.xml
===================================================================
--- xfce/core/tumbler.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/tumbler.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,13 +6,13 @@
 
   <!ENTITY tumbler-download-http
-    "http://archive.xfce.org/src/xfce/tumbler/0.1/tumbler-&tumbler-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/tumbler/0.1/tumbler-&tumbler-version;.tar.bz2">
   <!ENTITY tumbler-download-ftp  " ">
-  <!ENTITY tumbler-md5sum        "d4edc15c172714c7a3eaf3c719b8faf6">
-  <!ENTITY tumbler-size          "468 KB">
-  <!ENTITY tumbler-buildsize     "12.5 MB">
+  <!ENTITY tumbler-md5sum        "3fa90528c3e7e77d8ace4bffcf0a2748">
+  <!ENTITY tumbler-size          "496 KB">
+  <!ENTITY tumbler-buildsize     "14 MB">
   <!ENTITY tumbler-time          "0.2 SBU">
 ]>
 
-<sect1 id="tumbler" xreflabel="tumbler-&tumbler-version;">
+<sect1 id="tumbler" xreflabel="Tumbler-&tumbler-version;">
   <?dbhtml filename="tumbler.html"?>
 
@@ -22,8 +22,8 @@
   </sect1info>
 
-  <title>tumbler-&tumbler-version;</title>
+  <title>Tumbler-&tumbler-version;</title>
 
   <indexterm zone="tumbler">
-    <primary sortas="a-tumbler">tumbler</primary>
+    <primary sortas="a-Tumbler">Tumbler</primary>
   </indexterm>
 
@@ -84,11 +84,15 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://code.google.com/p/ffmpegthumbnailer/">FFmpeg-Thumbnailer</ulink>,
+      <xref linkend="curl"/>,
+      <ulink url="http://code.google.com/p/ffmpegthumbnailer/">FFmpegThumbnailer</ulink>,
       <xref linkend="freetype2"/>,
       <xref linkend="gdk-pixbuf"/>,
+      <xref linkend="gst-plugins-base"/>,
       <xref linkend="gtk-doc"/>,
       <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="poppler"/>,.
+      <xref linkend="libgsf"/>,
+      <ulink url="http://libopenraw.freedesktop.org/">libopewnraw</ulink>,
+      <xref linkend="libpng"/> and
+      <xref linkend="poppler"/>
     </para>
 
@@ -106,5 +110,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make</userinput></screen>
 
@@ -118,11 +122,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
 
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
   </sect2>
 
@@ -132,5 +130,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -140,17 +138,10 @@
         </seg>
         <seg>
-          libtumbler-1.so, and in
-          <filename class="directory">/usr/lib/tumbler-1/plugins</filename>
-          (depending on the dependencies you've installed):
-          tumbler-ffmpeg-thumbnailer.so,
-          tumbler-font-thumbnailer.so,
-          tumbler-jpeg-thumbnailer.so,
-          tumbler-pixbuf-thumbnailer.so and
-          tumbler-poppler-thumbnailer.so.
+          libtumbler-1.so
         </seg>
         <seg>
           /usr/include/tumbler-1,
           /usr/lib/tumbler-1 and
-          /usr/share/gtk-doc/html/tumbler.
+          /usr/share/gtk-doc/html/tumbler
         </seg>
       </seglistitem>
@@ -175,68 +166,7 @@
       </varlistentry>
 
-      <varlistentry id="tumbler-ffmpeg-thumbnailer">
-        <term><filename class="libraryfile">tumbler-ffmpeg-thumbnailer.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Tumbler</application>
-            <application>FFmpeg</application> plugin for creating thumbnails
-            of video files.
-          </para>
-          <indexterm zone="tumbler tumbler-ffmpeg-thumbnailer">
-            <primary sortas="c-tumbler-ffmpeg-thumbnailer">tumbler-ffmpeg-thumbnailer.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
+    </variablelist>
 
-      <varlistentry id="tumbler-font-thumbnailer">
-        <term><filename class="libraryfile">tumbler-font-thumbnailer.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Tumbler</application> font thumbnailer.
-          </para>
-          <indexterm zone="tumbler tumbler-font-thumbnailer">
-            <primary sortas="c-tumbler-font-thumbnailer">tumbler-font-thumbnailer.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
+  </sect2>
 
-      <varlistentry id="tumbler-jpeg-thumbnailer">
-        <term><filename class="libraryfile">tumbler-jpeg-thumbnailer.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Tumbler</application> jpeg thumbnailer for
-            creating thumbnails of jpeg images.
-          </para>
-          <indexterm zone="tumbler tumbler-jpeg-thumbnailer">
-            <primary sortas="c-tumbler-jpeg-thumbnailer">tumbler-jpeg-thumbnailer.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tumbler-pixbuf-thumbnailer">
-        <term><filename class="libraryfile">tumbler-pixbuf-thumbnailer.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Tumbler</application>
-            <application>Gdk Pixbuf</application> thumbnailer.
-          </para>
-          <indexterm zone="tumbler tumbler-pixbuf-thumbnailer">
-            <primary sortas="c-tumbler-pixbuf-thumbnailer">tumbler-pixbuf-thumbnailer.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tumbler-poppler-thumbnailer">
-        <term><filename class="libraryfile">tumbler-poppler-thumbnailer.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Tumbler</application> PDF thumbnailer.
-          </para>
-          <indexterm zone="tumbler tumbler-poppler-thumbnailer">
-            <primary sortas="c-tumbler-poppler-thumbnailer">tumbler-poppler-thumbnailer.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
 </sect1>
Index: xfce/core/xfce4-appfinder.xml
===================================================================
--- xfce/core/xfce4-appfinder.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/xfce4-appfinder.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,5 +6,5 @@
 
   <!ENTITY xfce4-appfinder-download-http
-    "http://archive.xfce.org/src/xfce/xfce4-appfinder/&xfce4-version;/xfce4-appfinder-&xfce4-appfinder-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfce4-appfinder/&xfce4-version;/xfce4-appfinder-&xfce4-appfinder-version;.tar.bz2">
   <!ENTITY xfce4-appfinder-download-ftp  " ">
   <!ENTITY xfce4-appfinder-md5sum        "799f70a9ad67b450da67810a5107e623">
@@ -29,8 +29,8 @@
 
   <sect2 role="package">
-    <title>Introduction to Xfce4-Appfinder</title>
+    <title>Introduction to Xfce4 Appfinder</title>
 
     <para>
-      <application>Xfce4-Appfinder</application> is a tool to find and launch
+      <application>Xfce4 Appfinder</application> is a tool to find and launch
       installed applications by searching the .desktop files installed on your
       system.
@@ -73,10 +73,10 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Xfce4-Appfinder Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Xfce4 Appfinder Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="garcon"/> and
-      <xref linkend="libxfce4ui"/>.
+      <xref linkend="libxfce4ui"/>
     </para>
 
@@ -87,8 +87,8 @@
 
   <sect2 role="installation">
-    <title>Installation of Xfce4-Appfinder</title>
+    <title>Installation of Xfce4 Appfinder</title>
 
     <para>
-      Install <application>Xfce4-Appfinder</application> by running the
+      Install <application>Xfce4 Appfinder</application> by running the
       following commands:
     </para>
@@ -106,4 +106,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -117,7 +118,13 @@
 
       <seglistitem>
-        <seg>xfce4-appfinder</seg>
-        <seg>None</seg>
-        <seg>None</seg>
+        <seg>
+          xfce4-appfinder
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -132,5 +139,5 @@
         <listitem>
           <para>
-            Is a <application>Gtk 2</application> application that enables you
+            Is a <application>GTK+ 2</application> application that enables you
             to quickly search through the .desktop files installed on your
             system looking for an application.
@@ -141,5 +148,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: xfce/core/xfce4-panel.xml
===================================================================
--- xfce/core/xfce4-panel.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/xfce4-panel.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,5 +6,5 @@
 
   <!ENTITY xfce4-panel-download-http
-    "http://archive.xfce.org/src/xfce/xfce4-panel/&xfce4-version;/xfce4-panel-&xfce4-panel-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfce4-panel/&xfce4-version;/xfce4-panel-&xfce4-panel-version;.tar.bz2">
   <!ENTITY xfce4-panel-download-ftp  " ">
   <!ENTITY xfce4-panel-md5sum        "cf7351a4b952dbe3fc5ff509c68def33">
@@ -29,8 +29,8 @@
 
   <sect2 role="package">
-    <title>Introduction to Xfce4-Panel</title>
-
-    <para>
-      The <application>Xfce4-Panel</application> package contains the
+    <title>Introduction to Xfce4 Panel</title>
+
+    <para>
+      The <application>Xfce4 Panel</application> package contains the
       <application>Xfce4</application> Panel.
     </para>
@@ -72,5 +72,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Xfce4-Panel Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Xfce4 Panel Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -79,10 +79,10 @@
       <xref linkend="garcon"/>,
       <xref linkend="libwnck2"/> and
-      <xref linkend="libxfce4ui"/>.
+      <xref linkend="libxfce4ui"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/>.
+      <xref linkend="gtk-doc"/>
     </para>
 
@@ -93,13 +93,15 @@
 
   <sect2 role="installation">
-    <title>Installation of Xfce4-Panel</title>
-
-    <para>
-      Install <application>Xfce4-Panel</application> by running the following
+    <title>Installation of Xfce4 Panel</title>
+
+    <para>
+      Install <application>Xfce4 Panel</application> by running the following
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-  --docdir=/usr/share/doc/xfce4-panel-&xfce4-panel-version; &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --docdir=/usr/share/doc/xfce4-panel-&xfce4-panel-version; \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -113,4 +115,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -120,4 +123,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
+
   </sect2>
 
@@ -135,7 +139,9 @@
           xfce4-popup-directorymenu,
           xfce4-popup-applicationsmenu and
-          xfce4-popup-windowmenu.
+          xfce4-popup-windowmenu
         </seg>
-        <seg>libxfce4panel-1.0.so.</seg>
+        <seg>
+          libxfce4panel-1.0.so
+        </seg>
         <seg>
           /etc/xdg/xfce4/panel,
@@ -145,5 +151,5 @@
           /usr/share/doc/xfce4-panel-&xfce4-panel-version;,
           /usr/share/gtk-doc/html/libxfce4panel-1.0 and
-          /usr/share/xfce4/panel.
+          /usr/share/xfce4/panel
         </seg>
       </seglistitem>
@@ -171,5 +177,5 @@
         <listitem>
           <para>
-            is a shell script that uses <application>DBus</application> and
+            is a shell script that uses <application>D-Bus</application> and
             <application>Xfce Panel</application> to display a popup menu of the
             installed applications.
@@ -185,5 +191,5 @@
         <listitem>
           <para>
-            is a shell script that uses <application>DBus</application> and
+            is a shell script that uses <application>D-Bus</application> and
             <application>Xfce Panel</application> to display a popup menu of
             your home folder and its subdirectories.
@@ -219,5 +225,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
-  </sect2>
+
+  </sect2>
+
 </sect1>
Index: xfce/core/xfce4-power-manager.xml
===================================================================
--- xfce/core/xfce4-power-manager.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/xfce4-power-manager.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,5 +6,5 @@
 
   <!ENTITY xfce4-power-manager-download-http
-    "http://archive.xfce.org/src/xfce/xfce4-power-manager/1.2/xfce4-power-manager-&xfce4-power-manager-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfce4-power-manager/1.2/xfce4-power-manager-&xfce4-power-manager-version;.tar.bz2">
   <!ENTITY xfce4-power-manager-download-ftp  " ">
   <!ENTITY xfce4-power-manager-md5sum        "935599b7114b0a4b0e2c9a5d6c72524c">
@@ -83,5 +83,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libnotify"/> and
+      <xref linkend="libnotify"/>,
+      <xref linkend="upower"/> and
       <xref linkend="xfce4-panel"/>
     </para>
@@ -112,17 +113,6 @@
 
 <screen role="root"><userinput>make docdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version; \
-  imagesdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version;/images install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>docdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version;</parameter>
-      and
-      <parameter>imagesdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version;/images</parameter>:
-      These parameters put a html file and some images in a versioned directory
-      in <filename class="directory">/usr/share/doc</filename>.
-    </para>
+     imagesdir=/usr/share/doc/xfce4-power-manager-&xfce4-power-manager-version;/images install</userinput></screen>
+
   </sect2>
 
@@ -160,5 +150,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> application that displays
+            is a <application>GTK+ 2</application> application that displays
             information about installed devices. It uses
             <application>DBus</application> to comunicate with
@@ -177,5 +167,5 @@
         <listitem>
           <para>
-            is the <application>Xfce</application> power manager.
+            is the <application>Xfce</application> Power Manager.
           </para>
           <indexterm zone="xfce4-power-manager xfce4-power-manager-prog">
@@ -189,6 +179,6 @@
         <listitem>
           <para>
-            is a utility that  comes  with  the  <application>Xfce</application>
-            power manager to access/change its configuration.
+            is a utility that comes with the <application>Xfce</application>
+            Power Manager to access/change its configuration.
           </para>
           <indexterm zone="xfce4-power-manager xfce4-power-manager-settings">
@@ -210,5 +200,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: xfce/core/xfce4-session.xml
===================================================================
--- xfce/core/xfce4-session.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/xfce4-session.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -5,5 +5,6 @@
   %general-entities;
 
-  <!ENTITY xfce4-session-download-http "http://archive.xfce.org/src/xfce/xfce4-session/&xfce4-version;/xfce4-session-&xfce4-session-version;.tar.bz2">
+  <!ENTITY xfce4-session-download-http
+           "http://archive.xfce.org/src/xfce/xfce4-session/&xfce4-version;/xfce4-session-&xfce4-session-version;.tar.bz2">
   <!ENTITY xfce4-session-download-ftp  " ">
   <!ENTITY xfce4-session-md5sum        "4768e1a41a0287af6aad18b329a0f230">
@@ -96,6 +97,8 @@
     </para>
 
-<screen><userinput>./configure --docdir=/usr/share/doc/xfce4-session-&xfce4-session-version; \
-            --prefix=/usr --sysconfdir=/etc --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --docdir=/usr/share/doc/xfce4-session-&xfce4-session-version; \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -109,4 +112,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -116,4 +120,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
+
   </sect2>
 
@@ -121,9 +126,13 @@
     <title>Configuring Xfce4 Session</title>
 
-    <para>There are several optional run time dependencies for
-    <application>Xfce4</application>:  <xref linkend="hicolor-icon-theme"/>,
-    <xref linkend="consolekit"/>, <xref linkend="upower"/>,
-    <xref linkend="openssh"/>, <xref linkend="gnupg2"/>, and
-    <xref linkend="sudo"/>.</para>
+    <para>
+      There are several optional run time dependencies for
+      <application>Xfce4</application>:
+      <xref linkend="hicolor-icon-theme"/>,
+      <xref linkend="consolekit"/>,
+      <xref linkend="openssh"/>,
+      <xref linkend="gnupg2"/> and
+      <xref linkend="sudo"/>.
+    </para>
 
     <para>
@@ -144,5 +153,6 @@
 
 <screen role="root"><userinput>echo <replaceable>USERNAME</replaceable> ${HOSTNAME} = NOPASSWD: /usr/lib/xfce4/session/xfsm-shutdown-helper \
-  &gt;&gt; /etc/sudoers</userinput></screen>
+     &gt;&gt; /etc/sudoers</userinput></screen>
+
   </sect2>
 
@@ -160,11 +170,13 @@
           xfce4-session-logout,
           xfce4-session-settings and
-          xfce4-tips.
+          xfce4-tips
         </seg>
-        <seg>libxfsm-4.6.so.</seg>
+        <seg>
+          libxfsm-4.6.so
+        </seg>
         <seg>
           /usr/include/xfce4/xfce4-session-4.6,
           /usr/share/xfce4/tips and
-          /usr/share/doc/xfce4-session-&xfce4-session-version;.
+          /usr/share/doc/xfce4-session-&xfce4-session-version;
         </seg>
       </seglistitem>
@@ -204,5 +216,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> GUI which allows you to alter
+            is a <application>GTK+ 2</application> GUI which allows you to alter
             your preferences for your <application>Xfce Session</application>.
           </para>
@@ -217,5 +229,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> GUI which displays tips when
+            is a <application>GTK+ 2</application> GUI which displays tips when
             you log in to an <application>Xfce Session</application>.
           </para>
@@ -226,5 +238,5 @@
       </varlistentry>
 
-      <varlistentry id="libxfsm-4.6">
+      <varlistentry id="libxfsm-4">
         <term><filename class="libraryfile">libxfsm-4.6.so</filename></term>
         <listitem>
@@ -232,10 +244,13 @@
             contains the <application>Xfce Session</application> API functions.
           </para>
-          <indexterm zone="xfce4-session libxfsm-4.6">
-            <primary sortas="c-libxfsm-4.6">libxfsm-4.6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
+          <indexterm zone="xfce4-session libxfsm-4">
+            <primary sortas="c-libxfsm-4">libxfsm-4.6.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
-  </sect2>
+
+  </sect2>
+
 </sect1>
Index: xfce/core/xfce4-settings.xml
===================================================================
--- xfce/core/xfce4-settings.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/xfce4-settings.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,5 +6,5 @@
 
   <!ENTITY xfce4-settings-download-http
-    "http://archive.xfce.org/src/xfce/xfce4-settings/&xfce4-version;/xfce4-settings-&xfce4-settings-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfce4-settings/&xfce4-version;/xfce4-settings-&xfce4-settings-version;.tar.bz2">
   <!ENTITY xfce4-settings-download-ftp  " ">
   <!ENTITY xfce4-settings-md5sum        "cc4dd9179ead9046c056431f01a12000">
@@ -81,6 +81,6 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
       <xref linkend="libnotify"/> and
       <xref linkend="libxklavier"/>
@@ -112,4 +112,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -119,4 +120,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
+
   </sect2>
 
@@ -159,5 +161,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> GUI to allow you to change
+            is a <application>GTK+ 2</application> GUI to allow you to change
             some of your keyboard and mouse preferences.
           </para>
@@ -172,5 +174,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> GUI to allow you to change
+            is a <application>GTK+ 2</application> GUI to allow you to change
             some of your theme, icon and font preferences.
           </para>
@@ -185,5 +187,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> GUI to allow you to change
+            is a <application>GTK+ 2</application> GUI to allow you to change
             some of your screen preferences.
           </para>
@@ -198,5 +200,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> GUI to allow you to change
+            is a <application>GTK+ 2</application> GUI to allow you to change
             some of your keyboard preferences.
           </para>
@@ -211,5 +213,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> GUI to allow you to change
+            is a <application>GTK+ 2</application> GUI to allow you to change
             which applications are used to handle different mime types.
           </para>
@@ -224,5 +226,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> GUI to allow you to change
+            is a <application>GTK+ 2</application> GUI to allow you to change
             some of your mouse preferences.
           </para>
@@ -237,5 +239,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> GUI to allow you to change
+            is a <application>GTK+ 2</application> GUI to allow you to change
             your preferences stored in <application>Xfconf</application>.
           </para>
@@ -250,5 +252,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> GUI to allow you to change
+            is a <application>GTK+ 2</application> GUI to allow you to change
             your many of your <application>Xfce</application> preferences.
           </para>
@@ -270,5 +272,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
-  </sect2>
+
+  </sect2>
+
 </sect1>
Index: xfce/core/xfconf.xml
===================================================================
--- xfce/core/xfconf.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/xfconf.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,5 +6,5 @@
 
   <!ENTITY xfconf-download-http
-    "http://archive.xfce.org/src/xfce/xfconf/&xfce4-version;/xfconf-&xfconf-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfconf/&xfce4-version;/xfconf-&xfconf-version;.tar.bz2">
   <!ENTITY xfconf-download-ftp  " ">
   <!ENTITY xfconf-md5sum        "4ed48150a03fb5f42b455494307b7f28">
@@ -14,5 +14,5 @@
 ]>
 
-<sect1 id="xfconf" xreflabel="xfconf-&xfconf-version;">
+<sect1 id="xfconf" xreflabel="Xfconf-&xfconf-version;">
   <?dbhtml filename="xfconf.html"?>
 
@@ -22,8 +22,8 @@
   </sect1info>
 
-  <title>xfconf-&xfconf-version;</title>
+  <title>Xfconf-&xfconf-version;</title>
 
   <indexterm zone="xfconf">
-    <primary sortas="a-xfconf">xfconf</primary>
+    <primary sortas="a-Xfconf">Xfconf</primary>
   </indexterm>
 
@@ -76,11 +76,13 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="perl-glib"/> and
+      <xref linkend="dbus-glib"/> and
       <xref linkend="libxfce4util"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/>.</para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="perl-glib"/>
+    </para>
 
     <para condition="html" role="usernotes">
@@ -118,5 +120,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
@@ -130,9 +133,13 @@
 
       <seglistitem>
-        <seg>xfconf-query.</seg>
-        <seg>libxfconf.so.</seg>
+        <seg>
+          xfconf-query
+        </seg>
+        <seg>
+          libxfconf.so
+        </seg>
         <seg>
           /usr/include/xfconf-0, /usr/lib/xfce4 and
-          /usr/share/gtk-doc/html/xfconf.
+          /usr/share/gtk-doc/html/xfconf
         </seg>
       </seglistitem>
@@ -149,5 +156,5 @@
           <para>
             is a commandline utility to view or change any setting stored in
-            <application>xfconf</application>.
+            <application>Xfconf</application>.
           </para>
           <indexterm zone="xfconf xfconf-query">
@@ -169,5 +176,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: xfce/core/xfdesktop.xml
===================================================================
--- xfce/core/xfdesktop.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/xfdesktop.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -6,13 +6,13 @@
 
   <!ENTITY xfdesktop-download-http
-    "http://archive.xfce.org/src/xfce/xfdesktop/&xfce4-version;/xfdesktop-&xfdesktop-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfdesktop/&xfce4-version;/xfdesktop-&xfdesktop-version;.tar.bz2">
   <!ENTITY xfdesktop-download-ftp  " ">
-  <!ENTITY xfdesktop-md5sum        "d5f6fb9fdde3ddff5804b2a251892936">
+  <!ENTITY xfdesktop-md5sum        "54a84ce63046c279fc3ec3f436d2f1b0">
   <!ENTITY xfdesktop-size          "1.1 MB">
-  <!ENTITY xfdesktop-buildsize     "19 MB">
+  <!ENTITY xfdesktop-buildsize     "20 MB">
   <!ENTITY xfdesktop-time          "0.2 SBU">
 ]>
 
-<sect1 id="xfdesktop" xreflabel="xfdesktop-&xfdesktop-version;">
+<sect1 id="xfdesktop" xreflabel="Xfdesktop-&xfdesktop-version;">
   <?dbhtml filename="xfdesktop.html"?>
 
@@ -22,8 +22,8 @@
   </sect1info>
 
-  <title>xfdesktop-&xfdesktop-version;</title>
+  <title>Xfdesktop-&xfdesktop-version;</title>
 
   <indexterm zone="xfdesktop">
-    <primary sortas="a-xfdesktop">xfdesktop</primary>
+    <primary sortas="a-Xfdesktop">Xfdesktop</primary>
   </indexterm>
 
@@ -84,8 +84,9 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libnotify"/> and
-      <xref linkend="startup-notification"/>,
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libnotify"/>,
+      <xref linkend="startup-notification"/> and
+      <xref linkend="thunar"/>
     </para>
 
@@ -126,6 +127,10 @@
 
       <seglistitem>
-        <seg>xfdesktop and xfdesktop-settings</seg>
-        <seg>None</seg>
+        <seg>
+          xfdesktop and xfdesktop-settings
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /usr/share/backgrounds/xfce and
@@ -157,5 +162,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> application that allows you to
+            is a <application>GTK+ 2</application> application that allows you to
             change your desktop background, some preferences for the righ click
             menu and what icons are displayed on the desktop.
@@ -166,5 +171,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: xfce/core/xfwm4.xml
===================================================================
--- xfce/core/xfwm4.xml	(revision bb9728099f29795aaa463687b87e662613785838)
+++ xfce/core/xfwm4.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="xfwm4" xreflabel="xfwm4-&xfwm4-version;">
+<sect1 id="xfwm4" xreflabel="Xfwm4-&xfwm4-version;">
   <?dbhtml filename="xfwm4.html"?>
 
@@ -21,8 +21,8 @@
   </sect1info>
 
-  <title>xfwm4-&xfwm4-version;</title>
+  <title>Xfwm4-&xfwm4-version;</title>
 
   <indexterm zone="xfwm4">
-    <primary sortas="a-xfwm4">xfwm4</primary>
+    <primary sortas="a-Xfwm4">Xfwm4</primary>
   </indexterm>
 
@@ -77,10 +77,10 @@
       <xref linkend="libwnck2"/>,
       <xref linkend="libxfce4ui"/> and
-      <xref linkend="libxfce4util"/>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="startup-notification"/>.
+      <xref linkend="libxfce4util"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="startup-notification"/>
     </para>
 
@@ -110,4 +110,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -159,5 +160,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> application that allows you to
+            is a <application>GTK+ 2</application> application that allows you to
             set some preferences such as your theme, keyboard shortcuts and
             mouse focus behaviour.
@@ -173,5 +174,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> application that allows you to
+            is a <application>GTK+ 2</application> application that allows you to
             set some more preferences for <application>Xfwm4</application>.
           </para>
@@ -186,5 +187,5 @@
         <listitem>
           <para>
-            is a <application>Gtk 2</application> application that allows you to
+            is a <application>GTK+ 2</application> application that allows you to
             set your workspace preferences.
           </para>
@@ -194,5 +195,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
