diff --git a/admin_manual/_templates/versions.html b/admin_manual/_templates/versions.html
new file mode 100644
index 000000000..e8a3a5a13
--- /dev/null
+++ b/admin_manual/_templates/versions.html
@@ -0,0 +1,18 @@
+{% if READTHEDOCS %}
+{# Add rst-badge after rst-versions for small badge style. #}
+  <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+    <span class="rst-current-version" data-toggle="rst-current-version">
+      <span class="fa fa-book"> Read the Docs</span>
+      v: {{ current_version }}
+      <span class="fa fa-caret-down"></span>
+    </span>
+    <div class="rst-other-versions">
+      <dl>
+        <dt>{{ _('Versions') }}</dt>
+        {% for slug, url in versions %}
+          <dd><a href="{{ url }}">{{ slug }}</a></dd>
+        {% endfor %}
+      </dl>
+    </div>
+  </div>
+{% endif %}
\ No newline at end of file
diff --git a/admin_manual/conf.py b/admin_manual/conf.py
index 1a469042a..1250689f0 100644
--- a/admin_manual/conf.py
+++ b/admin_manual/conf.py
@@ -32,7 +32,7 @@ from conf import *
 extensions += ['sphinx.ext.todo', 'rst2pdf.pdfbuilder', 'sphinx.ext.intersphinx']
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['../_shared_assets/templates']
+templates_path = ['../_shared_assets/templates', '_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -52,6 +52,8 @@ master_doc = 'contents'
 # The full version, including alpha/beta/rc tags.
 #release = '12'
 
+language = 'en'
+
 # General information about the project.
 project = u'Nextcloud %s Administration Manual' % (version)
 #copyright = u'2012-2017, The Nextcloud developers'
diff --git a/conf.py b/conf.py
index 62aa0beb4..08b572e8b 100644
--- a/conf.py
+++ b/conf.py
@@ -8,6 +8,8 @@ dir_path = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(0, os.path.abspath(dir_path + '/_ext'))
 now = datetime.datetime.now()
 
+os.environ["READTHEDOCS"] = "True"
+
 extensions = ['sphinx_rtd_theme', 'sphinx_rtd_dark_mode', 'sphinx_copybutton', 'sphinxcontrib.mermaid']
 
 # General information about the project.
diff --git a/developer_manual/_templates/versions.html b/developer_manual/_templates/versions.html
new file mode 100644
index 000000000..e8a3a5a13
--- /dev/null
+++ b/developer_manual/_templates/versions.html
@@ -0,0 +1,18 @@
+{% if READTHEDOCS %}
+{# Add rst-badge after rst-versions for small badge style. #}
+  <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+    <span class="rst-current-version" data-toggle="rst-current-version">
+      <span class="fa fa-book"> Read the Docs</span>
+      v: {{ current_version }}
+      <span class="fa fa-caret-down"></span>
+    </span>
+    <div class="rst-other-versions">
+      <dl>
+        <dt>{{ _('Versions') }}</dt>
+        {% for slug, url in versions %}
+          <dd><a href="{{ url }}">{{ slug }}</a></dd>
+        {% endfor %}
+      </dl>
+    </div>
+  </div>
+{% endif %}
\ No newline at end of file
diff --git a/developer_manual/conf.py b/developer_manual/conf.py
index 7770ac004..9859b7fac 100644
--- a/developer_manual/conf.py
+++ b/developer_manual/conf.py
@@ -32,7 +32,7 @@ from conf import *
 extensions += ['sphinx.ext.todo', 'rst2pdf.pdfbuilder', 'sphinx.ext.intersphinx', 'sphinxcontrib.phpdomain', 'sphinx_toolbox.collapse', 'sphinx_reredirects']
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['../_shared_assets/templates']
+templates_path = ['../_shared_assets/templates', '_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -172,7 +172,6 @@ html_show_sphinx = False
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'NextcloudDeveloperManual'
 
-
 # -- Options for LaTeX output --------------------------------------------------
 
 latex_elements = {