diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 150aaf78b..1d07bef96 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -349,20 +349,26 @@ define([
                     }),
                     h('div.checkbox-container', [
                         h('input#import-recent', {
+                            name: 'import-recent',
                             type: 'checkbox',
                             checked: true
                         }),
-                        h('label', {
+                        // hscript doesn't generate for on label for some
+                        // reason... use jquery as a temporary fallback
+                        setHTML($('<label for="import-recent"></label>')[0], Msg.register_importRecent)
+                        /*h('label', {
                             'for': 'import-recent',
-                        }, Msg.register_importRecent),
+                        }, Msg.register_importRecent),*/
                     ]),
                     h('div.checkbox-container', [
                         h('input#accept-terms', {
+                            name: 'accept-terms',
                             type: 'checkbox'
                         }),
-                        setHTML(h('label', {
+                        setHTML($('<label for="accept-terms"></label>')[0], Msg.register_acceptTerms)
+                        /*setHTML(h('label', {
                             'for': 'accept-terms',
-                        }), Msg.register_acceptTerms),
+                        }), Msg.register_acceptTerms),*/
                     ]),
                     h('button#register.btn.btn-primary', Msg.login_register)
                 ])
diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index d667aa1cf..1a791bc04 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -2,25 +2,25 @@
 @import (once) "./browser.less";
 
 .alertify_main () {
-    @alertify-fore: @colortheme_old-fore;
-    @alertify-base: @colortheme_old-base;
+    @alertify-fore: @colortheme_modal-fg;
+    @alertify-base: @colortheme_modal-bg;
 
-    @alertify-dialog-bg: #222;
-    @alertify-dialog-fg: @colortheme_old-fore;
+    @alertify-dialog-bg: @alertify-base;
+    @alertify-dialog-fg: @alertify-fore;
 
-    @alertify-btn-fg: @colortheme_old-fore;
+    @alertify-btn-fg: @alertify-fore;
 
     @alertify-btn-bg: rgba(200, 200, 200, 0.1);
     @alertify-btn-bg-hover: rgba(200, 200, 200, .3);
 
-    @alertify-bg: rgba(0, 0, 0, .4);
-    @alertify-fg: @colortheme_old-fore;
+    @alertify-bg: @colortheme_modal-dim;
+    @alertify-fg: @alertify-fore;
 
-    @alertify-input-bg: @colortheme_old-base;
-    @alertify-input-fg: @colortheme_old-fore;
+    @alertify-input-bg: @colortheme_modal-input;
+    @alertify-input-fg: @colortheme_modal-fg;
 
-    @alertify_padding-base: 12px;
-    @alertify_box-shadow: 0 2px 5px 0 rgba(0,0,0,.2);
+    @alertify_padding-base: @colortheme_modal-padding;
+    @alertify_box-shadow: @colortheme_modal-shadow;
 
     // Logs to show that something has happened
     // These show only once
@@ -33,7 +33,7 @@
             padding: @alertify_padding-base @alertify_padding-base * 4;
             color: @alertify-fore;
 
-            font-weight: bold;
+            font-family: @colortheme_font;
             font-size: large;
 
             box-shadow: @alertify_box-shadow;
@@ -42,10 +42,11 @@
                 background: rgba(0, 0, 0, .8);
             }
             &.error {
+                font-weight: bold;
                 background: @colortheme_cp-red;
             }
             &.success {
-                background: @colortheme_cp-green;
+                background: rgba(0, 0, 0, .8);
             }
         }
     }
@@ -123,7 +124,7 @@
                 margin: 0;
             }
 
-            input:not(.form-control){
+            input:not(.form-control), textarea {
                 background-color: @alertify-input-bg;
                 color: @alertify-input-fg; 
                 border: 0px;
@@ -136,6 +137,13 @@
                     //outline-offset: -2px;
                 }
             }
+
+            input[type="checkbox"] {
+                padding: 0;
+                margin: 0;
+                margin-right: 0.5em;
+            }
+
             nav {
 
                 text-align: right;
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 822c7bf47..a1e02d9d4 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -13,9 +13,19 @@
 @colortheme_cp-red: #FA5858; // remove red
 @colortheme_cp-green: #46E981;
 
+@colortheme_modal-bg: #222;
+@colortheme_modal-fg: #fff;
+@colortheme_modal-dim: rgba(0, 0, 0, 0.4);
+@colortheme_modal-padding: 12px;
+@colortheme_modal-shadow: 0 8px 32px 0 rgba(0,0,0,.4);
+
+@colortheme_modal-input: #111;
+
 @colortheme_alertify-red: #E55236;
 @colortheme_alertify-green: #77C825;
 
+// Apps
+
 @colortheme_pad-bg: #1c4fa0;
 @colortheme_pad-color: #fff;
 
@@ -50,4 +60,4 @@
 @colortheme_profile-color: #fff;
 
 @cryptpad_color_blue: #4591C4; 
-@cryptpad_color_grey: #999999;
\ No newline at end of file
+@cryptpad_color_grey: #999999;
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index a074faab7..437d91de6 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1397,23 +1397,42 @@ define([
         }
     };
 
+    // This is duplicated in drive/main.js, it should be unified
+    var getFileIcon = function (data) {
+        var $icon = common.getIcon();
+
+        if (!data) { return $icon; }
+
+        var href = data.href;
+        if (!href) { return $icon; }
+
+        if (href.indexOf('/pad/') !== -1) { $icon = common.getIcon('pad'); }
+        else if (href.indexOf('/code/') !== -1) { $icon = common.getIcon('code'); }
+        else if (href.indexOf('/slide/') !== -1) { $icon = common.getIcon('slide'); }
+        else if (href.indexOf('/poll/') !== -1) { $icon = common.getIcon('poll'); }
+        else if (href.indexOf('/whiteboard/') !== -1) { $icon = common.getIcon('whiteboard'); }
+        else if (href.indexOf('/file/') !== -1) { $icon = common.getIcon('file'); }
+
+        return $icon;
+    };
 
     common.createFileDialog = function (cfg) {
         var $body = cfg.$body || $('body');
-        var $block = $body.find('#fileDialog');
-        if (!$block.length) {
-            $block = $('<div>', {id: "fileDialog"}).appendTo($body);
+        var $blockContainer = $body.find('#fileDialog');
+        if (!$blockContainer.length) {
+            $blockContainer = $('<div>', {id: "fileDialog"}).appendTo($body);
         }
-        $block.html('');
+        $blockContainer.html('');
+        var $block = $('<div>', {'class': 'cp-modal'}).appendTo($blockContainer);
         $('<span>', {
             'class': 'close fa fa-times',
             'title': Messages.filePicker_close
         }).click(function () {
-            $block.hide();
+            $blockContainer.hide();
         }).appendTo($block);
         var $description = $('<p>').text(Messages.filePicker_description);
         $block.append($description);
-        var $filter = $('<p>').appendTo($block);
+        var $filter = $('<p>', {'class': 'cp-form'}).appendTo($block);
         var $container = $('<span>', {'class': 'fileContainer'}).appendTo($block);
         var updateContainer = function () {
             $container.html('');
@@ -1426,11 +1445,15 @@ define([
                 if (filter && name.toLowerCase().indexOf(filter.toLowerCase()) === -1) {
                     return;
                 }
-                var $span = $('<span>', {'class': 'element'}).appendTo($container);
-                var $inner = $('<span>').text(name);
-                $span.append($inner).click(function () {
+                var $span = $('<span>', {
+                    'class': 'element',
+                    'title': name,
+                }).appendTo($container);
+                $span.append(getFileIcon(data));
+                $span.append(name);
+                $span.click(function () {
                     if (typeof cfg.onSelect === "function") { cfg.onSelect(data.href); }
-                    $block.hide();
+                    $blockContainer.hide();
                 });
             });
         };
@@ -1446,13 +1469,13 @@ define([
         //$filter.append(' '+Messages.or+' ');
         var data = {FM: cfg.data.FM};
         $filter.append(common.createButton('upload', false, data, function () {
-            $block.hide();
+            $blockContainer.hide();
         }));
         updateContainer();
         $body.keydown(function (e) {
-            if (e.which === 27) { $block.hide(); }
+            if (e.which === 27) { $blockContainer.hide(); }
         });
-        $block.show();
+        $blockContainer.show();
     };
 
 
diff --git a/www/common/file-dialog.less b/www/common/file-dialog.less
index 76840feeb..aac18f274 100644
--- a/www/common/file-dialog.less
+++ b/www/common/file-dialog.less
@@ -1,39 +1,101 @@
+@import (once) '../customize/src/less2/include/colortheme.less';
+
 #fileDialog {
-    position: absolute;
-    background-color: rgba(200, 200, 200, 0.8);
-    top: 15vh; bottom: 15vh;
-    left: 10vw; right: 10vw;
-    border: 1px solid black;
-    z-index: 100000;
-    overflow: auto;
     display: none;
-    font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
-    font-size: 16px;
-    text-align: center;
-    .close {
+
+    z-index: 100000;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background-color: @colortheme_modal-dim;
+
+    .cp-modal {
+        background-color: @colortheme_modal-bg;
+        color: @colortheme_modal-fg;
+        box-shadow: @colortheme_modal-shadow;
+
+        padding: @colortheme_modal-padding;
+
         position: absolute;
-        top: 0;
-        right: 0;
-        padding: 5px;
-        cursor: pointer;
-    }
-    .element {
-        cursor: pointer;
-        display: inline-flex;
-        width: 100px;
-        height: 100px;
-        border: 1px solid #ccc;
-        margin: 5px;
-        overflow: hidden;
-        word-wrap: break-word;
-        background-color: white;
-        padding: 5px;
-        align-items: center;
-        span {
-            width: 100px;
-            text-align: center;
+        top: 15vh; bottom: 15vh;
+        left: 10vw; right: 10vw;
+
+        overflow: auto;
+
+        font-family: @colortheme_font;
+        text-align: center;
+
+        & > p {
+            margin-bottom: 1em;
+        }
+
+        .cp-form {
+            display: flex;
+            flex-wrap: wrap;
+            align-items: center;
+            justify-content: center;
         }
-    }
-}
 
+        input {
+            background-color: @colortheme_modal-input;
+            color: @colortheme_modal-fg;
+            border: 0;
+            padding: 8px 12px;
+            margin: 1em;
+        }
+
+        .close {
+            text-shadow: none;
+            color: inherit;
+
+            position: absolute;
+            top: 0;
+            right: 0;
+            margin: @colortheme_modal-padding;
+            cursor: pointer;
+        }
+
+        .fileContainer {
+            display: flex;
+            flex-wrap: wrap;
+            overflow-y: auto;
+        }
+
+        .element {
+            @darker: darken(@colortheme_modal-fg, 30%);
+
+            width: 200px;
+            min-width: 200px;
+            height: 1em;
+            padding: 0.5em;
+            margin: 5px;
+            box-sizing: content-box;
+
+            text-align: left;
+            line-height: 1em;
+            cursor: pointer;
 
+            background-color: #111;
+            color: @darker;
+
+            transition: all 0.1s;
+
+            &:hover {
+                color: @colortheme_modal-fg;
+            }
+
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+
+            align-items: center;
+
+            .fa {
+                cursor: pointer;
+                margin-right: 0.5em;
+            }
+        }
+    }
+}
diff --git a/www/drive/main.js b/www/drive/main.js
index 098154ad0..b1b764336 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1146,6 +1146,7 @@ define([
             $span.append($name).append($subfolders).append($files);
         };
 
+        // This is duplicated in cryptpad-common, it should be unified
         var getFileIcon = function (id) {
             var $icon = Cryptpad.getIcon();
 
diff --git a/www/poll/main.js b/www/poll/main.js
index ecb308a36..7bef35e6d 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -621,6 +621,12 @@ var ready = function (info, userid, readOnly) {
         .on('change', ['table'], change)
         .on('remove', [], change);
 
+    var userInput = $('.uncommitted > input');
+    if (userInput.val() === '')
+    {
+        userInput.val(Cryptpad.getProxy()[Cryptpad.displayNameKey]);
+    }
+
     UserList.addToUserData(APP.proxy.info.userData);
 
     APP.ready = true;
diff --git a/www/poll/poll.less b/www/poll/poll.less
index 6153f320e..ddc0ea502 100644
--- a/www/poll/poll.less
+++ b/www/poll/poll.less
@@ -29,6 +29,7 @@ body {
     flex: 1;
     #poll {
         flex: 1;
+        overflow-y: auto;
     }
 }