diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less
index a120be19e..5f75301a2 100644
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -617,7 +617,7 @@ noscript {
     opacity: 0.7;
     font-family: Ubuntu,Georgia,Cambria,serif;
     box-sizing: border-box;
-    z-index:10;
+    z-index:10000;
     display: none;
     #uploadStatus {
         width: 80vw;
diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css
deleted file mode 100644
index bf075cd51..000000000
--- a/customize.dist/toolbar.css
+++ /dev/null
@@ -1,1460 +0,0 @@
-/* The container <div> - needed to position the dropdown content */
-.dropdown-bar {
-  position: relative;
-  display: inline-block;
-}
-.dropdown-bar .fa {
-  font-family: FontAwesome;
-}
-.dropdown-bar button .fa-caret-down {
-  margin-right: 0px;
-  margin-left: 5px;
-}
-.dropdown-bar .dropdown-bar-content {
-  display: none;
-  position: absolute;
-  background-color: #f9f9f9;
-  min-width: 250px;
-  box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
-  z-index: 1000;
-  max-height: 300px;
-  overflow-y: auto;
-}
-.dropdown-bar .dropdown-bar-content.left {
-  right: 0;
-}
-.dropdown-bar .dropdown-bar-content:hover {
-  display: block;
-}
-.dropdown-bar .dropdown-bar-content a {
-  color: black;
-  padding: 5px 16px;
-  text-decoration: none;
-  display: block;
-  cursor: pointer;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  float: none;
-  text-align: left;
-}
-.dropdown-bar .dropdown-bar-content a:hover {
-  background-color: #f1f1f1;
-  color: black;
-}
-.dropdown-bar .dropdown-bar-content a.active {
-  background-color: #e8e8e8;
-  color: black;
-}
-.dropdown-bar .dropdown-bar-content hr {
-  margin: 5px 0px;
-  height: 1px;
-  background: #bbb;
-}
-.dropdown-bar .dropdown-bar-content p {
-  min-width: 160px;
-  padding: 5px;
-  margin: 0;
-  white-space: normal;
-  text-align: left;
-}
-.dropdown-bar .dropdown-bar-content p h2 {
-  font-weight: bold;
-  text-align: center;
-  background-color: #EEEEEE;
-  padding: 5px 0px;
-  margin: 5px 0px;
-  font-size: 16px;
-  white-space: normal;
-}
-.unselectable {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.toolbar-container {
-  font: 12px Arial, Helvetica, Tahoma, Verdana, sans-serif;
-  background: -webkit-linear-gradient(#f5f5f5, #DDDDDD);
-  /* For Safari 5.1 to 6.0 */
-  background: -o-linear-gradient(#f5f5f5, #DDDDDD);
-  /* For Opera 11.1 to 12.0 */
-  background: -moz-linear-gradient(#f5f5f5, #DDDDDD);
-  /* For Firefox 3.6 to 15 */
-  background: linear-gradient(#f5f5f5, #DDDDDD);
-  /* Standard syntax */
-}
-.toolbar-container .cryptpad-toolbar select {
-  box-sizing: border-box;
-}
-.cke_reset_all * {
-  color: inherit;
-}
-#cke_1_contents {
-  margin-top: -1px;
-  display: flex;
-}
-.userlist-drawer {
-  font: normal normal normal 14px Arial, Helvetica, Tahoma, Verdana, Sans-Serif;
-  width: 175px;
-  display: block;
-  overflow-y: auto;
-  overflow-x: hidden;
-  padding: 10px;
-  box-sizing: border-box;
-  text-align: baseline;
-}
-.userlist-drawer h2 {
-  color: inherit;
-  font-size: 1.2em;
-  font-weight: bold;
-  text-align: center;
-  padding: 5px 0px;
-  margin: 5px 0px;
-  font-size: 16px;
-  white-space: normal;
-}
-.userlist-drawer .viewer {
-  font-style: italic;
-  padding: 5px;
-  background: rgba(0, 0, 0, 0.1);
-  margin: 2px 0;
-}
-.userlist-drawer .userlist-others {
-  display: flex;
-  flex-flow: column;
-  margin: 10px 0;
-  margin-bottom: 20px;
-}
-.userlist-drawer .userlist-others > span {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 5px;
-  background: rgba(0, 0, 0, 0.1);
-  margin: 2px 0;
-}
-body.app-pad .userlist-drawer {
-  background-color: #1c4fa0;
-  color: #fff;
-}
-body.app-pad .userlist-drawer h2 {
-  background-color: #143a75;
-}
-body.app-pad .cryptpad-toolbar {
-  background-color: #1c4fa0;
-  color: #fff;
-}
-body.app-pad .cryptpad-toolbar .userlist-drawer {
-  background-color: #1c4fa0;
-  width: 150px;
-  position: absolute;
-  left: 0;
-  top: 96px;
-  bottom: 0;
-}
-body.app-pad .cryptpad-toolbar .cryptpad-limit {
-  text-shadow: -1px 0 #fff, 0 1px #fff, 1px 0 #fff, 0 -1px #fff;
-}
-body.app-pad .cryptpad-toolbar .cryptpad-toolbar-leftside,
-body.app-pad .cryptpad-toolbar .cryptpad-toolbar-rightside,
-body.app-pad .cryptpad-toolbar .drawer-content {
-  background-color: #2260c3;
-}
-body.app-pad .cryptpad-toolbar .cryptpad-toolbar-leftside button:hover,
-body.app-pad .cryptpad-toolbar .cryptpad-toolbar-rightside button:hover,
-body.app-pad .cryptpad-toolbar .drawer-content button:hover {
-  background-color: #1c4fa0;
-}
-body.app-pad .cryptpad-toolbar .hoverable:hover .editable {
-  cursor: text;
-  border: 1px solid #112f5f;
-  background: #143a75;
-  color: #fff;
-}
-body.app-pad .cryptpad-toolbar .hoverable:hover .pencilIcon {
-  border: 1px solid #112f5f;
-  background: #143a75;
-  color: #fff;
-}
-body.app-pad .cryptpad-toolbar .hoverable:hover .pencilIcon:hover {
-  background: #18448a;
-}
-body.app-pad .cryptpad-toolbar .saveIcon {
-  border: 1px solid #112f5f;
-  background: #143a75;
-  color: #fff;
-}
-body.app-pad .cryptpad-toolbar .saveIcon:hover {
-  background: #18448a;
-}
-body.app-pad .cryptpad-toolbar input {
-  border: 1px solid #112f5f;
-  background: #143a75;
-  color: #fff;
-}
-body.app-pad .cryptpad-toolbar .dropdown-bar-content {
-  background: #18448a;
-  border: 1px solid #fff;
-  color: #fff;
-}
-body.app-pad .cryptpad-toolbar .dropdown-bar-content a {
-  color: #fff;
-}
-body.app-pad .cryptpad-toolbar .dropdown-bar-content a.active {
-  background-color: #143a75;
-  color: #fff;
-}
-body.app-pad .cryptpad-toolbar .dropdown-bar-content a:hover {
-  background-color: #1c4fa0;
-  color: #fff;
-}
-body.app-pad .cryptpad-toolbar .dropdown-bar-content hr {
-  background-color: #112f5f;
-}
-body.app-pad .cryptpad-toolbar .dropdown-bar-content p h2 {
-  background-color: #143a75;
-}
-body.app-pad .cryptpad-toolbar .dropdown-bar-content p .accountData {
-  background-color: #1c4fa0;
-}
-body.app-code .userlist-drawer {
-  background-color: #ffae00;
-  color: #000;
-}
-body.app-code .userlist-drawer h2 {
-  background-color: #cc8b00;
-}
-body.app-code .cryptpad-toolbar {
-  background-color: #ffae00;
-  color: #000;
-}
-body.app-code .cryptpad-toolbar .userlist-drawer {
-  background-color: #ffae00;
-  width: 150px;
-  position: absolute;
-  left: 0;
-  top: 96px;
-  bottom: 0;
-}
-body.app-code .cryptpad-toolbar .cryptpad-limit {
-  text-shadow: -1px 0 #000, 0 1px #000, 1px 0 #000, 0 -1px #000;
-}
-body.app-code .cryptpad-toolbar .cryptpad-toolbar-leftside,
-body.app-code .cryptpad-toolbar .cryptpad-toolbar-rightside,
-body.app-code .cryptpad-toolbar .drawer-content {
-  background-color: #ffbb29;
-}
-body.app-code .cryptpad-toolbar .cryptpad-toolbar-leftside button:hover,
-body.app-code .cryptpad-toolbar .cryptpad-toolbar-rightside button:hover,
-body.app-code .cryptpad-toolbar .drawer-content button:hover {
-  background-color: #ffae00;
-}
-body.app-code .cryptpad-toolbar .hoverable:hover .editable {
-  cursor: text;
-  border: 1px solid #b37a00;
-  background: #cc8b00;
-  color: #000;
-}
-body.app-code .cryptpad-toolbar .hoverable:hover .pencilIcon {
-  border: 1px solid #b37a00;
-  background: #cc8b00;
-  color: #000;
-}
-body.app-code .cryptpad-toolbar .hoverable:hover .pencilIcon:hover {
-  background: #e69d00;
-}
-body.app-code .cryptpad-toolbar .saveIcon {
-  border: 1px solid #b37a00;
-  background: #cc8b00;
-  color: #000;
-}
-body.app-code .cryptpad-toolbar .saveIcon:hover {
-  background: #e69d00;
-}
-body.app-code .cryptpad-toolbar input {
-  border: 1px solid #b37a00;
-  background: #cc8b00;
-  color: #000;
-}
-body.app-code .cryptpad-toolbar .dropdown-bar-content {
-  background: #e69d00;
-  border: 1px solid #000;
-  color: #000;
-}
-body.app-code .cryptpad-toolbar .dropdown-bar-content a {
-  color: #000;
-}
-body.app-code .cryptpad-toolbar .dropdown-bar-content a.active {
-  background-color: #cc8b00;
-  color: #000;
-}
-body.app-code .cryptpad-toolbar .dropdown-bar-content a:hover {
-  background-color: #ffae00;
-  color: #000;
-}
-body.app-code .cryptpad-toolbar .dropdown-bar-content hr {
-  background-color: #b37a00;
-}
-body.app-code .cryptpad-toolbar .dropdown-bar-content p h2 {
-  background-color: #cc8b00;
-}
-body.app-code .cryptpad-toolbar .dropdown-bar-content p .accountData {
-  background-color: #ffae00;
-}
-body.app-slide .userlist-drawer {
-  background-color: #e57614;
-  color: #fff;
-}
-body.app-slide .userlist-drawer h2 {
-  background-color: #b65e10;
-}
-body.app-slide .cryptpad-toolbar {
-  background-color: #e57614;
-  color: #fff;
-}
-body.app-slide .cryptpad-toolbar .userlist-drawer {
-  background-color: #e57614;
-  width: 150px;
-  position: absolute;
-  left: 0;
-  top: 96px;
-  bottom: 0;
-}
-body.app-slide .cryptpad-toolbar .cryptpad-limit {
-  text-shadow: -1px 0 #fff, 0 1px #fff, 1px 0 #fff, 0 -1px #fff;
-}
-body.app-slide .cryptpad-toolbar .cryptpad-toolbar-leftside,
-body.app-slide .cryptpad-toolbar .cryptpad-toolbar-rightside,
-body.app-slide .cryptpad-toolbar .drawer-content {
-  background-color: #ed8b34;
-}
-body.app-slide .cryptpad-toolbar .cryptpad-toolbar-leftside button:hover,
-body.app-slide .cryptpad-toolbar .cryptpad-toolbar-rightside button:hover,
-body.app-slide .cryptpad-toolbar .drawer-content button:hover {
-  background-color: #e57614;
-}
-body.app-slide .cryptpad-toolbar .hoverable:hover .editable {
-  cursor: text;
-  border: 1px solid #9f520e;
-  background: #b65e10;
-  color: #fff;
-}
-body.app-slide .cryptpad-toolbar .hoverable:hover .pencilIcon {
-  border: 1px solid #9f520e;
-  background: #b65e10;
-  color: #fff;
-}
-body.app-slide .cryptpad-toolbar .hoverable:hover .pencilIcon:hover {
-  background: #ce6a12;
-}
-body.app-slide .cryptpad-toolbar .saveIcon {
-  border: 1px solid #9f520e;
-  background: #b65e10;
-  color: #fff;
-}
-body.app-slide .cryptpad-toolbar .saveIcon:hover {
-  background: #ce6a12;
-}
-body.app-slide .cryptpad-toolbar input {
-  border: 1px solid #9f520e;
-  background: #b65e10;
-  color: #fff;
-}
-body.app-slide .cryptpad-toolbar .dropdown-bar-content {
-  background: #ce6a12;
-  border: 1px solid #fff;
-  color: #fff;
-}
-body.app-slide .cryptpad-toolbar .dropdown-bar-content a {
-  color: #fff;
-}
-body.app-slide .cryptpad-toolbar .dropdown-bar-content a.active {
-  background-color: #b65e10;
-  color: #fff;
-}
-body.app-slide .cryptpad-toolbar .dropdown-bar-content a:hover {
-  background-color: #e57614;
-  color: #fff;
-}
-body.app-slide .cryptpad-toolbar .dropdown-bar-content hr {
-  background-color: #9f520e;
-}
-body.app-slide .cryptpad-toolbar .dropdown-bar-content p h2 {
-  background-color: #b65e10;
-}
-body.app-slide .cryptpad-toolbar .dropdown-bar-content p .accountData {
-  background-color: #e57614;
-}
-body.app-poll .userlist-drawer {
-  background-color: #006304;
-  color: #fff;
-}
-body.app-poll .userlist-drawer h2 {
-  background-color: #003002;
-}
-body.app-poll .cryptpad-toolbar {
-  background-color: #006304;
-  color: #fff;
-}
-body.app-poll .cryptpad-toolbar .userlist-drawer {
-  background-color: #006304;
-  width: 150px;
-  position: absolute;
-  left: 0;
-  top: 96px;
-  bottom: 0;
-}
-body.app-poll .cryptpad-toolbar .cryptpad-limit {
-  text-shadow: -1px 0 #fff, 0 1px #fff, 1px 0 #fff, 0 -1px #fff;
-}
-body.app-poll .cryptpad-toolbar .cryptpad-toolbar-leftside,
-body.app-poll .cryptpad-toolbar .cryptpad-toolbar-rightside,
-body.app-poll .cryptpad-toolbar .drawer-content {
-  background-color: #008c06;
-}
-body.app-poll .cryptpad-toolbar .cryptpad-toolbar-leftside button:hover,
-body.app-poll .cryptpad-toolbar .cryptpad-toolbar-rightside button:hover,
-body.app-poll .cryptpad-toolbar .drawer-content button:hover {
-  background-color: #006304;
-}
-body.app-poll .cryptpad-toolbar .hoverable:hover .editable {
-  cursor: text;
-  border: 1px solid #001701;
-  background: #003002;
-  color: #fff;
-}
-body.app-poll .cryptpad-toolbar .hoverable:hover .pencilIcon {
-  border: 1px solid #001701;
-  background: #003002;
-  color: #fff;
-}
-body.app-poll .cryptpad-toolbar .hoverable:hover .pencilIcon:hover {
-  background: #004a03;
-}
-body.app-poll .cryptpad-toolbar .saveIcon {
-  border: 1px solid #001701;
-  background: #003002;
-  color: #fff;
-}
-body.app-poll .cryptpad-toolbar .saveIcon:hover {
-  background: #004a03;
-}
-body.app-poll .cryptpad-toolbar input {
-  border: 1px solid #001701;
-  background: #003002;
-  color: #fff;
-}
-body.app-poll .cryptpad-toolbar .dropdown-bar-content {
-  background: #004a03;
-  border: 1px solid #fff;
-  color: #fff;
-}
-body.app-poll .cryptpad-toolbar .dropdown-bar-content a {
-  color: #fff;
-}
-body.app-poll .cryptpad-toolbar .dropdown-bar-content a.active {
-  background-color: #003002;
-  color: #fff;
-}
-body.app-poll .cryptpad-toolbar .dropdown-bar-content a:hover {
-  background-color: #006304;
-  color: #fff;
-}
-body.app-poll .cryptpad-toolbar .dropdown-bar-content hr {
-  background-color: #001701;
-}
-body.app-poll .cryptpad-toolbar .dropdown-bar-content p h2 {
-  background-color: #003002;
-}
-body.app-poll .cryptpad-toolbar .dropdown-bar-content p .accountData {
-  background-color: #006304;
-}
-body.app-whiteboard .userlist-drawer {
-  background-color: #800080;
-  color: #fff;
-}
-body.app-whiteboard .userlist-drawer h2 {
-  background-color: #4d004d;
-}
-body.app-whiteboard .cryptpad-toolbar {
-  background-color: #800080;
-  color: #fff;
-}
-body.app-whiteboard .cryptpad-toolbar .userlist-drawer {
-  background-color: #800080;
-  width: 150px;
-  position: absolute;
-  left: 0;
-  top: 96px;
-  bottom: 0;
-}
-body.app-whiteboard .cryptpad-toolbar .cryptpad-limit {
-  text-shadow: -1px 0 #fff, 0 1px #fff, 1px 0 #fff, 0 -1px #fff;
-}
-body.app-whiteboard .cryptpad-toolbar .cryptpad-toolbar-leftside,
-body.app-whiteboard .cryptpad-toolbar .cryptpad-toolbar-rightside,
-body.app-whiteboard .cryptpad-toolbar .drawer-content {
-  background-color: #a900a9;
-}
-body.app-whiteboard .cryptpad-toolbar .cryptpad-toolbar-leftside button:hover,
-body.app-whiteboard .cryptpad-toolbar .cryptpad-toolbar-rightside button:hover,
-body.app-whiteboard .cryptpad-toolbar .drawer-content button:hover {
-  background-color: #800080;
-}
-body.app-whiteboard .cryptpad-toolbar .hoverable:hover .editable {
-  cursor: text;
-  border: 1px solid #340033;
-  background: #4d004d;
-  color: #fff;
-}
-body.app-whiteboard .cryptpad-toolbar .hoverable:hover .pencilIcon {
-  border: 1px solid #340033;
-  background: #4d004d;
-  color: #fff;
-}
-body.app-whiteboard .cryptpad-toolbar .hoverable:hover .pencilIcon:hover {
-  background: #670066;
-}
-body.app-whiteboard .cryptpad-toolbar .saveIcon {
-  border: 1px solid #340033;
-  background: #4d004d;
-  color: #fff;
-}
-body.app-whiteboard .cryptpad-toolbar .saveIcon:hover {
-  background: #670066;
-}
-body.app-whiteboard .cryptpad-toolbar input {
-  border: 1px solid #340033;
-  background: #4d004d;
-  color: #fff;
-}
-body.app-whiteboard .cryptpad-toolbar .dropdown-bar-content {
-  background: #670066;
-  border: 1px solid #fff;
-  color: #fff;
-}
-body.app-whiteboard .cryptpad-toolbar .dropdown-bar-content a {
-  color: #fff;
-}
-body.app-whiteboard .cryptpad-toolbar .dropdown-bar-content a.active {
-  background-color: #4d004d;
-  color: #fff;
-}
-body.app-whiteboard .cryptpad-toolbar .dropdown-bar-content a:hover {
-  background-color: #800080;
-  color: #fff;
-}
-body.app-whiteboard .cryptpad-toolbar .dropdown-bar-content hr {
-  background-color: #340033;
-}
-body.app-whiteboard .cryptpad-toolbar .dropdown-bar-content p h2 {
-  background-color: #4d004d;
-}
-body.app-whiteboard .cryptpad-toolbar .dropdown-bar-content p .accountData {
-  background-color: #800080;
-}
-body.app-drive .userlist-drawer {
-  background-color: #0087ff;
-  color: #fff;
-}
-body.app-drive .userlist-drawer h2 {
-  background-color: #006ccc;
-}
-body.app-drive .cryptpad-toolbar {
-  background-color: #0087ff;
-  color: #fff;
-}
-body.app-drive .cryptpad-toolbar .userlist-drawer {
-  background-color: #0087ff;
-  width: 150px;
-  position: absolute;
-  left: 0;
-  top: 96px;
-  bottom: 0;
-}
-body.app-drive .cryptpad-toolbar .cryptpad-limit {
-  text-shadow: -1px 0 #fff, 0 1px #fff, 1px 0 #fff, 0 -1px #fff;
-}
-body.app-drive .cryptpad-toolbar .cryptpad-toolbar-leftside,
-body.app-drive .cryptpad-toolbar .cryptpad-toolbar-rightside,
-body.app-drive .cryptpad-toolbar .drawer-content {
-  background-color: #299aff;
-}
-body.app-drive .cryptpad-toolbar .cryptpad-toolbar-leftside button:hover,
-body.app-drive .cryptpad-toolbar .cryptpad-toolbar-rightside button:hover,
-body.app-drive .cryptpad-toolbar .drawer-content button:hover {
-  background-color: #0087ff;
-}
-body.app-drive .cryptpad-toolbar .hoverable:hover .editable {
-  cursor: text;
-  border: 1px solid #005eb3;
-  background: #006ccc;
-  color: #fff;
-}
-body.app-drive .cryptpad-toolbar .hoverable:hover .pencilIcon {
-  border: 1px solid #005eb3;
-  background: #006ccc;
-  color: #fff;
-}
-body.app-drive .cryptpad-toolbar .hoverable:hover .pencilIcon:hover {
-  background: #0079e6;
-}
-body.app-drive .cryptpad-toolbar .saveIcon {
-  border: 1px solid #005eb3;
-  background: #006ccc;
-  color: #fff;
-}
-body.app-drive .cryptpad-toolbar .saveIcon:hover {
-  background: #0079e6;
-}
-body.app-drive .cryptpad-toolbar input {
-  border: 1px solid #005eb3;
-  background: #006ccc;
-  color: #fff;
-}
-body.app-drive .cryptpad-toolbar .dropdown-bar-content {
-  background: #0079e6;
-  border: 1px solid #fff;
-  color: #fff;
-}
-body.app-drive .cryptpad-toolbar .dropdown-bar-content a {
-  color: #fff;
-}
-body.app-drive .cryptpad-toolbar .dropdown-bar-content a.active {
-  background-color: #006ccc;
-  color: #fff;
-}
-body.app-drive .cryptpad-toolbar .dropdown-bar-content a:hover {
-  background-color: #0087ff;
-  color: #fff;
-}
-body.app-drive .cryptpad-toolbar .dropdown-bar-content hr {
-  background-color: #005eb3;
-}
-body.app-drive .cryptpad-toolbar .dropdown-bar-content p h2 {
-  background-color: #006ccc;
-}
-body.app-drive .cryptpad-toolbar .dropdown-bar-content p .accountData {
-  background-color: #0087ff;
-}
-body.app-file .userlist-drawer {
-  background-color: #cd2532;
-  color: #fff;
-}
-body.app-file .userlist-drawer h2 {
-  background-color: #a21d27;
-}
-body.app-file .cryptpad-toolbar {
-  background-color: #cd2532;
-  color: #fff;
-}
-body.app-file .cryptpad-toolbar .userlist-drawer {
-  background-color: #cd2532;
-  width: 150px;
-  position: absolute;
-  left: 0;
-  top: 96px;
-  bottom: 0;
-}
-body.app-file .cryptpad-toolbar .cryptpad-limit {
-  text-shadow: -1px 0 #fff, 0 1px #fff, 1px 0 #fff, 0 -1px #fff;
-}
-body.app-file .cryptpad-toolbar .cryptpad-toolbar-leftside,
-body.app-file .cryptpad-toolbar .cryptpad-toolbar-rightside,
-body.app-file .cryptpad-toolbar .drawer-content {
-  background-color: #dc3f4b;
-}
-body.app-file .cryptpad-toolbar .cryptpad-toolbar-leftside button:hover,
-body.app-file .cryptpad-toolbar .cryptpad-toolbar-rightside button:hover,
-body.app-file .cryptpad-toolbar .drawer-content button:hover {
-  background-color: #cd2532;
-}
-body.app-file .cryptpad-toolbar .hoverable:hover .editable {
-  cursor: text;
-  border: 1px solid #8c1922;
-  background: #a21d27;
-  color: #fff;
-}
-body.app-file .cryptpad-toolbar .hoverable:hover .pencilIcon {
-  border: 1px solid #8c1922;
-  background: #a21d27;
-  color: #fff;
-}
-body.app-file .cryptpad-toolbar .hoverable:hover .pencilIcon:hover {
-  background: #b7212d;
-}
-body.app-file .cryptpad-toolbar .saveIcon {
-  border: 1px solid #8c1922;
-  background: #a21d27;
-  color: #fff;
-}
-body.app-file .cryptpad-toolbar .saveIcon:hover {
-  background: #b7212d;
-}
-body.app-file .cryptpad-toolbar input {
-  border: 1px solid #8c1922;
-  background: #a21d27;
-  color: #fff;
-}
-body.app-file .cryptpad-toolbar .dropdown-bar-content {
-  background: #b7212d;
-  border: 1px solid #fff;
-  color: #fff;
-}
-body.app-file .cryptpad-toolbar .dropdown-bar-content a {
-  color: #fff;
-}
-body.app-file .cryptpad-toolbar .dropdown-bar-content a.active {
-  background-color: #a21d27;
-  color: #fff;
-}
-body.app-file .cryptpad-toolbar .dropdown-bar-content a:hover {
-  background-color: #cd2532;
-  color: #fff;
-}
-body.app-file .cryptpad-toolbar .dropdown-bar-content hr {
-  background-color: #8c1922;
-}
-body.app-file .cryptpad-toolbar .dropdown-bar-content p h2 {
-  background-color: #a21d27;
-}
-body.app-file .cryptpad-toolbar .dropdown-bar-content p .accountData {
-  background-color: #cd2532;
-}
-.cryptpad-toolbar {
-  box-sizing: border-box;
-  padding: 0px;
-  background-color: #ddd;
-  color: #000;
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  font: normal normal normal 12px Arial, Helvetica, Tahoma, Verdana, Sans-Serif;
-  width: 100%;
-  z-index: 9001;
-}
-.cryptpad-toolbar .fa {
-  font: normal normal normal 14px/1 FontAwesome;
-  font-family: FontAwesome;
-}
-.cryptpad-toolbar .dropdown-bar {
-  height: 100%;
-  display: inline-block;
-}
-.cryptpad-toolbar .dropdown-bar button {
-  height: 100%;
-  border-radius: 0;
-  margin: 0;
-  background: transparent;
-}
-.cryptpad-toolbar .dropdown-bar .dropdown-bar-content {
-  line-height: 14px;
-}
-.cryptpad-toolbar .separator {
-  content: '';
-  display: inline-block;
-  background: #888;
-  margin: 7px 4px;
-  height: 18px;
-  width: 1px;
-  vertical-align: top;
-}
-.cryptpad-toolbar .separator:last-child {
-  display: none;
-}
-.cryptpad-toolbar button {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  border: 1px solid transparent;
-  border-radius: .25rem;
-  color: inherit;
-  font: 12px Ubuntu, Arial, sans-serif;
-}
-.cryptpad-toolbar button#shareButton,
-.cryptpad-toolbar button.buttonSuccess {
-  color: #fff;
-  background: #5cb85c;
-  border-color: #5cb85c;
-}
-.cryptpad-toolbar button#shareButton:hover,
-.cryptpad-toolbar button.buttonSuccess:hover {
-  color: #fff;
-  background: #449d44;
-  border: 1px solid #419641;
-}
-.cryptpad-toolbar button#shareButton span,
-.cryptpad-toolbar button.buttonSuccess span {
-  color: #fff;
-}
-.cryptpad-toolbar button#shareButton .large,
-.cryptpad-toolbar button.buttonSuccess .large {
-  margin-left: 5px;
-}
-.cryptpad-toolbar button#newdoc,
-.cryptpad-toolbar button.buttonPrimary {
-  color: #fff;
-  background: #0275d8;
-  border-color: #0275d8;
-}
-.cryptpad-toolbar button#newdoc:hover,
-.cryptpad-toolbar button.buttonPrimary:hover {
-  color: #fff;
-  background: #025aa5;
-  border: 1px solid #01549b;
-}
-.cryptpad-toolbar button#newdoc span,
-.cryptpad-toolbar button.buttonPrimary span {
-  color: #fff;
-}
-.cryptpad-toolbar button#newdoc .large,
-.cryptpad-toolbar button.buttonPrimary .large {
-  margin-left: 5px;
-}
-.cryptpad-toolbar button.hidden {
-  display: none;
-}
-.cryptpad-toolbar button * {
-  color: inherit;
-  font: 12px Ubuntu, Arial, sans-serif;
-}
-.cryptpad-toolbar .cryptpad-toolbar-rightside button,
-.cryptpad-toolbar .cryptpad-toolbar-leftside button {
-  background: transparent;
-}
-.cryptpad-toolbar .cryptpad-toolbar-rightside button:hover,
-.cryptpad-toolbar .cryptpad-toolbar-leftside button:hover {
-  background-color: rgba(50, 50, 50, 0.3);
-  border-color: #adadad;
-}
-.cryptpad-toolbar button.upgrade {
-  font-size: 14px;
-  vertical-align: top;
-  margin-left: 10px;
-}
-.cryptpad-toolbar .cryptpad-limit {
-  box-sizing: border-box;
-  height: 26px;
-  width: 26px;
-  display: inline-block;
-  padding: 3px;
-  margin: 0px;
-  margin-right: 3px;
-  vertical-align: middle;
-  line-height: 64px;
-}
-.cryptpad-toolbar .cryptpad-limit span {
-  color: red;
-  cursor: pointer;
-  margin: auto;
-  font-size: 20px;
-}
-.cryptpad-toolbar .cryptpad-state {
-  line-height: 64px;
-}
-.cryptpad-toolbar .cryptpad-lag {
-  display: inline-block;
-  vertical-align: top;
-  box-sizing: content-box;
-  text-align: center;
-  line-height: 64px;
-}
-.cryptpad-toolbar .cryptpad-lag .disconnected {
-  display: none;
-  color: inherit;
-  width: 28px;
-  margin: 8px;
-  font-size: 28px;
-  text-align: center;
-  vertical-align: middle;
-}
-.cryptpad-toolbar .cryptpad-lag .bars {
-  margin: 8px;
-  height: 26px;
-  line-height: 26px;
-  display: inline-block;
-}
-.cryptpad-toolbar .cryptpad-lag .bars span {
-  display: inline-block;
-  width: 6px;
-  margin: 0;
-  margin-right: 1px;
-  background: white;
-  vertical-align: bottom;
-  box-sizing: border-box;
-  border: 1px solid black;
-  visibility: hidden;
-  transition: background 1s, border 1s;
-}
-.cryptpad-toolbar .cryptpad-lag .bars span:last-child {
-  margin-right: 0;
-}
-.cryptpad-toolbar .cryptpad-lag .bars span.bar1 {
-  height: 6px;
-}
-.cryptpad-toolbar .cryptpad-lag .bars span.bar2 {
-  height: 12px;
-}
-.cryptpad-toolbar .cryptpad-lag .bars span.bar3 {
-  height: 18px;
-}
-.cryptpad-toolbar .cryptpad-lag .bars span.bar4 {
-  height: 24px;
-}
-.cryptpad-toolbar .cryptpad-lag.dc .disconnected {
-  display: inline;
-}
-.cryptpad-toolbar .cryptpad-lag.dc .bars {
-  display: none;
-}
-.cryptpad-toolbar .cryptpad-lag.lag0 span span {
-  background: transparent;
-}
-.cryptpad-toolbar .cryptpad-lag.lag1 .bar2,
-.cryptpad-toolbar .cryptpad-lag.lag1 .bar3,
-.cryptpad-toolbar .cryptpad-lag.lag1 .bar4 {
-  background: transparent;
-}
-.cryptpad-toolbar .cryptpad-lag.lag1 span span {
-  visibility: visible;
-}
-.cryptpad-toolbar .cryptpad-lag.lag2 .bar3,
-.cryptpad-toolbar .cryptpad-lag.lag2 .bar4 {
-  background: transparent;
-}
-.cryptpad-toolbar .cryptpad-lag.lag2 span span {
-  visibility: visible;
-}
-.cryptpad-toolbar .cryptpad-lag.lag3 .bar4 {
-  background: transparent;
-}
-.cryptpad-toolbar .cryptpad-lag.lag3 span span {
-  visibility: visible;
-}
-.cryptpad-toolbar .cryptpad-lag.lag4 span span {
-  visibility: visible;
-}
-.cryptpad-toolbar div {
-  white-space: normal;
-}
-.cryptpad-toolbar div.cryptpad-back {
-  padding: 0;
-  font-weight: bold;
-  cursor: pointer;
-  color: #000;
-}
-.cryptpad-toolbar button,
-.cryptpad-toolbar select,
-.cryptpad-toolbar .rightside-element {
-  height: 26px;
-  padding-right: 5px;
-  padding-left: 5px;
-  margin: 3px 2px;
-  box-sizing: border-box;
-}
-.cryptpad-toolbar .rightside-button {
-  float: right;
-  cursor: pointer;
-}
-.cryptpad-toolbar .leftside-button {
-  cursor: pointer;
-  float: left;
-}
-.cryptpad-toolbar .rightside-element {
-  vertical-align: middle;
-  white-space: nowrap;
-}
-.cryptpad-toolbar .rightside-element.float {
-  float: right;
-}
-.cryptpad-toolbar select {
-  border: 0px;
-  margin-left: 5px;
-  margin-right: 5px;
-  padding-left: 5px;
-  border: 1px solid #A6A6A6;
-  border-bottom-color: #979797;
-  vertical-align: top;
-  box-sizing: content-box;
-}
-.cryptpad-toolbar select option {
-  height: 24px;
-}
-@media screen and (max-width: 800px) {
-  .cryptpad-toolbar .big {
-    display: none;
-  }
-}
-@media screen and (min-width: 801px) {
-  .cryptpad-toolbar .big {
-    display: inline-block;
-  }
-}
-@media screen and (max-width: 800px) {
-  .cryptpad-toolbar .small {
-    display: inline-block;
-  }
-}
-@media screen and (min-width: 801px) {
-  .cryptpad-toolbar .small {
-    display: none;
-  }
-}
-@media screen and (max-width: 600px) {
-  .cryptpad-toolbar .med-big {
-    display: none;
-  }
-}
-@media screen and (min-width: 601px) {
-  .cryptpad-toolbar .med-big {
-    display: inline-block;
-  }
-}
-@media screen and (max-width: 600px) {
-  .cryptpad-toolbar .med-small {
-    display: inline-block;
-  }
-}
-@media screen and (min-width: 601px) {
-  .cryptpad-toolbar .med-small {
-    display: none;
-  }
-}
-@media screen and (max-width: 400px) {
-  .cryptpad-toolbar .large {
-    display: none;
-  }
-}
-@media screen and (min-width: 401px) {
-  .cryptpad-toolbar .large {
-    display: inline-block;
-  }
-}
-@media screen and (max-width: 400px) {
-  .cryptpad-toolbar .narrow {
-    display: inline-block;
-  }
-}
-@media screen and (min-width: 401px) {
-  .cryptpad-toolbar .narrow {
-    display: none;
-  }
-}
-.cryptpad-toolbar.notitle .filler {
-  flex: 1;
-}
-@media screen and (max-width: 600px) {
-  .cryptpad-toolbar:not(.notitle) .cryptpad-toolbar-top {
-    flex-wrap: wrap;
-    height: auto;
-  }
-  .cryptpad-toolbar:not(.notitle) .cryptpad-toolbar-top .cryptpad-state {
-    display: none;
-  }
-  .cryptpad-toolbar:not(.notitle) .cryptpad-toolbar-top .filler {
-    flex: 1;
-  }
-  .cryptpad-toolbar:not(.notitle) .cryptpad-toolbar-top .cryptpad-title {
-    flex: auto;
-    width: 100%;
-    order: 10;
-    height: 32px;
-    line-height: initial;
-    margin: 0;
-  }
-  .cryptpad-toolbar:not(.notitle) .cryptpad-toolbar-top .cryptpad-title .hoverable {
-    width: 100%;
-  }
-  .cryptpad-toolbar:not(.notitle) .cryptpad-toolbar-top .cryptpad-title .editable {
-    max-width: calc(100vw - 26px);
-    display: inline-block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    font-size: 16px;
-    height: 32px;
-    box-sizing: border-box;
-    line-height: 20px;
-  }
-  .cryptpad-toolbar:not(.notitle) .cryptpad-toolbar-top .cryptpad-title .pencilIcon,
-  .cryptpad-toolbar:not(.notitle) .cryptpad-toolbar-top .cryptpad-title .saveIcon {
-    box-sizing: border-box;
-    height: 32px;
-    line-height: 16px;
-    display: inline-block;
-  }
-  .cryptpad-toolbar:not(.notitle) .cryptpad-toolbar-top .cryptpad-title .pencilIcon .fa,
-  .cryptpad-toolbar:not(.notitle) .cryptpad-toolbar-top .cryptpad-title .saveIcon .fa {
-    font-size: 16px;
-  }
-  .cryptpad-toolbar:not(.notitle) .cryptpad-toolbar-top .cryptpad-title input {
-    height: 32px;
-    font-size: 16px;
-    flex: 1;
-    max-width: none;
-  }
-}
-.cryptpad-toolbar-top {
-  display: flex;
-  flex-flow: row;
-  height: 64px;
-  position: relative;
-}
-.cryptpad-toolbar-top .filler {
-  height: 100%;
-  display: inline-block;
-  order: 4;
-}
-.cryptpad-toolbar-top .cryptpad-title {
-  flex: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  order: 3;
-  height: 100%;
-  display: inline-flex;
-  align-items: center;
-  line-height: 64px;
-  margin: 0 20px;
-}
-.cryptpad-toolbar-top .cryptpad-title .title,
-.cryptpad-toolbar-top .cryptpad-title .pencilIcon,
-.cryptpad-toolbar-top .cryptpad-title .saveIcon {
-  font-size: 25px;
-  vertical-align: middle;
-  line-height: 25px;
-}
-.cryptpad-toolbar-top .cryptpad-title .hoverable {
-  display: inline-flex;
-  overflow: hidden;
-}
-.cryptpad-toolbar-top .cryptpad-title .pencilIcon {
-  cursor: pointer;
-  border: 1px solid transparent;
-  padding: 5px;
-  border-collapse: collapse;
-}
-.cryptpad-toolbar-top .cryptpad-title .pencilIcon span {
-  font-size: 25px;
-  cursor: pointer;
-}
-.cryptpad-toolbar-top .cryptpad-title .saveIcon {
-  cursor: pointer;
-  padding: 5px;
-  border-collapse: collapse;
-}
-.cryptpad-toolbar-top .cryptpad-title .saveIcon span {
-  font-size: 25px;
-  cursor: pointer;
-}
-.cryptpad-toolbar-top .cryptpad-title .editable {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  border: 1px solid transparent;
-  padding: 5px;
-  border-collapse: collapse;
-}
-.cryptpad-toolbar-top .cryptpad-title input {
-  max-width: calc(100% - 40px);
-  flex: 1;
-  font-size: 1.5em;
-  vertical-align: middle;
-  box-sizing: border-box;
-  cursor: auto;
-  width: 300px;
-  font-size: 20px;
-  padding: 5px 5px;
-  height: 40px;
-}
-.cryptpad-toolbar-top .cryptpad-link,
-.cryptpad-toolbar-top .cryptpad-new {
-  font-size: 48px;
-  line-height: 64px;
-  width: 64px;
-  height: 64px;
-  padding: 0;
-  box-sizing: border-box;
-  display: inline-block;
-  color: white;
-  transition: all 0.15s;
-}
-.cryptpad-toolbar-top .cryptpad-new {
-  background-color: rgba(0, 0, 0, 0.2);
-  order: 2;
-  text-align: center;
-}
-.cryptpad-toolbar-top .cryptpad-new:hover {
-  background-color: rgba(0, 0, 0, 0.3);
-}
-.cryptpad-toolbar-top .cryptpad-new > button {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 64px;
-  height: 64px !important;
-  font-size: 1em;
-  color: inherit;
-  height: auto;
-  padding: 0px;
-  margin: 0;
-}
-.cryptpad-toolbar-top .cryptpad-new > button::before {
-  padding-top: 4px;
-}
-.cryptpad-toolbar-top .cryptpad-new > button:hover {
-  background-color: initial;
-  border-color: transparent;
-}
-.cryptpad-toolbar-top .cryptpad-new > button span {
-  vertical-align: top;
-  font-size: 1em;
-  text-decoration: none;
-  color: inherit;
-}
-.cryptpad-toolbar-top .cryptpad-new .dropdown-bar-content {
-  font-size: 12px;
-  line-height: 14px;
-}
-.cryptpad-toolbar-top .cryptpad-link {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  background-color: rgba(0, 0, 0, 0.4);
-  order: 1;
-}
-.cryptpad-toolbar-top .cryptpad-link:hover {
-  background-color: rgba(0, 0, 0, 0.5);
-}
-.cryptpad-toolbar-top .cryptpad-link .fa {
-  margin: 0;
-}
-.cryptpad-toolbar-top .cryptpad-link a.cryptpad-logo {
-  cursor: pointer;
-  font-size: 1em;
-  height: auto;
-  padding: 0px 5px;
-  text-decoration: none;
-  color: inherit;
-}
-.cryptpad-toolbar-top .cryptpad-user {
-  height: 100%;
-  display: inline-block;
-  order: 5;
-  line-height: 64px;
-}
-.cryptpad-toolbar-top .cryptpad-user > * {
-  display: inline-block;
-  height: 100%;
-  vertical-align: top;
-}
-.cryptpad-toolbar-top .cryptpad-user .cryptpad-upgrade {
-  height: 32px;
-  vertical-align: middle;
-  cursor: pointer;
-}
-.cryptpad-toolbar-top .cryptpad-user .cryptpad-user-dropdown {
-  margin-left: 20px;
-  height: 64px;
-  width: 64px;
-  padding: 0px;
-  box-sizing: border-box;
-  text-align: center;
-  background-color: rgba(0, 0, 0, 0.3);
-}
-.cryptpad-toolbar-top .cryptpad-user .cryptpad-user-dropdown:hover {
-  background-color: rgba(0, 0, 0, 0.4);
-}
-.cryptpad-toolbar-top .cryptpad-user .cryptpad-user-dropdown .dropdown-bar-content {
-  margin: 0;
-}
-.cryptpad-toolbar-top .cryptpad-user .cryptpad-user-dropdown button {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 64px;
-  width: 64px;
-  padding: 0;
-}
-.cryptpad-toolbar-top .cryptpad-user .cryptpad-user-dropdown button span {
-  cursor: default;
-  font-size: 32px;
-}
-.cryptpad-toolbar-top .cryptpad-user .cryptpad-user-dropdown button span .fa {
-  margin-left: 3px;
-}
-.cryptpad-toolbar-top .cryptpad-user .cryptpad-backup {
-  margin: 0;
-  border-radius: 0;
-  background: transparent;
-}
-.cryptpad-toolbar-top .cryptpad-user .cryptpad-backup:hover {
-  background-color: rgba(0, 0, 0, 0.2);
-}
-.cryptpad-toolbar-leftside {
-  height: 32px;
-  float: left;
-  margin-bottom: -1px;
-}
-.cryptpad-toolbar-leftside:empty {
-  height: 0;
-}
-.cryptpad-toolbar-leftside .cryptpad-dropdown-users pre {
-  /* needed for ckeditor */
-  white-space: pre;
-  margin: 5px 0px;
-}
-.cryptpad-toolbar-leftside button {
-  margin: 0px;
-  border-radius: 0;
-  height: 100%;
-}
-.cryptpad-toolbar-leftside .dropdown-bar-content {
-  margin-top: -1px;
-}
-.cryptpad-toolbar-leftside .limit-container a {
-  height: 26px;
-  margin: 3px 0;
-  line-height: 26px;
-  padding: 0 5px;
-  box-sizing: border-box;
-  border: 1px solid transparent;
-  font-size: 14px;
-}
-.cryptpad-toolbar-leftside .limit-container a:hover {
-  text-decoration: none;
-}
-.cryptpad-toolbar-rightside {
-  height: 32px;
-  text-align: right;
-}
-.cryptpad-toolbar-rightside:empty {
-  height: 0;
-}
-.cryptpad-toolbar-rightside > button {
-  height: 100%;
-  margin: 0;
-  border-radius: 0;
-  padding: 0 10px;
-}
-.cryptpad-toolbar-rightside .drawer-content:empty ~ .drawer-button {
-  display: none;
-}
-.cryptpad-toolbar-rightside .drawer-content {
-  position: absolute;
-  right: 0px;
-  margin-top: 32px;
-  min-width: 50px;
-  background: white;
-  border: 1px solid black;
-  display: flex;
-  flex-flow: column;
-  z-index: 1000;
-}
-.cryptpad-toolbar-rightside .drawer-content > span {
-  box-sizing: border-box;
-  width: 150px;
-  height: 26px;
-  border-radius: 0;
-  border: 0;
-}
-.cryptpad-toolbar-rightside .drawer-content > span:not(:last-child) {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-}
-.cryptpad-toolbar-rightside .drawer-content > span button {
-  border: 0;
-}
-.cryptpad-toolbar-rightside .drawer-content button {
-  width: 100%;
-}
-.cryptpad-toolbar-rightside .drawer-content > button {
-  text-align: center;
-  margin: 0;
-  border-radius: 0;
-  border: 1px solid transparent;
-}
-.cryptpad-toolbar-rightside .drawer-content > button:hover {
-  border: 1px solid transparent;
-}
-.cryptpad-toolbar-rightside .drawer-content > button:not(:last-child) {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-}
-.cryptpad-toolbar-history {
-  display: none;
-  text-align: center;
-}
-.cryptpad-toolbar-history .next {
-  display: inline-block;
-  vertical-align: middle;
-  margin: 20px;
-}
-.cryptpad-toolbar-history .previous {
-  display: inline-block;
-  vertical-align: middle;
-  margin: 20px;
-}
-.cryptpad-toolbar-history .goto {
-  display: inline-block;
-  vertical-align: middle;
-  text-align: center;
-}
-.cryptpad-toolbar-history .goto input {
-  width: 75px;
-}
-.cryptpad-toolbar-history .gotoInput {
-  vertical-align: middle;
-}
-.cryptpad-toolbar-history .closeHistory {
-  background: white;
-  color: black;
-}
-.cke_toolbox .cryptpad-toolbar-history input.gotoInput {
-  padding: 3px 3px;
-}
-.cryptpad-spinner {
-  line-height: 64px;
-}
-.cryptpad-spinner > span {
-  height: 16px;
-  width: 16px;
-  margin: 8px;
-  line-height: 16px;
-  font-size: 16px;
-  text-align: center;
-}
-.cryptpad-readonly {
-  margin-right: 5px;
-  font-weight: bold;
-  text-transform: uppercase;
-}
-.cryptpad-user p.accountData > span {
-  font-weight: bold;
-}
-.cryptpad-user p.accountData > span span {
-  font-weight: normal;
-}
-.cryptpad-dropdown-share a .fa {
-  margin-right: 5px;
-}
-.lag {
-  height: 15px !important;
-  width: 15px !important;
-  border-radius: 50%;
-  border: 1px solid #444;
-}
-.lag-green {
-  background-color: #46E981;
-}
-.lag-red {
-  background-color: #FA5858;
-}
-.lag-orange {
-  background-color: #FE9A2E;
-}
diff --git a/package.json b/package.json
index e5cd3f705..36e1ca923 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
   "scripts": {
     "lint": "jshint --config .jshintrc --exclude-path .jshintignore .",
     "test": "node TestSelenium.js",
-    "style": "lessc ./customize.dist/src/less/toolbar.less > ./customize.dist/toolbar.css",
     "template": "cd customize.dist/src && for page in ../index.html ../privacy.html ../terms.html ../about.html ../contact.html ../../www/login/index.html ../../www/register/index.html ../../www/settings/index.html ../../www/user/index.html;do echo $page; cp template.html $page; done;"
   }
 }
diff --git a/rpc.js b/rpc.js
index 25b1ae550..1df16b8f9 100644
--- a/rpc.js
+++ b/rpc.js
@@ -578,8 +578,7 @@ var resetUserPins = function (Env, publicKey, channelList, cb) {
         });
     }
 
-    var pins = session.channels = {};
-
+    var pins = {};
     getMultipleFileSize(Env, channelList, function (e, sizes) {
         if (e) { return void cb(e); }
         var pinSize = sumChannelSizes(sizes);
@@ -606,6 +605,8 @@ var resetUserPins = function (Env, publicKey, channelList, cb) {
                     pins[channel] = true;
                 });
 
+                // update in-memory cache IFF the reset was allowed.
+                session.channels = pins;
                 getHash(Env, publicKey, function (e, hash) {
                     cb(e, hash);
                 });
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 859083224..2643e3a23 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1622,7 +1622,10 @@ define([
                         common.arePinsSynced(function (err, yes) {
                             if (!yes) {
                                 common.resetPins(function (err) {
-                                    if (err) { console.error(err); }
+                                    if (err) {
+                                        console.error("Pin Reset Error");
+                                        return console.error(err);
+                                    }
                                     console.log('RESET DONE');
                                 });
                             }
diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js
index d8892957a..3b5fd0ea2 100644
--- a/www/common/toolbar2.js
+++ b/www/common/toolbar2.js
@@ -48,19 +48,6 @@ define([
         return 'cryptpad-uid-' + String(Math.random()).substring(2);
     };
 
-    var styleToolbar = function ($container, href, version, force) {
-        if (!force) { return; }
-        href = href || '/customize/toolbar.css' + (version?('?' + version): '');
-
-        $.ajax({
-            url: href,
-            dataType: 'text',
-            success: function (data) {
-                $container.append($('<style>').text(data));
-            },
-        });
-    };
-
     var createRealtimeToolbar = function (config) {
         if (!config.$container) { return; }
         var $container = config.$container;
@@ -108,11 +95,6 @@ define([
 
         $container.prepend($toolbar);
 
-        if (ApiConfig && ApiConfig.requireConf && ApiConfig.requireConf.urlArgs) {
-            styleToolbar($container, undefined, ApiConfig.requireConf.urlArgs, config.legacyStyle);
-        } else {
-            styleToolbar($container, void 0, void 0, config.legacyStyle);
-        }
         $container.on('drop dragover', function (e) {
             e.preventDefault();
             e.stopPropagation();
diff --git a/www/pad/index.html b/www/pad/index.html
index 876add672..223c708ae 100644
--- a/www/pad/index.html
+++ b/www/pad/index.html
@@ -24,29 +24,6 @@
             padding:0;
             overflow:hidden;
         }
-        #feedback {
-            display: none;
-            position: fixed;
-            top: 0px;
-            right: 0px;
-            border: 0px;
-            height: 100vh;
-            width: 30vw;
-            background-color: #222;
-            color: #ccc;
-        }
-        #debug {
-            height: 20px;
-            position: absolute;
-            right: 0px;
-            top: 70px;
-        }
-        #debug button {
-            visibility: hidden;
-        }
-        #debug:hover button {
-            visibility: visible;
-        }
     </style>
 </head>
 <body>
diff --git a/www/pad/inner.js b/www/pad/inner.js
index 6348d82c2..0c7b4ada8 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -1,3 +1,3 @@
 define([
-    //'less!/customize/src/less/toolbar.less',
+    'less!/customize/src/less/toolbar.less',
 ], function () {});
diff --git a/www/pad/main.js b/www/pad/main.js
index 6c6f0049e..bf90468f8 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -472,10 +472,19 @@ define([
                     network: info.network,
                     $container: $bar,
                     $contentContainer: $iframe.find('#cke_1_contents'),
-                    legacyStyle: true,
                 };
                 toolbar = info.realtime.toolbar = Toolbar.create(configTb);
 
+                var src = 'less!/customize/src/less/toolbar.less';
+                require([
+                    src
+                ], function () {
+                    var $html = $bar.closest('html');
+                    $html
+                        .find('head style[data-original-src="' + src.replace(/less!/, '') + '"]')
+                        .appendTo($html.find('head'));
+                });
+
                 Title.setToolbar(toolbar);
 
                 var $rightside = toolbar.$rightside;
diff --git a/www/slide/index.html b/www/slide/index.html
index 14db505a7..d40f210a2 100644
--- a/www/slide/index.html
+++ b/www/slide/index.html
@@ -31,10 +31,6 @@
             top: 0px;
             height: 100%;
         }
-        body #iframe-container.fullscreen {
-            top: 0px;
-            height: 100%;
-        }
      </style>
 </head>
 <body>