diff --git a/index.html b/index.html
index 17891fd06..b4aa61c3c 100644
--- a/index.html
+++ b/index.html
@@ -219,6 +219,18 @@
 								page for more information.</p>
 							</div>
 
+							<div class="section" id="nextcloud-21">
+								<h2>Nextcloud 21<a class="headerlink" href="#nextcloud-21" title="Permalink to this headline">¶</a></h2>
+								<p>This documents the <em>upcoming</em> version of Nextcloud.</p>
+								<ul class="simple">
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/21/user_manual/">User Manual</a>
+										(<a class="reference external" href="https://docs.nextcloud.com/server/21/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/21/admin_manual/">Administration Manual</a>
+										(<a class="reference external" href="https://docs.nextcloud.com/server/21/Nextcloud_Server_Administration_Manual.pdf">Download PDF</a>)</li>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/21/developer_manual/">Developer Manual</a>
+								</ul>
+							</div>
+
 							<div class="section" id="nextcloud-20">
 								<h2>Nextcloud 20<a class="headerlink" href="#nextcloud-20" title="Permalink to this headline">¶</a></h2>
 								<p>This documents the <em>latest</em> version of Nextcloud.</p>
@@ -244,6 +256,40 @@
 							</div>
 
 
+							<div class="section" id="desktop">
+								<h1>Nextcloud Desktop Client<a class="headerlink" href="#desktop" title="Permalink to this headline">¶</a></h1>
+								<p>Once you have a Nextcloud Server running, you can connect to it with various <a class="reference external" href="https://nextcloud.com/install/#install-clients">clients like our mobile and desktop client.</a>
+								Find documentation for the desktop client below.</p>
+								<div class="section" id="desktop-31">
+									<h2>Desktop 3.1<a class="headerlink" href="#desktop-31" title="Permalink to this headline">¶</a></h2>
+									<p>This documents the <em>latest</em> version of the Nextcloud desktop client.</p>
+									<ul class="simple">
+										<li><a class="reference external" href="https://docs.nextcloud.com/desktop/3.1">Manual</a>
+									</ul>
+								</div>
+								<div class="section" id="desktop-30">
+									<h2>Desktop 3.0<a class="headerlink" href="#desktop-30" title="Permalink to this headline">¶</a></h2>
+									<p>This documents the <em>previous</em> version of the Nextcloud desktop client.</p>
+									<ul class="simple">
+										<li><a class="reference external" href="https://docs.nextcloud.com/desktop/3.0">Manual</a>
+									</ul>
+								</div>
+								<div class="section" id="desktop-26">
+									<h2>Desktop 2.6<a class="headerlink" href="#desktop-26" title="Permalink to this headline">¶</a></h2>
+									<p>This documents an <em>older</em> version of the Nextcloud desktop client. Users are strongly encouraged to upgrade to benefit from security and stability improvements.</p>
+									<ul class="simple">
+										<li><a class="reference external" href="https://docs.nextcloud.com/desktop/2.6">Manual</a>
+									</ul>
+								</div>
+							</div>
+						
+							<div class="section" id="nextcloud-older">
+								<h1>Older Nextcloud server releases<a class="headerlink" href="#nextcloud-older" title="Permalink to this headline">¶</a></h1>
+								<p>This documents the <em>older</em> versions of Nextcloud. These releases are no longer
+								publicly maintained and users are strongly encouraged to upgrade to a maintained
+								release or get access to long term security and stability updates through a 
+								<a href="https://nextcloud.com/enterprise">Nextcloud Subscription.</a></p>a
+
 							<div class="section" id="nextcloud-18">
 								<h2>Nextcloud 18<a class="headerlink" href="#nextcloud-18" title="Permalink to this headline">¶</a></h2>
 								<p>This documents a <em>previous</em> version of Nextcloud.</p>
@@ -280,40 +326,6 @@
 								</ul>
 							</div>
 
-							<div class="section" id="desktop">
-								<h1>Nextcloud Desktop Client<a class="headerlink" href="#desktop" title="Permalink to this headline">¶</a></h1>
-								<p>Once you have a Nextcloud Server running, you can connect to it with various <a class="reference external" href="https://nextcloud.com/install/#install-clients">clients like our mobile and desktop client.</a>
-								Find documentation for the desktop client below.</p>
-								<div class="section" id="desktop-31">
-									<h2>Desktop 3.1<a class="headerlink" href="#desktop-31" title="Permalink to this headline">¶</a></h2>
-									<p>This documents the <em>latest</em> version of the Nextcloud desktop client.</p>
-									<ul class="simple">
-										<li><a class="reference external" href="https://docs.nextcloud.com/desktop/3.1">Manual</a>
-									</ul>
-								</div>
-								<div class="section" id="desktop-30">
-									<h2>Desktop 3.0<a class="headerlink" href="#desktop-30" title="Permalink to this headline">¶</a></h2>
-									<p>This documents the <em>previous</em> version of the Nextcloud desktop client.</p>
-									<ul class="simple">
-										<li><a class="reference external" href="https://docs.nextcloud.com/desktop/3.0">Manual</a>
-									</ul>
-								</div>
-								<div class="section" id="desktop-26">
-									<h2>Desktop 2.6<a class="headerlink" href="#desktop-26" title="Permalink to this headline">¶</a></h2>
-									<p>This documents an <em>older</em> version of the Nextcloud desktop client. Users are strongly encouraged to upgrade to benefit from security and stability improvements.</p>
-									<ul class="simple">
-										<li><a class="reference external" href="https://docs.nextcloud.com/desktop/2.6">Manual</a>
-									</ul>
-								</div>
-							</div>
-						
-							<div class="section" id="nextcloud-older">
-								<h1>Older Nextcloud server releases<a class="headerlink" href="#nextcloud-older" title="Permalink to this headline">¶</a></h1>
-								<p>This documents the <em>older</em> versions of Nextcloud. These releases are no longer
-								publicly maintained and users are strongly encouraged to upgrade to a maintained
-								release or get access to long term security and stability updates through a 
-								<a href="https://nextcloud.com/enterprise">Nextcloud Subscription.</a></p>
-
 								<div class="section" id="nextcloud-15">
 									<h2>Nextcloud 15<a class="headerlink" href="#nextcloud-15" title="Permalink to this headline">¶</a></h2>
 									<p>This documents a <em>previous</em> version of Nextcloud.</p>