diff --git a/docs/en/ExtensionPoints.md b/docs/en/ExtensionPoints.md
index 1c740fd772..e798445fc9 100644
--- a/docs/en/ExtensionPoints.md
+++ b/docs/en/ExtensionPoints.md
@@ -1,4 +1,6 @@
-# Extension Points
+---
+title: Extension Points
+---
 
 - [AuthenticationHandler](http://docs.scm-manager.org/apidocs/latest/sonia/scm/web/security/AuthenticationHandler.html)
 - [AuthenticationListener](http://docs.scm-manager.org/apidocs/latest/sonia/scm/web/security/AuthenticationListener.html)
diff --git a/docs/en/Notes and considerations for 2.0.md b/docs/en/Notes and considerations for 2.0.md
deleted file mode 100644
index 208dd5651e..0000000000
--- a/docs/en/Notes and considerations for 2.0.md	
+++ /dev/null
@@ -1 +0,0 @@
-Moved to [State of SCM-Manager 2 development](State of SCM-Manager 2 development.md)
diff --git a/docs/en/Permissions.md b/docs/en/Permissions.md
index 40b92be09b..a0a3497288 100644
--- a/docs/en/Permissions.md
+++ b/docs/en/Permissions.md
@@ -1,4 +1,6 @@
-## Permissions
+---
+title: Permissions
+---
 
 SCM-Manager knows three different types of repository permissions:
 
diff --git a/docs/en/RPM and DEB packages.md b/docs/en/RPM and DEB packages.md
index 03ccd1b940..ff4241de61 100644
--- a/docs/en/RPM and DEB packages.md	
+++ b/docs/en/RPM and DEB packages.md	
@@ -1,4 +1,7 @@
-# RPM and DEB packages
+---
+title: RPM and DEB packages
+displayToc: true
+---
 
 Since version 1.39, SCM-Manager is delivered as RPM and DEB package. The package are generated with the [nativepkg-maven-plugin](https://github.com/sdorra/nativepkg-maven-plugin). The following table shows the directory structure which will be created by the packages:
 
diff --git a/docs/en/State of SCM-Manager 2 development.md b/docs/en/State of SCM-Manager 2 development.md
deleted file mode 100644
index b7d2429584..0000000000
--- a/docs/en/State of SCM-Manager 2 development.md	
+++ /dev/null
@@ -1,37 +0,0 @@
-# State of SCM-Manager 2 development
-The development of SCM-Manager 2.0.0 is organised in [Trello Boards](https://trello.com/scmmanager).
-
-## [Milestone 1](https://trello.com/b/oit1MD92/scm-manager-2-0-0-milestone-1)
-
-### Main goals
-* remove deprecated and unused stuff
-* remove old style listeners
-* replace [guava eventbus](https://code.google.com/p/guava-libraries/wiki/EventBusExplained) with [legman](https://github.com/sdorra/legman)
-* introduce new plugin structure
-* offline plugin installation/updates/deinstallation
-* use java 7 as default
-* use of [annotation processors](http://docs.oracle.com/javase/7/docs/api/javax/annotation/processing/Processor.html) instead of classpath scanning
-* move non core modules (plugin-backend, maven plugins, etc.) to separate repositories
-
-## [Milestone 2](https://trello.com/b/Afb3hoJ9/scm-manager-2-0-0-milestone-2)
-
-### Main goals
-* use [apache shiro](http://shiro.apache.org/) everywhere
-* improve authentication
-* improve user and group management
-* use permission instead of roles
-
-## [Milestone 3](https://trello.com/b/eLvqTGGe/scm-manager-2-0-0-milestone-3)
-
-### Main goals
-* completely new designed rest api
-
-## Milestone 4
-
-### Main goals
-* completely new user interface
-
-## Milestone 5
-
-### Main goals
-* improve repository api
diff --git a/docs/en/active-directory-plugin.md b/docs/en/active-directory-plugin.md
index 3d9bd09685..962e34684b 100644
--- a/docs/en/active-directory-plugin.md
+++ b/docs/en/active-directory-plugin.md
@@ -1,4 +1,6 @@
-### Active Directory Plugin
+---
+title: Active Directory Plugin
+---
 
 - Connect your Windows machine to your local Active Directory
 - Log in as a user of that directory
diff --git a/docs/en/apache/apache-mod_jk.md b/docs/en/apache/apache-mod_jk.md
index 73e42c1944..7607728b0e 100644
--- a/docs/en/apache/apache-mod_jk.md
+++ b/docs/en/apache/apache-mod_jk.md
@@ -1,6 +1,6 @@
 ---
 title: SCM-Server and Apache mod\_jk
-subtitle: Main documentation page
+subtitle: Setting up SCM-Manager with Apache Tomcat
 ---
 
 ### Apache Configuration
diff --git a/docs/en/apache/apache-mod_proxy.md b/docs/en/apache/apache-mod_proxy.md
index 16e8eaf14d..e24d0dc7ba 100644
--- a/docs/en/apache/apache-mod_proxy.md
+++ b/docs/en/apache/apache-mod_proxy.md
@@ -1,4 +1,7 @@
-# SCM-Server and Apache mod\_proxy
+---
+title: SCM-Server and Apache mod\_proxy
+subtitle: Setting up SCM-Manager behind a reverse proxy
+---
 
 ### Apache configuration
 
diff --git a/docs/en/applicationserver.md b/docs/en/applicationserver.md
index fb30079a04..d3e3c1d80d 100644
--- a/docs/en/applicationserver.md
+++ b/docs/en/applicationserver.md
@@ -1,4 +1,7 @@
-# Applicationserver
+---
+title: Applicationserver
+displayToc: true
+---
 
 ## Tomcat
 
diff --git a/docs/en/branchwp-plugin.md b/docs/en/branchwp-plugin.md
index 9af0d90f65..57a7156f95 100644
--- a/docs/en/branchwp-plugin.md
+++ b/docs/en/branchwp-plugin.md
@@ -1,4 +1,6 @@
-# Branch Write Protect Plugin
+---
+title: Branch Write Protect Plugin
+---
 
 ### Installation
 
diff --git a/docs/en/build-from-source.md b/docs/en/build-from-source.md
index 4ad9fa7fdd..692d510344 100644
--- a/docs/en/build-from-source.md
+++ b/docs/en/build-from-source.md
@@ -1,4 +1,6 @@
-# Building SCM-Manager from source
+---
+title: Building SCM-Manager from source
+---
 
 ### Software Requirements
 
diff --git a/docs/en/code-snippets.md b/docs/en/code-snippets.md
index 29e621ec14..62429d58f8 100644
--- a/docs/en/code-snippets.md
+++ b/docs/en/code-snippets.md
@@ -1,4 +1,6 @@
-# Code Snippets
+---
+title: Code Snippets
+---
 
 ### User Interface
 
diff --git a/docs/en/command-line-client.md b/docs/en/command-line-client.md
index 352070bd17..86c4c29671 100644
--- a/docs/en/command-line-client.md
+++ b/docs/en/command-line-client.md
@@ -1,4 +1,6 @@
-# Command line client
+---
+title: Command line client
+---
 
 You can download the command line client from
 [here](http://www.scm-manager.org/download/) (the scm-cli-client).
diff --git a/docs/en/configure-eclipse.md b/docs/en/configure-eclipse.md
index 8a8d15861d..52fa067ff7 100644
--- a/docs/en/configure-eclipse.md
+++ b/docs/en/configure-eclipse.md
@@ -1,4 +1,6 @@
-# Configure Eclipse
+---
+title: Configuring Eclipse
+---
 
 There are multiple approaches to using Maven projects within Eclipse. If
 you use an approach that isn\'t listed here, feel free to add it.
diff --git a/docs/en/daemons.md b/docs/en/daemons.md
index f17a3d67a6..196aa6db31 100644
--- a/docs/en/daemons.md
+++ b/docs/en/daemons.md
@@ -1,4 +1,6 @@
-# Unix Daemons and Windows Services
+---
+title: Unix Daemons and Windows Services
+---
 
 **Note**: If you are using a 64Bit operating system you should use a 64Bit JavaVirtualMachine as well 
 ([#74](https://github.com/scm-manager/scm-manager/issues/74) or 
diff --git a/docs/en/download-archive.md b/docs/en/download-archive.md
index 6f32c556bd..a044457755 100644
--- a/docs/en/download-archive.md
+++ b/docs/en/download-archive.md
@@ -1,4 +1,7 @@
-# Download Archive
+---
+title: Download Archive
+displayToc: true
+---
 
 ### SCM-Server 1.59 (standalone)
 
diff --git a/docs/en/download-snapshot-release.md b/docs/en/download-snapshot-release.md
index dfba15b96b..453010176f 100644
--- a/docs/en/download-snapshot-release.md
+++ b/docs/en/download-snapshot-release.md
@@ -1,4 +1,7 @@
-# Download latest Snapshot release
+---
+title: Snapshot Releases
+displayToc: true
+---
 
 ### SCM-Server 1.61 SNAPSHOT (standalone)
 
diff --git a/docs/en/download.md b/docs/en/download.md
index 23cd737cb5..4af4da0b9a 100644
--- a/docs/en/download.md
+++ b/docs/en/download.md
@@ -1,3 +1,5 @@
-# Download
+---
+title: Stable
+---
 
 The download page has moved to <http://www.scm-manager.org/download/>
diff --git a/docs/en/faq.md b/docs/en/faq.md
index 29aa799bff..cdab2e345a 100644
--- a/docs/en/faq.md
+++ b/docs/en/faq.md
@@ -1,4 +1,6 @@
-# Frequently Asked Questions
+---
+title: FAQ
+---
 
 ### What are the username and the password in the default installation?
 
diff --git a/docs/en/getting-started.md b/docs/en/getting-started.md
index 623070f5b9..f6b00c46c9 100644
--- a/docs/en/getting-started.md
+++ b/docs/en/getting-started.md
@@ -1,3 +1,8 @@
+---
+title: Getting started
+subtitle: How to install and configure SCM-Manager
+---
+
 # Getting started
 
 ### Install Java
diff --git a/docs/en/glassfish.md b/docs/en/glassfish.md
deleted file mode 100644
index 1797731015..0000000000
--- a/docs/en/glassfish.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# SCM-Manager with GlassFish
-
-To use SCM-Manager 1.6 and above with GlassFish 3.x you have to add a
-JVM-Option to the GlassFish configuration. Please follow the steps
-below.
-
-Open the GlassFish Admin-Console (http://yourserver:4848), login as
-admin user, goto Configuration-\>JVM Settings, switch to the JVM Options
-tab and add the following JVM-Option:
-
-```bash
--Dcom.sun.enterprise.overrideablejavaxpackages=javax.ws.rs,javax.ws.rs.core,javax.ws.rs.ext
-```
-
-Restart the GlassFish-Server.
-
-Source:
-<http://jersey.java.net/nonav/documentation/latest/glassfish.html>
diff --git a/docs/en/healthchecks/svn-incompatible-dbformat.md b/docs/en/healthchecks/svn-incompatible-dbformat.md
index 50f91d4946..92bab3aa15 100644
--- a/docs/en/healthchecks/svn-incompatible-dbformat.md
+++ b/docs/en/healthchecks/svn-incompatible-dbformat.md
@@ -1,4 +1,6 @@
-# Incompatible subversion db format
+---
+title: Incompatible subversion db format
+---
 
 SCM-Manager versions prior to 1.36 are creating incompatible subversion repositories, if the subversion option "with 1.7 Compatible" is enabled. This subversion repositories are neither compatible with svn 1.7 nor svn 1.8. These repositories are marked as unhealthy by SCM-Manager version 1.36 and above.
 
diff --git a/docs/en/howto-create-a-plugin.md b/docs/en/howto-create-a-plugin.md
deleted file mode 100644
index 32336524d4..0000000000
--- a/docs/en/howto-create-a-plugin.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# How to create your own plugin
-
-### Software Requirements
-
--   JDK 1.7 or higher
-    ([download](http://www.oracle.com/technetwork/java/index.html))
--   Maven 3 or higher ([download](http://maven.apache.org/))
-
-### Create plugin
-
-```bash
-mvn archetype:generate\
-   -DarchetypeGroupId=sonia.scm.maven\
-   -DarchetypeArtifactId=scm-plugin-archetype\
-   -DarchetypeVersion=1.60\
-   -DarchetypeRepository=http://maven.scm-manager.org/nexus/content/groups/public/
-```
-### Test the plugin
-
-```bash
-mvn scmp:run
-```
-
-### Samples
-
-- [Hello World](https://bitbucket.org/sdorra/scm-manager/src/1.x/scm-samples/scm-sample-hello/)
-- [Authentication Plugin](https://bitbucket.org/sdorra/scm-manager/src/1.x/scm-samples/scm-sample-auth/)
-
-### Further reading
-
-- [Injection framework - Google Guice](http://code.google.com/p/google-guice/)
-- [Restful WebService - Jersey](http://jersey.java.net/nonav/documentation/latest/user-guide.html)
-- [ XML transformation - JAXB](http://jaxb.java.net/guide/)
-- [User interface - Ext JS](http://www.sencha.com/products/extjs3/)
-
-### Questions/Help
-
-If you have questions or you need help, please write to the mailing
-list: <https://groups.google.com/forum/#!forum/scmmanager>
diff --git a/docs/en/iis-helicon.md b/docs/en/iis-helicon.md
index 489e7c8b02..96eeb39589 100644
--- a/docs/en/iis-helicon.md
+++ b/docs/en/iis-helicon.md
@@ -1,4 +1,6 @@
-# SCM-Manager on IIS Helicon
+---
+title: SCM-Manager on IIS Helicon
+---
 First of all this setup is not recommended, because there were a lot of problems with it and it was never tested by the development team of SCM-Manager. However there are several working installation out there. But there some pitfalls:
 
 **Problem description:**
diff --git a/docs/en/index.md b/docs/en/index.md
index 01e6683294..22a6d1ed6c 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -79,7 +79,7 @@ repositories over http.
 - [Configuring Eclipse projects for SCM-Manager](configure-eclipse.md)
 - [Plugin Descriptor](plugin-descriptor.md)
 - [ExtensionPoints](ExtensionPoints.md)
-- [How to create your own plugin](howto-create-a-plugin.md)
+- [How to create your own plugin](content/docs/1.60.x/en/how-to-create-a-plugin.md)
 - [Injection Objects](injectionObjects.md)
 - [API documentation](http://docs.scm-manager.org/apidocs/latest/)
 - [WebService documentation](http://docs.scm-manager.org/restdocs/current/)
diff --git a/docs/en/injectionObjects.md b/docs/en/injectionObjects.md
index 4dcccb0215..877dd184f2 100644
--- a/docs/en/injectionObjects.md
+++ b/docs/en/injectionObjects.md
@@ -1,5 +1,6 @@
-# Injection Objects
-
+---
+title: Injection Objects
+---
 - [AdministrationContext](http://docs.scm-manager.org/apidocs/latest/sonia/scm/web/security/AdministrationContext.html)
 - [AuthenticationManager](http://docs.scm-manager.org/apidocs/latest/sonia/scm/web/security/AuthenticationManager.html)
 - [CGIExecutorFactory](http://docs.scm-manager.org/apidocs/latest/sonia/scm/web/cgi/CGIExecutorFactory.html)
diff --git a/docs/en/java-client-api.md b/docs/en/java-client-api.md
index f3229cc63c..2cf3daa33a 100644
--- a/docs/en/java-client-api.md
+++ b/docs/en/java-client-api.md
@@ -1,4 +1,6 @@
-# Java Client API
+---
+title: Java Client API
+---
 
 ### Maven
 
diff --git a/docs/en/jenkins-plugin.md b/docs/en/jenkins-plugin.md
index c63911fe23..f4d23fb885 100644
--- a/docs/en/jenkins-plugin.md
+++ b/docs/en/jenkins-plugin.md
@@ -1,4 +1,6 @@
-# scm-jenkins-plugin
+---
+title: SCM-Jenkins-Plugin
+---
 
 The jenkins plugin will ping your Jenkins CI server when a new commit is
 pushed to SCM-Manager. In SCM-Manager exists two differnt methods to
diff --git a/docs/en/jira-plugin.md b/docs/en/jira-plugin.md
index 20475d6321..8cf8259a94 100644
--- a/docs/en/jira-plugin.md
+++ b/docs/en/jira-plugin.md
@@ -1,4 +1,6 @@
-# scm-jira-plugin
+---
+title: Jira Plugin
+---
 
 The plugin enables the following features to integrate Atlassian JIRA to
 SCM-Manager:
diff --git a/docs/en/mail-plugin.md b/docs/en/mail-plugin.md
index ff46a773ec..4ccafc8b43 100644
--- a/docs/en/mail-plugin.md
+++ b/docs/en/mail-plugin.md
@@ -1,4 +1,6 @@
-# scm-mail-plugin
+---
+title: Mail Plugin
+---
 
 The mail plugin provides an central api for sending e-mails. This api
 can be used by other plugins.
diff --git a/docs/en/mantisbt-plugin.md b/docs/en/mantisbt-plugin.md
index 160c5a0726..b9723175ba 100644
--- a/docs/en/mantisbt-plugin.md
+++ b/docs/en/mantisbt-plugin.md
@@ -1,4 +1,6 @@
-# scm-mantisbt-plugin
+---
+title: Mantisbt Plugin
+---
 
 The plugin enables the following features to integrate [MantisBT](https://www.mantisbt.org/) to SCM-Manager:
 
diff --git a/docs/en/mercurial/clone-empty.md b/docs/en/mercurial/clone-empty.md
index 44a81de20c..f18ab5ffa4 100644
--- a/docs/en/mercurial/clone-empty.md
+++ b/docs/en/mercurial/clone-empty.md
@@ -1,4 +1,6 @@
-# Clone empty repository
+---
+title: Cloning an empty repository
+---
 
 ```http
 GET /scm/hg/hgtest?cmd=capabilities HTTP/1.1.
diff --git a/docs/en/mercurial/push-bookmark.md b/docs/en/mercurial/push-bookmark.md
index 9ed591f9f4..bdb2c09aac 100644
--- a/docs/en/mercurial/push-bookmark.md
+++ b/docs/en/mercurial/push-bookmark.md
@@ -1,4 +1,6 @@
-# Push bookmark
+---
+title: Push bookmark
+---
 
 ```http
 GET /scm/hg/hgtest?cmd=capabilities HTTP/1.1.
diff --git a/docs/en/mercurial/push-multiple-branches-to-new.md b/docs/en/mercurial/push-multiple-branches-to-new.md
index 734c479fef..060cac73a6 100644
--- a/docs/en/mercurial/push-multiple-branches-to-new.md
+++ b/docs/en/mercurial/push-multiple-branches-to-new.md
@@ -1,4 +1,6 @@
-# Push multiple branches to new repository
+---
+title: Push multiple branches to new repository
+---
 
 ```http
 GET /scm/hg/hgtest?cmd=capabilities HTTP/1.1.
diff --git a/docs/en/mercurial/push-multiple-branches.md b/docs/en/mercurial/push-multiple-branches.md
index 5827cb0ceb..16b8a4b494 100644
--- a/docs/en/mercurial/push-multiple-branches.md
+++ b/docs/en/mercurial/push-multiple-branches.md
@@ -1,4 +1,6 @@
-# Push multiple branches
+---
+title: Push multiple branches
+---
 
 ```http
 GET /scm/hg/hgtest?cmd=capabilities HTTP/1.1.
diff --git a/docs/en/mercurial/push-single-changeset.md b/docs/en/mercurial/push-single-changeset.md
index 499b4c21c3..d7ad480bcd 100644
--- a/docs/en/mercurial/push-single-changeset.md
+++ b/docs/en/mercurial/push-single-changeset.md
@@ -1,4 +1,6 @@
-# Push single changeset
+---
+title: Push single changeset
+---
 
 ```http
 GET /scm/hg/hgtest?cmd=capabilities HTTP/1.1.
diff --git a/docs/en/navigation.yml b/docs/en/navigation.yml
index 050e4c01a0..7cbfb22adf 100644
--- a/docs/en/navigation.yml
+++ b/docs/en/navigation.yml
@@ -1,10 +1,75 @@
 - section: Getting started
   entries:
     - /getting-started/
+    - /applicationserver/
+    - /iis-helicon/
+    - /nginx/
+    - /apache/apache-mod_jk/
+    - /apache/apache-mod_proxy/
+    - /daemons/
+    - /upgrade/
     - /faq/
 
-- section: Plugin Development
+- section: Downloads
   entries:
-    - /plugin-development/create/
-    - /plugin-development/i18n/
-    - /plugin-development/publish/
+    - /RPM and DEB packages/
+    - /download/
+    - /download-snapshot-release/
+    - /download-archive/
+
+- section: Release Notes
+  entries:
+    - /release-notes/
+    - /release notes 1.39 - 1.20/
+    - /release notes 1.19 - 1.0/
+
+- section: Administration
+  entries:
+    - /command-line-client/
+    - /scm-server-ssl/
+    - /Permissions/
+    - /rv-plugin-comparison/
+    - /healthchecks/svn-incompatible-dbformat/
+
+- section: Mercurial
+  entries:
+    - /mercurial/clone-empty/
+    - /mercurial/push-bookmark/
+    - /mercurial/push-multiple-branches/
+    - /mercurial/push-multiple-branches-to-new/
+    - /mercurial/push-single-changeset/
+
+- section: Plugins
+  entries:
+    - /scm-plugins/
+    - /how-to-create-a-plugin/
+    - /plugin-descriptor/
+    - /active-directory-plugin/
+    - /branchwp-plugin/
+    - /pathwp-plugin/
+    - /jira-plugin/
+    - /mail-plugin/
+    - /mantisbt-plugin/
+    - /redmine-plugin/
+    - /scheduler-plugin/
+    - /trac-plugin/
+    - /webhook-plugin/
+    - /jenkins-plugin/
+
+- section: Development
+  entries:
+    - /configure-eclipse/
+    - /build-from-source/
+    - /java-client-api/
+    - /ExtensionPoints/
+    - /injectionObjects/
+
+- section: Examples
+  entries:
+    - /screens/
+    - /code-snippets/
+    - /snippet-authentication/
+    - /snippet-config-group/
+    - /snippet-extend-navigation/
+    - /snippet-repository-tab/
+    - /subrepositories/
diff --git a/docs/en/nginx.md b/docs/en/nginx.md
index 5b14695c40..b4f68714a0 100644
--- a/docs/en/nginx.md
+++ b/docs/en/nginx.md
@@ -1,4 +1,6 @@
-# SCM-Server and Nginx
+---
+title: SCM-Server and Nginx
+---
 
 ## Nginx configuration
 
diff --git a/docs/en/pathwp-plugin.md b/docs/en/pathwp-plugin.md
index 0e7563e9fb..814e5b1ff9 100644
--- a/docs/en/pathwp-plugin.md
+++ b/docs/en/pathwp-plugin.md
@@ -1,4 +1,6 @@
-# Path Write Protect Plugin
+---
+title: Path Write Protect Plugin
+---
 
 ### Installation
 
diff --git a/docs/en/plugin-descriptor.md b/docs/en/plugin-descriptor.md
index 53631fa739..8f1a1d26f0 100644
--- a/docs/en/plugin-descriptor.md
+++ b/docs/en/plugin-descriptor.md
@@ -1,4 +1,6 @@
-# Plugin Descriptor
+---
+title: Plugin Descriptor
+---
 
 The plugin descriptor contains informations and instructions for the
 scm-manager to integrate the plugin. The descriptor is located at
diff --git a/docs/en/redmine-plugin.md b/docs/en/redmine-plugin.md
index db1fa21ae8..302dd2a121 100644
--- a/docs/en/redmine-plugin.md
+++ b/docs/en/redmine-plugin.md
@@ -1,4 +1,6 @@
-# Redmine Plugin
+---
+title: Redmine Plugin
+---
 
 Is based on [scm-jira-plugin](jira-plugin.md).
 
diff --git a/docs/en/release notes 1.19 - 1.0.md b/docs/en/release notes 1.19 - 1.0.md
index 828e1dd2f7..0c9de3e82b 100644
--- a/docs/en/release notes 1.19 - 1.0.md	
+++ b/docs/en/release notes 1.19 - 1.0.md	
@@ -1,4 +1,7 @@
-# Release Notes 1.19 - 1.0
+---
+title: Release Notes 1.19 - 1.0
+displayToc: true
+---
 
 ## SCM-Manager 1.19
 
diff --git a/docs/en/release notes 1.39 - 1.20.md b/docs/en/release notes 1.39 - 1.20.md
index 7ddf77a5b7..bc2b47f770 100644
--- a/docs/en/release notes 1.39 - 1.20.md	
+++ b/docs/en/release notes 1.39 - 1.20.md	
@@ -1,4 +1,7 @@
-# Release Notes 1.39 - 1.20
+---
+title: Release Notes 1.39 - 1.20
+displayToc: true
+---
 
 SCM-Manager 1.39
 ----------------
diff --git a/docs/en/release-notes.md b/docs/en/release-notes.md
index c52f33bba5..f6e8f03a26 100644
--- a/docs/en/release-notes.md
+++ b/docs/en/release-notes.md
@@ -1,3 +1,8 @@
+---
+title: Release Notes 1.60 - 1.40
+displayToc: true
+---
+
 **note**
 
 -   Versions prior to 1.36 are creating incompatible subversion
diff --git a/docs/en/rv-plugin-comparison.md b/docs/en/rv-plugin-comparison.md
index c81899961d..a0b954b33c 100644
--- a/docs/en/rv-plugin-comparison.md
+++ b/docs/en/rv-plugin-comparison.md
@@ -1,4 +1,6 @@
-# Revision Control Plugin Comparison
+---
+title: Revision Control Plugin Comparison
+---
 
 | Plugin Name | Name | Core-Plugin | Requirements | Url |
 | --- | --- | --- | --- | --- | 
diff --git a/docs/en/scheduler-plugin.md b/docs/en/scheduler-plugin.md
index e7cf622f30..ec315fbb01 100644
--- a/docs/en/scheduler-plugin.md
+++ b/docs/en/scheduler-plugin.md
@@ -1,4 +1,6 @@
-# scm-scheduler-plugin
+---
+title: Scheduler Plugin
+---
 
 The scheduler plugin provides an api for other plugins to execute scheduled jobs. The plugin is based on the [quartz project](http://quartz-scheduler.org/).
 
diff --git a/docs/en/scm-plugins.md b/docs/en/scm-plugins.md
index 1d672d3edb..32609da3f0 100644
--- a/docs/en/scm-plugins.md
+++ b/docs/en/scm-plugins.md
@@ -1,4 +1,6 @@
-# Plugins
+---
+title: Overview
+---
 
 ### Authentication
 
diff --git a/docs/en/scm-server-ssl.md b/docs/en/scm-server-ssl.md
index 4f91468cc8..55444d2379 100644
--- a/docs/en/scm-server-ssl.md
+++ b/docs/en/scm-server-ssl.md
@@ -1,4 +1,6 @@
-# SCM-Server SSL
+---
+title: SCM-Server SSL
+---
 
 **Note**: This document describes a ssl configuration with a
         self-signed certificate
diff --git a/docs/en/screens.md b/docs/en/screens.md
index 0e34401d08..e3d6ae0745 100644
--- a/docs/en/screens.md
+++ b/docs/en/screens.md
@@ -1,4 +1,7 @@
-# Screenshots
+---
+title: Screenshots
+displayToc: true
+---
 
 <http://www.scm-manager.org/screenshots/>
 
diff --git a/docs/en/snippet-authentication.md b/docs/en/snippet-authentication.md
index 278f8d1d0a..456477d8cb 100644
--- a/docs/en/snippet-authentication.md
+++ b/docs/en/snippet-authentication.md
@@ -1,4 +1,6 @@
-# Snippet: Authentication
+---
+title: Snippet - Authentication
+---
 
 ```java
 package sonia.scm.snippets;
diff --git a/docs/en/snippet-config-group.md b/docs/en/snippet-config-group.md
index d93ffadca3..4a9c062caa 100644
--- a/docs/en/snippet-config-group.md
+++ b/docs/en/snippet-config-group.md
@@ -1,4 +1,6 @@
-# Snippet: Extend global configuration
+---
+title: Snippet - Extend global configuration
+---
 
 ```javascript
 // register the new configuration form
diff --git a/docs/en/snippet-extend-navigation.md b/docs/en/snippet-extend-navigation.md
index 13071b6615..93b254c981 100644
--- a/docs/en/snippet-extend-navigation.md
+++ b/docs/en/snippet-extend-navigation.md
@@ -1,4 +1,6 @@
-### Snippet: Extend Navigation
+---
+title: Snippet - Extend Navigation
+---
 
 ```javascript
 // add login callback
diff --git a/docs/en/snippet-repository-tab.md b/docs/en/snippet-repository-tab.md
index 2bf7567d5a..7830474276 100644
--- a/docs/en/snippet-repository-tab.md
+++ b/docs/en/snippet-repository-tab.md
@@ -1,4 +1,6 @@
-# Snippet: Add tab to repository configuration
+---
+title: Snippet - Add tab to repository configuration
+---
 
 ```javascript
 /** 
diff --git a/docs/en/subrepositories.md b/docs/en/subrepositories.md
index acdf2323cd..af2db6e37f 100644
--- a/docs/en/subrepositories.md
+++ b/docs/en/subrepositories.md
@@ -1,4 +1,6 @@
-# Mercurial Subrepositories
+---
+title: Mercurial Subrepositories
+---
 
 In the following examples i will use the [scm-cli-client](command-line-client.md)
 to create the repositories, but you can also use the web interface to
diff --git a/docs/en/trac-plugin.md b/docs/en/trac-plugin.md
index ebcb05d867..d794b32b60 100644
--- a/docs/en/trac-plugin.md
+++ b/docs/en/trac-plugin.md
@@ -1,4 +1,6 @@
-# Trac Plugin
+---
+title: Trac Plugin
+---
 
 The plugin enables the following features to integrate SCM-Manager to [Trac](http://trac.edgewall.org/):
 
diff --git a/docs/en/upgrade.md b/docs/en/upgrade.md
index 60e83a070f..6d9741327e 100644
--- a/docs/en/upgrade.md
+++ b/docs/en/upgrade.md
@@ -1,4 +1,6 @@
-# Upgrade to a new Version
+---
+title: Upgrade to a new Version
+---
 
 If you would like to update SCM-Manager, you have to do the following
 steps.
diff --git a/docs/en/webhook-plugin.md b/docs/en/webhook-plugin.md
index 3d15311ba7..ab1662fde0 100644
--- a/docs/en/webhook-plugin.md
+++ b/docs/en/webhook-plugin.md
@@ -1,4 +1,6 @@
-# WebHook Plugin
+---
+title: Webhook Plugin
+---
 
 ### Installation