diff --git a/customize.dist/loading.js b/customize.dist/loading.js
index 819e0d89d..59cba470c 100644
--- a/customize.dist/loading.js
+++ b/customize.dist/loading.js
@@ -1,279 +1,14 @@
 // bg #e7e7e7
 // blue #0087FF
 // text #3F4141
-define(['/customize/messages.js'], function (Messages) {
-    var loadingStyle = (function(){/*
-@font-face {
-  font-family: 'Open Sans';
-  src: url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.eot');
-  src: url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),
-       url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.woff') format('woff'),
-       url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.ttf') format('truetype'),
-       url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.svg#OpenSansRegular') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-
-#cp-loading {
-  visibility: visible;
-  position: fixed;
-  z-index: 10000000;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-  background-color: #e7e7e7;
-  color: #3F4141;
-  font-size: 1.3em;
-  line-height: 120%;
-  opacity: 1;
-  display: flex;
-  flex-flow: column;
-  justify-content: center;
-  align-items: center;
-  font: 20px 'Open Sans', 'Helvetica Neue', sans-serif !important;
-}
-#cp-loading.cp-loading-transparent {
-    background-color: rgba(231, 231, 231, 0.7);
-}
-#cp-loading.cp-loading-hidden {
-  opacity: 0;
-  visibility: hidden;
-  transition: opacity 0.75s, visibility 0s 0.75s;
-}
-#cp-loading .cp-loading-logo {
-    height: 300px;
-    width: 300px;
-    margin-top: 50px;
-    flex: 0 1 auto;
-    min-height: 0;
-    text-align: center;
-}
-#cp-loading .cp-loading-logo img {
-    max-width: 100%;
-    max-height: 100%;
-}
-#cp-loading .cp-loading-container {
-    width: 700px;
-    max-width: 90vw;
-    height: 236px;
-    max-height: calc(100vh - 20px);
-    margin: 50px;
-    flex-shrink: 0;
-    display: flex;
-    flex-flow: column;
-    align-items: center;
-}
-#cp-loading .cp-loading-cryptofist {
-  margin-left: auto;
-  margin-right: auto;
-  max-width: 90vw;
-  max-height: 300px;
-  width: auto;
-  height: auto;
-  margin-bottom: 2em;
-}
-@media screen and (max-width: 500px) {
-  #cp-loading {
-      font-size: 16px !important;
-  }
-  #cp-loading .cp-loading-container {
-      height: 206px;
-  }
-}
-@media screen and (max-height: 700px) {
-  #cp-loading {
-      font-size: 16px !important;
-  }
-  #cp-loading .cp-loading-container {
-      height: 206px;
-  }
-}
-@media screen and (max-height: 500px) {
-  #cp-loading .cp-loading-logo {
-      display: none;
-  }
-}
-#cp-loading-message {
-    background: #FFF;
-    padding: 20px;
-    width: 100%;
-    color: #3F4141;
-    text-align: left;
-    display: none;
-}
-
-#cp-loading-password-prompt p.cp-password-error {
-    color: white;
-    background: #9e0000;
-    padding: 5px;
-    margin-bottom: 15px;
-}
-#cp-loading-password-prompt .cp-password-info {
-    text-align: left;
-    margin-bottom: 15px;
-}
-#cp-loading-burn-after-reading .cp-password-info {
-    margin-bottom: 15px;
-}
-
-p.cp-password-info{
-    text-align: left;
-}
-#cp-loading-password-prompt .cp-password-form {
-    display: flex;
-    flex-wrap: wrap;
-}
-#cp-loading-password-prompt .cp-password-form button{
-    background-color: #4591c4;
-    color: white;
-    border: 1px solid #4591c4;
-}
-
-.cp-password-input{
-    font-size:16px;
-    border: 1px solid #4591c4;
-    background-color: white;
-    border-radius 0;
-}
-
-.cp-password-form button{
-    padding: 8px 12px;
-    font-weight: bold;
-    text-transform: uppercase;
-}
-
-#cp-loading-password-prompt .cp-password-form{
-    width: 100%;
-}
-
-#cp-loading-password-prompt .cp-password-form .cp-password-container {
-    flex-shrink: 1;
-    min-width: 0;
-}
-
-#cp-loading-password-prompt .cp-password-form .cp-password-container .cp-password-reveal{
-    color: #4591c4;
-    padding: 0px 24px;
-}
-
-#cp-loading-password-prompt .cp-password-form input {
-    flex: 1;
-    padding: 12px;
-    min-width: 0;
-    text-overflow: ellipsis;
-}
-#cp-loading-password-prompt .cp-password-form button:hover {
-    background-color: #326599;
-}
-#cp-loading-password-prompt ::placeholder {
-    color: #999999;
-    opacity: 1;
-}
-#cp-loading-password-prompt :-ms-input-placeholder {
-    color: #d9d9d9;
-}
-#cp-loading-password-prompt ::-ms-input-placeholder {
-    color: #d9d9d9;
-}
-#cp-loading .cp-loading-spinner-container {
-  position: relative;
-  height: 80px;
-  margin-bottom: 50px;
-}
-.cp-loading-progress {
-    width: 100%;
-    text-align: center;
-}
-.cp-loading-progress p {
-    margin: 5px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-.cp-loading-progress-list {
-    text-align: left;
-    display: inline-block;
-    margin-bottom: 50px;
-    max-width: 100%;
-}
-.cp-loading-progress-list ul {
-    list-style: none;
-    padding-left: 0;
-    margin: 0;
-}
-.cp-loading-progress-list li {
-    padding: 0px 5px;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.cp-loading-progress-list li i {
-    width: 22px;
-}
-.cp-loading-progress-list li span{
-    margin-left: 10px;
-}
-.cp-loading-progress-list li span.percent {
-    position: absolute;
-}
-
-.cp-loading-progress-bar {
-    height: 24px;
-    background: white;
-    border: 1px solid #0087FF;
-}
-.cp-loading-progress-bar-value {
-    height: 100%;
-    background: #0087FF;
-}
-
-@keyframes spin {
-    from {
-        transform: rotate(0deg);
-    }
-    to {
-        transform: rotate(1800deg);
-    }
-}
-
-.cp-spinner {
-    display: inline-block;
-    box-sizing: border-box;
-    width: 80px;
-    height: 80px;
-    border: 11px solid #999999;
-    border-radius: 50%;
-    border-top-color: transparent;
-    animation: spin infinite 3s;
-    animation-timing-function: cubic-bezier(.6,0.15,0.4,0.85);
-}
-
-button:not(.btn).primary{
-    border: 1px solid #4591c4;
-    padding: 8px 12px;
-    text-transform: uppercase;
-    background-color: #4591c4;
-    color: white;
-    font-weight: bold;
-}
-
-button:not(.btn).primary:hover{
-    background-color: rgb(52, 118, 162);
-}
-
-*/}).toString().slice(14, -3);
+define([
+    '/customize/messages.js',
+    'less!/customize/src/less2/include/loading.less'
+], function (Messages) {
     var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });
     var elem = document.createElement('div');
     elem.setAttribute('id', 'cp-loading');
     elem.innerHTML = [
-        '<style>',
-        loadingStyle,
-        '</style>',
         '<div class="cp-loading-logo">',
             '<img class="cp-loading-cryptofist" src="/customize/CryptPad_logo.svg?' + urlArgs + '">',
         '</div>',
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 2982ed374..aec174310 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -131,13 +131,23 @@
 @cryptpad_color_light_blue: #00b7d8;
 @cryptpad_color_lighter_blue: #d2e1f2;
 @cryptpad_color_warn_red: #eb675e;
+@cryptpad_color_dark_red: #9e0000;
 @cryptpad_color_black: #000;
 @cryptpad_color_white: #FFF;
 @cryptpad_color_green: #5cb85c;
 
 @cryptpad_color_link: #0275D8;
 
+// Loading screen
 @cp_loading-bg: #E7E7E7;
+@cp_loading-fg: @cryptpad_text_col;
+@cp_loading-msg-bg: @cryptpad_color_white;
+@cp_loading-error-bg: @cryptpad_color_dark_red;
+@cp_loading-error-fg: @cryptpad_color_white;
+@cp_loading-progress-bg: @cryptpad_color_white;
+@cp_loading-progress-bar-bg: @colortheme_logo-2;
+@cp_loading-spinner: @cryptpad_color_dark_grey;
+
 
 // Alertify
 @cp_alertify-bg: @cryptpad_color_white;
diff --git a/www/common/LessLoader.js b/www/common/LessLoader.js
index 796004429..9ad5e8cc5 100644
--- a/www/common/LessLoader.js
+++ b/www/common/LessLoader.js
@@ -95,7 +95,7 @@ define([
 
     var COLORTHEME = '/customize/src/less2/include/colortheme.less';
     var COLORTHEME_DARK = '/customize/src/less2/include/colortheme-dark.less';
-    //COLORTHEME_DARK = '/customize/src/less2/include/colortheme.less'; // XXX
+    COLORTHEME_DARK = '/customize/src/less2/include/colortheme.less'; // XXX
     var getColortheme = function () {
         return window.CryptPad_theme;
     };
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index f1d8ae78c..924cf84fa 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2546,7 +2546,7 @@ define([
         var info = h('p.cp-password-info', Messages.password_info);
         var password = UI.passwordInput({placeholder: Messages.password_placeholder});
         var $password = $(password);
-        var button = h('button', Messages.password_submit);
+        var button = h('button.btn.btn-primary', Messages.password_submit);
         cfg = cfg || {};
 
         if (cfg.value && !isError) {
@@ -2587,7 +2587,7 @@ define([
 
     UIElements.displayBurnAfterReadingPage = function (common, cb) {
         var info = h('p.cp-password-info', Messages.burnAfterReading_warningAccess);
-        var button = h('button.primary', Messages.burnAfterReading_proceed);
+        var button = h('button.btn.primary', Messages.burnAfterReading_proceed);
 
         $(button).on('click', function () {
             cb();