diff --git a/customize.dist/about.html b/customize.dist/about.html
index 682422a80..3ce8dee6e 100644
--- a/customize.dist/about.html
+++ b/customize.dist/about.html
@@ -6,6 +6,8 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
+    <script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
     <script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
     <script src="/bower_components/requirejs/require.js"></script>
     <script>
@@ -24,6 +26,7 @@
 
     <span class="slogan" data-localization="main_slogan"></span>
 
+    <span id="language-selector" class="right dropdown-bar"></span>
     <span class="right">
         <a href="/about.html" data-localization="about">About</a>
     </span>
@@ -39,12 +42,11 @@
 </div>
 
 
-    <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
+    <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 50px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
 <!-- Thanks! http://tholman.com/github-corners/ -->
 
 
 
-    <span id="language-selector" class="dropdown-bar"></span>
     <center>
         <noscript>
           <p>
diff --git a/customize.dist/bg2.jpg b/customize.dist/bg2.jpg
new file mode 100644
index 000000000..a7598eee1
Binary files /dev/null and b/customize.dist/bg2.jpg differ
diff --git a/customize.dist/contact.html b/customize.dist/contact.html
index 1c7885c25..83973aa3f 100644
--- a/customize.dist/contact.html
+++ b/customize.dist/contact.html
@@ -6,6 +6,8 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
+    <script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
     <script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
     <script src="/bower_components/requirejs/require.js"></script>
     <script>
@@ -24,6 +26,7 @@
 
     <span class="slogan" data-localization="main_slogan"></span>
 
+    <span id="language-selector" class="right dropdown-bar"></span>
     <span class="right">
         <a href="/about.html" data-localization="about">About</a>
     </span>
@@ -39,12 +42,11 @@
 </div>
 
 
-    <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
+    <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 50px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
 <!-- Thanks! http://tholman.com/github-corners/ -->
 
 
 
-    <span id="language-selector" class="dropdown-bar"></span>
     <center>
         <noscript>
           <p>
diff --git a/customize.dist/index.html b/customize.dist/index.html
index a8cd4a4f5..d972da5f1 100644
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@@ -6,6 +6,8 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
+    <script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
     <script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
     <script src="/bower_components/requirejs/require.js"></script>
     <script>
@@ -24,6 +26,7 @@
 
     <span class="slogan" data-localization="main_slogan"></span>
 
+    <span id="language-selector" class="right dropdown-bar"></span>
     <span class="right">
         <a href="/about.html" data-localization="about">About</a>
     </span>
@@ -39,12 +42,11 @@
 </div>
 
 
-    <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
+    <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 50px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
 <!-- Thanks! http://tholman.com/github-corners/ -->
 
 
 
-    <span id="language-selector" class="dropdown-bar"></span>
     <center>
         <noscript>
           <p>
@@ -60,16 +62,21 @@
 
 
 <div id="main">
+    <div id="overlay"></div>
     <div id="data">
       <p class="left" data-localization="main_p1"><!-- Zero Knowledge collaborative realtime editor. Protected from the NSA. --></p>
 
-        <h5 id="tryit" data-localization="tryIt"></h5>
+        <center>
+          <h5 id="tryit" data-localization="tryIt"></h5>
+        </center>
 
         <div id="buttons" class="buttons">
-          <a id="create-pad" class="button create" href="/pad/" data-localization="button_newpad"></a><br/>
-          <a id="create-code" class="button create" href="/code/" data-localization="button_newcode"></a><br/>
-          <a id="create-poll" class="button create" href="/poll/" data-localization="button_newpoll"></a><br/>
-          <a id="create-slide" class="button create" href="/slide/" data-localization="button_newslide"></a>
+            <a id="create-pad" href="/pad/"><button class="btn btn-secondary" data-localization="button_newpad"></button></a>
+            <a id="create-code" href="/code/"><button class="btn btn-secondary" data-localization="button_newcode"></button></a>
+            <a id="create-poll" href="/poll/"><button class="btn btn-secondary" data-localization="button_newpoll"></button></a>
+            <a id="create-slide" href="/slide/"><button class="btn btn-secondary" data-localization="button_newslide"></button></a>
+            <br>
+            <button class="btn btn-default nologin" data-localization="login_nologin"></button>
         </div>
 
     </div>
@@ -86,9 +93,7 @@
 
         <input type="checkbox" id="rememberme" checked="checked"><label for="rememberme" data-localization="login_remember"></label><br>
         <br>
-        <button class="create button login half first" data-localization="login_login"></button> <button class="create button register half" data-localization="login_register"></button><br>
-        <button class="create button nologin" data-localization="login_nologin"></button>
-
+        <button class="btn btn-secondary login half first" data-localization="login_login"></button> <button class="btn btn-primary register half" data-localization="login_register"></button><br>
     </div>
 </div>
 
diff --git a/customize.dist/main.css b/customize.dist/main.css
index f3327e0df..954138b65 100644
--- a/customize.dist/main.css
+++ b/customize.dist/main.css
@@ -344,7 +344,7 @@
   display: none;
   position: absolute;
   background-color: #f9f9f9;
-  min-width: 160px;
+  min-width: 200px;
   box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
   z-index: 1000;
 }
@@ -405,12 +405,12 @@
   top: 0;
   left: 0;
   right: 0;
-  height: 80px;
+  height: 50px;
   color: #000;
   font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
   padding: 5px;
   box-sizing: border-box;
-  font-size: 40px;
+  font-size: 30px;
 }
 #cryptpadTopBar > span {
   vertical-align: middle;
@@ -418,34 +418,45 @@
   height: 100%;
 }
 #cryptpadTopBar .cryptpad-logo {
-  height: 70px;
+  height: 40px;
   vertical-align: middle;
 }
 #cryptpadTopBar .slogan {
   font-size: 20px;
   color: #000;
-  line-height: 70px;
+  line-height: 40px;
 }
 #cryptpadTopBar .gotoMain {
   color: #000;
-  height: 70px;
-  line-height: 70px;
+  height: 40px;
+  line-height: 40px;
+}
+#cryptpadTopBar .gotoMain:hover {
+  text-decoration: none;
+  color: #558;
 }
 #cryptpadTopBar .right {
   float: right;
   font-size: 20px;
-  margin: 0px 5px;
-  background: #2E9AFE;
+  margin: 0px 10px;
+  line-height: 40px;
 }
 #cryptpadTopBar .right a {
-  text-align: center;
-  min-width: 100px;
-  font-weight: bold;
-  height: 70px;
-  padding: 0 10px;
-  line-height: 70px;
-  display: inline-block;
-  color: #fff;
+  font-weight: 500;
+  font-size: 0.75em;
+  color: #558;
+  /*            text-align: center;
+            min-width: 100px;
+            font-weight: bold;
+            height: 70px;
+            padding: 0 10px;
+            line-height: 70px;
+            display: inline-block;
+            color: @topbar-button-color;*/
+}
+#cryptpadTopBar .right a:hover {
+  text-decoration: none;
+  color: #000;
 }
 html.cp,
 .cp body {
@@ -455,12 +466,14 @@ html.cp,
   font-family: Georgia,Cambria,serif;
   height: 100%;
 }
-.cp:not(.poll) #language-selector {
-  position: absolute;
-  top: 80px;
-  right: 0px;
-  display: inline-block;
-  z-index: 2;
+.cp:not(.poll) {
+  /*#language-selector {
+        position: absolute;
+        top: @topbar-height;
+        right: 0px;
+        display: inline-block;
+        z-index: 2;
+    }*/
 }
 .cp {
   /* buttons */
@@ -575,9 +588,13 @@ html.cp,
   height: 100vh;
   background: red;
 }
+.cp .btn-default:hover {
+  background-color: #d8d8d8;
+}
 .cp #main {
-  background-image: url('/customize/bg.jpg');
+  background-image: url('/customize/bg2.jpg');
   background-size: cover;
+  background-position: center center;
 }
 .cp #main,
 .cp #main_other {
@@ -585,20 +602,29 @@ html.cp,
   left: 0;
   right: 0;
   padding: 0 15vw;
-  height: calc(100vh - 80px);
+  height: calc(100vh - 50px);
   margin: auto;
   font-size: medium;
 }
+.cp #main #overlay,
+.cp #main_other #overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #000;
+  opacity: 0.2;
+}
 .cp #main #data,
 .cp #main_other #data {
-  color: #000;
+  color: #fff;
   padding: 15px;
   box-sizing: border-box;
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
   width: calc(100% - 450px - 30vw);
-  background-color: rgba(34, 177, 221, 0.8);
 }
 .cp #main #data p,
 .cp #main_other #data p {
@@ -607,7 +633,11 @@ html.cp,
 }
 .cp #main #data h5,
 .cp #main_other #data h5 {
-  color: #000;
+  color: #fff;
+}
+.cp #main #data #tryit,
+.cp #main_other #data #tryit {
+  margin-top: 20px;
 }
 .cp #main #userForm,
 .cp #main_other #userForm {
@@ -618,24 +648,21 @@ html.cp,
   margin-left: 50px;
   display: inline-block;
   width: 400px;
-  background-color: rgba(34, 177, 221, 0.8);
   padding: 10px;
   box-sizing: border-box;
   font-family: lato, Helvetica, sans-serif;
-  color: #000;
+  color: #fff;
 }
 .cp #main #userForm h1,
 .cp #main_other #userForm h1 {
-  color: black;
+  color: #fff;
   padding: 0;
 }
 .cp #main #userForm [type="text"],
 .cp #main_other #userForm [type="text"],
 .cp #main #userForm [type="password"],
 .cp #main_other #userForm [type="password"] {
-  width: calc(100% - 10px);
-  height: 1.5em;
-  border-radius: 0;
+  width: 100%;
 }
 .cp #main #userForm [type="checkbox"],
 .cp #main_other #userForm [type="checkbox"] {
@@ -644,6 +671,11 @@ html.cp,
   margin-top: 10px;
   margin-right: 5px;
 }
+.cp #main #userForm label,
+.cp #main_other #userForm label {
+  margin-bottom: 0;
+  margin-top: 0.5em;
+}
 .cp #main #userForm button,
 .cp #main_other #userForm button {
   width: 100%;
@@ -653,11 +685,21 @@ html.cp,
 }
 .cp #main #userForm button.half,
 .cp #main_other #userForm button.half {
-  width: calc(50% - 2px);
+  width: calc(50% - 4px);
+}
+.cp #main #userForm button.half:not(.first),
+.cp #main_other #userForm button.half:not(.first) {
+  float: right;
 }
 .cp #main .buttons,
 .cp #main_other .buttons {
-  margin-top: 20px;
+  text-align: center;
+}
+.cp #main .buttons button,
+.cp #main_other .buttons button {
+  text-transform: uppercase;
+  cursor: pointer;
+  margin-top: 10px;
 }
 .cp #fileManagerIframe {
   width: 100%;
diff --git a/customize.dist/main.js b/customize.dist/main.js
index 1af9761e1..6851535f8 100644
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@@ -41,6 +41,7 @@ define([
     // Language selector
     var $sel = $('#language-selector');
     Cryptpad.createLanguageSelector(undefined, $sel);
+    $sel.find('button').addClass('btn').addClass('btn-secondary');
     $sel.show();
 
     $(window).click(function () {
diff --git a/customize.dist/privacy.html b/customize.dist/privacy.html
index 244c382ee..1560b3d3f 100644
--- a/customize.dist/privacy.html
+++ b/customize.dist/privacy.html
@@ -6,6 +6,8 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
+    <script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
     <script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
     <script src="/bower_components/requirejs/require.js"></script>
     <script>
@@ -24,6 +26,7 @@
 
     <span class="slogan" data-localization="main_slogan"></span>
 
+    <span id="language-selector" class="right dropdown-bar"></span>
     <span class="right">
         <a href="/about.html" data-localization="about">About</a>
     </span>
@@ -39,12 +42,11 @@
 </div>
 
 
-    <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
+    <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 50px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
 <!-- Thanks! http://tholman.com/github-corners/ -->
 
 
 
-    <span id="language-selector" class="dropdown-bar"></span>
     <center>
         <noscript>
           <p>
diff --git a/customize.dist/src/fragments/fork.html b/customize.dist/src/fragments/fork.html
index 3c6773783..668c38648 100644
--- a/customize.dist/src/fragments/fork.html
+++ b/customize.dist/src/fragments/fork.html
@@ -1,3 +1,3 @@
-<a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
+<a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 50px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
 <!-- Thanks! http://tholman.com/github-corners/ -->
 
diff --git a/customize.dist/src/fragments/index.html b/customize.dist/src/fragments/index.html
index 37a5cba34..e73da7400 100644
--- a/customize.dist/src/fragments/index.html
+++ b/customize.dist/src/fragments/index.html
@@ -1,14 +1,19 @@
 <div id="main">
+    <div id="overlay"></div>
     <div id="data">
       <p class="left" data-localization="main_p1"><!-- Zero Knowledge collaborative realtime editor. Protected from the NSA. --></p>
 
-        <h5 id="tryit" data-localization="tryIt"></h5>
+        <center>
+          <h5 id="tryit" data-localization="tryIt"></h5>
+        </center>
 
         <div id="buttons" class="buttons">
-          <a id="create-pad" class="button create" href="/pad/" data-localization="button_newpad"></a><br/>
-          <a id="create-code" class="button create" href="/code/" data-localization="button_newcode"></a><br/>
-          <a id="create-poll" class="button create" href="/poll/" data-localization="button_newpoll"></a><br/>
-          <a id="create-slide" class="button create" href="/slide/" data-localization="button_newslide"></a>
+            <a id="create-pad" href="/pad/"><button class="btn btn-secondary" data-localization="button_newpad"></button></a>
+            <a id="create-code" href="/code/"><button class="btn btn-secondary" data-localization="button_newcode"></button></a>
+            <a id="create-poll" href="/poll/"><button class="btn btn-secondary" data-localization="button_newpoll"></button></a>
+            <a id="create-slide" href="/slide/"><button class="btn btn-secondary" data-localization="button_newslide"></button></a>
+            <br>
+            <button class="btn btn-default nologin" data-localization="login_nologin"></button>
         </div>
 
     </div>
@@ -25,9 +30,7 @@
 
         <input type="checkbox" id="rememberme" checked="checked"><label for="rememberme" data-localization="login_remember"></label><br>
         <br>
-        <button class="create button login half first" data-localization="login_login"></button> <button class="create button register half" data-localization="login_register"></button><br>
-        <button class="create button nologin" data-localization="login_nologin"></button>
-
+        <button class="btn btn-secondary login half first" data-localization="login_login"></button> <button class="btn btn-primary register half" data-localization="login_register"></button><br>
     </div>
 </div>
 
diff --git a/customize.dist/src/fragments/topbar.html b/customize.dist/src/fragments/topbar.html
index a3544c051..b9185804f 100644
--- a/customize.dist/src/fragments/topbar.html
+++ b/customize.dist/src/fragments/topbar.html
@@ -7,6 +7,7 @@
 
     <span class="slogan" data-localization="main_slogan"></span>
 
+    <span id="language-selector" class="right dropdown-bar"></span>
     <span class="right">
         <a href="/about.html" data-localization="about">About</a>
     </span>
diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less
index 2f06decbf..0ce6af9c9 100644
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -17,13 +17,13 @@ html.cp, .cp body {
 }
 
 .cp:not(.poll) {
-    #language-selector {
+    /*#language-selector {
         position: absolute;
-        top: 80px;
+        top: @topbar-height;
         right: 0px;
         display: inline-block;
         z-index: 2;
-    }
+    }*/
 }
 
 .cp {
@@ -144,16 +144,31 @@ body.html {
         background: red;
     }
 
+.btn-default {
+    &:hover {
+        background-color: #d8d8d8;
+    }
+}
 #main {
-    background-image: url('/customize/bg.jpg');
+    background-image: url('/customize/bg2.jpg');
     background-size: cover;
+    background-position: center center;
 }
 #main, #main_other {
+    #overlay {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: #000;
+        opacity: 0.2;
+    }
     position: absolute;
     left: 0;
     right: 0;
     padding: 0 @main-border-width;
-    height: ~"calc(100vh - 80px)";
+    height: ~"calc(100vh - 50px)";
     margin: auto;
     //margin-top: 100px;
 
@@ -165,16 +180,20 @@ body.html {
             padding: 0;
         }
         h5 {
-            color: @topbar-color;
+            color: @main-color;
         }
-        color: @topbar-color;
+        color: @main-color;
         padding: 15px;
         box-sizing: border-box;
         position: absolute;
         top: 50%;
         transform: translateY(-50%);
         width: ~"calc(100% - 450px - 30vw)";
-        background-color: rgba(34, 177, 221, 0.8);
+//        background-color: @main-block-bg;
+
+        #tryit {
+            margin-top: 20px;
+        }
     }
 
     #userForm {
@@ -185,21 +204,19 @@ body.html {
         margin-left: 50px;
         display: inline-block;
         width: 400px;
-        background-color: rgba(34, 177, 221, 0.8);
+//        background-color: @main-block-bg;
         padding: 10px;
         box-sizing: border-box;
         font-family: lato, Helvetica, sans-serif;
-        color: @topbar-color;
+        color: @main-color;
 
         h1 {
-            color: black;
+            color: @main-color;
             padding: 0;
         }
 
         [type="text"], [type="password"] {
-            width: ~"calc(100% - 10px)";
-            height: 1.5em;
-            border-radius: 0;
+            width: 100%;
         }
 
         [type="checkbox"] {
@@ -209,21 +226,32 @@ body.html {
             margin-right: 5px;
         }
 
+        label {
+            margin-bottom: 0;
+            margin-top: 0.5em;
+        }
+
         button {
             width: 100%;
             margin: 2px 0px;
             text-transform: uppercase;
             cursor: pointer;
             &.half {
-                width: ~"calc(50% - 2px)";
-                &.first {
+                width: ~"calc(50% - 4px)";
+                &:not(.first) {
+                    float: right;
                 }
             }
         }
     }
 
     .buttons {
-        margin-top: 20px;
+        text-align: center;
+        button {
+            text-transform: uppercase;
+            cursor: pointer;
+            margin-top: 10px;
+        }
     }
 }
 
diff --git a/customize.dist/src/less/dropdown.less b/customize.dist/src/less/dropdown.less
index d45749fa3..478943207 100644
--- a/customize.dist/src/less/dropdown.less
+++ b/customize.dist/src/less/dropdown.less
@@ -26,7 +26,7 @@
         display: none;
         position: absolute;
         background-color: #f9f9f9;
-        min-width: 160px;
+        min-width: 200px;
         box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
         z-index: 1000;
 
diff --git a/customize.dist/src/less/topbar.less b/customize.dist/src/less/topbar.less
index fb5cc42a2..b08f2ec41 100644
--- a/customize.dist/src/less/topbar.less
+++ b/customize.dist/src/less/topbar.less
@@ -6,12 +6,12 @@
     top: 0;
     left: 0;
     right: 0;
-    height: 80px;
+    height: @topbar-height;
     color: @topbar-color;
     font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
     padding: 5px;
     box-sizing: border-box;
-    font-size: 40px;
+    font-size: 30px;
 
     &> span {
         vertical-align: middle;
@@ -19,37 +19,49 @@
         height: 100%;
     }
     .cryptpad-logo {
-        height: 70px;
+        height: 40px;
         vertical-align: middle;
     }
 
     .slogan {
         font-size: 20px;
         color: @topbar-color;
-        line-height: 70px;
+        line-height: 40px;
     }
 
     .gotoMain {
         color: @topbar-color;
-        height: 70px;
-        line-height: 70px;
+        height: 40px;
+        line-height: 40px;
+        &:hover {
+            text-decoration: none;
+            color: #558;
+        }
     }
 
     .right {
         float: right;
         font-size: 20px;
-        margin: 0px 5px;
-        background: @topbar-button-bg;
+        margin: 0px 10px;
+        line-height: 40px;
 
         a {
-            text-align: center;
+            font-weight: 500;
+            font-size: 0.75em;
+            color: #558;
+
+            &:hover {
+                text-decoration: none;
+                color: #000;
+            }
+/*            text-align: center;
             min-width: 100px;
             font-weight: bold;
             height: 70px;
             padding: 0 10px;
             line-height: 70px;
             display: inline-block;
-            color: @topbar-button-color;
+            color: @topbar-button-color;*/
         }
     }
 }
diff --git a/customize.dist/src/less/variables.less b/customize.dist/src/less/variables.less
index c79834a62..9f43fdff5 100644
--- a/customize.dist/src/less/variables.less
+++ b/customize.dist/src/less/variables.less
@@ -55,7 +55,11 @@
 @topbar-color: #000;
 @topbar-button-bg: #2E9AFE;
 @topbar-button-color: #fff;
+@topbar-height: 50px;
 
 @main-border-width: 15vw;
 @cp-darkblue: #3333ff;
 @cp-accent2: darken(@cp-darkblue, 20%);
+
+@main-block-bg: rgba(200, 200, 200, 0.3);
+@main-color: #fff;
diff --git a/customize.dist/src/template.html b/customize.dist/src/template.html
index d52a044b3..e53476738 100644
--- a/customize.dist/src/template.html
+++ b/customize.dist/src/template.html
@@ -6,6 +6,8 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
+    <script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
     <script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
     <script src="/bower_components/requirejs/require.js"></script>
     <script>
@@ -19,7 +21,6 @@
 
     {{fork}}
 
-    <span id="language-selector" class="dropdown-bar"></span>
 {{noscript}}
 
 {{main}}
diff --git a/customize.dist/terms.html b/customize.dist/terms.html
index abb25586c..226239225 100644
--- a/customize.dist/terms.html
+++ b/customize.dist/terms.html
@@ -6,6 +6,8 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
+    <script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
     <script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
     <script src="/bower_components/requirejs/require.js"></script>
     <script>
@@ -24,6 +26,7 @@
 
     <span class="slogan" data-localization="main_slogan"></span>
 
+    <span id="language-selector" class="right dropdown-bar"></span>
     <span class="right">
         <a href="/about.html" data-localization="about">About</a>
     </span>
@@ -39,12 +42,11 @@
 </div>
 
 
-    <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
+    <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 50px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
 <!-- Thanks! http://tholman.com/github-corners/ -->
 
 
 
-    <span id="language-selector" class="dropdown-bar"></span>
     <center>
         <noscript>
           <p>
diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css
index 86422fea8..572055def 100644
--- a/customize.dist/toolbar.css
+++ b/customize.dist/toolbar.css
@@ -13,7 +13,7 @@
   display: none;
   position: absolute;
   background-color: #f9f9f9;
-  min-width: 160px;
+  min-width: 200px;
   box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
   z-index: 1000;
 }
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index c0df35751..2f466f246 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -236,7 +236,7 @@ define(function () {
 
     // login
     out.login_login = "Log in";
-    out.login_nologin = "Use an anonymous session";
+    out.login_nologin = "Your browser's recent pads";
     out.login_register = "Sign up";
     out.logoutButton = "Log out";
 
@@ -273,7 +273,8 @@ define(function () {
 
     // index.html
 
-    out.main_p1 = 'CryptPad is the <strong>zero knowledge</strong> realtime collaborative editor.  Encryption carried out in your web browser protects the data from the server, the cloud, and the NSA.  The secret encryption key is stored in the URL <a href="https://en.wikipedia.org/wiki/Fragment_identifier">fragment identifier</a> which is never sent to the server but is available to javascript so by sharing the URL, you give authorization to others who want to participate.';
+    //out.main_p1 = 'CryptPad is the <strong>zero knowledge</strong> realtime collaborative editor.  Encryption carried out in your web browser protects the data from the server, the cloud, and the NSA.  The secret encryption key is stored in the URL <a href="https://en.wikipedia.org/wiki/Fragment_identifier">fragment identifier</a> which is never sent to the server but is available to javascript so by sharing the URL, you give authorization to others who want to participate.';
+    out.main_p1 = "Type quick documents with friends and colleagues.<br>With <strong>Zero Knowledge</strong> technology, the server doesn't know what you're doing.";
     out.main_p2 = 'This project uses the <a href="http://ckeditor.com/">CKEditor</a> Visual Editor, <a href="https://codemirror.net/">CodeMirror</a>, and the <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a> realtime engine.';
     out.main_howitworks = 'How It Works';
     out.main_howitworks_p1 = 'CryptPad uses a variant of the <a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> algorithm which is able to find distributed consensus using a <a href="https://bitcoin.org/bitcoin.pdf">Nakamoto Blockchain</a>, a construct popularized by <a href="https://en.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. This way the algorithm can avoid the need for a central server to resolve Operational Transform Edit Conflicts and without the need for resolving conflicts, the server can be kept unaware of the content which is being edited on the pad.';