Index: general/genlib/boost.xml
===================================================================
--- general/genlib/boost.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/boost.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -131,8 +131,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libboost_chrono.so, libboost_date_time.so, libboost_exception.a,
Index: general/genlib/glibmm.xml
===================================================================
--- general/genlib/glibmm.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/glibmm.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -111,8 +111,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libgiomm-2.4.so, libglibmm-2.4.so and
Index: general/genlib/gmime.xml
===================================================================
--- general/genlib/gmime.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/gmime.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -141,8 +141,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libgmime-2.6.so
Index: general/genlib/iso-codes.xml
===================================================================
--- general/genlib/iso-codes.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/iso-codes.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -104,7 +104,15 @@
 
     <segmentedlist>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /usr/share/xml/iso-codes
Index: general/genlib/json-c.xml
===================================================================
--- general/genlib/json-c.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/json-c.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -112,8 +112,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libjson.so
Index: general/genlib/json-glib.xml
===================================================================
--- general/genlib/json-glib.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/json-glib.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -129,8 +129,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libjson-glib-1.0.so
Index: general/genlib/libatomic_ops.xml
===================================================================
--- general/genlib/libatomic_ops.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/libatomic_ops.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -125,8 +125,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libatomic_ops.so and libatomic_ops_gpl.so
Index: general/genlib/libdaemon.xml
===================================================================
--- general/genlib/libdaemon.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/libdaemon.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -135,8 +135,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libdaemon.so
Index: general/genlib/libdbusmenuqt.xml
===================================================================
--- general/genlib/libdbusmenuqt.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/libdbusmenuqt.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -116,6 +116,6 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
Index: general/genlib/libdrm.xml
===================================================================
--- general/genlib/libdrm.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/libdrm.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -149,8 +149,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libdrm.so, libdrm_exynos.so, libdrm_intel.so,
Index: general/genlib/libffi.xml
===================================================================
--- general/genlib/libffi.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/libffi.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -95,5 +95,5 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
Index: general/genlib/libsigc++.xml
===================================================================
--- general/genlib/libsigc++.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/libsigc++.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -103,8 +103,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libsigc-2.0.so
Index: general/genlib/libunique.xml
===================================================================
--- general/genlib/libunique.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/libunique.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -128,8 +128,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libunique-3.0.so
Index: general/genlib/libusb-compat.xml
===================================================================
--- general/genlib/libusb-compat.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/libusb-compat.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -115,8 +115,10 @@
       <segtitle>Installed Program</segtitle>
       <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>libusb-config</seg>
         <seg>libusb.so</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
Index: general/genlib/libusb.xml
===================================================================
--- general/genlib/libusb.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/libusb.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -148,8 +148,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libusb-1.0.so
Index: general/genlib/lzo.xml
===================================================================
--- general/genlib/lzo.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/lzo.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -108,8 +108,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           liblzo2.{so,a}
Index: general/genlib/mtdev.xml
===================================================================
--- general/genlib/mtdev.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/mtdev.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -114,4 +114,5 @@
       <segtitle>Installed Program</segtitle>
       <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -121,4 +122,7 @@
         <seg>
           libmtdev.so
+        </seg>
+        <seg>
+          None
         </seg>
       </seglistitem>
Index: general/genlib/talloc.xml
===================================================================
--- general/genlib/talloc.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/talloc.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -113,10 +113,18 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
+          None
+        </seg>
+        <seg>
           libpytalloc-util.so, libtalloc.so and
           talloc.so (Python Module)
+        </seg>
+        <seg>
+          None
         </seg>
       </seglistitem>
Index: general/genlib/telepathy-farstream.xml
===================================================================
--- general/genlib/telepathy-farstream.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/telepathy-farstream.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -129,8 +129,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libtelepathy-farstream.so
Index: general/genlib/telepathy-glib.xml
===================================================================
--- general/genlib/telepathy-glib.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genlib/telepathy-glib.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -146,8 +146,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libtelepathy-glib.so
Index: general/genutils/desktop-file-utils.xml
===================================================================
--- general/genutils/desktop-file-utils.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genutils/desktop-file-utils.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -166,4 +166,6 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -173,4 +175,10 @@
           update-desktop-database
         </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: general/genutils/intltool.xml
===================================================================
--- general/genutils/intltool.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genutils/intltool.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -118,4 +118,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -124,4 +125,7 @@
           intltool-extract, intltool-merge, intltool-prepare,
           intltool-update and intltoolize
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: general/genutils/xscreensaver.xml
===================================================================
--- general/genutils/xscreensaver.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/genutils/xscreensaver.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -186,4 +186,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -195,5 +196,9 @@
         </seg>
         <seg>
-          /usr/lib/xscreensaver and /usr/share/xscreensaver
+          None
+        </seg>
+        <seg>
+          /usr/lib/xscreensaver and
+          /usr/share/xscreensaver
         </seg>
       </seglistitem>
Index: general/graphlib/babl.xml
===================================================================
--- general/graphlib/babl.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/graphlib/babl.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -139,8 +139,10 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>None</seg>
         <seg>libbabl.so, and libraries in /usr/lib/babl-0.1/</seg>
         <seg>/usr/include/babl-0.1/</seg>
Index: general/graphlib/exiv2.xml
===================================================================
--- general/graphlib/exiv2.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/graphlib/exiv2.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -120,4 +120,5 @@
       <segtitle>Installed Program</segtitle>
       <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -127,4 +128,7 @@
         <seg>
           libexiv2.so
+        </seg>
+        <seg>
+          None
         </seg>
       </seglistitem>
Index: general/graphlib/lcms2.xml
===================================================================
--- general/graphlib/lcms2.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/graphlib/lcms2.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -95,8 +95,10 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>jpgicc, linkicc, psicc, tificc, and transicc</seg>
         <seg>liblcms2.so</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
Index: general/graphlib/libexif.xml
===================================================================
--- general/graphlib/libexif.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/graphlib/libexif.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -132,8 +132,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libexif.so
Index: general/graphlib/pixman.xml
===================================================================
--- general/graphlib/pixman.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/graphlib/pixman.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -118,8 +118,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libpixman-1.so
Index: general/prog/bazaar.xml
===================================================================
--- general/prog/bazaar.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/prog/bazaar.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -126,8 +126,10 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>bzr, pyrexc</seg>
+        <seg>None</seg>
         <seg>/usr/share/doc/Pyrex, /usr/lib/python2.7/site-packages/bzrlib</seg>
       </seglistitem>
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/prog/cmake.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -144,4 +144,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -149,4 +150,7 @@
         <seg>
           ccmake, cmake, cmake-gui, cpack and ctest
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/prog/doxygen.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -171,4 +171,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -176,4 +177,7 @@
         <seg>
           doxygen and optionally, doxywizard
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: general/prog/gc.xml
===================================================================
--- general/prog/gc.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/prog/gc.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -130,8 +130,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libcord.so, libgc.so and
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/prog/git.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -250,9 +250,11 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>git, git-cvsserver, gitk, git-receive-pack, git-shell,
-        git-upload-archive and git-upload-pack.</seg>
+        git-upload-archive and git-upload-pack</seg>
+        <seg>None</seg>
         <seg>/usr/libexec/git-core, /usr/share/git-&git-version;,
         /usr/share/git-core, /usr/share/git-gui, /usr/share/gitk and
Index: general/prog/nasm.xml
===================================================================
--- general/prog/nasm.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/prog/nasm.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -108,8 +108,10 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>nasm and ndisasm</seg>
+        <seg>None</seg>
         <seg>/usr/share/doc/nasm-&NASM-version;</seg>
       </seglistitem>
Index: general/prog/pkgconfig.xml
===================================================================
--- general/prog/pkgconfig.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/prog/pkgconfig.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -139,8 +139,16 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
           pkg-config
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
         </seg>
       </seglistitem>
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/prog/python-modules.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -233,7 +233,15 @@
 
       <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
         <segtitle>Installed Directory</segtitle>
 
         <seglistitem>
+          <seg>
+            None
+          </seg>
+          <seg>
+            None
+          </seg>
           <seg>
             /usr/lib/python&python2-majorver;/site-packages/gtk-2.0/pynotify
@@ -349,9 +357,15 @@
 
       <segmentedlist>
-        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Library</segtitle>
         <segtitle>Installed Directory</segtitle>
 
         <seglistitem>
-          <seg>_cairo.so</seg>
+          <seg>
+            None
+          </seg>
+          <seg>
+            _cairo.so
+          </seg>
           <seg>
             /usr/include/pycairo and
@@ -619,8 +633,12 @@
 
       <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
         <segtitle>Installed Library</segtitle>
         <segtitle>Installed Directories</segtitle>
 
         <seglistitem>
+          <seg>
+            None
+           </seg>
           <seg>
             libpyglib-gi-2.0-python.so
@@ -934,7 +952,15 @@
 
       <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
         <segtitle>Installed Directory</segtitle>
 
         <seglistitem>
+          <seg>
+            None
+          </seg>
+          <seg>
+            None
+          </seg>
           <seg>
             /usr/lib/python&python2-majorver;/site-packages/pyatspi
@@ -1039,10 +1065,14 @@
 
       <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Directories</segtitle>
+        <segtitle>Installed Program</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directory</segtitle>
 
         <seglistitem>
           <seg>
             pyrexc
+          </seg>
+          <seg>
+            None
           </seg>
           <seg>
Index: general/sysutils/hdparm.xml
===================================================================
--- general/sysutils/hdparm.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/sysutils/hdparm.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -125,8 +125,16 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
           hdparm
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
         </seg>
       </seglistitem>
Index: general/sysutils/obex-data-server.xml
===================================================================
--- general/sysutils/obex-data-server.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/sysutils/obex-data-server.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -124,4 +124,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -129,4 +130,7 @@
         <seg>
           obex-data-server
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: general/sysutils/obexd.xml
===================================================================
--- general/sysutils/obexd.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/sysutils/obexd.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -115,4 +115,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -120,4 +121,7 @@
         <seg>
           obex-client and obexd
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: general/sysutils/sg3_utils.xml
===================================================================
--- general/sysutils/sg3_utils.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/sysutils/sg3_utils.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -117,4 +117,5 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -133,4 +134,7 @@
           libsgutils2.so
         </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: general/sysutils/udisks.xml
===================================================================
--- general/sysutils/udisks.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/sysutils/udisks.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -135,4 +135,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -141,4 +142,7 @@
           udisks, udisks-daemon, udisks-tcp-bridge and
           umount.udisks
+        </seg>
+        <seg>
+          None
         </seg>
         <seg> 
Index: general/sysutils/unrar.xml
===================================================================
--- general/sysutils/unrar.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/sysutils/unrar.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -106,9 +106,17 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
           unrar
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
         </seg>
       </seglistitem>
Index: general/sysutils/usbutils.xml
===================================================================
--- general/sysutils/usbutils.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ general/sysutils/usbutils.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -152,4 +152,6 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -157,4 +159,10 @@
           lsusb, update-usbids, usb-devices and usbhid-dump
         </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/applications/aisleriot.xml
===================================================================
--- gnome/applications/aisleriot.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/aisleriot.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -125,4 +125,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -130,4 +131,7 @@
         <seg>
           sol
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/alacarte.xml
===================================================================
--- gnome/applications/alacarte.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/alacarte.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -113,4 +113,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -118,4 +119,7 @@
         <seg>
           alacarte
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/baobab.xml
===================================================================
--- gnome/applications/baobab.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/baobab.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -113,4 +113,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -118,4 +119,7 @@
         <seg>
           baobab
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/empathy.xml
===================================================================
--- gnome/applications/empathy.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/empathy.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -166,4 +166,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -171,4 +172,7 @@
         <seg>
           empathy, empathy-accounts and empathy-debugger
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/eog.xml
===================================================================
--- gnome/applications/eog.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/eog.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -141,4 +141,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -146,4 +147,7 @@
         <seg>
           eog
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/epiphany-extensions.xml
===================================================================
--- gnome/applications/epiphany-extensions.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/epiphany-extensions.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -147,8 +147,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Extensions</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libactionsextension.so, libadblockextension.so,
Index: gnome/applications/epiphany.xml
===================================================================
--- gnome/applications/epiphany.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/epiphany.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -150,4 +150,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -155,4 +156,7 @@
         <seg>
           epiphany
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/evolution.xml
===================================================================
--- gnome/applications/evolution.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/evolution.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -167,4 +167,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -172,4 +173,7 @@
         <seg>
           evolution
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/file-roller.xml
===================================================================
--- gnome/applications/file-roller.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/file-roller.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -157,4 +157,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -162,4 +163,7 @@
         <seg>
           file-roller
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/gcalctool.xml
===================================================================
--- gnome/applications/gcalctool.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/gcalctool.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -114,4 +114,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -119,4 +120,7 @@
         <seg>
           gcalccmd and gcalctool
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/gedit.xml
===================================================================
--- gnome/applications/gedit.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/gedit.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -144,4 +144,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -149,4 +150,7 @@
         <seg>
           gedit
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/gnome-color-manager.xml
===================================================================
--- gnome/applications/gnome-color-manager.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/gnome-color-manager.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -138,4 +138,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -144,4 +145,7 @@
           gcm-calibrate, gcm-import, gcm-inspect, 
           gcm-picker and gcm-viewer
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/gnome-contacts.xml
===================================================================
--- gnome/applications/gnome-contacts.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/gnome-contacts.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -131,9 +131,13 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
           gnome-contacts
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/gnome-disk-utility.xml
===================================================================
--- gnome/applications/gnome-disk-utility.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/gnome-disk-utility.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -117,4 +117,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -122,4 +123,7 @@
         <seg>
           gnome-disk-image-mounter and gnome-disks
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/gnome-games.xml
===================================================================
--- gnome/applications/gnome-games.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/gnome-games.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -151,4 +151,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -158,4 +159,7 @@
           gnome-sudoku, gnomine, gnotravex, gnotski, gtali, iagno,
           lightsoff, quadrapassel and swell-foop
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/gnome-nettool.xml
===================================================================
--- gnome/applications/gnome-nettool.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/gnome-nettool.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -137,4 +137,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -142,4 +143,7 @@
         <seg>
           gnome-nettool
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/gnome-screenshot.xml
===================================================================
--- gnome/applications/gnome-screenshot.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/gnome-screenshot.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -113,5 +113,6 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -119,4 +120,7 @@
         <seg>
           gnome-screenshot
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/gnome-search-tool.xml
===================================================================
--- gnome/applications/gnome-search-tool.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/gnome-search-tool.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -113,4 +113,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -118,4 +119,7 @@
         <seg>
           gnome-search-tool
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/gnome-system-log.xml
===================================================================
--- gnome/applications/gnome-system-log.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/gnome-system-log.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -108,10 +108,14 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>
           gnome-system-log
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/gnome-system-monitor.xml
===================================================================
--- gnome/applications/gnome-system-monitor.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/gnome-system-monitor.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -119,4 +119,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -124,4 +125,7 @@
         <seg>
           gnome-system-monitor
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/gnome-tweak-tool.xml
===================================================================
--- gnome/applications/gnome-tweak-tool.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/gnome-tweak-tool.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -114,4 +114,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -119,4 +120,7 @@
         <seg>
           gnome-tweak-tool
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/mousetweaks.xml
===================================================================
--- gnome/applications/mousetweaks.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/mousetweaks.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -115,4 +115,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -120,4 +121,7 @@
         <seg>
           mousetweaks
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/orca.xml
===================================================================
--- gnome/applications/orca.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/orca.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -126,4 +126,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -131,4 +132,7 @@
         <seg>
           orca
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/seahorse.xml
===================================================================
--- gnome/applications/seahorse.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/seahorse.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -138,4 +138,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -143,4 +144,7 @@
         <seg>
           seahorse
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/sound-juicer.xml
===================================================================
--- gnome/applications/sound-juicer.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/sound-juicer.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -163,4 +163,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -168,4 +169,7 @@
         <seg>
           sound-juicer
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/vinagre.xml
===================================================================
--- gnome/applications/vinagre.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/vinagre.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -127,4 +127,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -132,4 +133,7 @@
         <seg>
           vinagre
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/applications/vino.xml
===================================================================
--- gnome/applications/vino.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/applications/vino.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -131,9 +131,14 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
+
 
       <seglistitem>
         <seg>
           vino-passwd, vino-preferences and vino-server
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/core/evolution-data-server.xml
===================================================================
--- gnome/core/evolution-data-server.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/evolution-data-server.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -175,8 +175,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libcamel-1.2.so, libebackend-1.2.so, libebook-1.2.so, 
Index: gnome/core/gnome-backgrounds.xml
===================================================================
--- gnome/core/gnome-backgrounds.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-backgrounds.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -115,7 +115,15 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /usr/share/backgrounds/gnome and
Index: gnome/core/gnome-control-center.xml
===================================================================
--- gnome/core/gnome-control-center.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-control-center.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -168,4 +168,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -173,4 +174,7 @@
         <seg>
           gnome-control-center and gnome-sound-applet
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-desktop.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -140,8 +140,12 @@
 
     <segmentedlist>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libgnome-desktop-3.so
Index: gnome/core/gnome-doc-utils.xml
===================================================================
--- gnome/core/gnome-doc-utils.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-doc-utils.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -135,4 +135,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
       <segtitle>Installed Stylesheets</segtitle>
@@ -141,4 +142,7 @@
         <seg>
           gnome-doc-prepare, gnome-doc-tool and xml2po
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/core/gnome-icon-theme-symbolic.xml
===================================================================
--- gnome/core/gnome-icon-theme-symbolic.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-icon-theme-symbolic.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -114,7 +114,15 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /usr/share/icons/gnome/scalable
Index: gnome/core/gnome-icon-theme.xml
===================================================================
--- gnome/core/gnome-icon-theme.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-icon-theme.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -116,7 +116,15 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /usr/share/icons/gnome
Index: gnome/core/gnome-js-common.xml
===================================================================
--- gnome/core/gnome-js-common.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-js-common.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -113,7 +113,15 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /usr/lib/gnome-js and 
Index: gnome/core/gnome-power-manager.xml
===================================================================
--- gnome/core/gnome-power-manager.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-power-manager.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -120,4 +120,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -125,4 +126,7 @@
         <seg>
           gnome-power-statistics
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/core/gnome-screensaver.xml
===================================================================
--- gnome/core/gnome-screensaver.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-screensaver.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -195,4 +195,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -200,4 +201,7 @@
         <seg>
           gnome-screensaver and gnome-screensaver-command
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-session.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -185,9 +185,13 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
           gnome-session, gnome-session-properties and gnome-session-quit
+        </seg>
+       <seg>
+          None
         </seg>
         <seg>
Index: gnome/core/gnome-settings-daemon.xml
===================================================================
--- gnome/core/gnome-settings-daemon.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-settings-daemon.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -171,5 +171,6 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -177,4 +178,7 @@
         <seg>
           gnome-settings-daemon
+        </seg>
+       <seg>
+          None
         </seg>
         <seg>
Index: gnome/core/gnome-shell.xml
===================================================================
--- gnome/core/gnome-shell.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-shell.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -154,4 +154,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -160,4 +161,7 @@
           gnome-shell, gnome-shell-extension-prefs and gnome-shell-extension-tool and
           gnome-shell-pref-tool
+        </seg>
+       <seg>
+          None
         </seg>
         <seg>
Index: gnome/core/gnome-terminal.xml
===================================================================
--- gnome/core/gnome-terminal.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-terminal.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -123,4 +123,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -128,4 +129,7 @@
         <seg>
           gnome-terminal
+        </seg>
+       <seg>
+          None
         </seg>
         <seg>
Index: gnome/core/gnome-themes-standard.xml
===================================================================
--- gnome/core/gnome-themes-standard.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-themes-standard.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -116,8 +116,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+       <seg>
+          None
+        </seg>
         <seg>
           libadwaita.so
Index: gnome/core/gnome-user-docs.xml
===================================================================
--- gnome/core/gnome-user-docs.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-user-docs.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -112,7 +112,15 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+       <seg>
+          None
+        </seg>
+       <seg>
+          None
+        </seg>
         <seg>
           /usr/share/help/*/gnome-help and
Index: gnome/core/gnome-user-share.xml
===================================================================
--- gnome/core/gnome-user-share.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-user-share.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -129,4 +129,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -134,4 +135,7 @@
         <seg>
           gnome-file-share-properties and gnome-user-share
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/core/gnome-video-effects.xml
===================================================================
--- gnome/core/gnome-video-effects.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gnome-video-effects.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -112,7 +112,15 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /usr/share/gnome-video-effects
Index: gnome/core/gsettings-desktop-schemas.xml
===================================================================
--- gnome/core/gsettings-desktop-schemas.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gsettings-desktop-schemas.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -121,7 +121,15 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /usr/include/gsettings-desktop-schemas
Index: gnome/core/gtksourceview.xml
===================================================================
--- gnome/core/gtksourceview.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/gtksourceview.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -132,8 +132,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libgtksourceview-3.0.so
Index: gnome/core/libgdata.xml
===================================================================
--- gnome/core/libgdata.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/libgdata.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -137,8 +137,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libgdata.so
Index: gnome/core/libgee.xml
===================================================================
--- gnome/core/libgee.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/libgee.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -117,8 +117,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libgee.so
Index: gnome/core/libgnome-keyring.xml
===================================================================
--- gnome/core/libgnome-keyring.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/libgnome-keyring.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -136,8 +136,13 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
+
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libgnome-keyring.so
Index: gnome/core/libgtop.xml
===================================================================
--- gnome/core/libgtop.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/libgtop.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -133,8 +133,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libgtop-2.0.so
Index: gnome/core/libgweather.xml
===================================================================
--- gnome/core/libgweather.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/libgweather.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -137,8 +137,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libgweather-3.so
Index: gnome/core/libzeitgeist.xml
===================================================================
--- gnome/core/libzeitgeist.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/libzeitgeist.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -130,8 +130,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libzeitgeist-1.0.so
Index: gnome/core/nautilus-sendto.xml
===================================================================
--- gnome/core/nautilus-sendto.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/nautilus-sendto.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -138,4 +138,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -143,4 +144,7 @@
         <seg>
           nautilus-sendto
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/core/polkit-gnome.xml
===================================================================
--- gnome/core/polkit-gnome.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/polkit-gnome.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -155,4 +155,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -160,4 +161,7 @@
         <seg>
           polkit-gnome-authentication-agent-1
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: gnome/core/totem-pl-parser.xml
===================================================================
--- gnome/core/totem-pl-parser.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/totem-pl-parser.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -140,8 +140,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libtotem-plparser-mini.so and libtotem-plparser.so
Index: gnome/core/yelp-xsl.xml
===================================================================
--- gnome/core/yelp-xsl.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/yelp-xsl.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -113,7 +113,15 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /usr/share/yelp-xsl
Index: gnome/core/zenity.xml
===================================================================
--- gnome/core/zenity.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ gnome/core/zenity.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -125,4 +125,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -130,4 +131,7 @@
         <seg>
           gdialog and zenity
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: kde/add/libkcddb.xml
===================================================================
--- kde/add/libkcddb.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ kde/add/libkcddb.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -110,8 +110,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libkcddb.so and kcm_cddb.so in &kde-dir;/lib/kde4
Index: multimedia/cdwriteutils/libisofs.xml
===================================================================
--- multimedia/cdwriteutils/libisofs.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/cdwriteutils/libisofs.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -119,8 +119,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libisofs.so
Index: multimedia/libdriv/alsa-plugins.xml
===================================================================
--- multimedia/libdriv/alsa-plugins.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/alsa-plugins.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -130,7 +130,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           Numerous libasound_module_<replaceable>&lt;module&gt;</replaceable>.so
@@ -139,4 +144,7 @@
           rate_samplerate* and rate_speexrate*
         </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: multimedia/libdriv/alsa-utils.xml
===================================================================
--- multimedia/libdriv/alsa-utils.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/alsa-utils.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -230,5 +230,6 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -240,4 +241,7 @@
         </seg>
         <seg>
+          None
+        </seg>
+        <seg>
           /usr/share/sounds/alsa and /var/lib/alsa
         </seg>
Index: multimedia/libdriv/audiofile.xml
===================================================================
--- multimedia/libdriv/audiofile.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/audiofile.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -113,4 +113,5 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -120,4 +121,7 @@
         <seg>
           libaudiofile.{so,a}
+        </seg>
+        <seg>
+          None
         </seg>
       </seglistitem>
Index: multimedia/libdriv/farstream.xml
===================================================================
--- multimedia/libdriv/farstream.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/farstream.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -138,8 +138,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libfarstream-0.2.so
Index: multimedia/libdriv/gst-plugins-bad.xml
===================================================================
--- multimedia/libdriv/gst-plugins-bad.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/gst-plugins-bad.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -197,8 +197,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libgstbasecamerabinsrc-0.10.so, libgstbasevideo-0.10.so, libgstcodecparsers-0.10.so,
Index: multimedia/libdriv/gst-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst-plugins-good.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/gst-plugins-good.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -198,7 +198,15 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /usr/share/gtk-doc/html/gst-plugins-good-plugins-0.10
Index: multimedia/libdriv/gst-plugins-ugly.xml
===================================================================
--- multimedia/libdriv/gst-plugins-ugly.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/gst-plugins-ugly.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -184,7 +184,15 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /usr/share/gtk-doc/html/gst-plugins-ugly-plugins-0.10
Index: multimedia/libdriv/gst10-libav.xml
===================================================================
--- multimedia/libdriv/gst10-libav.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/gst10-libav.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -121,9 +121,17 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
+          None
+        </seg>
+        <seg>
           Several plugins in /usr/lib/gstreamer-1.0
+        </seg>
+        <seg>
+          None
         </seg>
       </seglistitem>
Index: multimedia/libdriv/gst10-plugins-bad.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-bad.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/gst10-plugins-bad.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -173,8 +173,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libgstbasecamerabinsrc-1.0.so, libgstbasevideo-1.0.so, libgstcodecparsers-1.0.so,
Index: multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-good.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/gst10-plugins-good.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -145,8 +145,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           Several plugins in /usr/lib/gstreamer-1.0
Index: multimedia/libdriv/gst10-plugins-ugly.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-ugly.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/gst10-plugins-ugly.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -136,8 +136,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           Several plugins in /usr/lib/gstreamer-1.0
Index: multimedia/libdriv/libdiscid.xml
===================================================================
--- multimedia/libdriv/libdiscid.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/libdiscid.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -115,8 +115,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libdiscid.so
Index: multimedia/libdriv/libdvdcss.xml
===================================================================
--- multimedia/libdriv/libdvdcss.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/libdvdcss.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -160,8 +160,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libdvdcss.so
Index: multimedia/libdriv/libdvdread.xml
===================================================================
--- multimedia/libdriv/libdvdread.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/libdvdread.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -92,8 +92,10 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>None</seg>
         <seg>libdvdread.so</seg>
         <seg>/usr/include/dvdread</seg>
Index: multimedia/libdriv/libmusicbrainz3.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz3.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/libmusicbrainz3.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -124,8 +124,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libmusicbrainz3.so
Index: multimedia/libdriv/libmusicbrainz5.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz5.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/libmusicbrainz5.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -123,8 +123,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libmusicbrainz5.so
Index: multimedia/libdriv/libvorbis.xml
===================================================================
--- multimedia/libdriv/libvorbis.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/libvorbis.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -133,8 +133,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libvorbis.so, libvorbisenc.so and libvorbisfile.so
Index: multimedia/libdriv/opal.xml
===================================================================
--- multimedia/libdriv/opal.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/libdriv/opal.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -132,8 +132,12 @@
 
     <segmentedlist>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libopal.so and libopal_s.a
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/videoutils/transcode.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -196,4 +196,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -205,4 +206,7 @@
         </seg>
         <seg>
+          None
+        </seg>
+        <seg>
           /usr/lib/transcode and /usr/share/doc/transcode-&transcode-version;
         </seg>
Index: multimedia/videoutils/xine-ui.xml
===================================================================
--- multimedia/videoutils/xine-ui.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ multimedia/videoutils/xine-ui.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -154,4 +154,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -167,6 +168,10 @@
         </seg>
         <seg>
+          None
+        </seg>
+        <seg>
           /usr/share/xine and
-          /usr/share/doc/xine-ui-&xine-ui-version;</seg>
+          /usr/share/doc/xine-ui-&xine-ui-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: networking/netlibs/geoclue.xml
===================================================================
--- networking/netlibs/geoclue.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ networking/netlibs/geoclue.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -172,8 +172,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libgeoclue.so
Index: networking/netlibs/librest.xml
===================================================================
--- networking/netlibs/librest.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ networking/netlibs/librest.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -133,8 +133,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           librest-0.7.so and librest-extras-0.7.so
Index: networking/netlibs/libsoup.xml
===================================================================
--- networking/netlibs/libsoup.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ networking/netlibs/libsoup.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -149,8 +149,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libsoup-2.4.so and libsoup-gnome-2.4.so
Index: networking/netlibs/libtirpc.xml
===================================================================
--- networking/netlibs/libtirpc.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ networking/netlibs/libtirpc.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -164,8 +164,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libtirpc.{so,a}
Index: networking/netprogs/wget.xml
===================================================================
--- networking/netprogs/wget.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ networking/netprogs/wget.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -169,7 +169,17 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>wget</seg>
+        <seg>
+          wget
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ networking/netprogs/wpa_supplicant.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -344,8 +344,16 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
       
       <seglistitem>
         <seg>
           wpa_gui, wpa_supplicant, wpa_passphrase and wpa_cli
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
         </seg>
       </seglistitem>
Index: networking/netutils/mod_dnssd.xml
===================================================================
--- networking/netutils/mod_dnssd.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ networking/netutils/mod_dnssd.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -131,8 +131,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>None</seg>
         <seg>mod_dnssd.so</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
Index: networking/textweb/w3m.xml
===================================================================
--- networking/textweb/w3m.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ networking/textweb/w3m.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -160,8 +160,10 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>w3m and w3mman</seg>
+        <seg>None</seg>
         <seg>/usr/libexec/w3m, /usr/share/w3m and
         usr/share/doc/w3m-&w3m-version;</seg>
Index: postlfs/editors/bluefish.xml
===================================================================
--- postlfs/editors/bluefish.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ postlfs/editors/bluefish.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -123,4 +123,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -128,4 +129,7 @@
         <seg>
           bluefish
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: postlfs/editors/ed.xml
===================================================================
--- postlfs/editors/ed.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ postlfs/editors/ed.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -88,7 +88,11 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>ed and red</seg>
+        <seg>None</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ postlfs/editors/nano.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -175,4 +175,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -180,4 +181,7 @@
         <seg>
           nano and rnano
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: postlfs/filesystems/lvm2.xml
===================================================================
--- postlfs/filesystems/lvm2.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ postlfs/filesystems/lvm2.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -166,4 +166,5 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -176,4 +177,7 @@
           libdevmapper.so, liblvm2app.so and liblvm2cmd.so
         </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: postlfs/filesystems/sshfs-fuse.xml
===================================================================
--- postlfs/filesystems/sshfs-fuse.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ postlfs/filesystems/sshfs-fuse.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -135,7 +135,17 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>sshfs.</seg>
+        <seg>
+          sshfs
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: postlfs/security/liboauth.xml
===================================================================
--- postlfs/security/liboauth.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ postlfs/security/liboauth.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -143,8 +143,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           liboauth.so
Index: postlfs/security/libpwquality.xml
===================================================================
--- postlfs/security/libpwquality.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ postlfs/security/libpwquality.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -138,4 +138,5 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -146,4 +147,7 @@
           libpwquality.so and pam_pwquality.so
         </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: postlfs/security/openssh.xml
===================================================================
--- postlfs/security/openssh.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ postlfs/security/openssh.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -310,4 +310,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -315,5 +316,8 @@
         <seg>
           scp, sftp, sftp-server, slogin, ssh, sshd, ssh-add, ssh-agent,
-          ssh-keygen, ssh-keyscan and ssh-keysign.
+          ssh-keygen, ssh-keyscan and ssh-keysign
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
@@ -321,5 +325,5 @@
           /var/lib/sshd,
           /usr/lib/openssh and
-          /usr/share/doc/openssh-&openssh-version;.
+          /usr/share/doc/openssh-&openssh-version;
         </seg>
       </seglistitem>
Index: postlfs/security/sudo.xml
===================================================================
--- postlfs/security/sudo.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ postlfs/security/sudo.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -243,5 +243,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: pst/ps/epdfview.xml
===================================================================
--- pst/ps/epdfview.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ pst/ps/epdfview.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -146,8 +146,10 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>epdfview</seg>
+        <seg>None</seg>
         <seg>/usr/share/epdfview</seg>
       </seglistitem>
Index: pst/xml/itstool.xml
===================================================================
--- pst/xml/itstool.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ pst/xml/itstool.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -115,4 +115,5 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -120,4 +121,7 @@
         <seg>
           itstool
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ server/major/apache.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -291,4 +291,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -297,4 +298,7 @@
           ab, apachectl, apxs, checkgid, dbmmanage, htcacheclean, htdbm,
           htdigest, htpasswd, httpd, httxt2dbm, logresolve and rotatelogs
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: xfce/apps/midori.xml
===================================================================
--- xfce/apps/midori.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/apps/midori.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -131,8 +131,10 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>midori.</seg>
+        <seg>midori</seg>
+        <seg>None</seg>
         <seg>
           /etc/xdg/midori,
@@ -140,5 +142,5 @@
           /usr/lib/midori,
           /usr/share/midori and
-          /usr/share/doc/midori.
+          /usr/share/doc/midori
         </seg>
       </seglistitem>
Index: xfce/apps/parole.xml
===================================================================
--- xfce/apps/parole.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/apps/parole.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -143,12 +143,14 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>parole</seg>
+        <seg>None</seg>
         <seg>
           /usr/include/parole,
           /usr/lib/parole-0 and
-          /usr/share/parole.
+          /usr/share/parole
         </seg>
       </seglistitem>
Index: xfce/apps/terminal.xml
===================================================================
--- xfce/apps/terminal.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/apps/terminal.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -124,4 +124,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -129,7 +130,8 @@
         <seg>
           Terminal and
-          terminal.
+          terminal
         </seg>
-        <seg>/usr/share/doc/terminal-&terminal-version;.</seg>
+        <seg>None</seg>
+        <seg>/usr/share/doc/terminal-&terminal-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: xfce/apps/xfburn.xml
===================================================================
--- xfce/apps/xfburn.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/apps/xfburn.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -127,9 +127,11 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>xfburn.</seg>
-        <seg>/usr/share/xfburn.</seg>
+        <seg>xfburn</seg>
+        <seg>None</seg>
+        <seg>/usr/share/xfburn</seg>
       </seglistitem>
     </segmentedlist>
Index: xfce/apps/xfce4-notifyd.xml
===================================================================
--- xfce/apps/xfce4-notifyd.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/apps/xfce4-notifyd.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -123,12 +123,14 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>xfce4-notifyd-config.</seg>
+        <seg>xfce4-notifyd-config</seg>
+        <seg>None</seg>
         <seg>
           /usr/share/themes/Default/xfce-notify-4.0,
           /usr/share/themes/Smoke/xfce-notify-4.0 and
-          /usr/share/themes/ZOMG-PONIES!/xfce-notify-4.0.
+          /usr/share/themes/ZOMG-PONIES!/xfce-notify-4.0
         </seg>
       </seglistitem>
Index: xfce/core/garcon.xml
===================================================================
--- xfce/core/garcon.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/core/garcon.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -127,10 +127,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <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>
Index: xfce/core/gtk-xfce-engine.xml
===================================================================
--- xfce/core/gtk-xfce-engine.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/core/gtk-xfce-engine.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -121,8 +121,10 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>None</seg>
         <seg>
           libxfce.so (in /usr/lib/gtk-&gtk2-libdir;/engines).
Index: xfce/core/libxfce4ui.xml
===================================================================
--- xfce/core/libxfce4ui.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/core/libxfce4ui.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -128,8 +128,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libxfce4kbd-private-2.so and libxfce4ui-1.so.
Index: xfce/core/libxfcegui4.xml
===================================================================
--- xfce/core/libxfcegui4.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/core/libxfcegui4.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -125,11 +125,13 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>libxfcegui4.so and libxfce4.so.</seg>
+        <seg>None</seg>
+        <seg>libxfcegui4.so and libxfce4.so</seg>
         <seg>/usr/include/xfce4/libxfcegui4 and
-        /usr/share/gtk-doc/html/libxfcegui4.
+        /usr/share/gtk-doc/html/libxfcegui4
         </seg>
       </seglistitem>
Index: xfce/core/thunar-volman.xml
===================================================================
--- xfce/core/thunar-volman.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/core/thunar-volman.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -119,7 +119,11 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>thunar-volman and thunar-volman-settings.</seg>
+        <seg>thunar-volman and thunar-volman-settings</seg>
+        <seg>None</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
Index: xfce/core/tumbler.xml
===================================================================
--- xfce/core/tumbler.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/core/tumbler.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -131,8 +131,12 @@
 
     <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
+        <seg>
+          None
+        </seg>
         <seg>
           libtumbler-1.so, and in
Index: xfce/core/xfce4-appfinder.xml
===================================================================
--- xfce/core/xfce4-appfinder.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/core/xfce4-appfinder.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -113,7 +113,11 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>xfce4-appfinder.</seg>
+        <seg>xfce4-appfinder</seg>
+        <seg>None</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
Index: xfce/core/xfce4-power-manager.xml
===================================================================
--- xfce/core/xfce4-power-manager.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/core/xfce4-power-manager.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -132,4 +132,6 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -138,5 +140,11 @@
           xfce4-power-manager,
           xfce4-power-manager-settings and
-          xfpm-power-backlight-helper.
+          xfpm-power-backlight-helper
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
         </seg>
       </seglistitem>
Index: xfce/core/xfce4-settings.xml
===================================================================
--- xfce/core/xfce4-settings.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/core/xfce4-settings.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -126,4 +126,6 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -137,5 +139,11 @@
           xfce4-settings-editor,
           xfce4-settings-manager and
-          xfsettingsd.
+          xfsettingsd
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
         </seg>
       </seglistitem>
Index: xfce/core/xfdesktop.xml
===================================================================
--- xfce/core/xfdesktop.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/core/xfdesktop.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -122,8 +122,10 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>xfdesktop and xfdesktop-settings.</seg>
+        <seg>xfdesktop and xfdesktop-settings</seg>
+        <seg>None</seg>
         <seg>
           /usr/share/backgrounds/xfce and
Index: xfce/core/xfwm4.xml
===================================================================
--- xfce/core/xfwm4.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xfce/core/xfwm4.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -117,4 +117,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -124,5 +125,8 @@
           xfwm4-settings,
           xfwm4-tweaks-settings and
-          xfwm4-workspace-settings.
+          xfwm4-workspace-settings
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xsoft/office/libreoffice.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -393,4 +393,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -401,4 +402,7 @@
         </seg>
         <seg>
+          None
+        </seg>
+        <seg>
           /usr/lib/libreoffice
         </seg>
Index: xsoft/other/blueman.xml
===================================================================
--- xsoft/other/blueman.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xsoft/other/blueman.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -143,4 +143,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -149,4 +150,7 @@
           blueman-adapters, blueman-applet, blueman-assistant, blueman-browse,
           blueman-manager, blueman-sendto and blueman-services
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: xsoft/other/ekiga.xml
===================================================================
--- xsoft/other/ekiga.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xsoft/other/ekiga.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -177,4 +177,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -182,4 +183,7 @@
         <seg>
           ekiga, ekiga-config-tool and ekiga-helper
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: xsoft/other/gparted.xml
===================================================================
--- xsoft/other/gparted.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xsoft/other/gparted.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -155,4 +155,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -160,4 +161,7 @@
         <seg>
           gparted and gpartedbin
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: xsoft/other/icedtea-web.xml
===================================================================
--- xsoft/other/icedtea-web.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xsoft/other/icedtea-web.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -129,9 +129,12 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
 
       <seglistitem>
         <seg>itweb-settings, javaws, and pluginappletviewer</seg>
         <seg>IcedTeaPlugin.so, about.jar, netx.jar, plugin.jar</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
Index: xsoft/other/inkscape.xml
===================================================================
--- xsoft/other/inkscape.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xsoft/other/inkscape.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -130,4 +130,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -135,4 +136,7 @@
         <seg>
           inkscape and inkview
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: xsoft/other/rox-filer.xml
===================================================================
--- xsoft/other/rox-filer.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xsoft/other/rox-filer.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -270,8 +270,10 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>rox</seg>
+        <seg>None</seg>
         <seg>/usr/share/rox</seg>
       </seglistitem>
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xsoft/other/thunderbird.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -346,10 +346,14 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>
           thunderbird
+        </seg>
+        <seg>
+          None
         </seg>
         <seg>
Index: xsoft/other/transmission.xml
===================================================================
--- xsoft/other/transmission.xml	(revision 8bf11809043050c79aa21eb28ee0f506b7a575a9)
+++ xsoft/other/transmission.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
@@ -157,4 +157,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
@@ -166,4 +167,7 @@
         </seg>
         <seg>
+          None
+        </seg>
+        <seg>
           /usr/share/transmission
         </seg>
