Overrides to colortheme.less will nolonger block the adding of new keys to the original file

customize.dist/src/less/bar.less

@@ -1,5 +1,5 @@
 /* Bottom Bar */
-@import (once) "../less2/include/colortheme.less";
+@import (once) "../less2/include/colortheme-all.less";
 
 .top-bar, .bottom-bar {
     position:fixed;

customize.dist/src/less/cryptpad.less

@@ -2,7 +2,7 @@
 @import "./mixins.less";
 
 @import "../less2/include/alertify.less";
-@import "../less2/include/colortheme.less";
+@import "../less2/include/colortheme-all.less";
 @import "../less2/include/modal.less";
 @import "../less2/include/font.less";
 @import "../less2/loading.less";

customize.dist/src/less/footer.less

@@ -1,5 +1,5 @@
 @import "./variables.less";
-@import (once) "../less2/include/colortheme.less";
+@import (once) "../less2/include/colortheme-all.less";
 
 footer {
     background: @category-bg;

customize.dist/src/less/sidebar-layout.less

@@ -1,6 +1,6 @@
 @import '/customize/src/less/variables.less';
 @import '/customize/src/less/mixins.less';
-@import (once) "/customize/src/less2/include/colortheme.less";
+@import (once) "/customize/src/less2/include/colortheme-all.less";
 
 @leftside-bg: @colortheme_sidebar-left-bg;
 @leftside-color: @colortheme_sidebar-left-fg;

customize.dist/src/less/toolbar.less

@@ -2,7 +2,7 @@
 @import "./mixins.less";
 
 @import (once) "../less2/include/dropdown.less";
-@import (once) "../less2/include/colortheme.less";
+@import (once) "../less2/include/colortheme-all.less";
 @import (once) "../less2/include/ckeditor-fix.less";
 @import (once) "../less2/include/icon-colors.less";
 

customize.dist/src/less/topbar.less

@@ -1,5 +1,5 @@
 @import "./variables.less";
-@import (once) "../less2/include/colortheme.less";
+@import (once) "../less2/include/colortheme-all.less";
 
 #cryptpadTopBar {
     background: @topbar-back;

customize.dist/src/less/variables.less

@@ -1,4 +1,4 @@
-@import (once) '../less2/include/colortheme.less';
+@import (once) '../less2/include/colortheme-all.less';
 @import (once) '../less2/include/browser.less';
 
 @base: @colortheme_base;

customize.dist/src/less2/include/colortheme-all.less

@@ -0,0 +1,6 @@
+// Don't override/edit this file directly, you can create
+// create a file: customize/src/less2/include/colortheme.less
+// override whatever colors you want. When you update, the new colors will be
+// added ok because the original file is pulled in first.
+@import (once) "/customize.dist/src/less2/include/colortheme.less";
+@import (once) "/customize/src/less2/include/colortheme.less";

customize.dist/src/less2/include/sidebar-layout.less

@@ -1,4 +1,4 @@
-@import (once) "/customize/src/less2/include/colortheme.less";
+@import (once) "/customize/src/less2/include/colortheme-all.less";
 @import (once) "/customize/src/less2/include/leftside-menu.less";
 
 @leftside-bg: @colortheme_sidebar-left-bg;

customize.dist/src/less2/loading.less

@@ -3,7 +3,7 @@ WARNING: THIS FILE DOES NOTHING
 It exists only as a proposal of what CSS you should use in loading.js
 The CSS inside of loading.js is precompiled in order to save 200ish milliseconds to the loading screen.
 */
-@import (once) "./include/colortheme.less";
+@import (once) "./include/colortheme-all.less";
 @import (once) "./include/browser.less";
 
 #cp-loading {

customize.dist/src/less2/pages/page-about.less

@@ -1,5 +1,5 @@
 @import (once) "../include/infopages.less";
-@import (once) "../include/colortheme.less";
+@import (once) "../include/colortheme-all.less";
 
 .infopages_main();
 .infopages_topbar();

customize.dist/src/less2/pages/page-contact.less

@@ -1,5 +1,5 @@
 @import (once) "../include/infopages.less";
-@import (once) "../include/colortheme.less";
+@import (once) "../include/colortheme-all.less";
 
 .infopages_main();
 .infopages_topbar();

customize.dist/src/less2/pages/page-index.less

@@ -1,7 +1,7 @@
 //@import (once) "./variables.less";
 
 @import (once) "../include/infopages.less";
-@import (once) "../include/colortheme.less";
+@import (once) "../include/colortheme-all.less";
 
 
 .infopages_main();

customize.dist/src/less2/pages/page-login.less

@@ -1,5 +1,5 @@
 @import (once) "../include/infopages.less";
-@import (once) "../include/colortheme.less";
+@import (once) "../include/colortheme-all.less";
 @import (once) "../include/alertify.less";
 @import (once) "../loading.less";
 

customize.dist/src/less2/pages/page-privacy.less

@@ -1,5 +1,5 @@
 @import (once) "../include/infopages.less";
-@import (once) "../include/colortheme.less";
+@import (once) "../include/colortheme-all.less";
 
 .infopages_main();
 .infopages_topbar();

customize.dist/src/less2/pages/page-register.less

@@ -1,5 +1,5 @@
 @import (once) "../include/infopages.less";
-@import (once) "../include/colortheme.less";
+@import (once) "../include/colortheme-all.less";
 @import (once) "../include/alertify.less";
 @import (once) "../loading.less";
 

customize.dist/src/less2/pages/page-terms.less

@@ -1,5 +1,5 @@
 @import (once) "../include/infopages.less";
-@import (once) "../include/colortheme.less";
+@import (once) "../include/colortheme-all.less";
 
 .infopages_main();
 .infopages_topbar();

customize.dist/src/less2/pages/page-what-is-cryptpad.less

@@ -1,5 +1,5 @@
 @import (once) "../include/infopages.less";
-@import (once) "../include/colortheme.less";
+@import (once) "../include/colortheme-all.less";
 
 .infopages_main();
 .infopages_topbar();

www/common/file-dialog.less

@@ -1,4 +1,4 @@
-@import (once) '../customize/src/less2/include/colortheme.less';
+@import (once) '../customize/src/less2/include/colortheme-all.less';
 @import '../customize/src/less2/include/modal.less';
 
 .fileDialog_main () {

www/filepicker/app-filepicker.less

@@ -1,4 +1,4 @@
-@import (once) '../../customize/src/less2/include/colortheme.less';
+@import (once) '../../customize/src/less2/include/colortheme-all.less';
 @import (once) '../../customize/src/less2/include/modal.less';
 @import (once) '../../customize/src/less2/include/icon-colors.less';
 @import (once) '../../customize/src/less2/include/fileupload.less';

www/settings/app-settings.less

@@ -1,4 +1,4 @@
-@import (once) "../../customize/src/less2/include/colortheme.less";
+@import (once) "../../customize/src/less2/include/colortheme-all.less";
 @import (once) "../../customize/src/less2/include/browser.less";
 @import (once) "../../customize/src/less2/include/toolbar.less";
 @import (once) "../../customize/src/less2/include/markdown.less";