Index: xfce/apps/midori.xml
===================================================================
--- xfce/apps/midori.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ xfce/apps/midori.xml	(revision f46244e86f55ef3762240a282b051a89340b9796)
@@ -79,5 +79,5 @@
       <xref linkend="cmake"/>,
       <xref linkend="libnotify"/>,
-      <xref linkend="webkitgtk2"/> (see "Command Explanations"), and
+      <xref linkend="webkitgtk2"/> (Compiled against either GTK+ 2 or GTK+ 3 - see "Command Explanations"), and
       <xref linkend="vala"/>
     </para>
@@ -140,15 +140,15 @@
 
     <para>
-      <parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
-      <xref linkend="libzeitgeist"/> is installed. 
+      <parameter>-DUSE_ZEITGEIST=OFF</parameter>: This switch disables Zeitgeist
+      support. Remove it if you have installed <xref linkend="libzeitgeist"/>. 
     </para>
 
     <para>
       <option>-DUSE_GTK3=1</option>: Use this switch if you want to build
-      <application>Midori</application> with
-      <application>WebKitGTK+</application> built against <application>GTK+
-      3</application>, because by default it chooses
-      <application>WebKitGTK+</application> built against <application>GTK+
-      2</application>.
+      <application>Midori</application> using
+      <application>WebKitGTK+</application> built against
+      <application>GTK+ 3</application>. <command>cmake</command>
+      defaults to the <application>WebKitGTK+</application> built
+      against <application>GTK+ 2</application>.
     </para>
 
Index: xfce/apps/vte2.xml
===================================================================
--- xfce/apps/vte2.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ xfce/apps/vte2.xml	(revision f46244e86f55ef3762240a282b051a89340b9796)
@@ -103,5 +103,5 @@
 <screen><userinput>./configure --prefix=/usr \
             --libexecdir=/usr/lib/vte \
-            --disable-static  &amp;&amp;
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
Index: xfce/core/core.xml
===================================================================
--- xfce/core/core.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ xfce/core/core.xml	(revision f46244e86f55ef3762240a282b051a89340b9796)
@@ -44,6 +44,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxfcegui4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-panel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar-volman.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar-volman-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tumbler.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-appfinder.xml"/>
@@ -52,5 +52,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfdesktop.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfwm4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-session.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-session-systemd.xml"/>
 
 </chapter>
Index: xfce/core/thunar-systemd.xml
===================================================================
--- xfce/core/thunar-systemd.xml	(revision f46244e86f55ef3762240a282b051a89340b9796)
+++ xfce/core/thunar-systemd.xml	(revision f46244e86f55ef3762240a282b051a89340b9796)
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!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        "4f10d5d5576ce5127308d6badbac3afa">
+  <!ENTITY thunar-size          "1.9 MB">
+  <!ENTITY thunar-buildsize     "60 MB">
+  <!ENTITY thunar-time          "0.7 SBU">
+]>
+
+<sect1 id="thunar" xreflabel="Thunar-&thunar-version;">
+  <?dbhtml filename="thunar.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Thunar-&thunar-version;</title>
+
+  <indexterm zone="thunar">
+    <primary sortas="a-Thunar">Thunar</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Thunar</title>
+
+    <para>
+      <application>Thunar</application> is the <application>Xfce</application>
+      file manager, a <application>GTK+ 2</application> GUI to organise the files
+      on your computer.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&thunar-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&thunar-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &thunar-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &thunar-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &thunar-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &thunar-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Thunar Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="exo"/> and
+      <xref linkend="libxfce4ui"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libnotify"/>,
+      <xref linkend="startup-notification"/>,
+      <xref linkend="systemd"/> (for GUdev) and
+      <xref linkend="xfce4-panel"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gvfs"/> (for remote browsing and automounting),
+      <xref linkend="libexif"/> and
+      <xref linkend="tumbler"/> (runtime)
+    </para>
+
+    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
+    <para role="optional">
+      An icon theme such as <xref linkend="adwaita-icon-theme"/>,
+      <xref linkend="gnome-icon-theme"/> or
+      <xref linkend="lxde-icon-theme"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/thunar"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Thunar</title>
+
+    <para>
+      Install <application>Thunar</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --docdir=/usr/share/doc/Thunar-&thunar-version; &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<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/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          Thunar, thunar and thunar-settings
+        </seg>
+        <seg>
+          libthunarx-2.so
+        </seg>
+        <seg>
+          /etc/xdg/Thunar,
+          /usr/include/thunarx-2,
+          /usr/lib/Thunar,
+          /usr/lib/thunarx-2,
+          /usr/share/doc/Thunar-&thunar-version;,
+          /usr/share/gtk-doc/html/thunarx,
+          /usr/share/pixmaps/Thunar and
+          /usr/share/Thunar
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="Thunar">
+        <term><command>Thunar</command></term>
+        <listitem>
+          <para>
+            is the <application>Xfce</application> file manager.
+          </para>
+          <indexterm zone="thunar Thunar">
+            <primary sortas="b-Thunar">Thunar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="thunar-prog">
+        <term><command>thunar</command></term>
+        <listitem>
+          <para>
+            is a symbolic link to <application>Thunar</application>.
+          </para>
+          <indexterm zone="thunar thunar-prog">
+            <primary sortas="b-thunar">thunar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="thunar-settings">
+        <term><command>thunar-settings</command></term>
+        <listitem>
+          <para>
+            is a shell script that launches a dialog box to allow you to alter
+            the behaviour of <application>Thunar</application>.
+          </para>
+          <indexterm zone="thunar thunar-settings">
+            <primary sortas="b-thunar-settings">thunar-settings</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libthunarx-2">
+        <term><filename class="libraryfile">libthunarx-2.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Thunar</application> extension library
+            which permits adding new features to the
+            <application>Thunar</application> file manager.
+          </para>
+          <indexterm zone="thunar libthunarx-2">
+            <primary sortas="c-libthunarx-2">libthunarx-2.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xfce/core/thunar-volman-systemd.xml
===================================================================
--- xfce/core/thunar-volman-systemd.xml	(revision f46244e86f55ef3762240a282b051a89340b9796)
+++ xfce/core/thunar-volman-systemd.xml	(revision f46244e86f55ef3762240a282b051a89340b9796)
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %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-ftp  " ">
+  <!ENTITY thunar-volman-md5sum        "250af757ea629c7c27f554d17119080c">
+  <!ENTITY thunar-volman-size          "404 KB">
+  <!ENTITY thunar-volman-buildsize     "6.6 MB">
+  <!ENTITY thunar-volman-time          "0.1 SBU">
+]>
+
+<sect1 id="thunar-volman" xreflabel="thunar-volman-&thunar-volman-version;">
+  <?dbhtml filename="thunar-volman.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>thunar-volman-&thunar-volman-version;</title>
+
+  <indexterm zone="thunar-volman">
+    <primary sortas="a-thunar-volman">thunar-volman</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to the Thunar Volume Manager</title>
+
+    <para>
+      The <application>Thunar Volume Manager</application> is an extension for
+      the <application>Thunar</application> file manager, which enables
+      automatic management of removable drives and media.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&thunar-volman-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&thunar-volman-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &thunar-volman-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &thunar-volman-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &thunar-volman-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &thunar-volman-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Thunar Volume Manager Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="exo"/>,
+      <xref linkend="libxfce4ui"/> and
+      <xref linkend="systemd"/> (for GUdev)
+    </para>
+
+    <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>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/thunar-volman"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of the Thunar Volume Manager</title>
+
+    <para>
+      Install the <application>Thunar Volume Manager</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          thunar-volman and thunar-volman-settings
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="thunar-volman-prog">
+        <term><command>thunar-volman</command></term>
+        <listitem>
+          <para>
+            is the <application>Thunar</application> Volume Manager, a command
+            line utility to automatically mount or unmount removable media.
+          </para>
+          <indexterm zone="thunar-volman thunar-volman-prog">
+            <primary sortas="b-thunar-volman">thunar-volman</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="thunar-volman-settings">
+        <term><command>thunar-volman-settings</command></term>
+        <listitem>
+          <para>
+            is a small <application>GTK+ 2</application> application for changing
+            <application>Thunar Volume Manager</application> settings.
+          </para>
+          <indexterm zone="thunar-volman thunar-volman-settings">
+            <primary sortas="b-thunar-volman-settings">thunar-volman-settings</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xfce/core/thunar-volman.xml
===================================================================
--- xfce/core/thunar-volman.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ 	(revision )
@@ -1,180 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %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-ftp  " ">
-  <!ENTITY thunar-volman-md5sum        "250af757ea629c7c27f554d17119080c">
-  <!ENTITY thunar-volman-size          "404 KB">
-  <!ENTITY thunar-volman-buildsize     "6.6 MB">
-  <!ENTITY thunar-volman-time          "0.1 SBU">
-]>
-
-<sect1 id="thunar-volman" xreflabel="thunar-volman-&thunar-volman-version;">
-  <?dbhtml filename="thunar-volman.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>thunar-volman-&thunar-volman-version;</title>
-
-  <indexterm zone="thunar-volman">
-    <primary sortas="a-thunar-volman">thunar-volman</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to the Thunar Volume Manager</title>
-
-    <para>
-      The <application>Thunar Volume Manager</application> is an extension for
-      the <application>Thunar</application> file manager, which enables
-      automatic management of removable drives and media.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&thunar-volman-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&thunar-volman-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &thunar-volman-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &thunar-volman-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &thunar-volman-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &thunar-volman-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Thunar Volume Manager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="exo"/>,
-      <xref linkend="libxfce4ui"/> and
-      <xref linkend="systemd"/> (for GUdev)
-    </para>
-
-    <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>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/thunar-volman"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of the Thunar Volume Manager</title>
-
-    <para>
-      Install the <application>Thunar Volume Manager</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          thunar-volman and thunar-volman-settings
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="thunar-volman-prog">
-        <term><command>thunar-volman</command></term>
-        <listitem>
-          <para>
-            is the <application>Thunar</application> Volume Manager, a command
-            line utility to automatically mount or unmount removable media.
-          </para>
-          <indexterm zone="thunar-volman thunar-volman-prog">
-            <primary sortas="b-thunar-volman">thunar-volman</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="thunar-volman-settings">
-        <term><command>thunar-volman-settings</command></term>
-        <listitem>
-          <para>
-            is a small <application>GTK+ 2</application> application for changing
-            <application>Thunar Volume Manager</application> settings.
-          </para>
-          <indexterm zone="thunar-volman thunar-volman-settings">
-            <primary sortas="b-thunar-volman-settings">thunar-volman-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xfce/core/thunar.xml
===================================================================
--- xfce/core/thunar.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ 	(revision )
@@ -1,230 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!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        "4f10d5d5576ce5127308d6badbac3afa">
-  <!ENTITY thunar-size          "1.9 MB">
-  <!ENTITY thunar-buildsize     "60 MB">
-  <!ENTITY thunar-time          "0.7 SBU">
-]>
-
-<sect1 id="thunar" xreflabel="Thunar-&thunar-version;">
-  <?dbhtml filename="thunar.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Thunar-&thunar-version;</title>
-
-  <indexterm zone="thunar">
-    <primary sortas="a-Thunar">Thunar</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Thunar</title>
-
-    <para>
-      <application>Thunar</application> is the <application>Xfce</application>
-      file manager, a <application>GTK+ 2</application> GUI to organise the files
-      on your computer.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&thunar-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&thunar-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &thunar-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &thunar-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &thunar-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &thunar-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Thunar Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="exo"/> and
-      <xref linkend="libxfce4ui"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required runtime">
-      <xref linkend="gnome-icon-theme"/> or
-      <xref linkend="lxde-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libnotify"/>,
-      <xref linkend="startup-notification"/>,
-      <xref linkend="systemd"/> (for GUdev) and
-      <xref linkend="xfce4-panel"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gvfs"/> (for remote browsing and automounting),
-      <xref linkend="libexif"/> and
-      <xref linkend="tumbler"/> (runtime)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/thunar"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Thunar</title>
-
-    <para>
-      Install <application>Thunar</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --docdir=/usr/share/doc/Thunar-&thunar-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<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/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          Thunar, thunar and thunar-settings
-        </seg>
-        <seg>
-          libthunarx-2.so
-        </seg>
-        <seg>
-          /etc/xdg/Thunar,
-          /usr/include/thunarx-2,
-          /usr/lib/Thunar,
-          /usr/lib/thunarx-2,
-          /usr/share/doc/Thunar-&thunar-version;,
-          /usr/share/gtk-doc/html/thunarx,
-          /usr/share/pixmaps/Thunar and
-          /usr/share/Thunar
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="Thunar">
-        <term><command>Thunar</command></term>
-        <listitem>
-          <para>
-            is the <application>Xfce</application> file manager.
-          </para>
-          <indexterm zone="thunar Thunar">
-            <primary sortas="b-Thunar">Thunar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="thunar-prog">
-        <term><command>thunar</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <application>Thunar</application>.
-          </para>
-          <indexterm zone="thunar thunar-prog">
-            <primary sortas="b-thunar">thunar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="thunar-settings">
-        <term><command>thunar-settings</command></term>
-        <listitem>
-          <para>
-            is a shell script that launches a dialog box to allow you to alter
-            the behaviour of <application>Thunar</application>.
-          </para>
-          <indexterm zone="thunar thunar-settings">
-            <primary sortas="b-thunar-settings">thunar-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libthunarx-2">
-        <term><filename class="libraryfile">libthunarx-2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Thunar</application> extension library
-            which permits adding new features to the
-            <application>Thunar</application> file manager.
-          </para>
-          <indexterm zone="thunar libthunarx-2">
-            <primary sortas="c-libthunarx-2">libthunarx-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xfce/core/xfce4-session-systemd.xml
===================================================================
--- xfce/core/xfce4-session-systemd.xml	(revision f46244e86f55ef3762240a282b051a89340b9796)
+++ xfce/core/xfce4-session-systemd.xml	(revision f46244e86f55ef3762240a282b051a89340b9796)
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %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-ftp  " ">
+  <!ENTITY xfce4-session-md5sum        "1757657c1d590aa6274b7b7cbba33352">
+  <!ENTITY xfce4-session-size          "1.3 MB">
+  <!ENTITY xfce4-session-buildsize     "21 MB">
+  <!ENTITY xfce4-session-time          "0.3 SBU">
+]>
+
+<sect1 id="xfce4-session" xreflabel="xfce4-session-&xfce4-session-version;">
+  <?dbhtml filename="xfce4-session.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>xfce4-session-&xfce4-session-version;</title>
+
+  <indexterm zone="xfce4-session">
+    <primary sortas="a-xfce4-session">xfce4-session</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Xfce4 Session</title>
+
+    <para>
+      <application>Xfce4 Session</application> is a session manager for
+      <application>Xfce</application>. Its task is to save the state of your
+      desktop (opened applications and their location) and restore it during a
+      next startup. You can create several different sessions and choose one of
+      them on startup.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&xfce4-session-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xfce4-session-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xfce4-session-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xfce4-session-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xfce4-session-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xfce4-session-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/xfce4-session-&xfce4-session-version;-logind_suspend_hibernate-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Xfce4 Session Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libwnck2"/>,
+      <xref linkend="libxfce4ui"/>, and
+      <xref linkend="which"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/xfce4-session"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Xfce4 Session</title>
+
+    <para>
+      Install <application>Xfce4 Session</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../xfce4-session-&xfce4-session-version;-logind_suspend_hibernate-1.patch &amp;&amp;
+./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-legacy-sm &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>--disable-legacy-sm</option>: This switch disables
+      legacy session management which isn't necessary on modern
+      system.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Xfce4 Session</title>
+
+    <para>
+      There are several optional run time dependencies for
+      <application>Xfce4</application>:
+      <xref linkend="dbus"/>,
+      <xref linkend="gnupg2"/>,
+      <xref linkend="hicolor-icon-theme"/>,
+      <xref linkend="openssh"/> and
+      <xref linkend="systemd"/> (for Logind)
+    </para>
+
+    <para>
+      To launch <application>Xfce4</application> use the command
+      <command>startxfce4</command>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          xfce4-session,
+          xfce4-session-logout,
+          xfce4-session-settings and
+          xfce4-tips
+        </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;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="xfce4-session-prog">
+        <term><command>xfce4-session</command></term>
+        <listitem>
+          <para>
+            starts up the <application>Xfce</application> Desktop Environment.
+          </para>
+          <indexterm zone="xfce4-session xfce4-session-prog">
+            <primary sortas="b-xfce4-session">xfce4-session</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xfce4-session-logout">
+        <term><command>xfce4-session-logout</command></term>
+        <listitem>
+          <para>
+            logs out from <application>Xfce</application>.
+          </para>
+          <indexterm zone="xfce4-session xfce4-session-logout">
+            <primary sortas="b-xfce4-session-logout">xfce4-session-logout</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xfce4-session-settings">
+        <term><command>xfce4-session-settings</command></term>
+        <listitem>
+          <para>
+            is a <application>GTK+ 2</application> GUI which allows you to alter
+            your preferences for your <application>Xfce Session</application>.
+          </para>
+          <indexterm zone="xfce4-session xfce4-session-settings">
+            <primary sortas="b-xfce4-session-settings">xfce4-session-settings</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xfce4-tips">
+        <term><command>xfce4-tips</command></term>
+        <listitem>
+          <para>
+            is a <application>GTK+ 2</application> GUI which displays tips when
+            you log in to an <application>Xfce Session</application>.
+          </para>
+          <indexterm zone="xfce4-session xfce4-tips">
+            <primary sortas="b-xfce4-tips">xfce4-tips</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libxfsm-4">
+        <term><filename class="libraryfile">libxfsm-4.6.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Xfce Session</application> API functions.
+          </para>
+          <indexterm zone="xfce4-session libxfsm-4">
+            <primary sortas="c-libxfsm-4">libxfsm-4.6.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xfce/core/xfce4-session.xml
===================================================================
--- xfce/core/xfce4-session.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ 	(revision )
@@ -1,248 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %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-ftp  " ">
-  <!ENTITY xfce4-session-md5sum        "1757657c1d590aa6274b7b7cbba33352">
-  <!ENTITY xfce4-session-size          "1.3 MB">
-  <!ENTITY xfce4-session-buildsize     "21 MB">
-  <!ENTITY xfce4-session-time          "0.3 SBU">
-]>
-
-<sect1 id="xfce4-session" xreflabel="xfce4-session-&xfce4-session-version;">
-  <?dbhtml filename="xfce4-session.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>xfce4-session-&xfce4-session-version;</title>
-
-  <indexterm zone="xfce4-session">
-    <primary sortas="a-xfce4-session">xfce4-session</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfce4 Session</title>
-
-    <para>
-      <application>Xfce4 Session</application> is a session manager for
-      <application>Xfce</application>. Its task is to save the state of your
-      desktop (opened applications and their location) and restore it during a
-      next startup. You can create several different sessions and choose one of
-      them on startup.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-session-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-session-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-session-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-session-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-session-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-session-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfce4 Session Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libwnck2"/>,
-      <xref linkend="libxfce4ui"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/xfce4-session"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfce4 Session</title>
-
-    <para>
-      Install <application>Xfce4 Session</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-legacy-sm &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-legacy-sm</option>: This switch disables
-      legacy session management which isn't necessary on modern
-      system.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Xfce4 Session</title>
-
-    <para>
-      There are several optional run time dependencies for
-      <application>Xfce4</application>:
-      <xref linkend="systemd"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="gnupg2"/>,
-      <xref linkend="hicolor-icon-theme"/> and
-      <xref linkend="openssh"/>
-    </para>
-
-    <para>
-      To launch <application>Xfce4</application> use the command
-      <command>startxfce4</command>. If you have <xref linkend="systemd"/>
-      installed, use <command>startxfce4 --with-ck-launch</command>.
-      <application>ConsoleKit</application> is required to perform any
-      task that requires administrative access, including shut down
-      and reboot.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfce4-session,
-          xfce4-session-logout,
-          xfce4-session-settings and
-          xfce4-tips
-        </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;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-session-prog">
-        <term><command>xfce4-session</command></term>
-        <listitem>
-          <para>
-            starts up the <application>Xfce</application> Desktop Environment.
-          </para>
-          <indexterm zone="xfce4-session xfce4-session-prog">
-            <primary sortas="b-xfce4-session">xfce4-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-session-logout">
-        <term><command>xfce4-session-logout</command></term>
-        <listitem>
-          <para>
-            logs out from <application>Xfce</application>.
-          </para>
-          <indexterm zone="xfce4-session xfce4-session-logout">
-            <primary sortas="b-xfce4-session-logout">xfce4-session-logout</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-session-settings">
-        <term><command>xfce4-session-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 2</application> GUI which allows you to alter
-            your preferences for your <application>Xfce Session</application>.
-          </para>
-          <indexterm zone="xfce4-session xfce4-session-settings">
-            <primary sortas="b-xfce4-session-settings">xfce4-session-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-tips">
-        <term><command>xfce4-tips</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 2</application> GUI which displays tips when
-            you log in to an <application>Xfce Session</application>.
-          </para>
-          <indexterm zone="xfce4-session xfce4-tips">
-            <primary sortas="b-xfce4-tips">xfce4-tips</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxfsm-4">
-        <term><filename class="libraryfile">libxfsm-4.6.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Xfce Session</application> API functions.
-          </para>
-          <indexterm zone="xfce4-session libxfsm-4">
-            <primary sortas="c-libxfsm-4">libxfsm-4.6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xfce/core/xfce4-settings.xml
===================================================================
--- xfce/core/xfce4-settings.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ xfce/core/xfce4-settings.xml	(revision f46244e86f55ef3762240a282b051a89340b9796)
@@ -82,10 +82,4 @@
     </para>
 
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required runtime">
-      <xref linkend="gnome-icon-theme"/> or
-      <xref linkend="lxde-icon-theme"/>
-    </para>
-
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -93,4 +87,11 @@
       <xref linkend="libnotify"/> and
       <xref linkend="libxklavier"/>
+    </para>
+
+    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
+    <para role="optional">
+      An icon theme such as <xref linkend="adwaita-icon-theme"/>,
+      <xref linkend="gnome-icon-theme"/> or
+      <xref linkend="lxde-icon-theme"/>
     </para>
 
