diff --git a/customize.dist/src/less/mixins.less b/customize.dist/src/less/mixins.less
index 68cca3cb4..a75fa4e30 100644
--- a/customize.dist/src/less/mixins.less
+++ b/customize.dist/src/less/mixins.less
@@ -1,4 +1,5 @@
 @import "/customize/src/less/variables.less";
+@import (once) "/customize/src/less2/include/tools.less";
 
 .fontface(@family, @src, @style: normal, @weight: 400, @fmt: 'truetype'){
     @font-face {
@@ -39,26 +40,6 @@
     background: linear-gradient(@start, @end); /* Standard syntax */
 }
 
-.placeholderColor (@color) {
-    &::-webkit-input-placeholder { /* WebKit, Blink, Edge */
-        color: @color;;
-    }
-    &:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-        color: @color;
-        opacity: 1;
-    }
-    &::-moz-placeholder { /* Mozilla Firefox 19+ */
-        color: @color;
-        opacity: 1;
-    }
-    &:-ms-input-placeholder { /* Internet Explorer 10-11 */
-        color: @color;
-    }
-    &::-ms-input-placeholder { /* Microsoft Edge */
-        color: @color;
-    }
-}
-
 .avatar (@width) {
     &.avatar {
     overflow: hidden;
@@ -83,7 +64,7 @@
         box-sizing: content-box;
     }
     .default {
-        .unselectable();
+        .tools_unselectable();
         background: white;
         color: black;
         font-size: @width/1.2;
@@ -122,7 +103,7 @@
 }
 
 .leftsideCategory {
-    .unselectable();
+    .tools_unselectable();
     padding: 5px 20px;
     margin: 15px 0;
     cursor: pointer;
diff --git a/customize.dist/src/less/sidebar-layout.less b/customize.dist/src/less/sidebar-layout.less
index d16d9c019..47e4e86f9 100644
--- a/customize.dist/src/less/sidebar-layout.less
+++ b/customize.dist/src/less/sidebar-layout.less
@@ -1,10 +1,11 @@
 @import '/customize/src/less/variables.less';
 @import '/customize/src/less/mixins.less';
+@import (once) "/customize/src/less2/include/colortheme.less";
 
-@leftside-bg: #eee;
-@leftside-color: #000;
-@rightside-color: #000;
-@description-color: #777;
+@leftside-bg: @colortheme_sidebar-left-bg;
+@leftside-color: @colortheme_sidebar-left-fg;
+@rightside-color: @colortheme_sidebar-right-fg;
+@description-color: @colortheme_sidebar-description;
 
 @button-width: 400px;
 
diff --git a/customize.dist/src/less2/include/avatar.less b/customize.dist/src/less2/include/avatar.less
index 0ca0d0fa1..b935db786 100644
--- a/customize.dist/src/less2/include/avatar.less
+++ b/customize.dist/src/less2/include/avatar.less
@@ -1,3 +1,5 @@
+@import (once) "./tools.less";
+
 .avatar_main (@width) {
     &.cp-avatar {
     overflow: hidden;
@@ -16,7 +18,7 @@
         box-sizing: content-box;
     }
     .cp-avatar-default {
-        .unselectable();
+        .tools_unselectable();
         background: white;
         color: black;
         font-size: @width/1.2;
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 53d97649a..e5e57cc74 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -75,6 +75,16 @@
 @colortheme_todo-bg: #7bccd1;
 @colortheme_todo-color: #000;
 
+// Sidebar layout
+@colortheme_sidebar-active: #fff;
+@colortheme_sidebar-left-bg: #eee;
+@colortheme_sidebar-left-fg: #000;
+@colortheme_sidebar-left-branch: #888;
+@colortheme_sidebar-right-bg: #fff;
+@colortheme_sidebar-right-fg: #000;
+@colortheme_sidebar-description: #777;
+
+
 @cryptpad_color_blue: #4591C4; 
 @cryptpad_color_grey: #999999;
 @cryptpad_header_col: #1E1F1F;
diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less
index b6a7bcbeb..6593b926e 100644
--- a/customize.dist/src/less2/include/dropdown.less
+++ b/customize.dist/src/less2/include/dropdown.less
@@ -1,4 +1,5 @@
 @import (once) "./colortheme.less";
+@import (once) "./tools.less";
 
 /* The container <div> - needed to position the dropdown content */
 .dropdown_main () {
@@ -17,7 +18,7 @@
                 margin-left: 5px;
             }
             * {
-                .unselectable();
+                .tools_unselectable();
                 cursor: default;
             }
         }
diff --git a/customize.dist/src/less2/include/leftside-menu.less b/customize.dist/src/less2/include/leftside-menu.less
new file mode 100644
index 000000000..3211fb3a9
--- /dev/null
+++ b/customize.dist/src/less2/include/leftside-menu.less
@@ -0,0 +1,23 @@
+@import (once) "./unselectable.less";
+@import (once) "./variables.less";
+@import (once) "./colortheme.less";
+
+.leftside-menu_main() {
+}
+.leftside-menu-category_main() {
+    .unselectable_make();
+    padding: 5px 20px;
+    margin: 15px 0;
+    cursor: pointer;
+    height: @variables_bar-height;
+    line-height: @variables_bar-height - 10px;
+    .fa {
+        width: 25px;
+    }
+    &:hover {
+        background: rgba(0,0,0,0.05);
+    }
+    &.cp-leftside-active {
+        background: @colortheme_sidebar-active;
+    }
+}
diff --git a/customize.dist/src/less2/include/limit-bar.less b/customize.dist/src/less2/include/limit-bar.less
new file mode 100644
index 000000000..efca7811d
--- /dev/null
+++ b/customize.dist/src/less2/include/limit-bar.less
@@ -0,0 +1,58 @@
+@import (once) "./colortheme.less";
+
+.limit-bar_main () {
+    .cp-limit-container {
+        @colortheme_green: #5cb85c;
+        display: inline-flex;
+        flex-flow: column-reverse;
+        width: 100%;
+        margin-top: 20px;
+        .cp-limit-bar {
+            display: inline-block;
+            max-width: 100%;
+            margin: 3px;
+            box-sizing: border-box;
+            border: 1px solid #999;
+            background: white;
+            position: relative;
+            text-align: center;
+            vertical-align: middle;
+            width: ~"calc(100% - 6px)";
+            height: 25px;
+            line-height: 25px;
+            overflow: hidden;
+            .cp-limit-usage {
+                height: 100%;
+                display: inline-block;
+                background: blue;
+                position: absolute;
+                left: 0;
+                z-index:1; // .usage
+                &.cp-limit-usage-normal {
+                    background: @colortheme_green;
+                }
+                &.cp-limit-usage-warning {
+                    background: orange;
+                }
+                &.cp-limit-usage-above {
+                    background: red;
+                }
+            }
+            .cp-limit-usage-text {
+                position: relative;
+                color: black;
+                text-shadow: 1px 0 2px white, 0 1px 2px white, -1px 0 2px white, 0 -1px 2px white;
+                z-index: 2; // .usageText
+                font-size: @colortheme_app-font-size;
+                font-weight: bold;
+            }
+        }
+        .cp-limit-upgrade {
+            padding: 0;
+            line-height: 25px;
+            height: 25px;
+            margin: 0 3px;
+            border-radius: 0;
+        }
+    }
+}
diff --git a/customize.dist/src/less2/include/tokenfield.less b/customize.dist/src/less2/include/tokenfield.less
index da048b2fe..5dcea83ec 100644
--- a/customize.dist/src/less2/include/tokenfield.less
+++ b/customize.dist/src/less2/include/tokenfield.less
@@ -1,15 +1,8 @@
+@import (once) "./tools.less";
+
 .tokenfield_main () {
     .tokenfield {
-        .unselectable () {
-            -webkit-touch-callout: none;
-            -webkit-user-select: none;
-            -khtml-user-select: none;
-            -moz-user-select: none;
-            -ms-user-select: none;
-            user-select: none;
-        }
-
-        .unselectable();
+        .tools_unselectable();
         height: auto;
         min-height: 34px;
         padding-bottom: 0px;
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index d4b6fcebf..2d49da6b2 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -5,6 +5,7 @@
 @import (once) "./avatar.less";
 @import (once) "./toolbar-history.less";
 @import (once) "./icon-colors.less";
+@import (once) "./tools.less";
 
 
 .toolbar_main () {
@@ -13,15 +14,6 @@
     @toolbar_top-height: 64px;
     @toolbar_button-font: @colortheme_app-font;
 
-    .unselectable () {
-        -webkit-touch-callout: none;
-        -webkit-user-select: none;
-        -khtml-user-select: none;
-        -moz-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
-    }
-
     .dropdown_main();
     .ckeditor_fix();
     .history_main();
@@ -270,7 +262,7 @@
             font-family: FontAwesome;
         }
 
-        .unselectable();
+        .tools_unselectable();
 
         font: @toolbar_button-font;
         width: 100%;
@@ -289,7 +281,7 @@
 
         button {
             transition: all 0.15s;
-            .unselectable();
+            .tools_unselectable();
             &.cp-toolbar-hidden {
                 display: none;
             }
diff --git a/customize.dist/src/less2/include/tools.less b/customize.dist/src/less2/include/tools.less
new file mode 100644
index 000000000..9fd2df5bc
--- /dev/null
+++ b/customize.dist/src/less2/include/tools.less
@@ -0,0 +1,27 @@
+.tools_placeholder-color (@color) {
+    &::-webkit-input-placeholder { /* WebKit, Blink, Edge */
+        color: @color;;
+    }
+    &:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+        color: @color;
+        opacity: 1;
+    }
+    &::-moz-placeholder { /* Mozilla Firefox 19+ */
+        color: @color;
+        opacity: 1;
+    }
+    &:-ms-input-placeholder { /* Internet Explorer 10-11 */
+        color: @color;
+    }
+    &::-ms-input-placeholder { /* Microsoft Edge */
+        color: @color;
+    }
+}
+
+.tools_unselectable () {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+}
diff --git a/customize.dist/src/less2/include/unselectable.less b/customize.dist/src/less2/include/unselectable.less
new file mode 100644
index 000000000..30223128b
--- /dev/null
+++ b/customize.dist/src/less2/include/unselectable.less
@@ -0,0 +1,13 @@
+.unselectable_make() {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+}
+
+.unselectable_main() {
+    .cp-unselectable {
+        .unselectable_make();
+    }
+}
diff --git a/customize.dist/src/less2/include/variables.less b/customize.dist/src/less2/include/variables.less
new file mode 100644
index 000000000..3aee02492
--- /dev/null
+++ b/customize.dist/src/less2/include/variables.less
@@ -0,0 +1,3 @@
+// Elements size
+@variables_bar-height: 32px;
+
diff --git a/customize.dist/src/less2/main.less b/customize.dist/src/less2/main.less
index b2f32baec..ed0d0bd0d 100644
--- a/customize.dist/src/less2/main.less
+++ b/customize.dist/src/less2/main.less
@@ -22,6 +22,7 @@ html.cp-app-print {
     .app-print_main();
 }
 
+body.cp-app-drive { @import "../../../newdrive/app-drive.less"; }
 body.cp-app-pad { @import "../../../pad/app-pad.less"; }
 body.cp-app-code { @import "../../../code/app-code.less"; }
 body.cp-app-slide { @import "../../../slide/app-slide.less"; }
diff --git a/www/code/inner.html b/www/code/inner.html
index 2ac5b56f8..5d914b6c8 100644
--- a/www/code/inner.html
+++ b/www/code/inner.html
@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/code/inner.js" data-main="/common/sframe-boot.js?ver=1.5" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/code/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
         #editor1 { display: none; }
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index a02badebf..f85aec474 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -253,7 +253,7 @@ define([
             stopListening(listener);
             cb();
         });
-        listener = listenForKeys(close, close);
+        listener = listenForKeys(close, close, ok);
         var $ok = $(ok).click(close);
 
         document.body.appendChild(frame);
@@ -302,7 +302,7 @@ define([
             $ok.click();
         }, function () { // no
             $cancel.click();
-        });
+        }, input);
 
         document.body.appendChild(frame);
         setTimeout(function () {
@@ -350,7 +350,7 @@ define([
             $ok.click();
         }, function () {
             $cancel.click();
-        });
+        }, ok);
 
         document.body.appendChild(frame);
         setTimeout(function () {
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 1d169cd87..863d97d07 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -2236,6 +2236,46 @@ define([
                 }
                 $iframe.load(w2); //cb);
             }
+        }).nThen(function (waitFor) {
+            if (sessionStorage.createReadme) {
+                var w = waitFor();
+                require(['/common/cryptget.js'], function (Crypt) {
+                    var hash = common.createRandomHash();
+                    Crypt.put(hash, Messages.driveReadme, function (e) {
+                        if (e) {
+                            console.error("Error while creating the default pad:", e);
+                            return void w();
+                        }
+                        var href = '/pad/#' + hash;
+                        var data = {
+                            href: href,
+                            title: Messages.driveReadmeTitle,
+                            atime: new Date().toISOString(),
+                            ctime: new Date().toISOString()
+                        };
+                        common.getFO().pushData(data, function (e, id) {
+                            if (e) {
+                                console.error("Error while creating the default pad:", e);
+                                return void w();
+                            }
+                            common.getFO().add(id);
+                            w();
+                        });
+                    });
+                    delete sessionStorage.createReadme;
+                });
+            }
+        }).nThen(function (waitFor) {
+            if (sessionStorage.migrateAnonDrive) {
+                var w = waitFor();
+                require(['/common/mergeDrive.js'], function (Merge) {
+                    var hash = localStorage.FS_hash;
+                    Merge.anonDriveIntoUser(getStore().getProxy(), hash, function () {
+                        delete sessionStorage.migrateAnonDrive;
+                        w();
+                    });
+                });
+            }
         }).nThen(function () {
             updateLocalVersion();
             common.addTooltips();
diff --git a/www/common/fsStore.js b/www/common/fsStore.js
index 5a8e0becb..f24409d8b 100644
--- a/www/common/fsStore.js
+++ b/www/common/fsStore.js
@@ -4,7 +4,7 @@ define([
     '/bower_components/chainpad-crypto/crypto.js?v=0.1.5',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/common/userObject.js',
-    '/common/migrate-user-object.js'
+    '/common/migrate-user-object.js',
 ], function ($, Listmap, Crypto, TextPatcher, FO, Migrate) {
     /*
         This module uses localStorage, which is synchronous, but exposes an
@@ -196,11 +196,11 @@ define([
 
             Migrate(proxy, Cryptpad);
 
-            //storeObj = proxy;
             store = initStore(fo, proxy, exp);
             if (typeof(f) === 'function') {
                 f(void 0, store);
             }
+            //storeObj = proxy;
 
             var requestLogin = function () {
                 // log out so that you don't go into an endless loop...
diff --git a/www/common/mergeDrive.js b/www/common/mergeDrive.js
index 0cbe312bf..1a5fb5f29 100644
--- a/www/common/mergeDrive.js
+++ b/www/common/mergeDrive.js
@@ -83,9 +83,9 @@ define([
         });
     };
 
-    exp.anonDriveIntoUser = function (proxy, cb) {
+    exp.anonDriveIntoUser = function (proxyData, fsHash, cb) {
         // Make sure we have an FS_hash and we don't use it, otherwise just stop the migration and cb
-        if (!localStorage.FS_hash || !Cryptpad.isLoggedIn()) {
+        if (!fsHash || !Cryptpad.isLoggedIn()) {
             if (typeof(cb) === "function") { return void cb(); }
         }
         // Get the content of FS_hash and then merge the objects, remove the migration key and cb
@@ -102,13 +102,13 @@ define([
                 return;
             }
             if (parsed) {
+                var proxy = proxyData.proxy;
                 var oldFo = FO.init(parsed.drive, {
                     Cryptpad: Cryptpad
                 });
                 var onMigrated = function () {
                     oldFo.fixFiles();
-                    var newData = Cryptpad.getStore().getProxy();
-                    var newFo = newData.fo;
+                    var newFo = proxyData.fo;
                     var oldRecentPads = parsed.drive[newFo.FILES_DATA];
                     var newRecentPads = proxy.drive[newFo.FILES_DATA];
                     var oldFiles = oldFo.getFiles([newFo.FILES_DATA]);
@@ -152,7 +152,7 @@ define([
                     if (!proxy.FS_hashes || !Array.isArray(proxy.FS_hashes)) {
                         proxy.FS_hashes = [];
                     }
-                    proxy.FS_hashes.push(localStorage.FS_hash);
+                    proxy.FS_hashes.push(fsHash);
                     if (typeof(cb) === "function") { cb(); }
                 };
                 oldFo.migrate(onMigrated);
@@ -160,7 +160,7 @@ define([
             }
             if (typeof(cb) === "function") { cb(); }
         };
-        Crypt.get(localStorage.FS_hash, todo);
+        Crypt.get(fsHash, todo);
     };
 
     return exp;
diff --git a/www/common/metadata-manager.js b/www/common/metadata-manager.js
index 5299634fb..1c8994d00 100644
--- a/www/common/metadata-manager.js
+++ b/www/common/metadata-manager.js
@@ -73,7 +73,6 @@ define(['json.sortify'], function (Sortify) {
             });
         };
 
-        console.log('here register');
         sframeChan.on('EV_METADATA_UPDATE', function (ev) {
             meta = ev;
             if (ev.priv) {
diff --git a/www/common/sframe-boot.js b/www/common/sframe-boot.js
index bb97ac36b..43b424624 100644
--- a/www/common/sframe-boot.js
+++ b/www/common/sframe-boot.js
@@ -42,6 +42,25 @@ var afterLoaded = function (req) {
             updated: updated,
             cache: data.cache
         };
+        data.localStore = data.localStore || {};
+        var lsUpdated = {};
+        window.cryptpadStore = {
+            get: function (k, cb) {
+                setTimeout(function () { cb(data.localStore[k]); });
+            },
+            getAll: function (cb) {
+                setTimeout(function () {
+                    cb(JSON.parse(JSON.stringify(data.localStore)));
+                });
+            },
+            put: function (k, v, cb) {
+                cb = cb || function () { };
+                lsUpdated[k] = v;
+                setTimeout(function () { data.localStore[k] = v; cb(); });
+            },
+            updated: lsUpdated,
+            store: data.localStore
+        };
         window.cryptpadLanguage = data.language;
         require(['/common/sframe-boot2.js'], function () { });
     };
diff --git a/www/common/sframe-common-interface.js b/www/common/sframe-common-interface.js
index eaf5fc40c..7c8aa2b10 100644
--- a/www/common/sframe-common-interface.js
+++ b/www/common/sframe-common-interface.js
@@ -1,12 +1,14 @@
 define([
     'jquery',
+    '/api/config',
     '/common/cryptpad-common.js',
+    '/common/common-util.js',
     '/common/media-tag.js',
     '/common/tippy.min.js',
     '/customize/application_config.js',
 
     'css!/common/tippy.css',
-], function ($, Cryptpad, MediaTag, Tippy, AppConfig) {
+], function ($, Config, Cryptpad, Util, MediaTag, Tippy, AppConfig) {
     var UI = {};
     var Messages = Cryptpad.Messages;
 
@@ -291,6 +293,103 @@ define([
         }
     };
 
+    /*  Create a usage bar which keeps track of how much storage space is used
+        by your CryptDrive. The getPinnedUsage RPC is one of the heavier calls,
+        so we throttle its usage. Clients will not update more than once per
+        LIMIT_REFRESH_RATE. It will be update at least once every three such intervals
+        If changes are made to your drive in the interim, they will trigger an
+        update.
+    */
+    var LIMIT_REFRESH_RATE = 30000; // milliseconds
+    UI.createUsageBar = function (common, cb) {
+        if (!common.isLoggedIn()) { return cb("NOT_LOGGED_IN"); }
+        // getPinnedUsage updates common.account.usage, and other values
+        // so we can just use those and only check for errors
+        var $container = $('<span>', {'class':'cp-limit-container'});
+        var todo;
+        var updateUsage = Cryptpad.notAgainForAnother(function () {
+            common.getPinUsage(todo);
+        }, LIMIT_REFRESH_RATE);
+
+        todo = function (err, data) {
+            if (err) { return void console.error(err); }
+
+            var usage = data.usage;
+            var limit = data.limit;
+            var plan = data.plan;
+            $container.html('');
+            var unit = Util.magnitudeOfBytes(limit);
+
+            var usage = unit === 'GB'? Util.bytesToGigabytes(usage):
+                Util.bytesToMegabytes(usage);
+            var limit = unit === 'GB'? Util.bytesToGigabytes(limit):
+                Util.bytesToMegabytes(limit);
+
+            var $limit = $('<span>', {'class': 'cp-limit-bar'}).appendTo($container);
+            var quota = usage/limit;
+            var $usage = $('<span>', {'class': 'cp-limit-usage'}).css('width', quota*100+'%');
+
+            var makeDonateButton = function () {
+                $('<a>', {
+                    'class': 'cp-limit-upgrade btn btn-success',
+                    href: Cryptpad.donateURL,
+                    rel: "noreferrer noopener",
+                    target: "_blank",
+                }).text(Messages.supportCryptpad).appendTo($container);
+            };
+
+            var makeUpgradeButton = function () {
+                $('<a>', {
+                    'class': 'cp-limit-upgrade btn btn-success',
+                    href: Cryptpad.upgradeURL,
+                    rel: "noreferrer noopener",
+                    target: "_blank",
+                }).text(Messages.upgradeAccount).appendTo($container);
+            };
+
+            if (!Config.removeDonateButton) {
+                if (!common.isLoggedIn() || !Config.allowSubscriptions) {
+                    // user is not logged in, or subscriptions are disallowed
+                    makeDonateButton();
+                } else if (!plan) {
+                    // user is logged in and subscriptions are allowed
+                    // and they don't have one. show upgrades
+                    makeUpgradeButton();
+                } else {
+                    // they have a plan. show nothing
+                }
+            }
+
+            var prettyUsage;
+            var prettyLimit;
+
+            if (unit === 'GB') {
+                prettyUsage = Messages._getKey('formattedGB', [usage]);
+                prettyLimit = Messages._getKey('formattedGB', [limit]);
+            } else {
+                prettyUsage = Messages._getKey('formattedMB', [usage]);
+                prettyLimit = Messages._getKey('formattedMB', [limit]);
+            }
+
+            if (quota < 0.8) { $usage.addClass('cp-limit-usage-normal'); }
+            else if (quota < 1) { $usage.addClass('cp-limit-usage-warning'); }
+            else { $usage.addClass('cp-limit-usage-above'); }
+            var $text = $('<span>', {'class': 'cp-limit-usage-text'});
+            $text.text(usage + ' / ' + prettyLimit);
+            $limit.append($usage).append($text);
+        };
+
+        setInterval(function () {
+            updateUsage();
+        }, LIMIT_REFRESH_RATE * 3);
+
+        updateUsage();
+        /*getProxy().on('change', ['drive'], function () {
+            updateUsage();
+        }); TODO*/
+        cb(null, $container);
+    };
+
     UI.createUserAdminMenu = function (Common, config) {
         var metadataMgr = Common.getMetadataMgr();
 
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 8bb1fd3db..f50bc1de2 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -44,14 +44,21 @@ define([
                     localStorage.CRYPTPAD_URLARGS = ApiConfig.requireConf.urlArgs;
                 }
                 var cache = {};
+                var localStore = {};
                 Object.keys(localStorage).forEach(function (k) {
-                    if (k.indexOf('CRYPTPAD_CACHE|') !== 0) { return; }
-                    cache[k.slice(('CRYPTPAD_CACHE|').length)] = localStorage[k];
+                    if (k.indexOf('CRYPTPAD_CACHE|') === 0) {
+                        cache[k.slice(('CRYPTPAD_CACHE|').length)] = localStorage[k];
+                        return;
+                    }
+                    if (k.indexOf('CRYPTPAD_STORE|') === 0) {
+                        localStore[k.slice(('CRYPTPAD_STORE|').length)] = localStorage[k];
+                        return;
+                    }
                 });
 
                 SFrameChannel.create($('#sbox-iframe')[0].contentWindow, waitFor(function (sfc) {
                     sframeChan = sfc;
-                }), false, { cache: cache, language: Cryptpad.getLanguage() });
+                }), false, { cache: cache, localStore: localStore, language: Cryptpad.getLanguage() });
                 Cryptpad.ready(waitFor());
             }));
         }).nThen(function (waitFor) {
@@ -61,8 +68,17 @@ define([
                     localStorage['CRYPTPAD_CACHE|' + k] = x[k];
                 });
             });
+            sframeChan.on('EV_LOCALSTORE_PUT', function (x) {
+                Object.keys(x).forEach(function (k) {
+                    if (typeof(x[k]) === "undefined") {
+                        delete localStorage['CRYPTPAD_STORE|' + k];
+                        return;
+                    }
+                    localStorage['CRYPTPAD_STORE|' + k] = x[k];
+                });
+            });
 
-            secret = Cryptpad.getSecrets();
+            secret = cfg.getSecrets ? cfg.getSecrets(Cryptpad) : Cryptpad.getSecrets();
             if (!secret.channel) {
                 // New pad: create a new random channel id
                 secret.channel = Cryptpad.createChannelId();
@@ -278,6 +294,12 @@ define([
                 });
             });
 
+            sframeChan.on('Q_SESSIONSTORAGE_PUT', function (data, cb) {
+                sessionStorage[data.key] = data.value;
+                cb();
+            });
+
+
             // Present mode URL
             sframeChan.on('Q_PRESENT_URL_GET_VALUE', function (data, cb) {
                 var parsed = Cryptpad.parsePadUrl(window.location.href);
@@ -369,6 +391,12 @@ define([
                 }
             });
 
+            sframeChan.on('EV_OPEN_URL', function (url) {
+                if (url) {
+                    window.open(url);
+                }
+            });
+
             sframeChan.on('Q_TAGS_GET', function (data, cb) {
                 Cryptpad.getPadTags(null, function (err, data) {
                     cb({
@@ -383,6 +411,15 @@ define([
                 Cryptpad.resetTags(null, data);
             });
 
+            sframeChan.on('Q_PIN_GET_USAGE', function (data, cb) {
+                Cryptpad.isOverPinLimit(function (err, overLimit, data) {
+                    cb({
+                        error: err,
+                        data: data
+                    });
+                });
+            });
+
             if (cfg.addRpc) {
                 cfg.addRpc(sframeChan, Cryptpad);
             }
@@ -396,7 +433,7 @@ define([
             CpNfOuter.start({
                 sframeChan: sframeChan,
                 channel: secret.channel,
-                network: Cryptpad.getNetwork(),
+                network: cfg.newNetwork || Cryptpad.getNetwork(),
                 validateKey: secret.keys.validateKey || undefined,
                 readOnly: readOnly,
                 crypto: Crypto.createEncryptor(secret.keys),
@@ -408,7 +445,7 @@ define([
                         });
                         return;
                     }
-                    if (readOnly) { return; }
+                    if (readOnly || cfg.noHash) { return; }
                     Cryptpad.replaceHash(Cryptpad.getEditHashFromKeys(wc.id, secret.keys));
                 }
             });
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 62837a716..3ca91d7c0 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -77,6 +77,7 @@ define([
     funcs.openTemplatePicker = callWithCommon(UI.openTemplatePicker);
     funcs.displayAvatar = callWithCommon(UI.displayAvatar);
     funcs.createButton = callWithCommon(UI.createButton);
+    funcs.createUsageBar = callWithCommon(UI.createUsageBar);
 
     // History
     funcs.getHistory = callWithCommon(History.create);
@@ -156,6 +157,12 @@ define([
             if (cb) { cb(data); }
         });
     };
+    funcs.getPinUsage = function (cb) {
+        cb = cb || $.noop;
+        ctx.sframeChan.query('Q_PIN_GET_USAGE', null, function (err, data) {
+            cb(err || data.error, data.data);
+        });
+    };
 
     funcs.isOverPinLimit = function (cb) {
         ctx.sframeChan.query('Q_GET_PIN_LIMIT_STATUS', null, function (err, data) {
@@ -203,6 +210,15 @@ define([
         }, cb);
     };
 
+    funcs.sessionStorage = {
+        put: function (key, value, cb) {
+            ctx.sframeChan.query('Q_SESSIONSTORAGE_PUT', {
+                key: key,
+                value: value
+            }, cb);
+        }
+    };
+
     funcs.isStrongestStored = function () {
         var data = ctx.metadataMgr.getPrivateData();
         if (data.availableHashes.fileHash) { return true; }
@@ -214,6 +230,9 @@ define([
         ctx.sframeChan.query('Q_SETTINGS_SET_DISPLAY_NAME', name, cb);
     };
 
+    funcs.mergeAnonDrive = function (cb) {
+        ctx.sframeChan.query('Q_MERGE_ANON_DRIVE', null, cb);
+    };
     // Friends
     var pendingFriends = [];
     funcs.getPendingFriends = function () {
@@ -264,6 +283,7 @@ define([
     }; */
 
     funcs.gotoURL = function (url) { ctx.sframeChan.event('EV_GOTO_URL', url); };
+    funcs.openURL = function (url) { ctx.sframeChan.event('EV_OPEN_URL', url); };
 
     funcs.whenRealtimeSyncs = evRealtimeSynced.reg;
 
@@ -287,6 +307,18 @@ define([
                     ctx.sframeChan.event('EV_CACHE_PUT', x);
                 };
             });
+            ctx.sframeChan.whenReg('EV_LOCALSTORE_PUT', function () {
+                if (Object.keys(window.cryptpadStore.updated).length) {
+                    ctx.sframeChan.event('EV_LOCALSTORE_PUT', window.cryptpadStore.updated);
+                }
+                window.cryptpadStore._put = window.cryptpadStore.put;
+                window.cryptpadStore.put = function (k, v, cb) {
+                    window.cryptpadStore._put(k, v, cb);
+                    var x = {};
+                    x[k] = v;
+                    ctx.sframeChan.event('EV_LOCALSTORE_PUT', x);
+                };
+            });
 
             UI.addTooltips();
 
diff --git a/www/common/sframe-protocol.js b/www/common/sframe-protocol.js
index 1955701c0..e4a6d7c02 100644
--- a/www/common/sframe-protocol.js
+++ b/www/common/sframe-protocol.js
@@ -67,6 +67,9 @@ define({
     // Use anonymous rpc from inside the iframe (for avatars & pin usage).
     'Q_ANON_RPC_MESSAGE': true,
 
+    // Get the user's pin limit, usage and plan
+    'Q_PIN_GET_USAGE': true,
+
     // Check the pin limit to determine if we can store the pad in the drive or if we should.
     // display a warning
     'Q_GET_PIN_LIMIT_STATUS': true,
@@ -123,16 +126,28 @@ define({
 
     // Make the browser window navigate to a given URL, if no URL is passed then it will reload.
     'EV_GOTO_URL': true,
+    // Make the parent window open a given URL in a new tab. It allows us to keep sessionStorage
+    // form the parent window.
+    'EV_OPEN_URL': true,
 
     // Present mode URL
     'Q_PRESENT_URL_GET_VALUE': true,
     'EV_PRESENT_URL_SET_VALUE': true,
 
     // Put one or more entries to the cache which will go in localStorage.
+    // Cache is wiped after each new release
     'EV_CACHE_PUT': true,
+    // Put one or more entries to the localStore which will go in localStorage.
+    'EV_LOCALSTORE_PUT': true,
+    // Put one entry in the parent sessionStorage
+    'Q_SESSIONSTORAGE_PUT': true,
 
     // Set and get the tags using the tag prompt button
     'Q_TAGS_GET': true,
     'EV_TAGS_SET': true,
 
+    // Merge the anonymous drive (FS_hash) into the current logged in user's drive, to keep the pads
+    // in the drive at registration.
+    'Q_MERGE_ANON_DRIVE': true,
+
 });
diff --git a/www/common/userObject.js b/www/common/userObject.js
index ddacbb806..7825161e4 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -18,6 +18,7 @@ define([
         var exp = {};
         var Cryptpad = config.Cryptpad;
         var Messages = Cryptpad.Messages;
+        var loggedIn = config.loggedIn || Cryptpad.isLoggedIn();
 
         var FILES_DATA = module.FILES_DATA = exp.FILES_DATA = Cryptpad.storageKey;
         var OLD_FILES_DATA = module.OLD_FILES_DATA = exp.OLD_FILES_DATA = Cryptpad.oldStorageKey;
@@ -481,13 +482,14 @@ define([
 
         // FILES DATA
         exp.pushData = function (data, cb) {
+            // TODO: can only be called from outside atm
             if (typeof cb !== "function") { cb = function () {}; }
             var todo = function () {
                 var id = Cryptpad.createRandomInteger();
                 files[FILES_DATA][id] = data;
                 cb(null, id);
             };
-            if (!Cryptpad.isLoggedIn() || !AppConfig.enablePinning || config.testMode) {
+            if (!loggedIn || !AppConfig.enablePinning || config.testMode) {
                 return void todo();
             }
             Cryptpad.pinPads([Cryptpad.hrefToHexChannelId(data.href)], function (e) {
@@ -585,7 +587,7 @@ define([
 
         // ADD
         var add = exp.add = function (id, path) {
-            if (!Cryptpad.isLoggedIn() && !config.testMode) { return; }
+            if (!loggedIn && !config.testMode) { return; }
             var data = files[FILES_DATA][id];
             if (!data || typeof(data) !== "object") { return; }
             var newPath = path, parentEl;
@@ -624,7 +626,7 @@ define([
         exp.forget = function (href) {
             var id = getIdFromHref(href);
             if (!id) { return; }
-            if (!Cryptpad.isLoggedIn() && !config.testMode) {
+            if (!loggedIn && !config.testMode) {
                 // delete permanently
                 exp.removePadAttribute(href);
                 spliceFileData(id);
@@ -653,7 +655,7 @@ define([
         };
         var checkDeletedFiles = function () {
             // Nothing in OLD_FILES_DATA for workgroups
-            if (workgroup || (!Cryptpad.isLoggedIn() && !config.testMode)) { return; }
+            if (workgroup || (!loggedIn && !config.testMode)) { return; }
 
             var filesList = getFiles([ROOT, 'hrefArray', TRASH]);
             getFiles([FILES_DATA]).forEach(function (id) {
@@ -680,7 +682,7 @@ define([
             var trashPaths = paths.filter(function(x) { return isPathIn(x, [TRASH]); });
             var allFilesPaths = paths.filter(function(x) { return isPathIn(x, [FILES_DATA]); });
 
-            if (!Cryptpad.isLoggedIn() && !config.testMode) {
+            if (!loggedIn && !config.testMode) {
                 allFilesPaths.forEach(function (path) {
                     var el = find(path);
                     if (!el) { return; }
@@ -855,6 +857,7 @@ define([
                 }
                 try {
                     debug("Migrating file system...");
+                    // TODO
                     Cryptpad.feedback('Migrate-oldFilesData', true);
                     files.migrate = 1;
                     var next = function () {
@@ -904,6 +907,7 @@ define([
                     };
                     if (exp.rt) {
                         exp.rt.sync();
+                        // TODO
                         Cryptpad.whenRealtimeSyncs(exp.rt, next);
                     } else {
                         window.setTimeout(next, 1000);
@@ -1063,7 +1067,7 @@ define([
                         continue;
                     }
 
-                    if ((Cryptpad.isLoggedIn() || config.testMode) && rootFiles.indexOf(id) === -1) {
+                    if ((loggedIn || config.testMode) && rootFiles.indexOf(id) === -1) {
                         debug("An element in filesData was not in ROOT, TEMPLATE or TRASH.", id, el);
                         var newName = Cryptpad.createChannelId();
                         root[newName] = id;
diff --git a/www/drive/file.less b/www/drive/file.less
index 42019501f..729368af3 100644
--- a/www/drive/file.less
+++ b/www/drive/file.less
@@ -1,5 +1,6 @@
 @import "/customize/src/less/variables.less";
 @import "/customize/src/less/mixins.less";
+@import (once) "/customize/src/less2/include/tools.less";
 
 @tree-bg: #eee;
 @tree-fg: #000;
@@ -267,7 +268,7 @@ span {
         input {
             background: lighten(@toolbar-drive-bg, 8%);
             color: @toolbar-drive-color;
-            .placeholderColor(@toolbar-drive-color);
+            .tools_placeholder-color(@toolbar-drive-color);
             outline-width: 0px;
             border-radius: 0;
             width: 100%;
diff --git a/www/file/inner.html b/www/file/inner.html
index 53aebdbc4..3b3ede8fc 100644
--- a/www/file/inner.html
+++ b/www/file/inner.html
@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/file/inner.js" data-main="/common/sframe-boot.js?ver=1.5" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/file/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
         #editor1 { display: none; }
diff --git a/www/filepicker/inner.html b/www/filepicker/inner.html
index c753d4af8..8090d7abc 100644
--- a/www/filepicker/inner.html
+++ b/www/filepicker/inner.html
@@ -2,7 +2,7 @@
 <html style="height: 100%; background: transparent;">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/filepicker/inner.js" data-main="/common/sframe-boot.js?ver=1.5" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/filepicker/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
         body #cp-loading {
diff --git a/www/newdrive/app-drive.less b/www/newdrive/app-drive.less
new file mode 100644
index 000000000..ea027d76e
--- /dev/null
+++ b/www/newdrive/app-drive.less
@@ -0,0 +1,820 @@
+@import (once) "../../customize/src/less2/include/browser.less";
+@import (once) "../../customize/src/less2/include/toolbar.less";
+@import (once) "../../customize/src/less2/include/markdown.less";
+@import (once) '../../customize/src/less2/include/fileupload.less';
+@import (once) '../../customize/src/less2/include/alertify.less';
+@import (once) '../../customize/src/less2/include/leftside-menu.less';
+@import (once) "../../customize/src/less2/include/tools.less";
+@import (once) "../../customize/src/less2/include/limit-bar.less";
+
+.toolbar_main();
+.fileupload_main();
+.alertify_main();
+.limit-bar_main();
+
+@drive_hover: #eee;
+@drive_hover-light: lighten(@drive_hover, 20%);
+@drive_info-box-bg: #d2e1f2;
+@drive_info-box-border: #bbb;
+@drive_table-header-fg: #555;
+@drive_table-header-bg: #e8e8e8;
+@drive_mobile-tree-border-col: #ccc;
+
+@drive_content-fg: @colortheme_sidebar-right-fg;
+@drive_content-bg: @colortheme_sidebar-right-bg;
+@drive_content-bg-ro: darken(@drive_content-bg, 10%);
+
+
+/* PAGE */
+
+display: flex;
+flex-flow: column;
+max-height: 100%;
+min-height: auto;
+
+.cp-unselectable {
+    .tools_unselectable();
+}
+
+/* local mixins */
+.drive_fileIcon {
+    li {
+        display: inline-block;
+        margin: 10px 10px;
+        width: 140px;
+        height: 140px;
+        text-align: center;
+        vertical-align: top;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        padding-top: 5px;
+        padding-bottom: 5px;
+
+        &:not(.cp-app-drive-element-selected):not(.cp-app-drive-element-selected-tmp) {
+            border: 1px solid #CCC;
+        }
+        .cp-app-drive-element-name {
+            width: 100%;
+            height: 48px;
+            margin: 8px 0;
+            display: inline-block;
+            //align-items: center;
+            //justify-content: center;
+            overflow: hidden;
+            //text-overflow: ellipsis;
+            word-wrap: break-word;
+        }
+        .cp-app-drive-element-truncated {
+            display: block;
+            position: absolute;
+            bottom: 0px;
+            left: 0; right: 0;
+            text-align: center;
+        }
+        img.cp-app-drive-content-icon {
+            height: 48px;
+            max-height: none;
+            max-width: none;
+            margin: 8px 0;
+        }
+        .fa {
+            display: block;
+            margin: auto;
+            font-size: 48px;
+            margin: 8px 0;
+            text-align: center;
+            &.listonly {
+                display: none;
+            }
+        }
+    }
+}
+
+img.cp-app-drive-icon {
+    max-width: 20px;
+    max-height: 16px;
+}
+
+.cp-app-drive-container {
+    flex: 1;
+    overflow: auto;
+    width: 100%;
+    display: flex;
+    flex-flow: row;
+    @media screen and (max-width: @browser_media-medium-screen) {
+        display: block;
+        #cp-app-drive-toolbar {
+            .path .element {
+                display: none;
+            }
+        }
+        #cp-app-drive-tree {
+            resize: none;
+            width: 100%;
+            max-width: unset;
+            max-height: unset;
+            border-bottom: 1px solid @drive_mobile-tree-border-col;
+            .cp-app-drive-tree-category {
+                margin-top: 0.5em;
+            }
+        }
+    }
+}
+
+div:focus {
+    outline: none;
+}
+
+.fa {
+    font-family: FontAwesome;
+}
+
+ul {
+    list-style: none;
+    padding-left: 0px; // Remove the default padding
+}
+
+li {
+    padding: 0px 5px;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.cp-app-drive-context {
+    display: none;
+    position: absolute;
+    z-index: 500;
+    li {
+        padding: 0;
+        font-size: @colortheme_app-font-size;
+        a {
+            cursor: pointer;
+        }
+    }
+}
+
+.cp-app-drive-element-droppable {
+    background-color: #FE9A2E;
+    color: #222;
+}
+
+.cp-app-drive-element-selected {
+    background: #666 !important;
+    color: #eee;
+    margin: -1px;
+    .fa-minus-square-o, .fa-plus-square-o {
+        color: @colortheme_sidebar-left-fg;
+    }
+}
+
+.cp-app-drive-element-selected-tmp {
+    border: 1px dotted #bbb;
+    background: #AAA;
+    color: #ddd;
+    margin: -1px;
+    .fa-minus-square-o, .fa-plus-square-o {
+        color: @colortheme_sidebar-left-fg;
+    }
+}
+
+span {
+    &.fa-folder, &.fa-folder-open {
+        //color: #FEDE8B;
+        //text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
+    }
+}
+
+/* TREE */
+
+
+#cp-app-drive-tree {
+    font-size: @colortheme_app-font-size;
+    //border-right: 1px solid #ccc;
+    box-sizing: border-box;
+    background: @colortheme_sidebar-left-bg;
+    overflow: auto;
+    resize: horizontal;
+    width: auto;
+    white-space: nowrap;
+    max-width: 500px;
+    min-width: 200px;
+    padding: 0px;
+    color: @colortheme_sidebar-left-fg;
+    display: flex;
+    flex-flow: column;
+    max-height: 100%;
+    .cp-app-drive-tree-categories-container {
+        flex: 1;
+        max-width: 500px;
+        overflow: auto;
+    }
+    img.cp-app-drive-icon {
+        margin-bottom: 3px;
+        margin-left: -2px;
+    }
+    .cp-app-drive-tree-docs {
+        margin-top: 20px;
+        //padding: 0 0 0 20px;
+        padding: 0;
+        cursor: auto;
+        &li, li {
+            padding: 0;
+            &.cp-app-drive-element-collapsed ul {
+                display: none;
+            }
+            input {
+                width: ~"calc(100% - 30px)";
+                padding: 0 10px;
+                border: 0;
+                color: lighten(@colortheme_sidebar-left-fg, 40%);
+            }
+            & > span.cp-app-drive-element-row {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                //min-width: ~"calc(100% + 5px)";
+                .leftside-menu-category_main();
+                width: ~"calc(100% + 5px)";
+                margin: 0;
+                margin-bottom: -6px;
+                display: inline-block;
+                cursor: pointer;
+                margin-left: -5px;
+                padding-left: 5px;
+            }
+            & > span.cp-app-drive-element-row:not(.cp-app-drive-element-selected):not(.cp-app-drive-element-active):hover {
+            }
+        }
+    }
+    span.cp-app-drive-element {
+        cursor: pointer;
+    }
+    .cp-app-drive-tree-category {
+        margin: 0;
+        margin-top: 15px;
+        .cp-app-drive-tree-root {
+            &> .fa {
+                min-width: 30px;
+                cursor: pointer;
+            }
+        }
+        li {
+            padding: 0;
+            .cp-app-drive-element-row {
+                display: block;
+                padding-left: 20px;
+                .leftside-menu-category_main();
+                margin: 0;
+                .fa {
+                    width: 25px;
+                }
+            }
+        }
+    }
+    .cp-app-drive-tree-category:last-child {
+        margin-bottom: 20px;
+    }
+    .limit-container {
+        margin-top: 0;
+    }
+    #cp-app-drive-tree-search {
+        text-align: center;
+        padding: 0;
+        position: relative;
+        input {
+            background: lighten(@colortheme_drive-bg, 8%);
+            color: @colortheme_drive-color;
+            .tools_placeholder-color(@colortheme_drive-color);
+            outline-width: 0px;
+            border-radius: 0;
+            width: 100%;
+            //border: 1px solid #ccc;
+            border: 0;
+            border-right: 1px solid lighten(@colortheme_drive-bg, 16%);
+            //border-right: 0;
+            height: @variables_bar-height;
+            padding: 0 5px;
+            padding-left: 45px;
+            &:focus {
+                outline-width: 0px;
+            }
+        }
+        .cp-app-drive-tree-search-con {
+            color: @colortheme_drive-color;
+            position: absolute;
+            left: 20px; // TODO align with drive categories
+            top: 8px;
+        }
+    }
+    .fa.cp-app-drive-icon-expcol {
+        margin-left: -10px;
+        font-size: 14px;
+        position: absolute;
+        left: -20px;
+        top: 10px;
+        width: 11px !important;
+        height: 11px !important;
+        padding: 0;
+        margin: 0;
+        background: white;
+        z-index: 10;
+        cursor: default;
+        &:before {
+            position:relative;
+            top: -1px;
+        }
+    }
+    .cp-app-drive-tree-docs {
+        .cp-app-drive-tree-root > .cp-app-drive-element-row > .cp-app-drive-icon-expcol {
+            position: relative;
+            top:0;
+            left: -10px;
+        }
+        .cp-app-drive-tree-root > .cp-app-drive-element-row > .cp-app-drive-icon-folder {
+            margin-left: -5px;
+        }
+        .cp-app-drive-tree-root {
+            &> .cp-app-drive-element-row {
+                padding-left: 20px;
+            }
+            &> ul {
+                padding-left: 30px;
+            }
+        }
+    }
+
+    // Expand/collapse lines
+    .cp-app-drive-tree-docs ul {
+        margin: 0px 0px 0px 10px;
+        list-style: none;
+        padding-left: 10px;
+        li {
+            position: relative;
+            &:before {
+                position: absolute;
+                left: -15px;
+                top: -11px;
+                content: '';
+                display: block;
+                border-left: 1px solid @colortheme_sidebar-left-branch;
+                height: ~"calc(1em + 11px)";
+                border-bottom: 1px solid @colortheme_sidebar-left-branch;
+                width: 15px;
+            }
+            &:after {
+                position: absolute;
+                left: -15px;
+                bottom: -7px;
+                content: '';
+                display: block;
+                border-left: 1px solid @colortheme_sidebar-left-branch;
+                height: 100%;
+            }
+            &.cp-app-drive-tree-root {
+                margin: 0px 0px 0px -10px;
+                &:before {
+                    display: none;
+                }
+                &:after {
+                    display: none;
+                }
+            }
+            &:last-child:after {
+                display: none;
+            }
+        }
+    }
+}
+
+/* CONTENT */
+#cp-app-drive-content-container {
+    display: flex;
+    flex-flow: column;
+    flex: 1;
+    // Needed to avoid the folder's path to overflows
+    // https://stackoverflow.com/questions/38223879/white-space-nowrap-breaks-flexbox-layout
+    min-width: 0;
+}
+#cp-app-drive-content {
+    box-sizing: border-box;
+    background: @drive_content-bg;
+    color: @drive_content-fg;
+    overflow: auto;
+    flex: 1;
+    display: flex;
+    flex-flow: column;
+    position: relative;
+    .cp-app-drive-content-select-box {
+        display: none;
+        background-color: rgba(100, 100, 100, 0.7);
+        position: absolute;
+        z-index: 50;
+    }
+    &.cp-app-drive-readonly {
+        background: @drive_content-bg-ro;
+    }
+    h1 {
+        padding-left: 10px;
+        margin-top: 10px;
+    }
+    .cp-app-drive-content-info-box {
+        line-height: 2em;
+        padding: 0.25em 0.75em;
+        margin: 1em;
+        background: @drive_info-box-bg;
+        span {
+            cursor: pointer;
+            float: right;
+            margin-top: 0.5em;
+        }
+    }
+    li {
+        cursor: default;
+        &:not(.cp-app-drive-element-header) {
+            &:hover {
+                &:not(.-cp-app-drive-element-selected, .cp-app-drive-element-selected-tmp) {
+                    background-color: @drive_hover;
+                }
+            }
+        }
+    }
+    #cp-app-drive-content-folder {
+        li {
+            &.cp-app-drive-search-result {
+                border-bottom: 1px solid @drive_info-box-border;
+                display: block;
+                &:hover {
+                    background-color: initial;
+                }
+                table {
+                    width: 100%;
+                    .cp-app-drive-search-label2 {
+                        width: 150px;
+                        font-size: 15px;
+                        text-align: right;
+                        padding-right: 15px;
+                    }
+                    .cp-app-drive-search-opendir {
+                        a {
+                            cursor: pointer;
+                            color: #41b7d8;
+                            &:hover {
+                                color: #014c8c;
+                                text-decoration: underline;
+                            }
+                        }
+                    }
+                    .cp-app-drive-search-path {
+                        font-style: italic;
+                        direction: rtl;
+                        .cp-app-drive-path-element {
+                            display: inline-block;
+                            margin-right: 5px;
+                        }
+                    }
+                    .cp-app-drive-search-title {
+                        font-weight: bold;
+                        cursor: pointer;
+                        &:hover {
+                            background-color: @drive_hover;
+                        }
+                    }
+                    .cp-app-drive-search-col2 {
+                        width: 250px;
+                    }
+                    td.cp-app-drive-search-icon {
+                        width: 50px;
+                        font-size: 40px;
+                    }
+                }
+            }
+        }
+    }
+    .cp-app-drive-element {
+        .cp-app-drive-element-truncated { display: none; }
+    }
+    div.cp-app-drive-content-grid {
+        padding: 20px;
+        .drive_fileIcon;
+        li {
+            &.cp-app-drive-element {
+                position: relative;
+            }
+            input {
+                width: 100%;
+                margin-top: 5px;
+            }
+            .cp-app-drive-element-state {
+                position: absolute;
+                top: 3px;
+                right: 3px;
+                .fa {
+                    margin:0;
+                    font-size: 18px;
+                }
+            }
+        }
+        .cp-app-drive-element-list {
+            display: none;
+        }
+        .cp-app-drive-new-ghost {
+            cursor: pointer;
+            opacity: 0.5;
+            padding: 0;
+            &:hover {
+                opacity: 0.7;
+            }
+            .fa {
+                cursor: pointer;
+                font-size: 90px;
+                margin-top: 5px;
+                margin-bottom: 0;
+            }
+        }
+    }
+
+    .cp-app-drive-content-list {
+        .cp-app-drive-element-grid {
+            display: none;
+        }
+        // Make it act as a table!
+        padding-left: 20px;
+        ul {
+            display: table;
+            width: 100%;
+            padding: 0px 10px;
+        }
+        li {
+            display: table-row;
+            &> span {
+                padding: 0 5px;
+                display: table-cell;
+            }
+            &:not(.cp-app-drive-element-header) {
+                height: @variables_bar-height;
+                line-height: @variables_bar-height;
+            }
+            &.cp-app-drive-element-header {
+                cursor: default;
+                color: @drive_table-header-fg;
+                span {
+                    &:not(.fa) {
+                        text-align: left;
+                    }
+                    &.sortasc, &.sortdesc {
+                        float: right;
+                    }
+                }
+                &> span {
+                    padding: 15px 5px;
+                    &.cp-app-drive-sort-active {
+                        font-weight: bold;
+                    }
+                    &.cp-app-drive-sort-clickable {
+                        cursor: pointer;
+                        &:hover {
+                            background: @drive_table-header-bg;
+                        }
+                    }
+                }
+            }
+        }
+        .cp-app-drive-element {
+            span {
+                overflow: hidden;
+                white-space: nowrap;
+                box-sizing: border-box;
+                &.cp-app-drive-element-state {
+                    .fa:not(:last-child) {
+                        margin-right: 5px;
+                    }
+                }
+                &.cp-app-drive-content-icon, &.cp-app-drive-element-state {
+                    width: 30px;
+                }
+                &.cp-app-drive-element-type, &.cp-app-drive-element-atime, &.cp-app-drive-element-ctime {
+                    width: 175px;
+                }
+                &.cp-app-drive-element-title {
+                    width: 250px;
+                    @media screen and (max-width: 1200px) {
+                        display: none;
+                    }
+                }
+                &.cp-app-drive-element-folders, &.cp-app-drive-element-files {
+                    width: 150px;
+                }
+            }
+        }
+    }
+}
+
+#cp-app-drive-content-folder {
+    padding-right: 10px;
+    flex: 1;
+}
+
+#cp-app-drive-new-ghost-dialog.cp-modal-container {
+    .drive_fileIcon;
+
+    li:not(.cp-app-drive-element-selected):hover {
+        border: 1px solid white;
+    }
+    .cp-modal {
+        display: flex;
+        flex-flow: column;
+        li, li .fa {
+            cursor: pointer;
+        }
+        &> p {
+            margin: 50px;
+        }
+        &> div {
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: center;
+            align-content: center;
+            overflow-y: auto;
+            .cp-app-drive-new-upload {
+                break-after: always;
+                page-break-after: always;
+            }
+        }
+    }
+
+    @media screen and (max-height: @browser_media-not-big) {
+        .cp-modal {
+            & > p {
+                display: none;
+            }
+            & > div {
+                align-content: unset;
+                li {
+                    height: 40px;
+                    width: 90%;
+                    display: flex;
+                    align-items: center;
+                    .fa {
+                        font-size: 32px;
+                    }
+                    .cp-app-drive-new-name {
+                        height: auto;
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+/* Toolbar */
+
+#cp-app-drive-toolbar {
+    background: lighten(@colortheme_drive-bg, 8%);
+    color: @colortheme_drive-color;
+    //height: 30px;
+    //display: flex;
+    //flex-flow: row;
+    z-index: 100;
+    box-sizing: border-box;
+    height: @variables_bar-height;
+    padding: 0;
+    display: flex;
+    flex-flow: row;
+
+    * {
+        outline-width: 0;
+        &:focus {
+            outline-width: 0;
+        }
+    }
+
+    .history {
+        float: right;
+        .cp-toolbar-drawer-element {
+            display: none;
+        }
+    }
+
+    .cp-app-drive-toolbar-rightside, .cp-app-drive-toolbar-leftside {
+        display: inline-block;
+        margin: 0;
+        padding: 0;
+        .fa {
+            margin: 0;
+        }
+        button {
+            height: @variables_bar-height;
+            padding: 0 10px;
+            border: none;
+            border-radius: 0;
+            box-sizing: border-box;
+            background: transparent;
+            font-size: @colortheme_app-font-size;
+            color: @colortheme_drive-color;
+            transition: all 0.15s;
+            .drawer {
+                display: none;
+            }
+            .fa, span {
+                font-size: @colortheme_app-font-size;
+            }
+            &:hover {
+                background: @colortheme_drive-bg;
+            }
+            &.cp-app-drive-toolbar-active {
+                display: none;
+            }
+        }
+    }
+    .cp-app-drive-toolbar-rightside {
+        float: right;
+        & > * {
+            float: right;
+        }
+        #cp-app-drive-toolbar-contextbuttons {
+            display: inline-block;
+            height: 100%;
+        }
+        padding-left: 10px;
+    }
+    .cp-app-drive-toolbar-leftside {
+        & > span {
+            height: 100%;
+            margin: 0;
+        }
+        button {
+            padding: 0 10px;
+            .fa {
+                margin-right: 5px;
+            }
+            .cp-dropdown-button-title {
+                display: inline-flex;
+                height: @variables_bar-height;
+                align-items: center;
+                span:not(.fa) {
+                    line-height: 23px;
+                }
+            }
+        }
+    }
+
+    button {
+        font: @colortheme_app-font;
+        span {
+            font: @colortheme_app-font;
+        }
+        .fa, &.fa {
+            font-family: FontAwesome;
+        }
+    }
+    /* The container <div> - needed to position the dropdown content */
+    .cp-dropdown-container {
+        margin: 2px 2px;
+        line-height: 1em;
+        position: relative;
+        display: inline-block;
+    }
+    .cp-dropdown-content {
+        margin-right: 2px;
+    }
+
+    .cp-app-drive-path {
+        flex: 1;
+        width: 100%;
+        height: @variables_bar-height;
+        line-height: @variables_bar-height;
+        cursor: default;
+        width: auto;
+        overflow: hidden;
+        white-space: nowrap;
+        direction: rtl;
+        max-width: 100%;
+        text-align: left;
+        .cp-app-drive-path-element {
+            display: inline-block;
+            height: @variables_bar-height;
+            line-height: @variables_bar-height;
+            font-size: @colortheme_app-font-size;
+            padding: 0 5px;
+            border: 0;
+            background: darken(@colortheme_drive-bg, 10%);
+            color: @colortheme_drive-color;
+            box-sizing: border-box;
+            transition: all 0.15s;
+            &.cp-app-drive-path-separator {
+                color: #ccc;
+            }
+            &.cp-app-drive-path-lickable {
+                cursor: pointer;
+                &:hover {
+                    background: darken(@colortheme_drive-bg, 15%);
+                }
+            }
+        }
+    }
+}
+
+
+
diff --git a/www/newdrive/index.html b/www/newdrive/index.html
new file mode 100644
index 000000000..e3f7eacc4
--- /dev/null
+++ b/www/newdrive/index.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CryptPad</title>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <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>
+    <style>
+        html, body {
+            margin: 0px;
+            padding: 0px;
+        }
+        #sbox-iframe {
+            position:fixed;
+            top:0px;
+            left:0px;
+            bottom:0px;
+            right:0px;
+            width:100%;
+            height:100%;
+            border:none;
+            margin:0;
+            padding:0;
+            overflow:hidden;
+        }
+        #sbox-filePicker-iframe {
+            position: fixed;
+            top:0; left:0;
+            bottom:0; right:0;
+            width:100%;
+            height: 100%;
+            border: 0;
+        }
+    </style>
+</head>
+<body>
+<iframe id="sbox-iframe">
diff --git a/www/newdrive/inner.html b/www/newdrive/inner.html
new file mode 100644
index 000000000..afba5fccc
--- /dev/null
+++ b/www/newdrive/inner.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html class="cp-app-noscroll">
+<head>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <script async data-bootload="/newdrive/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <style>
+        .loading-hidden { display: none; }
+        #editor1 { display: none; }
+    </style>
+</head>
+<body class="cp-app-drive">
+  <div id="cp-toolbar" class="cp-toolbar-container"></div>
+    <div class="cp-app-drive-container" tabindex="0">
+        <div id="cp-app-drive-tree">
+        </div>
+        <div id="cp-app-drive-content-container">
+            <div id="cp-app-drive-toolbar"></div>
+            <div id="cp-app-drive-content" tabindex="2"></div>
+        </div>
+        <div id="cp-app-drive-context-tree" class="cp-app-drive-context dropdown cp-unselectable">
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">
+                <li><a tabindex="-1" data-icon="fa-folder-open" class="cp-app-drive-context-open dropdown-item" data-localization="fc_open">Open</a></li>
+                <li><a tabindex="-1" data-icon="fa-eye" class="cp-app-drive-context-openro dropdown-item" data-localization="fc_open_ro">Open (read-only)</a></li>
+                <li><a tabindex="-1" data-icon="fa-pencil" class="cp-app-drive-context-rename cp-app-drive-context-editable dropdown-item" data-localization="fc_rename">Rename</a></li>
+                <li><a tabindex="-1" data-icon="fa-trash" class="cp-app-drive-context-delete cp-app-drive-context-editable dropdown-item" data-localization="fc_delete">Delete</a></li>
+                <li><a tabindex="-1" data-icon="fa-folder" class="cp-app-drive-context-newfolder cp-app-drive-context-editable dropdown-item" data-localization="fc_newfolder">New folder</a></li>
+                <li><a tabindex="-1" data-icon="fa-database" class="cp-app-drive-context-properties dropdown-item" data-localization="fc_prop">Properties</a></li>
+            </ul>
+        </div>
+        <div id="cp-app-drive-context-content" class="cp-app-drive-context dropdown cp-unselectable">
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">
+                <li><a tabindex="-1" data-icon="fa-folder" class="cp-app-drive-context-newfolder cp-app-drive-context-editable dropdown-item" data-localization="fc_newfolder">New folder</a></li>
+                <li><a tabindex="-1" data-icon="fa-file-word-o" class="cp-app-drive-context-newdoc cp-app-drive-context-own cp-app-drive-context-editable dropdown-item" data-type="pad" data-localization="button_newpad">New pad</a></li>
+                <li><a tabindex="-1" data-icon="fa-file-code-o" class="cp-app-drive-context-newdoc cp-app-drive-context-own cp-app-drive-context-editable dropdown-item" data-type="code" data-localization="button_newcode">New code</a></li>
+                <li><a tabindex="-1" data-icon="fa-file-powerpoint-o" class="cp-app-drive-context-newdoc cp-app-drive-context-own cp-app-drive-context-editable dropdown-item" data-type="slide" data-localization="button_newslide">New slide</a></li>
+                <li><a tabindex="-1" data-icon="fa-calendar" class="cp-app-drive-context-newdoc cp-app-drive-context-own cp-app-drive-context-editable dropdown-item" data-type="poll" data-localization="button_newpoll">New poll</a></li>
+                <li><a tabindex="-1" data-icon="fa-paint-brush" class="cp-app-drive-context-newdoc cp-app-drive-context-own cp-app-drive-context-editable dropdown-item" data-type="whiteboard" data-localization="button_newwhiteboard">New whiteboard</a></li>
+            </ul>
+        </div>
+        <div id="cp-app-drive-context-default" class="cp-app-drive-context dropdown cp-unselectable">
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">
+                <li><a tabindex="-1" data-icon="fa-folder-open" class="cp-app-drive-context-open dropdown-item" data-localization="fc_open">Open</a></li>
+                <li><a tabindex="-1" data-icon="fa-eye" class="cp-app-drive-context-openro dropdown-item" data-localization="fc_open_ro">Open (read-only)</a></li>
+                <li><a tabindex="-1" data-icon="fa-trash" class="cp-app-drive-context-delete dropdown-item" data-localization="fc_delete">Delete</a></li>
+                <li><a tabindex="-1" data-icon="fa-database" class="cp-app-drive-context-properties dropdown-item" data-localization="fc_prop">Properties</a></li>
+            </ul>
+        </div>
+        <div id="cp-app-drive-context-trashtree" class="cp-app-drive-context dropdown cp-unselectable">
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">
+                <li><a tabindex="-1" data-icon="fa-trash-o" class="cp-app-drive-context-empty cp-app-drive-context-editable dropdown-item" data-localization="fc_empty">Empty the trash</a></li>
+            </ul>
+        </div>
+        <div id="cp-app-drive-context-trash" class="cp-app-drive-context dropdown cp-unselectable">
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">
+                <li><a tabindex="-1" data-icon="fa-eraser" class="cp-app-drive-context-remove cp-app-drive-context-editable dropdown-item" data-localization="fc_remove">Delete permanently</a></li>
+                <li><a tabindex="-1" data-icon="fa-repeat" class="cp-app-drive-context-restore cp-app-drive-context-editable dropdown-item" data-localization="fc_restore">Restore</a></li>
+                <li><a tabindex="-1" data-icon="fa-database" class="cp-app-drive-context-properties dropdown-item" data-localization="fc_prop">Properties</a></li>
+            </ul>
+        </div>
+    </div>
+</body>
+</html>
+
diff --git a/www/newdrive/inner.js b/www/newdrive/inner.js
new file mode 100644
index 000000000..9c1072954
--- /dev/null
+++ b/www/newdrive/inner.js
@@ -0,0 +1,3038 @@
+define([
+    'jquery',
+    '/bower_components/chainpad-crypto/crypto.js',
+    '/bower_components/textpatcher/TextPatcher.js',
+    '/common/toolbar3.js',
+    'json.sortify',
+    '/common/cryptpad-common.js',
+    '/common/common-util.js',
+    '/common/cryptget.js',
+    '/bower_components/nthen/index.js',
+    '/common/sframe-common.js',
+    '/common/common-realtime.js',
+    '/common/userObject.js',
+    '/customize/application_config.js',
+    '/common/mergeDrive.js',
+    '/common/sframe-chainpad-listmap.js',
+
+    'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
+    'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    'less!/customize/src/less2/main.less',
+], function (
+    $,
+    Crypto,
+    TextPatcher,
+    Toolbar,
+    JSONSortify,
+    Cryptpad,
+    Util,
+    Cryptget,
+    nThen,
+    SFCommon,
+    CommonRealtime,
+    FO,
+    AppConfig,
+    Merge,
+    Listmap)
+{
+    var Messages = Cryptpad.Messages;
+
+    var APP = window.APP = {
+        editable: false,
+        Cryptpad: Cryptpad,
+        mobile: function () { return $('body').width() <= 600; } // Menu and content area are not inline-block anymore for mobiles
+    };
+
+    var stringify = function (obj) {
+        return JSONSortify(obj);
+    };
+
+    var onConnectError = function () {
+        Cryptpad.errorLoadingScreen(Messages.websocketError);
+    };
+
+    var E_OVER_LIMIT = 'E_OVER_LIMIT';
+
+    var SEARCH = "search";
+    var SEARCH_NAME = Messages.fm_searchName;
+    var ROOT = "root";
+    var ROOT_NAME = Messages.fm_rootName;
+    var FILES_DATA = Cryptpad.storageKey;
+    var FILES_DATA_NAME = Messages.fm_filesDataName;
+    var TEMPLATE = "template";
+    var TEMPLATE_NAME = Messages.fm_templateName;
+    var TRASH = "trash";
+    var TRASH_NAME = Messages.fm_trashName;
+    var RECENT = "recent";
+    var RECENT_NAME = Messages.fm_recentPadsName;
+
+    var LS_LAST = "app-drive-lastOpened";
+    var LS_OPENED = "app-drive-openedFolders";
+    var LS_VIEWMODE = "app-drive-viewMode";
+    var LS_SEARCHCURSOR = "app-drive-searchCursor";
+    var FOLDER_CONTENT_ID = "cp-app-drive-content-folder";
+
+    var config = {};
+    var DEBUG = config.DEBUG = true;
+    var debug = config.debug = DEBUG ? function () {
+        console.log.apply(console, arguments);
+    } : function () { return; };
+    var logError = config.logError = function () {
+        console.error.apply(console, arguments);
+    };
+    var log = config.log = Cryptpad.log;
+
+    var localStore = window.cryptpadStore;
+    APP.store = {};
+    var getLastOpenedFolder = function () {
+        var path;
+        try {
+            path = APP.store[LS_LAST] ? JSON.parse(APP.store[LS_LAST]) : [ROOT];
+        } catch (e) {
+            path = [ROOT];
+        }
+        return path;
+    };
+    var setLastOpenedFolder = function (path) {
+        if (path[0] === SEARCH) { return; }
+        APP.store[LS_LAST] = JSON.stringify(path);
+        localStore.put(LS_LAST, JSON.stringify(path));
+    };
+
+    var wasFolderOpened = function (path) {
+        var stored = JSON.parse(APP.store[LS_OPENED] || '[]');
+        return stored.indexOf(JSON.stringify(path)) !== -1;
+    };
+    var setFolderOpened = function (path, opened) {
+        var s = JSON.stringify(path);
+        var stored = JSON.parse(APP.store[LS_OPENED] || '[]');
+        if (opened && stored.indexOf(s) === -1) {
+            stored.push(s);
+        }
+        if (!opened) {
+            var idx = stored.indexOf(s);
+            if (idx !== -1) {
+                stored.splice(idx, 1);
+            }
+        }
+        APP.store[LS_OPENED] = JSON.stringify(stored);
+        localStore.put(LS_OPENED, JSON.stringify(stored));
+    };
+
+    var getViewModeClass = function () {
+        var mode = APP.store[LS_VIEWMODE];
+        if (mode === 'list') { return 'cp-app-drive-content-list'; }
+        return 'cp-app-drive-content-grid';
+    };
+    var getViewMode = function () {
+        return APP.store[LS_VIEWMODE] || 'grid';
+    };
+    var setViewMode = function (mode) {
+        if (typeof(mode) !== "string") {
+            logError("Incorrect view mode: ", mode);
+            return;
+        }
+        APP.store[LS_VIEWMODE] = mode;
+        localStore.put(LS_VIEWMODE, mode);
+    };
+
+    var setSearchCursor = function () {
+        var $input = $('#cp-app-drive-tree-search-input');
+        APP.store[LS_SEARCHCURSOR] = $input[0].selectionStart;
+        localStore.put(LS_SEARCHCURSOR, $input[0].selectionStart);
+    };
+    var getSearchCursor = function () {
+        return APP.store[LS_SEARCHCURSOR] || 0;
+    };
+
+    var setEditable = function (state) {
+        APP.editable = state;
+        if (!state) {
+            APP.$content.addClass('cp-app-drive-readonly');
+            $('[draggable="true"]').attr('draggable', false);
+        }
+        else {
+            APP.$content.removeClass('cp-app-drive-readonly');
+            $('[draggable="false"]').attr('draggable', true);
+        }
+    };
+
+    // Icons
+    var $folderIcon = $('<span>', {
+        "class": "fa fa-folder cp-app-drive-icon-folder cp-app-drive-content-icon"
+    });
+    //var $folderIcon = $('<img>', {src: "/customize/images/icons/folder.svg", "class": "folder icon"});
+    var $folderEmptyIcon = $folderIcon.clone();
+    var $folderOpenedIcon = $('<span>', {"class": "fa fa-folder-open cp-app-drive-icon-folder"});
+    //var $folderOpenedIcon = $('<img>', {src: "/customize/images/icons/folderOpen.svg", "class": "folder icon"});
+    var $folderOpenedEmptyIcon = $folderOpenedIcon.clone();
+    //var $upIcon = $('<span>', {"class": "fa fa-arrow-circle-up"});
+    var $unsortedIcon = $('<span>', {"class": "fa fa-files-o"});
+    var $templateIcon = $('<span>', {"class": "fa fa-cubes"});
+    var $recentIcon = $('<span>', {"class": "fa fa-clock-o"});
+    var $trashIcon = $('<span>', {"class": "fa fa-trash"});
+    var $trashEmptyIcon = $('<span>', {"class": "fa fa-trash-o"});
+    //var $collapseIcon = $('<span>', {"class": "fa fa-minus-square-o cp-app-drive-icon-expcol"});
+    var $expandIcon = $('<span>', {"class": "fa fa-plus-square-o cp-app-drive-icon-expcol"});
+    var $emptyTrashIcon = $('<button>', {"class": "fa fa-ban"});
+    var $listIcon = $('<button>', {"class": "fa fa-list"});
+    var $gridIcon = $('<button>', {"class": "fa fa-th-large"});
+    var $sortAscIcon = $('<span>', {"class": "fa fa-angle-up sortasc"});
+    var $sortDescIcon = $('<span>', {"class": "fa fa-angle-down sortdesc"});
+    var $closeIcon = $('<span>', {"class": "fa fa-window-close"});
+    var $backupIcon = $('<span>', {"class": "fa fa-life-ring"});
+    var $searchIcon = $('<span>', {"class": "fa fa-search cp-app-drive-tree-search-con"});
+    var $addIcon = $('<span>', {"class": "fa fa-plus"});
+    var $renamedIcon = $('<span>', {"class": "fa fa-flag"});
+    var $readonlyIcon = $('<span>', {"class": "fa fa-eye"});
+
+    var history = {
+        isHistoryMode: false,
+    };
+
+    var andThen = function (common, proxy) {
+        var files = proxy.drive;
+        var metadataMgr = common.getMetadataMgr();
+        var priv = metadataMgr.getPrivateData();
+        var user = metadataMgr.getUserData();
+        var isOwnDrive = function () {
+            return true; // TODO
+            //return Cryptpad.getUserHash() === APP.hash || localStorage.FS_hash === APP.hash;
+        };
+        var isWorkgroup = function () {
+            return files.workgroup === 1;
+        };
+        config.workgroup = isWorkgroup();
+        config.Cryptpad = Cryptpad;
+        config.loggedIn = APP.loggedIn;
+
+        APP.origin = priv.origin;
+
+        var filesOp = FO.init(files, config);
+        filesOp.fixFiles();
+
+        var error = filesOp.error;
+
+        var $tree = APP.$tree = $("#cp-app-drive-tree");
+        var $content = APP.$content = $("#cp-app-drive-content");
+        var $appContainer = $(".cp-app-drive-container");
+        var $driveToolbar = $("#cp-app-drive-toolbar");
+        var $contextMenu = $("#cp-app-drive-context-tree");
+        var $contentContextMenu = $("#cp-app-drive-context-content");
+        var $defaultContextMenu = $("#cp-app-drive-context-default");
+        var $trashTreeContextMenu = $("#cp-app-drive-context-trashtree");
+        var $trashContextMenu = $("#cp-app-drive-context-trash");
+
+        $tree.on('drop dragover', function (e) {
+            e.preventDefault();
+            e.stopPropagation();
+        });
+        $driveToolbar.on('drop dragover', function (e) {
+            e.preventDefault();
+            e.stopPropagation();
+        });
+
+
+
+        // TOOLBAR
+
+        /* add a "change username" button */
+        if (!APP.readOnly) {
+            APP.$displayName.text(user.name || Messages.anonymous);
+        } else {
+            APP.$displayName.html('<span class="' + Toolbar.constants.readonly + '">' + Messages.readonly + '</span>');
+        }
+
+        // FILE MANAGER
+        // _WORKGROUP_ and other people drive : display Documents as main page
+        var currentPath = APP.currentPath = isOwnDrive() ? getLastOpenedFolder() : [ROOT];
+
+        // Categories dislayed in the menu
+        // _WORKGROUP_ : do not display unsorted
+        var displayedCategories = [ROOT, TRASH, SEARCH, RECENT];
+        if (AppConfig.enableTemplates) { displayedCategories.push(TEMPLATE); }
+        if (isWorkgroup()) { displayedCategories = [ROOT, TRASH, SEARCH]; }
+        var virtualCategories = [SEARCH, RECENT];
+
+        if (!APP.loggedIn) {
+            displayedCategories = [FILES_DATA];
+            currentPath = [FILES_DATA];
+            $tree.hide();
+            if (Object.keys(files.root).length && !proxy.anonymousAlert) {
+                Cryptpad.alert(Messages.fm_alert_anonymous, null, true);
+                proxy.anonymousAlert = true;
+            }
+        }
+
+        if (!APP.readOnly) {
+            setEditable(true);
+        }
+        var appStatus = {
+            isReady: true,
+            _onReady: [],
+            onReady: function (handler) {
+                if (appStatus.isReady) {
+                    handler();
+                    return;
+                }
+                appStatus._onReady.push(handler);
+            },
+            ready: function (state) {
+                appStatus.isReady = state;
+                if (state) {
+                    appStatus._onReady.forEach(function (h) {
+                        h();
+                    });
+                    appStatus._onReady = [];
+                }
+            }
+        };
+
+        var findDataHolder = function ($el) {
+            return $el.is('.cp-app-drive-element-row') ? $el : $el.closest('.cp-app-drive-element-row');
+        };
+
+
+        // Selection
+        var sel = {};
+
+        var removeSelected =  function (keepObj) {
+            $('.cp-app-drive-element-selected').removeClass("cp-app-drive-element-selected");
+            var $container = $driveToolbar.find('#cp-app-drive-toolbar-contextbuttons');
+            if (!$container.length) { return; }
+            $container.html('');
+            if (!keepObj) {
+                delete sel.startSelected;
+                delete sel.endSelected;
+                delete sel.oldSelection;
+            }
+        };
+
+        sel.refresh = 200;
+        sel.$selectBox = $('<div>', {'class': 'cp-app-drive-content-select-box'}).appendTo($content);
+        var checkSelected = function () {
+            if (!sel.down) { return; }
+            var pos = sel.pos;
+            var l = $content[0].querySelectorAll('.cp-app-drive-element:not(.cp-app-drive-element-selected):not(.cp-app-drive-element-header)');
+            var p, el;
+            var offset = getViewMode() === "grid" ? 10 : 0;
+            for (var i = 0; i < l.length; i++) {
+                el = l[i];
+                p = $(el).position();
+                p.top += offset + $content.scrollTop();
+                p.left += offset;
+                p.bottom = p.top + $(el).outerHeight();
+                p.right = p.left + $(el).outerWidth();
+                if (p.right < pos.left || p.left > pos.right
+                    || p.top > pos.bottom || p.bottom < pos.top) {
+                    $(el).removeClass('cp-app-drive-element-selected-tmp');
+                } else {
+                    $(el).addClass('cp-app-drive-element-selected-tmp');
+                }
+            }
+        };
+        $content.on('mousedown', function (e) {
+            if (currentPath[0] === SEARCH) { return; }
+            if (e.which !== 1) { return; }
+            $content.focus();
+            sel.down = true;
+            if (!e.ctrlKey) { removeSelected(); }
+            var rect = e.currentTarget.getBoundingClientRect();
+            sel.startX = e.clientX - rect.left;
+            sel.startY = e.clientY - rect.top + $content.scrollTop();
+            sel.$selectBox.show().css({
+                left: sel.startX + 'px',
+                top: sel.startY + 'px',
+                width: '0px',
+                height: '0px'
+            });
+            APP.hideMenu(e);
+            if (sel.move) { return; }
+            sel.move = function (ev) {
+                var rectMove = ev.currentTarget.getBoundingClientRect(),
+                    offX = ev.clientX - rectMove.left,
+                    offY = ev.clientY - rectMove.top + $content.scrollTop();
+
+
+                var left = sel.startX,
+                    top = sel.startY;
+                var width = offX - sel.startX;
+                if (width < 0) {
+                    left = Math.max(0, offX);
+                    var diffX = left-offX;
+                    width = Math.abs(width) - diffX;
+                }
+                var height = offY - sel.startY;
+                if (height < 0) {
+                    top = Math.max(0, offY);
+                    var diffY = top-offY;
+                    height = Math.abs(height) - diffY;
+                }
+                sel.$selectBox.css({
+                    width: width + 'px',
+                    left: left + 'px',
+                    height: height + 'px',
+                    top: top + 'px'
+                });
+
+
+                sel.pos = {
+                    top: top,
+                    left: left,
+                    bottom: top + height,
+                    right: left + width
+                };
+                var diffT = sel.update ? +new Date() - sel.update : sel.refresh;
+                if (diffT < sel.refresh) {
+                    if (!sel.to) {
+                        sel.to = window.setTimeout(function () {
+                            sel.update = +new Date();
+                            checkSelected();
+                            sel.to = undefined;
+                        }, (sel.refresh - diffT));
+                    }
+                    return;
+                }
+                sel.update = +new Date();
+                checkSelected();
+            };
+            $content.mousemove(sel.move);
+        });
+        $(window).on('mouseup', function (e) {
+            if (!sel.down) { return; }
+            if (e.which !== 1) { return; }
+            sel.down = false;
+            sel.$selectBox.hide();
+            $content.off('mousemove', sel.move);
+            delete sel.move;
+            $content.find('.cp-app-drive-element-selected-tmp')
+                .removeClass('cp-app-drive-element-selected-tmp')
+                .addClass('cp-app-drive-element-selected');
+            e.stopPropagation();
+        });
+
+        // Arrow keys to modify the selection
+        $(window).keydown(function (e) {
+            var $searchBar = $tree.find('#cp-app-drive-tree-search-input');
+            if ($searchBar.is(':focus') && $searchBar.val()) { return; }
+
+            var $elements = $content.find('.cp-app-drive-element:not(.cp-app-drive-element-header)');
+
+            var ev = {};
+            if (e.ctrlKey) { ev.ctrlKey = true; }
+            if (e.shiftKey) { ev.shiftKey = true; }
+            var click = function (el) {
+                if (!el) { return; }
+                APP.onElementClick(ev, $(el));
+            };
+
+            // Enter
+            if (e.which === 13) {
+                var $allSelected = $content.find('.cp-app-drive-element.cp-app-drive-element-selected');
+                if ($allSelected.length === 1) {
+                    // Open the folder or the file
+                    $allSelected.dblclick();
+                    return;
+                }
+                // If more than one, open only the files
+                var $select = $content.find('.cp-app-drive-element-file.cp-app-drive-element-selected');
+                $select.each(function (idx, el) {
+                    $(el).dblclick();
+                });
+                return;
+            }
+
+            // [Left, Up, Right, Down]
+            if ([37, 38, 39, 40].indexOf(e.which) === -1) { return; }
+            e.preventDefault();
+
+            var $selection = $content.find('.cp-app-drive-element.cp-app-drive-element-selected');
+            if ($selection.length === 0) { return void click($elements.first()[0]); }
+
+            var lastIndex = typeof sel.endSelected === "number" ? sel.endSelected :
+                            typeof sel.startSelected === "number" ? sel.startSelected :
+                            $elements.index($selection.last()[0]);
+            var length = $elements.length;
+            if (length === 0) { return; }
+            // List mode
+            if (getViewMode() === "list") {
+                if (e.which === 40) { click($elements.get(Math.min(lastIndex+1, length -1))); }
+                if (e.which === 38) { click($elements.get(Math.max(lastIndex-1, 0))); }
+                return;
+            }
+
+            // Icon mode
+            // Get the vertical and horizontal position of lastIndex
+            // Filter all the elements to get those in the same line/column
+            var pos = $($elements.get(0)).position();
+            var $line = $elements.filter(function (idx, el) {
+                return $(el).position().top === pos.top;
+            });
+            var cols = $line.length;
+            var lines = Math.ceil(length/cols);
+
+            var lastPos = {
+                l : Math.floor(lastIndex/cols),
+                c : lastIndex - Math.floor(lastIndex/cols)*cols
+            };
+
+            if (e.which === 37) {
+                if (lastPos.c === 0) { return; }
+                click($elements.get(Math.max(lastIndex-1, 0)));
+                return;
+            }
+            if (e.which === 38) {
+                if (lastPos.l === 0) { return; }
+                click($elements.get(Math.max(lastIndex-cols, 0)));
+                return;
+            }
+            if (e.which === 39) {
+                if (lastPos.c === cols-1) { return; }
+                click($elements.get(Math.min(lastIndex+1, length-1)));
+                return;
+            }
+            if (e.which === 40) {
+                if (lastPos.l === lines-1) { return; }
+                click($elements.get(Math.min(lastIndex+cols, length-1)));
+                return;
+            }
+
+        });
+
+
+        var removeInput =  function (cancel) {
+            if (!cancel && $('.cp-app-drive-element-row > input').length === 1) {
+                var $input = $('.cp-app-drive-element-row > input');
+                filesOp.rename($input.data('path'), $input.val(), APP.refresh);
+            }
+            $('.cp-app-drive-element-row > input').remove();
+            $('.cp-app-drive-element-row > span:hidden').removeAttr('style');
+        };
+
+        var compareDays = function (date1, date2) {
+            var day1 = Date.UTC(date1.getFullYear(), date1.getMonth(), date1.getDate());
+            var day2 = Date.UTC(date2.getFullYear(), date2.getMonth(), date2.getDate());
+            var ms = Math.abs(day1-day2);
+            return Math.floor(ms/1000/60/60/24);
+        };
+
+        var getDate = function (sDate) {
+            if (!sDate) { return ''; }
+            var ret = sDate.toString();
+            try {
+                var date = new Date(sDate);
+                var today = new Date();
+                var diff = compareDays(date, today);
+                if (diff === 0) {
+                    ret = date.toLocaleTimeString();
+                } else {
+                    ret = date.toLocaleDateString();
+                }
+            } catch (e) {
+                error("Unable to format that string to a date with .toLocaleString", sDate, e);
+            }
+            return ret;
+        };
+
+        var openFile = function (el, href) {
+            if (!href) {
+                var data = filesOp.getFileData(el);
+                if (!data || !data.href) {
+                    return void logError("Missing data for the file", el, data);
+                }
+                href = data.href;
+            }
+            window.open(APP.origin + href);
+        };
+
+        var refresh = APP.refresh = function () {
+            APP.displayDirectory(currentPath);
+        };
+
+        var getFileNameExtension = function (name) {
+            var matched = /\.\S+$/.exec(name);
+            if (matched && matched.length) { return matched[matched.length -1]; }
+            return '';
+        };
+
+        // Replace a file/folder name by an input to change its value
+        var displayRenameInput = function ($element, path) {
+            // NOTE: setTimeout(f, 0) otherwise the "rename" button in the toolbar is not working
+            window.setTimeout(function () {
+                if (!APP.editable) { return; }
+                if (!path || path.length < 2) {
+                    logError("Renaming a top level element (root, trash or filesData) is forbidden.");
+                    return;
+                }
+                removeInput();
+                removeSelected();
+                var $name = $element.find('.cp-app-drive-element-name');
+                if (!$name.length) {
+                    $name = $element.find('> .cp-app-drive-element');
+                }
+                $name.hide();
+                var el = filesOp.find(path);
+                var name = filesOp.isFile(el) ? filesOp.getTitle(el)  : path[path.length - 1];
+                var $input = $('<input>', {
+                    placeholder: name,
+                    value: name
+                }).data('path', path);
+
+
+                // Stop propagation on keydown to avoid issues with arrow keys
+                $input.on('keydown', function (e) { e.stopPropagation(); });
+
+                $input.on('keyup', function (e) {
+                    if (e.which === 13) {
+                        removeInput(true);
+                        filesOp.rename(path, $input.val(), refresh);
+                        return;
+                    }
+                    if (e.which === 27) {
+                        removeInput(true);
+                    }
+                });
+                //$element.parent().append($input);
+                $name.after($input);
+                $input.focus();
+
+                var extension = getFileNameExtension(name);
+                var input = $input[0];
+                input.selectionStart = 0;
+                input.selectionEnd = name.length - extension.length;
+
+                // We don't want to open the file/folder when clicking on the input
+                $input.on('click dblclick', function (e) {
+                    removeSelected();
+                    e.stopPropagation();
+                });
+                // Remove the browser ability to drag text from the input to avoid
+                // triggering our drag/drop event handlers
+                $input.on('dragstart dragleave drag drop', function (e) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                });
+                // Make the parent element non-draggable when selecting text in the field
+                // since it would remove the input
+                $input.on('mousedown', function (e) {
+                    e.stopPropagation();
+                    $input.parents('.cp-app-drive-element-row').attr("draggable", false);
+                });
+                $input.on('mouseup', function (e) {
+                    e.stopPropagation();
+                    $input.parents('.cp-app-drive-element-row').attr("draggable", true);
+                });
+            },0);
+        };
+
+        var filterContextMenu = function ($menu, paths) {
+            //var path = $element.data('path');
+            if (!paths || paths.length === 0) { logError('no paths'); }
+
+            var hide = [];
+            var hasFolder = false;
+            paths.forEach(function (p) {
+                var path = p.path;
+                var $element = p.element;
+                if (path.length === 1) {
+                    // Can't rename or delete root elements
+                    hide.push($menu.find('a.cp-app-drive-context-rename'));
+                    hide.push($menu.find('a.cp-app-drive-context-delete'));
+                }
+                if (!APP.editable) {
+                    hide.push($menu.find('a.cp-app-drive-context-editable'));
+                }
+                if (!isOwnDrive()) {
+                    hide.push($menu.find('a.cp-app-drive-context-own'));
+                }
+                if ($element.is('.cp-app-drive-element-file')) {
+                    // No folder in files
+                    hide.push($menu.find('a.cp-app-drive-context-newfolder'));
+                    if ($element.is('.cp-app-drive-readonly')) {
+                        // Keep only open readonly
+                        hide.push($menu.find('a.cp-app-drive-context-open'));
+                    } else if ($element.is('.cp-app-drive-noreadonly')) {
+                        // Keep only open readonly
+                        hide.push($menu.find('a.cp-app-drive-context-openro'));
+                    }
+                } else {
+                    if (hasFolder) {
+                        // More than 1 folder selected: cannot create a new subfolder
+                        hide.push($menu.find('a.cp-app-drive-context-newfolder'));
+                    }
+                    hasFolder = true;
+                    hide.push($menu.find('a.cp-app-drive-context-openro'));
+                    hide.push($menu.find('a.cp-app-drive-context-properties'));
+                }
+                // If we're in the trash, hide restore and properties for non-root elements
+                if ($menu.find('a.cp-app-drive-context-restore').length && path && path.length > 4) {
+                    hide.push($menu.find('a.cp-app-drive-context-restore'));
+                    hide.push($menu.find('a.cp-app-drive-context-properties'));
+                }
+            });
+            if (paths.length > 1) {
+                hide.push($menu.find('a.cp-app-drive-context-restore'));
+                hide.push($menu.find('a.cp-app-drive-context-properties'));
+                hide.push($menu.find('a.cp-app-drive-context-rename'));
+            }
+            if (hasFolder && paths.length > 1) {
+                // Cannot open multiple folders
+                hide.push($menu.find('a.cp-app-drive-context-open'));
+            }
+            return hide;
+        };
+
+        var getSelectedPaths = function ($element) {
+            var paths = [];
+            if ($('.cp-app-drive-element-selected').length > 1) {
+                var $selected = $('.cp-app-drive-element-selected');
+                $selected.each(function (idx, elmt) {
+                    var ePath = $(elmt).data('path');
+                    if (ePath) {
+                        paths.push({
+                            path: ePath,
+                            element: $(elmt)
+                        });
+                    }
+                });
+            }
+
+            if (!paths.length) {
+                var path = $element.data('path');
+                if (!path) { return false; }
+                paths.push({
+                    path: path,
+                    element: $element
+                });
+            }
+            return paths;
+        };
+
+        var updateContextButton = function () {
+            if (filesOp.isPathIn(currentPath, [TRASH])) {
+                $driveToolbar.find('cp-app-drive-toolbar-emptytrash').show();
+            } else {
+                $driveToolbar.find('cp-app-drive-toolbar-emptytrash').hide();
+            }
+            var $li = $content.find('.cp-app-drive-element-selected');
+            if ($li.length === 0) {
+                $li = findDataHolder($tree.find('.cp-app-drive-element-active'));
+            }
+            var $button = $driveToolbar.find('#cp-app-drive-toolbar-context-mobile');
+            if ($button.length) { // mobile
+                if ($li.length !== 1
+                    || !$._data($li[0], 'events').contextmenu
+                    || $._data($li[0], 'events').contextmenu.length === 0) {
+                    $button.hide();
+                    return;
+                }
+                $button.show();
+                $button.css({
+                    background: '#000'
+                });
+                window.setTimeout(function () {
+                    $button.css({
+                        background: ''
+                    });
+                }, 500);
+                return;
+            }
+            // Non mobile
+            var $container = $driveToolbar.find('#cp-app-drive-toolbar-contextbuttons');
+            if (!$container.length) { return; }
+            $container.html('');
+            var $element = $li.length === 1 ? $li : $($li[0]);
+            var paths = getSelectedPaths($element);
+            var $menu = $element.data('context');
+            if (!$menu) { return; }
+            //var actions = [];
+            var $actions = $menu.find('a');
+            var toHide = filterContextMenu($menu, paths);
+            $actions = $actions.filter(function (i, el) {
+                for (var j = 0; j < toHide.length; j++) {
+                    if ($(el).is(toHide[j])) { return false; }
+                }
+                return true;
+            });
+            $actions.each(function (i, el) {
+                var $a = $('<button>', {'class': 'cp-app-drive-element'});
+                if ($(el).attr('data-icon')) {
+                    $a.addClass('fa').addClass($(el).attr('data-icon'));
+                    $a.attr('title', $(el).text());
+                } else {
+                    $a.text($(el).text());
+                }
+                $(el).data('paths', paths);
+                //$(el).data('path', path);
+                //:$(el).data('element', $element);
+                $container.append($a);
+                $a.click(function() { $(el).click(); });
+            });
+        };
+
+        var scrollTo = function ($element) {
+            // Current scroll position
+            var st = $content.scrollTop();
+            // Block height
+            var h = $content.height();
+            // Current top position of the element relative to the scroll position
+            var pos = Math.round($element.offset().top - $content.position().top);
+            // Element height
+            var eh = $element.outerHeight();
+            // New scroll value
+            var v = st + pos + eh - h;
+            // If the element is completely visile, don't change the scroll position
+            if (pos+eh <= h && pos >= 0) { return; }
+            $content.scrollTop(v);
+        };
+        // Add the "selected" class to the "li" corresponding to the clicked element
+        var onElementClick = APP.onElementClick = function (e, $element) {
+            // If "Ctrl" is pressed, do not remove the current selection
+            removeInput();
+            $element = findDataHolder($element);
+            // If we're selecting a new element with the left click, hide the menu
+            if (e) { APP.hideMenu(); }
+            // Remove the selection if we don't hold ctrl key or if we are right-clicking
+            if (!e || !e.ctrlKey) {
+                removeSelected(e && e.shiftKey);
+            }
+            if (!$element.length) {
+                log(Messages.fm_selectError);
+                return;
+            }
+            scrollTo($element);
+            // Add the selected class to the clicked / right-clicked element
+            // Remove the class if it already has it
+            // If ctrlKey, add to the selection
+            // If shiftKey, select a range of elements
+            var $elements = $content.find('.cp-app-drive-element:not(.cp-app-drive-element-header)');
+            var $selection = $elements.filter('.cp-app-drive-element-selected');
+            if (typeof sel.startSelected !== "number" || !e || (e.ctrlKey && !e.shiftKey)) {
+                sel.startSelected = $elements.index($element[0]);
+                sel.oldSelection = [];
+                $selection.each(function (idx, el) {
+                    sel.oldSelection.push(el);
+                });
+                delete sel.endSelected;
+            }
+            if (e && e.shiftKey) {
+                var end = $elements.index($element[0]);
+                sel.endSelected = end;
+                var $el;
+                removeSelected(true);
+                sel.oldSelection.forEach(function (el) {
+                    if (!$(el).hasClass("cp-app-drive-element-selected")) {
+                        $(el).addClass("cp-app-drive-element-selected");
+                    }
+                });
+                for (var i = Math.min(sel.startSelected, sel.endSelected);
+                     i <= Math.max(sel.startSelected, sel.endSelected);
+                     i++) {
+                    $el = $($elements.get(i));
+                    if (!$el.hasClass("cp-app-drive-element-selected")) {
+                        $el.addClass("cp-app-drive-element-selected");
+                    }
+                }
+            } else {
+                if (!$element.hasClass("cp-app-drive-element-selected")) {
+                    $element.addClass("cp-app-drive-element-selected");
+                } else {
+                    $element.removeClass("cp-app-drive-element-selected");
+                }
+            }
+            updateContextButton();
+        };
+
+        var displayMenu = function (e, $menu) {
+            $menu.css({ display: "block" });
+            if (APP.mobile()) { return; }
+            var h = $menu.outerHeight();
+            var w = $menu.outerWidth();
+            var wH = window.innerHeight;
+            var wW = window.innerWidth;
+            if (h > wH) {
+                $menu.css({
+                    top: '0px',
+                    bottom: ''
+                });
+            } else if (e.pageY + h <= wH) {
+                $menu.css({
+                    top: e.pageY+'px',
+                    bottom: ''
+                });
+            } else {
+                $menu.css({
+                    bottom: '0px',
+                    top: ''
+                });
+            }
+            if(w > wW) {
+                $menu.css({
+                    left: '0px',
+                    right: ''
+                });
+            } else if (e.pageX + w <= wW) {
+                $menu.css({
+                    left: e.pageX+'px',
+                    right: ''
+                });
+            } else {
+                $menu.css({
+                    left: '',
+                    right: '0px',
+                });
+            }
+        };
+
+        // Open the selected context menu on the closest "li" element
+        var openContextMenu = function (e, $menu) {
+            APP.hideMenu();
+            e.stopPropagation();
+
+            var $element = findDataHolder($(e.target));
+            if (!$element.length) {
+                logError("Unable to locate the .element tag", e.target);
+                $menu.hide();
+                log(Messages.fm_contextMenuError);
+                return false;
+            }
+
+            if (!$element.hasClass('cp-app-drive-element-selected')) { //paths.length === 1) {
+                onElementClick(undefined, $element);
+            }
+
+            var paths = getSelectedPaths($element);
+
+            var toHide = filterContextMenu($menu, paths);
+            toHide.forEach(function ($a) {
+                $a.parent('li').hide();
+            });
+
+            displayMenu(e, $menu);
+
+            if ($menu.find('li:visible').length === 0) {
+                debug("No visible element in the context menu. Abort.");
+                $menu.hide();
+                return true;
+            }
+
+            $menu.find('a').data('paths', paths);
+            //$menu.find('a').data('path', path);
+            //$menu.find('a').data('element', $element);
+            return false;
+        };
+
+        var openDirectoryContextMenu = function (e) {
+            $contextMenu.find('li').show();
+            openContextMenu(e, $contextMenu);
+            return false;
+        };
+
+        var openDefaultContextMenu = function (e) {
+            $defaultContextMenu.find('li').show();
+            openContextMenu(e, $defaultContextMenu);
+            return false;
+        };
+
+        var openTrashTreeContextMenu = function (e) {
+            removeSelected();
+            $trashTreeContextMenu.find('li').show();
+            openContextMenu(e, $trashTreeContextMenu);
+            return false;
+        };
+
+        var openTrashContextMenu = function (e) {
+            var path = findDataHolder($(e.target)).data('path');
+            if (!path) { return; }
+            $trashContextMenu.find('li').show();
+            openContextMenu(e, $trashContextMenu);
+            return false;
+        };
+
+        var openContentContextMenu = function (e) {
+            APP.hideMenu();
+            e.stopPropagation();
+            var path = $(e.target).closest('#' + FOLDER_CONTENT_ID).data('path');
+            if (!path) { return; }
+            var $menu = $contentContextMenu;
+            removeSelected();
+
+            if (!APP.editable) {
+                $menu.find('a.cp-app-drive-context-editable').parent('li').hide();
+            }
+            if (!isOwnDrive()) {
+                $menu.find('a.cp-app-drive-context-own').parent('li').hide();
+            }
+
+            $menu.find('[data-type]').each(function (idx, el) {
+                if (AppConfig.availablePadTypes.indexOf($(el).attr('data-type')) === -1) {
+                    $(el).hide();
+                }
+            });
+
+            displayMenu(e, $menu);
+
+            if ($menu.find('li:visible').length === 0) {
+                debug("No visible element in the context menu. Abort.");
+                $menu.hide();
+                return true;
+            }
+
+            $menu.find('a').data('path', path);
+            return false;
+        };
+
+        var getElementName = function (path) {
+            var file = filesOp.find(path);
+            if (!file || !filesOp.isFile(file)) { return '???'; }
+            return filesOp.getTitle(file);
+        };
+        // filesOp.moveElements is able to move several paths to a new location, including
+        // the Trash or the "Unsorted files" folder
+        var moveElements = function (paths, newPath, force, cb) {
+            if (!APP.editable) { return; }
+            var andThenMove = function () {
+                filesOp.move(paths, newPath, cb);
+            };
+            // Cancel drag&drop from TRASH to TRASH
+            if (filesOp.isPathIn(newPath, [TRASH]) && paths.length && paths[0][0] === TRASH) {
+                return;
+            }
+            andThenMove();
+        };
+        // Drag & drop:
+        // The data transferred is a stringified JSON containing the path of the dragged element
+        var onDrag = function (ev, path) {
+            var paths = [];
+            var $element = findDataHolder($(ev.target));
+            if ($element.hasClass('cp-app-drive-element-selected')) {
+                var $selected = $('.cp-app-drive-element-selected');
+                $selected.each(function (idx, elmt) {
+                    var ePath = $(elmt).data('path');
+                    if (ePath) {
+                        var val = filesOp.find(ePath);
+                        if (!val) { return; } // Error? A ".selected" element in not in the object
+                        paths.push({
+                            path: ePath,
+                            value: {
+                                name: getElementName(ePath),
+                                el: val
+                            }
+                        });
+                    }
+                });
+            } else {
+                removeSelected();
+                $element.addClass('cp-app-drive-element-selected');
+                var val = filesOp.find(path);
+                if (!val) { return; } // The element in not in the object
+                paths = [{
+                    path: path,
+                    value: {
+                        name: getElementName(path),
+                        el: val
+                    }
+                }];
+            }
+            var data = {
+                'path': paths
+            };
+            ev.dataTransfer.setData("text", stringify(data));
+        };
+
+        var onFileDrop = APP.onFileDrop = function (file, e) {
+            APP.FM.onFileDrop(file, e);
+        };
+        var findDropPath = function (target) {
+            var $target = $(target);
+            var $el = findDataHolder($target);
+            var newPath = $el.data('path');
+            if ((!newPath || filesOp.isFile(filesOp.find(newPath)))
+                    && $target.parents('#cp-app-drive-content')) {
+                newPath = currentPath;
+            }
+            return newPath;
+        };
+        var onDrop = function (ev) {
+            ev.preventDefault();
+            $('.cp-app-drive-element-droppable').removeClass('cp-app-drive-element-droppable');
+            var data = ev.dataTransfer.getData("text");
+
+            // Don't the the normal drop handler for file upload
+            var fileDrop = ev.dataTransfer.files;
+            if (fileDrop.length) { return void onFileDrop(fileDrop, ev); }
+
+            var oldPaths = JSON.parse(data).path;
+            if (!oldPaths) { return; }
+            // Dropped elements can be moved from the same file manager or imported from another one.
+            // A moved element should be removed from its previous location
+            var movedPaths = [];
+            var importedElements = [];
+            oldPaths.forEach(function (p) {
+                var el = filesOp.find(p.path);
+                if (el && (stringify(el) === stringify(p.value.el) || !p.value || !p.value.el)) {
+                    movedPaths.push(p.path);
+                } else {
+                    importedElements.push(p.value);
+                }
+            });
+
+            var newPath = findDropPath(ev.target);
+            if (!newPath) { return; }
+            if (movedPaths && movedPaths.length) {
+                moveElements(movedPaths, newPath, null, refresh);
+            }
+            if (importedElements && importedElements.length) {
+                // TODO workgroup
+                //filesOp.importElements(importedElements, newPath, refresh);
+            }
+        };
+
+        var addDragAndDropHandlers = function ($element, path, isFolder, droppable) {
+            if (!APP.editable) { return; }
+            // "dragenter" is fired for an element and all its children
+            // "dragleave" may be fired when entering a child
+            // --> we use pointer-events: none in CSS, but we still need a counter to avoid some issues
+            // --> We store the number of enter/leave and the element entered and we remove the
+            // highlighting only when we have left everything
+            var counter = 0;
+            $element.on('dragstart', function (e) {
+                e.stopPropagation();
+                counter = 0;
+                onDrag(e.originalEvent, path);
+            });
+
+            $element.on('mousedown', function (e) {
+                e.stopPropagation();
+            });
+
+            // Add drop handlers if we are not in the trash and if the element is a folder
+            if (!droppable || !isFolder) { return; }
+
+            $element.on('dragover', function (e) {
+                e.preventDefault();
+            });
+            $element.on('drop', function (e) {
+                e.preventDefault();
+                e.stopPropagation();
+                onDrop(e.originalEvent);
+            });
+            $element.on('dragenter', function (e) {
+                e.preventDefault();
+                e.stopPropagation();
+                counter++;
+                $element.addClass('droppable');
+            });
+            $element.on('dragleave', function (e) {
+                e.preventDefault();
+                e.stopPropagation();
+                counter--;
+                if (counter <= 0) {
+                    counter = 0;
+                    $element.removeClass('droppable');
+                }
+            });
+        };
+        addDragAndDropHandlers($content, null, true, true);
+
+        // In list mode, display metadata from the filesData object
+        // _WORKGROUP_ : Do not display title, atime and ctime columns since we don't have files data
+        var addFileData = function (element, $span) {
+            if (!filesOp.isFile(element)) { return; }
+
+            var data = filesOp.getFileData(element);
+            if (!data) { return void logError("No data for the file", element); }
+
+            var hrefData = Cryptpad.parsePadUrl(data.href);
+            var $state = $('<span>', {'class': 'cp-app-drive-element-state'});
+            if (hrefData.hashData && hrefData.hashData.mode === 'view') {
+                var $ro = $readonlyIcon.clone().appendTo($state);
+                $ro.attr('title', Messages.readonly);
+            }
+            if (data.filename && data.filename !== data.title) {
+                var $renamed = $renamedIcon.clone().appendTo($state);
+                $renamed.attr('title', Messages._getKey('fm_renamedPad', [data.title]));
+            }
+
+            var name = filesOp.getTitle(element);
+
+            // The element with the class '.name' is underlined when the 'li' is hovered
+            var $name = $('<span>', {'class': 'cp-app-drive-element-name'}).text(name);
+            $span.html('');
+            $span.append($name);
+            $span.append($state);
+
+            var type = Messages.type[hrefData.type] || hrefData.type;
+            var $type = $('<span>', {
+                'class': 'cp-app-drive-element-type cp-app-drive-element-list'
+            }).text(type);
+            var $adate = $('<span>', {
+                'class': 'cp-app-drive-element-atime cp-app-drive-element-list'
+            }).text(getDate(data.atime));
+            var $cdate = $('<span>', {
+                'class': 'cp-app-drive-element-ctime cp-app-drive-element-list'
+            }).text(getDate(data.ctime));
+            $span.append($type);
+            if (!isWorkgroup()) {
+                $span.append($adate).append($cdate);
+            }
+        };
+
+        var addFolderData = function (element, key, $span) {
+            if (!element || !filesOp.isFolder(element)) { return; }
+            $span.html('');
+            // The element with the class '.name' is underlined when the 'li' is hovered
+            var sf = filesOp.hasSubfolder(element);
+            var files = filesOp.hasFile(element);
+            var $name = $('<span>', {'class': 'cp-app-drive-element-name'}).text(key);
+            var $state = $('<span>', {'class': 'cp-app-drive-element-state'});
+            var $subfolders = $('<span>', {
+                'class': 'cp-app-drive-element-folders cp-app-drive-element-list'
+            }).text(sf);
+            var $files = $('<span>', {
+                'class': 'cp-app-drive-element-files cp-app-drive-element-list'
+            }).text(files);
+            $span.append($name).append($state).append($subfolders).append($files);
+        };
+
+        // This is duplicated in cryptpad-common, it should be unified
+        var getFileIcon = function (id) {
+            var data = filesOp.getFileData(id);
+            return Cryptpad.getFileIcon(data);
+        };
+        var getIcon = Cryptpad.getIcon;
+
+        // Create the "li" element corresponding to the file/folder located in "path"
+        var createElement = function (path, elPath, root, isFolder) {
+            // Forbid drag&drop inside the trash
+            var isTrash = path[0] === TRASH;
+            var newPath = path.slice();
+            var key;
+            if (isTrash && Array.isArray(elPath)) {
+                key = elPath[0];
+                elPath.forEach(function (k) { newPath.push(k); });
+            } else {
+                key = elPath;
+                newPath.push(key);
+            }
+
+            var element = filesOp.find(newPath);
+            var $icon = !isFolder ? getFileIcon(element) : undefined;
+            var ro = filesOp.isReadOnlyFile(element);
+            // ro undefined means it's an old hash which doesn't support read-only
+            var roClass = typeof(ro) === 'undefined' ?' cp-app-drive-element-noreadonly' :
+                            ro ? ' cp-app-drive-element-readonly' : '';
+            var liClass = 'cp-app-drive-element-file cp-app-drive-element' + roClass;
+            if (isFolder) {
+                liClass = 'cp-app-drive-element-folder cp-app-drive-element';
+                $icon = filesOp.isFolderEmpty(root[key]) ? $folderEmptyIcon.clone() : $folderIcon.clone();
+            }
+            var $element = $('<li>', {
+                draggable: true,
+                'class': 'cp-app-drive-element-row'
+            });
+            if (!isFolder && Array.isArray(APP.selectedFiles)) {
+                var idx = APP.selectedFiles.indexOf(element);
+                if (idx !== -1) {
+                    $element.addClass('cp-app-drive-element-selected');
+                    APP.selectedFiles.splice(idx, 1);
+                }
+            }
+            if (isFolder) {
+                addFolderData(element, key, $element);
+            } else {
+                addFileData(element, $element);
+            }
+            $element.prepend($icon).dblclick(function () {
+                if (isFolder) {
+                    APP.displayDirectory(newPath);
+                    return;
+                }
+                if (isTrash) { return; }
+                openFile(root[key]);
+            });
+            $element.addClass(liClass);
+            $element.data('path', newPath);
+            addDragAndDropHandlers($element, newPath, isFolder, !isTrash);
+            $element.click(function(e) {
+                e.stopPropagation();
+                onElementClick(e, $element, newPath);
+            });
+            if (!isTrash) {
+                $element.contextmenu(openDirectoryContextMenu);
+                $element.data('context', $contextMenu);
+            } else {
+                $element.contextmenu(openTrashContextMenu);
+                $element.data('context', $trashContextMenu);
+            }
+            var isNewFolder = APP.newFolder && filesOp.comparePath(newPath, module.newFolder);
+            if (isNewFolder) {
+                appStatus.onReady(function () {
+                    window.setTimeout(function () { displayRenameInput($element, newPath); }, 0);
+                });
+                delete APP.newFolder;
+            }
+            return $element;
+        };
+
+        // Display the full path in the title when displaying a directory from the trash
+        /*
+        var getTrashTitle = function (path) {
+            if (!path[0] || path[0] !== TRASH) { return; }
+            var title = TRASH_NAME;
+            for (var i=1; i<path.length; i++) {
+                if (i === 3 && path[i] === 'element') {}
+                else if (i === 2 && parseInt(path[i]) === path[i]) {
+                    if (path[i] !== 0) {
+                        title += " [" + path[i] + "]";
+                    }
+                } else {
+                    title += " / " + path[i];
+                }
+            }
+            return title;
+        }; */
+
+        var getPrettyName = function (name) {
+            var pName;
+            switch (name) {
+                case ROOT: pName = ROOT_NAME; break;
+                case TRASH: pName = TRASH_NAME; break;
+                case TEMPLATE: pName = TEMPLATE_NAME; break;
+                case FILES_DATA: pName = FILES_DATA_NAME; break;
+                case SEARCH: pName = SEARCH_NAME; break;
+                case RECENT: pName = RECENT_NAME; break;
+                default: pName = name;
+            }
+            return pName;
+        };
+
+        // Create the title block with the "parent folder" button
+        var createTitle = function ($container, path, noStyle) {
+            if (!path || path.length === 0) { return; }
+            var isTrash = filesOp.isPathIn(path, [TRASH]);
+            if (APP.mobile() && !noStyle) { // noStyle means title in search result
+                return $container;
+            }
+            var isVirtual = virtualCategories.indexOf(path[0]) !== -1;
+            var el = isVirtual ? undefined : filesOp.find(path);
+            path = path[0] === SEARCH ? path.slice(0,1) : path;
+            path.forEach(function (p, idx) {
+                if (isTrash && [2,3].indexOf(idx) !== -1) { return; }
+
+                var name = p;
+
+                var $span = $('<span>', {'class': 'cp-app-drive-path-element'});
+                if (idx < path.length - 1) {
+                    if (!noStyle) {
+                        $span.addClass('cp-app-drive-path-clickable');
+                        $span.click(function () {
+                            var sliceEnd = idx + 1;
+                            if (isTrash && idx === 1) { sliceEnd = 4; } // Make sure we don't show the index or 'element' and 'path'
+                            APP.displayDirectory(path.slice(0, sliceEnd));
+                        });
+                    }
+                } else if (idx > 0 && filesOp.isFile(el)) {
+                    name = getElementName(path);
+                }
+
+                if (idx === 0) { name = getPrettyName(p); }
+                else {
+                    var $span2 = $('<span>', {
+                        'class': 'cp-app-drive-path-element cp-app-drive-path-separator'
+                    }).text(' / ');
+                    $container.prepend($span2);
+                }
+
+                $span.text(name).prependTo($container);
+            });
+        };
+
+        var createInfoBox = function (path) {
+            var $box = $('<div>', {'class': 'cp-app-drive-content-info-box'});
+            var msg;
+            switch (path[0]) {
+                case ROOT:
+                    msg = Messages.fm_info_root;
+                    break;
+                case TEMPLATE:
+                    msg = Messages.fm_info_template;
+                    break;
+                case TRASH:
+                    msg = Messages.fm_info_trash;
+                    break;
+                case FILES_DATA:
+                    msg = Messages.fm_info_allFiles;
+                    break;
+                case RECENT:
+                    msg = Messages.fm_info_recent;
+                    break;
+                default:
+                    msg = undefined;
+            }
+            if (!APP.loggedIn) {
+                msg = Messages.fm_info_anonymous;
+                $box.html(msg);
+                return $box;
+            }
+            if (!msg || APP.store['hide-info-' + path[0]] === '1') {
+                $box.hide();
+            } else {
+                $box.text(msg);
+                var $close = $closeIcon.clone().css({
+                    'cursor': 'pointer',
+                    'margin-left': '10px',
+                    title: Messages.fm_closeInfoBox
+                }).on('click', function () {
+                    $box.hide();
+                    APP.store['hide-info-' + path[0]] = '1';
+                    localStore.put('hide-info-' + path[0], '1');
+                });
+                $box.prepend($close);
+            }
+            return $box;
+        };
+
+        // Create the button allowing the user to switch from list to icons modes
+        var createViewModeButton = function ($container) {
+            var $listButton = $listIcon.clone();
+            var $gridButton = $gridIcon.clone();
+
+            $listButton.click(function () {
+                $gridButton.removeClass('cp-app-drive-toolbar-active');
+                $listButton.addClass('cp-app-drive-toolbar-active');
+                setViewMode('list');
+                $('#' + FOLDER_CONTENT_ID).removeClass('cp-app-drive-content-grid');
+                $('#' + FOLDER_CONTENT_ID).addClass('cp-app-drive-content-list');
+                common.feedback('DRIVE_LIST_MODE');
+            });
+            $gridButton.click(function () {
+                $listButton.removeClass('cp-app-drive-toolbar-active');
+                $gridButton.addClass('cp-app-drive-toolbar-active');
+                setViewMode('grid');
+                $('#' + FOLDER_CONTENT_ID).addClass('cp-app-drive-content-grid');
+                $('#' + FOLDER_CONTENT_ID).removeClass('cp-app-drive-content-list');
+                common.feedback('DRIVE_GRID_MODE');
+            });
+
+            if (getViewMode() === 'list') {
+                $listButton.addClass('cp-app-drive-toolbar-active');
+            } else {
+                $gridButton.addClass('cp-app-drive-toolbar-active');
+            }
+            $listButton.attr('title', Messages.fm_viewListButton);
+            $gridButton.attr('title', Messages.fm_viewGridButton);
+            $container.append($listButton).append($gridButton);
+        };
+        var createEmptyTrashButton = function ($container) {
+            var $button = $emptyTrashIcon.clone();
+            $button.addClass('cp-app-drive-toolbar-emptytrash');
+            $button.attr('title', Messages.fc_empty);
+            $button.click(function () {
+                Cryptpad.confirm(Messages.fm_emptyTrashDialog, function(res) {
+                    if (!res) { return; }
+                    filesOp.emptyTrash(refresh);
+                });
+            });
+            $container.append($button);
+        };
+
+        var getNewPadTypes = function () {
+            var arr = [];
+            AppConfig.availablePadTypes.forEach(function (type) {
+                if (type === 'drive') { return; }
+                if (type === 'contacts') { return; }
+                if (type === 'todo') { return; }
+                if (type === 'file') { return; }
+                if (!Cryptpad.isLoggedIn() && AppConfig.registeredOnlyTypes &&
+                    AppConfig.registeredOnlyTypes.indexOf(type) !== -1) {
+                    return;
+                }
+                arr.push(type);
+            });
+            return arr;
+        };
+        var addNewPadHandlers = function ($block, isInRoot) {
+            // Handlers
+            if (isInRoot) {
+                var onCreated = function (err, info) {
+                    if (err) {
+                        if (err === E_OVER_LIMIT) {
+                            return void Cryptpad.alert(Messages.pinLimitDrive, null, true);
+                        }
+                        return void Cryptpad.alert(Messages.fm_error_cantPin);
+                    }
+                    APP.newFolder = info.newPath;
+                    refresh();
+                };
+                $block.find('a.cp-app-drive-toolbar-new-folder, li.cp-app-drive-toolbar-new-folder')
+                    .click(function () {
+                    filesOp.addFolder(currentPath, null, onCreated);
+                });
+                $block.find('a.cp-app-drive-toolbar-new-upload, li.cp-app-drive-toolbar-new-upload')
+                    .click(function () {
+                    var $input = $('<input>', {
+                        'type': 'file',
+                        'style': 'display: none;'
+                    }).on('change', function (e) {
+                        var file = e.target.files[0];
+                        var ev = {
+                            target: $content[0]
+                        };
+                        APP.FM.handleFile(file, ev);
+                    });
+                    $input.click();
+                });
+            }
+            $block.find('a.cp-app-drive-toolbar-new-doc, li.cp-app-drive-toolbar-new-doc')
+                .click(function () {
+                var type = $(this).attr('data-type') || 'pad';
+                var path = filesOp.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
+                common.sessionStorage.put(Cryptpad.newPadPathKey, path, function () {
+                    common.openURL('/' + type + '/');
+                });
+            });
+        };
+        var createNewButton = function (isInRoot, $container) {
+            if (!APP.editable) { return; }
+            if (!APP.loggedIn) { return; } // Anonymous users can use the + menu in the toolbar
+
+            if (!filesOp.isPathIn(currentPath, [ROOT, 'hrefArray'])) { return; }
+
+            // Create dropdown
+            var options = [];
+            if (isInRoot) {
+                options.push({
+                    tag: 'a',
+                    attributes: {'class': 'cp-app-drive-toolbar-new-older'},
+                    content: $('<div>').append($folderIcon.clone()).html() + Messages.fm_folder
+                });
+                options.push({tag: 'hr'});
+                options.push({
+                    tag: 'a',
+                    attributes: {'class': 'cp-app-drive-toolbar-new-upload'},
+                    content: $('<div>').append(getIcon('file')).html() + Messages.uploadButton
+                });
+                options.push({tag: 'hr'});
+            }
+            getNewPadTypes().forEach(function (type) {
+                var attributes = {
+                    'class': 'cp-app-drive-toolbar-new-doc',
+                    'data-type': type,
+                    'href': '#'
+                };
+                options.push({
+                    tag: 'a',
+                    attributes: attributes,
+                    content: $('<div>').append(getIcon(type)).html() + Messages.type[type]
+                });
+            });
+            var $plusIcon = $('<div>').append($('<span>', {'class': 'fa fa-plus'}));
+
+
+            var dropdownConfig = {
+                text: $plusIcon.html() + '<span>'+Messages.fm_newButton+'</span>',
+                options: options,
+                feedback: 'DRIVE_NEWPAD_LOCALFOLDER',
+            };
+            var $block = Cryptpad.createDropdown(dropdownConfig);
+
+            // Custom style:
+            $block.find('button').addClass('cp-app-drive-toolbar-new');
+            $block.find('button').attr('title', Messages.fm_newButtonTitle);
+
+            addNewPadHandlers($block, isInRoot);
+
+            $container.append($block);
+        };
+
+        var hideNewButton = function () {
+            $('.cp-dropdown-content').hide();
+        };
+
+        var SORT_FOLDER_DESC = 'sortFoldersDesc';
+        var SORT_FILE_BY = 'sortFilesBy';
+        var SORT_FILE_DESC = 'sortFilesDesc';
+
+        var getSortFileDesc = function () {
+            return APP.store[SORT_FILE_DESC]+"" === "true";
+        };
+        var getSortFolderDesc = function () {
+            return APP.store[SORT_FOLDER_DESC]+"" === "true";
+        };
+
+        var onSortByClick = function () {
+            var $span = $(this);
+            var value;
+            if ($span.hasClass('cp-app-drive-sort-foldername')) {
+                value = getSortFolderDesc();
+                APP.store[SORT_FOLDER_DESC] = value ? false : true;
+                localStore.put(SORT_FOLDER_DESC, value ? false : true);
+                refresh();
+                return;
+            }
+            value = APP.store[SORT_FILE_BY];
+            var descValue = getSortFileDesc();
+            if ($span.hasClass('cp-app-drive-sort-filename')) {
+                if (value === '') {
+                    descValue = descValue ? false : true;
+                } else {
+                    descValue = false;
+                    value = '';
+                }
+            } else {
+                ['cp-app-drive-element-title', 'cp-app-drive-element-type',
+                 'cp-app-drive-element-atime', 'cp-app-drive-element-ctime'].some(function (c) {
+                    if ($span.hasClass(c)) {
+                        if (value === c) { descValue = descValue ? false : true; }
+                        else {
+                            // atime and ctime should be ordered in a desc order at the first click
+                            value = c.replace(/cp-app-drive-element-/, '');
+                            descValue = value !== 'title';
+                        }
+                        return true;
+                    }
+                });
+            }
+            APP.store[SORT_FILE_BY] = value;
+            APP.store[SORT_FILE_DESC] = descValue;
+            localStore.put(SORT_FILE_BY, value);
+            localStore.put(SORT_FILE_DESC, descValue);
+            refresh();
+        };
+
+        var addFolderSortIcon = function ($list) {
+            var $icon = $sortAscIcon.clone();
+            if (getSortFolderDesc()) {
+                $icon = $sortDescIcon.clone();
+            }
+            if (typeof(APP.store[SORT_FOLDER_DESC]) !== "undefined") {
+                $list.find('.cp-app-drive-sort-foldername').addClass('cp-app-drive-sort-active').prepend($icon);
+            }
+        };
+        var getFolderListHeader = function () {
+            var $fohElement = $('<li>', {
+                'class': 'cp-app-drive-element-header cp-app-drive-element-list'
+            });
+            //var $fohElement = $('<span>', {'class': 'element'}).appendTo($folderHeader);
+            var $fhIcon = $('<span>', {'class': 'cp-app-drive-content-icon'});
+            var $name = $('<span>', {
+                'class': 'cp-app-drive-element-name cp-app-drive-sort-foldername ' +
+                         'cp-app-drive-sort-clickable'
+            }).text(Messages.fm_folderName).click(onSortByClick);
+            var $state = $('<span>', {'class': 'cp-app-drive-element-state'});
+            var $subfolders = $('<span>', {
+                'class': 'cp-app-drive-element-folders cp-app-drive-element-list'
+            }).text(Messages.fm_numberOfFolders);
+            var $files = $('<span>', {
+                'class': 'cp-app-drive-element-files cp-app-drive-element-list'
+            }).text(Messages.fm_numberOfFiles);
+            $fohElement.append($fhIcon).append($name).append($state)
+                        .append($subfolders).append($files);
+            addFolderSortIcon($fohElement);
+            return $fohElement;
+        };
+        var addFileSortIcon = function ($list) {
+            var $icon = $sortAscIcon.clone();
+            if (getSortFileDesc()) {
+                $icon = $sortDescIcon.clone();
+            }
+            var classSorted;
+            if (APP.store[SORT_FILE_BY] === '') { classSorted = 'cp-app-drive-sort-filename'; }
+            else if (APP.store[SORT_FILE_BY]) { classSorted = APP.store[SORT_FILE_BY]; }
+            if (classSorted) {
+                $list.find('.' + classSorted).addClass('cp-app-drive-sort-active').prepend($icon);
+            }
+        };
+        // _WORKGROUP_ : do not display title, atime and ctime in workgroups since we don't have files data
+        var getFileListHeader = function () {
+            var $fihElement = $('<li>', {
+                'class': 'cp-app-drive-element-header cp-app-drive-element-list'
+            });
+            //var $fihElement = $('<span>', {'class': 'element'}).appendTo($fileHeader);
+            var $fhIcon = $('<span>', {'class': 'cp-app-drive-content-icon'});
+            var $fhName = $('<span>', {
+                'class': 'cp-app-drive-element-name cp-app-drive-sort-filename ' +
+                         'cp-app-drive-sort-clickable'
+            }).text(Messages.fm_fileName).click(onSortByClick);
+            var $fhState = $('<span>', {'class': 'cp-app-drive-element-state'});
+            var $fhType = $('<span>', {
+                'class': 'cp-app-drive-element-type cp-app-drive-sort-clickable'
+            }).text(Messages.fm_type).click(onSortByClick);
+            var $fhAdate = $('<span>', {
+                'class': 'cp-app-drive-element-atime cp-app-drive-sort-clickable'
+            }).text(Messages.fm_lastAccess).click(onSortByClick);
+            var $fhCdate = $('<span>', {
+                'class': 'cp-app-drive-element-ctime cp-app-drive-sort-clickable'
+            }).text(Messages.fm_creation).click(onSortByClick);
+            // If displayTitle is false, it means the "name" is the title, so do not display the "name" header
+            $fihElement.append($fhIcon).append($fhName).append($fhState).append($fhType);
+            if (!isWorkgroup()) {
+                $fihElement.append($fhAdate).append($fhCdate);
+            }
+            addFileSortIcon($fihElement);
+            return $fihElement;
+        };
+
+        var sortElements = function (folder, path, oldkeys, prop, asc, useId) {
+            var root = filesOp.find(path);
+            var test = folder ? filesOp.isFolder : filesOp.isFile;
+            var keys = oldkeys.filter(function (e) {
+                return useId ? test(e) : test(root[e]);
+            });
+            if (keys.length < 2) { return keys; }
+            var mult = asc ? 1 : -1;
+            var getProp = function (el, prop) {
+                if (folder) { return el.toLowerCase(); }
+                var id = useId ? el : root[el];
+                var data = filesOp.getFileData(id);
+                if (!data) { return ''; }
+                if (prop === 'type') {
+                    var hrefData = Cryptpad.parsePadUrl(data.href);
+                    return hrefData.type;
+                }
+                if (prop === 'atime' || prop === 'ctime') {
+                    return new Date(data[prop]);
+                }
+                return (filesOp.getTitle(id) || "").toLowerCase();
+            };
+            keys.sort(function(a, b) {
+                if (getProp(a, prop) < getProp(b, prop)) { return mult * -1; }
+                if (getProp(a, prop) > getProp(b, prop)) { return mult * 1; }
+                return 0;
+            });
+            return keys;
+        };
+        var sortTrashElements = function (folder, oldkeys, prop, asc) {
+            var test = folder ? filesOp.isFolder : filesOp.isFile;
+            var keys = oldkeys.filter(function (e) {
+                return test(e.element);
+            });
+            if (keys.length < 2) { return keys; }
+            var mult = asc ? 1 : -1;
+            var getProp = function (el, prop) {
+                if (prop && !folder) {
+                    var element = el.element;
+                    var e = filesOp.getFileData(element);
+                    if (!e) {
+                        e = {
+                            href : el,
+                            title : Messages.fm_noname,
+                            atime : 0,
+                            ctime : 0
+                        };
+                    }
+                    if (prop === 'type') {
+                        var hrefData = Cryptpad.parsePadUrl(e.href);
+                        return hrefData.type;
+                    }
+                    if (prop === 'atime' || prop === 'ctime') {
+                        return new Date(e[prop]);
+                    }
+                }
+                return (el.name || "").toLowerCase();
+            };
+            keys.sort(function(a, b) {
+                if (getProp(a, prop) < getProp(b, prop)) { return mult * -1; }
+                if (getProp(a, prop) > getProp(b, prop)) { return mult * 1; }
+                return 0;
+            });
+            return keys;
+        };
+
+        // Create the ghost icon to add pads/folders
+        var createNewPadIcons = function ($block, isInRoot) {
+            var $container = $('<div>');
+            if (isInRoot) {
+                // Folder
+                var $element1 = $('<li>', {
+                    'class': 'cp-app-drive-new-folder cp-app-drive-element-row ' +
+                             'cp-app-drive-element-grid'
+                }).prepend($folderIcon.clone()).appendTo($container);
+                $element1.append($('<span>', { 'class': 'cp-app-drive-new-name' })
+                    .text(Messages.fm_folder));
+                // File
+                var $element2 = $('<li>', {
+                    'class': 'cp-app-drive-new-upload cp-app-drive-element-row ' +
+                             'cp-app-drive-element-grid'
+                }).prepend(getIcon('file')).appendTo($container);
+                $element2.append($('<span>', {'class': 'cp-app-drive-new-name'})
+                    .text(Messages.uploadButton));
+            }
+            // Pads
+            getNewPadTypes().forEach(function (type) {
+                var $element = $('<li>', {
+                    'class': 'cp-app-drive-new-doc cp-app-drive-element-row ' +
+                             'cp-app-drive-element-grid'
+                }).prepend(getIcon(type)).appendTo($container);
+                $element.append($('<span>', {'class': 'cp-app-drive-new-name'})
+                    .text(Messages.type[type]));
+                $element.attr('data-type', type);
+            });
+
+            $container.find('.cp-app-drive-element-row').click(function () {
+                $block.hide();
+            });
+            return $container;
+        };
+        var createGhostIcon = function ($list) {
+            var isInRoot = currentPath[0] === ROOT;
+            var $element = $('<li>', {
+                'class': 'cp-app-drive-element-row cp-app-drive-element-grid cp-app-drive-new-ghost'
+            }).prepend($addIcon.clone()).appendTo($list);
+            $element.append($('<span>', {'class': 'cp-app-drive-element-name'})
+                .text(Messages.fm_newFile));
+            $element.attr('title', Messages.fm_newFile);
+            $element.click(function () {
+                var $modal = Cryptpad.createModal({
+                    id: 'cp-app-drive-new-ghost-dialog',
+                    $body: $('body')
+                });
+                var $title = $('<h3>').text(Messages.fm_newFile);
+                var $description = $('<p>').text(Messages.fm_newButtonTitle);
+                $modal.find('.cp-modal').append($title);
+                $modal.find('.cp-modal').append($description);
+                var $content = createNewPadIcons($modal, isInRoot);
+                $modal.find('.cp-modal').append($content);
+                window.setTimeout(function () { $modal.show(); });
+                addNewPadHandlers($modal, isInRoot);
+            });
+        };
+
+        // Drive content toolbar
+        var createToolbar = function () {
+            var $toolbar = $driveToolbar;
+            $toolbar.html('');
+            $('<div>', {'class': 'cp-app-drive-toolbar-leftside'}).appendTo($toolbar);
+            $('<div>', {'class': 'cp-app-drive-path cp-unselectable'}).appendTo($toolbar);
+            var $rightside = $('<div>', {'class': 'cp-app-drive-toolbar-rightside'})
+                .appendTo($toolbar);
+            var $hist = common.createButton('history', true, {histConfig: APP.histConfig});
+            $rightside.append($hist);
+            return $toolbar;
+        };
+
+        // Unsorted element are represented by "href" in an array: they don't have a filename
+        // and they don't hav a hierarchical structure (folder/subfolders)
+        var displayHrefArray = function ($container, rootName, draggable) {
+            var unsorted = files[rootName];
+            if (unsorted.length) {
+                var $fileHeader = getFileListHeader(false);
+                $container.append($fileHeader);
+            }
+            var keys = unsorted;
+            var sortBy = APP.store[SORT_FILE_BY];
+            sortBy = sortBy === "" ? sortBy = 'name' : sortBy;
+            var sortedFiles = sortElements(false, [rootName], keys, sortBy, !getSortFileDesc(), true);
+            sortedFiles.forEach(function (id) {
+                var file = filesOp.getFileData(id);
+                if (!file) {
+                    //debug("Unsorted or template returns an element not present in filesData: ", href);
+                    file = { title: Messages.fm_noname };
+                    //return;
+                }
+                var idx = files[rootName].indexOf(id);
+                var $icon = getFileIcon(id);
+                var ro = filesOp.isReadOnlyFile(id);
+                // ro undefined mens it's an old hash which doesn't support read-only
+                var roClass = typeof(ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
+                                ro ? ' cp-app-drive-element-readonly' : '';
+                var $element = $('<li>', {
+                    'class': 'cp-app-drive-element cp-app-drive-element-row' + roClass,
+                    draggable: draggable
+                });
+                if (Array.isArray(APP.selectedFiles)) {
+                    var sidx = APP.selectedFiles.indexOf(id);
+                    if (sidx !== -1) {
+                        $element.addClass('cp-app-drive-element-selected');
+                        APP.selectedFiles.splice(sidx, 1);
+                    }
+                }
+                addFileData(id, $element);
+                $element.prepend($icon).dblclick(function () {
+                    openFile(id);
+                });
+                var path = [rootName, idx];
+                $element.data('path', path);
+                $element.click(function(e) {
+                    e.stopPropagation();
+                    onElementClick(e, $element, path);
+                });
+                $element.contextmenu(openDefaultContextMenu);
+                $element.data('context', $defaultContextMenu);
+                if (draggable) {
+                    addDragAndDropHandlers($element, path, false, false);
+                }
+                $container.append($element);
+            });
+            createGhostIcon($container);
+        };
+
+        var displayAllFiles = function ($container) {
+            var allfiles = files[FILES_DATA];
+            if (allfiles.length === 0) { return; }
+            var $fileHeader = getFileListHeader(false);
+            $container.append($fileHeader);
+            var keys = filesOp.getFiles([FILES_DATA]);
+            var sortedFiles = sortElements(false, [FILES_DATA], keys, APP.store[SORT_FILE_BY], !getSortFileDesc(), true);
+            sortedFiles.forEach(function (id) {
+                var $icon = getFileIcon(id);
+                var ro = filesOp.isReadOnlyFile(id);
+                // ro undefined maens it's an old hash which doesn't support read-only
+                var roClass = typeof(ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
+                    ro ? ' cp-app-drive-element-readonly' : '';
+                var $element = $('<li>', {
+                    'class': 'cp-app-drive-element cp-app-drive-element-row' + roClass 
+                });
+                addFileData(id, $element);
+                $element.data('path', [FILES_DATA, id]);
+                $element.data('element', id);
+                $element.prepend($icon).dblclick(function () {
+                    openFile(id);
+                });
+                $element.click(function(e) {
+                    e.stopPropagation();
+                    onElementClick(e, $element);
+                });
+                $element.contextmenu(openDefaultContextMenu);
+                $element.data('context', $defaultContextMenu);
+                $container.append($element);
+            });
+        };
+
+        var displayTrashRoot = function ($list, $folderHeader, $fileHeader) {
+            var filesList = [];
+            var root = files[TRASH];
+            // Elements in the trash are JS arrays (several elements can have the same name)
+            Object.keys(root).forEach(function (key) {
+                if (!Array.isArray(root[key])) {
+                    logError("Trash element has a wrong type", root[key]);
+                    return;
+                }
+                root[key].forEach(function (el, idx) {
+                    if (!filesOp.isFile(el.element) && !filesOp.isFolder(el.element)) { return; }
+                    var spath = [key, idx, 'element'];
+                    filesList.push({
+                        element: el.element,
+                        spath: spath,
+                        name: key
+                    });
+                });
+            });
+            var sortedFolders = sortTrashElements(true, filesList, null, !getSortFolderDesc());
+            var sortedFiles = sortTrashElements(false, filesList, APP.store[SORT_FILE_BY], !getSortFileDesc());
+            if (filesOp.hasSubfolder(root, true)) { $list.append($folderHeader); }
+            sortedFolders.forEach(function (f) {
+                var $element = createElement([TRASH], f.spath, root, true);
+                $list.append($element);
+            });
+            if (filesOp.hasFile(root, true)) { $list.append($fileHeader); }
+            sortedFiles.forEach(function (f) {
+                var $element = createElement([TRASH], f.spath, root, false);
+                $list.append($element);
+            });
+        };
+
+        var displaySearch = function ($list, value) {
+            var filesList = filesOp.search(value);
+            filesList.forEach(function (r) {
+                r.paths.forEach(function (path) {
+                    var href = r.data.href;
+                    var parsed = Cryptpad.parsePadUrl(href);
+                    var $table = $('<table>');
+                    var $icon = $('<td>', {'rowspan': '3', 'class': 'cp-app-drive-search-icon'})
+                        .append(getFileIcon(href));
+                    var $title = $('<td>', {
+                        'class': 'cp-app-drive-search-col1 cp-app-drive-search-title'
+                    }).text(r.data.title)
+                        .click(function () {
+                        openFile(null, r.data.href);
+                    });
+                    var $typeName = $('<td>', {'class': 'cp-app-drive-search-label2'})
+                        .text(Messages.fm_type);
+                    var $type = $('<td>', {'class': 'cp-app-drive-search-col2'})
+                        .text(Messages.type[parsed.type] || parsed.type);
+                    var $atimeName = $('<td>', {'class': 'cp-app-drive-search-label2'})
+                        .text(Messages.fm_lastAccess);
+                    var $atime = $('<td>', {'class': 'cp-app-drive-search-col2'})
+                        .text(new Date(r.data.atime).toLocaleString());
+                    var $ctimeName = $('<td>', {'class': 'cp-app-drive-search-label2'})
+                        .text(Messages.fm_creation);
+                    var $ctime = $('<td>', {'class': 'cp-app-drive-search-col2'})
+                        .text(new Date(r.data.ctime).toLocaleString());
+                    if (filesOp.isPathIn(path, ['hrefArray'])) {
+                        path.pop();
+                        path.push(r.data.title);
+                    }
+                    var $path = $('<td>', {
+                        'class': 'cp-app-drive-search-col1 cp-app-drive-search-path'
+                    });
+                    createTitle($path, path, true);
+                    var parentPath = path.slice();
+                    var $a;
+                    if (parentPath) {
+                        $a = $('<a>').text(Messages.fm_openParent).click(function (e) {
+                            e.preventDefault();
+                            if (filesOp.isInTrashRoot(parentPath)) { parentPath = [TRASH]; }
+                            else { parentPath.pop(); }
+                            APP.selectedFiles = [r.id];
+                            APP.displayDirectory(parentPath);
+                        });
+                    }
+                    var $openDir = $('<td>', {'class': 'cp-app-drive-search-opendir'}).append($a);
+
+                    // rows 1-3
+                    $('<tr>').append($icon).append($title).append($typeName).append($type).appendTo($table);
+                    $('<tr>').append($path).append($atimeName).append($atime).appendTo($table);
+                    $('<tr>').append($openDir).append($ctimeName).append($ctime).appendTo($table);
+                    $('<li>', {'class':'cp-app-drive-search-result'}).append($table).appendTo($list);
+                });
+            });
+        };
+
+        var displayRecent = function ($list) {
+            var filesList = filesOp.getRecentPads();
+            var limit = 20;
+            var i = 0;
+            filesList.forEach(function (id) {
+                if (i >= limit) { return; }
+                // Check path (pad exists and not in trash)
+                var paths = filesOp.findFile(id);
+                if (!paths.length) { return; }
+                var path = paths[0];
+                if (filesOp.isPathIn(path, [TRASH])) { return; }
+                // Display the pad
+                var file = filesOp.getFileData(id);
+                if (!file) {
+                    //debug("Unsorted or template returns an element not present in filesData: ", href);
+                    file = { title: Messages.fm_noname };
+                    //return;
+                }
+                var $icon = getFileIcon(id);
+                var ro = filesOp.isReadOnlyFile(id);
+                // ro undefined mens it's an old hash which doesn't support read-only
+                var roClass = typeof(ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
+                                ro ? ' cp-app-drive-element-readonly' : '';
+                var $element = $('<li>', {
+                    'class': 'cp-app-drive-element cp-app-drive-element-row' + roClass,
+                });
+                addFileData(id, $element);
+                $element.prepend($icon).dblclick(function () {
+                    openFile(id);
+                });
+                $element.data('path', path);
+                $element.click(function(e) {
+                    e.stopPropagation();
+                    onElementClick(e, $element, path);
+                });
+                $element.contextmenu(openDefaultContextMenu);
+                $element.data('context', $defaultContextMenu);
+                /*if (draggable) {
+                    addDragAndDropHandlers($element, path, false, false);
+                }*/
+                $list.append($element);
+                i++;
+            });
+        };
+
+        // Display the selected directory into the content part (rightside)
+        // NOTE: Elements in the trash are not using the same storage structure as the others
+        // _WORKGROUP_ : do not change the lastOpenedFolder value in localStorage
+        var displayDirectory = APP.displayDirectory = function (path, force) {
+            APP.hideMenu();
+            if (!APP.editable) { debug("Read-only mode"); }
+            if (!appStatus.isReady && !force) { return; }
+
+            // Only Trash and Root are available in not-owned files manager
+            if (!path || displayedCategories.indexOf(path[0]) === -1) {
+                log(Messages.categoryError);
+                currentPath = [ROOT];
+                displayDirectory(currentPath);
+                return;
+            }
+            appStatus.ready(false);
+            currentPath = path;
+            var s = $content.scrollTop() || 0;
+            $content.html("");
+            sel.$selectBox = $('<div>', {'class': 'cp-app-drive-content-select-box'})
+                .appendTo($content);
+            if (!path || path.length === 0) {
+                path = [ROOT];
+            }
+            var isInRoot = filesOp.isPathIn(path, [ROOT]);
+            var inTrash = filesOp.isPathIn(path, [TRASH]);
+            var isTrashRoot = filesOp.comparePath(path, [TRASH]);
+            var isTemplate = filesOp.comparePath(path, [TEMPLATE]);
+            var isAllFiles = filesOp.comparePath(path, [FILES_DATA]);
+            var isSearch = path[0] === SEARCH;
+            var isRecent = path[0] === RECENT;
+            var isVirtual = virtualCategories.indexOf(path[0]) !== -1;
+
+            var root = isVirtual ? undefined : filesOp.find(path);
+            if (!isVirtual && typeof(root) === "undefined") {
+                log(Messages.fm_unknownFolderError);
+                debug("Unable to locate the selected directory: ", path);
+                var parentPath = path.slice();
+                parentPath.pop();
+                displayDirectory(parentPath, true);
+                return;
+            }
+            if (!isSearch) { delete APP.Search.oldLocation; }
+
+            APP.resetTree();
+            if (displayedCategories.indexOf(SEARCH) !== -1 && $tree.find('#cp-app-drive-tree-search-input').length) {
+                // in history mode we want to focus the version number input
+                if (!history.isHistoryMode && !APP.mobile()) {
+                    var st = $tree.scrollTop() || 0;
+                    $tree.find('#cp-app-drive-tree-search-input').focus();
+                    $tree.scrollTop(st);
+                }
+                $tree.find('#cp-app-drive-tree-search-input')[0].selectionStart = getSearchCursor();
+                $tree.find('#cp-app-drive-tree-search-input')[0].selectionEnd = getSearchCursor();
+            }
+
+            if (!isWorkgroup()) {
+                setLastOpenedFolder(path);
+            }
+
+            var $toolbar = createToolbar(path);
+            var $info = createInfoBox(path);
+
+            var $dirContent = $('<div>', {id: FOLDER_CONTENT_ID});
+            $dirContent.data('path', path);
+            if (!isSearch) {
+                var mode = getViewMode();
+                if (mode) {
+                    $dirContent.addClass(getViewModeClass());
+                }
+                createViewModeButton($toolbar.find('.cp-app-drive-toolbar-rightside'));
+            }
+            if (inTrash) {
+                createEmptyTrashButton($toolbar.find('.cp-app-drive-toolbar-rightside'));
+            }
+
+            var $list = $('<ul>').appendTo($dirContent);
+
+            // NewButton can be undefined if we're in read only mode
+            createNewButton(isInRoot, $toolbar.find('.cp-app-drive-toolbar-leftside'));
+
+            createTitle($toolbar.find('.cp-app-drive-path'), path);
+
+            if (APP.mobile()) {
+                var $context = $('<button>', {
+                    'class': 'cp-dropdown-container',
+                    id: 'cp-app-drive-toolbar-context-mobile'
+                });
+                $context.append($('<span>', {'class': 'fa fa-caret-down'}));
+                $context.appendTo($toolbar.find('.cp-app-drive-toolbar-rightside'));
+                $context.click(function (e) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    var $li = $content.find('.cp-app-drive-element-selected');
+                    if ($li.length !== 1) {
+                        $li = findDataHolder($tree.find('.cp-app-drive-element-active'));
+                    }
+                    // Close if already opened
+                    if ($('.cp-app-drive-context:visible').length) {
+                        APP.hideMenu();
+                        return;
+                    }
+                    // Open the menu
+                    $('.cp-app-drive-context').css({
+                        top: ($context.offset().top + 32) + 'px',
+                        right: '0px',
+                        left: ''
+                    });
+                    $li.contextmenu();
+                });
+            } else {
+                var $contextButtons = $('<span>', {'id' : 'cp-app-drive-toolbar-contextbuttons'});
+                $contextButtons.appendTo($toolbar.find('.cp-app-drive-toolbar-rightside'));
+            }
+            updateContextButton();
+
+            var $folderHeader = getFolderListHeader();
+            var $fileHeader = getFileListHeader(true);
+
+            if (isTemplate) {
+                displayHrefArray($list, path[0], true);
+            } else if (isAllFiles) {
+                displayAllFiles($list);
+            } else if (isTrashRoot) {
+                displayTrashRoot($list, $folderHeader, $fileHeader);
+            } else if (isSearch) {
+                displaySearch($list, path[1]);
+            } else if (isRecent) {
+                displayRecent($list);
+            } else {
+                $dirContent.contextmenu(openContentContextMenu);
+                if (filesOp.hasSubfolder(root)) { $list.append($folderHeader); }
+                // display sub directories
+                var keys = Object.keys(root);
+                var sortedFolders = sortElements(true, path, keys, null, !getSortFolderDesc());
+                var sortedFiles = sortElements(false, path, keys, APP.store[SORT_FILE_BY], !getSortFileDesc());
+                sortedFolders.forEach(function (key) {
+                    if (filesOp.isFile(root[key])) { return; }
+                    var $element = createElement(path, key, root, true);
+                    $element.appendTo($list);
+                });
+                if (filesOp.hasFile(root)) { $list.append($fileHeader); }
+                // display files
+                sortedFiles.forEach(function (key) {
+                    if (filesOp.isFolder(root[key])) { return; }
+                    var $element = createElement(path, key, root, false);
+                    $element.appendTo($list);
+                });
+
+                createGhostIcon($list);
+            }
+            $content.append($info).append($dirContent);
+
+            var $truncated = $('<span>', {'class': 'cp-app-drive-element-truncated'}).text('...');
+            $content.find('.cp-app-drive-element').each(function (idx, el) {
+                var $name = $(el).find('.cp-app-drive-element-name');
+                if ($name.length === 0) { return; }
+                if ($name[0].scrollHeight > $name[0].clientHeight) {
+                    var $tr = $truncated.clone();
+                    $tr.attr('title', $name.text());
+                    $(el).append($tr);
+                }
+            });
+
+            $content.scrollTop(s);
+            appStatus.ready(true);
+        };
+
+        var createTreeElement = function (name, $icon, path, draggable, droppable, collapsable, active) {
+            var $name = $('<span>', { 'class': 'cp-app-drive-element' }).text(name);
+            var $collapse;
+            if (collapsable) {
+                $collapse = $expandIcon.clone();
+            }
+            var $elementRow = $('<span>', {'class': 'cp-app-drive-element-row'}).append($collapse).append($icon).append($name).click(function (e) {
+                e.stopPropagation();
+                APP.displayDirectory(path);
+            });
+            var $element = $('<li>').append($elementRow);
+            if (draggable) { $elementRow.attr('draggable', true); }
+            if (collapsable) {
+                $element.addClass('cp-app-drive-element-collapsed');
+                $collapse.click(function(e) {
+                    e.stopPropagation();
+                    if ($element.hasClass('cp-app-drive-element-collapsed')) {
+                        // It is closed, open it
+                        $element.removeClass('cp-app-drive-element-collapsed');
+                        setFolderOpened(path, true);
+                        $collapse.removeClass('fa-plus-square-o');
+                        $collapse.addClass('fa-minus-square-o');
+                    } else {
+                        // Collapse the folder
+                        $element.addClass('cp-app-drive-element-collapsed');
+                        setFolderOpened(path, false);
+                        $collapse.removeClass('fa-minus-square-o');
+                        $collapse.addClass('fa-plus-square-o');
+                        // Change the current opened folder if it was collapsed
+                        if (filesOp.isSubpath(currentPath, path)) {
+                            displayDirectory(path);
+                        }
+                    }
+                });
+                if (wasFolderOpened(path) ||
+                        (filesOp.isSubpath(currentPath, path) && path.length < currentPath.length)) {
+                    $collapse.click();
+                }
+            }
+            $elementRow.data('path', path);
+            addDragAndDropHandlers($elementRow, path, true, droppable);
+            if (active) {
+                $elementRow.addClass('cp-app-drive-element-active cp-leftside-active');
+            }
+            return $element;
+        };
+
+        var createTree = function ($container, path) {
+            var root = filesOp.find(path);
+
+            // don't try to display what doesn't exist
+            if (!root) { return; }
+
+            // Display the root element in the tree
+            var displayingRoot = filesOp.comparePath([ROOT], path);
+            if (displayingRoot) {
+                var isRootOpened = filesOp.comparePath([ROOT], currentPath);
+                var $rootIcon = filesOp.isFolderEmpty(files[ROOT]) ?
+                    (isRootOpened ? $folderOpenedEmptyIcon : $folderEmptyIcon) :
+                    (isRootOpened ? $folderOpenedIcon : $folderIcon);
+                var $rootElement = createTreeElement(ROOT_NAME, $rootIcon.clone(), [ROOT], false, true, true, isRootOpened);
+                if (!filesOp.hasSubfolder(root)) {
+                    $rootElement.find('.cp-app-drive-icon-expcol').css('visibility', 'hidden');
+                }
+                $rootElement.addClass('cp-app-drive-tree-root');
+                $rootElement.find('>.cp-app-drive-element-row')
+                    .contextmenu(openDirectoryContextMenu);
+                $('<ul>', {'class': 'cp-app-drive-tree-docs'})
+                    .append($rootElement).appendTo($container);
+                $container = $rootElement;
+            } else if (filesOp.isFolderEmpty(root)) { return; }
+
+            // Display root content
+            var $list = $('<ul>').appendTo($container);
+            var keys = Object.keys(root).sort();
+            keys.forEach(function (key) {
+                // Do not display files in the menu
+                if (!filesOp.isFolder(root[key])) { return; }
+                var newPath = path.slice();
+                newPath.push(key);
+                var isCurrentFolder = filesOp.comparePath(newPath, currentPath);
+                var isEmpty = filesOp.isFolderEmpty(root[key]);
+                var subfolder = filesOp.hasSubfolder(root[key]);
+                var $icon = isEmpty ?
+                    (isCurrentFolder ? $folderOpenedEmptyIcon : $folderEmptyIcon) :
+                    (isCurrentFolder ? $folderOpenedIcon : $folderIcon);
+                var $element = createTreeElement(key, $icon.clone(), newPath, true, true, subfolder, isCurrentFolder);
+                $element.appendTo($list);
+                $element.find('>.cp-app-drive-element-row').contextmenu(openDirectoryContextMenu);
+                createTree($element, newPath);
+            });
+        };
+
+        var createTemplate = function ($container, path) {
+            var $icon = $templateIcon.clone();
+            var isOpened = filesOp.comparePath(path, currentPath);
+            var $element = createTreeElement(TEMPLATE_NAME, $icon, [TEMPLATE], false, true, false, isOpened);
+            $element.addClass('cp-app-drive-tree-root');
+            var $list = $('<ul>', { 'class': 'cp-app-drive-tree-category' }).append($element);
+            $container.append($list);
+        };
+
+        var createAllFiles = function ($container, path) {
+            var $icon = $unsortedIcon.clone();
+            var isOpened = filesOp.comparePath(path, currentPath);
+            var $allfilesElement = createTreeElement(FILES_DATA_NAME, $icon, [FILES_DATA], false, false, false, isOpened);
+            $allfilesElement.addClass('root');
+            var $allfilesList = $('<ul>', { 'class': 'cp-app-drive-tree-category' })
+                .append($allfilesElement);
+            $container.append($allfilesList);
+        };
+
+        var createTrash = function ($container, path) {
+            var $icon = filesOp.isFolderEmpty(files[TRASH]) ? $trashEmptyIcon.clone() : $trashIcon.clone();
+            var isOpened = filesOp.comparePath(path, currentPath);
+            var $trashElement = createTreeElement(TRASH_NAME, $icon, [TRASH], false, true, false, isOpened);
+            $trashElement.addClass('root');
+            $trashElement.find('>.cp-app-drive-element-row').contextmenu(openTrashTreeContextMenu);
+            var $trashList = $('<ul>', { 'class': 'cp-app-drive-tree-category' })
+                .append($trashElement);
+            $container.append($trashList);
+        };
+
+        var createRecent = function ($container, path) {
+            var $icon = $recentIcon.clone();
+            var isOpened = filesOp.comparePath(path, currentPath);
+            var $element = createTreeElement(RECENT_NAME, $icon, [RECENT], false, false, false, isOpened);
+            $element.addClass('root');
+            var $list = $('<ul>', { 'class': 'cp-app-drive-tree-category' }).append($element);
+            $container.append($list);
+        };
+
+        var search = APP.Search = {};
+        var createSearch = function ($container) {
+            var isInSearch = currentPath[0] === SEARCH;
+            var $div = $('<div>', {'id': 'cp-app-drive-tree-search', 'class': 'cp-unselectable'});
+            var $input = $('<input>', {
+                id: 'cp-app-drive-tree-search-input',
+                type: 'text',
+                draggable: false,
+                tabindex: 1,
+                placeholder: Messages.fm_searchPlaceholder
+            }).keyup(function (e) {
+                if (search.to) { window.clearTimeout(search.to); }
+                if ([38, 39, 40, 41].indexOf(e.which) !== -1) {
+                    if (!$input.val()) {
+                        $input.blur();
+                        $content.focus();
+                        return;
+                    } else {
+                        e.stopPropagation();
+                    }
+                }
+                var isInSearchTmp = currentPath[0] === SEARCH;
+                if ($input.val().trim() === "") {
+                    setSearchCursor(0);
+                    if (search.oldLocation && search.oldLocation.length) { displayDirectory(search.oldLocation); }
+                    return;
+                }
+                if (e.which === 13) {
+                    if (!isInSearchTmp) { search.oldLocation = currentPath.slice(); }
+                    var newLocation = [SEARCH, $input.val()];
+                    setSearchCursor();
+                    if (!filesOp.comparePath(newLocation, currentPath.slice())) { displayDirectory(newLocation); }
+                    return;
+                }
+                if (APP.mobile()) { return; }
+                search.to = window.setTimeout(function () {
+                    if (!isInSearchTmp) { search.oldLocation = currentPath.slice(); }
+                    var newLocation = [SEARCH, $input.val()];
+                    setSearchCursor();
+                    if (!filesOp.comparePath(newLocation, currentPath.slice())) { displayDirectory(newLocation); }
+                }, 500);
+            }).appendTo($div);
+            $searchIcon.clone().appendTo($div);
+            if (isInSearch) { $input.val(currentPath[1] || ''); }
+            $container.append($div);
+        };
+
+        APP.resetTree = function () {
+            var $categories = $tree.find('.cp-app-drive-tree-categories-container');
+            var s = $categories.scrollTop() || 0;
+
+            $tree.html('');
+            if (displayedCategories.indexOf(SEARCH) !== -1) { createSearch($tree); }
+            var $div = $('<div>', {'class': 'cp-app-drive-tree-categories-container'})
+                .appendTo($tree);
+            if (displayedCategories.indexOf(RECENT) !== -1) { createRecent($div, [RECENT]); }
+            if (displayedCategories.indexOf(ROOT) !== -1) { createTree($div, [ROOT]); }
+            if (displayedCategories.indexOf(TEMPLATE) !== -1) { createTemplate($div, [TEMPLATE]); }
+            if (displayedCategories.indexOf(FILES_DATA) !== -1) { createAllFiles($div, [FILES_DATA]); }
+            if (displayedCategories.indexOf(TRASH) !== -1) { createTrash($div, [TRASH]); }
+
+            $tree.append(APP.$limit);
+            $categories = $tree.find('.cp-app-drive-tree-categories-container');
+            $categories.scrollTop(s);
+        };
+
+        APP.hideMenu = function () {
+            $contextMenu.hide();
+            $trashTreeContextMenu.hide();
+            $trashContextMenu.hide();
+            $contentContextMenu.hide();
+            $defaultContextMenu.hide();
+            $('.cp-dropdown-content').hide();
+        };
+
+        var stringifyPath = function (path) {
+            if (!Array.isArray(path)) { return; }
+            var $div = $('<div>');
+            var i = 0;
+            var space = 10;
+            path.forEach(function (s) {
+                if (i === 0) { s = getPrettyName(s); }
+                $div.append($('<span>', {'style': 'margin: 0 0 0 ' + i * space + 'px;'}).text(s));
+                $div.append($('<br>'));
+                i++;
+            });
+            return $div.html();
+        };
+
+        var getReadOnlyUrl = APP.getRO = function (id) {
+            if (!filesOp.isFile(id)) { return; }
+            var data = filesOp.getFileData(id);
+            if (!data) { return; }
+            var parsed = Cryptpad.parsePadUrl(data.href);
+            if (parsed.hashData.type !== "pad") { return; }
+            var i = data.href.indexOf('#') + 1;
+            var base = APP.origin + data.href.slice(0, i);
+            var hrefsecret = Cryptpad.getSecrets(parsed.type, parsed.hash);
+            if (!hrefsecret.keys) { return; }
+            var viewHash = Cryptpad.getViewHashFromKeys(hrefsecret.channel, hrefsecret.keys);
+            return base + viewHash;
+        };
+
+        // Disable middle click in the context menu to avoid opening /drive/inner.html# in new tabs
+        $(window).click(function (e) {
+            if (!e.target || !$(e.target).parents('.cp-dropdown-content').length) { return; }
+            if (e.which !== 1) {
+                e.stopPropagation();
+                return false;
+            }
+        });
+
+        var getProperties = function (el, cb) {
+            if (!filesOp.isFile(el)) {
+                return void cb('NOT_FILE');
+            }
+            var ro = filesOp.isReadOnlyFile(el);
+            var base = APP.origin;
+            var $d = $('<div>');
+            $('<strong>').text(Messages.fc_prop).appendTo($d);
+
+            var data = filesOp.getFileData(el);
+            if (!data || !data.href) { return void cb(void 0, $d); }
+
+            $('<br>').appendTo($d);
+            if (!ro) {
+                $('<label>', {'for': 'cp-app-drive-prop-link'}).text(Messages.editShare).appendTo($d);
+                $d.append(Cryptpad.dialog.selectable(base + data.href, {
+                    id: 'cp-app-drive-prop-link',
+                }));
+            }
+
+            var parsed = Cryptpad.parsePadUrl(data.href);
+            if (parsed.hashData && parsed.hashData.type === 'pad') {
+                var roLink = ro ? base + data.href : getReadOnlyUrl(el);
+                if (roLink) {
+                    $('<label>', {'for': 'cp-app-drive-prop-rolink'}).text(Messages.viewShare).appendTo($d);
+                    $d.append(Cryptpad.dialog.selectable(roLink, {
+                        id: 'cp-app-drive-prop-rolink',
+                    }));
+                }
+            }
+
+            if (data.tags && Array.isArray(data.tags)) {
+                $('<label>', {'for': 'cp-app-drive-prop-tags'}).text(Messages.fm_prop_tagsList).appendTo($d);
+                $d.append(Cryptpad.dialog.selectable(data.tags.join(', '), {
+                    id: 'cp-app-drive-prop-tags',
+                }));
+            }
+
+            if (APP.loggedIn && AppConfig.enablePinning) {
+                // check the size of this file...
+                common.getFileSize(data.href, function (e, bytes) {
+                    if (e) {
+                        // there was a problem with the RPC
+                        logError(e);
+
+                        // but we don't want to break the interface.
+                        // continue as if there was no RPC
+
+                        return void cb(void 0, $d);
+                    }
+                    var KB = Cryptpad.bytesToKilobytes(bytes);
+
+                    var formatted = Messages._getKey('formattedKB', [KB]);
+                    $('<br>').appendTo($d);
+
+                    $('<label>', {
+                        'for': 'cp-app-drive-prop-size'
+                    }).text(Messages.fc_sizeInKilobytes).appendTo($d);
+
+                    $d.append(Cryptpad.dialog.selectable(formatted, {
+                        id: 'cp-app-drive-prop-size',
+                    }));
+                    cb(void 0, $d);
+                });
+            } else {
+                cb(void 0, $d);
+            }
+        };
+
+        $contextMenu.on("click", "a", function(e) {
+            e.stopPropagation();
+            var paths = $(this).data('paths');
+            //var path = $(this).data('path');
+            //var $element = $(this).data('element');
+            if (paths.length === 0) {
+                log(Messages.fm_forbidden);
+                debug("Directory context menu on a forbidden or unexisting element. ", paths);
+                return;
+            }
+            if ($(this).hasClass("cp-app-drive-context-rename")) {
+                if (paths.length !== 1) { return; }
+                displayRenameInput(paths[0].element, paths[0].path);
+            }
+            else if($(this).hasClass("cp-app-drive-context-delete")) {
+                var pathsList = [];
+                paths.forEach(function (p) { pathsList.push(p.path); });
+                moveElements(pathsList, [TRASH], false, refresh);
+            }
+            else if ($(this).hasClass('cp-app-drive-context-open')) {
+                paths.forEach(function (p) {
+                    var $element = p.element;
+                    $element.click();
+                    $element.dblclick();
+                });
+            }
+            else if ($(this).hasClass('cp-app-drive-context-openro')) {
+                paths.forEach(function (p) {
+                    var el = filesOp.find(p.path);
+                    if (filesOp.isFolder(el)) { return; }
+                    var roUrl = getReadOnlyUrl(el);
+                    openFile(null, roUrl);
+                });
+            }
+            else if ($(this).hasClass('cp-app-drive-context-newfolder')) {
+                if (paths.length !== 1) { return; }
+                var onCreated = function (err, info) {
+                    if (err) { return void logError(err); }
+                    APP.newFolder = info.newPath;
+                    APP.displayDirectory(paths[0].path);
+                };
+                filesOp.addFolder(paths[0].path, null, onCreated);
+            }
+            else if ($(this).hasClass("cp-app-drive-context-properties")) {
+                if (paths.length !== 1) { return; }
+                var el = filesOp.find(paths[0].path);
+                getProperties(el, function (e, $prop) {
+                    if (e) { return void logError(e); }
+                    Cryptpad.alert($prop[0], undefined, true);
+                });
+            }
+            APP.hideMenu();
+        });
+
+        $defaultContextMenu.on("click", "a", function(e) {
+            e.stopPropagation();
+            var paths = $(this).data('paths');
+            if (paths.length === 0) {
+                log(Messages.fm_forbidden);
+                debug("Context menu on a forbidden or unexisting element. ", paths);
+                return;
+            }
+            if ($(this).hasClass('cp-app-drive-context-open')) {
+                paths.forEach(function (p) {
+                    var $element = p.element;
+                    $element.dblclick();
+                });
+            }
+            else if ($(this).hasClass('cp-app-drive-context-openro')) {
+                paths.forEach(function (p) {
+                    var el = filesOp.find(p.path);
+                    if (filesOp.isPathIn(p.path, [FILES_DATA])) { el = el.href; }
+                    if (!el || filesOp.isFolder(el)) { return; }
+                    var roUrl = getReadOnlyUrl(el);
+                    openFile(null, roUrl);
+                });
+            }
+            else if ($(this).hasClass('cp-app-drive-context-delete')) {
+                var pathsList = [];
+                paths.forEach(function (p) { pathsList.push(p.path); });
+                if (!APP.loggedIn) {
+                    var msg = Messages._getKey("fm_removeSeveralPermanentlyDialog", [paths.length]);
+                    if (paths.length === 1) {
+                        msg = Messages.fm_removePermanentlyDialog;
+                    }
+                    Cryptpad.confirm(msg, function(res) {
+                        $(window).focus();
+                        if (!res) { return; }
+                        filesOp.delete(pathsList, refresh);
+                    });
+                    return;
+                }
+                moveElements(pathsList, [TRASH], false, refresh);
+            }
+            else if ($(this).hasClass("cp-app-drive-context-properties")) {
+                if (paths.length !== 1) { return; }
+                var el = filesOp.find(paths[0].path);
+                getProperties(el, function (e, $prop) {
+                    if (e) { return void logError(e); }
+                    Cryptpad.alert($prop[0], undefined, true);
+                });
+            }
+            APP.hideMenu();
+        });
+
+        $contentContextMenu.on('click', 'a', function (e) {
+            e.stopPropagation();
+            var path = $(this).data('path');
+            var onCreated = function (err, info) {
+                if (err === E_OVER_LIMIT) {
+                    return void Cryptpad.alert(Messages.pinLimitDrive, null, true);
+                }
+                if (err) {
+                    return void Cryptpad.alert(Messages.fm_error_cantPin);
+                }
+                APP.newFolder = info.newPath;
+                refresh();
+            };
+            if ($(this).hasClass("cp-app-drive-context-newfolder")) {
+                filesOp.addFolder(path, null, onCreated);
+            }
+            else if ($(this).hasClass("cp-app-drive-context-newdoc")) {
+                var type = $(this).data('type') || 'pad';
+                sessionStorage[Cryptpad.newPadPathKey] = filesOp.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
+                window.open('/' + type + '/');
+            }
+            APP.hideMenu();
+        });
+
+        $trashTreeContextMenu.on('click', 'a', function (e) {
+            e.stopPropagation();
+            var paths = $(this).data('paths');
+            if (paths.length !== 1 || !paths[0].element || !filesOp.comparePath(paths[0].path, [TRASH])) {
+                log(Messages.fm_forbidden);
+                debug("Trash tree context menu on a forbidden or unexisting element. ", paths);
+                return;
+            }
+            if ($(this).hasClass("cp-app-drive-context-empty")) {
+                Cryptpad.confirm(Messages.fm_emptyTrashDialog, function(res) {
+                    if (!res) { return; }
+                    filesOp.emptyTrash(refresh);
+                });
+            }
+            APP.hideMenu();
+        });
+
+        $trashContextMenu.on('click', 'a', function (e) {
+            e.stopPropagation();
+            var paths = $(this).data('paths');
+            if (paths.length === 0) {
+                log(Messages.fm_forbidden);
+                debug("Trash context menu on a forbidden or unexisting element. ", paths);
+                return;
+            }
+            var path = paths[0].path;
+            var name = paths[0].path[paths[0].path.length - 1];
+            if ($(this).hasClass("cp-app-drive-context-remove")) {
+                if (paths.length === 1) {
+                    Cryptpad.confirm(Messages.fm_removePermanentlyDialog, function(res) {
+                        if (!res) { return; }
+                        filesOp.delete([path], refresh);
+                    });
+                    return;
+                }
+                var pathsList = [];
+                paths.forEach(function (p) { pathsList.push(p.path); });
+                var msg = Messages._getKey("fm_removeSeveralPermanentlyDialog", [paths.length]);
+                Cryptpad.confirm(msg, function(res) {
+                    if (!res) { return; }
+                    filesOp.delete(pathsList, refresh);
+                });
+            }
+            else if ($(this).hasClass("cp-app-drive-context-restore")) {
+                if (paths.length !== 1) { return; }
+                if (path.length === 4) {
+                    var el = filesOp.find(path);
+                    if (filesOp.isFile(el)) {
+                        name = filesOp.getTitle(el);
+                    } else {
+                        name = path[1];
+                    }
+                }
+                Cryptpad.confirm(Messages._getKey("fm_restoreDialog", [name]), function(res) {
+                    if (!res) { return; }
+                    filesOp.restore(path, refresh);
+                });
+            }
+            else if ($(this).hasClass("cp-app-drive-context-properties")) {
+                if (paths.length !== 1 || path.length !== 4) { return; }
+                var element = filesOp.find(path.slice(0,3)); // element containing the oldpath
+                var sPath = stringifyPath(element.path);
+                Cryptpad.alert('<strong>' + Messages.fm_originalPath + "</strong>:<br>" + sPath, undefined, true);
+            }
+            APP.hideMenu();
+        });
+
+        // Chrome considers the double-click means "select all" in the window
+        $content.on('mousedown', function (e) {
+            $content.focus();
+            e.preventDefault();
+        });
+        $appContainer.on('mouseup', function (e) {
+            //if (sel.down) { return; }
+            if (e.which !== 1) { return ; }
+            APP.hideMenu(e);
+            //removeSelected(e);
+        });
+        $appContainer.on('click', function (e) {
+            if (e.which !== 1) { return ; }
+            removeInput();
+            hideNewButton();
+        });
+        $appContainer.on('drag drop', function (e) {
+            removeInput();
+            APP.hideMenu(e);
+        });
+        $appContainer.on('mouseup drop', function () {
+            $('.cp-app-drive-element-droppable').removeClass('cp-app-drive-element-droppable');
+        });
+        $appContainer.on('keydown', function (e) {
+            // "Del"
+            if (e.which === 46) {
+                if (filesOp.isPathIn(currentPath, [FILES_DATA]) && APP.loggedIn) {
+                    return; // We can't remove elements directly from filesData
+                }
+                var $selected = $('.cp-app-drive-element-selected');
+                if (!$selected.length) { return; }
+                var paths = [];
+                var isTrash = filesOp.isPathIn(currentPath, [TRASH]);
+                $selected.each(function (idx, elmt) {
+                    if (!$(elmt).data('path')) { return; }
+                    paths.push($(elmt).data('path'));
+                });
+                // If we are in the trash or anon pad or if we are holding the "shift" key, delete permanently,
+                if (!APP.loggedIn || isTrash || e.shiftKey) {
+                    var msg = Messages._getKey("fm_removeSeveralPermanentlyDialog", [paths.length]);
+                    if (paths.length === 1) {
+                        msg = Messages.fm_removePermanentlyDialog;
+                    }
+
+                    Cryptpad.confirm(msg, function(res) {
+                        $(window).focus();
+                        if (!res) { return; }
+                        filesOp.delete(paths, refresh);
+                    });
+                    return;
+                }
+                // else move to trash
+                moveElements(paths, [TRASH], false, refresh);
+            }
+        });
+        $appContainer.contextmenu(function () {
+            APP.hideMenu();
+            return false;
+        });
+
+        var onRefresh = {
+            refresh: function() {
+                if (onRefresh.to) {
+                    window.clearTimeout(onRefresh.to);
+                }
+                onRefresh.to = window.setTimeout(refresh, 500);
+            }
+        };
+        proxy.on('change', [], function () {
+            if (history.isHistoryMode) { return; }
+            var path = arguments[2];
+            if (path[0] !== 'drive') { return false; }
+            path = path.slice(1);
+            var cPath = currentPath.slice();
+            if ((filesOp.isPathIn(cPath, ['hrefArray', TRASH]) && cPath[0] === path[0]) ||
+                    (path.length >= cPath.length && filesOp.isSubpath(path, cPath))) {
+                // Reload after a few ms to make sure all the change events have been received
+                onRefresh.refresh();
+            } else if (path.length && path[0] === FILES_DATA) {
+                onRefresh.refresh();
+            }
+            APP.resetTree();
+            return false;
+        }).on('remove', [], function () {
+            if (history.isHistoryMode) { return; }
+            var path = arguments[1];
+            if (path[0] !== 'drive') { return false; }
+            path = path.slice(1);
+            var cPath = currentPath.slice();
+            if ((filesOp.isPathIn(cPath, ['hrefArray', TRASH]) && cPath[0] === path[0]) ||
+                    (path.length >= cPath.length && filesOp.isSubpath(path, cPath))) {
+                // Reload after a few to make sure all the change events have been received
+                onRefresh.to = window.setTimeout(refresh, 500);
+            }
+            APP.resetTree();
+            return false;
+        }).on('change', ['drive', 'migrate'], function () {
+            var path = arguments[2];
+            var value = arguments[1];
+            if (path[1] === "migrate" && value === 1) {
+                if (APP.onDisconnect) { APP.onDisconnect(true); }
+            }
+        });
+
+        history.onEnterHistory = function (obj) {
+            var files = obj.drive;
+            filesOp = FO.init(files, config);
+            appStatus.isReady = true;
+            refresh();
+        };
+        history.onLeaveHistory = function () {
+            var files = proxy.drive;
+            filesOp = FO.init(files, config);
+            refresh();
+        };
+
+        var fmConfig = {
+            noHandlers: true,
+            onUploaded: function (ev, data) {
+                try {
+                    // Get the folder path
+                    console.log(ev.target);
+                    console.log(data);
+                    var newPath = findDropPath(ev.target);
+                    if (!newPath) { return void refresh(); }
+                    var href = data.url;
+                    // Get the current file location in ROOT
+                    var id = filesOp.getIdFromHref(href);
+                    var paths = filesOp.findFile(id);
+                    if (paths.length !== 1) { return; }
+                    // Try to move and refresh
+                    moveElements([paths[0]], newPath, true);
+                    refresh();
+                } catch (e) {
+                    console.error(e);
+                    refresh();
+                }
+            },
+            body: $('body')
+        };
+        APP.FM = common.createFileManager(fmConfig);
+
+        refresh();
+        Cryptpad.removeLoadingScreen();
+    };
+
+    var setHistory = function (bool, update) {
+        history.isHistoryMode = bool;
+        setEditable(!bool);
+        if (!bool && update) {
+            history.onLeaveHistory();
+        }
+    };
+
+    var migrateAnonDrive = function (proxy, cb) {
+        if (sessionStorage.migrateAnonDrive) {
+            Merge.anonDriveIntoUser(proxy, function () {
+                delete sessionStorage.migrateAnonDrive;
+                if (typeof(cb) === "function") { cb(); }
+            });
+        } else {
+            if (typeof(cb) === "function") { cb(); }
+        }
+    };
+
+    var main = function () {
+        var common;
+        var proxy;
+
+        nThen(function (waitFor) {
+            $(waitFor(function () {
+                Cryptpad.addLoadingScreen();
+            }));
+            window.cryptpadStore.getAll(waitFor(function (val) {
+                APP.store = JSON.parse(JSON.stringify(val));
+            }));
+            SFCommon.create(waitFor(function (c) { APP.common = common = c; }));
+        }).nThen(function (waitFor) {
+            var privReady = Util.once(waitFor());
+            var metadataMgr = common.getMetadataMgr();
+            if (JSON.stringify(metadataMgr.getPrivateData()) !== '{}') {
+                privReady();
+                return;
+            }
+            metadataMgr.onChange(function () {
+                if (typeof(metadataMgr.getPrivateData().readOnly) === 'boolean') {
+                    readOnly = metadataMgr.getPrivateData().readOnly;
+                    privReady();
+                }
+            });
+        }).nThen(function (/* waitFor */) {
+            APP.loggedIn = common.isLoggedIn();
+            APP.SFCommon = common;
+            if (!APP.loggedIn) { common.feedback('ANONYMOUS_DRIVE'); }
+            APP.$body = $('body');
+            APP.$bar = $('#cp-toolbar');
+
+            common.setTabTitle(Messages.type.drive);
+
+            var listmapConfig = {
+                data: {},
+                common: common,
+                logging: false
+            };
+
+            var metadataMgr;
+            var rt = APP.rt = Listmap.create(listmapConfig);
+            proxy = rt.proxy;
+            var onCreate = function (info) {
+                var realtime = APP.realtime = info.realtime;
+
+                APP.patchText = TextPatcher.create({
+                    realtime: realtime,
+                    logging: true,
+                });
+
+                metadataMgr = common.getMetadataMgr();
+                readOnly = metadataMgr.getPrivateData().readOnly;
+
+                var configTb = {
+                    displayed: ['useradmin', 'pageTitle', 'newpad', 'limit'],
+                    pageTitle: Messages.type.drive,
+                    metadataMgr: metadataMgr,
+                    readOnly: readOnly,
+                    realtime: info.realtime,
+                    common: Cryptpad,
+                    sfCommon: common,
+                    $container: APP.$bar
+                };
+                toolbar = APP.toolbar = Toolbar.create(configTb);
+
+                var $rightside = toolbar.$rightside;
+                $rightside.html(''); // Remove the drawer if we don't use it to hide the toolbar
+                var $userBlock = toolbar.$userAdmin;
+                APP.$displayName = APP.$bar.find('.' + Toolbar.constants.username);
+
+                /* add the usage */
+                common.createUsageBar(function (err, $limitContainer) {
+                    if (err) { return void logError(err); }
+                    APP.$limit = $limitContainer;
+                }, true);
+
+                /* add a history button */
+                APP.histConfig = {
+                    onLocal: function () {
+                        proxy.drive = history.currentObj.drive;
+                    },
+                    onRemote: function () {},
+                    setHistory: setHistory,
+                    applyVal: function (val) {
+                        var obj = JSON.parse(val || '{}');
+                        history.currentObj = obj;
+                        history.onEnterHistory(obj);
+                    },
+                    $toolbar: APP.$bar,
+                };
+
+                /* TODO iframe: backup button here?
+                if (!readOnly && !APP.loggedIn) {
+                    // TODO secure drive
+                    // cryptpad-backup --> cp-toolbar-backup
+                    var $backupButton = Cryptpad.createButton('', true).removeClass('fa').removeClass('fa-question').addClass('cryptpad-backup');
+                    $backupButton.append($backupIcon.clone().css('marginRight', '0px'));
+                    $backupButton.attr('title', Messages.fm_backup_title);
+                    $backupButton.on('click', function() {
+                        var url = window.location.origin + window.location.pathname + '#' + editHash;
+                        var msg = Messages.fm_alert_backupUrl + '<input type="text" readonly="readonly" id="fm_backupUrl" value="'+url+'">';
+                        Cryptpad.alert(msg, undefined, true);
+                        $('#fm_backupUrl').val(url);
+                        $('#fm_backupUrl').click(function () {
+                            $(this).select();
+                        });
+                    });
+                    $userBlock.append($backupButton);
+                }
+                */
+
+                metadataMgr.onChange(function () {
+                    var name = metadataMgr.getUserData().name || Messages.anonymous;
+                    APP.$displayName.text(name);
+                });
+            };
+            var onReady = function () {
+                $('body').css('display', '');
+                APP.files = proxy;
+                if (!proxy.drive || typeof(proxy.drive) !== 'object') { proxy.drive = {}; }
+                andThen(common, proxy);
+                Cryptpad.removeLoadingScreen();
+            };
+            var onDisconnect = APP.onDisconnect = function (noAlert) {
+                setEditable(false);
+                if (APP.refresh) { APP.refresh(); }
+                APP.toolbar.failed();
+                if (!noAlert) { Cryptpad.alert(Messages.common_connectionLost, undefined, true); }
+            };
+            var onReconnect = function (info) {
+                setEditable(true);
+                if (APP.refresh) { APP.refresh(); }
+                APP.toolbar.reconnecting(info.myId);
+                Cryptpad.findOKButton().click();
+            };
+
+            proxy.on('create', function (info) {
+                onCreate(info);
+            }).on('ready', function () {
+                onReady();
+            });
+            proxy.on('disconnect', function () {
+                onDisconnect();
+            });
+            proxy.on('reconnect', function (info) {
+                onReconnect(info);
+            });
+
+            Cryptpad.onError(function (info) {
+                if (info && info.type === "store") {
+                    onConnectError();
+                }
+            });
+            //Cryptpad.onLogout(function () { setEditable(false); });
+        });
+    };
+    main();
+});
diff --git a/www/newdrive/main.js b/www/newdrive/main.js
new file mode 100644
index 000000000..ac4df8914
--- /dev/null
+++ b/www/newdrive/main.js
@@ -0,0 +1,53 @@
+// Load #1, load as little as possible because we are in a race to get the loading screen up.
+define([
+    '/bower_components/nthen/index.js',
+    '/api/config',
+    'jquery',
+    '/common/requireconfig.js',
+    '/common/sframe-common-outer.js',
+    '/common/cryptpad-common.js',
+    '/bower_components/netflux-websocket/netflux-client.js',
+], function (nThen, ApiConfig, $, RequireConfig, SFCommonO, Cryptpad, Netflux) {
+    var requireConfig = RequireConfig();
+
+    // Loaded in load #2
+    nThen(function (waitFor) {
+        $(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 + '/newdrive/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 getSecrets = function (Cryptpad) {
+            var hash = window.location.hash.slice(1) || Cryptpad.getUserHash() || localStorage.FS_hash;
+            return Cryptpad.getSecrets('drive', hash);
+        };
+        Netflux.connect(Cryptpad.getWebsocketURL()).then(function (network) {
+            SFCommonO.start({
+                getSecrets: getSecrets,
+                newNetwork: network,
+                noHash: true
+            });
+        }, function (err) { console.error(err); });
+    });
+});
diff --git a/www/pad/inner.html b/www/pad/inner.html
index 59e3d2652..03d635730 100644
--- a/www/pad/inner.html
+++ b/www/pad/inner.html
@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/pad/inner.js" data-main="/common/sframe-boot.js?ver=1.5" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/pad/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
 </head>
 <body class="cp-app-pad">
     <textarea style="display:none" id="editor1" name="editor1"></textarea>
diff --git a/www/settings/main.js b/www/settings/main.js
index a94cf7141..e2464acee 100644
--- a/www/settings/main.js
+++ b/www/settings/main.js
@@ -381,7 +381,7 @@ define([
                 if (!yes) { return; }
                 $spinner.show();
                 $ok.hide();
-                Merge.anonDriveIntoUser(obj.proxy, function () {
+                Merge.anonDriveIntoUser(obj, localStorage.FS_hash, function () {
                     $spinner.hide();
                     $ok.show();
                     Cryptpad.alert(Messages.settings_importDone);
diff --git a/www/slide/inner.html b/www/slide/inner.html
index 34fcd4ddf..b7f831ccd 100644
--- a/www/slide/inner.html
+++ b/www/slide/inner.html
@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll cp-app-print">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/slide/inner.js" data-main="/common/sframe-boot.js?ver=1.5" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/slide/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
         #editor1 { display: none; }
diff --git a/www/whiteboard/app-whiteboard.less b/www/whiteboard/app-whiteboard.less
index cd7a27e38..848fd994c 100644
--- a/www/whiteboard/app-whiteboard.less
+++ b/www/whiteboard/app-whiteboard.less
@@ -3,6 +3,7 @@
 @import (once) "../../customize/src/less2/include/markdown.less";
 @import (once) '../../customize/src/less2/include/fileupload.less';
 @import (once) '../../customize/src/less2/include/alertify.less';
+@import (once) '../../customize/src/less2/include/tools.less';
 
 .toolbar_main();
 .fileupload_main();
@@ -37,12 +38,7 @@
     }
 
     .cp-app-whiteboard-unselectable {
-        -webkit-touch-callout: none;
-        -webkit-user-select: none;
-        -khtml-user-select: none;
-        -moz-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
+        .tools_unselectable();
     }
 
     // contains user tools
diff --git a/www/whiteboard/inner.html b/www/whiteboard/inner.html
index 076a78285..b2349ab88 100644
--- a/www/whiteboard/inner.html
+++ b/www/whiteboard/inner.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/whiteboard/inner.js" data-main="/common/sframe-boot.js?ver=1.5" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/whiteboard/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
         #editor1 { display: none; }