diff --git a/intellij_codeformatter.xml b/intellij_codeformatter.xml
index 3fa4132c6c..628f202ea9 100644
--- a/intellij_codeformatter.xml
+++ b/intellij_codeformatter.xml
@@ -41,6 +41,11 @@
     <SqlCodeStyleSettings version="7">
         <option name="DISABLE_FORMATTING" value="true"/>
     </SqlCodeStyleSettings>
+    <codeStyleSettings language="HTML">
+        <arrangement>
+            <rules/>
+        </arrangement>
+    </codeStyleSettings>
     <codeStyleSettings language="JAVA">
         <option name="RIGHT_MARGIN" value="144"/>
         <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1"/>
diff --git a/site/.gitignore b/site/.gitignore
index 88e4c850e0..229aaada68 100644
--- a/site/.gitignore
+++ b/site/.gitignore
@@ -2,6 +2,7 @@
 content/rest-api/*.json
 content/rest-api/*.html
 content/rest-api/*.yaml
+static/rest-api/*.html
 # npm leftover
 node_modules
 package.json
diff --git a/site/config.toml b/site/config.toml
index c7b693e141..8b7303789e 100755
--- a/site/config.toml
+++ b/site/config.toml
@@ -16,95 +16,95 @@ metadataformat = "toml"
 canonifyurls = false
 
 [markup]
-[markup.goldmark]
-[markup.goldmark.extensions]
-typographer = true
-[markup.goldmark.renderer]
-unsafe = true
+	[markup.goldmark]
+		[markup.goldmark.extensions]
+			typographer = true
+        [markup.goldmark.renderer]
+            unsafe = true
 
 [markup.highlight]
-codeFences = false
+	codeFences = false
 
 [params]
-# General information
-author = "The Eclipse hawkBit Project"
-description = "IoT. Update. Device."
-copyright = "The Eclipse hawkBit Project"
-logo = "images/hawkbit_icon.png"
-favicon = "images/favicon.ico"
+	# General information
+	author = "The Eclipse hawkBit Project"
+	description = "IoT. Update. Device."
+	copyright = "The Eclipse hawkBit Project"
+	logo = "images/hawkbit_icon.png"
+	favicon = "images/favicon.ico"
 
-# Repository
-provider = "GitHub"
-repo_url = "https://github.com/eclipse-hawkbit/hawkbit"
+	# Repository
+	provider = "GitHub"
+	repo_url = "https://github.com/eclipse-hawkbit/hawkbit"
 
-permalink = "#"
+	permalink = "#"
 
-# Custom assets
-custom_css = ["css/hawkbit.css", "//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css"]
-custom_js = []
+	# Custom assets
+	custom_css = ["css/hawkbit.css","//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css"]
+	custom_js  = []
 
-# Syntax highlighting theme
-highlight_css = ""
+	# Syntax highlighting theme
+	highlight_css  = ""
 
 [params.palette]
-primary = "deep-purple"
-accent = "light-green"
+	primary = "deep-purple"
+	accent  = "light-green"
 
 [params.font]
-text = "Ubuntu"
-code = "Ubuntu Mono"
+	text = "Ubuntu"
+	code = "Ubuntu Mono"
 
 [social]
-github = "eclipse/hawkbit"
-gitter = "eclipse/hawkbit"
-docker = "hawkbit"
+	github  = "eclipse/hawkbit"
+	gitter  = "eclipse/hawkbit"
+	docker  = "hawkbit"
 
 [[menu.main]]
-name = "What is hawkBit"
-url = "/whatishawkbit/"
-weight = 10
+	name   = "What is hawkBit"
+	url    = "/whatishawkbit/"
+	weight = 10
 
 [[menu.main]]
-name = "Getting started"
-url = "/gettingstarted/"
-weight = 20
+	name   = "Getting started"
+	url    = "/gettingstarted/"
+	weight = 20
 
 [[menu.main]]
-name = "Guides"
-url = "/guides/"
-weight = 30
+	name   = "Guides"
+	url    = "/guides/"
+	weight = 30
 
 [[menu.main]]
-name = "Features"
-url = "/features/"
-weight = 40
+	name   = "Features"
+	url    = "/features/"
+	weight = 40
 
 [[menu.main]]
-name = "Concepts"
-url = "/concepts/"
-weight = 50
+	name   = "Concepts"
+	url    = "/concepts/"
+	weight = 50
 
 [[menu.main]]
-name = "Architecture"
-url = "/architecture/"
-weight = 60
+	name   = "Architecture"
+	url    = "/architecture/"
+	weight = 60
 
 [[menu.main]]
-name = "APIs"
-url = "/apis/"
-weight = 80
+	name   = "APIs"
+	url    = "/apis/"
+	weight = 80
 
 [[menu.main]]
-name = "Release notes"
-url = "/release-notes/"
-weight = 90
+	name   = "Release notes"
+	url    = "/release-notes/"
+	weight = 90
 
 [[menu.main]]
-name = "Blog"
-url = "/blog/"
-weight = 100
+	name   = "Blog"
+	url    = "/blog/"
+	weight = 100
 
 [[menu.main]]
-name = "Community"
-url = "/community/"
-weight = 110
+	name   = "Community"
+	url    = "/community/"
+	weight = 110
diff --git a/site/layouts/_default/list.html b/site/layouts/_default/list.html
index da0db6041b..cbaeb5f78b 100755
--- a/site/layouts/_default/list.html
+++ b/site/layouts/_default/list.html
@@ -1,54 +1,54 @@
 {{ partial "head" . }}
 
 {{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}
-{{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
-{{ .Scratch.Set "repo_id" $repo_id }}
+  {{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
+  {{ .Scratch.Set "repo_id" $repo_id }}
 {{ end }}
 
 <div class="backdrop">
-    <div class="backdrop-paper"></div>
+	<div class="backdrop-paper"></div>
 </div>
 
-<input class="toggle" id="toggle-drawer" type="checkbox">
-<input class="toggle" id="toggle-search" type="checkbox">
+<input class="toggle" type="checkbox" id="toggle-drawer">
+<input class="toggle" type="checkbox" id="toggle-search">
 <label class="toggle-button overlay" for="toggle-drawer"></label>
 
 <header class="header">
-    {{ partial "header" . }}
+	{{ partial "header" . }}
 </header>
 
 <main class="main">
-    <div class="drawer">
-        {{ partial "drawer" . }}
-    </div>
-
-    <article class="article">
-        <div class="wrapper">
-            <h1>Pages in {{ .Title }}</h1>
-
-            {{ range .Data.Pages }}
-            <a href="{{ .Permalink }}" title="{{ .Title }}">
-                <h2>{{ .Title }}</h2>
-            </a>
-
-            <br>
-            {{ printf "%s" .Summary | markdownify }} <br><a href="{{ .Permalink }}">[...]</a>
-
-            <hr>
-            {{ end }}
-
-            {{ partial "copyright.html" . }}
-        </div>
-    </article>
-
-    <div aria-live="polite" class="results" role="status">
-        <div class="scrollable">
-            <div class="wrapper">
-                <div class="meta"></div>
-                <div class="list"></div>
-            </div>
-        </div>
-    </div>
+	<div class="drawer">
+		{{ partial "drawer" . }}
+	</div>
+
+	<article class="article">
+		<div class="wrapper">
+			<h1>Pages in {{ .Title }}</h1>
+
+			{{ range .Data.Pages }}
+			<a href="{{ .Permalink }}" title="{{ .Title }}">
+				<h2>{{ .Title }}</h2>
+			</a>
+
+			<br>
+			{{ printf "%s" .Summary | markdownify }} <br><a href="{{ .Permalink }}">[...]</a>
+
+			<hr>
+			{{ end }}
+
+			{{ partial "copyright.html" . }}
+		</div>
+	</article>
+
+	<div class="results" role="status" aria-live="polite">
+		<div class="scrollable">
+			<div class="wrapper">
+				<div class="meta"></div>
+				<div class="list"></div>
+			</div>
+		</div>
+	</div>
 </main>
 
 {{ partial "footer_js" . }}
\ No newline at end of file
diff --git a/site/layouts/_default/single.html b/site/layouts/_default/single.html
index ab077869f6..76ea3f7341 100755
--- a/site/layouts/_default/single.html
+++ b/site/layouts/_default/single.html
@@ -1,49 +1,49 @@
 {{ partial "head" . }}
 
 {{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}
-{{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
-{{ .Scratch.Set "repo_id" $repo_id }}
+	{{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
+	{{ .Scratch.Set "repo_id" $repo_id }}
 {{ end }}
 
 <div class="backdrop">
-    <div class="backdrop-paper"></div>
+	<div class="backdrop-paper"></div>
 </div>
 
-<input class="toggle" id="toggle-drawer" type="checkbox">
-<input class="toggle" id="toggle-search" type="checkbox">
+<input class="toggle" type="checkbox" id="toggle-drawer">
+<input class="toggle" type="checkbox" id="toggle-search">
 <label class="toggle-button overlay" for="toggle-drawer"></label>
 
 <header class="header">
-    {{ partial "header" . }}
+	{{ partial "header" . }}
 </header>
 
 <main class="main">
-    <div class="drawer">
-        {{ partial "drawer" . }}
-    </div>
-
-    <article class="article">
-        <div class="wrapper">
-            <h1>{{ .Title }} {{ if .Draft }} (Draft){{ end }}</h1>
-
-            {{ .Content }}
-
-            {{ partial "copyright.html" . }}
-
-            <footer class="footer">
-                {{ partial "footer" . }}
-            </footer>
-        </div>
-    </article>
-
-    <div aria-live="polite" class="results" role="status">
-        <div class="scrollable">
-            <div class="wrapper">
-                <div class="meta"></div>
-                <div class="list"></div>
-            </div>
-        </div>
-    </div>
+	<div class="drawer">
+		{{ partial "drawer" . }}
+	</div>
+
+	<article class="article">
+		<div class="wrapper">
+			<h1>{{ .Title }} {{ if .Draft }} (Draft){{ end }}</h1>
+
+			{{ .Content }}
+
+			{{ partial "copyright.html" . }}
+
+			<footer class="footer">
+				{{ partial "footer" . }}
+			</footer>
+		</div>
+	</article>
+
+	<div class="results" role="status" aria-live="polite">
+		<div class="scrollable">
+			<div class="wrapper">
+				<div class="meta"></div>
+				<div class="list"></div>
+			</div>
+		</div>
+	</div>
 </main>
 
 {{ partial "footer_js" . }}
diff --git a/site/layouts/index.html b/site/layouts/index.html
index 38fa0c7f4a..5f32f511b5 100755
--- a/site/layouts/index.html
+++ b/site/layouts/index.html
@@ -1,16 +1,16 @@
 {{ partial "head" . }}
 
 {{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}
-{{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
-{{ .Scratch.Set "repo_id" $repo_id }}
+	{{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
+	{{ .Scratch.Set "repo_id" $repo_id }}
 {{ end }}
 
 <div class="backdrop">
     <div class="backdrop-paper"></div>
 </div>
 
-<input class="toggle" id="toggle-drawer" type="checkbox">
-<input class="toggle" id="toggle-search" type="checkbox">
+<input class="toggle" type="checkbox" id="toggle-drawer">
+<input class="toggle" type="checkbox" id="toggle-search">
 <label class="toggle-button overlay" for="toggle-drawer"></label>
 
 <header class="header">
@@ -34,7 +34,7 @@
                     edge devices as well as more powerful controllers and gateways connected to IP based networking
                     infrastructure.
                 </p>
-                <img src="images/hawkBit_overview.jpeg"/>
+                <img src="images/hawkBit_overview.jpeg" />
                 <h2>Interfaces</h2>
                 <p>
                     hawkBit offers a direct device integration via HTTP or a device management federation API
@@ -63,7 +63,7 @@ <h2>Rollout</h2>
                     <div style="margin-left: 50%;">
                         <br/>
                         <br/>
-                        <img src="images/rollout.png"/>
+                        <img src="images/rollout.png" />
                     </div>
                 </div>
 
@@ -71,7 +71,7 @@ <h2>Package Model</h2>
                 <div style="width: 100%; overflow: hidden;">
                     <div style="width: 50%; float: left;">
                         <br/>
-                        <img src="images/packagemodel.png"/>
+                        <img src="images/packagemodel.png" />
                     </div>
 
                     <div style="margin-left: 55%;">
@@ -88,7 +88,7 @@ <h2>Package Model</h2>
         </div>
     </article>
 
-    <div aria-live="polite" class="results" role="status">
+    <div class="results" role="status" aria-live="polite">
         <div class="scrollable">
             <div class="wrapper">
                 <div class="meta"></div>
diff --git a/site/layouts/partials/copyright.html b/site/layouts/partials/copyright.html
index e0cf20ed33..17aa964b2b 100755
--- a/site/layouts/partials/copyright.html
+++ b/site/layouts/partials/copyright.html
@@ -1,33 +1,33 @@
 <aside class="copyright" role="note">
-    <div class="logo">
-        <a href="https://www.eclipse.org" target="_blank">
-            <img src="/hawkbit/images/eclipse_foundation_logo.png"/>
-        </a>
-    </div>
-    <p class="notice">
-        {{ with .Site.Params.copyright }}
-        &copy; {{ now.Year }} {{ . }} &ndash;
-        {{ end }}
-        Documentation built with
-        <a href="https://www.gohugo.io" target="_blank">Hugo</a>
-        using the
-        <a href="http://github.com/digitalcraftsman/hugo-material-docs" target="_blank">Material</a> theme.
-    </p>
-    <p class="quickLinks">
-        <a href="http://www.eclipse.org/legal/privacy.php" target="_blank">
-            &gt; Privacy Policy
-        </a>
-        <a href="http://www.eclipse.org/legal/termsofuse.php" target="_blank">
-            &gt; Terms of Use
-        </a>
-        <a href="http://www.eclipse.org/legal/copyright.php" target="_blank">
-            &gt; Copyright Agent
-        </a>
-        <a href="http://www.eclipse.org/legal" target="_blank">
-            &gt; Legal
-        </a>
-        <a href="https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt" target="_blank">
-            &gt; License
-        </a>
-    </p>
+  <div class="logo">
+    <a href="https://www.eclipse.org" target="_blank">
+      <img src="/hawkbit/images/eclipse_foundation_logo.png" />
+    </a>
+  </div>
+  <p class="notice">
+    {{ with .Site.Params.copyright }}
+    &copy; {{ now.Year }} {{ . }} &ndash;
+    {{ end }}
+    Documentation built with
+    <a href="https://www.gohugo.io" target="_blank">Hugo</a>
+    using the
+    <a href="http://github.com/digitalcraftsman/hugo-material-docs" target="_blank">Material</a> theme.
+  </p>
+  <p class="quickLinks">
+    <a href="http://www.eclipse.org/legal/privacy.php" target="_blank">
+      &gt; Privacy Policy
+    </a>
+    <a href="http://www.eclipse.org/legal/termsofuse.php" target="_blank">
+      &gt; Terms of Use
+    </a>
+    <a href="http://www.eclipse.org/legal/copyright.php" target="_blank">
+      &gt; Copyright Agent
+    </a>
+    <a href="http://www.eclipse.org/legal" target="_blank">
+      &gt; Legal
+    </a>
+    <a href="https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt" target="_blank">
+      &gt; License
+    </a>
+  </p>
 </aside>
diff --git a/site/layouts/partials/drawer.html b/site/layouts/partials/drawer.html
index 7ab5c4710c..987b721d0e 100755
--- a/site/layouts/partials/drawer.html
+++ b/site/layouts/partials/drawer.html
@@ -1,89 +1,82 @@
 <nav aria-label="Navigation">
-    <a class="project" href="{{ with .Site.BaseURL }}{{ . }}{{ else }}{{ .Site.BaseURL }}{{ end }}">
-        <div class="banner">
-            {{ with .Site.Params.logo }}
-            <div class="logo">
-                <img src="{{ $.Site.BaseURL }}{{ . }}">
-            </div>
-            {{ end }}
-            <div class="name">
-                <strong>{{ .Site.Title }}&trade; {{ with .Site.Params.version }}<span class="version">{{ . }}</span>{{
-                    end }}</strong>
-                {{ with .Scratch.Get "repo_id" }}
-                <br>
-                {{ . }}
-                {{ end }}
-            </div>
+  <a href="{{ with .Site.BaseURL }}{{ . }}{{ else }}{{ .Site.BaseURL }}{{ end }}" class="project">
+    <div class="banner">
+      {{ with .Site.Params.logo }}
+        <div class="logo">
+          <img src="{{ $.Site.BaseURL }}{{ . }}">
         </div>
-    </a>
+      {{ end }}
+      <div class="name">
+        <strong>{{ .Site.Title }}&trade; {{ with .Site.Params.version }}<span class="version">{{ . }}</span>{{ end }}</strong>
+        {{ with .Scratch.Get "repo_id" }}
+          <br>
+          {{ . }}
+        {{ end }}
+      </div>
+    </div>
+  </a>
 
-    <div class="scrollable">
-        <div class="wrapper">
-            {{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}
-            <ul class="repo">
-                <li class="repo-download">
-                    <a data-action="sandbox" href="https://hawkbit.eclipseprojects.io" target="_blank"
-                       title="hawkBit Sandbox">
-                        <i class="fas fa-desktop"></i> &nbsp; Sandbox
-                    </a>
-                </li>
-                <li class="repo-stars">
-                    <a data-action="star" href="{{ .Site.Params.repo_url }}/stargazers" target="_blank"
-                       title="Stargazers">
-                        <i class="icon icon-star"></i> Stars
-                        <span class="count">&ndash;</span>
-                    </a>
-                </li>
-            </ul>
-            <hr>
-            {{ end }}
+  <div class="scrollable">
+    <div class="wrapper">
+      {{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}
+        <ul class="repo">
+          <li class="repo-download">
+            <a href="https://hawkbit.eclipseprojects.io" target="_blank" title="hawkBit Sandbox" data-action="sandbox">
+              <i class="fas fa-desktop"></i> &nbsp; Sandbox
+            </a>
+          </li>
+          <li class="repo-stars">
+            <a href="{{ .Site.Params.repo_url }}/stargazers" target="_blank" title="Stargazers" data-action="star">
+              <i class="icon icon-star"></i> Stars
+              <span class="count">&ndash;</span>
+            </a>
+          </li>
+        </ul>
+        <hr>
+      {{ end }}
 
-            <div class="toc">
-                {{ if gt (len .Site.Menus.main) 0 }}
-                <ul>
-                    {{ partial "nav" . }}
-                </ul>
-                {{ end }}
+      <div class="toc">
+        {{ if gt (len .Site.Menus.main) 0 }}
+        <ul>
+          {{ partial "nav" . }}
+        </ul>
+        {{ end }}
 
-                {{ if isset .Site.Params "author" }}
-                <hr>
+        {{ if isset .Site.Params "author" }}
+        <hr>
 
-                <ul>
-                    <li>
-                        <a href="https://opensource.org/licenses/EPL-2.0" target="_blank" title="License">
-                            <img src="https://img.shields.io/badge/License-EPL%202.0-green.svg"/>
-                        </a>
-                    </li>
+        <ul>
+          <li>
+            <a href="https://opensource.org/licenses/EPL-2.0" title="License" target="_blank">
+              <img src="https://img.shields.io/badge/License-EPL%202.0-green.svg" />
+            </a>
+          </li>
 
-                    <li>
-                        <a href="https://github.com/eclipse-hawkbit/hawkbit/actions/workflows/verify.yml"
-                           target="_blank" title="License">
-                            <img src="https://github.com/eclipse-hawkbit/hawkbit/actions/workflows/verify.yml/badge.svg?branch=master"/>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="https://sonarcloud.io/summary/new_code?id=eclipse-hawkbit_hawkbit"
-                           target="_blank" title="Sonarcloud Status">
-                            <img src="https://sonarcloud.io/api/project_badges/measure?project=eclipse-hawkbit_hawkbit&metric=alert_status"/>
-                        </a>
-                    </li>
+          <li>
+            <a href="https://github.com/eclipse-hawkbit/hawkbit/actions/workflows/verify.yml" title="License" target="_blank">
+              <img src="https://github.com/eclipse-hawkbit/hawkbit/actions/workflows/verify.yml/badge.svg?branch=master" />
+            </a>
+          </li>
+          <li>
+            <a href="https://sonarcloud.io/summary/new_code?id=eclipse-hawkbit_hawkbit" title="Sonarcloud Status" target="_blank">
+              <img src="https://sonarcloud.io/api/project_badges/measure?project=eclipse-hawkbit_hawkbit&metric=alert_status" />
+            </a>
+          </li>
 
-                    <li>
-                        <a href="https://search.maven.org/search?q=g:org.eclipse.hawkbit" target="_blank"
-                           title="Maven Central Status">
-                            <img src="https://img.shields.io/maven-central/v/org.eclipse.hawkbit/hawkbit-parent?label=maven-central&color=blue"/>
-                        </a>
-                    </li>
+          <li>
+            <a href="https://search.maven.org/search?q=g:org.eclipse.hawkbit" title="Maven Central Status" target="_blank">
+              <img src="https://img.shields.io/maven-central/v/org.eclipse.hawkbit/hawkbit-parent?label=maven-central&color=blue" />
+            </a>
+          </li>
 
-                    <li>
-                        <a href="https://gitter.im/eclipse/hawkbit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"
-                           target="_blank" title="Chat on Gitter">
-                            <img src="https://badges.gitter.im/eclipse/hawkbit.svg"/>
-                        </a>
-                    </li>
-                </ul>
-                {{ end }}
-            </div>
-        </div>
+          <li>
+            <a href="https://gitter.im/eclipse/hawkbit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge" title="Chat on Gitter" target="_blank">
+              <img src="https://badges.gitter.im/eclipse/hawkbit.svg" />
+            </a>
+          </li>
+        </ul>
+        {{ end }}
+      </div>
     </div>
+  </div>
 </nav>
diff --git a/site/layouts/partials/footer_js.html b/site/layouts/partials/footer_js.html
index 5dfe8cf5a1..8087fb6e72 100755
--- a/site/layouts/partials/footer_js.html
+++ b/site/layouts/partials/footer_js.html
@@ -1,87 +1,60 @@
-<script>
-    {
-        {
-            with .
-            Scratch.Get
-            "repo_id"
-        }
-    }
-    var base_url = '{{ (printf "%s" $.Site.BaseURL) | safeJS }}';
-    var repo_id = '{{ . | safeJS }}';
-    {
-        { else
-        }
-    }
-    var base_url = '';
-    var repo_id = '';
-    {
-        {
-            end
-        }
-    }
-</script>
-
-<script javascripts src="{{ "/application.js" | absURL }}"></script>
-{{ range .Site.Params.custom_js }}
-<script src="{{ . | absURL }}"></script>
-{{ end }}
-
-<script>
-    {
-        {
-            "/* Add headers to scrollspy */" | safeJS
-        }
-    }
-    var headers = document.getElementsByTagName("h2");
-    var scrollspy = document.getElementById('scrollspy');
-
-    if (scrollspy) {
-        if (headers.length > 0) {
-            for (var i = 0; i < headers.length; i++) {
-                var li = document.createElement("li");
-                li.setAttribute("class", "anchor");
-
-                var a = document.createElement("a");
-                if (!headers[i].id)
-                    a.setAttribute("href", headers[i].parentNode.href);
-                else
-                    a.setAttribute("href", "#" + headers[i].id);
-                a.setAttribute("title", headers[i].innerHTML);
-                a.innerHTML = headers[i].innerHTML;
-
-                li.appendChild(a);
-                scrollspy.appendChild(li);
-            }
-        } else {
-            scrollspy.parentElement.removeChild(scrollspy)
-        }
-
-
-        {
-            {
-                "/* Add permanent link next to the headers */" | safeJS
-            }
-        }
-        var headers = document.querySelectorAll("h1, h2, h3, h4, h5, h6");
-
-        for (var i = 0; i < headers.length; i++) {
+    <script>
+    {{ with .Scratch.Get "repo_id" }}
+      var base_url = '{{ (printf "%s" $.Site.BaseURL) | safeJS }}';
+      var repo_id  = '{{ . | safeJS }}';
+    {{ else }}
+      var base_url = '';
+      var repo_id  = '';
+    {{ end }}
+    </script>
+
+    <script src="{{ "javascripts/application.js" | absURL }}"></script>
+    {{ range .Site.Params.custom_js }}
+    <script src="{{ . | absURL }}"></script>
+    {{ end }}
+
+    <script>
+      {{ "/* Add headers to scrollspy */" | safeJS }}
+      var headers   = document.getElementsByTagName("h2");
+      var scrollspy = document.getElementById('scrollspy');
+
+      if(scrollspy) {
+          if(headers.length > 0) {
+              for(var i = 0; i < headers.length; i++) {
+                  var li = document.createElement("li");
+                  li.setAttribute("class", "anchor");
+
+                  var a  = document.createElement("a");
+                  if(!headers[i].id)
+                      a.setAttribute("href", headers[i].parentNode.href);
+                  else
+                      a.setAttribute("href", "#" + headers[i].id);
+                  a.setAttribute("title", headers[i].innerHTML);
+                  a.innerHTML = headers[i].innerHTML;
+
+                  li.appendChild(a);
+                  scrollspy.appendChild(li);
+              }
+          } else {
+              scrollspy.parentElement.removeChild(scrollspy)
+          }
+
+
+        {{ "/* Add permanent link next to the headers */" | safeJS }}
+          var headers = document.querySelectorAll("h1, h2, h3, h4, h5, h6");
+
+        for(var i = 0; i < headers.length; i++) {
             var a = document.createElement("a");
             a.setAttribute("class", "headerlink");
             a.setAttribute("href", "#" + headers[i].id);
             a.setAttribute("title", "Permanent link");
-            a.innerHTML = {
-            {
-                or.Site.Params.permalink
-                "¶"
-            }
-        }
-            ;
+            a.innerHTML = {{ or .Site.Params.permalink "¶" }};
             headers[i].appendChild(a);
         }
-    }
-</script>
+      }
+    </script>
 
-<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.8.0/highlight.min.js"></script>
-<script>hljs.initHighlightingOnLoad();</script>
-</body>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.8.0/highlight.min.js"></script>
+    <script>hljs.initHighlightingOnLoad();</script>
+  </body>
 </html>
diff --git a/site/layouts/partials/head.html b/site/layouts/partials/head.html
index 2d355ffd81..dee409d695 100755
--- a/site/layouts/partials/head.html
+++ b/site/layouts/partials/head.html
@@ -1,103 +1,83 @@
 <!DOCTYPE html>
-<!--[if lt IE 7 ]>
-<html class="no-js ie6"><![endif]-->
-<!--[if IE 7 ]>
-<html class="no-js ie7"><![endif]-->
-<!--[if IE 8 ]>
-<html class="no-js ie8"><![endif]-->
-<!--[if IE 9 ]>
-<html class="no-js ie9"><![endif]-->
-<!--[if (gt IE 9)|!(IE)]><!-->
-<html class="no-js"> <!--<![endif]-->
+  <!--[if lt IE 7 ]><html class="no-js ie6"><![endif]-->
+  <!--[if IE 7 ]><html class="no-js ie7"><![endif]-->
+  <!--[if IE 8 ]><html class="no-js ie8"><![endif]-->
+  <!--[if IE 9 ]><html class="no-js ie9"><![endif]-->
+  <!--[if (gt IE 9)|!(IE)]><!--> <html class="no-js"> <!--<![endif]-->
 
-<head .Site.LanguageCode end with {{ {{ }} }}lang="{{ . }}">
+  <head {{ with .Site.LanguageCode }}lang="{{ . }}"{{ end }}>
     <meta charset="utf-8">
-    <meta content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1" name="viewport">
-    <meta content="IE=10" http-equiv="X-UA-Compatible"/>
+    <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
+    <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>{{ .Title }}{{ if not .IsHome }} - {{ .Site.Title }}{{ end }}</title>
     {{ hugo.Generator }}
 
     {{ with .Site.Params.description }}
-    <meta content="{{ . }}" name="description">
+    <meta name="description" content="{{ . }}">
     {{ end }}
-    <link href="{{ .Permalink }}" rel="canonical">
+    <link rel="canonical" href="{{ .Permalink }}">
     {{ with .Site.Params.author }}
-    <meta content="{{ . }}" name="author">
+    <meta name="author" content="{{ . }}">
     {{ end }}
 
-    <meta content="{{ .Permalink }}" property="og:url">
-    {{ with .Site.Title }}
-    <meta content="{{ . }}" property="og:title">
-    {{ end }}
-    {{ with .Site.Params.logo }}
-    <meta content="{{ . | absURL }}" property="og:image">
-    {{ end }}
-    {{ with .Site.Title }}
-    <meta content="{{ . }}" name="apple-mobile-web-app-title">
-    {{ end }}
-    <meta content="yes" name="apple-mobile-web-app-capable">
-    <meta content="black-translucent" name="apple-mobile-web-app-status-bar-style">
+    <meta property="og:url" content="{{ .Permalink }}">
+    {{ with .Site.Title }}<meta property="og:title" content="{{ . }}">{{ end }}
+    {{ with .Site.Params.logo }}<meta property="og:image" content="{{ . | absURL }}">{{ end }}
+    {{ with .Site.Title }}<meta name="apple-mobile-web-app-title" content="{{ . }}">{{ end }}
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 
-    {{ if .Params.redirectURL }}
-    <meta content="1; url={{ .Params.redirectURL }}" http-equiv="refresh"/>
-    {{ end }}
+    {{ if .Params.redirectURL }}<meta http-equiv="refresh" content="1; url={{ .Params.redirectURL }}"/>{{ end }}
 
-    <link href="{{ with .Site.Params.favicon }}{{ . | absURL }}{{ else }}{{ " images rel="shortcut icon"
-          type="image/x-icon"
-    /favicon.ico" | absURL }}{{ end }}">
-    <link href="{{ with .Site.Params.favicon }}{{ . | absURL }}{{ else }}{{ " images rel="icon" type="image/x-icon"
-    /favicon.ico" | absURL }}{{ end }}">
+    <link rel="shortcut icon" type="image/x-icon" href="{{ with .Site.Params.favicon }}{{ . | absURL }}{{ else }}{{ "images/favicon.ico" | absURL }}{{ end }}">
+    <link rel="icon" type="image/x-icon" href="{{ with .Site.Params.favicon }}{{ . | absURL }}{{ else }}{{ "images/favicon.ico" | absURL }}{{ end }}">
 
     <style>
-        @font-face {
-            font-family: 'Icon';
-            src: url('{{ "fonts/icon.eot?52m981" | absURL }}');
-            src: url('{{ "fonts/icon.eot?#iefix52m981" | absURL }}') format('embedded-opentype'),
-            url('{{ "fonts/icon.woff?52m981" | absURL }}') format('woff'),
-            url('{{ "fonts/icon.ttf?52m981" | absURL }}') format('truetype'),
-            url('{{ "fonts/icon.svg?52m981#icon" | absURL }}') format('svg');
-            font-weight: normal;
-            font-style: normal;
-        }
+      @font-face {
+        font-family: 'Icon';
+        src: url('{{ "fonts/icon.eot?52m981" | absURL }}');
+        src: url('{{ "fonts/icon.eot?#iefix52m981" | absURL }}')
+               format('embedded-opentype'),
+             url('{{ "fonts/icon.woff?52m981" | absURL }}')
+               format('woff'),
+             url('{{ "fonts/icon.ttf?52m981" | absURL }}')
+               format('truetype'),
+             url('{{ "fonts/icon.svg?52m981#icon" | absURL }}')
+               format('svg');
+        font-weight: normal;
+        font-style: normal;
+      }
     </style>
 
-    <link href="{{ " rel="stylesheet" stylesheets
-    /application.css" | absURL }}">
-    <link href="{{ " rel="stylesheet" stylesheets
-    /temporary.css" | absURL }}">
-    <link href="{{ " rel="stylesheet" stylesheets
-    /palettes.css" | absURL }}">
-    <link href="{{ with .Site.Params.highlight_css }}{{ . | absURL }}{{ else }}{{ " rel="stylesheet" stylesheets
-    /highlight/highlight.css" | absURL }}{{ end }}">
+    <link rel="stylesheet" href="{{ "stylesheets/application.css" | absURL }}">
+    <link rel="stylesheet" href="{{ "stylesheets/temporary.css" | absURL }}">
+    <link rel="stylesheet" href="{{ "stylesheets/palettes.css" | absURL }}">
+    <link rel="stylesheet" href="{{ with .Site.Params.highlight_css }}{{ . | absURL }}{{ else }}{{ "stylesheets/highlight/highlight.css" | absURL }}{{ end }}">
 
     {{/* set default values if no custom ones are defined */}}
     {{ $text := or .Site.Params.font.text "Roboto" }}
     {{ $code := or .Site.Params.font.code "Roboto Mono" }}
-    <link href="//fonts.googleapis.com/css?family={{ $text }}:400,700|{{ replace  $code " rel="stylesheet"
-    " "+" | safeURL }}">
+    <link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ $text }}:400,700|{{ replace  $code " " "+" | safeURL }}">
     <style>
-        body, input {
-            font-family: '{{ $text }}', Helvetica, Arial, sans-serif;
-        }
-
-        pre, code {
-            font-family: '{{ $code }}', 'Courier New', 'Courier', monospace;
-        }
+      body, input {
+        font-family: '{{ $text }}', Helvetica, Arial, sans-serif;
+      }
+      pre, code {
+        font-family: '{{ $code }}', 'Courier New', 'Courier', monospace;
+      }
     </style>
 
     {{ range .Site.Params.custom_css }}
-    <link href="{{ . | absURL }}" rel="stylesheet">
+    <link rel="stylesheet" href="{{ . | absURL }}">
     {{ end }}
-    <script javascripts src="{{ "
-    /modernizr.js" | absURL }}"></script>
+    <script src="{{ "javascripts/modernizr.js" | absURL }}"></script>
     <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
 
     {{ with .OutputFormats.Get "RSS" }}
-    <link href="{{ . }}" rel="alternate" title="{{ $.Site.Title }}" type="application/rss+xml"/>
-    <link href="{{ . }}" rel="feed" title="{{ $.Site.Title }}" type="application/rss+xml"/>
+    <link href="{{ . }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}" />
+    <link href="{{ . }}" rel="feed" type="application/rss+xml" title="{{ $.Site.Title }}" />
     {{ end }}
 
-    <link crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css"
-          integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" rel="stylesheet">
-</head>
-<body class="{{ with .Site.Params.palette.primary }}palette-primary-{{ . }}{{end }} {{ with .Site.Params.palette.accent }}palette-accent-{{ .  }}{{ end }}">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
+  </head>
+  <body class="{{ with .Site.Params.palette.primary }}palette-primary-{{ . }}{{end }} {{ with .Site.Params.palette.accent }}palette-accent-{{ .  }}{{ end }}">
diff --git a/site/layouts/partials/header.html b/site/layouts/partials/header.html
index 36a4df2ff0..3929a8ee32 100755
--- a/site/layouts/partials/header.html
+++ b/site/layouts/partials/header.html
@@ -1,62 +1,57 @@
 <nav aria-label="Header">
-    <div class="bar default">
-        <div aria-label="Menu" class="button button-menu" role="button">
-            <label class="toggle-button icon icon-menu" for="toggle-drawer">
-                <span></span>
-            </label>
-        </div>
-        <div class="stretch">
-            <div class="title">
-                {{ .Title | safeHTML }}
-            </div>
-        </div>
-
-        {{ with .Site.Social.twitter }}
-        <div aria-label="Twitter" class="button button-twitter" role="button">
-            <a class="toggle-button icon icon-twitter" href="https://twitter.com/{{ . }}" target="_blank"
-               title="@{{ . }} on Twitter"></a>
-        </div>
-        {{ end }}
+  <div class="bar default">
+    <div class="button button-menu" role="button" aria-label="Menu">
+      <label class="toggle-button icon icon-menu" for="toggle-drawer">
+        <span></span>
+      </label>
+    </div>
+    <div class="stretch">
+      <div class="title">
+        {{ .Title | safeHTML }}
+      </div>
+    </div>
 
-        {{ with .Site.Social.github }}
-        <div aria-label="GitHub" class="button button-github" role="button">
-            <a class="toggle-button icon icon-github" href="https://github.com/{{ . }}" target="_blank"
-               title="@{{ . }} on GitHub"></a>
-        </div>
-        {{ end }}
+    {{ with .Site.Social.twitter }}
+    <div class="button button-twitter" role="button" aria-label="Twitter">
+       <a href="https://twitter.com/{{ . }}" title="@{{ . }} on Twitter" target="_blank" class="toggle-button icon icon-twitter"></a>
+    </div>
+    {{ end }}
 
-        {{ with .Site.Social.gitter }}
-        <div aria-label="Gitter" class="button button-github" role="button">
-            <a class="toggle-button icon fab fa-gitter" href="https://gitter.im/{{ . }}" target="_blank"
-               title="@{{ . }} on Gitter"></a>
-        </div>
-        {{ end }}
+    {{ with .Site.Social.github }}
+    <div class="button button-github" role="button" aria-label="GitHub">
+      <a href="https://github.com/{{ . }}" title="@{{ . }} on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
+    </div>
+    {{ end }}
 
-        {{ with .Site.Social.docker }}
-        <div aria-label="Docker" class="button button-github" role="button">
-            <a class="toggle-button icon fab fa-docker" href="https://hub.docker.com/u/{{ . }}" target="_blank"
-               title="{{ . }} on Docker Hub"></a>
-        </div>
-        {{ end }}
+    {{ with .Site.Social.gitter }}
+    <div class="button button-github" role="button" aria-label="Gitter">
+      <a href="https://gitter.im/{{ . }}" title="@{{ . }} on Gitter" target="_blank" class="toggle-button icon fab fa-gitter"></a>
+    </div>
+    {{ end }}
 
-        <!-- TODO: disabled until Hugo supports the generation of a content index natively
-        <div class="button button-search" role="button" aria-label="Search">
-          <label class="toggle-button icon icon-search" title="Search" for="toggle-search"></label>
-        </div>
-        -->
-    </div>
-    <div class="bar search">
-        <div aria-label="Close" class="button button-close" role="button">
-            <label class="toggle-button icon icon-back" for="toggle-search"></label>
-        </div>
-        <div class="stretch">
-            <div class="field">
-                <input autocapitalize="off" autocomplete="off" autocorrect="off" class="query" placeholder="Search"
-                       spellcheck type="text">
-            </div>
-        </div>
-        <div aria-label="Search" class="button button-reset" role="button">
-            <button class="toggle-button icon icon-close" id="reset-search"></button>
-        </div>
+    {{ with .Site.Social.docker }}
+    <div class="button button-github" role="button" aria-label="Docker">
+      <a href="https://hub.docker.com/u/{{ . }}" title="{{ . }} on Docker Hub" target="_blank" class="toggle-button icon fab fa-docker"></a>
+    </div>
+    {{ end }}
+    
+    <!-- TODO: disabled until Hugo supports the generation of a content index natively 
+    <div class="button button-search" role="button" aria-label="Search">
+      <label class="toggle-button icon icon-search" title="Search" for="toggle-search"></label>
+    </div>
+    -->    
+  </div>
+  <div class="bar search">
+    <div class="button button-close" role="button" aria-label="Close">
+      <label class="toggle-button icon icon-back" for="toggle-search"></label>
+    </div>
+    <div class="stretch">
+      <div class="field">
+        <input class="query" type="text" placeholder="Search" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck>
+      </div>
+    </div>
+    <div class="button button-reset" role="button" aria-label="Search">
+      <button class="toggle-button icon icon-close" id="reset-search"></button>
     </div>
+  </div>
 </nav>
\ No newline at end of file
diff --git a/site/layouts/partials/nav_link.html b/site/layouts/partials/nav_link.html
index fa7099a257..2bdd8d0c48 100755
--- a/site/layouts/partials/nav_link.html
+++ b/site/layouts/partials/nav_link.html
@@ -2,9 +2,9 @@
 {{ $isCurrent := eq .Permalink ($currentMenuEntry.URL | absURL | printf "%s") }}
 
 
-<a $isCurrent end href="{{ $currentMenuEntry.URL }}" if title="{{ $currentMenuEntry.Name }}" {{ {{ }} }}class="current">
-    {{ $currentMenuEntry.Pre }}
-    {{ $currentMenuEntry.Name }}
+<a {{ if $isCurrent }}class="current"{{ end }} title="{{ $currentMenuEntry.Name }}" href="{{ $currentMenuEntry.URL }}">
+	{{ $currentMenuEntry.Pre }}
+	{{ $currentMenuEntry.Name }}
 </a>
 
 {{ if $isCurrent }}