diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index a08e40d3c..5178cac17 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -384,7 +384,8 @@ define([
                 var item = faq[c][q];
                 if (typeof item !== "object") { return; }
                 var answer = h('p.cp-faq-questions-a');
-                var question = h('p.cp-faq-questions-q');
+                var hash = c + '-' + q;
+                var question = h('p.cp-faq-questions-q#' + hash);
                 $(question).click(function () {
                     if ($(answer).is(':visible')) {
                         return void $(answer).slideUp();
@@ -401,6 +402,10 @@ define([
                 h('div.cp-faq-category-questions', questions)
             ]));
         });
+        var hash = window.location.hash;
+        if (hash) {
+            $(categories).find(hash).click();
+        }
         return h('div#cp-main', [
             infopageTopbar(),
             h('div.container.cp-container', [
diff --git a/customize.dist/src/less2/include/checkmark.less b/customize.dist/src/less2/include/checkmark.less
new file mode 100644
index 000000000..30c6e7d4a
--- /dev/null
+++ b/customize.dist/src/less2/include/checkmark.less
@@ -0,0 +1,67 @@
+@import (once) "./colortheme-all.less";
+
+.checkmark_main(@size) {
+
+    @width: round(@size / 8);
+    @dim1: round(@size / 3);
+    @dim2: round(2 * @size / 3);
+    @top: round(@size / 12);
+    // <label.cp-checkmark><input><span.cp-checkmark-mark></span>Text</label>
+    .cp-checkmark {
+        margin: 0;
+        display: flex;
+        align-items: center;
+        position: relative;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+
+        &.cp-checkmark-secondary {
+            .cp-checkmark-mark {
+                &:after {
+                    border-color: @colortheme_checkmark-col2;
+                }
+            }
+            input {
+                &:checked ~ .cp-checkmark-mark {
+                    background-color: @colortheme_checkmark-back2;
+                }
+            }
+        }
+        &:hover .cp-checkmark-mark {
+            background-color: @colortheme_checkmark-back0-active;
+        }
+
+        input {
+            display: none;
+            &:checked ~ .cp-checkmark-mark {
+                background-color: @colortheme_checkmark-back1;
+                &:after {
+                    display: block;
+                }
+            }
+        }
+
+        .cp-checkmark-mark {
+            margin-right: 10px;
+            position: relative;
+            height: @size;
+            width: @size;
+            background-color: @colortheme_checkmark-back0;
+            display: flex;
+            justify-content: center;
+            &:after {
+                content: "";
+                display: none;
+                margin-top: @top;
+                width: @dim1;
+                height: @dim2;
+                transform: rotate(45deg);
+                border: solid @colortheme_checkmark-col1;
+                border-width: 0 @width @width 0;
+            }
+        }
+
+    }
+}
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 1a2b143e5..1bdb69291 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -109,3 +109,10 @@
 @cryptpad_color_grey: #999999;
 @cryptpad_header_col: #1E1F1F;
 @cryptpad_text_col: #3F4141;
+
+@colortheme_checkmark-back0: #ffffff;
+@colortheme_checkmark-back0-active: #bbbbbb;
+@colortheme_checkmark-back1: #FF0073;
+@colortheme_checkmark-col1: #ffffff;
+@colortheme_checkmark-back2: #FFFFFF;
+@colortheme_checkmark-col2: #000000;
diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index 16bce0637..c07fcc849 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -1,5 +1,7 @@
 @import (once) "./colortheme-all.less";
 @import (once) "./tools.less";
+@import (once) "./checkmark.less";
+@import (once) './icon-colors.less';
 
 .creation_main() {
     .tippy-popper {
@@ -31,149 +33,205 @@
             max-width: 100%;
             margin: 40px auto;
             text-align: left;
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: center;
-            align-items: center;
-            h2 {
-                width: 100%;
-                display: flex;
-                margin-bottom: 20px;
-                justify-content: space-between;
-                .cp-creation-help {
-                    display: none;
-                }
-            }
-            .cp-creation-help-container {
-                width: 100%;
-                display: flex;
-                justify-content: space-between;
-                p {
-                    padding: 0 20px;
-                    flex-grow: 0;
-                    flex-shrink: 0;
-                    flex-basis: 50%;
-                    text-align: justify;
-                }
-            }
-            @media screen and (max-width: 500px) {
-                width: ~"calc(100% - 30px)";
-            }
-            @media screen and (max-height: 800px), screen and (max-width: 500px) {
-                h2 .cp-creation-help {
-                    display: inline;
-                }
-                .cp-creation-help-container {
-                    display: none;
-                }
-            }
-            @media screen and (min-height: 601px) {
-                @media screen and (min-width: 501px) {
-                    p {
-                        display: block !important;
-                    }
-                }
-            }
         }
 
         .cp-creation-create, .cp-creation-settings {
+            @creation-button: #FF0073;
             button {
                 .tools_unselectable();
                 padding: 15px;
-                background: darken(@colortheme_loading-bg, 10%);
-                color: @colortheme_loading-color;
+                background: #30b239;
+                color: #FFF;
+                font-weight: bold;
                 margin: 3px 10px;
                 border: none;
                 cursor: pointer;
                 outline: none;
                 &:hover {
-                    background: darken(@colortheme_loading-bg, 5%);
-                }
-                &.cp-creation-button-selected {
-                    color: darken(@colortheme_loading-bg, 10%);
-                    background: @colortheme_loading-color;
+                    background: darken(@creation-button, 5%);
                 }
             }
         }
+        .cp-creation-create {
+            text-align: center;
+        }
 
-        input[type="radio"] {
-            display: none;
-            &:checked {
-                & + label {
-                    font-weight: bold;
-                    background-color: lighten(@colortheme_loading-bg, 20%);
-                    cursor: default;
-                    border: 1px solid #c1158e;
-                    &:hover {
-                        background-color: lighten(@colortheme_loading-bg, 20%);
+        #cp-creation-form {
+            display: flex;
+            flex-flow: column;
+            align-items: center;
+            & > div {
+                width: 400px;
+                max-width: 100%;
+                display: flex;
+                align-items: center;
+                flex-wrap: wrap;
+                font-size: 16px;
+                margin: 10px 0;
+                label {
+                    flex: 1;
+                }
+                input[type="checkbox"] {
+                    &+ label {
+                        margin-bottom: 0;
+                        flex: 1;
+                        padding: 0 10px;
                     }
                 }
-            }
-        }
-        input[type="radio"] + label {
-            .tools_unselectable();
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-            width: 200px;
-            height: 50px;
-            padding: 5px;
-            margin: 0 20px;
-            border: 1px solid @colortheme_loading-color;
-            cursor: pointer;
-            &:hover {
-                background-color: lighten(@colortheme_loading-bg, 10%);
-            }
-        }
-        .cp-creation-expire {
-            #cp-creation-expire-true {
-                display: none;
-                &:checked {
-                    & + label {
-                        height: 100px;
-                        .cp-creation-expire-picker {
-                            display: inline;
-                        }
+                .cp-creation-help {
+                    font-size: 18px;
+                    color: white;
+                    &:hover {
+                        color: #AAA;
+                        text-decoration: none;
                     }
                 }
             }
-            label[for="cp-creation-expire-true"] {
-                flex-wrap: wrap;
+            .cp-creation-expire {
                 .cp-creation-expire-picker {
-                    display: none;
+                    display: block;
+                    overflow: hidden;
+                    max-height: 0px;
+                    transition: max-height 0.5s ease-in-out;
+                    width: 100%;
+                    text-align: center;
+                    margin-top: 10px;
+                    input {
+                        width: 100px;
+                    }
                 }
-                input {
-                    width: 70px;
+                .cp-creation-expire-picker.active {
+                    max-height: 40px;
                 }
-                select {
-                    width: 100px;
+            }
+            .cp-creation-settings {
+                button {
+                    margin: 0;
+                    padding: 0;
                 }
-                input, select {
-                    border: none;
-                    height: 30px;
-                    background: @colortheme_loading-bg;
-                    color: @colortheme_loading-color;
-                    border-radius: 3px;
+                .cp-filler { flex: 1; }
+            }
+
+            div.cp-creation-template {
+                width: 100%;
+                background-color: darken(@colortheme_modal-bg, 3%);
+                padding: 20px;
+                margin: 30px 0;
+            }
+            .cp-creation-template-container {
+                width: 100%;
+                display: flex;
+                flex-wrap: wrap;
+                justify-content: center;
+                overflow-y: auto;
+                align-items: center;
+                .cp-creation-template-element {
+                    @darker: darken(@colortheme_modal-fg, 30%);
+
+                    width: 125px;
+                    padding: 10px;
+                    margin: 5px;
+                    display: inline-flex;
+                    flex-flow: column;
+
+                    box-sizing: content-box;
+
+                    text-align: left;
+                    line-height: 1em;
+                    cursor: pointer;
+
+                    background-color: #111;
+                    color: @darker;
+                    border: 1px solid transparent;
+
+                    &.cp-creation-template-selected {
+                        border: 1px solid white;
+                        background-color: #222;
+                    }
+
+                    transition: all 0.1s;
+
+                    &:hover {
+                        color: @colortheme_modal-fg;
+                    }
+
+                    align-items: center;
+
+                    img {
+                        max-width: 100px;
+                        max-height: 100px;
+                        background: #fff;
+                    }
+
+                    .cp-creation-template-element-name {
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                        height: 20px;
+                        line-height: 20px;
+                        margin-top: 5px;
+                        max-width: 100%;
+                    }
+                    .fa {
+                        cursor: pointer;
+                        width: 100px;
+                        height: 100px;
+                        font-size: 70px;
+                        text-align: center;
+                        line-height: 100px;
+                    }
                 }
             }
         }
-        .cp-creation-settings {
-            justify-content: left;
-            a {
-                color: #0275d8;
-                &:hover {
-                    color: lighten(#0275d8, 10%);
-                }
+
+        .cp-creation-deleted-container {
+            text-align: center;
+            .cp-creation-deleted {
+                background: #111;
+                padding: 10px;
+                text-align: center;
+                font-weight: bold;
+                display: inline-block;
             }
-            &> span.fa {
-                margin-left: 15px;
+        }
+
+        .checkmark_main(30px);
+
+        @media screen and (max-width: @browser_media-narrow-screen) {
+            & > div {
+                width: 95%;
+                margin: 10px auto;
             }
         }
-        .cp-creation-deleted {
-            background: #111;
-            padding: 10px;
-            text-align: justify;
-            font-weight: bold;
+        @media screen and (max-width: @browser_media-medium-screen) {
+            #cp-creation-form {
+                div.cp-creation-template {
+                    margin: 0;
+                    padding: 5px;
+                    .cp-creation-template-container {
+                        .cp-creation-template-element {
+                            flex-flow: row;
+                            margin: 1px;
+                            padding: 5px;
+                            img {
+                                display: none;
+                            }
+                            .fa {
+                                font-size: 18px;
+                                width: 20px;
+                                height: 20px;
+                                line-height: 20px;
+                                display: inline !important;
+                            }
+                            .cp-creation-template-element-name {
+                                margin: 0;
+                                margin-left: 5px;
+                            }
+                        }
+                    }
+                }
+            }
         }
+
     }
 }
diff --git a/customize.dist/template.js b/customize.dist/template.js
index 2aed683ce..9285567ca 100644
--- a/customize.dist/template.js
+++ b/customize.dist/template.js
@@ -108,6 +108,8 @@ $(function () {
             require([ '/customize/main.js', ], function () {});
         } else if (/invite/.test(pathname)) {
             require([ '/invite/main.js'], function () {});
+        } else if (/faq/.test(pathname)) {
+            window.location.hash = window.location.hash;
         } else {
             require([ '/customize/main.js', ], function () {});
         }
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index e1e8c59ba..b238fc22b 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -1062,11 +1062,13 @@ define(function () {
     // Creation page
     out.creation_404 = "Ce pad n'existe plus. Vous pouvez créer un nouveau pad en utilisant le formulaire suivant.";
     out.creation_ownedTitle = "Type de pad";
+    out.creation_owned = "Être propriétaire de ce pad";
     out.creation_ownedTrue = "Être propriétaire";
     out.creation_ownedFalse = "Pas de propriétaire";
     out.creation_owned1 = "Être <b>propriétaire</b> d'un pad signifie que vous pouvez le supprimer du serveur à tout moment. Une fois supprimé, il disparaît du CryptDrive des autres utilisateurs.";
     out.creation_owned2 = "Un pad <b>sans propriétaire</b> ne peut pas être supprimé du serveur à moins d'avoir dépassé son éventuelle date d'expiration.";
     out.creation_expireTitle = "Durée de vie";
+    out.creation_expire = "Ajouter une durée de vie";
     out.creation_expireTrue = "Ajouter durée de vie";
     out.creation_expireFalse = "Illimité";
     out.creation_expireHours = "Heure(s)";
@@ -1074,11 +1076,11 @@ define(function () {
     out.creation_expireMonths = "Mois";
     out.creation_expire1 = "Un pad <b>illimité</b> ne sera pas supprimé du serveur à moins que son propriétaire ne le décide.";
     out.creation_expire2 = "Un pad <b>à durée de vie</b> sera supprimé automatiquement du serveur et du CryptDrive des utilisateurs lorsque cette durée sera dépassée.";
-    out.creation_createTitle = "Créer un pad";
-    out.creation_createFromTemplate = "Utiliser un modèle";
-    out.creation_createFromScratch = "Créer un pad vide";
-    out.creation_settings = "Préférences des nouveaux pads";
-    out.creation_saveSettings = "Sauver les préférences";
+    out.creation_noTemplate = "Pas de modèle";
+    out.creation_newTemplate = "Nouveau modèle";
+    out.creation_create = "Créer";
+    out.creation_saveSettings = "Se souvenir de ces paramètres";
+    out.creation_settings = "Voir davantage de préférences";
     // Properties about creation data
     out.creation_owners = "Propriétaires";
     out.creation_ownedByOther = "Appartient à un autre utilisateur";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index ac90a1d3b..884b4bb62 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -1109,11 +1109,13 @@ define(function () {
     // Creation page
     out.creation_404 = "This pad not longer exists. Use the following form to create a new pad.";
     out.creation_ownedTitle = "Type of pad";
-    out.creation_ownedTrue = "Owned pad";
+    out.creation_owned = "Owned pad"; // Creation page
+    out.creation_ownedTrue = "Owned pad"; // Settings
     out.creation_ownedFalse = "Open pad";
     out.creation_owned1 = "An <b>owned</b> pad can be deleted from the server whenever the owner wants. Deleting an owned pad removes it from other users' CryptDrives.";
     out.creation_owned2 = "An <b>open</b> pad doesn't have any owner and thus, it can't be deleted from the server unless it has reached its expiration time.";
     out.creation_expireTitle = "Life time";
+    out.creation_expire = "Expiring pad";
     out.creation_expireTrue = "Add a life time";
     out.creation_expireFalse = "Unlimited";
     out.creation_expireHours = "Hour(s)";
@@ -1121,11 +1123,11 @@ define(function () {
     out.creation_expireMonths = "Month(s)";
     out.creation_expire1 = "An <b>unlimited</b> pad will not be removed from the server until its owner deletes it.";
     out.creation_expire2 = "An <b>expiring</b> pad has a set lifetime, after which it will be automatically removed from the server and other users' CryptDrives.";
-    out.creation_createTitle = "Create a pad";
-    out.creation_createFromTemplate = "From template";
-    out.creation_createFromScratch = "From scratch";
-    out.creation_settings = "New Pad settings";
-    out.creation_saveSettings = "Save settings";
+    out.creation_noTemplate = "No template";
+    out.creation_newTemplate = "New template";
+    out.creation_create = "Create";
+    out.creation_saveSettings = "Remember these settings";
+    out.creation_settings = "View more settings";
     // Properties about creation data
     out.creation_owners = "Owners";
     out.creation_ownedByOther = "Owned by another user";
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 9517971e7..24c7098c0 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -638,9 +638,10 @@ define([
         var $icon = UI.getIcon();
         if (!data) { return $icon; }
         var href = data.href;
-        if (!href) { return $icon; }
+        var type = data.type;
+        if (!href && !type) { return $icon; }
 
-        var type = Hash.parsePadUrl(href).type;
+        if (!type) { type = Hash.parsePadUrl(href).type; }
         $icon = UI.getIcon(type);
 
         return $icon;
diff --git a/www/common/common-thumbnail.js b/www/common/common-thumbnail.js
index f3864e6a3..455b095c9 100644
--- a/www/common/common-thumbnail.js
+++ b/www/common/common-thumbnail.js
@@ -237,6 +237,9 @@ define([
         $span.prepend(img);
         cb($(img));
     };
+    Thumb.addThumbnail = function(thumb, $span, cb) {
+        return addThumbnail(null, thumb, $span, cb);
+    };
     var getKey = function (href) {
         var parsed = Hash.parsePadUrl(href);
         return 'thumbnail-' + parsed.type + '-' + parsed.hashData.channel;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 07ad3d98d..ba7779eca 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1792,6 +1792,7 @@ define([
 
     UIElements.setExpirationValue = function (val, $expire) {
         if (val && typeof (val) === "number") {
+            $expire.find('#cp-creation-expire').attr('checked', true).trigger('change');
             $expire.find('#cp-creation-expire-true').attr('checked', true);
             if (val % (3600 * 24 * 30) === 0) {
                 $expire.find('#cp-creation-expire-unit').val("month");
@@ -1822,22 +1823,23 @@ define([
         var $creationContainer = $('<div>', { id: 'cp-creation-container' }).appendTo($body);
         var $creation = $('<div>', { id: 'cp-creation', tabindex: 1 }).appendTo($creationContainer);
 
-        var setHTML = function (e, html) {
-            e.innerHTML = html;
-            return e;
-        };
-
         // Title
-        $creation.append(h('h1.cp-creation-title', Messages['button_new'+type]));
+        var colorClass = 'cp-icon-color-'+type;
+        $creation.append(h('h1.cp-creation-title.'+colorClass, Messages['button_new'+type]));
 
         // Deleted pad warning
         if (metadataMgr.getPrivateData().isDeleted) {
-            $creation.append(h('div.cp-creation-deleted', Messages.creation_404));
+            $creation.append(h('div.cp-creation-deleted-container',
+                h('div.cp-creation-deleted', Messages.creation_404)
+            ));
         }
 
-        var createHelper = function (text) {
-            var q = h('span.cp-creation-help.fa.fa-question', {
-                title: text
+        var origin = common.getMetadataMgr().getPrivateData().origin;
+        var createHelper = function (href, text) {
+            var q = h('a.cp-creation-help.fa.fa-question', {
+                title: text,
+                href: origin + href,
+                target: "_blank"
             });
             return q;
         };
@@ -1845,78 +1847,144 @@ define([
         // Owned pads
         // Default is Owned pad
         var owned = h('div.cp-creation-owned', [
-            h('h2', [
-                Messages.creation_ownedTitle,
-                createHelper(Messages.creation_owned1 + '\n' + Messages.creation_owned2)
+            h('label.cp-checkmark', [
+                h('input', {
+                    type: 'checkbox',
+                    id: 'cp-creation-owned',
+                    checked: 'checked'
+                }),
+                h('span.cp-checkmark-mark'),
+                Messages.creation_owned
             ]),
-            h('div.cp-creation-help-container', [
-                setHTML(h('p'), Messages.creation_owned1),
-                setHTML(h('p'), Messages.creation_owned2)
-            ]),
-            h('input#cp-creation-owned-true.cp-creation-owned-value', {
-                type: 'radio',
-                name: 'cp-creation-owned',
-                value: 1,
-                checked: 'checked'
-            }),
-            h('label', { 'for': 'cp-creation-owned-true' }, Messages.creation_ownedTrue),
-            h('input#cp-creation-owned-false.cp-creation-owned-value', {
-                type: 'radio',
-                name: 'cp-creation-owned',
-                value: 0
-            }),
-            h('label', { 'for': 'cp-creation-owned-false' }, Messages.creation_ownedFalse)
+            createHelper('/faq.html#keywords-owned', Messages.creation_owned1)
         ]);
-        $creation.append(owned);
-
-        // If set to "open pad", check "open pad"
-        if (!cfg.owned && typeof cfg.owned !== "undefined") {
-            $creation.find('#cp-creation-owned-false').attr('checked', true);
-        }
 
         // Life time
         var expire = h('div.cp-creation-expire', [
-            h('h2', [
-                Messages.creation_expireTitle,
-                createHelper(Messages.creation_expire1, Messages.creation_expire2)
-            ]),
-            h('div.cp-creation-help-container', [
-                setHTML(h('p'), Messages.creation_expire1),
-                setHTML(h('p'), Messages.creation_expire2)
+            h('label.cp-checkmark', [
+                h('input', {
+                    type: 'checkbox',
+                    id: 'cp-creation-expire'
+                }),
+                h('span.cp-checkmark-mark'),
+                Messages.creation_expire
             ]),
-            h('input#cp-creation-expire-false.cp-creation-expire-value', {
-                type: 'radio',
-                name: 'cp-creation-expire',
-                value: 0,
-                checked: 'checked'
-            }),
-            h('label', { 'for': 'cp-creation-expire-false' }, Messages.creation_expireFalse),
-            h('input#cp-creation-expire-true.cp-creation-expire-value', {
-                type: 'radio',
-                name: 'cp-creation-expire',
-                value: 1
-            }),
-            h('label', { 'for': 'cp-creation-expire-true' }, [
-                Messages.creation_expireTrue,
-                h('span.cp-creation-expire-picker', [
-                    h('input#cp-creation-expire-val', {
-                        type: "number",
-                        min: 1,
-                        max: 100,
-                        value: 3
-                    }),
-                    h('select#cp-creation-expire-unit', [
-                        h('option', { value: 'hour' }, Messages.creation_expireHours),
-                        h('option', { value: 'day' }, Messages.creation_expireDays),
-                        h('option', {
-                            value: 'month',
-                            selected: 'selected'
-                        }, Messages.creation_expireMonths)
-                    ])
+            createHelper('faq.html#keywords-expiring', Messages.creation_expire2),
+            h('div.cp-creation-expire-picker', [
+                h('input#cp-creation-expire-val', {
+                    type: "number",
+                    min: 1,
+                    max: 100,
+                    value: 3
+                }),
+                h('select#cp-creation-expire-unit', [
+                    h('option', { value: 'hour' }, Messages.creation_expireHours),
+                    h('option', { value: 'day' }, Messages.creation_expireDays),
+                    h('option', {
+                        value: 'month',
+                        selected: 'selected'
+                    }, Messages.creation_expireMonths)
                 ])
             ])
         ]);
-        $creation.append(expire);
+
+        var templates = h('div.cp-creation-template', [
+            h('div.cp-creation-template-container', [
+                h('span.fa.fa-circle-o-notch.fa-spin.fa-4x.fa-fw')
+            ])
+        ]);
+
+        var settings = h('div.cp-creation-remember', [
+            h('label.cp-checkmark.cp-checkmark-secondary', [
+                h('input', {
+                    type: 'checkbox',
+                    id: 'cp-creation-remember',
+                    checked: 'checked'
+                }),
+                h('span.cp-checkmark-mark'),
+                Messages.creation_saveSettings
+            ]),
+            createHelper('/settings/#creation', Messages.creation_settings)
+        ]);
+
+        $(h('div#cp-creation-form', [
+            owned,
+            expire,
+            templates,
+            settings
+        ])).appendTo($creation);
+
+        // Display templates
+        var selected = 0;
+        sframeChan.query("Q_CREATE_TEMPLATES", type, function (err, res) {
+            if (!res.data || !Array.isArray(res.data)) {
+                return void console.error("Error: get the templates list");
+            }
+            var data = res.data.slice().sort(function (a, b) {
+                if (a.name === b.name) { return 0; }
+                return a.name < b.name ? -1 : 1;
+            });
+            data.unshift({
+                name: Messages.creation_noTemplate,
+                id: 0,
+                icon: h('span.fa.fa-times')
+            });
+            data.push({
+                name: Messages.creation_newTemplate,
+                id: -1,
+                icon: h('span.fa.fa-plus')
+            });
+            var $container = $(templates).find('.cp-creation-template-container').html('');
+            data.forEach(function (obj, idx) {
+                var name = obj.name;
+                var $span = $('<span>', {
+                    'class': 'cp-creation-template-element',
+                    'title': name,
+                }).appendTo($container);
+                console.log(obj.id);
+                $span.data('id', obj.id);
+                if (idx === 0) { $span.addClass('cp-creation-template-selected'); }
+                $span.append(obj.icon || UI.getFileIcon({type: type}));
+                $('<span>', {'class': 'cp-creation-template-element-name'}).text(name)
+                    .appendTo($span);
+                $span.click(function () {
+                    $container.find('.cp-creation-template-selected')
+                        .removeClass('cp-creation-template-selected');
+                    $span.addClass('cp-creation-template-selected');
+                    selected = idx;
+                });
+
+                // Add thumbnail if it exists
+                if (obj.thumbnail) {
+                    common.addThumbnail(obj.thumbnail, $span, function () {});
+                }
+            });
+        });
+        // Change template selection when Tab is pressed
+        var next = function (revert) {
+            var max = $creation.find('.cp-creation-template-element').length;
+            selected = revert ?
+                        (--selected < 0 ? max-1 : selected) :
+                        ++selected % max;
+            $creation.find('.cp-creation-template-element')
+                .removeClass('cp-creation-template-selected');
+            $($creation.find('.cp-creation-template-element').get(selected))
+                .addClass('cp-creation-template-selected');
+        };
+
+
+        // Display expiration form when checkbox checked
+        $creation.find('#cp-creation-expire').on('change', function () {
+            if ($(this).is(':checked')) {
+                $creation.find('.cp-creation-expire-picker:not(.active)').addClass('active');
+                $creation.find('#cp-creation-expire-val').focus();
+                return;
+            }
+            $creation.find('.cp-creation-expire-picker').removeClass('active');
+            $creation.focus();
+        });
+
+        // Keyboard shortcuts
         $creation.find('#cp-creation-expire-val').keydown(function (e) {
             if (e.which === 9) {
                 e.stopPropagation();
@@ -1928,15 +1996,20 @@ define([
             }
         });
 
+
+        // Initial values
+        if (!cfg.owned && typeof cfg.owned !== "undefined") {
+            $creation.find('#cp-creation-owned').attr('checked', false);
+        }
         UIElements.setExpirationValue(cfg.expire, $creation);
 
         // Create the pad
-        var getFormValues = function (template) {
+        var getFormValues = function () {
             // Type of pad
-            var ownedVal = parseInt($('input[name="cp-creation-owned"]:checked').val());
+            var ownedVal = $('#cp-creation-owned').is(':checked') ? 1 : 0;
             // Life time
             var expireVal = 0;
-            if(parseInt($('input[name="cp-creation-expire"]:checked').val())) {
+            if($('#cp-creation-expire').is(':checked')) {
                 var unit = 0;
                 switch ($('#cp-creation-expire-unit').val()) {
                     case "hour" : unit = 3600;           break;
@@ -1947,62 +2020,45 @@ define([
                 expireVal = ($('#cp-creation-expire-val').val() || 0) * unit;
             }
 
+            var $template = $creation.find('.cp-creation-template-selected');
+            var templateId = $template.data('id') || undefined;
+
             return {
                 owned: ownedVal,
                 expire: expireVal,
-                template: template
+                templateId: templateId
             };
         };
-        var create = function (template) {
-            $creationContainer.remove();
+        var create = function () {
+            var val = getFormValues();
+
+            if ($('#cp-creation-remember').is(':checked')) {
+                common.setAttribute(['general', 'creation', 'owned'],
+                                    val.owned, function (e) {
+                    if (e) { return void console.error(e); }
+                });
+                common.setAttribute(['general', 'creation', 'expire'],
+                                    val.expire, function (e) {
+                    if (e) { return void console.error(e); }
+                });
+            }
 
-            common.createPad(getFormValues(template), function () {
+            $creationContainer.remove();
+            common.createPad(val, function () {
                 cb();
             });
         };
 
-        var $create = $(h('div.cp-creation-create', [
-            h('h2', Messages.creation_createTitle)
-        ])).appendTo($creation);
-        // Pick a template?
-        sframeChan.query("Q_TEMPLATE_EXIST", type, function (err, data) {
-            if (!data) { return; }
-            var $templateButton = $('<button>').text(Messages.creation_createFromTemplate)
-                                               .appendTo($create);
-
-            var pickerCfg = {
-                types: [type],
-                where: ['template'],
-                hidden: true
-            };
-            common.openFilePicker(pickerCfg);
-
-            $templateButton.click(function () {
-                // Show the template picker
-                delete pickerCfg.hidden;
-                common.openFilePicker(pickerCfg);
-                var first = true; // We can only pick a template once (for a new document)
-                var fileDialogCfg = {
-                    onSelect: function (data) {
-                        if (data.type === type && first) {
-                            create(data.href);
-                            first = false;
-                        }
-                    }
-                };
-                common.initFilePicker(fileDialogCfg);
-            });
-        });
+        var $create = $(h('div.cp-creation-create')).appendTo($creation);
 
-        var $button = $('<button>').text(Messages.creation_createFromScratch).appendTo($create);
+        var $button = $('<button>').text(Messages.creation_create).appendTo($create);
         $button.addClass('cp-creation-button-selected');
         $button.click(function () {
             create();
         });
 
-        // Settings button
-        var origin = common.getMetadataMgr().getPrivateData().origin;
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide();
+        // Save settings button
+        /*var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide();
         var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide();
         var okTo;
         var $saveButton = $('<button>').text(Messages.creation_saveSettings).click(function () {
@@ -2025,35 +2081,29 @@ define([
                 }, 5000);
             });
         });
-        $(h('div.cp-creation-settings', [
-            $saveButton[0],
-            h('br'),
-            h('a', {
-                href: origin + '/settings/#creation',
-                target: '_blank'
-            }, Messages.creation_settings),
+
+        var settings = h('div.cp-creation-settings', [
+            h('button.cp-creation-settings-save', Messages.creation_saveSettings),
             $ok[0],
-            $spinner[0]
-        ])).appendTo($creation);
+            $spinner[0],
+            h('span.cp-filler'),
+            createHelper('/settings/#creation')
+            //h('a', {
+            //    href: origin + '/settings/#creation',
+            //    target: '_blank'
+            //}, Messages.creation_settings),
+        ]);*/
 
-        var selected = 0;
-        var next = function () {
-            selected = ++selected % $creation.find('button').length;
-            $creation.find('button').removeClass('cp-creation-button-selected');
-            $($creation.find('button').get(selected)).addClass('cp-creation-button-selected');
-        };
 
         $creation.keydown(function (e) {
             if (e.which === 9) {
                 e.preventDefault();
                 e.stopPropagation();
-                next();
+                next(e.shiftKey);
                 return;
             }
             if (e.which === 13) {
-                if ($creation.find('.cp-creation-button-selected').length === 1) {
-                    $creation.find('.cp-creation-button-selected').click();
-                }
+                $button.click();
                 return;
             }
         });
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 5bb00e6f3..10db8522a 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -75,13 +75,7 @@ define([
             cb();
         });
     };
-    // Settings and drive
-    common.getUserObject = function (cb) {
-        postMessage("GET", [], function (obj) {
-            cb(obj);
-        });
-    };
-    // Settings and auth
+    // Settings and drive and auth
     common.getUserObject = function (cb) {
         postMessage("GET", [], function (obj) {
             cb(obj);
@@ -468,6 +462,16 @@ define([
             cb(void 0, list);
         });
     };
+    // Get a template href from its id
+    common.getPadData = function (id, cb) {
+        postMessage("GET_PAD_DATA", id, function (data) {
+            cb(void 0, data);
+        });
+    };
+    // Set initial path when creating a pad from pad creation screen
+    common.setInitialPath = function (path) {
+        postMessage("SET_INITIAL_PATH", path);
+    };
 
     // Messaging (manage friends from the userlist)
     common.inviteFromUserlist = function (netfluxId, cb) {
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 92c32cbb2..4f1431e32 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -678,6 +678,13 @@ define([
         });
         cb(list);
     };
+    Store.getPadData = function (id, cb) {
+        cb(store.userObject.getFileData(id));
+    };
+    Store.setInitialPath = function (path) {
+        if (!store.data) { return; }
+        store.data.initialPath = path;
+    };
 
     // Messaging (manage friends from the userlist)
     var getMessagingCfg = function () {
diff --git a/www/common/outer/store-rpc.js b/www/common/outer/store-rpc.js
index 9fe45556e..7c4bff116 100644
--- a/www/common/outer/store-rpc.js
+++ b/www/common/outer/store-rpc.js
@@ -117,6 +117,12 @@ define([
             case 'GET_SECURE_FILES_LIST': {
                 Store.getSecureFilesList(data, cb); break;
             }
+            case 'GET_PAD_DATA': {
+                Store.getPadData(data, cb); break;
+            }
+            case 'SET_INITIAL_PATH': {
+                Store.setInitialPath(data); break;
+            }
             case 'GET_STRONGER_HASH': {
                 Store.getStrongerHash(data, cb); break;
             }
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 10fd2e9f9..df933f1a5 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -469,6 +469,35 @@ define([
                     cb(templates.length > 0);
                 });
             });
+            var getKey = function (href) {
+                var parsed = Utils.Hash.parsePadUrl(href);
+                return 'thumbnail-' + parsed.type + '-' + parsed.hashData.channel;
+            };
+            sframeChan.on('Q_CREATE_TEMPLATES', function (type, cb) {
+                Cryptpad.getSecureFilesList({
+                    types: [type],
+                    where: ['template']
+                }, function (err, data) {
+                    // NOTE: Never return data directly!
+                    if (err) { return void cb({error: err}); }
+
+                    var res = [];
+                    nThen(function (waitFor) {
+                        Object.keys(data).map(function (el) {
+                            var k = getKey(data[el].href);
+                            Utils.LocalStore.getThumbnail(k, waitFor(function (e, thumb) {
+                                res.push({
+                                    id: el,
+                                    name: data[el].filename || data[el].title || '?',
+                                    thumbnail: thumb
+                                });
+                            }));
+                        });
+                    }).nThen(function () {
+                        cb({data: res});
+                    });
+                });
+            });
 
             sframeChan.on('EV_GOTO_URL', function (url) {
                 if (url) {
@@ -584,7 +613,7 @@ define([
                 var replaceHash = function (hash) {
                     if (window.history && window.history.replaceState) {
                         if (!/^#/.test(hash)) { hash = '#' + hash; }
-                        void window.history.replaceState({}, window.document.title, hash);
+                        window.history.replaceState({}, window.document.title, hash);
                         if (typeof(window.onhashchange) === 'function') {
                             window.onhashchange();
                         }
@@ -646,19 +675,31 @@ define([
                 if (data.expire) {
                     rtConfig.expire = data.expire;
                 }
-                if (data.template) {
-                    // Pass rtConfig to useTemplate because Cryptput will create the file and
-                    // we need to have the owners and expiration time in the first line on the
-                    // server
-                    Cryptpad.useTemplate(data.template, Cryptget, function () {
-                        startRealtime();
-                        cb();
-                    }, rtConfig);
-                    return;
-                }
-                // Start realtime outside the iframe and callback
-                startRealtime(rtConfig);
-                cb();
+                nThen(function(waitFor) {
+                    if (data.templateId) {
+                        if (data.templateId === -1) {
+                            Cryptpad.setInitialPath(['template']);
+                            return;
+                        }
+                        Cryptpad.getPadData(data.templateId, waitFor(function (err, d) {
+                            data.template = d.href;
+                        }));
+                    }
+                }).nThen(function () {
+                    if (data.template) {
+                        // Pass rtConfig to useTemplate because Cryptput will create the file and
+                        // we need to have the owners and expiration time in the first line on the
+                        // server
+                        Cryptpad.useTemplate(data.template, Cryptget, function () {
+                            startRealtime();
+                            cb();
+                        }, rtConfig);
+                        return;
+                    }
+                    // Start realtime outside the iframe and callback
+                    startRealtime(rtConfig);
+                    cb();
+                });
             });
 
             sframeChan.ready();
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index d8804349b..36f896d52 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -97,6 +97,7 @@ define([
 
     // Thumb
     funcs.displayThumbnail = callWithCommon(Thumb.displayThumbnail);
+    funcs.addThumbnail = Thumb.addThumbnail;
 
     // History
     funcs.getHistory = callWithCommon(History.create);
@@ -196,7 +197,8 @@ define([
         ctx.sframeChan.query("Q_CREATE_PAD", {
             owned: cfg.owned,
             expire: cfg.expire,
-            template: cfg.template
+            template: cfg.template,
+            templateId: cfg.templateId
         }, cb);
     };
 
diff --git a/www/common/sframe-protocol.js b/www/common/sframe-protocol.js
index b7fa01b28..f49b3ed11 100644
--- a/www/common/sframe-protocol.js
+++ b/www/common/sframe-protocol.js
@@ -220,6 +220,8 @@ define({
 
     // Pad creation screen: create a pad with the selected attributes (owned, expire)
     'Q_CREATE_PAD': true,
+    // Get the available templates
+    'Q_CREATE_TEMPLATES': true,
 
     // This is for sending data out of the iframe when we are in testing mode
     // The exact protocol is defined in common/test.js
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 1fd87294d..22e9d5bf3 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -400,7 +400,7 @@ define([
         });
         show();
         Common.getAttribute(['toolbar', 'userlist-drawer'], function (err, val) {
-            if (val === false || $(window).height() < 800) { return void hide(); }
+            if (val === false || $(window).width() < 800) { return void hide(); }
             show();
         });
 
diff --git a/www/contacts/inner.html b/www/contacts/inner.html
index dc67d4390..b99bbc5b4 100644
--- a/www/contacts/inner.html
+++ b/www/contacts/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="/contacts/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/contacts/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; }
     </style>
diff --git a/www/profile/inner.html b/www/profile/inner.html
index 48f0531f9..1decad2c7 100644
--- a/www/profile/inner.html
+++ b/www/profile/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="/profile/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/profile/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; }
     </style>
diff --git a/www/settings/inner.html b/www/settings/inner.html
index a63627771..c228a9aaa 100644
--- a/www/settings/inner.html
+++ b/www/settings/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="/settings/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/settings/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; }
     </style>
diff --git a/www/todo/inner.html b/www/todo/inner.html
index 111a61b07..85b676a17 100644
--- a/www/todo/inner.html
+++ b/www/todo/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="/todo/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/todo/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; }
     </style>
diff --git a/www/worker/inner.html b/www/worker/inner.html
index e01d19558..6ee87fa8f 100644
--- a/www/worker/inner.html
+++ b/www/worker/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="/worker/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/worker/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; }
     </style>