diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index e66f92243..63751fed2 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -1,4 +1,4 @@
-@import (once) "./colortheme.less";
+@import (once) "./colortheme-all.less";
 @import (once) "./browser.less";
 @import (once) "./modal-theme.less";
 
diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less
index 1aea222bd..49d6ef74f 100644
--- a/customize.dist/src/less2/include/dropdown.less
+++ b/customize.dist/src/less2/include/dropdown.less
@@ -1,4 +1,4 @@
-@import (once) "./colortheme.less";
+@import (once) "./colortheme-all.less";
 @import (once) "./tools.less";
 
 /* The container <div> - needed to position the dropdown content */
diff --git a/customize.dist/src/less2/include/fileupload.less b/customize.dist/src/less2/include/fileupload.less
index a07d365bd..3ed3e793e 100644
--- a/customize.dist/src/less2/include/fileupload.less
+++ b/customize.dist/src/less2/include/fileupload.less
@@ -1,4 +1,4 @@
-@import (once) './colortheme.less';
+@import (once) './colortheme-all.less';
 @import (once) './modal.less';
 
 .fileupload_main () {
diff --git a/customize.dist/src/less2/include/icon-colors.less b/customize.dist/src/less2/include/icon-colors.less
index db9de2a14..a71059950 100644
--- a/customize.dist/src/less2/include/icon-colors.less
+++ b/customize.dist/src/less2/include/icon-colors.less
@@ -1,4 +1,4 @@
-@import (once) "./colortheme.less";
+@import (once) "./colortheme-all.less";
 .iconColors_main () {
     // Classes used in common-interface.js
     .cp-icon-color-pad { color: @colortheme_pad-bg; }
diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less
index 41bafa6f0..f6e752633 100644
--- a/customize.dist/src/less2/include/infopages.less
+++ b/customize.dist/src/less2/include/infopages.less
@@ -1,4 +1,4 @@
-@import (once) "./colortheme.less";
+@import (once) "./colortheme-all.less";
 
 @infopages_infobar-height: 64px;
 @infopages_padding: 32px;
diff --git a/customize.dist/src/less2/include/leftside-menu.less b/customize.dist/src/less2/include/leftside-menu.less
index 3211fb3a9..28ae57af4 100644
--- a/customize.dist/src/less2/include/leftside-menu.less
+++ b/customize.dist/src/less2/include/leftside-menu.less
@@ -1,6 +1,6 @@
 @import (once) "./unselectable.less";
 @import (once) "./variables.less";
-@import (once) "./colortheme.less";
+@import (once) "./colortheme-all.less";
 
 .leftside-menu_main() {
 }
diff --git a/customize.dist/src/less2/include/limit-bar.less b/customize.dist/src/less2/include/limit-bar.less
index efca7811d..373d59e66 100644
--- a/customize.dist/src/less2/include/limit-bar.less
+++ b/customize.dist/src/less2/include/limit-bar.less
@@ -1,4 +1,4 @@
-@import (once) "./colortheme.less";
+@import (once) "./colortheme-all.less";
 
 .limit-bar_main () {
     .cp-limit-container {
diff --git a/customize.dist/src/less2/include/modal.less b/customize.dist/src/less2/include/modal.less
index 865abff73..070660291 100644
--- a/customize.dist/src/less2/include/modal.less
+++ b/customize.dist/src/less2/include/modal.less
@@ -1,4 +1,4 @@
-@import (once) "./colortheme.less";
+@import (once) "./colortheme-all.less";
 @import (once) "./modal-theme.less";
 
 .modal_base() {
diff --git a/customize.dist/src/less2/include/toolbar-history.less b/customize.dist/src/less2/include/toolbar-history.less
index d553caa3f..abf14f3ac 100644
--- a/customize.dist/src/less2/include/toolbar-history.less
+++ b/customize.dist/src/less2/include/toolbar-history.less
@@ -1,4 +1,4 @@
-@import (once) "./colortheme.less";
+@import (once) "./colortheme-all.less";
 
 .history_main () {
     .cp-toolbar-history {
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 4e955af6c..37d294c3b 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -1,5 +1,5 @@
 @import (once) "./dropdown.less";
-@import (once) "./colortheme.less";
+@import (once) "./colortheme-all.less";
 @import (once) "./browser.less";
 @import (once) "./ckeditor-fix.less";
 @import (once) "./avatar.less";
diff --git a/customize.dist/src/less2/pages/page-404.less b/customize.dist/src/less2/pages/page-404.less
index 6c67732fd..c6afae5b0 100644
--- a/customize.dist/src/less2/pages/page-404.less
+++ b/customize.dist/src/less2/pages/page-404.less
@@ -1,4 +1,4 @@
-@import (once) "../include/colortheme.less";
+@import (once) "../include/colortheme-all.less";
 @import (once) "../include/font.less";
 .font_neuropolitical();
 .font_open-sans();