Index: x/dm/lxdm.xml
===================================================================
--- x/dm/lxdm.xml	(revision c8b93dfdc5b9756bb7797508b5688118823a5d85)
+++ x/dm/lxdm.xml	(revision e71a98d94124d5f73676a68f7ccf1a580622867b)
@@ -80,5 +80,6 @@
       <xref linkend="gtk2"/>,
       <xref linkend="iso-codes"/>, and
-      <xref linkend="librsvg"/> (runtime, for default theme background)
+      <xref role="runtime" linkend="librsvg"/> (runtime, for default theme
+      background)
     </para>
 
Index: x/dm/sddm.xml
===================================================================
--- x/dm/sddm.xml	(revision c8b93dfdc5b9756bb7797508b5688118823a5d85)
+++ x/dm/sddm.xml	(revision e71a98d94124d5f73676a68f7ccf1a580622867b)
@@ -92,7 +92,7 @@
     </para>
 
-    <bridgehead renderas="sect4" revision="sysv">Runtime Dependencies</bridgehead>
+    <bridgehead renderas="sect4" revision="sysv">Runtime Dependency</bridgehead>
     <para role="required" revision="sysv">
-      <xref linkend="consolekit"/>
+      <xref role="runtime" linkend="consolekit"/>
     </para>
 
Index: x/installing/libvdpau-va-gl.xml
===================================================================
--- x/installing/libvdpau-va-gl.xml	(revision c8b93dfdc5b9756bb7797508b5688118823a5d85)
+++ x/installing/libvdpau-va-gl.xml	(revision e71a98d94124d5f73676a68f7ccf1a580622867b)
@@ -102,5 +102,5 @@
     <bridgehead renderas="sect5">Runtime Dependency</bridgehead>
     <para role="optional">
-      <xref linkend="mesa"/>
+      <xref role="runtime" linkend="mesa"/>
     </para>
 
Index: x/installing/libvdpau.xml
===================================================================
--- x/installing/libvdpau.xml	(revision c8b93dfdc5b9756bb7797508b5688118823a5d85)
+++ x/installing/libvdpau.xml	(revision e71a98d94124d5f73676a68f7ccf1a580622867b)
@@ -107,5 +107,5 @@
     <bridgehead renderas="sect5">Runtime Dependency</bridgehead>
     <para role="optional">
-      <xref linkend="mesa"/>
+      <xref role="runtime" linkend="mesa"/>
     </para>
 
Index: x/installing/mesa.xml
===================================================================
--- x/installing/mesa.xml	(revision c8b93dfdc5b9756bb7797508b5688118823a5d85)
+++ x/installing/mesa.xml	(revision e71a98d94124d5f73676a68f7ccf1a580622867b)
@@ -110,6 +110,7 @@
       url="http://www.mesa3d.org/systems.html"/> for more information)<phrase
       revision="systemd">, and
-      <xref linkend="wayland"/> (required for <xref linkend='plasma5-build'/>,
-      <xref linkend='lxqt'/>, and GNOME)</phrase>
+      <xref linkend="wayland"/> (required for <xref role="nodep" 
+                                                    linkend='plasma5-build'/>,
+      <xref role="nodep" linkend='lxqt'/>, and GNOME)</phrase>
     </para>
 
@@ -119,11 +120,10 @@
       <xref linkend="nettle"/>,
       <phrase revision="sysv"><xref linkend="wayland"/> (required for
-        <xref linkend='plasma5-build'/> and <xref linkend='lxqt'/>),</phrase>
-      
+        <xref role="nodep" linkend='plasma5-build'/> and
+        <xref role="nodep" linkend='lxqt'/>),</phrase>
       <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">mesa-demos</ulink>
       (provides more than 300 extra demos to test
       <application>Mesa</application>; this includes the same programs added by
       the patch above), and
-      
       <ulink url="http://omxil.sourceforge.net/">Bellagio OpenMAX Integration
       Layer</ulink> (for mobile platforms)
Index: x/installing/xinit.xml
===================================================================
--- x/installing/xinit.xml	(revision c8b93dfdc5b9756bb7797508b5688118823a5d85)
+++ x/installing/xinit.xml	(revision e71a98d94124d5f73676a68f7ccf1a580622867b)
@@ -66,9 +66,10 @@
     </para>
 
-    <bridgehead renderas="sect4">Required (runtime only)</bridgehead>
-    <para role="required">
-      <xref linkend="twm"/>, 
-      <xref linkend="xclock"/>, and
-      <xref linkend="xterm2"/>
+    <bridgehead renderas="sect4">Recommended (runtime only)</bridgehead>
+    <para role="recommended">
+      <xref role="runtime" linkend="twm"/>, 
+      <xref role="runtime" linkend="xclock"/>, and
+      <xref role="runtime" linkend="xterm2"/> (used in the default <filename>
+      xinitrc</filename> file)
     </para>
 
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision c8b93dfdc5b9756bb7797508b5688118823a5d85)
+++ x/installing/xorg-server.xml	(revision e71a98d94124d5f73676a68f7ccf1a580622867b)
@@ -90,6 +90,6 @@
       <xref linkend="libgcrypt"/>,
       <xref linkend="pixman"/>, and at runtime:
-      <xref linkend="xorg7-font"/> and
-      <xref linkend="xkeyboard-config"/>
+      <xref role="runtime" linkend="xorg7-font"/> and
+      <xref role="runtime" linkend="xkeyboard-config"/>
     </para>
 
@@ -108,5 +108,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="acpid"/> (runtime),
+      <xref role="runtime" linkend="acpid"/> (runtime),
       <xref linkend="doxygen"/> (to build API documentation),
       <xref linkend="fop"/> (to build documentation),
Index: x/installing/xterm.xml
===================================================================
--- x/installing/xterm.xml	(revision c8b93dfdc5b9756bb7797508b5688118823a5d85)
+++ x/installing/xterm.xml	(revision e71a98d94124d5f73676a68f7ccf1a580622867b)
@@ -68,5 +68,5 @@
     <para role="required">
       A monospace TTF or OTF font such as
-      <xref linkend="dejavu-fonts"/>
+      <xref role="runtime" linkend="dejavu-fonts"/>
     </para>
 
Index: x/lib/libglade.xml
===================================================================
--- x/lib/libglade.xml	(revision c8b93dfdc5b9756bb7797508b5688118823a5d85)
+++ x/lib/libglade.xml	(revision e71a98d94124d5f73676a68f7ccf1a580622867b)
@@ -31,6 +31,6 @@
 
     <para>The <application>libglade</application> package contains
-    <filename class="libraryfile">libglade</filename> libraries. These are useful
-    for loading Glade interface files in a program at runtime.</para>
+    <filename class="libraryfile">libglade</filename> libraries. These are
+    useful for loading Glade interface files in a program at runtime.</para>
 
     &lfs81_checked;
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision c8b93dfdc5b9756bb7797508b5688118823a5d85)
+++ x/lib/qt5.xml	(revision e71a98d94124d5f73676a68f7ccf1a580622867b)
@@ -118,5 +118,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="bluez"/> (runtime, used by QtConnectivity module),
+      <xref role="runtime" linkend="bluez"/> (runtime, used by QtConnectivity
+      module),
       <xref linkend="ibus"/>,
       <xref linkend="libinput"/>, <!-- needs -libinput switch -->
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision c8b93dfdc5b9756bb7797508b5688118823a5d85)
+++ x/wm/fluxbox.xml	(revision e71a98d94124d5f73676a68f7ccf1a580622867b)
@@ -65,5 +65,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dbus"/> (runtime),
+      <xref role="runtime" linkend="dbus"/> (runtime),
       <xref linkend="fribidi"/>, and
       <xref linkend="imlib2"/> (if you wish to use other image formats in addition to XPM)
Index: x/wm/openbox.xml
===================================================================
--- x/wm/openbox.xml	(revision c8b93dfdc5b9756bb7797508b5688118823a5d85)
+++ x/wm/openbox.xml	(revision e71a98d94124d5f73676a68f7ccf1a580622867b)
@@ -77,5 +77,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dbus"/> (runtime),
+      <xref role="runtime" linkend="dbus"/> (runtime),
       <xref linkend="imlib2"/> (to enable icons in the right click menu),
       <xref linkend="pyxdg"/>,
