diff --git a/index.html b/index.html
index f3104c656..9fef00e10 100644
--- a/index.html
+++ b/index.html
@@ -77,112 +77,134 @@
 </header>
 
 <div class="wrap container not-front">
-  <div class="content row">
-  <main class="main">
+	<div class="content row">
+		<main class="main">
+			<div class="col-md-12">
+				<div class="page-content">
+					<div class="section" id="nextcloud-documentation-overview">
+						<h1>Nextcloud Documentation Overview<a class="headerlink" href="#nextcloud-documentation-overview" title="Permalink to this headline">¶</a></h1>
+						<div class="section" id="reporting-documentation-bugs-how-to-contribute">
+							<h2>Reporting Documentation Bugs &amp; How to Contribute<a class="headerlink" href="#reporting-documentation-bugs-how-to-contribute" title="Permalink to this headline">¶</a></h2>
+							<p>If you find an error or omission in any of the manuals, we welcome your bug
+							reports and contributions. Contribution to the documentation is very easy as
+							the code is entirely <a href="https://github.com/nextcloud/documentation">in
+							github and can be edited there online.</a></p>
+						</div>
+						<div class="section" id="server">
+							<h1>Nextcloud Server<a class="headerlink" href="#server" title="Permalink to this headline">¶</a></h1>
+							<div class="section" id="getting-Nextcloud">
+								<p>You can download and install Nextcloud on your own Linux server, use the Web
+								Installer to install it on shared Web hosting, try some prefab cloud or virtual
+								machine images, or sign up for hosted Nextcloud services. See the
+								<a class="reference external" href="https://nextcloud.com/install/">Get Started</a>
+								page for more information.</p>
+							</div>
+							<div class="section" id="nextcloud-13">
+								<h2>Nextcloud 13<a class="headerlink" href="#nextcloud-13" title="Permalink to this headline">¶</a></h2>
+								<p>This documents the <em>latest production</em> version of Nextcloud.</p>
+								<ul class="simple">
+									<li><a class="reference external" href="https://docs.nextcloud.org/server/13/user_manual/">User Manual</a>
+									<li><a class="reference external" href="https://docs.nextcloud.org/server/13/admin_manual/">Administration Manual</a>
+									<li><a class="reference external" href="https://docs.nextcloud.org/server/13/developer_manual/">Developer Manual</a>
+								</ul>
+							</div>
 
-      
+							<div class="section" id="nextcloud-12">
+								<h2>Nextcloud 12<a class="headerlink" href="#nextcloud-12" title="Permalink to this headline">¶</a></h2>
+								<p>This documents the <em>previous production</em> version of Nextcloud.</p>
+								<ul class="simple">
+									<li><a class="reference external" href="https://docs.nextcloud.org/server/12/user_manual/">User Manual</a>
+									<li><a class="reference external" href="https://docs.nextcloud.org/server/12/admin_manual/">Administration Manual</a>
+									<li><a class="reference external" href="https://docs.nextcloud.org/server/12/developer_manual/">Developer Manual</a>
+								</ul>
+							</div>
 
-        <div class="col-md-12">
-          <div class="page-content">
-           <div class="section" id="nextcloud-documentation-overview">
-<h1>Nextcloud Documentation Overview<a class="headerlink" href="#nextcloud-documentation-overview" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="getting-Nextcloud">
-<h2>Getting Nextcloud<a class="headerlink" href="#getting-nextcloud" title="Permalink to this headline">¶</a></h2>
-<p>You can download and install Nextcloud on your own Linux server, use the Web
-Installer to install it on shared Web hosting, try some prefab cloud or virtual
-machine images, or sign up for hosted Nextcloud services. See the <a class="reference external" href="https://nextcloud.com/install/">Get Started</a> page for more information.</p>
-</div>
-<div class="section" id="reporting-documentation-bugs-how-to-contribute">
-<h2>Reporting Documentation Bugs &amp; How to Contribute<a class="headerlink" href="#reporting-documentation-bugs-how-to-contribute" title="Permalink to this headline">¶</a></h2>
-<p>If you find an error or omission in any of the manuals, we welcome your bug
-reports and contributions.</p>
-</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-23">
+									<h2>Desktop 2.3<a class="headerlink" href="#desktop-23" title="Permalink to this headline">¶</a></h2>
+									<p>This documents the <em>latest production</em> version of the Nextcloud desktop client.</p>
+									<ul class="simple">
+										<li><a class="reference external" href="https://docs.nextcloud.org/desktop/2.3">Manual</a>
+									</ul>
+								</div>
+								
+								<div class="section" id="desktop-22">
+									<h2>Desktop 2.2<a class="headerlink" href="#desktop-22" title="Permalink to this headline">¶</a></h2>
+									<p>This documents the <em>previous</em> version of the Nextcloud desktop client.
+									This version is no longer supported and users are encouraged to upgrade!</p>
+									<ul class="simple">
+										<li><a class="reference external" href="https://docs.nextcloud.org/desktop/2.2">Manual</a>
+									</ul>
+								</div>
+							</div><!-- client -->
+						
+							<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-13">
-<h2>Nextcloud 13<a class="headerlink" href="#nextcloud-13" title="Permalink to this headline">¶</a></h2>
-<p>This documents the <em>latest production</em> version of Nextcloud.</p>
-<ul class="simple">
-<li><a class="reference external" href="https://docs.nextcloud.org/server/13/user_manual/">User Manual</a>
-<li><a class="reference external" href="https://docs.nextcloud.org/server/13/admin_manual/">Administration Manual</a>
-<li><a class="reference external" href="https://docs.nextcloud.org/server/13/developer_manual/">Developer Manual</a>
-</ul>
-</div>
+								<div class="section" id="nextcloud-11">
+									<h2>Nextcloud 11<a class="headerlink" href="#nextcloud-11" title="Permalink to this headline">¶</a></h2>
+									<ul class="simple">
+									<li><a class="reference external" href="https://docs.nextcloud.org/server/11/user_manual/">User Manual</a>
+									(<a class="reference external" href="https://docs.nextcloud.org/server/11/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
+									<li><a class="reference external" href="https://docs.nextcloud.org/server/11/admin_manual/">Administration Manual</a>
+									(<a class="reference external" href="https://docs.nextcloud.org/server/11/Nextcloud_Server_Administration_Manual.pdf">Download PDF</a>)</li>
+									<li><a class="reference external" href="https://docs.nextcloud.org/server/11/developer_manual/">Developer Manual</a>
+									(<a class="reference external" href="https://docs.nextcloud.org/server/11/NextcloudDeveloperManual.pdf">Download PDF</a>)</li>
+									</ul>
+								</div>
 
-<div class="section" id="nextcloud-12">
-<h2>Nextcloud 12<a class="headerlink" href="#nextcloud-12" title="Permalink to this headline">¶</a></h2>
-<p>This documents the <em>previous production</em> version of Nextcloud.</p>
-<ul class="simple">
-<li><a class="reference external" href="https://docs.nextcloud.org/server/12/user_manual/">User Manual</a>
-<li><a class="reference external" href="https://docs.nextcloud.org/server/12/admin_manual/">Administration Manual</a>
-<li><a class="reference external" href="https://docs.nextcloud.org/server/12/developer_manual/">Developer Manual</a>
-</ul>
-</div>
+								<div class="section" id="nextcloud-10">
+									<h2>Nextcloud 10<a class="headerlink" href="#nextcloud-10" title="Permalink to this headline">¶</a></h2>
+									<ul class="simple">
+									<li><a class="reference external" href="https://docs.nextcloud.org/server/10/user_manual/">User Manual</a>
+									(<a class="reference external" href="https://docs.nextcloud.org/server/10/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
+									<li><a class="reference external" href="https://docs.nextcloud.org/server/10/admin_manual/">Administration Manual</a>
+									(<a class="reference external" href="https://docs.nextcloud.org/server/10/Nextcloud_Server_Administration_Manual.pdf">Download PDF</a>)</li>
+									<li><a class="reference external" href="https://docs.nextcloud.org/server/10/developer_manual/">Developer Manual</a>
+									(<a class="reference external" href="https://docs.nextcloud.org/server/10/NextcloudDeveloperManual.pdf">Download PDF</a>)</li>
+									</ul>
+								</div>
 
-<div class="section" id="nextcloud-older">
-<h1>Older Nextcloud server releases</h1>
-<p>This documents the <em>older</em> versions of Nextcloud. Users are strongly encouraged to upgrade to the latest production release.</p>
+								<div class="section" id="nextcloud-9">
+									<h2>Nextcloud 9<a class="headerlink" href="#nextcloud-9" title="Permalink to this headline">¶</a></h2>
+									<ul class="simple">
+										<li><a class="reference external" href="https://docs.nextcloud.org/server/9/user_manual/">User Manual</a>
+										(<a class="reference external" href="https://docs.nextcloud.org/server/9/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
+										<li><a class="reference external" href="https://docs.nextcloud.org/server/9/admin_manual/">Administration Manual</a>
+										(<a class="reference external" href="https://docs.nextcloud.org/server/9/Nextcloud_Server_Administration_Manual.pdf">Download PDF</a>)</li>
+										<li><a class="reference external" href="https://docs.nextcloud.org/server/9/developer_manual/">Developer Manual</a>
+										(<a class="reference external" href="https://docs.nextcloud.org/server/9/NextcloudDeveloperManual.pdf">Download PDF</a>)</li>
+									</ul>
+								</div>
+							</div>
+						</div><!-- server -->
+					</div><!-- nextcloud-documentation-overview -->
+				</div><!-- page-content -->
+			</div><!-- col-md-12 -->
+		</main> 
+	</div><!-- content -->
+</div><!-- container -->
 
-<div class="section" id="nextcloud-11">
-<h2>Nextcloud 11<a class="headerlink" href="#nextcloud-11" title="Permalink to this headline">¶</a></h2>
-<ul class="simple">
-<li><a class="reference external" href="https://docs.nextcloud.org/server/11/user_manual/">User Manual</a>
-(<a class="reference external" href="https://docs.nextcloud.org/server/11/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
-<li><a class="reference external" href="https://docs.nextcloud.org/server/11/admin_manual/">Administration Manual</a>
-(<a class="reference external" href="https://docs.nextcloud.org/server/11/Nextcloud_Server_Administration_Manual.pdf">Download PDF</a>)</li>
-<li><a class="reference external" href="https://docs.nextcloud.org/server/11/developer_manual/">Developer Manual</a>
-(<a class="reference external" href="https://docs.nextcloud.org/server/11/NextcloudDeveloperManual.pdf">Download PDF</a>)</li>
-</ul>
-</div>
-
-<div class="section" id="nextcloud-10">
-<h2>Nextcloud 10<a class="headerlink" href="#nextcloud-10" title="Permalink to this headline">¶</a></h2>
-<ul class="simple">
-<li><a class="reference external" href="https://docs.nextcloud.org/server/10/user_manual/">User Manual</a>
-(<a class="reference external" href="https://docs.nextcloud.org/server/10/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
-<li><a class="reference external" href="https://docs.nextcloud.org/server/10/admin_manual/">Administration Manual</a>
-(<a class="reference external" href="https://docs.nextcloud.org/server/10/Nextcloud_Server_Administration_Manual.pdf">Download PDF</a>)</li>
-<li><a class="reference external" href="https://docs.nextcloud.org/server/10/developer_manual/">Developer Manual</a>
-(<a class="reference external" href="https://docs.nextcloud.org/server/10/NextcloudDeveloperManual.pdf">Download PDF</a>)</li>
-</ul>
-</div>
-
-
-<div class="section" id="nextcloud-9">
-<h2>Nextcloud 9<a class="headerlink" href="#nextcloud-9" title="Permalink to this headline">¶</a></h2>
-<ul class="simple">
-<li><a class="reference external" href="https://docs.nextcloud.org/server/9/user_manual/">User Manual</a>
-(<a class="reference external" href="https://docs.nextcloud.org/server/9/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
-<li><a class="reference external" href="https://docs.nextcloud.org/server/9/admin_manual/">Administration Manual</a>
-(<a class="reference external" href="https://docs.nextcloud.org/server/9/Nextcloud_Server_Administration_Manual.pdf">Download PDF</a>)</li>
-<li><a class="reference external" href="https://docs.nextcloud.org/server/9/developer_manual/">Developer Manual</a>
-(<a class="reference external" href="https://docs.nextcloud.org/server/9/NextcloudDeveloperManual.pdf">Download PDF</a>)</li>
-</ul>
-</div>
-</div>
-</div>   
-</div>
-
-
-            
-          </div>
-        </div>
-      </div>
-  </main>  
-  </div>
-</div>
 <div class="container">
-<div class="row">
-    <div class="col-lg-12 footer-social-icons">
-      <p class="text-center"><a target="_blank" href="https://plus.google.com/104036748063781940910/about"><img width=50 src="https://docs.nextcloud.org/server/9/user_manual/_static/img/social/googleplus.svg" title="Follow us on Google Plus!" alt="Follow us on Google Plus!"></img></a>
-      <a target="_blank" style="margin: 0 7px 0 14px;" href="https://www.facebook.com/Nextclouders"><img width=50 src="https://docs.nextcloud.org/server/9/user_manual/_static/img/social/facebook.svg" title="Like our facebook page!" alt="Like our facebook page!"></img></a>
-      <a target="_blank" style="margin: 0 14px 0 7px;" href="https://twitter.com/Nextclouders"><img width=50 src="https://docs.nextcloud.org/server/9/user_manual/_static/img/social/twitter.svg" title="Subscribe to our twitter channel!" alt="Subscribe to our twitter channel!"></img></a>
-      <a target="_blank" href="https://nextcloud.com/blogfeed"><img class="img-circle" width=50 src="https://docs.nextcloud.org/server/9/user_manual/_static/img/social/rss.svg" title="Subscribe to our news feed!" alt="Subscribe to our news feed!"></img></a>
-      <a target="_blank" href="https://newsletter.nextcloud.com/"><img class="img-circle" width=50 src="https://docs.nextcloud.org/server/9/user_manual/_static/img/social/mail.svg"  title="Subscribe to our newsletter!" alt="Subscribe to our newsletter!"></img></a></p>
-    </div>
-    <div class="text-center">
-      All documentation licensed under the <a href="https://creativecommons.org/licenses/by/3.0/us/">Creative Commons Attribution 3.0 Unported license</a>.
-    </div>
-</div>
+	<div class="row">
+		<div class="col-lg-12 footer-social-icons">
+		<p class="text-center"><a target="_blank" href="https://plus.google.com/104036748063781940910/about"><img width=50 src="https://docs.nextcloud.org/server/9/user_manual/_static/img/social/googleplus.svg" title="Follow us on Google Plus!" alt="Follow us on Google Plus!"></img></a>
+		<a target="_blank" style="margin: 0 7px 0 14px;" href="https://www.facebook.com/Nextclouders"><img width=50 src="https://docs.nextcloud.org/server/9/user_manual/_static/img/social/facebook.svg" title="Like our facebook page!" alt="Like our facebook page!"></img></a>
+		<a target="_blank" style="margin: 0 14px 0 7px;" href="https://twitter.com/Nextclouders"><img width=50 src="https://docs.nextcloud.org/server/9/user_manual/_static/img/social/twitter.svg" title="Subscribe to our twitter channel!" alt="Subscribe to our twitter channel!"></img></a>
+		<a target="_blank" href="https://nextcloud.com/blogfeed"><img class="img-circle" width=50 src="https://docs.nextcloud.org/server/9/user_manual/_static/img/social/rss.svg" title="Subscribe to our news feed!" alt="Subscribe to our news feed!"></img></a>
+		<a target="_blank" href="https://newsletter.nextcloud.com/"><img class="img-circle" width=50 src="https://docs.nextcloud.org/server/9/user_manual/_static/img/social/mail.svg"  title="Subscribe to our newsletter!" alt="Subscribe to our newsletter!"></img></a></p>
+		</div>
+		<div class="text-center">
+		All documentation licensed under the <a href="https://creativecommons.org/licenses/by/3.0/us/">Creative Commons Attribution 3.0 Unported license</a>.
+		</div>
+	</div>
 </div>
 <footer class="content-info" role="contentinfo">
 <div class="container">