diff --git a/admin_manual/Makefile b/admin_manual/Makefile
index 3cd8eff94..72f472c35 100644
--- a/admin_manual/Makefile
+++ b/admin_manual/Makefile
@@ -47,12 +47,12 @@ html:   html-com
 html-all: html-release html-com
 
 html-release:
-	$(SPHINXBUILD) -b html -D html_theme='owncloud_release' $(ALLSPHINXOPTS) $(BUILDDIR)/html/release
+	$(SPHINXBUILD) -b html -D html_theme='nextcloud_release' $(ALLSPHINXOPTS) $(BUILDDIR)/html/release
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/release."
 
 html-com:
-	$(SPHINXBUILD) -b html -D html_theme='owncloud_com' $(ALLSPHINXOPTS) $(BUILDDIR)/html/com
+	$(SPHINXBUILD) -b html -D html_theme='nextcloud_com' $(ALLSPHINXOPTS) $(BUILDDIR)/html/com
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/com."
 
diff --git a/admin_manual/conf.py b/admin_manual/conf.py
index 1edcc14ef..03b5f266f 100644
--- a/admin_manual/conf.py
+++ b/admin_manual/conf.py
@@ -99,7 +99,7 @@ html_theme_path = ['../_shared_assets/themes']
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'owncloud_org'
+html_theme = 'nextcloud_com'
 html_theme_options = {
 #    "rightsidebar": "true",
 }
diff --git a/developer_manual/conf.py b/developer_manual/conf.py
index d8b438a97..05e8fb616 100644
--- a/developer_manual/conf.py
+++ b/developer_manual/conf.py
@@ -99,7 +99,7 @@ html_theme_path = ['../_shared_assets/themes']
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'owncloud_org'
+html_theme = 'nextcloud_com'
 html_theme_options = {
 #    "rightsidebar": "true",
 }
diff --git a/user_manual/Makefile b/user_manual/Makefile
index 0353c8c9c..72f472c35 100644
--- a/user_manual/Makefile
+++ b/user_manual/Makefile
@@ -47,17 +47,12 @@ html:   html-com
 html-all: html-release html-com
 
 html-release:
-	$(SPHINXBUILD) -b html -D html_theme='owncloud_release' $(ALLSPHINXOPTS) $(BUILDDIR)/html/release
+	$(SPHINXBUILD) -b html -D html_theme='nextcloud_release' $(ALLSPHINXOPTS) $(BUILDDIR)/html/release
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/release."
 
-html-org:
-	$(SPHINXBUILD) -b html -D html_theme='owncloud_org' $(ALLSPHINXOPTS) $(BUILDDIR)/html/org
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/org."
-
 html-com:
-	$(SPHINXBUILD) -b html -D html_theme='owncloud_com' $(ALLSPHINXOPTS) $(BUILDDIR)/html/com
+	$(SPHINXBUILD) -b html -D html_theme='nextcloud_com' $(ALLSPHINXOPTS) $(BUILDDIR)/html/com
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/com."
 
diff --git a/user_manual/conf.py b/user_manual/conf.py
index 060c71e47..09e3661b1 100644
--- a/user_manual/conf.py
+++ b/user_manual/conf.py
@@ -99,7 +99,7 @@ html_theme_path = ['../_shared_assets/themes']
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'owncloud_org'
+html_theme = 'nextcloud_com'
 html_theme_options = {
 #    "rightsidebar": "true",
 }