You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2020/01/13 13:43:36 UTC

[unomi-site] branch UNOMI-262-jekyll-site created (now 35edce5)

This is an automated email from the ASF dual-hosted git repository.

shuber pushed a change to branch UNOMI-262-jekyll-site
in repository https://gitbox.apache.org/repos/asf/unomi-site.git.


      at 35edce5  UNOMI-262 Use Jekyll to generate site - Jekyll is now integrated with Maven to continue using Maven as a build process - Jekyll uses a custom layout that is exactly the layout we had previously - We use HTML for the page contents for the moment, to stay 100% compatible with the original site - Assets have been consolidated in the assets directory - README was updated for instructions on how to use Jekyll.

This branch includes the following new commits:

     new 35edce5  UNOMI-262 Use Jekyll to generate site - Jekyll is now integrated with Maven to continue using Maven as a build process - Jekyll uses a custom layout that is exactly the layout we had previously - We use HTML for the page contents for the moment, to stay 100% compatible with the original site - Assets have been consolidated in the assets directory - README was updated for instructions on how to use Jekyll.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[unomi-site] 01/01: UNOMI-262 Use Jekyll to generate site - Jekyll is now integrated with Maven to continue using Maven as a build process - Jekyll uses a custom layout that is exactly the layout we had previously - We use HTML for the page contents for the moment, to stay 100% compatible with the original site - Assets have been consolidated in the assets directory - README was updated for instructions on how to use Jekyll.

Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

shuber pushed a commit to branch UNOMI-262-jekyll-site
in repository https://gitbox.apache.org/repos/asf/unomi-site.git

commit 35edce507d2d6cae8497fd1f490bd73604188a33
Author: Serge Huber <sh...@jahia.com>
AuthorDate: Mon Jan 13 14:43:28 2020 +0100

    UNOMI-262 Use Jekyll to generate site
    - Jekyll is now integrated with Maven to continue using Maven as a build process
    - Jekyll uses a custom layout that is exactly the layout we had previously
    - We use HTML for the page contents for the moment, to stay 100% compatible with the original site
    - Assets have been consolidated in the assets directory
    - README was updated for instructions on how to use Jekyll.
---
 .gitignore                                         |   1 +
 README.md                                          |  47 +++++-
 _config.yml                                        |   4 +
 pom.xml                                            | 185 +++++++++++++++++++--
 src/main/webapp/_layouts/default.html              | 145 ++++++++++++++++
 .../webapp/{ => assets}/css/bootstrap-grid.css     |   0
 .../webapp/{ => assets}/css/bootstrap-grid.css.map |   0
 .../webapp/{ => assets}/css/bootstrap-grid.min.css |   0
 .../{ => assets}/css/bootstrap-grid.min.css.map    |   0
 .../webapp/{ => assets}/css/bootstrap-reboot.css   |   0
 .../{ => assets}/css/bootstrap-reboot.css.map      |   0
 .../{ => assets}/css/bootstrap-reboot.min.css      |   0
 .../{ => assets}/css/bootstrap-reboot.min.css.map  |   0
 src/main/webapp/{ => assets}/css/bootstrap.css     |   0
 src/main/webapp/{ => assets}/css/bootstrap.css.map |   0
 src/main/webapp/{ => assets}/css/bootstrap.min.css |   0
 .../webapp/{ => assets}/css/bootstrap.min.css.map  |   0
 src/main/webapp/{ => assets}/css/unomi.css         |   0
 .../{ => assets}/images/apache-feather-tm-new.png  | Bin
 .../{ => assets}/images/apache-feather-tm-new.svg  |   0
 .../{ => assets}/images/apache-unomi-380x85.png    | Bin
 src/main/webapp/{ => assets}/images/apache.png     | Bin
 .../webapp/{ => assets}/images/europe-gdpr.jpg     | Bin
 src/main/webapp/{ => assets}/images/favicon.ico    | Bin
 src/main/webapp/{ => assets}/images/feather.svg    |   0
 src/main/webapp/{ => assets}/images/github.png     | Bin
 .../webapp/{ => assets}/images/incubator-logo.png  | Bin
 .../webapp/{ => assets}/images/release-guide.png   | Bin
 .../webapp/{ => assets}/images/unomi-86x20.png     | Bin
 .../images/unomi-logical-architecture-diagram.png  | Bin
 .../{ => assets}/images/unomi-profile-view.png     | Bin
 src/main/webapp/{ => assets}/images/unomi.xcf      | Bin
 .../{js => assets/js/vendor}/bootstrap.bundle.js   |   0
 .../js/vendor}/bootstrap.bundle.js.map             |   0
 .../js/vendor}/bootstrap.bundle.min.js             |   0
 .../js/vendor}/bootstrap.bundle.min.js.map         |   0
 .../webapp/{js => assets/js/vendor}/bootstrap.js   |   0
 .../{js => assets/js/vendor}/bootstrap.js.map      |   0
 .../{js => assets/js/vendor}/bootstrap.min.js      |   0
 .../{js => assets/js/vendor}/bootstrap.min.js.map  |   0
 .../webapp/community-maturity-model-report.html    | 149 +----------------
 src/main/webapp/community-policies.html            | 149 +----------------
 src/main/webapp/community-team.html                | 149 +----------------
 src/main/webapp/community.html                     | 149 +----------------
 src/main/webapp/contribute-become-a-committer.html | 149 +----------------
 src/main/webapp/contribute-committer-guide.html    | 149 +----------------
 src/main/webapp/contribute-dependencies-guide.html | 149 +----------------
 src/main/webapp/contribute-post-commit-guides.html | 148 +----------------
 .../contribute-post-commit-policies-details.html   | 149 +----------------
 .../contribute-post-commit-test-policies.html      | 149 +----------------
 .../contribute-pre-commit-test-policies.html       | 149 +----------------
 src/main/webapp/contribute-release-guide.html      | 151 +----------------
 src/main/webapp/contribute-testing.html            | 149 +----------------
 src/main/webapp/contribute-website.html            | 149 +----------------
 src/main/webapp/contribute.html                    | 149 +----------------
 src/main/webapp/documentation.html                 | 148 +----------------
 src/main/webapp/download.html                      | 150 +----------------
 src/main/webapp/get-started.html                   | 150 +----------------
 src/main/webapp/index.html                         | 156 +----------------
 src/main/webapp/privacy-policy.html                | 149 +----------------
 src/main/webapp/resources.html                     | 148 +----------------
 src/main/webapp/tutorial.html                      | 150 +----------------
 src/main/webapp/use-cases.html                     | 150 +----------------
 63 files changed, 466 insertions(+), 3353 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95759a0..4d00eea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .idea/
 **/*.iml
 target/
+/src/main/webapp/.jekyll-cache/
diff --git a/README.md b/README.md
index d5ebf27..f75b63f 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This project contains the Apache Unomi Website.
 
 ## Build
 
-You need a machine with Maven to build the website.
+You need a machine with Maven installed to build the website.
 
 Checkout:
 
@@ -27,3 +27,48 @@ To publish the local website to the production location (https://unomi.apache.or
 ```
 mvn install scm-publish:publish-scm -Dusername=YOUR_APACHE_USERNAME -Dpassword=YOUR_APACHE_PASSWORD
 ```
+
+## Generate jekyll site
+
+`
+mvn install
+`
+
+## Jekyll serve
+
+`
+mvn gem:exec@jekyll-serve
+`
+
+It works as expected on Mac and Linux, but not on Windows the following stacktrace appears:
+    
+    [INFO] Configuration file: c:\Users\username\projects\jekyll-jruby-maven/src/main/webapp/_config.yml
+    [INFO] Source: c:\Users\username\projects\jekyll-jruby-maven/src/main/webapp
+    [INFO] Destination: c:\Users\username\projects\jekyll-jruby-maven\target\classes
+    [INFO] Incremental build: disabled. Enable with --incremental
+    [INFO] Generating...
+    [INFO] C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/lib/jekyll/utils.rb:117:in `open': Permission denied - c
+    :/Users/username/projects/jekyll-jruby-maven/src/main/resources/css (Errno::EACCES)
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/lib/jekyll/utils.rb:117:in `has_yaml_header?'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/lib/jekyll/reader.rb:43:in `block in read_directories'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/lib/jekyll/reader.rb:43:in `select'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/lib/jekyll/reader.rb:43:in `read_directories'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/lib/jekyll/reader.rb:17:in `read'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/lib/jekyll/site.rb:144:in `read'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/lib/jekyll/site.rb:57:in `process'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/lib/jekyll/command.rb:28:in `process_site'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/lib/jekyll/commands/build.rb:60:in `build'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/lib/jekyll/commands/build.rb:35:in `process'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/lib/jekyll/commands/build.rb:18:in `block in init_
+    with_program'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/mercenary-0.3.5/lib/mercenary/command.rb:220:in `call'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/mercenary-0.3.5/lib/mercenary/command.rb:220:in `block in execute'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/mercenary-0.3.5/lib/mercenary/command.rb:220:in `each'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/mercenary-0.3.5/lib/mercenary/command.rb:220:in `execute'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/mercenary-0.3.5/lib/mercenary/program.rb:42:in `go'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/mercenary-0.3.5/lib/mercenary.rb:19:in `program'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/gems/jekyll-3.0.2/bin/jekyll:17:in `<top>'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/bin/jekyll:1:in `load'
+    [INFO] from C:/Users/username/projects/jekyll-jruby-maven/target/rubygems/bin/jekyll:1:in `<top>'
+    [INFO] from -e:1:in `load'
+    [INFO] from -e:1:in `<top>'
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
new file mode 100644
index 0000000..7c442bd
--- /dev/null
+++ b/_config.yml
@@ -0,0 +1,4 @@
+source: src/main/webapp
+destination: target/site
+name: Apache Unomi website
+title: Apache Unomi&trade; Open Source Customer Data Platform
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6f4fac6..8f50d7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,26 +29,183 @@
     <version>1.0.0</version>
     <packaging>war</packaging>
 
-    <properties>
-        <jetty-port>8080</jetty-port>
-        <maven.wagon.version>1.0-beta-6</maven.wagon.version>
-    </properties>
+    <repositories>
+        <repository>
+            <id>rubygems-proxy</id>
+            <name>Rubygems Proxy</name>
+            <url>http://rubygems-proxy.torquebox.org/releases</url>
+            <layout>default</layout>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+                <updatePolicy>never</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>rubygems</groupId>
+            <artifactId>jekyll</artifactId>
+            <type>gem</type>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>jekyll</artifactId>
+                <version>3.1.2</version>
+                <type>gem</type>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>liquid</artifactId>
+                <type>gem</type>
+                <version>3.0.6</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>kramdown</artifactId>
+                <type>gem</type>
+                <version>1.10.0</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>mercenary</artifactId>
+                <type>gem</type>
+                <version>0.3.5</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>safe_yaml</artifactId>
+                <type>gem</type>
+                <version>1.0.4</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>colorator</artifactId>
+                <type>gem</type>
+                <version>0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>rouge</artifactId>
+                <type>gem</type>
+                <version>1.10.1</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>jekyll-sass-converter</artifactId>
+                <type>gem</type>
+                <version>1.4.0</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>sass</artifactId>
+                <type>gem</type>
+                <version>3.4.22</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>jekyll-watch</artifactId>
+                <type>gem</type>
+                <version>1.3.1</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>listen</artifactId>
+                <type>gem</type>
+                <version>3.0.6</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>rb-fsevent</artifactId>
+                <type>gem</type>
+                <version>0.9.7</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>rb-inotify</artifactId>
+                <type>gem</type>
+                <version>0.9.7</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>ffi</artifactId>
+                <type>gem</type>
+                <version>1.9.10</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>celluloid-essentials</artifactId>
+                <version>0.20.5</version>
+                <type>gem</type>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>celluloid-supervision</artifactId>
+                <type>gem</type>
+                <version>0.20.5</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>yajl-ruby</artifactId>
+                <type>gem</type>
+                <version>1.2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>rubygems</groupId>
+                <artifactId>bundler</artifactId>
+                <type>gem</type>
+                <version>1.11.2</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>8.1.4.v20120524</version>
+                <groupId>de.saumya.mojo</groupId>
+                <artifactId>gem-maven-plugin</artifactId>
+                <version>1.1.5</version>
+                <executions>
+                    <execution>
+                        <id>generate-documentation</id>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <file>${project.build.directory}/rubygems/bin/jekyll</file>
+                            <execArgs>build --trace --source ${project.basedir}/src/main/webapp --destination ${project.build.outputDirectory}</execArgs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <!-- run me with: mvn gem:exec@jekyll-serve -->
+                        <id>jekyll-serve</id>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <file>${project.build.directory}/rubygems/bin/jekyll</file>
+                            <execArgs>serve --trace --source ${project.basedir}/src/main/webapp --destination ${project.build.outputDirectory}</execArgs>
+                        </configuration>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
                 <configuration>
-                    <!-- When editing the conf files, you can comment this line to run
-                        mvn jetty:run
-                       to have a live web site
-                    -->
-                    <webAppSourceDirectory>src/main/webapp</webAppSourceDirectory>
+                    <supportNative>true</supportNative>
+                    <jrubyVersion>9.0.5.0</jrubyVersion>
+                    <addProjectClasspath>true</addProjectClasspath>
+                    <jrubyVerbose>false</jrubyVerbose>
                 </configuration>
-            </plugin>
-            <plugin>
+            </plugin>            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-scm-publish-plugin</artifactId>
                 <version>1.0-beta-2</version>
diff --git a/src/main/webapp/_layouts/default.html b/src/main/webapp/_layouts/default.html
new file mode 100644
index 0000000..b793c82
--- /dev/null
+++ b/src/main/webapp/_layouts/default.html
@@ -0,0 +1,145 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="/assets/images/favicon.ico">
+
+    <title>{{ site.title }} | {{ page.title }}</title>
+
+    <!-- Google Analytics -->
+    <script>
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+        ga('create', 'UA-70313240-1', 'auto');
+        ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+    <!-- Bootstrap core CSS -->
+    <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
+    <!-- Fontawesome CSS CDN -->
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
+    <!-- Custom styles for this template -->
+    <link href="/assets/css/unomi.css" rel="stylesheet">
+</head>
+<body>
+
+<header>
+    <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
+        <div class="container">
+            <a class="navbar-brand" href="index.html">
+                <img src="/assets/images/unomi-86x20.png" alt="Logo Apache Unomi"/>
+            </a>
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
+                <div>
+                    <ul class="navbar-nav mr-auto align-items-center text-uppercase">
+                        <li class="nav-item">
+                            <a class="nav-link" href="get-started.html">Get started</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="use-cases.html">Use cases</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="download.html">Download</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="documentation.html">Documentation</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="resources.html">Resources</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="contribute.html">Contribute</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="community.html">Community</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
+                                <img src="/assets/images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </nav>
+</header>
+
+<main>
+    {{ content }}
+</main>
+
+<!-- FOOTER -->
+<footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
+
+    <div class="container pb-5">
+        <div class="row">
+            <div class="col-3 col-md-3">
+                <h5>Start</h5>
+                <ul class="list-unstyled text-small">
+                    <li><a href="get-started.html" title="Get started">Get started</a></li>
+                    <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
+                    <li><a href="download.html" title="Download">Download</a></li>
+                </ul>
+            </div>
+
+            <div class="col-3 col-md-3">
+                <h5>Documentation</h5>
+                <ul class="list-unstyled text-small">
+                    <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
+                    <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
+                    <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
+                    <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
+                </ul>
+            </div>
+
+            <div class="col-3 col-md-3">
+                <h5>Community</h5>
+                <ul class="list-unstyled text-small">
+                    <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
+                    <li><a href="contribute.html" title="Contribute">Contribute</a></li>
+                    <li><a href="community-team.html" title="Team">Team</a></li>
+                    <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
+                </ul>
+            </div>
+
+            <div class="col-3 col-md-3">
+                <h5>About</h5>
+                <ul class="list-unstyled text-small">
+                    <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
+                    <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
+                    <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
+                    <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
+                    <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
+                    <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
+                    <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
+                </ul>
+            </div>
+            <div class="w-100 pt-md-3"></div>
+        </div>
+    </div>
+
+    <p class="float-right"><a href="#">Back to top</a></p>
+    <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
+        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
+</footer>
+
+<!-- Bootstrap core JavaScript
+================================================== -->
+<!-- Placed at the end of the document so the pages load faster -->
+<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+<script>window.jQuery || document.write('<script src="/assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
+<script src="/assets/js/vendor/popper.min.js"></script>
+<script src="/assets/js/vendor/bootstrap.min.js"></script>
+</body>
+</html>
diff --git a/src/main/webapp/css/bootstrap-grid.css b/src/main/webapp/assets/css/bootstrap-grid.css
similarity index 100%
rename from src/main/webapp/css/bootstrap-grid.css
rename to src/main/webapp/assets/css/bootstrap-grid.css
diff --git a/src/main/webapp/css/bootstrap-grid.css.map b/src/main/webapp/assets/css/bootstrap-grid.css.map
similarity index 100%
rename from src/main/webapp/css/bootstrap-grid.css.map
rename to src/main/webapp/assets/css/bootstrap-grid.css.map
diff --git a/src/main/webapp/css/bootstrap-grid.min.css b/src/main/webapp/assets/css/bootstrap-grid.min.css
similarity index 100%
rename from src/main/webapp/css/bootstrap-grid.min.css
rename to src/main/webapp/assets/css/bootstrap-grid.min.css
diff --git a/src/main/webapp/css/bootstrap-grid.min.css.map b/src/main/webapp/assets/css/bootstrap-grid.min.css.map
similarity index 100%
rename from src/main/webapp/css/bootstrap-grid.min.css.map
rename to src/main/webapp/assets/css/bootstrap-grid.min.css.map
diff --git a/src/main/webapp/css/bootstrap-reboot.css b/src/main/webapp/assets/css/bootstrap-reboot.css
similarity index 100%
rename from src/main/webapp/css/bootstrap-reboot.css
rename to src/main/webapp/assets/css/bootstrap-reboot.css
diff --git a/src/main/webapp/css/bootstrap-reboot.css.map b/src/main/webapp/assets/css/bootstrap-reboot.css.map
similarity index 100%
rename from src/main/webapp/css/bootstrap-reboot.css.map
rename to src/main/webapp/assets/css/bootstrap-reboot.css.map
diff --git a/src/main/webapp/css/bootstrap-reboot.min.css b/src/main/webapp/assets/css/bootstrap-reboot.min.css
similarity index 100%
rename from src/main/webapp/css/bootstrap-reboot.min.css
rename to src/main/webapp/assets/css/bootstrap-reboot.min.css
diff --git a/src/main/webapp/css/bootstrap-reboot.min.css.map b/src/main/webapp/assets/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from src/main/webapp/css/bootstrap-reboot.min.css.map
rename to src/main/webapp/assets/css/bootstrap-reboot.min.css.map
diff --git a/src/main/webapp/css/bootstrap.css b/src/main/webapp/assets/css/bootstrap.css
similarity index 100%
rename from src/main/webapp/css/bootstrap.css
rename to src/main/webapp/assets/css/bootstrap.css
diff --git a/src/main/webapp/css/bootstrap.css.map b/src/main/webapp/assets/css/bootstrap.css.map
similarity index 100%
rename from src/main/webapp/css/bootstrap.css.map
rename to src/main/webapp/assets/css/bootstrap.css.map
diff --git a/src/main/webapp/css/bootstrap.min.css b/src/main/webapp/assets/css/bootstrap.min.css
similarity index 100%
rename from src/main/webapp/css/bootstrap.min.css
rename to src/main/webapp/assets/css/bootstrap.min.css
diff --git a/src/main/webapp/css/bootstrap.min.css.map b/src/main/webapp/assets/css/bootstrap.min.css.map
similarity index 100%
rename from src/main/webapp/css/bootstrap.min.css.map
rename to src/main/webapp/assets/css/bootstrap.min.css.map
diff --git a/src/main/webapp/css/unomi.css b/src/main/webapp/assets/css/unomi.css
similarity index 100%
rename from src/main/webapp/css/unomi.css
rename to src/main/webapp/assets/css/unomi.css
diff --git a/src/main/webapp/images/apache-feather-tm-new.png b/src/main/webapp/assets/images/apache-feather-tm-new.png
similarity index 100%
rename from src/main/webapp/images/apache-feather-tm-new.png
rename to src/main/webapp/assets/images/apache-feather-tm-new.png
diff --git a/src/main/webapp/images/apache-feather-tm-new.svg b/src/main/webapp/assets/images/apache-feather-tm-new.svg
similarity index 100%
rename from src/main/webapp/images/apache-feather-tm-new.svg
rename to src/main/webapp/assets/images/apache-feather-tm-new.svg
diff --git a/src/main/webapp/images/apache-unomi-380x85.png b/src/main/webapp/assets/images/apache-unomi-380x85.png
similarity index 100%
rename from src/main/webapp/images/apache-unomi-380x85.png
rename to src/main/webapp/assets/images/apache-unomi-380x85.png
diff --git a/src/main/webapp/images/apache.png b/src/main/webapp/assets/images/apache.png
similarity index 100%
rename from src/main/webapp/images/apache.png
rename to src/main/webapp/assets/images/apache.png
diff --git a/src/main/webapp/images/europe-gdpr.jpg b/src/main/webapp/assets/images/europe-gdpr.jpg
similarity index 100%
rename from src/main/webapp/images/europe-gdpr.jpg
rename to src/main/webapp/assets/images/europe-gdpr.jpg
diff --git a/src/main/webapp/images/favicon.ico b/src/main/webapp/assets/images/favicon.ico
similarity index 100%
rename from src/main/webapp/images/favicon.ico
rename to src/main/webapp/assets/images/favicon.ico
diff --git a/src/main/webapp/images/feather.svg b/src/main/webapp/assets/images/feather.svg
similarity index 100%
rename from src/main/webapp/images/feather.svg
rename to src/main/webapp/assets/images/feather.svg
diff --git a/src/main/webapp/images/github.png b/src/main/webapp/assets/images/github.png
similarity index 100%
rename from src/main/webapp/images/github.png
rename to src/main/webapp/assets/images/github.png
diff --git a/src/main/webapp/images/incubator-logo.png b/src/main/webapp/assets/images/incubator-logo.png
similarity index 100%
rename from src/main/webapp/images/incubator-logo.png
rename to src/main/webapp/assets/images/incubator-logo.png
diff --git a/src/main/webapp/images/release-guide.png b/src/main/webapp/assets/images/release-guide.png
similarity index 100%
rename from src/main/webapp/images/release-guide.png
rename to src/main/webapp/assets/images/release-guide.png
diff --git a/src/main/webapp/images/unomi-86x20.png b/src/main/webapp/assets/images/unomi-86x20.png
similarity index 100%
rename from src/main/webapp/images/unomi-86x20.png
rename to src/main/webapp/assets/images/unomi-86x20.png
diff --git a/src/main/webapp/images/unomi-logical-architecture-diagram.png b/src/main/webapp/assets/images/unomi-logical-architecture-diagram.png
similarity index 100%
rename from src/main/webapp/images/unomi-logical-architecture-diagram.png
rename to src/main/webapp/assets/images/unomi-logical-architecture-diagram.png
diff --git a/src/main/webapp/images/unomi-profile-view.png b/src/main/webapp/assets/images/unomi-profile-view.png
similarity index 100%
rename from src/main/webapp/images/unomi-profile-view.png
rename to src/main/webapp/assets/images/unomi-profile-view.png
diff --git a/src/main/webapp/images/unomi.xcf b/src/main/webapp/assets/images/unomi.xcf
similarity index 100%
rename from src/main/webapp/images/unomi.xcf
rename to src/main/webapp/assets/images/unomi.xcf
diff --git a/src/main/webapp/js/bootstrap.bundle.js b/src/main/webapp/assets/js/vendor/bootstrap.bundle.js
similarity index 100%
rename from src/main/webapp/js/bootstrap.bundle.js
rename to src/main/webapp/assets/js/vendor/bootstrap.bundle.js
diff --git a/src/main/webapp/js/bootstrap.bundle.js.map b/src/main/webapp/assets/js/vendor/bootstrap.bundle.js.map
similarity index 100%
rename from src/main/webapp/js/bootstrap.bundle.js.map
rename to src/main/webapp/assets/js/vendor/bootstrap.bundle.js.map
diff --git a/src/main/webapp/js/bootstrap.bundle.min.js b/src/main/webapp/assets/js/vendor/bootstrap.bundle.min.js
similarity index 100%
rename from src/main/webapp/js/bootstrap.bundle.min.js
rename to src/main/webapp/assets/js/vendor/bootstrap.bundle.min.js
diff --git a/src/main/webapp/js/bootstrap.bundle.min.js.map b/src/main/webapp/assets/js/vendor/bootstrap.bundle.min.js.map
similarity index 100%
rename from src/main/webapp/js/bootstrap.bundle.min.js.map
rename to src/main/webapp/assets/js/vendor/bootstrap.bundle.min.js.map
diff --git a/src/main/webapp/js/bootstrap.js b/src/main/webapp/assets/js/vendor/bootstrap.js
similarity index 100%
rename from src/main/webapp/js/bootstrap.js
rename to src/main/webapp/assets/js/vendor/bootstrap.js
diff --git a/src/main/webapp/js/bootstrap.js.map b/src/main/webapp/assets/js/vendor/bootstrap.js.map
similarity index 100%
rename from src/main/webapp/js/bootstrap.js.map
rename to src/main/webapp/assets/js/vendor/bootstrap.js.map
diff --git a/src/main/webapp/js/bootstrap.min.js b/src/main/webapp/assets/js/vendor/bootstrap.min.js
similarity index 100%
rename from src/main/webapp/js/bootstrap.min.js
rename to src/main/webapp/assets/js/vendor/bootstrap.min.js
diff --git a/src/main/webapp/js/bootstrap.min.js.map b/src/main/webapp/assets/js/vendor/bootstrap.min.js.map
similarity index 100%
rename from src/main/webapp/js/bootstrap.min.js.map
rename to src/main/webapp/assets/js/vendor/bootstrap.min.js.map
diff --git a/src/main/webapp/community-maturity-model-report.html b/src/main/webapp/community-maturity-model-report.html
index b10921a..404be11 100644
--- a/src/main/webapp/community-maturity-model-report.html
+++ b/src/main/webapp/community-maturity-model-report.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Podling Maturity Assessment </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="contribute.html">Contribute</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="community.html">Community <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Podling Maturity Assessment
+layout: default
+---
 
       <div class="container mb-5 pt-5">
         <div class="col-2 sidenav-menu pt-3">
@@ -432,69 +357,3 @@
           </table>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/community-policies.html b/src/main/webapp/community-policies.html
index 0310410..1a4beff 100644
--- a/src/main/webapp/community-policies.html
+++ b/src/main/webapp/community-policies.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Policies </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="contribute.html">Contribute</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="community.html">Community <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Policies
+layout: default
+---
 
       <div class="container mb-5 pt-5">
         <div class="col-2 sidenav-menu pt-3">
@@ -105,69 +30,3 @@
           <p>If you wish to report a security vulnerability, please contact <a href="mailto:security@apache.org">security@apache.org</a>. Apache Unomi follows the typical <a target="_blank" href="https://apache.org/security/committers.html#vulnerability-handling">Apache vulnerability handling process</a>.</p>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/community-team.html b/src/main/webapp/community-team.html
index 71f4cbc..796a8eb 100644
--- a/src/main/webapp/community-team.html
+++ b/src/main/webapp/community-team.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Team </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="contribute.html">Contribute</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="community.html">Community <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                      <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Team
+layout: default
+---
 
       <div class="container mb-5 pt-5">
         <div class="col-2 sidenav-menu pt-3">
@@ -290,69 +215,3 @@
           <p>There are no contributors listed for this project. Please check back again later.</p>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-        <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-            Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/community.html b/src/main/webapp/community.html
index f097f03..3ff8abd 100644
--- a/src/main/webapp/community.html
+++ b/src/main/webapp/community.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Community </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="contribute.html">Contribute</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="community.html">Community <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Community
+layout: default
+---
 
       <div class="container mb-5 pt-5">
         <div class="col-2 sidenav-menu pt-3">
@@ -127,69 +52,3 @@
           <p>If you wish to report a security vulnerability, please contact <a href="mailto:security@apache.org">security@apache.org</a>. Apache Unomi follows the typical <a target="_blank" href="https://apache.org/security/committers.html#vulnerability-handling">Apache vulnerability handling process</a>.</p>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/contribute-become-a-committer.html b/src/main/webapp/contribute-become-a-committer.html
index 23125d7..54f255f 100644
--- a/src/main/webapp/contribute-become-a-committer.html
+++ b/src/main/webapp/contribute-become-a-committer.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Contribute | Become a committer </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="contribute.html">Contribute <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Contribute | Become a committer
+layout: default
+---
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -185,69 +110,3 @@
           </div>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/contribute-committer-guide.html b/src/main/webapp/contribute-committer-guide.html
index dd0519c..ca41ba3 100644
--- a/src/main/webapp/contribute-committer-guide.html
+++ b/src/main/webapp/contribute-committer-guide.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Contribute | Committer guide </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="contribute.html">Contribute <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Contribute | Committer guide
+layout: default
+---
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -162,69 +87,3 @@
           </div>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/contribute-dependencies-guide.html b/src/main/webapp/contribute-dependencies-guide.html
index 6d37cb3..e056749 100644
--- a/src/main/webapp/contribute-dependencies-guide.html
+++ b/src/main/webapp/contribute-dependencies-guide.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Contribute | Dependencies guide </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="contribute.html">Contribute <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Contribute | Dependencies guide
+layout: default
+---
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -191,69 +116,3 @@
           </div>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/contribute-post-commit-guides.html b/src/main/webapp/contribute-post-commit-guides.html
index 567d872..5ea9d49 100644
--- a/src/main/webapp/contribute-post-commit-guides.html
+++ b/src/main/webapp/contribute-post-commit-guides.html
@@ -1,82 +1,8 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
+---
+title: Contribute | Post-commit guides
+layout: default
+---
 
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Contribute | Post-commit guides </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="contribute.html">Contribute <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -169,69 +95,3 @@
           </div>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/contribute-post-commit-policies-details.html b/src/main/webapp/contribute-post-commit-policies-details.html
index 32b8eaa..97db21d 100644
--- a/src/main/webapp/contribute-post-commit-policies-details.html
+++ b/src/main/webapp/contribute-post-commit-policies-details.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Contribute | Post-commit policies details </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="contribute.html">Contribute <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Contribute | Post-commit policies details
+layout: default
+---
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -163,69 +88,3 @@
           </div>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/contribute-post-commit-test-policies.html b/src/main/webapp/contribute-post-commit-test-policies.html
index 2cf9ae2..d60c859 100644
--- a/src/main/webapp/contribute-post-commit-test-policies.html
+++ b/src/main/webapp/contribute-post-commit-test-policies.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Contribute | Post-commit test policies </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="contribute.html">Contribute <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Contribute | Post-commit test policies
+layout: default
+---
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -172,69 +97,3 @@
           </div>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/contribute-pre-commit-test-policies.html b/src/main/webapp/contribute-pre-commit-test-policies.html
index 9badb9a..c5f3739 100644
--- a/src/main/webapp/contribute-pre-commit-test-policies.html
+++ b/src/main/webapp/contribute-pre-commit-test-policies.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Contribute | Pre-commit test policies </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="contribute.html">Contribute <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Contribute | Pre-commit test policies
+layout: default
+---
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -165,69 +90,3 @@
           </div>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/contribute-release-guide.html b/src/main/webapp/contribute-release-guide.html
index 6065173..2d5b16f 100644
--- a/src/main/webapp/contribute-release-guide.html
+++ b/src/main/webapp/contribute-release-guide.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Contribute | Release guide </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-              <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="contribute.html">Contribute <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                        <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                    </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Contribute | Release guide
+layout: default
+---
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -126,7 +51,7 @@
 
             <h2 id="overview">Overview</h2>
 
-            <p><img src="images/release-guide.png" alt="Apache Unomi release guide" title="Release Process" class="img-fluid" /></p>
+            <p><img src="assets/images/release-guide.png" alt="Apache Unomi release guide" title="Release Process" class="img-fluid" /></p>
 
             <p>The release process consists of several steps:</p>
 
@@ -485,69 +410,3 @@ The Apache Unomi Team
           </div>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-        <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-            Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/contribute-testing.html b/src/main/webapp/contribute-testing.html
index 4afb2f6..1a47ab2 100644
--- a/src/main/webapp/contribute-testing.html
+++ b/src/main/webapp/contribute-testing.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Contribute | Testing </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="contribute.html">Contribute <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Contribute | Testing
+layout: default
+---
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -220,69 +145,3 @@
           </div>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/contribute-website.html b/src/main/webapp/contribute-website.html
index 8192a80..5095708 100644
--- a/src/main/webapp/contribute-website.html
+++ b/src/main/webapp/contribute-website.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Website </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="contribute.html">Contribute <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Contribute | Website
+layout: default
+---
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -163,69 +88,3 @@
           </div>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/contribute.html b/src/main/webapp/contribute.html
index dce6893..f71783e 100644
--- a/src/main/webapp/contribute.html
+++ b/src/main/webapp/contribute.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Contribute </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="contribute.html">Contribute <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Contribute
+layout: default
+---
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -148,69 +73,3 @@
           </div>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/documentation.html b/src/main/webapp/documentation.html
index 85041e0..40ca709 100644
--- a/src/main/webapp/documentation.html
+++ b/src/main/webapp/documentation.html
@@ -1,80 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Documentation </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="documentation.html">Documentation <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="contribute.html">Contribute</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
+---
+title: Documentation
+layout: default
+---
 
     <div class="container mb-5 pt-5">
       <h2 class="pb-2 mb-2 border-bottom">Documentation</h2>
@@ -175,8 +102,6 @@
       </div>
     </div>
 
-    <main>
-
       <!-- Marketing messaging and featurettes
       ================================================== -->
       <!-- Wrap the rest of the page in another container to center all the content. -->
@@ -325,69 +250,4 @@
         </div>
 
       </div><!-- /.container -->
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
 
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/download.html b/src/main/webapp/download.html
index 39a95e6..a81cf81 100644
--- a/src/main/webapp/download.html
+++ b/src/main/webapp/download.html
@@ -1,80 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Download </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="download.html">Download <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="contribute.html">Contribute</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
+---
+title: Download
+layout: default
+---
 
     <div class="container pt-5">
       <h2 class="pb-3 mb-2">Download</h2>
@@ -108,8 +35,6 @@
       </div>
     </div>
 
-    <main>
-
       <div class="container">
         <div class="row mb-3 mt-3">
             <div class="col">
@@ -271,70 +196,3 @@
             </div>
         </div>
       </div><!-- /.karaf - container -->
-    </main>
-
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/get-started.html b/src/main/webapp/get-started.html
index d616cdc..821bd64 100644
--- a/src/main/webapp/get-started.html
+++ b/src/main/webapp/get-started.html
@@ -1,82 +1,8 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
+---
+title: Getting Started
+layout: default
+---
 
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Getting Started </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item active">
-                  <a class="nav-link" href="get-started.html">Get started <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="contribute.html">Contribute</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
       <div class="container pt-5 pb-5">
         <!-- in a few words -->
         <div class="row pb-2 pt-4">
@@ -109,7 +35,7 @@
             <h2 class="featurette-heading">5 Minutes Quick start !</h2>
             <ol style="list-style-type: decimal">
               <li>Install JDK 8 (see <a target="_blank" href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">http://www.oracle.com/technetwork/java/javase/downloads/index.html</a> and make sure you set the JAVA_HOME variable <a target="_blank" href="https://docs.oracle.com/cd/E19182-01/820-7851/inst_cli_jdk_javahome_t/">https://docs.oracle.com/cd/E19182-01/820-7851/inst_cli_jdk_javahome_t/</a></li>
-              <li>Download ElasticSearch here : <a target="_blank" href="https://www.elastic.co/downloads/past-releases/elasticsearch-7-4-2">https://www.elastic.co/downloads/past-releases/elasticsearch-7-4-2</a> (please <strong>make sure</strong> you use the proper version : [7.4.2 for Unomi &gt;= 1.5] and [5.6.3 for Unomi &gt;= 1.3] and [5.1.2 for Unomi &lt;= 1.2])</li>
+              <li>Download ElasticSearch here : <a target="_blank" href="https://www.elastic.co/downloads/past-releases">https://www.elastic.co/downloads/past-releases</a> (please <strong>make sure</strong> you use the proper version : [7.4.2 for Unomi &gt;= 1.5] and [5.6.3 for Unomi &gt;= 1.3] and [5.1.2 for Unomi &lt;= 1.2])</li>
               <li>Uncompress it and change the <code>config/elasticsearch.yml</code> to include the following config : <code>cluster.name: contextElasticSearch</code></li>
               <li>Launch ElasticSearch using : <code>bin/elasticsearch</code></li>
               <li>Download Apache Unomi here : <a target="_blank" href="http://unomi.apache.org/download.html">http://unomi.apache.org/download.html</a></li>
@@ -124,69 +50,3 @@
         </div>
 
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-        Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index aea123c..ea8cf04 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -1,81 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Main Page </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="contribute.html">Contribute</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Main Page
+layout: default
+---
 
       <div class="container-fluid product pt-5 pb-5 mx-auto">
         <div class="row pt-5 pb-5">
@@ -103,7 +29,7 @@
 
         <div class="row">
           <div class="col-lg-4 my-auto mx-auto">
-            <img src="images/unomi-profile-view.png" class="img-thumbnail" alt="Apache Unomi profile view shell command" width="350" />
+            <img src="assets/images/unomi-profile-view.png" class="img-thumbnail" alt="Apache Unomi profile view shell command" width="350" />
           </div><!-- /.col-lg-4 -->
           <div class="col-lg-8 pl-5">
             <h3>Version 1.4.0 released !</h3>
@@ -140,7 +66,7 @@
               A quick guide to these new features is also available <a href="manual/latest/#_consent_api">here</a>.</p>
           </div><!-- /.col-lg-8 -->
           <div class="col-lg-4 my-auto mx-auto">
-            <img src="images/europe-gdpr.jpg" class="img-thumbnail" alt="GDPR Illustration" width="350" />
+            <img src="assets/images/europe-gdpr.jpg" class="img-thumbnail" alt="GDPR Illustration" width="350" />
           </div><!-- /.col-lg-4 -->
         </div><!-- /.row -->
 
@@ -183,7 +109,7 @@
 
         <div class="row featurette">
           <div class="col-md-12">
-            <img src="images/unomi-logical-architecture-diagram.png" alt="Apache Unomi logical architecture diagram" class="img-fluid" />
+            <img src="assets/images/unomi-logical-architecture-diagram.png" alt="Apache Unomi logical architecture diagram" class="img-fluid" />
           </div>
         </div>
 
@@ -255,7 +181,7 @@
           </div>
           <div class="col-md-5 align-items-center">
             <a href="http://apache.org" target="_blank">
-            <img class="featurette-image img-fluid mx-auto" src="images/apache.png" alt="Apache Software Foundation">
+            <img class="featurette-image img-fluid mx-auto" src="assets/images/apache.png" alt="Apache Software Foundation">
             </a>
             <br><br><br>
             <a href="https://www.apache.org/events/current-event.html" target="_blank">
@@ -267,69 +193,3 @@
         <!-- /END THE FEATURETTES -->
 
       </div><!-- /.container -->
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-      <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-      Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/privacy-policy.html b/src/main/webapp/privacy-policy.html
index 5a6623b..1c4e6bd 100644
--- a/src/main/webapp/privacy-policy.html
+++ b/src/main/webapp/privacy-policy.html
@@ -1,82 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Privacy Policy </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="contribute.html">Contribute</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="community.html">Community <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
+---
+title: Privacy Policy
+layout: default
+---
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -107,69 +32,3 @@
             </div>
         </div>
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-        <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-            Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/resources.html b/src/main/webapp/resources.html
index 199462e..b3170b3 100644
--- a/src/main/webapp/resources.html
+++ b/src/main/webapp/resources.html
@@ -1,82 +1,8 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
+---
+title: Resources
+layout: default
+---
 
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Getting Started </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="resources.html">Resources <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="contribute.html">Contribute</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-    <main>
       <div class="container pt-5 pb-5">
         <h2 class="pb-2 mb-2">Learn more about <span class="text-muted">Apache Unomi</span></h2>
 
@@ -181,69 +107,3 @@
           </div><!-- videos -->
 
       </div>
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-        <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-            Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/tutorial.html b/src/main/webapp/tutorial.html
index 8afdc71..b761261 100644
--- a/src/main/webapp/tutorial.html
+++ b/src/main/webapp/tutorial.html
@@ -1,83 +1,7 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Tutorial </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-              <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="use-cases.html">Use cases</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="contribute.html">Contribute</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                      <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
-
-
-    <main>
+---
+title: Tutorial
+layout: default
+---
 
       <!-- Marketing messaging and featurettes
       ================================================== -->
@@ -418,69 +342,3 @@ curl http://localhost:9200/_cat/health?format=json
         </div>
 
       </div><!-- /.container -->
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-        <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-            Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>
diff --git a/src/main/webapp/use-cases.html b/src/main/webapp/use-cases.html
index 58acd9e..b0755d6 100644
--- a/src/main/webapp/use-cases.html
+++ b/src/main/webapp/use-cases.html
@@ -1,93 +1,18 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="images/favicon.ico">
-
-    <title>Apache Unomi&trade; Open Source Customer Data Platform | Use Cases </title>
-
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-70313240-1', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics -->
-
-    <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Fontawesome CSS CDN -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <!-- Custom styles for this template -->
-    <link href="css/unomi.css" rel="stylesheet">
-  </head>
-  <body>
-
-    <header>
-      <nav class="navbar navbar-expand-md navbar-light bg-white fixed-top border-bottom box-shadow">
-        <div class="container">
-          <a class="navbar-brand" href="index.html">
-            <img src="images/unomi-86x20.png" alt="Logo Apache Unomi"/>
-          </a>
-          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
-                  aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
-            <div>
-              <ul class="navbar-nav mr-auto align-items-center text-uppercase">
-                <li class="nav-item">
-                  <a class="nav-link" href="get-started.html">Get started</a>
-                </li>
-                <li class="nav-item active">
-                  <a class="nav-link" href="use-cases.html">Use cases <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="download.html">Download</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="documentation.html">Documentation</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="resources.html">Resources</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="contribute.html">Contribute</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="community.html">Community</a>
-                </li>
-                <li class="nav-item">
-                  <a class="nav-link disabled" target="_blank" href="https://www.apache.org">
-                    <img src="images/apache-feather-tm-new.png" alt="Logo Apache Feather"/>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </nav>
-    </header>
+---
+title: Use Cases
+layout: default
+---
 
     <div class="container pt-5 pb-2">
       <div class="jumbotron p-3 p-md-5 text-white bg-primary">
         <div class="col-md-12 px-0">
-          <h1 class="display-5 font-italic">Apache Unomi has several use cases for what your need !</h1>
+          <h1 class="display-5 font-italic">Apache Unomi has several use cases for what your need!</h1>
           <p class="lead my-3">Apache Unomi is a REST server that manages user profiles and events related to the profiles. It can be used to integrate personalization and profile management within very different systems such as CMS, CRMs, Issue Trackers, native mobile application. It was designed to be easy to integrate with external systems, promoting profile sharing and re-use in very different applications.</p>
           <p class="lead mb-0">Let's start !</p>
         </div>
       </div>
     </div>
 
-    <main>
-
       <div class="container">
 
         <!-- use-cases -->
@@ -116,69 +41,4 @@
         </div><!-- use-cases -->
 
       </div><!-- /.container -->
-    </main>
-
-    <!-- FOOTER -->
-    <footer class="container-fluid bg-dark pt-5 pb-3 text-white text-center footer">
-
-      <div class="container pb-5">
-        <div class="row">
-          <div class="col-3 col-md-3">
-            <h5>Start</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="get-started.html" title="Get started">Get started</a></li>
-              <li><a href="get-started.html#quickstart" title="Quick start">Quick start</a></li>
-              <li><a href="download.html" title="Download">Download</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Documentation</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="documentation.html" title="Main documentation">Main documentation</a></li>
-              <li><a href="use-cases.html" title="More use cases">More use cases</a></li>
-              <li><a href="rest-api-doc/index.html" title="REST API documentation">REST API documentation</a></li>
-              <li><a href="unomi-api/apidocs/index.html" title="API Javadoc">API Javadoc</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>Community</h5>
-            <ul class="list-unstyled text-small">
-              <li><a href="community.html" title="Mailing lists">Contact Us</a></li>
-              <li><a href="contribute.html" title="Contribute">Contribute</a></li>
-              <li><a href="community-team.html" title="Team">Team</a></li>
-              <li><a href="community-maturity-model-report.html" title="Maturity model report card">Maturity model report card</a></li>
-            </ul>
-          </div>
-
-          <div class="col-3 col-md-3">
-            <h5>About</h5>
-            <ul class="list-unstyled text-small">
-              <li><a target="_blank" href="https://www.oasis-open.org/committees/cxs/" title="OASIS Context Server Technical Committee">OASIS CXS Committee</a></li>
-              <li><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
-              <li><a target="_blank" href="https://www.apache.org/events/current-event.html" title="Apache Events">Apache Events</a></li>
-              <li><a target="_blank" href="https://www.apache.org/licenses/" title="License">License</a></li>
-              <li><a target="_blank" href="https://www.apache.org/security/" title="Security">Security</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a></li>
-              <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html" title="Thanks">Thanks</a></li>
-            </ul>
-          </div>
-          <div class="w-100 pt-md-3"></div>
-        </div>
-      </div>
-
-      <p class="float-right"><a href="#">Back to top</a></p>
-        <p>Copyright &copy;2014 - 2019 <a target="_blank" href="https://www.apache.org">Apache Software Foundation</a> - All Rights Reserved - Powered by <a target="_blank" href="https://karaf.apache.org">Apache Karaf&trade;</a><br/>
-            Apache Unomi, Unomi, Apache and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
-    </footer>
 
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-    <script src="assets/js/vendor/popper.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
-</html>