diff --git a/_shared_assets/themes/nextcloud_com/layout.html b/_shared_assets/themes/nextcloud_com/layout.html
index c999603f1..c8c8725a6 100644
--- a/_shared_assets/themes/nextcloud_com/layout.html
+++ b/_shared_assets/themes/nextcloud_com/layout.html
@@ -144,10 +144,16 @@
   <div class="content row">
   <main class="main">
     <div class="row page-content-header">
-      <div class="col-md-6">
+      <div class="col-md-8">
         <h1><a href="{{ pathto(master_doc) }}">{{ project|e }}</a></h1>
+        <div class="doc-version-switch">
+          Nextcloud versions: 
+        {%- for v in doc_versions %}
+          <a href="https://docs.nextcloud.com/server/{{ v }}/{{current_doc}}/{{pagename}}.html" {% if version == v %} class="current-doc"{% endif %}>{{v}}</a>
+        {%- endfor %}
+        </div>
       </div>
-      <div class="col-md-5 col-md-offset-1">
+      <div class="col-md-4">
       {% if theme_show_search %}
         <form class="headersearch" style="margin: 16px 0;" action="{{ pathto('search') }}" method="get">
         <input type="text" value="" name="q" id="q" class="form-control" /> 
diff --git a/_shared_assets/themes/nextcloud_com/relations.html b/_shared_assets/themes/nextcloud_com/relations.html
index f7cbd2af9..b4c4fe091 100644
--- a/_shared_assets/themes/nextcloud_com/relations.html
+++ b/_shared_assets/themes/nextcloud_com/relations.html
@@ -6,7 +6,7 @@
   <li class="prev">
     <a href="{{ prev.link|e }}" title="{{ _('Previous Chapter: ') + prev.title|striptags }}">
       {%- if theme_bootstrap_version == "3" -%}<span class="glyphicon glyphicon-chevron-left visible-sm"></span>{%- endif -%}
-      <span class="hidden-sm">{{ "&laquo;"|safe }} {{ prev.title|striptags|truncate(length=16, killwords=True) }}</span>
+      <span class="hidden-sm">{{ "&laquo;"|safe }} {{ prev.title|striptags }}</span>
     </a>
   </li>
 {%- endif %}
@@ -14,7 +14,7 @@
   <li class="next">
     <a href="{{ next.link|e }}" title="{{ _('Next Chapter: ') + next.title|striptags }}">
       {%- if theme_bootstrap_version == "3" -%}<span class="glyphicon glyphicon-chevron-right visible-sm"></span>{%- endif -%}
-      <span class="hidden-sm">{{ next.title|striptags|truncate(length=16, killwords=True) }} {{ "&raquo;"|safe }}</span>
+      <span class="hidden-sm">{{ next.title|striptags }} {{ "&raquo;"|safe }}</span>
     </a>
   </li>
 {%- endif %}
diff --git a/_shared_assets/themes/nextcloud_com/static/styles.css b/_shared_assets/themes/nextcloud_com/static/styles.css
index 8f55a8c5c..6faa28515 100644
--- a/_shared_assets/themes/nextcloud_com/static/styles.css
+++ b/_shared_assets/themes/nextcloud_com/static/styles.css
@@ -975,7 +975,7 @@ img.desaturate {
     background-size: cover;
     -o-background-size: cover;
     /*    border: 0px; */
-    /*     min-height: 450px; background-position: 35% 40%; */
+    /*    min-height: 450px; background-position: 35% 40%; */
     position: relative;
     margin-left: 0px !important;
     margin-right: 0px !important;
@@ -1020,7 +1020,7 @@ img.desaturate {
 
 @media (max-width: 767px) {
     .ft-everywhere-img {
-        /*     height: auto; */
+        /* height: auto; */
         width: 20%;
         right: 5%;
     }
@@ -1060,9 +1060,9 @@ img.desaturate {
     top: 30%;
     left: 45%;
     margin-top: 10px;
-    /*     width: 0px; */
-    /*     height: 0px; */
-    /*     padding: 50%; */
+    /* width: 0px; */
+    /* height: 0px; */
+    /* padding: 50%; */
 }
 
 .youtube i {
@@ -1109,7 +1109,6 @@ a.headerlink {
 }
 
 #menu-support > ul > .current {
-    border: 1px solid #999 !important;
     border-right: 0 !important;
     border-bottom-left-radius: 5px;
     border-top-left-radius: 5px;
@@ -1129,11 +1128,6 @@ a.headerlink {
 #menu-support.menu ul ul ul {
   list-style-type: square;
 }
-/* having a separator between each elements of the top list and
-   between above the top of the third level list */
-#menu-support.menu ul ul ul {
-  border-top: 1px solid #EFEFEF;
-}
 
 .terminal-image {
   box-shadow: 1px 1px 15px rgba(0, 0, 0, 0.3);
@@ -1203,3 +1197,15 @@ li > dl > dt {
     background: #ddd;
     border-radius: 50%;
 }
+
+/* Version switcher */
+
+.doc-version-switch a {
+    padding: 3px;
+    margin-left:10px;
+    display: inline-block;
+}
+.doc-version-switch .current-doc {
+    font-weight: 900;
+}
+
diff --git a/admin_manual/conf.py b/admin_manual/conf.py
index d6f79f5b1..1ada5a014 100644
--- a/admin_manual/conf.py
+++ b/admin_manual/conf.py
@@ -13,6 +13,10 @@
 
 import sys, os
 
+# import global configuration from parent directory
+sys.path.insert(0, os.path.abspath('../'))
+from conf import *
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -44,13 +48,13 @@ master_doc = 'contents'
 # built documents.
 #
 # The short X.Y version.
-version = '12'
+#version = '12'
 # The full version, including alpha/beta/rc tags.
-release = '12'
+#release = '12'
 
 # General information about the project.
-project = u'Nextcloud %s Server Administration Manual' % (version)
-copyright = u'2012-2017, The Nextcloud developers'
+project = u'Nextcloud %s Administration Manual' % (version)
+#copyright = u'2012-2017, The Nextcloud developers'
 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -281,4 +285,4 @@ epub_copyright = u'2012-2017, The Nextcloud developers'
 #epub_tocdup = True
 
 # Include todos?
-todo_include_todos = True
+todo_include_todos = True
\ No newline at end of file
diff --git a/conf.py b/conf.py
new file mode 100644
index 000000000..aa16256e5
--- /dev/null
+++ b/conf.py
@@ -0,0 +1,24 @@
+# global configuration for every documentation added at the end 
+
+import os
+
+# General information about the project.
+copyright = u'2012-2017, The Nextcloud developers'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '12'
+# The full version, including alpha/beta/rc tags.
+release = '12'
+
+
+# substitutions go here
+rst_epilog =  '.. |version| replace:: %s' % version
+
+html_context = {
+	'doc_versions': ['11', '12'],
+	'current_doc': os.path.basename(os.getcwd()),
+}
diff --git a/developer_manual/conf.py b/developer_manual/conf.py
index 686c06641..d59fcc510 100644
--- a/developer_manual/conf.py
+++ b/developer_manual/conf.py
@@ -13,6 +13,10 @@
 
 import sys, os
 
+# import global configuration from parent directory
+sys.path.insert(0, os.path.abspath('../'))
+from conf import *
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -40,17 +44,17 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Nextcloud Developer Manual'
-copyright = u'2012-2017, The Nextcloud developers'
+project = u'Nextcloud %s Developer Manual' % (version)
+#copyright = u'2012-2017, The Nextcloud developers'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '13'
+#version = '13'
 # The full version, including alpha/beta/rc tags.
-release = '13'
+#release = '13'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -179,7 +183,7 @@ latex_elements = {
 #'pointsize': '10pt',
 
 # Additional stuff for the LaTeX preamble.
-'preamble': '\extrafloats{100}\maxdeadcycles=500',
+#'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
diff --git a/user_manual/conf.py b/user_manual/conf.py
index 19fc9b6ed..6824e0b0a 100644
--- a/user_manual/conf.py
+++ b/user_manual/conf.py
@@ -13,6 +13,10 @@
 
 import sys, os
 
+# import global configuration from parent directory
+sys.path.insert(0, os.path.abspath('../'))
+from conf import *
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -44,13 +48,13 @@ master_doc = 'contents'
 # built documents.
 #
 # The short X.Y version.
-version = '12'
+#version = '12'
 # The full version, including alpha/beta/rc tags.
-release = '12'
+#release = '12'
 
 # General information about the project.
 project = u'Nextcloud %s User Manual' % (version)
-copyright = u'2012-2017, The Nextcloud developers'
+#copyright = u'2012-2017, The Nextcloud developers'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -290,7 +294,4 @@ epub_copyright = u'2012-2017, The Nextcloud developers'
 #epub_tocdup = True
 
 # Include todos?
-todo_include_todos = True
-
-# substitutions go here
-rst_epilog =  '.. |version| replace:: %s' % version
+todo_include_todos = True
\ No newline at end of file
diff --git a/user_manual_de/conf.py b/user_manual_de/conf.py
index 818199325..e87e8e7b4 100644
--- a/user_manual_de/conf.py
+++ b/user_manual_de/conf.py
@@ -13,6 +13,10 @@
 
 import sys, os
 
+# import global configuration from parent directory
+sys.path.insert(0, os.path.abspath('../'))
+from conf import *
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -44,13 +48,13 @@ master_doc = 'contents'
 # built documents.
 #
 # The short X.Y version.
-version = '12'
+#version = '12'
 # The full version, including alpha/beta/rc tags.
-release = '12'
+#release = '12'
 
 # General information about the project.
 project = u'Nextcloud %s Benutzerhandbuch' % (version)
-copyright = u'2012-2017, Die Nextcloud Entwickler'
+#copyright = u'2012-2017, Die Nextcloud Entwickler'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -290,7 +294,4 @@ epub_copyright = u'2012-2017, Die Nextcloud Entwickler'
 #epub_tocdup = True
 
 # Include todos?
-todo_include_todos = True
-
-# substitutions go here
-rst_epilog =  '.. |version| replace:: %s' % version
+todo_include_todos = True
\ No newline at end of file