diff --git a/www/common/notifications.js b/www/common/notifications.js
index 771a84c3c..44cdb9dfd 100644
--- a/www/common/notifications.js
+++ b/www/common/notifications.js
@@ -8,17 +8,17 @@ define([
     '/common/common-constants.js',
     '/customize/messages.js',
     '/bower_components/nthen/index.js'
-], function ($, h, Hash, UI, UIElements, Util, Constants, Messages, nThen) {
+], function($, h, Hash, UI, UIElements, Util, Constants, Messages, nThen) {
 
     var handlers = {};
 
-    var defaultDismiss = function (common, data) {
-        return function (e) {
+    var defaultDismiss = function(common, data) {
+        return function(e) {
             if (e) {
                 e.preventDefault();
                 e.stopPropagation();
             }
-            common.mailbox.dismiss(data, function (err) {
+            common.mailbox.dismiss(data, function(err) {
                 if (err) { return void console.error(err); }
             });
         };
@@ -26,7 +26,7 @@ define([
 
     // Friend request
 
-    handlers['FRIEND_REQUEST'] = function (common, data) {
+    handlers['FRIEND_REQUEST'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
         var userData = msg.content.user || msg.content;
@@ -34,7 +34,7 @@ define([
         msg.content = { user: userData };
 
         // Display the notification
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages._getKey('friendRequest_notification', [name]);
         };
 
@@ -43,14 +43,14 @@ define([
 
         // if not archived, add handlers
         if (!content.archived) {
-            content.handler = function () {
+            content.handler = function() {
                 UIElements.displayFriendRequestModal(common, data);
             };
             common.addFriendRequest(data);
         }
     };
 
-    handlers['FRIEND_REQUEST_ACCEPTED'] = function (common, data) {
+    handlers['FRIEND_REQUEST_ACCEPTED'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
         var userData = typeof(msg.content.user) === "object" ? msg.content.user : {
@@ -58,7 +58,7 @@ define([
             curvePublic: msg.content.user
         };
         var name = Util.fixHTML(userData.displayName) || Messages.anonymous;
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages._getKey('friendRequest_accepted', [name]);
         };
         if (!content.archived) {
@@ -66,7 +66,7 @@ define([
         }
     };
 
-    handlers['FRIEND_REQUEST_DECLINED'] = function (common, data) {
+    handlers['FRIEND_REQUEST_DECLINED'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
         var userData = typeof(msg.content.user) === "object" ? msg.content.user : {
@@ -74,7 +74,7 @@ define([
             curvePublic: msg.content.user
         };
         var name = Util.fixHTML(userData.displayName) || Messages.anonymous;
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages._getKey('friendRequest_declined', [name]);
         };
         if (!content.archived) {
@@ -84,29 +84,29 @@ define([
 
     // Share pad
 
-    handlers['SHARE_PAD'] = function (common, data) {
+    handlers['SHARE_PAD'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
         var type = Hash.parsePadUrl(msg.content.href).type;
         var key = type === 'drive' ? 'notification_folderShared' :
-                    (type === 'file' ? 'notification_fileShared' :
-                    'notification_padShared');
+            (type === 'file' ? 'notification_fileShared' :
+                'notification_padShared');
         var name = Util.fixHTML(msg.content.name) || Messages.anonymous;
         var title = Util.fixHTML(msg.content.title);
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages._getKey(key, [name, title]);
         };
-        content.handler = function () {
-            var todo = function () {
+        content.handler = function() {
+            var todo = function() {
                 common.openURL(msg.content.href);
                 defaultDismiss(common, data)();
             };
-            nThen(function (waitFor) {
+            nThen(function(waitFor) {
                 if (msg.content.isTemplate) {
                     common.sessionStorage.put(Constants.newPadPathKey, ['template'], waitFor());
                 }
                 common.sessionStorage.put('newPadPassword', msg.content.password || '', waitFor());
-            }).nThen(function () {
+            }).nThen(function() {
                 todo();
             });
         };
@@ -116,12 +116,12 @@ define([
     };
 
     // New support message from the admins
-    handlers['SUPPORT_MESSAGE'] = function (common, data) {
+    handlers['SUPPORT_MESSAGE'] = function(common, data) {
         var content = data.content;
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages.support_notification;
         };
-        content.handler = function () {
+        content.handler = function() {
             common.openURL('/support/');
             defaultDismiss(common, data)();
         };
@@ -130,7 +130,7 @@ define([
         }
     };
 
-    handlers['REQUEST_PAD_ACCESS'] = function (common, data) {
+    handlers['REQUEST_PAD_ACCESS'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
 
@@ -140,13 +140,13 @@ define([
         // Display the notification
         var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
         var title = Util.fixHTML(msg.content.title);
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages._getKey('requestEdit_request', [title, name]);
         };
 
         // if not archived, add handlers
         if (!content.archived) {
-            content.handler = function () {
+            content.handler = function() {
                 var link = h('a', {
                     href: '#'
                 }, Messages.requestEdit_viewPad);
@@ -160,12 +160,12 @@ define([
                     verified,
                     link
                 ]);
-                $(link).click(function (e) {
+                $(link).click(function(e) {
                     e.preventDefault();
                     e.stopPropagation();
                     common.openURL(msg.content.href);
                 });
-                UI.confirm(div, function (yes) {
+                UI.confirm(div, function(yes) {
                     if (!yes) { return; }
                     common.getSframeChannel().event('EV_GIVE_ACCESS', {
                         channel: msg.content.channel,
@@ -182,7 +182,7 @@ define([
         }
     };
 
-    handlers['GIVE_PAD_ACCESS'] = function (common, data) {
+    handlers['GIVE_PAD_ACCESS'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
 
@@ -195,26 +195,26 @@ define([
         var title = Util.fixHTML(msg.content.title);
 
         // Display the notification
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages._getKey('requestEdit_accepted', [title, name]);
         };
 
         // if not archived, add handlers
-        content.handler = function () {
+        content.handler = function() {
             common.openURL(msg.content.href);
             defaultDismiss(common, data)();
         };
     };
 
 
-    handlers['ADD_OWNER'] = function (common, data) {
+    handlers['ADD_OWNER'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
 
         // Display the notification
         var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
         var title = Util.fixHTML(msg.content.title);
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages._getKey('owner_request', [name, title]);
         };
 
@@ -223,7 +223,7 @@ define([
 
         // if not archived, add handlers
         if (!content.archived) {
-            content.handler = function () {
+            content.handler = function() {
                 if (msg.content.teamChannel) {
                     return void UIElements.displayAddTeamOwnerModal(common, data);
                 }
@@ -232,7 +232,7 @@ define([
         }
     };
 
-    handlers['ADD_OWNER_ANSWER'] = function (common, data) {
+    handlers['ADD_OWNER_ANSWER'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
 
@@ -240,7 +240,7 @@ define([
         var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
         var title = Util.fixHTML(msg.content.title);
         var key = 'owner_request_' + (msg.content.answer ? 'accepted' : 'declined');
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages._getKey(key, [name, title]);
         };
         if (!content.archived) {
@@ -248,7 +248,7 @@ define([
         }
     };
 
-    handlers['RM_OWNER'] = function (common, data) {
+    handlers['RM_OWNER'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
 
@@ -256,7 +256,7 @@ define([
         var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
         var title = Util.fixHTML(msg.content.title);
         var key = 'owner_removed' + (msg.content.pending ? 'Pending' : '');
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages._getKey(key, [name, title]);
         };
         if (!content.archived) {
@@ -264,32 +264,32 @@ define([
         }
     };
 
-    handlers['INVITE_TO_TEAM'] = function (common, data) {
+    handlers['INVITE_TO_TEAM'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
 
         // Display the notification
         var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
-        var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name']) || '');
-        content.getFormatText = function () {
+        var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name'])  || '');
+        content.getFormatText = function() {
             var text = Messages._getKey('team_invitedToTeam', [name, teamName]);
             return text;
         };
         if (!content.archived) {
-            content.handler = function () {
+            content.handler = function() {
                 UIElements.displayInviteTeamModal(common, data);
             };
         }
     };
 
-    handlers['KICKED_FROM_TEAM'] = function (common, data) {
+    handlers['KICKED_FROM_TEAM'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
 
         // Display the notification
         var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
-        var teamName = Util.fixHTML(Util.find(msg, ['content', 'teamName']) || '');
-        content.getFormatText = function () {
+        var teamName = Util.fixHTML(Util.find(msg, ['content', 'teamName'])  || '');
+        content.getFormatText = function() {
             var text = Messages._getKey('team_kickedFromTeam', [name, teamName]);
             return text;
         };
@@ -298,16 +298,16 @@ define([
         }
     };
 
-    handlers['INVITE_TO_TEAM_ANSWER'] = function (common, data) {
+    handlers['INVITE_TO_TEAM_ANSWER'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
 
         // Display the notification
         var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
-        var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name']) || '') ||
-                        Util.fixHTML(Util.find(msg, ['content', 'teamName']));
+        var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name'])  || '') ||
+            Util.fixHTML(Util.find(msg, ['content', 'teamName']));
         var key = 'team_' + (msg.content.answer ? 'accept' : 'decline') + 'Invitation';
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages._getKey(key, [name, teamName]);
         };
         if (!content.archived) {
@@ -315,26 +315,24 @@ define([
         }
     };
 
-    Messages.comments_notification = 'Replies to your comment "{0}" in <b>{1}</b>'; // XXX
-    Messages.unknownPad = "Unknown pad"; // XXX
-    handlers['COMMENT_REPLY'] = function (common, data) {
+    handlers['COMMENT_REPLY'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
 
         // Display the notification
         //var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
-        var comment = Util.fixHTML(msg.content.comment).slice(0,20).trim();
+        var comment = Util.fixHTML(msg.content.comment).slice(0, 20).trim();
         if (msg.content.comment.length > 20) {
             comment += '...';
         }
         var title = Util.fixHTML(msg.content.title || Messages.unknownPad);
         var href = msg.content.href;
 
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages._getKey('comments_notification', [comment, title]);
         };
         if (href) {
-            content.handler = function () {
+            content.handler = function() {
                 common.openURL(href);
                 defaultDismiss(common, data)();
             };
@@ -344,8 +342,7 @@ define([
         }
     };
 
-    Messages.mentions_notification = '{0} has mentionned you in <b>{1}</b>'; // XXX
-    handlers['MENTION'] = function (common, data) {
+    handlers['MENTION'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
 
@@ -354,11 +351,11 @@ define([
         var title = Util.fixHTML(msg.content.title || Messages.unknownPad);
         var href = msg.content.href;
 
-        content.getFormatText = function () {
+        content.getFormatText = function() {
             return Messages._getKey('mentions_notification', [name, title]);
         };
         if (href) {
-            content.handler = function () {
+            content.handler = function() {
                 common.openURL(href);
                 defaultDismiss(common, data)();
             };
@@ -372,7 +369,7 @@ define([
     // NOTE: don't forget to fixHTML everything returned by "getFormatText"
 
     return {
-        add: function (common, data) {
+        add: function(common, data) {
             var type = data.content.msg.type;
 
             if (handlers[type]) {
@@ -385,9 +382,9 @@ define([
                 data.content.isDismissible = typeof data.content.dismissHandler === "function";
             }
         },
-        remove: function (common, data) {
+        remove: function(common, data) {
             common.removeFriendRequest(data.hash);
         },
         allowed: Object.keys(handlers)
     };
-});
+});
\ No newline at end of file
diff --git a/www/pad/comments.js b/www/pad/comments.js
index b3ead0a82..ac7ef6353 100644
--- a/www/pad/comments.js
+++ b/www/pad/comments.js
@@ -154,11 +154,6 @@ define([
         selection.addRange(range);
     };
 
-    Messages.comments_deleted = "Comment deleted by its author"; // XXX
-    Messages.comments_edited = "Edited"; // XXX
-    Messages.comments_submit = "Submit"; // XXX
-    Messages.comments_reply = "Reply"; // XXX
-    Messages.comments_resolve = "Resolve"; // XXX
     var getCommentForm = function(Env, reply, _cb, editContent) {
         var cb = Util.once(_cb);
         var userData = Env.metadataMgr.getUserData();
@@ -783,8 +778,6 @@ define([
             var applicable = Env.editor.plugins.comments.isApplicable();
             if (!applicable) {
                 // Abort if our selection contains a comment
-                console.error("Can't add a comment here");
-                // XXX show error
                 UI.warn(Messages.comments_error);
                 return;
             }
diff --git a/www/pad/inner.js b/www/pad/inner.js
index c77b99713..2919d3991 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -1,7 +1,7 @@
-require(['/api/config'], function (ApiConfig) {
+require(['/api/config'], function(ApiConfig) {
     // see ckeditor_base.js getUrl()
-    window.CKEDITOR_GETURL = function (resource) {
-        if (resource.indexOf( '/' ) === 0) {
+    window.CKEDITOR_GETURL = function(resource) {
+        if (resource.indexOf('/') === 0) {
             resource = window.CKEDITOR.basePath.replace(/\/bower_components\/.*/, '') + resource;
         } else if (resource.indexOf(':/') === -1) {
             resource = window.CKEDITOR.basePath + resource;
@@ -44,7 +44,7 @@ define([
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
     'less!/pad/app-pad.less'
-], function (
+], function(
     $,
     Hyperjson,
     Framework,
@@ -65,16 +65,15 @@ define([
     ChainPad,
     AppConfig,
     Test
-)
-{
+) {
     var DiffDom = window.diffDOM;
 
-    var slice = function (coll) {
+    var slice = function(coll) {
         return Array.prototype.slice.call(coll);
     };
 
-    var removeListeners = function (root) {
-        slice(root.attributes).map(function (attr) {
+    var removeListeners = function(root) {
+        slice(root.attributes).map(function(attr) {
             if (/^on/.test(attr.name)) {
                 root.attributes.removeNamedItem(attr.name);
             }
@@ -82,7 +81,7 @@ define([
         slice(root.children).forEach(removeListeners);
     };
 
-    var hjsonToDom = function (H) {
+    var hjsonToDom = function(H) {
         var dom = Hyperjson.toDOM(H);
         removeListeners(dom);
         return dom;
@@ -97,17 +96,17 @@ define([
 
     // MEDIATAG: Filter elements to serialize
     // * Remove the drag&drop and resizers from the hyperjson
-    var isWidget = function (el) {
-        return typeof (el.getAttribute) === "function" &&
-                   (el.getAttribute('data-cke-hidden-sel') ||
-                    (el.getAttribute('class') &&
-                        (/cke_widget_drag/.test(el.getAttribute('class')) ||
-                         /cke_image_resizer/.test(el.getAttribute('class')))
-                    )
-                   );
+    var isWidget = function(el) {
+        return typeof(el.getAttribute) === "function" &&
+            (el.getAttribute('data-cke-hidden-sel') ||
+                (el.getAttribute('class') &&
+                    (/cke_widget_drag/.test(el.getAttribute('class')) ||
+                        /cke_image_resizer/.test(el.getAttribute('class')))
+                )
+            );
     };
 
-    var isNotMagicLine = function (el) {
+    var isNotMagicLine = function(el) {
         return !(el && typeof(el.getAttribute) === 'function' &&
             el.getAttribute('class') &&
             el.getAttribute('class').split(' ').indexOf('non-realtime') !== -1);
@@ -115,12 +114,12 @@ define([
 
     var isCursor = Cursors.isCursor;
 
-    var shouldSerialize = function (el) {
+    var shouldSerialize = function(el) {
         return isNotMagicLine(el) && !isWidget(el) && !isCursor(el);
     };
 
     // MEDIATAG: Filter attributes in the serialized elements
-    var widgetFilter = function (hj) {
+    var widgetFilter = function(hj) {
         // Send a widget ID == 0 to avoid a fight between browsers and
         // prevent the container from having the "selected" class (blue border)
         if (hj[1].class) {
@@ -137,7 +136,7 @@ define([
                 //hj[1]['data-cke-widget-id'] = "0";
             }
             // Remove the title attribute of the drag&drop icons (translation conflicts)
-            if (split.indexOf('cke_widget_drag_handler')  !== -1 ||
+            if (split.indexOf('cke_widget_drag_handler') !== -1 ||
                 split.indexOf('cke_image_resizer') !== -1) {
                 hj[1].title = undefined;
             }
@@ -145,18 +144,18 @@ define([
         return hj;
     };
 
-    var hjsonFilters = function (hj) {
+    var hjsonFilters = function(hj) {
         /* catch `type="_moz"` before it goes over the wire */
-        var brFilter = function (hj) {
+        var brFilter = function(hj) {
             if (hj[1].type === '_moz') { hj[1].type = undefined; }
             return hj;
         };
-        var mediatagContentFilter = function (hj) {
+        var mediatagContentFilter = function(hj) {
             if (hj[0] === 'MEDIA-TAG') { hj[2] = []; }
             return hj;
         };
-        var commentActiveFilter = function (hj) {
-            if (hj[0] === 'COMMENT') { delete (hj[1] || {}).class; }
+        var commentActiveFilter = function(hj) {
+            if (hj[0] === 'COMMENT') { delete(hj[1] || {}).class; }
             return hj;
         };
         brFilter(hj);
@@ -166,7 +165,7 @@ define([
         return hj;
     };
 
-    var domFromHTML = function (html) {
+    var domFromHTML = function(html) {
         return new DOMParser().parseFromString(html, 'text/html');
     };
 
@@ -180,22 +179,22 @@ define([
     ];
 
     var CKEDITOR_CHECK_INTERVAL = 100;
-    var ckEditorAvailable = function (cb) {
+    var ckEditorAvailable = function(cb) {
         var intr;
-        var check = function () {
+        var check = function() {
             if (window.CKEDITOR) {
                 clearTimeout(intr);
                 cb(window.CKEDITOR);
             }
         };
-        intr = setInterval(function () {
+        intr = setInterval(function() {
             console.log("Ckeditor was not defined. Trying again in %sms", CKEDITOR_CHECK_INTERVAL);
             check();
         }, CKEDITOR_CHECK_INTERVAL);
         check();
     };
 
-    var mkHelpMenu = function (framework) {
+    var mkHelpMenu = function(framework) {
         var $toolbarContainer = $('.cke_toolbox_main');
         $toolbarContainer.before(framework._.sfCommon.getBurnAfterReadingWarning());
         var helpMenu = framework._.sfCommon.createHelpMenu(['text', 'pad']);
@@ -204,9 +203,9 @@ define([
         framework._.toolbar.$drawer.append(helpMenu.button);
     };
 
-    var mkDiffOptions = function (cursor, readOnly) {
+    var mkDiffOptions = function(cursor, readOnly) {
         return {
-            preDiffApply: function (info) {
+            preDiffApply: function(info) {
                 /*
                     Don't accept attributes that begin with 'on'
                     these are probably listeners, and we don't want to
@@ -257,15 +256,15 @@ define([
                 }
                 // CkEditor drag&drop icon container
                 if (info.node && info.node.tagName === 'SPAN' &&
-                        info.node.getAttribute('class') &&
-                        info.node.getAttribute('class').split(' ').indexOf('cke_widget_drag_handler_container') !== -1) {
+                    info.node.getAttribute('class') &&
+                    info.node.getAttribute('class').split(' ').indexOf('cke_widget_drag_handler_container') !== -1) {
                     return true;
                 }
                 // CkEditor drag&drop title (language fight)
                 if (info.node && info.node.getAttribute &&
-                        info.node.getAttribute('class') &&
-                        (info.node.getAttribute('class').split(' ').indexOf('cke_widget_drag_handler') !== -1 ||
-                         info.node.getAttribute('class').split(' ').indexOf('cke_image_resizer') !== -1 ) ) {
+                    info.node.getAttribute('class') &&
+                    (info.node.getAttribute('class').split(' ').indexOf('cke_widget_drag_handler') !== -1 ||
+                        info.node.getAttribute('class').split(' ').indexOf('cke_image_resizer') !== -1)) {
                     return true;
                 }
 
@@ -287,15 +286,13 @@ define([
 
                 // Don't remote the "active" class of our comments
                 if (info.node && info.node.tagName === 'COMMENT') {
-                    if (info.diff.action === 'removeAttribute' &&
-                        ['class'].indexOf(info.diff.name) !== -1) {
+                    if (info.diff.action === 'removeAttribute' && ['class'].indexOf(info.diff.name) !== -1) {
                         return true;
                     }
                 }
 
                 if (info.node && info.node.tagName === 'BODY') {
-                    if (info.diff.action === 'removeAttribute' &&
-                        ['class', 'spellcheck'].indexOf(info.diff.name) !== -1) {
+                    if (info.diff.action === 'removeAttribute' && ['class', 'spellcheck'].indexOf(info.diff.name) !== -1) {
                         return true;
                     }
                 }
@@ -343,50 +340,50 @@ define([
                     return true;
                 }
 
-/*
-                cursor.update();
+                /*
+                                cursor.update();
 
-                // no use trying to recover the cursor if it doesn't exist
-                if (!cursor.exists()) { return; }
+                                // no use trying to recover the cursor if it doesn't exist
+                                if (!cursor.exists()) { return; }
 
-                /*  frame is either 0, 1, 2, or 3, depending on which
-                    cursor frames were affected: none, first, last, or both
-                */
-/*
-                var frame = info.frame = cursor.inNode(info.node);
+                                /*  frame is either 0, 1, 2, or 3, depending on which
+                                    cursor frames were affected: none, first, last, or both
+                                */
+                /*
+                                var frame = info.frame = cursor.inNode(info.node);
 
-                if (!frame) { return; }
+                                if (!frame) { return; }
 
-                if (frame && typeof info.diff.oldValue === 'string' && typeof info.diff.newValue === 'string') {
-                    //var pushes = cursor.pushDelta(info.diff.oldValue, info.diff.newValue);
-                    var ops = ChainPad.Diff.diff(info.diff.oldValue, info.diff.newValue);
+                                if (frame && typeof info.diff.oldValue === 'string' && typeof info.diff.newValue === 'string') {
+                                    //var pushes = cursor.pushDelta(info.diff.oldValue, info.diff.newValue);
+                                    var ops = ChainPad.Diff.diff(info.diff.oldValue, info.diff.newValue);
 
-                    if (frame & 1) {
-                        // push cursor start if necessary
-                        cursor.transformRange(cursor.Range.start, ops);
-                    }
-                    if (frame & 2) {
-                        // push cursor end if necessary
-                        cursor.transformRange(cursor.Range.end, ops);
-                    }
-                }
-*/
+                                    if (frame & 1) {
+                                        // push cursor start if necessary
+                                        cursor.transformRange(cursor.Range.start, ops);
+                                    }
+                                    if (frame & 2) {
+                                        // push cursor end if necessary
+                                        cursor.transformRange(cursor.Range.end, ops);
+                                    }
+                                }
+                */
             },
-/*
-            postDiffApply: function (info) {
-                if (info.frame) {
-                    if (info.node) {
-                        if (info.frame & 1) { cursor.fixStart(info.node); }
-                        if (info.frame & 2) { cursor.fixEnd(info.node); }
-                    } else { console.error("info.node did not exist"); }
-
-                    var sel = cursor.makeSelection();
-                    var range = cursor.makeRange();
-
-                    cursor.fixSelection(sel, range);
-                }
-            }
-*/
+            /*
+                        postDiffApply: function (info) {
+                            if (info.frame) {
+                                if (info.node) {
+                                    if (info.frame & 1) { cursor.fixStart(info.node); }
+                                    if (info.frame & 2) { cursor.fixEnd(info.node); }
+                                } else { console.error("info.node did not exist"); }
+
+                                var sel = cursor.makeSelection();
+                                var range = cursor.makeRange();
+
+                                cursor.fixSelection(sel, range);
+                            }
+                        }
+            */
         };
     };
 
@@ -394,30 +391,29 @@ define([
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    var addToolbarHideBtn = function (framework, $bar) {
+    var addToolbarHideBtn = function(framework, $bar) {
         // Expand / collapse the toolbar
         var cfg = {
             element: $bar
         };
-        var onClick = function (visible) {
+        var onClick = function(visible) {
             framework._.sfCommon.setAttribute(['pad', 'showToolbar'], visible);
         };
-        framework._.sfCommon.getAttribute(['pad', 'showToolbar'], function (err, data) {
-            if (($(window).height() >= 800  || $(window).width() >= 800) &&
-                (typeof(data) === "undefined" || data)) { $('.cke_toolbox_main').show(); }
-            else { $('.cke_toolbox_main').hide(); }
+        framework._.sfCommon.getAttribute(['pad', 'showToolbar'], function(err, data) {
+            if (($(window).height() >= 800 || $(window).width() >= 800) &&
+                (typeof(data) === "undefined" || data)) { $('.cke_toolbox_main').show(); } else { $('.cke_toolbox_main').hide(); }
             var $collapse = framework._.sfCommon.createButton('toggle', true, cfg, onClick);
             framework._.toolbar.$rightside.append($collapse);
         });
     };
 
-    var displayMediaTags = function (framework, dom, mediaTagMap) {
-        setTimeout(function () { // Just in case
+    var displayMediaTags = function(framework, dom, mediaTagMap) {
+        setTimeout(function() { // Just in case
             var tags = dom.querySelectorAll('media-tag:empty');
-            Array.prototype.slice.call(tags).forEach(function (el) {
+            Array.prototype.slice.call(tags).forEach(function(el) {
                 MediaTag(el);
-                $(el).on('keydown', function (e) {
-                    if ([8,46].indexOf(e.which) !== -1) {
+                $(el).on('keydown', function(e) {
+                    if ([8, 46].indexOf(e.which) !== -1) {
                         $(el).remove();
                         framework.localChange();
                     }
@@ -439,19 +435,19 @@ define([
         });
     };
 
-    var restoreMediaTags = function (tempDom, mediaTagMap) {
+    var restoreMediaTags = function(tempDom, mediaTagMap) {
         var tags = tempDom.querySelectorAll('media-tag:empty');
-        Array.prototype.slice.call(tags).forEach(function (tag) {
+        Array.prototype.slice.call(tags).forEach(function(tag) {
             var src = tag.getAttribute('src');
             if (mediaTagMap[src]) {
-                mediaTagMap[src].forEach(function (n) {
+                mediaTagMap[src].forEach(function(n) {
                     tag.appendChild(n.cloneNode());
                 });
             }
         });
     };
 
-    var andThen2 = function (editor, Ckeditor, framework) {
+    var andThen2 = function(editor, Ckeditor, framework) {
         var mediaTagMap = {};
         var $contentContainer = $('#cke_1_contents');
         var $html = $('html');
@@ -461,7 +457,7 @@ define([
         }
 
         var ml = editor._.magiclineBackdoor.that.line.$;
-        [ml, ml.parentElement].forEach(function (el) {
+        [ml, ml.parentElement].forEach(function(el) {
             el.setAttribute('class', 'non-realtime');
         });
 
@@ -479,14 +475,14 @@ define([
         var inner = window.inner = documentBody;
         var $inner = $(inner);
 
-        var observer = new MutationObserver(function (muts) {
-            muts.forEach(function (mut) {
+        var observer = new MutationObserver(function(muts) {
+            muts.forEach(function(mut) {
                 if (mut.type === 'childList') {
                     var $a;
                     for (var i = 0; i < mut.addedNodes.length; i++) {
                         $a = $(mut.addedNodes[i]);
-                        if ($a.is('p') && $a.find('> span:empty').length
-                            && $a.find('> br').length && $a.children().length === 2) {
+                        if ($a.is('p') && $a.find('> span:empty').length &&
+                            $a.find('> br').length && $a.children().length === 2) {
                             $a.find('> span').append($a.find('> br'));
                         }
                     }
@@ -519,7 +515,7 @@ define([
         // Display other users cursor
         var cursors = Cursors.create(inner, hjsonToDom, cursor);
 
-        var openLink = function (e) {
+        var openLink = function(e) {
             var el = e.currentTarget;
             if (!el || el.nodeName !== 'A') { return; }
             var href = el.getAttribute('href');
@@ -530,7 +526,7 @@ define([
 
         mkHelpMenu(framework);
 
-        framework._.sfCommon.getAttribute(['pad', 'width'], function (err, data) {
+        framework._.sfCommon.getAttribute(['pad', 'width'], function(err, data) {
             var active = data || typeof(data) === "undefined";
             if (active) {
                 $contentContainer.addClass('cke_body_width');
@@ -539,50 +535,50 @@ define([
             }
         });
 
-        framework.onEditableChange(function (unlocked) {
+        framework.onEditableChange(function(unlocked) {
             if (!framework.isReadOnly()) {
                 $inner.attr('contenteditable', '' + Boolean(unlocked));
             }
             $inner.css({ background: unlocked ? '#fff' : '#eee' });
         });
 
-        framework.setMediaTagEmbedder(function ($mt) {
+        framework.setMediaTagEmbedder(function($mt) {
             $mt.attr('contenteditable', 'false');
             //$mt.attr('tabindex', '1');
             //MEDIATAG
             var element = new window.CKEDITOR.dom.element($mt[0]);
             editor.insertElement(element);
-            editor.widgets.initOn( element, 'mediatag' );
+            editor.widgets.initOn(element, 'mediatag');
         });
 
-        framework.setTitleRecommender(function () {
+        framework.setTitleRecommender(function() {
             var text;
-            if (['h1', 'h2', 'h3'].some(function (t) {
-                var $header = $inner.find(t + ':first-of-type');
-                if ($header.length && $header.text()) {
-                    text = $header.text();
-                    return true;
-                }
-            })) { return text; }
+            if (['h1', 'h2', 'h3'].some(function(t) {
+                    var $header = $inner.find(t + ':first-of-type');
+                    if ($header.length && $header.text()) {
+                        text = $header.text();
+                        return true;
+                    }
+                })) { return text; }
         });
 
         var DD = new DiffDom(mkDiffOptions(cursor, framework.isReadOnly()));
 
         var cursorStopped = false;
         var cursorTo;
-        var updateCursor = function () {
+        var updateCursor = function() {
             if (cursorTo) { clearTimeout(cursorTo); }
 
             // If we're receiving content
             if (cursorStopped) { return void setTimeout(updateCursor, 100); }
 
-            cursorTo = setTimeout(function () {
+            cursorTo = setTimeout(function() {
                 framework.updateCursor();
             }, 500); // 500ms to make sure it is sent after chainpad sync
         };
 
         // apply patches, and try not to lose the cursor in the process!
-        framework.onContentUpdate(function (hjson) {
+        framework.onContentUpdate(function(hjson) {
             if (!Array.isArray(hjson)) { throw new Error(Messages.typeError); }
             var userDocStateDom = hjsonToDom(hjson);
             cursorStopped = true;
@@ -598,7 +594,7 @@ define([
             userDocStateDom.normalize();
             inner.normalize();
 
-            $(userDocStateDom).find('span[data-cke-display-name="media-tag"]:empty').each(function (i, el) {
+            $(userDocStateDom).find('span[data-cke-display-name="media-tag"]:empty').each(function(i, el) {
                 $(el).remove();
             });
 
@@ -617,15 +613,15 @@ define([
             var ops = ChainPad.Diff.diff(oldText, newText);
             cursor.restoreOffset(ops);
 
-            setTimeout(function () {
+            setTimeout(function() {
                 cursorStopped = false;
                 updateCursor();
             }, 200);
 
             // MEDIATAG: Migrate old mediatags to the widget system
-            $inner.find('media-tag:not(.cke_widget_element)').each(function (i, el) {
+            $inner.find('media-tag:not(.cke_widget_element)').each(function(i, el) {
                 var element = new window.CKEDITOR.dom.element(el);
-                editor.widgets.initOn( element, 'mediatag' );
+                editor.widgets.initOn(element, 'mediatag');
             });
 
             displayMediaTags(framework, inner, mediaTagMap);
@@ -642,19 +638,19 @@ define([
             comments.onContentUpdate();
         });
 
-        framework.setTextContentGetter(function () {
+        framework.setTextContentGetter(function() {
             var innerCopy = inner.cloneNode(true);
             displayMediaTags(framework, innerCopy, mediaTagMap);
             innerCopy.normalize();
-            $(innerCopy).find('*').each(function (i, el) {
+            $(innerCopy).find('*').each(function(i, el) {
                 $(el).append(' ');
             });
             var str = $(innerCopy).text();
             str = str.replace(/\s\s+/g, ' ');
             return str;
         });
-        framework.setContentGetter(function () {
-            $inner.find('span[data-cke-display-name="media-tag"]:empty').each(function (i, el) {
+        framework.setContentGetter(function() {
+            $inner.find('span[data-cke-display-name="media-tag"]:empty').each(function(i, el) {
                 $(el).remove();
             });
 
@@ -677,7 +673,7 @@ define([
             $('.cke_toolbox_main').hide();
         }
 
-        framework.onReady(function (newPad) {
+        framework.onReady(function(newPad) {
             editor.focus();
 
             if (!module.isMaximized) {
@@ -700,7 +696,7 @@ define([
             var fmConfig = {
                 ckeditor: editor,
                 body: $('body'),
-                onUploaded: function (ev, data) {
+                onUploaded: function(ev, data) {
                     var parsed = Hash.parsePadUrl(data.url);
                     var secret = Hash.getSecrets('file', parsed.hash, data.password);
                     var fileHost = privateData.fileHost || privateData.origin;
@@ -714,39 +710,39 @@ define([
                     } else {
                         editor.insertElement(element);
                     }
-                    editor.widgets.initOn( element, 'mediatag' );
+                    editor.widgets.initOn(element, 'mediatag');
                 }
             };
             window.APP.FM = framework._.sfCommon.createFileManager(fmConfig);
 
-            framework._.sfCommon.getAttribute(['pad', 'spellcheck'], function (err, data) {
+            framework._.sfCommon.getAttribute(['pad', 'spellcheck'], function(err, data) {
                 if (framework.isReadOnly()) { return; }
                 if (data) {
                     $iframe.find('body').attr('spellcheck', true);
                 }
             });
 
-            framework._.sfCommon.isPadStored(function (err, val) {
+            framework._.sfCommon.isPadStored(function(err, val) {
                 if (!val) { return; }
                 var b64images = $inner.find('img[src^="data:image"]:not(.cke_reset)');
                 if (b64images.length && framework._.sfCommon.isLoggedIn()) {
                     var no = h('button.cp-corner-cancel', Messages.cancel);
                     var yes = h('button.cp-corner-primary', Messages.ok);
                     var actions = h('div', [no, yes]);
-                    var modal = UI.cornerPopup(Messages.pad_base64, actions, '', {big: true});
-                    $(no).click(function () {
+                    var modal = UI.cornerPopup(Messages.pad_base64, actions, '', { big: true });
+                    $(no).click(function() {
                         modal.delete();
                     });
-                    $(yes).click(function () {
+                    $(yes).click(function() {
                         modal.delete();
-                        b64images.each(function (i, el) {
+                        b64images.each(function(i, el) {
                             var src = $(el).attr('src');
                             var blob = Util.dataURIToBlob(src);
                             var ext = '.' + (blob.type.split('/')[1] || 'png');
-                            var name = (framework._.title.getTitle() || 'Pad')+'_image';
+                            var name = (framework._.title.getTitle() || 'Pad') + '_image';
                             blob.name = name + ext;
                             var ev = {
-                                insertElement: function (newEl) {
+                                insertElement: function(newEl) {
                                     var element = new window.CKEDITOR.dom.element(el);
                                     newEl.replace(element);
                                     setTimeout(framework.localChange);
@@ -769,34 +765,34 @@ define([
             });*/
         });
 
-        framework.onDefaultContentNeeded(function () {
+        framework.onDefaultContentNeeded(function() {
             inner.innerHTML = '<p></p>';
         });
 
-        var importMediaTags = function (dom, cb) {
+        var importMediaTags = function(dom, cb) {
             var $dom = $(dom);
-            $dom.find('media-tag').each(function (i, el) {
+            $dom.find('media-tag').each(function(i, el) {
                 $(el).empty();
             });
             cb($dom[0]);
         };
-        framework.setFileImporter({ accept: 'text/html' }, function (content, f, cb) {
-            importMediaTags(domFromHTML(content).body, function (dom) {
+        framework.setFileImporter({ accept: 'text/html' }, function(content, f, cb) {
+            importMediaTags(domFromHTML(content).body, function(dom) {
                 cb(Hyperjson.fromDOM(dom));
             });
         }, true);
 
-        framework.setFileExporter(Exporter.ext, function (cb) {
+        framework.setFileExporter(Exporter.ext, function(cb) {
             Exporter.main(inner, cb);
         }, true);
 
-        framework.setNormalizer(function (hjson) {
+        framework.setNormalizer(function(hjson) {
             return [
                 'BODY',
                 {
                     "class": "cke_editable cke_editable_themed cke_contents_ltr cke_show_borders",
                     "contenteditable": "true",
-                    "spellcheck":"false"
+                    "spellcheck": "false"
                 },
                 hjson[2]
             ];
@@ -829,7 +825,7 @@ define([
             The solution is the "input" event, triggered by the browser as soon as the
             character is inserted.
         */
-        inner.addEventListener('input', function () {
+        inner.addEventListener('input', function() {
             framework.localChange();
             updateCursor();
             editor.fire('cp-wc'); // Update word count
@@ -838,8 +834,8 @@ define([
 
         var wordCount = h('span.cp-app-pad-wordCount');
         $('.cke_toolbox_main').append(wordCount);
-        editor.on('cp-wc-update', function () {
-            if (!editor.wordCount || typeof (editor.wordCount.wordCount) === "undefined") {
+        editor.on('cp-wc-update', function() {
+            if (!editor.wordCount || typeof(editor.wordCount.wordCount) === "undefined") {
                 wordCount.innerText = '';
                 return;
             }
@@ -849,7 +845,7 @@ define([
         // export the typing tests to the window.
         // call like `test = easyTest()`
         // terminate the test like `test.cancel()`
-        window.easyTest = function () {
+        window.easyTest = function() {
             cursor.update();
             //var start = cursor.Range.start;
             //var test = TypingTest.testInput(inner, start.el, start.offset, framework.localChange);
@@ -861,18 +857,18 @@ define([
 
         // Fix the scrollbar if it's reset when clicking on a button (firefox only?)
         var buttonScrollTop;
-        $('.cke_toolbox_main').find('.cke_button, .cke_combo_button').mousedown(function () {
+        $('.cke_toolbox_main').find('.cke_button, .cke_combo_button').mousedown(function() {
             buttonScrollTop = $('iframe').contents().scrollTop();
-            setTimeout(function () {
+            setTimeout(function() {
                 $('iframe').contents().scrollTop(buttonScrollTop);
             });
         });
 
 
-        $('.cke_toolbox_main').find('.cke_button').click(function () {
+        $('.cke_toolbox_main').find('.cke_button').click(function() {
             var e = this;
             var classString = e.getAttribute('class');
-            var classes = classString.split(' ').filter(function (c) {
+            var classes = classString.split(' ').filter(function(c) {
                 return /cke_button__/.test(c);
             });
 
@@ -885,12 +881,12 @@ define([
         framework.start();
     };
 
-    var main = function () {
+    var main = function() {
         var Ckeditor;
         var editor;
         var framework;
 
-        nThen(function (waitFor) {
+        nThen(function(waitFor) {
             Framework.create({
                 toolbarContainer: '#cp-app-pad-toolbar',
                 contentContainer: '#cp-app-pad-editor',
@@ -917,15 +913,15 @@ define([
                         module.cursor.fixSelection(sel, range);
                     }
                 }*/
-            }, waitFor(function (fw) { window.APP.framework = framework = fw; }));
+            }, waitFor(function(fw) { window.APP.framework = framework = fw; }));
 
-            nThen(function (waitFor) {
-                ckEditorAvailable(waitFor(function (ck) {
+            nThen(function(waitFor) {
+                ckEditorAvailable(waitFor(function(ck) {
                     Ckeditor = ck;
                     require(['/pad/wysiwygarea-plugin.js'], waitFor());
                 }));
                 $(waitFor());
-            }).nThen(function (waitFor) {
+            }).nThen(function(waitFor) {
                 Ckeditor.config.toolbarCanCollapse = true;
                 if (screen.height < 800) {
                     Ckeditor.config.toolbarStartupExpanded = false;
@@ -947,20 +943,19 @@ define([
                     'import': Messages.pad_mediatagImport,
                     options: Messages.pad_mediatagOptions
                 };
-                Messages.comments_comment = "COMMENT"; // XXX
                 Ckeditor._commentsTranslations = {
                     comment: Messages.comments_comment,
                 };
-                Ckeditor.plugins.addExternal('mediatag','/pad/', 'mediatag-plugin.js');
-                Ckeditor.plugins.addExternal('blockbase64','/pad/', 'disable-base64.js');
-                Ckeditor.plugins.addExternal('comments','/pad/', 'comment.js');
-                Ckeditor.plugins.addExternal('wordcount','/pad/wordcount/', 'plugin.js');
+                Ckeditor.plugins.addExternal('mediatag', '/pad/', 'mediatag-plugin.js');
+                Ckeditor.plugins.addExternal('blockbase64', '/pad/', 'disable-base64.js');
+                Ckeditor.plugins.addExternal('comments', '/pad/', 'comment.js');
+                Ckeditor.plugins.addExternal('wordcount', '/pad/wordcount/', 'plugin.js');
                 module.ckeditor = editor = Ckeditor.replace('editor1', {
                     customConfig: '/customize/ckeditor-config.js',
                 });
 
                 editor.addCommand('pagemode', {
-                    exec: function () {
+                    exec: function() {
                         if (!framework) { return; }
                         var $contentContainer = $('#cke_1_contents');
                         var $button = $('.cke_button__pagemode');
@@ -983,12 +978,12 @@ define([
                 });
 
                 editor.on('instanceReady', waitFor());
-            }).nThen(function () {
-                editor.plugins.mediatag.import = function ($mt) {
+            }).nThen(function() {
+                editor.plugins.mediatag.import = function($mt) {
                     framework._.sfCommon.importMediaTag($mt);
                 };
                 Links.init(Ckeditor, editor);
-            }).nThen(function () {
+            }).nThen(function() {
                 // Move ckeditor parts to have a structure like the other apps
                 var $contentContainer = $('#cke_1_contents');
                 var $mainContainer = $('#cke_editor1 > .cke_inner');
@@ -998,19 +993,19 @@ define([
                 $ckeToolbar.find('.cke_button__image_icon').parent().hide();
             }).nThen(waitFor());
 
-        }).nThen(function (/*waitFor*/) {
+        }).nThen(function( /*waitFor*/ ) {
             function launchAnchorTest(test) {
                 // -------- anchor test: make sure the exported anchor contains <a name="...">  -------
                 console.log('---- anchor test: make sure the exported anchor contains <a name="...">  -----.');
 
                 function tryAndTestExport() {
                     console.log("Starting tryAndTestExport.");
-                    editor.on( 'dialogShow', function( evt ) {
+                    editor.on('dialogShow', function(evt) {
                         console.log("Anchor dialog detected.");
                         var dialog = evt.data;
-                        $(dialog.parts.contents.$).find("input").val('xx-' + Math.round(Math.random()*1000));
+                        $(dialog.parts.contents.$).find("input").val('xx-' + Math.round(Math.random() * 1000));
                         dialog.click(window.CKEDITOR.dialog.okButton(editor).id);
-                    } );
+                    });
                     var existingText = editor.getData();
                     editor.insertText("A bit of text");
                     console.log("Launching anchor command.");
@@ -1020,46 +1015,45 @@ define([
                     var waitH = window.setInterval(function() {
                         console.log("Waited 2s for the dialog to appear");
                         var anchors = window.CKEDITOR.plugins["link"].getEditorAnchors(editor);
-                        if(!anchors || anchors.length===0) {
+                        if (!anchors || anchors.length === 0) {
                             test.fail("No anchors found. Please adjust document");
                         } else {
                             console.log(anchors.length + " anchors found.");
                             var exported = Exporter.getHTML(window.inner);
                             console.log("Obtained exported: " + exported);
                             var allFound = true;
-                            for(var i=0; i<anchors.length; i++) {
+                            for (var i = 0; i < anchors.length; i++) {
                                 var anchor = anchors[i];
                                 console.log("Anchor " + anchor.name);
                                 var expected = "<a id=\"" + anchor.id + "\" name=\"" + anchor.name + "\" ";
-                                var found = exported.indexOf(expected)>=0;
+                                var found = exported.indexOf(expected) >= 0;
                                 console.log("Found " + expected + " " + found + ".");
                                 allFound = allFound && found;
                             }
 
                             console.log("Cleaning up.");
-                            if(allFound) {
+                            if (allFound) {
                                 // clean-up
                                 editor.execCommand('undo');
                                 editor.execCommand('undo');
-                                var nint = window.setInterval(function(){
+                                var nint = window.setInterval(function() {
                                     console.log("Waiting for undo to yield same result.");
-                                    if(existingText === editor.getData()) {
+                                    if (existingText === editor.getData()) {
                                         window.clearInterval(nint);
                                         test.pass();
                                     }
                                 }, 500);
-                                }  else
-                            {
+                            } else {
                                 test.fail("Not all expected a elements found for document at " + window.top.location + ".");
                             }
                         }
                         window.clearInterval(waitH);
-                    },2000);
+                    }, 2000);
 
 
                 }
                 var intervalHandle = window.setInterval(function() {
-                    if(editor.status==="ready") {
+                    if (editor.status === "ready") {
                         window.clearInterval(intervalHandle);
                         console.log("Editor is ready.");
                         tryAndTestExport();
@@ -1076,4 +1070,4 @@ define([
         });
     };
     main();
-});
+});
\ No newline at end of file
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 9353b2c64..255670c27 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -20,7 +20,7 @@ define([
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
     'less!/settings/app-settings.less',
-], function (
+], function(
     $,
     Toolbar,
     nThen,
@@ -36,8 +36,7 @@ define([
     ApiConfig,
     Backup,
     Feedback
-    )
-{
+) {
     var saveAs = window.saveAs;
     var APP = window.APP = {};
 
@@ -88,7 +87,7 @@ define([
             'cp-settings-code-spellcheck',
         ],
         'subscription': {
-            onClick: function () {
+            onClick: function() {
                 var urls = common.getMetadataMgr().getPrivateData().accounts;
                 window.open(urls.upgradeURL);
                 Feedback.send('SUBSCRIPTION_BUTTON');
@@ -111,34 +110,34 @@ define([
     var create = {};
 
     var SPECIAL_HINTS_HANDLER = {
-        safeLinks: function () {
-            return $('<span>', {'class': 'cp-sidebarlayout-description'})
+        safeLinks: function() {
+            return $('<span>', { 'class': 'cp-sidebarlayout-description' })
                 .html(Messages._getKey('settings_safeLinksHint', ['<span class="fa fa-shhare-alt"></span>']));
         },
     };
 
-    var DEFAULT_HINT_HANDLER = function (safeKey) {
-        return $('<span>', {'class': 'cp-sidebarlayout-description'})
-            .text(Messages['settings_'+safeKey+'Hint'] || 'Coming soon...');
+    var DEFAULT_HINT_HANDLER = function(safeKey) {
+        return $('<span>', { 'class': 'cp-sidebarlayout-description' })
+            .text(Messages['settings_' + safeKey + 'Hint'] || 'Coming soon...');
     };
 
-    var makeBlock = function (key, getter, full) {
-        var safeKey = key.replace(/-([a-z])/g, function (g) { return g[1].toUpperCase(); });
+    var makeBlock = function(key, getter, full) {
+        var safeKey = key.replace(/-([a-z])/g, function(g) { return g[1].toUpperCase(); });
 
-        create[key] = function () {
-            var $div = $('<div>', {'class': 'cp-settings-' + key + ' cp-sidebarlayout-element'});
+        create[key] = function() {
+            var $div = $('<div>', { 'class': 'cp-settings-' + key + ' cp-sidebarlayout-element' });
             if (full) {
-                $('<label>').text(Messages['settings_'+safeKey+'Title'] || key).appendTo($div);
+                $('<label>').text(Messages['settings_' + safeKey + 'Title'] || key).appendTo($div);
 
                 // if this block's hint needs a special renderer, then create it in SPECIAL_HINTS_HANLDER
                 // otherwise the default will be used
-                var hintFunction = (typeof(SPECIAL_HINTS_HANDLER[safeKey]) === 'function')?
-                    SPECIAL_HINTS_HANDLER[safeKey]:
+                var hintFunction = (typeof(SPECIAL_HINTS_HANDLER[safeKey]) === 'function') ?
+                    SPECIAL_HINTS_HANDLER[safeKey] :
                     DEFAULT_HINT_HANDLER;
 
                 hintFunction(safeKey).appendTo($div);
             }
-            getter(function (content) {
+            getter(function(content) {
                 if (content === false) {
                     $div.remove();
                     $div = undefined;
@@ -153,12 +152,12 @@ define([
 
     // Account settings
 
-    create['info-block'] = function () {
-        var $div = $('<div>', {'class': 'cp-settings-info-block'});
+    create['info-block'] = function() {
+        var $div = $('<div>', { 'class': 'cp-settings-info-block' });
 
-        var $account = $('<div>', {'class': 'cp-sidebarlayout-element'}).appendTo($div);
+        var $account = $('<div>', { 'class': 'cp-sidebarlayout-element' }).appendTo($div);
         var accountName = privateData.accountName;
-        var $label = $('<span>', {'class': 'label'}).text(Messages.user_accountName);
+        var $label = $('<span>', { 'class': 'label' }).text(Messages.user_accountName);
         var $name = $('<span>').text(accountName || '');
         if (!accountName) {
             $label.text('');
@@ -168,9 +167,9 @@ define([
 
         var publicKey = privateData.edPublic;
         if (publicKey) {
-            var $key = $('<div>', {'class': 'cp-sidebarlayout-element'}).appendTo($div);
+            var $key = $('<div>', { 'class': 'cp-sidebarlayout-element' }).appendTo($div);
             var userHref = Hash.getUserHrefFromKeys(privateData.origin, accountName, publicKey);
-            var $pubLabel = $('<span>', {'class': 'label'})
+            var $pubLabel = $('<span>', { 'class': 'label' })
                 .text(Messages.settings_publicSigningKey);
             $key.append($pubLabel).append(UI.dialog.selectable(userHref));
         }
@@ -179,39 +178,40 @@ define([
     };
 
     // Create the block containing the display name field
-    create['displayname'] = function () {
-        var $div = $('<div>', {'class': 'cp-settings-displayname cp-sidebarlayout-element'});
-        $('<label>', {'for' : 'cp-settings-displayname'}).text(Messages.user_displayName).appendTo($div);
-        var $inputBlock = $('<div>', {'class': 'cp-sidebarlayout-input-block'}).appendTo($div);
+    create['displayname'] = function() {
+        var $div = $('<div>', { 'class': 'cp-settings-displayname cp-sidebarlayout-element' });
+        $('<label>', { 'for': 'cp-settings-displayname' }).text(Messages.user_displayName).appendTo($div);
+        var $inputBlock = $('<div>', { 'class': 'cp-sidebarlayout-input-block' }).appendTo($div);
         var $input = $('<input>', {
             'type': 'text',
             'id': 'cp-settings-displayname',
-            'placeholder': Messages.anonymous}).appendTo($inputBlock);
-        var $save = $('<button>', {'class': 'btn btn-primary'}).text(Messages.settings_save).appendTo($inputBlock);
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide().appendTo($div);
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide().appendTo($div);
+            'placeholder': Messages.anonymous
+        }).appendTo($inputBlock);
+        var $save = $('<button>', { 'class': 'btn btn-primary' }).text(Messages.settings_save).appendTo($inputBlock);
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved }).hide().appendTo($div);
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' }).hide().appendTo($div);
 
         var displayName = metadataMgr.getUserData().name || '';
         $input.val(displayName);
 
         // When the display name is changed (enter or button clicked)
-        var todo = function () {
+        var todo = function() {
             displayName = $input.val();
             if (displayName === metadataMgr.getUserData().name) { return; }
             $spinner.show();
-            common.setDisplayName(displayName, function () {
+            common.setDisplayName(displayName, function() {
                 $spinner.hide();
                 $ok.show();
             });
         };
-        $input.on('keyup', function (e) {
+        $input.on('keyup', function(e) {
             if ($input.val() !== displayName) { $ok.hide(); }
             if (e.which === 13) { todo(); }
         });
         $save.click(todo);
 
         // On remote change
-        var onChange = function () {
+        var onChange = function() {
             if (metadataMgr.getUserData().name !== $input.val()) {
                 $input.val(metadataMgr.getUserData().name);
                 $input.focusout();
@@ -222,40 +222,40 @@ define([
         return $div;
     };
 
-    create['language-selector'] = function () {
-        var $div = $('<div>', {'class': 'cp-settings-language-selector cp-sidebarlayout-element'});
+    create['language-selector'] = function() {
+        var $div = $('<div>', { 'class': 'cp-settings-language-selector cp-sidebarlayout-element' });
         $('<label>').text(Messages.language).appendTo($div);
         var $b = common.createLanguageSelector($div);
         $b.find('button').addClass('btn btn-secondary');
         return $div;
     };
 
-    create['logout-everywhere'] = function () {
+    create['logout-everywhere'] = function() {
         if (!common.isLoggedIn()) { return; }
-        var $div = $('<div>', { 'class': 'cp-settings-logout-everywhere cp-sidebarlayout-element'});
+        var $div = $('<div>', { 'class': 'cp-settings-logout-everywhere cp-sidebarlayout-element' });
         $('<label>').text(Messages.settings_logoutEverywhereTitle).appendTo($div);
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_logoutEverywhere).appendTo($div);
         var $button = $('<button>', {
-            id: 'cp-settings-logout-everywhere',
-            'class': 'btn btn-primary'
-        }).text(Messages.settings_logoutEverywhereButton)
+                id: 'cp-settings-logout-everywhere',
+                'class': 'btn btn-primary'
+            }).text(Messages.settings_logoutEverywhereButton)
             .appendTo($div);
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide().appendTo($div);
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide().appendTo($div);
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved }).hide().appendTo($div);
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' }).hide().appendTo($div);
 
-        $button.click(function () {
+        $button.click(function() {
 
-            UI.confirm(Messages.settings_logoutEverywhereConfirm, function (yes) {
+            UI.confirm(Messages.settings_logoutEverywhereConfirm, function(yes) {
                 if (!yes) { return; }
                 $spinner.show();
                 $ok.hide();
 
                 Feedback.send('LOGOUT_EVERYWHERE');
-                sframeChan.query('Q_SETTINGS_LOGOUT', null, function () {
+                sframeChan.query('Q_SETTINGS_LOGOUT', null, function() {
                     $spinner.hide();
                     $ok.show();
-                    window.setTimeout(function () {
+                    window.setTimeout(function() {
                         $ok.fadeOut(1500);
                     }, 2500);
                 });
@@ -264,44 +264,44 @@ define([
         return $div;
     };
 
-    create['autostore'] = function () {
-        var $div = $('<div>', { 'class': 'cp-settings-autostore cp-sidebarlayout-element'});
+    create['autostore'] = function() {
+        var $div = $('<div>', { 'class': 'cp-settings-autostore cp-sidebarlayout-element' });
 
-        $('<span>', {'class': 'label'}).text(Messages.settings_autostoreTitle).appendTo($div);
+        $('<span>', { 'class': 'label' }).text(Messages.settings_autostoreTitle).appendTo($div);
 
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .append(Messages.settings_autostoreHint).appendTo($div);
 
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved });
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' });
 
         var opt1 = UI.createRadio('cp-settings-autostore', 'cp-settings-autostore-no',
-                                Messages.settings_autostoreNo, false, {
-                                    input: { value: -1 },
-                                    label: { class: 'noTitle' }
-                                });
+            Messages.settings_autostoreNo, false, {
+                input: { value: -1 },
+                label: { class: 'noTitle' }
+            });
         var opt2 = UI.createRadio('cp-settings-autostore', 'cp-settings-autostore-maybe',
-                                Messages.settings_autostoreMaybe, true, {
-                                    input: { value: 0 },
-                                    label: { class: 'noTitle' }
-                                });
+            Messages.settings_autostoreMaybe, true, {
+                input: { value: 0 },
+                label: { class: 'noTitle' }
+            });
         var opt3 = UI.createRadio('cp-settings-autostore', 'cp-settings-autostore-yes',
-                                Messages.settings_autostoreYes, false, {
-                                    input: { value: 1 },
-                                    label: { class: 'noTitle' }
-                                });
+            Messages.settings_autostoreYes, false, {
+                input: { value: 1 },
+                label: { class: 'noTitle' }
+            });
         var $div2 = $(h('div.cp-settings-autostore-radio', [
             opt3,
             opt2,
             opt1
         ])).appendTo($div);
 
-        $div.find('input[type="radio"]').on('change', function () {
+        $div.find('input[type="radio"]').on('change', function() {
             $spinner.show();
             $ok.hide();
             var val = $('input:radio[name="cp-settings-autostore"]:checked').val();
             val = Number(val) || 0;
-            common.setAttribute(['general', 'autostore'], val, function () {
+            common.setAttribute(['general', 'autostore'], val, function() {
                 $spinner.hide();
                 $ok.show();
             });
@@ -310,7 +310,7 @@ define([
         $ok.hide().appendTo($div2);
         $spinner.hide().appendTo($div2);
 
-        common.getAttribute(['general', 'autostore'], function (err, val) {
+        common.getAttribute(['general', 'autostore'], function(err, val) {
             if (val === 1) { return void $('#cp-settings-autostore-yes').prop('checked', true); }
             if (val === -1) { return void $('#cp-settings-autostore-no').prop('checked', true); }
             $('#cp-settings-autostore-maybe').prop('checked', true);
@@ -319,26 +319,26 @@ define([
         return $div;
     };
 
-    create['userfeedback'] = function () {
-        var $div = $('<div>', { 'class': 'cp-settings-userfeedback cp-sidebarlayout-element'});
+    create['userfeedback'] = function() {
+        var $div = $('<div>', { 'class': 'cp-settings-userfeedback cp-sidebarlayout-element' });
 
-        $('<span>', {'class': 'label'}).text(Messages.settings_userFeedbackTitle).appendTo($div);
+        $('<span>', { 'class': 'label' }).text(Messages.settings_userFeedbackTitle).appendTo($div);
 
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .append(Messages.settings_userFeedbackHint1)
             .append(Messages.settings_userFeedbackHint2).appendTo($div);
 
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved });
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' });
 
         var $cbox = $(UI.createCheckbox('cp-settings-userfeedback',
-                                   Messages.settings_userFeedback,
-                                   false, { label: {class: 'noTitle'} }));
-        var $checkbox = $cbox.find('input').on('change', function () {
+            Messages.settings_userFeedback,
+            false, { label: { class: 'noTitle' } }));
+        var $checkbox = $cbox.find('input').on('change', function() {
             $spinner.show();
             $ok.hide();
             var val = $checkbox.is(':checked') || false;
-            common.setAttribute(['general', 'allowUserFeedback'], val, function () {
+            common.setAttribute(['general', 'allowUserFeedback'], val, function() {
                 $spinner.hide();
                 $ok.show();
             });
@@ -355,30 +355,30 @@ define([
         return $div;
     };
 
-    create['delete'] = function () {
+    create['delete'] = function() {
         if (!common.isLoggedIn()) { return; }
-        var $div = $('<div>', { 'class': 'cp-settings-delete cp-sidebarlayout-element'});
+        var $div = $('<div>', { 'class': 'cp-settings-delete cp-sidebarlayout-element' });
 
-        $('<span>', {'class': 'label'}).text(Messages.settings_deleteTitle).appendTo($div);
+        $('<span>', { 'class': 'label' }).text(Messages.settings_deleteTitle).appendTo($div);
 
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .append(Messages.settings_deleteHint).appendTo($div);
 
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved });
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' });
 
-        var $button = $('<button>', {'id': 'cp-settings-delete', 'class': 'btn btn-danger'})
+        var $button = $('<button>', { 'id': 'cp-settings-delete', 'class': 'btn btn-danger' })
             .text(Messages.settings_deleteButton).appendTo($div);
 
-        $button.click(function () {
+        $button.click(function() {
             $spinner.show();
-            UI.confirm(Messages.settings_deleteConfirm, function (yes) {
+            UI.confirm(Messages.settings_deleteConfirm, function(yes) {
                 if (!yes) { return; }
-                sframeChan.query("Q_SETTINGS_DELETE_ACCOUNT", null, function (err, data) {
+                sframeChan.query("Q_SETTINGS_DELETE_ACCOUNT", null, function(err, data) {
                     // Owned drive
                     if (data.state === true) {
-                        sframeChan.query('Q_SETTINGS_LOGOUT', null, function () {});
-                        UI.alert(Messages.settings_deleted, function () {
+                        sframeChan.query('Q_SETTINGS_LOGOUT', null, function() {});
+                        UI.alert(Messages.settings_deleted, function() {
                             common.gotoURL('/');
                         });
                         $ok.show();
@@ -413,14 +413,14 @@ define([
         return $div;
     };
 
-    create['change-password'] = function () {
+    create['change-password'] = function() {
         if (!common.isLoggedIn()) { return; }
 
-        var $div = $('<div>', { 'class': 'cp-settings-change-password cp-sidebarlayout-element'});
+        var $div = $('<div>', { 'class': 'cp-settings-change-password cp-sidebarlayout-element' });
 
-        $('<span>', {'class': 'label'}).text(Messages.settings_changePasswordTitle).appendTo($div);
+        $('<span>', { 'class': 'label' }).text(Messages.settings_changePasswordTitle).appendTo($div);
 
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .append(Messages.settings_changePasswordHint).appendTo($div);
 
         // var publicKey = privateData.edPublic;
@@ -444,14 +444,14 @@ define([
 
         $(form).appendTo($div);
 
-        var updateBlock = function (data, cb) {
-            sframeChan.query('Q_CHANGE_USER_PASSWORD', data, function (err, obj) {
-                if (err || obj.error) { return void cb ({error: err || obj.error}); }
-                cb (obj);
+        var updateBlock = function(data, cb) {
+            sframeChan.query('Q_CHANGE_USER_PASSWORD', data, function(err, obj) {
+                if (err || obj.error) { return void cb({ error: err || obj.error }); }
+                cb(obj);
             });
         };
 
-        var todo = function () {
+        var todo = function() {
             var oldPassword = $(form).find('#cp-settings-change-password-current').val();
             var newPassword = $(form).find('#cp-settings-change-password-new').val();
             var newPasswordConfirm = $(form).find('#cp-settings-change-password-new2').val();
@@ -474,39 +474,39 @@ define([
             }
 
             UI.confirm(Messages.settings_changePasswordConfirm,
-            function (yes) {
-                if (!yes) { return; }
-
-                UI.addLoadingScreen({
-                    hideTips: true,
-                    loadingText: Messages.settings_changePasswordPending,
-                });
-                updateBlock({
-                    password: oldPassword,
-                    newPassword: newPassword
-                }, function (obj) {
-                    UI.removeLoadingScreen();
-                    if (obj && obj.error) {
-                        // TODO
-                        UI.alert(Messages.settings_changePasswordError);
-                    }
-                });
-            }, {
-                ok: Messages.register_writtenPassword,
-                cancel: Messages.register_cancel,
-                cancelClass: 'safe',
-                okClass: 'danger',
-                reverseOrder: true,
-                done: function ($dialog) {
-                    $dialog.find('> div').addClass('half');
-                },
-            }, true);
+                function(yes) {
+                    if (!yes) { return; }
+
+                    UI.addLoadingScreen({
+                        hideTips: true,
+                        loadingText: Messages.settings_changePasswordPending,
+                    });
+                    updateBlock({
+                        password: oldPassword,
+                        newPassword: newPassword
+                    }, function(obj) {
+                        UI.removeLoadingScreen();
+                        if (obj && obj.error) {
+                            // TODO
+                            UI.alert(Messages.settings_changePasswordError);
+                        }
+                    });
+                }, {
+                    ok: Messages.register_writtenPassword,
+                    cancel: Messages.register_cancel,
+                    cancelClass: 'safe',
+                    okClass: 'danger',
+                    reverseOrder: true,
+                    done: function($dialog) {
+                        $dialog.find('> div').addClass('half');
+                    },
+                }, true);
         };
 
-        $(form).find('button').click(function () {
+        $(form).find('button').click(function() {
             todo();
         });
-        $(form).find('input').keydown(function (e) {
+        $(form).find('input').keydown(function(e) {
             // Save on Enter
             if (e.which === 13) {
                 e.preventDefault();
@@ -518,7 +518,7 @@ define([
         return $div;
     };
 
-    makeBlock('own-drive', function (cb, $div) {
+    makeBlock('own-drive', function(cb, $div) {
         if (privateData.isDriveOwned || !common.isLoggedIn()) {
             return void cb(false);
         }
@@ -535,11 +535,11 @@ define([
         var $form = $(form);
         var spinner = UI.makeSpinner($form);
 
-        var todo = function () {
+        var todo = function() {
             var password = $form.find('#cp-settings-migrate-password').val();
             if (!password) { return; }
             spinner.spin();
-            UI.confirm(Messages.settings_ownDriveConfirm, function (yes) {
+            UI.confirm(Messages.settings_ownDriveConfirm, function(yes) {
                 if (!yes) { return; }
                 var data = {
                     password: password,
@@ -549,7 +549,7 @@ define([
                     hideTips: true,
                     loadingText: Messages.settings_ownDrivePending,
                 });
-                sframeChan.query('Q_CHANGE_USER_PASSWORD', data, function (err, obj) {
+                sframeChan.query('Q_CHANGE_USER_PASSWORD', data, function(err, obj) {
                     UI.removeLoadingScreen();
                     if (err || obj.error) { return UI.alert(Messages.settings_changePasswordError); }
                     spinner.done();
@@ -557,10 +557,10 @@ define([
             });
         };
 
-        $form.find('button').click(function () {
+        $form.find('button').click(function() {
             todo();
         });
-        $form.find('input').keydown(function (e) {
+        $form.find('input').keydown(function(e) {
             // Save on Enter
             if (e.which === 13) {
                 e.preventDefault();
@@ -575,24 +575,24 @@ define([
 
     // Security
 
-    makeBlock('safe-links', function (cb) {
+    makeBlock('safe-links', function(cb) {
 
         var $cbox = $(UI.createCheckbox('cp-settings-safe-links',
-                                   Messages.settings_safeLinksCheckbox,
-                                   false, { label: {class: 'noTitle'} }));
+            Messages.settings_safeLinksCheckbox,
+            false, { label: { class: 'noTitle' } }));
 
         var spinner = UI.makeSpinner($cbox);
 
         // Checkbox: "Enable safe links"
-        var $checkbox = $cbox.find('input').on('change', function () {
+        var $checkbox = $cbox.find('input').on('change', function() {
             spinner.spin();
             var val = !$checkbox.is(':checked');
-            common.setAttribute(['security', 'unsafeLinks'], val, function () {
+            common.setAttribute(['security', 'unsafeLinks'], val, function() {
                 spinner.done();
             });
         });
 
-        common.getAttribute(['security', 'unsafeLinks'], function (e, val) {
+        common.getAttribute(['security', 'unsafeLinks'], function(e, val) {
             if (e) { return void console.error(e); }
             if (val === false) {
                 $checkbox.attr('checked', 'checked');
@@ -604,26 +604,26 @@ define([
 
     // Drive settings
 
-    create['drive-duplicate'] = function () {
+    create['drive-duplicate'] = function() {
         if (!common.isLoggedIn()) { return; }
         var $div = $('<div>', {
             'class': 'cp-settings-drive-duplicate cp-sidebarlayout-element'
         });
         $('<label>').text(Messages.settings_driveDuplicateTitle).appendTo($div);
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_driveDuplicateHint).appendTo($div);
 
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved });
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' });
 
         var $cbox = $(UI.createCheckbox('cp-settings-drive-duplicate',
-                                   Messages.settings_driveDuplicateLabel,
-                                   false, { label: {class: 'noTitle'} }));
-        var $checkbox = $cbox.find('input').on('change', function () {
+            Messages.settings_driveDuplicateLabel,
+            false, { label: { class: 'noTitle' } }));
+        var $checkbox = $cbox.find('input').on('change', function() {
             $spinner.show();
             $ok.hide();
             var val = $checkbox.is(':checked');
-            common.setAttribute(['drive', 'hideDuplicate'], val, function () {
+            common.setAttribute(['drive', 'hideDuplicate'], val, function() {
                 $spinner.hide();
                 $ok.show();
             });
@@ -633,7 +633,7 @@ define([
         $ok.hide().appendTo($cbox);
         $spinner.hide().appendTo($cbox);
 
-        common.getAttribute(['drive', 'hideDuplicate'], function (e, val) {
+        common.getAttribute(['drive', 'hideDuplicate'], function(e, val) {
             if (e) { return void console.error(e); }
             if (val) {
                 $checkbox.attr('checked', 'checked');
@@ -643,18 +643,18 @@ define([
     };
 
 
-    create['resettips'] = function () {
-        var $div = $('<div>', {'class': 'cp-settings-resettips cp-sidebarlayout-element'});
+    create['resettips'] = function() {
+        var $div = $('<div>', { 'class': 'cp-settings-resettips cp-sidebarlayout-element' });
         $('<label>').text(Messages.settings_resetTips).appendTo($div);
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_resetTipsButton).appendTo($div);
-        var $button = $('<button>', {'id': 'cp-settings-resettips', 'class': 'btn btn-primary'})
+        var $button = $('<button>', { 'id': 'cp-settings-resettips', 'class': 'btn btn-primary' })
             .text(Messages.settings_resetTipsAction).appendTo($div);
 
         var localStore = window.cryptpadStore;
-        $button.click(function () {
-            Object.keys(localStore.store).forEach(function (k) {
-                if(/^(hide-(info|alert))/.test(k)) {
+        $button.click(function() {
+            Object.keys(localStore.store).forEach(function(k) {
+                if (/^(hide-(info|alert))/.test(k)) {
                     localStore.put(k, null);
                 }
             });
@@ -664,25 +664,25 @@ define([
         return $div;
     };
 
-    create['thumbnails'] = function () {
-        var $div = $('<div>', {'class': 'cp-settings-thumbnails cp-sidebarlayout-element'});
+    create['thumbnails'] = function() {
+        var $div = $('<div>', { 'class': 'cp-settings-thumbnails cp-sidebarlayout-element' });
         $('<label>').text(Messages.settings_thumbnails).appendTo($div);
 
         // Disable
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_disableThumbnailsDescription).appendTo($div);
 
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved });
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' });
 
         var $cbox = $(UI.createCheckbox('disableThumbnails',
-                                   Messages.settings_disableThumbnailsAction,
-                                   false, { label: {class: 'noTitle'} }));
-        var $checkbox = $cbox.find('input').on('change', function () {
+            Messages.settings_disableThumbnailsAction,
+            false, { label: { class: 'noTitle' } }));
+        var $checkbox = $cbox.find('input').on('change', function() {
             $spinner.show();
             $ok.hide();
             var val = $checkbox.is(':checked') || false;
-            common.setAttribute(['general', 'disableThumbnails'], val, function () {
+            common.setAttribute(['general', 'disableThumbnails'], val, function() {
                 $spinner.hide();
                 $ok.show();
             });
@@ -693,18 +693,18 @@ define([
         $ok.hide().appendTo($cbox);
         $spinner.hide().appendTo($cbox);
 
-        common.getAttribute(['general', 'disableThumbnails'], function (e, val) {
+        common.getAttribute(['general', 'disableThumbnails'], function(e, val) {
             $checkbox[0].checked = typeof(val) === "undefined" || val;
         });
 
         // Reset
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_resetThumbnailsDescription).appendTo($div);
-        var $button = $('<button>', {'id': 'resetThumbnails', 'class': 'btn btn-primary'})
+        var $button = $('<button>', { 'id': 'resetThumbnails', 'class': 'btn btn-primary' })
             .text(Messages.settings_resetThumbnailsAction).appendTo($div);
 
-        $button.click(function () {
-            sframeChan.query("Q_THUMBNAIL_CLEAR", null, function (err) {
+        $button.click(function() {
+            sframeChan.query("Q_THUMBNAIL_CLEAR", null, function(err) {
                 if (err) { return void console.error("Cannot clear localForage"); }
                 UI.alert(Messages.settings_resetThumbnailsDone);
             });
@@ -714,7 +714,7 @@ define([
     };
 
 
-    var createExportUI = function () {
+    var createExportUI = function() {
         var progress = h('div.cp-export-progress');
         var actions = h('div.cp-export-actions');
         var errors = h('div.cp-export-errors', [
@@ -738,27 +738,27 @@ define([
         $('body').append(exportUI);
         $('#cp-sidebarlayout-container').hide();
 
-        var close = function () {
+        var close = function() {
             $(exportUI).remove();
             $('#cp-sidebarlayout-container').show();
         };
 
         var _onCancel = [];
-        var onCancel = function (h) {
-            if (typeof (h) !== "function") { return; }
+        var onCancel = function(h) {
+            if (typeof(h) !== "function") { return; }
             _onCancel.push(h);
         };
         var cancel = h('button.btn.btn-default', Messages.cancel);
-        $(cancel).click(function () {
-            UI.confirm(Messages.settings_exportCancel, function (yes) {
+        $(cancel).click(function() {
+            UI.confirm(Messages.settings_exportCancel, function(yes) {
                 if (!yes) { return; }
                 Feedback.send('FULL_DRIVE_EXPORT_CANCEL');
-                _onCancel.forEach(function (h) { h(); });
+                _onCancel.forEach(function(h) { h(); });
             });
         }).appendTo(actions);
 
         var error = h('button.btn.btn-danger', Messages.settings_exportError);
-        var translateErrors = function (err) {
+        var translateErrors = function(err) {
             if (err === 'EEMPTY') {
                 return Messages.settings_exportErrorEmpty;
             }
@@ -767,16 +767,16 @@ define([
             }
             return Messages._getKey('settings_exportErrorOther', [err]);
         };
-        var addErrors = function (errs) {
+        var addErrors = function(errs) {
             if (!errs.length) { return; }
-            var onClick = function () {
+            var onClick = function() {
                 console.error('clicked?');
                 $(errors).toggle();
             };
             $(error).click(onClick).appendTo(actions);
             var list = h('div.cp-export-errors-list');
             $(list).appendTo(errors);
-            errs.forEach(function (err) {
+            errs.forEach(function(err) {
                 if (!err.data) { return; }
                 var href = (err.data.href && err.data.href.indexOf('#') !== -1) ? err.data.href : err.data.roHref;
                 $(h('div', [
@@ -794,20 +794,20 @@ define([
 
         var download = h('button.btn.btn-primary', Messages.download_mt_button);
         var completed = false;
-        var complete = function (h, err) {
+        var complete = function(h, err) {
             if (completed) { return; }
             completed = true;
             $(progress).find('.fa-square-o').removeClass('fa-square-o')
                 .addClass('fa-check-square-o');
-            $(cancel).text(Messages.filePicker_close).off('click').click(function () {
-                _onCancel.forEach(function (h) { h(); });
+            $(cancel).text(Messages.filePicker_close).off('click').click(function() {
+                _onCancel.forEach(function(h) { h(); });
             });
             $(download).click(h).appendTo(actions);
             addErrors(err);
         };
 
         var done = {};
-        var update = function (step, state) {
+        var update = function(step, state) {
             console.log(step, state);
             console.log(done[step]);
             if (done[step] && done[step] === -1) { return; }
@@ -819,7 +819,7 @@ define([
                     .addClass('fa-check-square-o');
                 $(progress).append(h('p', [
                     h('span.fa.fa-square-o'),
-                    h('span.text', Messages['settings_export_'+step] || step)
+                    h('span.text', Messages['settings_export_' + step] || step)
                 ]));
                 done[step] = state; // -1 if no bar, object otherwise
                 if (state !== -1) {
@@ -835,7 +835,7 @@ define([
             // Updating existing step
             if (typeof state !== "object") { return; }
             var b = done[step].bar;
-            var w = (state.current/state.max) * 100;
+            var w = (state.current / state.max) * 100;
             $(b).css('width', w + '%');
             if (!done[step].text) {
                 done[step].text = h('div.cp-export-progress-text');
@@ -853,31 +853,32 @@ define([
         };
     };
 
-    create['drive-backup'] = function () {
-        var $div = $('<div>', {'class': 'cp-settings-drive-backup cp-sidebarlayout-element'});
+    create['drive-backup'] = function() {
+        var $div = $('<div>', { 'class': 'cp-settings-drive-backup cp-sidebarlayout-element' });
 
         var accountName = privateData.accountName;
         var displayName = metadataMgr.getUserData().name || '';
         var name = displayName || accountName || Messages.anonymous;
         var suggestion = name + '-' + new Date().toDateString();
 
-        var exportFile = function () {
-            sframeChan.query("Q_SETTINGS_DRIVE_GET", null, function (err, data) {
+        var exportFile = function() {
+            sframeChan.query("Q_SETTINGS_DRIVE_GET", null, function(err, data) {
                 if (err) { return void console.error(err); }
                 var sjson = JSON.stringify(data);
                 UI.prompt(Messages.exportPrompt,
-                    Util.fixFileName(suggestion) + '.json', function (filename) {
-                    if (!(typeof(filename) === 'string' && filename)) { return; }
-                    var blob = new Blob([sjson], {type: "application/json;charset=utf-8"});
-                    saveAs(blob, filename);
-                });
+                    Util.fixFileName(suggestion) + '.json',
+                    function(filename) {
+                        if (!(typeof(filename) === 'string' && filename)) { return; }
+                        var blob = new Blob([sjson], { type: "application/json;charset=utf-8" });
+                        saveAs(blob, filename);
+                    });
             });
         };
-        var importFile = function (content) {
-            var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).appendTo($div);
+        var importFile = function(content) {
+            var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' }).appendTo($div);
             try {
                 var data = JSON.parse(content);
-                sframeChan.query("Q_SETTINGS_DRIVE_SET", data, function (e) {
+                sframeChan.query("Q_SETTINGS_DRIVE_SET", data, function(e) {
                     if (e) { console.error(e); }
                     $spinner.remove();
                 });
@@ -886,8 +887,8 @@ define([
             }
         };
 
-        $('<label>', {'for' : 'exportDrive'}).text(Messages.settings_backupCategory).appendTo($div);
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<label>', { 'for': 'exportDrive' }).text(Messages.settings_backupCategory).appendTo($div);
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_backupHint || Messages.settings_backupTitle).appendTo($div);
         /* add an export button */
         var $export = common.createButton('export', true, {}, exportFile);
@@ -900,35 +901,36 @@ define([
         $div.append($import);
 
         // Backup all the pads
-        var exportDrive = function () {
+        var exportDrive = function() {
             Feedback.send('FULL_DRIVE_EXPORT_START');
-            var todo = function (data, filename) {
+            var todo = function(data, filename) {
                 var ui = createExportUI();
 
-                var bu = Backup.create(data, common.getPad, privateData.fileHost, function (blob, errors) {
+                var bu = Backup.create(data, common.getPad, privateData.fileHost, function(blob, errors) {
                     saveAs(blob, filename);
                     sframeChan.event('EV_CRYPTGET_DISCONNECT');
-                    ui.complete(function () {
+                    ui.complete(function() {
                         Feedback.send('FULL_DRIVE_EXPORT_COMPLETE');
                         saveAs(blob, filename);
                     }, errors);
                 }, ui.update);
-                ui.onCancel(function () {
+                ui.onCancel(function() {
                     ui.close();
                     bu.stop();
                 });
             };
-            sframeChan.query("Q_SETTINGS_DRIVE_GET", "full", function (err, data) {
+            sframeChan.query("Q_SETTINGS_DRIVE_GET", "full", function(err, data) {
                 if (err) { return void console.error(err); }
                 if (data.error) { return void console.error(data.error); }
                 UI.prompt(Messages.settings_backup2Confirm,
-                    Util.fixFileName(suggestion) + '.zip', function (filename) {
-                    if (!(typeof(filename) === 'string' && filename)) { return; }
-                    todo(data, filename);
-                });
+                    Util.fixFileName(suggestion) + '.zip',
+                    function(filename) {
+                        if (!(typeof(filename) === 'string' && filename)) { return; }
+                        todo(data, filename);
+                    });
             });
         };
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_backupHint2).appendTo($div);
         var $export2 = common.createButton('export', true, {}, exportDrive);
         $export2.attr('class', 'btn btn-success').text(Messages.settings_backup2);
@@ -937,26 +939,26 @@ define([
         return $div;
     };
 
-    create['drive-import-local'] = function () {
+    create['drive-import-local'] = function() {
         if (!common.isLoggedIn()) { return; }
-        var $div = $('<div>', {'class': 'cp-settings-drive-import-local cp-sidebarlayout-element'});
-        $('<label>', {'for' : 'cp-settings-import-local-pads'})
+        var $div = $('<div>', { 'class': 'cp-settings-drive-import-local cp-sidebarlayout-element' });
+        $('<label>', { 'for': 'cp-settings-import-local-pads' })
             .text(Messages.settings_import).appendTo($div);
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_importTitle).appendTo($div);
         var $button = $('<button>', {
             'id': 'cp-settings-import-local-pads',
             'class': 'btn btn-primary'
         }).text(Messages.settings_import).appendTo($div);
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide().appendTo($div);
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide().appendTo($div);
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved }).hide().appendTo($div);
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' }).hide().appendTo($div);
 
-        $button.click(function () {
-            UI.confirm(Messages.settings_importConfirm, function (yes) {
+        $button.click(function() {
+            UI.confirm(Messages.settings_importConfirm, function(yes) {
                 if (!yes) { return; }
                 $spinner.show();
                 $ok.hide();
-                sframeChan.query('Q_SETTINGS_IMPORT_LOCAL', null, function () {
+                sframeChan.query('Q_SETTINGS_IMPORT_LOCAL', null, function() {
                     $spinner.hide();
                     $ok.show();
                     UI.alert(Messages.settings_importDone);
@@ -967,7 +969,7 @@ define([
         return $div;
     };
 
-    var redrawTrimHistory = function (cb, $div) {
+    var redrawTrimHistory = function(cb, $div) {
         var spinner = UI.makeSpinner();
         var button = h('button.btn.btn-danger-alt', {
             disabled: 'disabled'
@@ -983,7 +985,7 @@ define([
         if (!privateData.isDriveOwned) {
             var href = privateData.origin + privateData.pathname + '#' + 'account';
             $(currentSize).html(Messages.trimHistory_needMigration);
-            $(currentSize).find('a').prop('href', href).click(function (e) {
+            $(currentSize).find('a').prop('href', href).click(function(e) {
                 e.preventDefault();
                 $('.cp-sidebarlayout-category[data-category="account"]').click();
             });
@@ -994,11 +996,11 @@ define([
         var $button = $(button);
         var size;
         var channels = [];
-        nThen(function (waitFor) {
+        nThen(function(waitFor) {
             APP.history.execCommand('GET_HISTORY_SIZE', {
                 account: true,
                 channels: []
-            }, waitFor(function (obj) {
+            }, waitFor(function(obj) {
                 if (obj && obj.error) {
                     waitFor.abort();
                     var error = h('div.alert.alert-danger', Messages.trimHistory_getSizeError);
@@ -1008,7 +1010,7 @@ define([
                 channels = obj.channels;
                 size = Number(obj.size);
             }));
-        }).nThen(function () {
+        }).nThen(function() {
             if (!size || size < 1024) {
                 $(currentSize).html(Messages.trimHistory_noHistory);
                 return;
@@ -1017,13 +1019,13 @@ define([
             $button.prop('disabled', '');
             UI.confirmButton(button, {
                 classes: 'btn-danger'
-            }, function () {
+            }, function() {
                 $button.remove();
                 spinner.spin();
                 APP.history.execCommand('TRIM_HISTORY', {
                     channels: channels
-                }, function (obj) {
-                    if (obj && obj.error) {
+                }, function(obj) {
+                    if (obj && obj.error)  {
                         var error = h('div.alert.alert-danger', Messages.trimHistory_error);
                         $(content).empty().append(error);
                         return;
@@ -1037,7 +1039,7 @@ define([
         $div.find('#cp-settings-trim-container').remove();
         cb(content);
     };
-    makeBlock('trim-history', function (cb, $div) {
+    makeBlock('trim-history', function(cb, $div) {
         if (!common.isLoggedIn()) { return; }
         redrawTrimHistory(cb, $div);
     }, true);
@@ -1070,48 +1072,48 @@ define([
 
     // Cursor settings
 
-    create['cursor-color'] = function () {
+    create['cursor-color'] = function() {
         var $div = $('<div>', {
             'class': 'cp-settings-cursor-color cp-sidebarlayout-element'
         });
         $('<label>').text(Messages.settings_cursorColorTitle).appendTo($div);
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_cursorColorHint).appendTo($div);
 
         var $inputBlock = $('<div>').appendTo($div);
 
-        var $colorPicker = $("<div>", { class: "cp-settings-cursor-color-picker"});
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+        var $colorPicker = $("<div>", { class: "cp-settings-cursor-color-picker" });
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved });
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' });
 
         // when jscolor picker value change
-        var _onchange = function (colorL) {
+        var _onchange = function(colorL) {
             var val = "#" + colorL.toString();
             if (!/^#[0-9a-fA-F]{6}$/.test(val)) { return; }
-            common.setAttribute(['general', 'cursor', 'color'], val, function () {
+            common.setAttribute(['general', 'cursor', 'color'], val, function() {
                 $spinner.hide();
                 $ok.show();
             });
         };
         var to;
-        var onchange = function (colorL) {
+        var onchange = function(colorL) {
             $spinner.show();
             $ok.hide();
 
             if (to) { clearTimeout(to); }
-            to = setTimeout(function () {
+            to = setTimeout(function() {
                 _onchange(colorL);
             }, 300);
         };
 
         // jscolor picker
-        var jscolorL = new window.jscolor($colorPicker[0],{showOnClick: false, onFineChange: onchange, valueElement:undefined});
-        $colorPicker.click(function () {
+        var jscolorL = new window.jscolor($colorPicker[0], { showOnClick: false, onFineChange: onchange, valueElement: undefined });
+        $colorPicker.click(function() {
             jscolorL.show();
         });
 
         // set default color
-        common.getAttribute(['general', 'cursor', 'color'], function (e, val) {
+        common.getAttribute(['general', 'cursor', 'color'], function(e, val) {
             if (e) { return void console.error(e); }
             val = val || "#000";
             jscolorL.fromString(val);
@@ -1124,25 +1126,25 @@ define([
         return $div;
     };
 
-    create['cursor-share'] = function () {
+    create['cursor-share'] = function() {
         var $div = $('<div>', {
             'class': 'cp-settings-cursor-share cp-sidebarlayout-element'
         });
         $('<label>').text(Messages.settings_cursorShareTitle).appendTo($div);
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_cursorShareHint).appendTo($div);
 
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved });
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' });
 
         var $cbox = $(UI.createCheckbox('cp-settings-cursor-share',
-                                   Messages.settings_cursorShareLabel,
-                                   false, { label: {class: 'noTitle'} }));
-        var $checkbox = $cbox.find('input').on('change', function () {
+            Messages.settings_cursorShareLabel,
+            false, { label: { class: 'noTitle' } }));
+        var $checkbox = $cbox.find('input').on('change', function() {
             $spinner.show();
             $ok.hide();
             var val = $checkbox.is(':checked');
-            common.setAttribute(['general', 'cursor', 'share'], val, function () {
+            common.setAttribute(['general', 'cursor', 'share'], val, function() {
                 $spinner.hide();
                 $ok.show();
             });
@@ -1152,7 +1154,7 @@ define([
         $ok.hide().appendTo($cbox);
         $spinner.hide().appendTo($cbox);
 
-        common.getAttribute(['general', 'cursor', 'share'], function (e, val) {
+        common.getAttribute(['general', 'cursor', 'share'], function(e, val) {
             if (e) { return void console.error(e); }
             if (val !== false) {
                 $checkbox.attr('checked', 'checked');
@@ -1161,25 +1163,25 @@ define([
         return $div;
     };
 
-    create['cursor-show'] = function () {
+    create['cursor-show'] = function() {
         var $div = $('<div>', {
             'class': 'cp-settings-cursor-show cp-sidebarlayout-element'
         });
         $('<label>').text(Messages.settings_cursorShowTitle + ' (BETA)').appendTo($div);
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_cursorShowHint).appendTo($div);
 
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved });
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' });
 
         var $cbox = $(UI.createCheckbox('cp-settings-cursor-show',
-                                   Messages.settings_cursorShowLabel,
-                                   false, { label: {class: 'noTitle'} }));
-        var $checkbox = $cbox.find('input').on('change', function () {
+            Messages.settings_cursorShowLabel,
+            false, { label: { class: 'noTitle' } }));
+        var $checkbox = $cbox.find('input').on('change', function() {
             $spinner.show();
             $ok.hide();
             var val = $checkbox.is(':checked');
-            common.setAttribute(['general', 'cursor', 'show'], val, function () {
+            common.setAttribute(['general', 'cursor', 'show'], val, function() {
                 $spinner.hide();
                 $ok.show();
             });
@@ -1189,7 +1191,7 @@ define([
         $ok.hide().appendTo($cbox);
         $spinner.hide().appendTo($cbox);
 
-        common.getAttribute(['general', 'cursor', 'show'], function (e, val) {
+        common.getAttribute(['general', 'cursor', 'show'], function(e, val) {
             if (e) { return void console.error(e); }
             if (val !== false) {
                 $checkbox.attr('checked', 'checked');
@@ -1200,26 +1202,26 @@ define([
 
     // Rich text pads settings
 
-    create['pad-width'] = function () {
+    create['pad-width'] = function() {
         var $div = $('<div>', {
             'class': 'cp-settings-pad-width cp-sidebarlayout-element'
         });
-        $('<span>', {'class': 'label'}).text(Messages.settings_padWidth).appendTo($div);
+        $('<span>', { 'class': 'label' }).text(Messages.settings_padWidth).appendTo($div);
 
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_padWidthHint).appendTo($div);
 
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved });
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' });
 
         var $cbox = $(UI.createCheckbox('cp-settings-padwidth',
-                                   Messages.settings_padWidthLabel,
-                                   false, { label: {class: 'noTitle'} }));
-        var $checkbox = $cbox.find('input').on('change', function () {
+            Messages.settings_padWidthLabel,
+            false, { label: { class: 'noTitle' } }));
+        var $checkbox = $cbox.find('input').on('change', function() {
             $spinner.show();
             $ok.hide();
             var val = $checkbox.is(':checked');
-            common.setAttribute(['pad', 'width'], val, function () {
+            common.setAttribute(['pad', 'width'], val, function() {
                 $spinner.hide();
                 $ok.show();
             });
@@ -1230,7 +1232,7 @@ define([
         $spinner.hide().appendTo($cbox);
 
 
-        common.getAttribute(['pad', 'width'], function (e, val) {
+        common.getAttribute(['pad', 'width'], function(e, val) {
             if (e) { return void console.error(e); }
             if (val) {
                 $checkbox.attr('checked', 'checked');
@@ -1239,25 +1241,25 @@ define([
         return $div;
     };
 
-    create['pad-spellcheck'] = function () {
+    create['pad-spellcheck'] = function() {
         var $div = $('<div>', {
             'class': 'cp-settings-pad-spellcheck cp-sidebarlayout-element'
         });
         $('<label>').text(Messages.settings_padSpellcheckTitle).appendTo($div);
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
             .text(Messages.settings_padSpellcheckHint).appendTo($div);
 
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved });
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' });
 
         var $cbox = $(UI.createCheckbox('cp-settings-pad-spellcheck',
-                                   Messages.settings_padSpellcheckLabel,
-                                   false, { label: {class: 'noTitle'} }));
-        var $checkbox = $cbox.find('input').on('change', function () {
+            Messages.settings_padSpellcheckLabel,
+            false, { label: { class: 'noTitle' } }));
+        var $checkbox = $cbox.find('input').on('change', function() {
             $spinner.show();
             $ok.hide();
             var val = $checkbox.is(':checked');
-            common.setAttribute(['pad', 'spellcheck'], val, function () {
+            common.setAttribute(['pad', 'spellcheck'], val, function() {
                 $spinner.hide();
                 $ok.show();
             });
@@ -1267,7 +1269,7 @@ define([
         $ok.hide().appendTo($cbox);
         $spinner.hide().appendTo($cbox);
 
-        common.getAttribute(['pad', 'spellcheck'], function (e, val) {
+        common.getAttribute(['pad', 'spellcheck'], function(e, val) {
             if (e) { return void console.error(e); }
             if (val) {
                 $checkbox.attr('checked', 'checked');
@@ -1276,29 +1278,23 @@ define([
         return $div;
     };
 
-    // XXX Messages.settings_padNotifTitle
-    // XXX Messages.settings_padNotifHint
-    // XXX Messages.settings_padNotifCheckbox ("disable comments notifications")
-    Messages.settings_padNotifTitle = "Comments notifications"; // XXX
-    Messages.settings_padNotifHint = "Block notifications when someone replies to one of your comments"; // XXX
-    Messages.settings_padNotifCheckbox = "Disable comment notifications";
-    makeBlock('pad-notif', function (cb) {
+    makeBlock('pad-notif', function(cb) {
         var $cbox = $(UI.createCheckbox('cp-settings-pad-notif',
-                                   Messages.settings_padNotifCheckbox,
-                                   false, { label: {class: 'noTitle'} }));
+            Messages.settings_padNotifCheckbox,
+            false, { label: { class: 'noTitle' } }));
 
         var spinner = UI.makeSpinner($cbox);
 
         // Checkbox: "Enable safe links"
-        var $checkbox = $cbox.find('input').on('change', function () {
+        var $checkbox = $cbox.find('input').on('change', function() {
             spinner.spin();
             var val = $checkbox.is(':checked');
-            common.setAttribute(['pad', 'disableNotif'], val, function () {
+            common.setAttribute(['pad', 'disableNotif'], val, function() {
                 spinner.done();
             });
         });
 
-        common.getAttribute(['pad', 'disableNotif'], function (e, val) {
+        common.getAttribute(['pad', 'disableNotif'], function(e, val) {
             if (e) { return void console.error(e); }
             if (val === true) {
                 $checkbox.attr('checked', 'checked');
@@ -1310,7 +1306,7 @@ define([
 
     // Code settings
 
-    create['code-indent-unit'] = function () {
+    create['code-indent-unit'] = function() {
         var $div = $('<div>', {
             'class': 'cp-settings-code-indent-unit cp-sidebarlayout-element'
         });
@@ -1324,13 +1320,13 @@ define([
             'min': 1,
             'max': 8,
             type: 'number',
-        }).on('change', function () {
+        }).on('change', function() {
             var val = parseInt($input.val());
             if (typeof(val) !== 'number') { return; }
             common.setAttribute(['codemirror', 'indentUnit'], val);
         }).appendTo($inputBlock);
 
-        common.getAttribute(['codemirror', 'indentUnit'], function (e, val) {
+        common.getAttribute(['codemirror', 'indentUnit'], function(e, val) {
             if (e) { return void console.error(e); }
             if (typeof(val) !== 'number') {
                 $input.val(2);
@@ -1341,7 +1337,7 @@ define([
         return $div;
     };
 
-    create['code-indent-type'] = function () {
+    create['code-indent-type'] = function() {
         var key = 'indentWithTabs';
 
         var $div = $('<div>', {
@@ -1350,13 +1346,13 @@ define([
         $('<label>').text(Messages.settings_codeUseTabs).appendTo($div);
 
         var $inputBlock = $('<div>', {
-            'class': 'cp-sidebarlayout-input-block',
-        }).css('flex-flow', 'column')
-        .appendTo($div);
+                'class': 'cp-sidebarlayout-input-block',
+            }).css('flex-flow', 'column')
+            .appendTo($div);
 
 
         var $cbox = $(UI.createCheckbox('cp-settings-codeindent'));
-        var $checkbox = $cbox.find('input').on('change', function () {
+        var $checkbox = $cbox.find('input').on('change', function() {
             var val = $checkbox.is(':checked');
             if (typeof(val) !== 'boolean') { return; }
             common.setAttribute(['codemirror', key], val);
@@ -1367,14 +1363,14 @@ define([
             $input[0].checked = !!n;
         });*/
 
-        common.getAttribute(['codemirror', key], function (e, val) {
+        common.getAttribute(['codemirror', key], function(e, val) {
             if (e) { return void console.error(e); }
             $checkbox[0].checked = !!val;
         });
         return $div;
     };
 
-    create['code-brackets'] = function () {
+    create['code-brackets'] = function() {
         var key = 'brackets';
 
         var $div = $('<div>', {
@@ -1383,27 +1379,27 @@ define([
         $('<label>').text(Messages.settings_codeBrackets).appendTo($div);
 
         var $inputBlock = $('<div>', {
-            'class': 'cp-sidebarlayout-input-block',
-        }).css('flex-flow', 'column')
-        .appendTo($div);
+                'class': 'cp-sidebarlayout-input-block',
+            }).css('flex-flow', 'column')
+            .appendTo($div);
 
 
         var $cbox = $(UI.createCheckbox('cp-settings-codebrackets'));
-        var $checkbox = $cbox.find('input').on('change', function () {
+        var $checkbox = $cbox.find('input').on('change', function() {
             var val = $checkbox.is(':checked');
             if (typeof(val) !== 'boolean') { return; }
             common.setAttribute(['codemirror', key], val);
         });
         $cbox.appendTo($inputBlock);
 
-        common.getAttribute(['codemirror', key], function (e, val) {
+        common.getAttribute(['codemirror', key], function(e, val) {
             if (e) { return void console.error(e); }
             $checkbox[0].checked = typeof(val) !== "boolean" || val;
         });
         return $div;
     };
 
-    create['code-font-size'] = function () {
+    create['code-font-size'] = function() {
         var key = 'fontSize';
 
         var $div = $('<div>', {
@@ -1419,13 +1415,13 @@ define([
             'min': 8,
             'max': 30,
             type: 'number',
-        }).on('change', function () {
+        }).on('change', function() {
             var val = parseInt($input.val());
             if (typeof(val) !== 'number') { return; }
             common.setAttribute(['codemirror', key], val);
         }).appendTo($inputBlock);
 
-        common.getAttribute(['codemirror', key], function (e, val) {
+        common.getAttribute(['codemirror', key], function(e, val) {
             if (e) { return void console.error(e); }
             if (typeof(val) !== 'number') {
                 $input.val(12);
@@ -1436,7 +1432,7 @@ define([
         return $div;
     };
 
-    create['code-spellcheck'] = function () {
+    create['code-spellcheck'] = function() {
         var $div = $('<div>', {
             'class': 'cp-settings-code-spellcheck cp-sidebarlayout-element'
         });
@@ -1444,17 +1440,17 @@ define([
         //$('<span>', {'class': 'cp-sidebarlayout-description'})
         //    .text(Messages.settings_padSpellcheckHint).appendTo($div);
 
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved });
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' });
 
         var $cbox = $(UI.createCheckbox('cp-settings-code-spellcheck',
-                                   Messages.settings_codeSpellcheckLabel,
-                                   false, { label: {class: 'noTitle'} }));
-        var $checkbox = $cbox.find('input').on('change', function () {
+            Messages.settings_codeSpellcheckLabel,
+            false, { label: { class: 'noTitle' } }));
+        var $checkbox = $cbox.find('input').on('change', function() {
             $spinner.show();
             $ok.hide();
             var val = $checkbox.is(':checked');
-            common.setAttribute(['codemirror', 'spellcheck'], val, function () {
+            common.setAttribute(['codemirror', 'spellcheck'], val, function() {
                 $spinner.hide();
                 $ok.show();
             });
@@ -1464,7 +1460,7 @@ define([
         $ok.hide().appendTo($cbox);
         $spinner.hide().appendTo($cbox);
 
-        common.getAttribute(['codemirror', 'spellcheck'], function (e, val) {
+        common.getAttribute(['codemirror', 'spellcheck'], function(e, val) {
             if (e) { return void console.error(e); }
             if (val) {
                 $checkbox.attr('checked', 'checked');
@@ -1476,46 +1472,46 @@ define([
 
     // Settings app
 
-    var createUsageButton = function () {
-        common.createUsageBar(null, function (err, $bar) {
+    var createUsageButton = function() {
+        common.createUsageBar(null, function(err, $bar) {
             if (err) { return void console.error(err); }
             APP.$usage.html('').append($bar);
         }, true);
     };
 
-    var hideCategories = function () {
+    var hideCategories = function() {
         APP.$rightside.find('> div').hide();
     };
-    var showCategories = function (cat) {
+    var showCategories = function(cat) {
         hideCategories();
-        cat.forEach(function (c) {
-            APP.$rightside.find('.'+c).show();
+        cat.forEach(function(c) {
+            APP.$rightside.find('.' + c).show();
         });
     };
 
-    var createLeftside = function () {
-        var $categories = $('<div>', {'class': 'cp-sidebarlayout-categories'})
-                            .appendTo(APP.$leftside);
-        APP.$usage = $('<div>', {'class': 'usage'}).appendTo(APP.$leftside);
+    var createLeftside = function() {
+        var $categories = $('<div>', { 'class': 'cp-sidebarlayout-categories' })
+            .appendTo(APP.$leftside);
+        APP.$usage = $('<div>', { 'class': 'usage' }).appendTo(APP.$leftside);
         var active = privateData.category || 'account';
-        Object.keys(categories).forEach(function (key) {
+        Object.keys(categories).forEach(function(key) {
             var $category = $('<div>', {
                 'class': 'cp-sidebarlayout-category',
                 'data-category': key
             }).appendTo($categories);
-            if (key === 'account') { $category.append($('<span>', {'class': 'fa fa-user-o'})); }
-            if (key === 'drive') { $category.append($('<span>', {'class': 'fa fa-hdd-o'})); }
-            if (key === 'cursor') { $category.append($('<span>', {'class': 'fa fa-i-cursor' })); }
-            if (key === 'code') { $category.append($('<span>', {'class': 'fa fa-file-code-o' })); }
-            if (key === 'pad') { $category.append($('<span>', {'class': 'fa fa-file-word-o' })); }
-            if (key === 'security') { $category.append($('<span>', {'class': 'fa fa-lock' })); }
-            if (key === 'subscription') { $category.append($('<span>', {'class': 'fa fa-star-o' })); }
+            if (key === 'account') { $category.append($('<span>', { 'class': 'fa fa-user-o' })); }
+            if (key === 'drive') { $category.append($('<span>', { 'class': 'fa fa-hdd-o' })); }
+            if (key === 'cursor') { $category.append($('<span>', { 'class': 'fa fa-i-cursor' })); }
+            if (key === 'code') { $category.append($('<span>', { 'class': 'fa fa-file-code-o' })); }
+            if (key === 'pad') { $category.append($('<span>', { 'class': 'fa fa-file-word-o' })); }
+            if (key === 'security') { $category.append($('<span>', { 'class': 'fa fa-lock' })); }
+            if (key === 'subscription') { $category.append($('<span>', { 'class': 'fa fa-star-o' })); }
 
             if (key === active) {
                 $category.addClass('cp-leftside-active');
             }
 
-            $category.click(function () {
+            $category.click(function() {
                 if (!Array.isArray(categories[key]) && categories[key].onClick) {
                     categories[key].onClick();
                     return;
@@ -1527,7 +1523,7 @@ define([
                 showCategories(categories[key]);
             });
 
-            $category.append(Messages['settings_cat_'+key] || key);
+            $category.append(Messages['settings_cat_' + key] || key);
         });
         showCategories(categories[active]);
         common.setHash(active);
@@ -1535,17 +1531,17 @@ define([
 
 
 
-    nThen(function (waitFor) {
+    nThen(function(waitFor) {
         $(waitFor(UI.addLoadingScreen));
-        SFCommon.create(waitFor(function (c) { APP.common = common = c; }));
-    }).nThen(function (waitFor) {
+        SFCommon.create(waitFor(function(c) { APP.common = common = c; }));
+    }).nThen(function(waitFor) {
         APP.$container = $('#cp-sidebarlayout-container');
         APP.$toolbar = $('#cp-toolbar');
-        APP.$leftside = $('<div>', {id: 'cp-sidebarlayout-leftside'}).appendTo(APP.$container);
-        APP.$rightside = $('<div>', {id: 'cp-sidebarlayout-rightside'}).appendTo(APP.$container);
+        APP.$leftside = $('<div>', { id: 'cp-sidebarlayout-leftside' }).appendTo(APP.$container);
+        APP.$rightside = $('<div>', { id: 'cp-sidebarlayout-rightside' }).appendTo(APP.$container);
         sframeChan = common.getSframeChannel();
         sframeChan.onReady(waitFor());
-    }).nThen(function (/*waitFor*/) {
+    }).nThen(function( /*waitFor*/ ) {
         metadataMgr = common.getMetadataMgr();
         privateData = metadataMgr.getPrivateData();
 
@@ -1568,9 +1564,9 @@ define([
             if (typeof create[f] !== "function") { continue; }
             $rightside.append(create[f]());
         }*/
-        var addItem = function (cssClass) {
+        var addItem = function(cssClass) {
             var item = cssClass.slice(12); // remove 'cp-settings-'
-            if (typeof (create[item]) === "function") {
+            if (typeof(create[item]) === "function") {
                 $rightside.append(create[item]());
             }
         };
@@ -1590,4 +1586,4 @@ define([
 
         UI.removeLoadingScreen();
     });
-});
+});
\ No newline at end of file