diff --git a/customize.dist/about.html b/customize.dist/about.html
index 9b5fd5fca..626b6bb95 100644
--- a/customize.dist/about.html
+++ b/customize.dist/about.html
@@ -19,6 +19,8 @@
 
 
 
+    <select id="language-selector" style="display: none;"></select>
+
     <div id="main">
       <center>
           <a href="/"><img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" /></a>
diff --git a/customize.dist/index.html b/customize.dist/index.html
index aa1d5d6ac..5a0b9ec9d 100644
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@@ -19,6 +19,8 @@
 
 
 
+    <select id="language-selector" style="display: none;"></select>
+
     <div id="main">
       <center>
           <a href="/"><img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" /></a>
diff --git a/customize.dist/main.js b/customize.dist/main.js
index af0afa95b..227fa2df3 100644
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@@ -1,11 +1,12 @@
 define([
     '/customize/messages.js',
-    '/customize/DecorateToolbar.js',
+    //'/customize/DecorateToolbar.js',
     '/customize/application_config.js',
     '/common/cryptpad-common.js',
     '/bower_components/lil-uri/uri.min.js',
+    '/customize/languageSelector.js',
     '/bower_components/jquery/dist/jquery.min.js',
-], function (Messages, DecorateToolbar, Config, Cryptpad, LilUri) {
+], function (Messages, Config, Cryptpad, LilUri, LS) {
     var $ = window.$;
 
     var APP = window.APP = {
@@ -34,6 +35,18 @@ define([
         });
     };
 
+    var $sel = $('#language-selector');
+
+    Object.keys(Messages._languages).forEach(function (code) {
+        $sel.append($('<option>', {
+            value: code,
+        }).text(Messages._languages[code]));
+    });
+
+    LS.main();
+    Messages._applyTranslation();
+    $sel.show();
+
     var makeRecentPadsTable = function (recentPads) {
         if (!recentPads.length) { return; }
 
diff --git a/customize.dist/privacy.html b/customize.dist/privacy.html
index 0f553287f..cbde851e7 100644
--- a/customize.dist/privacy.html
+++ b/customize.dist/privacy.html
@@ -19,6 +19,8 @@
 
 
 
+    <select id="language-selector" style="display: none;"></select>
+
     <div id="main">
       <center>
           <a href="/"><img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" /></a>
@@ -71,8 +73,6 @@
     <br />
 
 
-
-
     </div>
 </body>
 </html>
diff --git a/customize.dist/src/template.html b/customize.dist/src/template.html
index 22013b85f..256c2661f 100644
--- a/customize.dist/src/template.html
+++ b/customize.dist/src/template.html
@@ -16,6 +16,8 @@
 <body>
     {{fork}}
 
+    <select id="language-selector" style="display: none;"></select>
+
     <div id="main">
 {{logo}}
 
diff --git a/customize.dist/terms.html b/customize.dist/terms.html
index 61762b33f..e1c3f8329 100644
--- a/customize.dist/terms.html
+++ b/customize.dist/terms.html
@@ -19,6 +19,8 @@
 
 
 
+    <select id="language-selector" style="display: none;"></select>
+
     <div id="main">
       <center>
           <a href="/"><img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" /></a>
