diff --git a/index.html b/index.html
index fcdf33620..c1c00c5e9 100644
--- a/index.html
+++ b/index.html
@@ -36,10 +36,10 @@
 		<meta property="og:image" content="https://docs.nextcloud.com/server/13/user_manual/_images/files_page.png">
 
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-		<link rel="stylesheet" href="https://docs.nextcloud.org/server/13/user_manual/_static/main.min.css" type="text/css" />
-		<link rel="stylesheet" href="https://docs.nextcloud.org/server/13/user_manual/_static/styles.css" type="text/css" />
+		<link rel="stylesheet" href="https://docs.nextcloud.com/server/13/user_manual/_static/main.min.css" type="text/css" />
+		<link rel="stylesheet" href="https://docs.nextcloud.com/server/13/user_manual/_static/styles.css" type="text/css" />
 		
-	<script type="text/javascript">var templateUrl='https://docs.nextcloud.org/server/13/user_manual/_static/';</script> <script data-main="https://docs.nextcloud.org/server/13/user_manual/_static/js/require.config.js" src="https://docs.nextcloud.org/server/13/user_manual/_static/js/require.min.js"></script>
+	<script type="text/javascript">var templateUrl='https://docs.nextcloud.com/server/13/user_manual/_static/';</script> <script data-main="https://docs.nextcloud.org/server/13/user_manual/_static/js/require.config.js" src="https://docs.nextcloud.org/server/13/user_manual/_static/js/require.min.js"></script>
 	
 	<script>require(["require.config"],function(){require(["modules/header","main","modernizr","modules/cookieconsent"])});</script>
 	
@@ -52,13 +52,13 @@
 				HAS_SOURCE:     true
 			};
 		</script>
-		<script type="text/javascript" src="https://docs.nextcloud.org/server/13/user_manual/_static/jquery.js"></script>
-		<script type="text/javascript" src="https://docs.nextcloud.org/server/13/user_manual/_static/underscore.js"></script>
-		<script type="text/javascript" src="https://docs.nextcloud.org/server/13/user_manual/_static/doctools.js"></script>
-		<script type="text/javascript" src="https://docs.nextcloud.org/server/13/user_manual/_static/js/jquery-1.11.0.min.js"></script>
-		<script type="text/javascript" src="https://docs.nextcloud.org/server/13/user_manual/_static/js/jquery-fix.js"></script>
-		<script type="text/javascript" src="https://docs.nextcloud.org/server/13/user_manual/_static/bootstrap-3.1.0/js/bootstrap.min.js"></script>
-		<script type="text/javascript" src="https://docs.nextcloud.org/server/13/user_manual/_static/bootstrap-sphinx.js"></script>
+		<script type="text/javascript" src="https://docs.nextcloud.com/server/13/user_manual/_static/jquery.js"></script>
+		<script type="text/javascript" src="https://docs.nextcloud.com/server/13/user_manual/_static/underscore.js"></script>
+		<script type="text/javascript" src="https://docs.nextcloud.com/server/13/user_manual/_static/doctools.js"></script>
+		<script type="text/javascript" src="https://docs.nextcloud.com/server/13/user_manual/_static/js/jquery-1.11.0.min.js"></script>
+		<script type="text/javascript" src="https://docs.nextcloud.com/server/13/user_manual/_static/js/jquery-fix.js"></script>
+		<script type="text/javascript" src="https://docs.nextcloud.com/server/13/user_manual/_static/bootstrap-3.1.0/js/bootstrap.min.js"></script>
+		<script type="text/javascript" src="https://docs.nextcloud.com/server/13/user_manual/_static/bootstrap-sphinx.js"></script>
 		<!-- Piwik -->
 		<script type="text/javascript">
 			var _paq = _paq || [];
@@ -114,7 +114,7 @@
 							<li class="nav__item">
 								<a href="https://nextcloud.com/files">
 									<div class="nav__logo">
-										<img style="" src="https://docs.nextcloud.org/server/13/user_manual/_static/img/Nextcloud-Files.svg" >
+										<img style="" src="https://docs.nextcloud.com/server/13/user_manual/_static/img/Nextcloud-Files.svg" >
 									</div>
 									<div class="nav__text">
 										<strong>Nextcloud Files</strong>
@@ -126,7 +126,7 @@
 							<li class="nav__item">
 								<a href="https://nextcloud.com/talk">
 									<div class="nav__logo">
-										<img src="https://docs.nextcloud.org/server/13/user_manual/_static/img/Nextcloud-Talk.svg" >
+										<img src="https://docs.nextcloud.com/server/13/user_manual/_static/img/Nextcloud-Talk.svg" >
 									</div>
 									<div class="nav__text">
 										<strong>Nextcloud Talk</strong>
@@ -138,7 +138,7 @@
 							<li class="nav__item">
 							<a href="https://nextcloud.com/groupware">
 								<div class="nav__logo">
-									<img src="https://docs.nextcloud.org/server/13/user_manual/_static/img/Nextcloud-Groupware.svg" >
+									<img src="https://docs.nextcloud.com/server/13/user_manual/_static/img/Nextcloud-Groupware.svg" >
 								</div>
 								<div class="nav__text">
 								<strong>Nextcloud Groupware</strong>
@@ -150,7 +150,7 @@
 					<li class="nav__item">
 						<a href="https://nextcloud.com/athome">
 							<div class="nav__logo">
-								<img src="https://docs.nextcloud.org/server/13/user_manual/_static/img/Nextcloud-Home.svg" >
+								<img src="https://docs.nextcloud.com/server/13/user_manual/_static/img/Nextcloud-Home.svg" >
 							</div>
 							<div class="nav__text">
 								<strong>Nextcloud at home</strong>
@@ -228,9 +228,9 @@
 								<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>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/13/user_manual/">User Manual</a>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/13/admin_manual/">Administration Manual</a>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/13/developer_manual/">Developer Manual</a>
 								</ul>
 							</div>
 
@@ -238,9 +238,9 @@
 								<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>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/12/user_manual/">User Manual</a>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/12/admin_manual/">Administration Manual</a>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/12/developer_manual/">Developer Manual</a>
 								</ul>
 							</div>
 
@@ -252,7 +252,7 @@
 									<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>
+										<li><a class="reference external" href="https://docs.nextcloud.com/desktop/2.3">Manual</a>
 									</ul>
 								</div>
 								
@@ -261,7 +261,7 @@
 									<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>
+										<li><a class="reference external" href="https://docs.nextcloud.com/desktop/2.2">Manual</a>
 									</ul>
 								</div>
 							</div><!-- client -->
@@ -276,36 +276,36 @@
 								<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>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/11/user_manual/">User Manual</a>
+									(<a class="reference external" href="https://docs.nextcloud.com/server/11/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/11/admin_manual/">Administration Manual</a>
+									(<a class="reference external" href="https://docs.nextcloud.com/server/11/Nextcloud_Server_Administration_Manual.pdf">Download PDF</a>)</li>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/11/developer_manual/">Developer Manual</a>
+									(<a class="reference external" href="https://docs.nextcloud.com/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>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/10/user_manual/">User Manual</a>
+									(<a class="reference external" href="https://docs.nextcloud.com/server/10/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/10/admin_manual/">Administration Manual</a>
+									(<a class="reference external" href="https://docs.nextcloud.com/server/10/Nextcloud_Server_Administration_Manual.pdf">Download PDF</a>)</li>
+									<li><a class="reference external" href="https://docs.nextcloud.com/server/10/developer_manual/">Developer Manual</a>
+									(<a class="reference external" href="https://docs.nextcloud.com/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>
+										<li><a class="reference external" href="https://docs.nextcloud.com/server/9/user_manual/">User Manual</a>
+										(<a class="reference external" href="https://docs.nextcloud.com/server/9/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
+										<li><a class="reference external" href="https://docs.nextcloud.com/server/9/admin_manual/">Administration Manual</a>
+										(<a class="reference external" href="https://docs.nextcloud.com/server/9/Nextcloud_Server_Administration_Manual.pdf">Download PDF</a>)</li>
+										<li><a class="reference external" href="https://docs.nextcloud.com/server/9/developer_manual/">Developer Manual</a>
+										(<a class="reference external" href="https://docs.nextcloud.com/server/9/NextcloudDeveloperManual.pdf">Download PDF</a>)</li>
 									</ul>
 								</div>
 							</div>