Index: gnome/applications/applications.xml
===================================================================
--- gnome/applications/applications.xml	(revision 3609a85de828665557ffcd021403c34480e39f1b)
+++ gnome/applications/applications.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -44,5 +44,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-weather.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gucharmap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network-manager-applet.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network-manager-applet.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="seahorse.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vinagre.xml"/>
Index: gnome/applications/gnome-color-manager.xml
===================================================================
--- gnome/applications/gnome-color-manager.xml	(revision 3609a85de828665557ffcd021403c34480e39f1b)
+++ gnome/applications/gnome-color-manager.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-color-manager-download-http
-           "&gnome-download-http;/gnome-color-manager/&gnome-minor-32;/gnome-color-manager-&gnome-color-manager-version;.tar.xz">
+           "&gnome-download-http;/gnome-color-manager/&gnome-minor-36;/gnome-color-manager-&gnome-color-manager-version;.tar.xz">
   <!ENTITY gnome-color-manager-download-ftp
-           "&gnome-download-ftp;/gnome-color-manager/&gnome-minor-32;/gnome-color-manager-&gnome-color-manager-version;.tar.xz">
-  <!ENTITY gnome-color-manager-md5sum        "e6de219a25ac16630aca552936611c15">
-  <!ENTITY gnome-color-manager-size          "2.5 MB">
-  <!ENTITY gnome-color-manager-buildsize     "24 MB">
-  <!ENTITY gnome-color-manager-time          "0.2 SBU">
+           "&gnome-download-ftp;/gnome-color-manager/&gnome-minor-36;/gnome-color-manager-&gnome-color-manager-version;.tar.xz">
+  <!ENTITY gnome-color-manager-md5sum        "c5360705a68e88455b1801200e9aaa2e">
+  <!ENTITY gnome-color-manager-size          "2.1 MB">
+  <!ENTITY gnome-color-manager-buildsize     "18 MB">
+  <!ENTITY gnome-color-manager-time          "0.1 SBU">
 ]>
 
@@ -78,5 +78,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="colord-gtk"/>,
       <xref linkend="colord"/>,
       <xref linkend="gtk3"/>,
@@ -89,7 +88,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="exiv2"/>, and
-      <xref linkend="vte"/>
+      <xref linkend="desktop-file-utils"/>
     </para>
 
@@ -127,5 +124,6 @@
 
     <para>
-      This package does not come with a test suite.
+      To test the results, issue: <command>ninja test</command>. The tests must
+      be run from an X session.
     </para>
 
@@ -164,5 +162,5 @@
       <seglistitem>
         <seg>
-          gcm-calibrate, gcm-import, gcm-inspect,
+          <!--gcm-calibrate,--> gcm-import, gcm-inspect,
           gcm-picker, and gcm-viewer
         </seg>
@@ -182,4 +180,5 @@
       <?dbhtml list-presentation="table"?>
 
+<!-- Seems to be removed in 3.36.0
       <varlistentry id="gcm-calibrate">
         <term><command>gcm-calibrate</command></term>
@@ -193,5 +192,5 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="gcm-import">
         <term><command>gcm-import</command></term>
Index: gnome/applications/network-manager-applet.xml
===================================================================
--- gnome/applications/network-manager-applet.xml	(revision 3609a85de828665557ffcd021403c34480e39f1b)
+++ 	(revision )
@@ -1,256 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY network-manager-applet-download-http
-           "&gnome-download-http;/network-manager-applet/1.8/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-download-ftp
-           "&gnome-download-ftp;/network-manager-applet/1.8/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-md5sum    "5c1bf351fde5adc12200345550516050">
-  <!ENTITY network-manager-applet-size      "1.9 MB">
-  <!ENTITY network-manager-applet-buildsize "65 MB (with tests)">
-  <!ENTITY network-manager-applet-time      "0.3 SBU (with tests)">
-]>
-
-<sect1 id="network-manager-applet" xreflabel="network-manager-applet-&network-manager-applet-version;">
-  <?dbhtml filename="network-manager-applet.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>network-manager-applet-&network-manager-applet-version;</title>
-
-  <indexterm zone="network-manager-applet">
-    <primary sortas="a-network-manager-applet">network-manager-applet</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NetworkManager Applet</title>
-
-    <para>
-      The <application>NetworkManager Applet</application> provides a tool and
-      a panel applet used to configure wired and wireless network connections
-      through GUI. It's designed for use with any desktop environment that uses
-      <application>GTK+</application>, such as <application>Xfce</application>
-       and <application>LXDE</application>.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&network-manager-applet-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&network-manager-applet-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &network-manager-applet-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &network-manager-applet-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &network-manager-applet-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &network-manager-applet-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">NetworkManager Applet Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gcr"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="libnotify"/>, and
-      <xref linkend="NetworkManager"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="ModemManager"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required">
-      Since this package uses
-      <xref role="nodep" linkend="polkit"/> for authorization,
-	  one <xref role="runtime" linkend="polkit-agent"/> should be
-      running when the functionality of this package is used.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gnome-bluetooth"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="jansson"/>,
-      <ulink url="https://launchpad.net/libappindicator">libindicator</ulink>,
-      and <ulink url="&gnome-download-http;/mobile-broadband-provider-info">
-       mobile-broadband-provider-info</ulink> (runtime)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/network-manager-applet"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NetworkManager Applet</title>
-
-    <para>
-      Install <application>NetworkManager Applet</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr     \
-      --sysconfdir=/etc \
-      -Dselinux=false   \
-      -Dteam=false      \
-      -Dmobile_broadband_provider_info=false \
-      -Dgtk_doc=false .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Dteam=false</parameter>: This switch disables the team
-      configuration editor since it requires <xref linkend="jansson"/>. If
-      you have Jansson installed, remove this option or set it to "true".
-    </para>
-
-    <para>
-      <parameter>-Dselinux=false</parameter>: This switch forcibly
-      disables <application>SELinux</application> support since it is not
-      currently in BLFS and the build will fail without it.
-    </para>
-    <para>
-      <parameter>-Dmobile_broadband_provider_info=false</parameter>: This
-      switch forcibly disables Mobile Broadband Provider support because it
-      is not currently available in BLFS.
-    </para>
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: Remove this if you have
-      <xref linkend="gtk-doc"/> installed and want to rebuild the
-      documentation with it.
-    </para>
-
-    <para>
-      <option>-Dwwan=false</option>: This switch disables WWAN support.
-      Use this if you do not have <xref linkend="ModemManager"/> installed.
-    </para>
-    <para>
-      <option>-Dintrospection=false</option>: Use this if you do not have <xref linkend="gobject-introspection"/> installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          nm-applet and nm-connection-editor
-        </seg>
-        <seg>
-           libnma.so <!-- and libnm-gtk.so -->
-        </seg>
-        <seg>
-          <!--/usr/include/{libnma,libnm-gtk},--> 
-          /usr/include/libnma and /usr/share/gtk-doc/libnma
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nm-connection-editor">
-        <term><command>nm-connection-editor</command></term>
-        <listitem>
-          <para>
-            allows users to view and edit network connection settings.
-          </para>
-          <indexterm zone="network-manager-applet nm-connection-editor">
-            <primary sortas="b-nm-connection-editor">nm-connection-editor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnma">
-        <term><filename class="libraryfile">libnma.so</filename></term>
-        <listitem>
-          <para>
-            contains internal functions for the 
-            <application>Network Manager GTK+ Interface</application>.
-          </para>
-          <indexterm zone="network-manager-applet libnma">
-            <primary sortas="c-libnma">libnma.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="libnm-gtk">
-        <term><filename class="libraryfile">libnm-gtk.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>NetworkManager</application>
-            <application>GTK+</application> bindings.
-          </para>
-          <indexterm zone="network-manager-applet libnm-gtk">
-            <primary sortas="c-libnm-gtk">libnm-gtk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/platform/gnome-control-center.xml
===================================================================
--- gnome/platform/gnome-control-center.xml	(revision 3609a85de828665557ffcd021403c34480e39f1b)
+++ gnome/platform/gnome-control-center.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-control-center-download-http
-           "&gnome-download-http;/gnome-control-center/&gnome-minor-34;/gnome-control-center-&gnome-control-center-version;.tar.xz">
+           "&gnome-download-http;/gnome-control-center/&gnome-minor-36;/gnome-control-center-&gnome-control-center-version;.tar.xz">
   <!ENTITY gnome-control-center-download-ftp
-           "&gnome-download-ftp;/gnome-control-center/&gnome-minor-34;/gnome-control-center-&gnome-control-center-version;.tar.xz">
-  <!ENTITY gnome-control-center-md5sum        "4a783c45d6775185a683f143a14d460e">
-  <!ENTITY gnome-control-center-size          "5.9 MB">
-  <!ENTITY gnome-control-center-buildsize     "170 MB (with tests)">
-  <!ENTITY gnome-control-center-time          "0.4 SBU (Using parallelism=4; with tests)">
+           "&gnome-download-ftp;/gnome-control-center/&gnome-minor-36;/gnome-control-center-&gnome-control-center-version;.tar.xz">
+  <!ENTITY gnome-control-center-md5sum        "29a6d529ba4e7ca6dc53018cc8378352">
+  <!ENTITY gnome-control-center-size          "6.0 MB">
+  <!ENTITY gnome-control-center-buildsize     "176 MB (with tests)">
+  <!ENTITY gnome-control-center-time          "0.5 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -100,5 +100,6 @@
       <xref linkend="libhandy"/>, and
       <xref linkend="ModemManager"/> and
-      <xref linkend="network-manager-applet"/> (for the Network Panel)
+      <xref linkend="libnma"/> (for the Network Panel)
+      <!-- gnome-remote-desktop can be used in the Sharing panel. -->
     </para>
 
Index: gnome/platform/gnome-shell.xml
===================================================================
--- gnome/platform/gnome-shell.xml	(revision 3609a85de828665557ffcd021403c34480e39f1b)
+++ gnome/platform/gnome-shell.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-shell-download-http
-           "&gnome-download-http;/gnome-shell/&gnome-minor-34;/gnome-shell-&gnome-shell-version;.tar.xz">
+           "&gnome-download-http;/gnome-shell/&gnome-minor-36;/gnome-shell-&gnome-shell-version;.tar.xz">
   <!ENTITY gnome-shell-download-ftp
-           "&gnome-download-ftp;/gnome-shell/&gnome-minor-34;/gnome-shell-&gnome-shell-version;.tar.xz">
-  <!ENTITY gnome-shell-md5sum        "692181c1a98be9e5f5b7e8738fd428ce">
-  <!ENTITY gnome-shell-size          "1.5 MB">
-  <!ENTITY gnome-shell-buildsize     "66 MB">
-  <!ENTITY gnome-shell-time          "0.1 SBU (Using parallelism=4)">
+           "&gnome-download-ftp;/gnome-shell/&gnome-minor-36;/gnome-shell-&gnome-shell-version;.tar.xz">
+  <!ENTITY gnome-shell-md5sum        "e0f5568c4fc9c1784167bf59845b5929">
+  <!ENTITY gnome-shell-size          "1.7 MB">
+  <!ENTITY gnome-shell-buildsize     "72 MB">
+  <!ENTITY gnome-shell-time          "0.2 SBU (Using parallelism=4)">
 ]>
 
@@ -81,7 +81,4 @@
       <xref linkend="gnome-autoar"/>,
       <xref linkend="gnome-control-center"/>,
-      <!-- FIXME in gnome-shell-3.36.0 libcroco will be included,
-        so when that goes in please archive libcroco -->
-      <xref linkend="libcroco"/>,
       <xref linkend="mutter"/>,
       <xref linkend="sassc"/>,
@@ -97,5 +94,5 @@
       <xref linkend="gnome-bluetooth"/>,
       <xref linkend="gst10-plugins-base"/>, and
-      <xref linkend="network-manager-applet"/>
+      <xref linkend="NetworkManager"/>
     </para>
 
Index: gnome/platform/mutter.xml
===================================================================
--- gnome/platform/mutter.xml	(revision 3609a85de828665557ffcd021403c34480e39f1b)
+++ gnome/platform/mutter.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-minor-34;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-minor-34;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-md5sum        "de19a6de98a2250dd7efdfca14359e39">
-  <!ENTITY mutter-size          "2.7 MB">
+  <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-minor-36;/mutter-&mutter-version;.tar.xz">
+  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-minor-36;/mutter-&mutter-version;.tar.xz">
+  <!ENTITY mutter-md5sum        "af300762ac1ed9b431144b55f3f6c1eb">
+  <!ENTITY mutter-size          "2.6 MB">
   <!ENTITY mutter-buildsize     "216 MB">
-  <!ENTITY mutter-time          "1.0 SBU (Using parallelism=4)">
+  <!ENTITY mutter-time          "1.1 SBU (Using parallelism=4)">
 ]>
 
@@ -73,4 +73,5 @@
     </itemizedlist>
 
+    <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -82,4 +83,5 @@
       </listitem>
     </itemizedlist>
+    -->
 
     <bridgehead renderas="sect3">Mutter Dependencies</bridgehead>
@@ -91,4 +93,5 @@
       <xref linkend="gnome-desktop"/>,
       <xref linkend="gnome-settings-daemon"/>,
+      <xref linkend="graphene"/>,
       <xref linkend="libcanberra"/>,
       <xref linkend="libwacom"/>,
@@ -136,4 +139,5 @@
     <title>Installation of Mutter</title>
 
+    <!-- Not needed anymore with 3.36.1
     <para>
       First, apply a patch to Mutter to fix building with mesa-20.x and later:
@@ -141,4 +145,5 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../mutter-&mutter-version;-mesa_20_fixes-1.patch</userinput></screen>
+    -->
 
     <para>
@@ -180,8 +185,8 @@
         </seg>
         <seg>
-          libmutter-5.so
+          libmutter-6.so
         </seg>
         <seg>
-          /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-5
+          /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-6
         </seg>
       </seglistitem>
@@ -207,5 +212,5 @@
 
       <varlistentry id="libmutter">
-        <term><filename class="libraryfile">libmutter-5.so</filename></term>
+        <term><filename class="libraryfile">libmutter-6.so</filename></term>
         <listitem>
           <para>
@@ -213,5 +218,5 @@
           </para>
           <indexterm zone="mutter libmutter">
-            <primary sortas="c-libmutter">libmutter-5.so</primary>
+            <primary sortas="c-libmutter">libmutter-6.so</primary>
           </indexterm>
         </listitem>
