diff --git a/customize.dist/src/outer.css b/customize.dist/src/outer.css
index ba35bf168..564dc8472 100644
--- a/customize.dist/src/outer.css
+++ b/customize.dist/src/outer.css
@@ -7,7 +7,7 @@ html, body {
         background: black;
     }
 }
-#sbox-iframe, #sbox-secure-iframe {
+iframe-placeholder, #sbox-iframe, #sbox-secure-iframe {
     position: fixed;
     top:0; left:0;
     bottom:0; right:0;
diff --git a/www/admin/index.html b/www/admin/index.html
index 959d7b9e8..96a3cce86 100644
--- a/www/admin/index.html
+++ b/www/admin/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/code/index.html b/www/code/index.html
index ab7b9352b..f4f11aef9 100644
--- a/www/code/index.html
+++ b/www/code/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/common/boot2.js b/www/common/boot2.js
index 24a853251..ebbd53e12 100644
--- a/www/common/boot2.js
+++ b/www/common/boot2.js
@@ -14,6 +14,7 @@ try {
     var os = isDarkOS() ? 'dark' : 'light';
     var key = 'CRYPTPAD_STORE|colortheme';
     window.CryptPad_theme = localStorage[key] || os;
+    console.error(localStorage[key], os);
     if (!localStorage[key]) {
         // We're using OS theme, check if we need to change
         if (os !== localStorage[key+'_default']) {
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index b3540c7e6..65a912bce 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -33,9 +33,11 @@ define([
             }
         }
 
-        document.getElementById('sbox-iframe').setAttribute('src',
+
+        var $i = $('<iframe>').attr('id', 'sbox-iframe').attr('src',
             ApiConfig.httpSafeOrigin + (pathname || window.location.pathname) + 'inner.html?' +
                 requireConfig.urlArgs + '#' + encodeURIComponent(JSON.stringify(req)));
+        $('iframe-placeholder').after($i).remove();
 
         // This is a cheap trick to avoid loading sframe-channel in parallel with the
         // loading screen setup.
diff --git a/www/contacts/index.html b/www/contacts/index.html
index 959d7b9e8..96a3cce86 100644
--- a/www/contacts/index.html
+++ b/www/contacts/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/debug/index.html b/www/debug/index.html
index 959d7b9e8..18eb3b5e2 100644
--- a/www/debug/index.html
+++ b/www/debug/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.3" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/debug/main.js b/www/debug/main.js
index af3d78a57..52aac942f 100644
--- a/www/debug/main.js
+++ b/www/debug/main.js
@@ -30,30 +30,6 @@ define([
         $(waitFor());
     }).nThen(function (waitFor) {
         SFCommonO.initIframe(waitFor);
-    }).nThen(function (waitFor) {
-        var req = {
-            cfg: requireConfig,
-            req: [ '/common/loading.js' ],
-            pfx: window.location.origin
-        };
-        window.rc = requireConfig;
-        window.apiconf = ApiConfig;
-        $('#sbox-iframe').attr('src',
-            ApiConfig.httpSafeOrigin + '/debug/inner.html?' + requireConfig.urlArgs +
-                '#' + encodeURIComponent(JSON.stringify(req)));
-
-        // This is a cheap trick to avoid loading sframe-channel in parallel with the
-        // loading screen setup.
-        var done = waitFor();
-        var onMsg = function (msg) {
-            var data = JSON.parse(msg.data);
-            if (data.q !== 'READY') { return; }
-            window.removeEventListener('message', onMsg);
-            var _done = done;
-            done = function () { };
-            _done();
-        };
-        window.addEventListener('message', onMsg);
     }).nThen(function (/*waitFor*/) {
         var hash = localStorage[Constants.userHashKey] || localStorage[Constants.fileHashKey];
         var drive = hash && ('#'+hash === window.location.hash);
diff --git a/www/drive/index.html b/www/drive/index.html
index 959d7b9e8..96a3cce86 100644
--- a/www/drive/index.html
+++ b/www/drive/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/file/index.html b/www/file/index.html
index 959d7b9e8..96a3cce86 100644
--- a/www/file/index.html
+++ b/www/file/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/kanban/index.html b/www/kanban/index.html
index 86eb0f201..c2076f8e5 100644
--- a/www/kanban/index.html
+++ b/www/kanban/index.html
@@ -7,11 +7,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 
 <body>
-    <iframe id="sbox-iframe">
+    <iframe-placeholder>
     </iframe>
 </body>
 </html>
diff --git a/www/notifications/index.html b/www/notifications/index.html
index 959d7b9e8..96a3cce86 100644
--- a/www/notifications/index.html
+++ b/www/notifications/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/oodoc/index.html b/www/oodoc/index.html
index cd51e2503..321b16709 100644
--- a/www/oodoc/index.html
+++ b/www/oodoc/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/ooslide/index.html b/www/ooslide/index.html
index cd51e2503..321b16709 100644
--- a/www/ooslide/index.html
+++ b/www/ooslide/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/pad/index.html b/www/pad/index.html
index 536b34e33..a370d0536 100644
--- a/www/pad/index.html
+++ b/www/pad/index.html
@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
 
diff --git a/www/poll/index.html b/www/poll/index.html
index 959d7b9e8..96a3cce86 100644
--- a/www/poll/index.html
+++ b/www/poll/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/profile/index.html b/www/profile/index.html
index 959d7b9e8..96a3cce86 100644
--- a/www/profile/index.html
+++ b/www/profile/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/settings/index.html b/www/settings/index.html
index 959d7b9e8..96a3cce86 100644
--- a/www/settings/index.html
+++ b/www/settings/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/sheet/index.html b/www/sheet/index.html
index cd51e2503..321b16709 100644
--- a/www/sheet/index.html
+++ b/www/sheet/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/slide/index.html b/www/slide/index.html
index ab7b9352b..f4f11aef9 100644
--- a/www/slide/index.html
+++ b/www/slide/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/support/index.html b/www/support/index.html
index 959d7b9e8..96a3cce86 100644
--- a/www/support/index.html
+++ b/www/support/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/teams/index.html b/www/teams/index.html
index 959d7b9e8..96a3cce86 100644
--- a/www/teams/index.html
+++ b/www/teams/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/todo/index.html b/www/todo/index.html
index 959d7b9e8..96a3cce86 100644
--- a/www/todo/index.html
+++ b/www/todo/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/whiteboard/index.html b/www/whiteboard/index.html
index ab7b9352b..f4f11aef9 100644
--- a/www/whiteboard/index.html
+++ b/www/whiteboard/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="referrer" content="no-referrer" />
     <script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css">
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
diff --git a/www/worker/index.html b/www/worker/index.html
index e3f7eacc4..cc6bd3ff0 100644
--- a/www/worker/index.html
+++ b/www/worker/index.html
@@ -35,4 +35,4 @@
     </style>
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe-placeholder>
