diff --git a/apps/common/main/resources/less/chat.less b/apps/common/main/resources/less/chat.less
index d2bc00f4c..eb46fdf2e 100644
--- a/apps/common/main/resources/less/chat.less
+++ b/apps/common/main/resources/less/chat.less
@@ -11,7 +11,7 @@
 
     .area {
         position: absolute;
-        border-bottom: 1px solid @gray-dark;
+        border-bottom: 1px solid @border-toolbar;
         overflow: hidden;
     }
 
@@ -57,7 +57,7 @@
             margin: 0 5px 3px 0;
             width: 12px;
             height: 12px;
-            border: 1px solid @gray-dark;
+            border: 1px solid @border-toolbar;
         }
 
         .name {
@@ -112,7 +112,7 @@
                 .color {
                     width: 12px;
                     height: 12px;
-                    border: 1px solid @gray-dark;
+                    border: 1px solid @border-toolbar;
                     margin: 0 5px 3px 0;
                     vertical-align: middle;
                 }
@@ -143,7 +143,7 @@
             height: 100%;
             resize: none;
             margin-bottom: 5px;
-            border: 1px solid @gray-dark;
+            border: 1px solid @border-toolbar;
             font-size: 12px;
 
             &:focus {
diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less
index 8b3222037..33484dbf9 100644
--- a/apps/common/main/resources/less/comments.less
+++ b/apps/common/main/resources/less/comments.less
@@ -14,7 +14,7 @@
         right: 0;
         bottom: 45px;
         height: 300px;
-        border-bottom: 1px solid @gray-dark;
+        border-bottom: 1px solid @border-toolbar;
 
         &.stretch {
             border-bottom: none;
@@ -58,7 +58,7 @@
             width: 100%;
             resize: none;
             margin-bottom: 5px;
-            border: 1px solid @gray-dark;
+            border: 1px solid @border-toolbar;
             height: 100%;
             &:focus {
                 border-color: @gray-darker;
@@ -90,7 +90,7 @@
         height: 50px;
         resize: none;
         margin-bottom: 5px;
-        border: 1px solid @gray-dark;
+        border: 1px solid @border-toolbar;
         word-break: break-all;
         line-height: 15px;
         color: @gray-deep;
@@ -109,7 +109,7 @@
     }
 
     .separator-cmt {
-        border-bottom: 1px solid @gray-dark;
+        border-bottom: 1px solid @border-toolbar;
         margin: 20px 0px 0px 0px;
     }
 
@@ -133,7 +133,7 @@
     .color {
         width: 12px;
         height: 12px;
-        border: 1px solid @gray-dark;
+        border: 1px solid @border-toolbar;
         margin: 0 5px 3px 0;
         vertical-align: middle;
     }
@@ -408,6 +408,6 @@
         -webkit-transform: rotate(45deg);
         -o-transform: rotate(45deg);
         transform: rotate(45deg);
-        border: solid 1px @gray-dark;
+        border: solid 1px @border-toolbar;
     }
 }
diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less
index de6cd9579..291a6ce48 100644
--- a/apps/common/main/resources/less/header.less
+++ b/apps/common/main/resources/less/header.less
@@ -256,7 +256,7 @@
             height: 12px;
             display: inline-block;
             vertical-align: middle;
-            border: 1px solid @gray-dark;
+            border: 1px solid @border-toolbar;
             margin: 0 5px 1px 0;
         }
 
diff --git a/apps/common/main/resources/less/history.less b/apps/common/main/resources/less/history.less
index 27f31be06..cfc27b3d2 100644
--- a/apps/common/main/resources/less/history.less
+++ b/apps/common/main/resources/less/history.less
@@ -10,7 +10,7 @@
     top: 0;
     right: 0;
     overflow: hidden;
-    border-bottom: 1px solid @gray-dark;
+    border-bottom: 1px solid @border-toolbar;
 
     #history-btn-back {
         height: 27px;
@@ -33,7 +33,7 @@
     bottom: 0;
     right: 0;
     overflow: hidden;
-    border-top: 1px solid @gray-dark;
+    border-top: 1px solid @border-toolbar;
 
     #history-btn-expand {
         height: 27px;
@@ -128,7 +128,7 @@
         .color {
             width: 12px;
             height: 12px;
-            border: 1px solid @gray-dark;
+            border: 1px solid @border-toolbar;
             margin: 0 5px 3px 0;
             vertical-align: middle;
         }
diff --git a/apps/common/main/resources/less/layout.less b/apps/common/main/resources/less/layout.less
index d447dfe85..6c644723f 100644
--- a/apps/common/main/resources/less/layout.less
+++ b/apps/common/main/resources/less/layout.less
@@ -36,8 +36,8 @@
             cursor: row-resize;
 
             &.move {
-                border-top: solid 1px @gray-dark;
-                border-bottom: solid 1px @gray-dark;
+                border-top: solid 1px @border-toolbar;
+                border-bottom: solid 1px @border-toolbar;
             }
         }
     }
@@ -53,8 +53,8 @@
             cursor: col-resize;
 
             &.move {
-                border-left: solid 1px @gray-dark;
-                border-right: solid 1px @gray-dark;
+                border-left: solid 1px @border-toolbar;
+                border-right: solid 1px @border-toolbar;
             }
         }
     }
diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less
index bf665caba..c33d56b50 100644
--- a/apps/common/main/resources/less/plugins.less
+++ b/apps/common/main/resources/less/plugins.less
@@ -82,7 +82,7 @@
         width: 100%;
         height: 38px;
         padding: 10px 12px;
-        border-bottom: 1px solid @gray-dark;
+        border-bottom: 1px solid @border-toolbar;
         
         label {
             width: 100%;
diff --git a/apps/common/main/resources/less/separator.less b/apps/common/main/resources/less/separator.less
index b163e8a96..687805dff 100644
--- a/apps/common/main/resources/less/separator.less
+++ b/apps/common/main/resources/less/separator.less
@@ -9,7 +9,7 @@
 .separator {
     display: inline-block;
     position: inherit;
-    border-left: 1px solid @gray-dark;
+    border-left: 1px solid @border-toolbar;
     vertical-align: top;
     padding: 0;
     width: 0;
@@ -20,6 +20,6 @@
 
         border-left: none;
         border-right: none;
-        border-top: 1px solid @gray-dark;
+        border-top: 1px solid @border-toolbar;
     }
 }
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index a8f7639d5..7823396df 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -192,7 +192,7 @@
     }
 
     background-color: @gray-light;
-    .box-inner-shadow(0 -1px 0 @gray-dark);
+    .box-inner-shadow(0 -1px 0 @border-toolbar);
 
     .group {
         position: relative;
diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less
index 044f6cbc4..d9dd1c409 100644
--- a/apps/common/main/resources/less/variables.less
+++ b/apps/common/main/resources/less/variables.less
@@ -15,7 +15,7 @@
 
 @gray-deep:             #444444; //rgb(68, 68, 68)
 @gray-darker:           #848484; //rgb(132, 132, 132)
-@gray-dark:             #cbcbcb; //rgb(203, 203, 203)
+//@gray-dark:             #cbcbcb; //rgb(203, 203, 203)
 @gray:                  #cfcfcf; //rgb(207, 207, 207)
 @gray-light:            #f1f1f1; //rgb(241, 241, 241)
 @gray-lighter:          #ededed; //rgb(237, 237, 237)
@@ -41,7 +41,7 @@
 // -------------------------
 
 @body-bg:               #fff;
-@text-color:            @gray-dark;
+@text-color:            #cbcbcb;
 
 // Links
 // -------------------------
@@ -199,7 +199,7 @@
 
 @form-group-margin-bottom:       15px;
 
-@legend-color:                   @gray-dark;
+@legend-color:                   #cbcbcb;
 @legend-border-color:            #e5e5e5;
 
 @input-group-addon-bg:           @input-bg;
@@ -576,7 +576,7 @@
 @panel-border-radius:         @border-radius-base;
 @panel-footer-bg:             #f5f5f5;
 
-@panel-default-text:          @gray-dark;
+//@panel-default-text:          @gray-dark;
 @panel-default-border:        #ddd;
 @panel-default-heading-bg:    #f5f5f5;
 
@@ -608,7 +608,7 @@
 @thumbnail-border:            #ddd;
 @thumbnail-border-radius:     @border-radius-base;
 
-@thumbnail-caption-color:     @text-color;
+//@thumbnail-caption-color:     @text-color;
 @thumbnail-caption-padding:   9px;
 
 
@@ -673,7 +673,7 @@
 @kbd-bg:                      #333;
 
 @pre-bg:                      #f5f5f5;
-@pre-color:                   @gray-dark;
+//@pre-color:                   @gray-dark;
 @pre-border-color:            #ccc;
 @pre-scrollable-max-height:   340px;
 
diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less
index 5a47e07ca..36bbfe7f4 100644
--- a/apps/common/main/resources/less/window.less
+++ b/apps/common/main/resources/less/window.less
@@ -27,7 +27,7 @@
     box-shadow: 0 5px 15px rgba(0,0,0,0.2);
     border-radius: 5px;
     background-color: @body-bg;
-    border: solid 1px @gray-dark;
+    border: solid 1px @border-toolbar;
 
     left: 0;
     top: 0;
@@ -55,7 +55,7 @@
         line-height: 26px;
 
         background: @gray-lighter;
-        border-bottom: solid 1px @gray-dark;
+        border-bottom: solid 1px @border-toolbar;
 
         cursor: move;
 
@@ -242,7 +242,7 @@
         height: 5px;
         z-index: 1;
         background: @gray-lighter;
-        border: 1px none @gray-dark;
+        border: 1px none @border-toolbar;
 
         &.left {
             left: 0;
diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less
index 67de94554..f28565ef0 100644
--- a/apps/documenteditor/main/resources/less/app.less
+++ b/apps/documenteditor/main/resources/less/app.less
@@ -9,6 +9,7 @@
 
 // Bootstrap overwrite
 @import "../../../../common/main/resources/less/variables.less";
+@import "../../../../common/main/resources/less/colors-table.less";
 
 //
 // Bootstrap
diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less
index 210380167..aa9724fe6 100644
--- a/apps/documenteditor/main/resources/less/filemenu.less
+++ b/apps/documenteditor/main/resources/less/filemenu.less
@@ -7,7 +7,7 @@
   .panel-menu {
     width: 260px;
     float: left;
-    border-right: 1px solid @gray-dark;
+    border-right: 1px solid @border-toolbar;
     background-color: @gray-light;
 
     li {
@@ -285,7 +285,7 @@
   }
 
   .dataview {
-    border-right: 1px solid @gray-dark;
+    border-right: 1px solid @border-toolbar;
 
     & > .item {
       display: block;
diff --git a/apps/documenteditor/main/resources/less/leftmenu.less b/apps/documenteditor/main/resources/less/leftmenu.less
index 97450d75e..715ccdb6b 100644
--- a/apps/documenteditor/main/resources/less/leftmenu.less
+++ b/apps/documenteditor/main/resources/less/leftmenu.less
@@ -6,7 +6,7 @@
         overflow: hidden;
 
         .tool-menu-btns {
-            border-right: 1px solid @gray-dark;
+            border-right: 1px solid @border-toolbar;
         }
     }
 }
@@ -26,7 +26,7 @@
 .left-panel {
     padding-left: 40px;
     height: 100%;
-    border-right: 1px solid @gray-dark;
+    border-right: 1px solid @border-toolbar;
 
     #left-panel-chat {
         height: 100%;
diff --git a/apps/documenteditor/main/resources/less/navigation.less b/apps/documenteditor/main/resources/less/navigation.less
index 7eb4bba97..b87947af3 100644
--- a/apps/documenteditor/main/resources/less/navigation.less
+++ b/apps/documenteditor/main/resources/less/navigation.less
@@ -11,7 +11,7 @@
         width: 100%;
         font-weight: bold;
         padding: 10px 12px;
-        border-bottom: 1px solid @gray-dark;
+        border-bottom: 1px solid @border-toolbar;
     }
 
     #navigation-list {
diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less
index 8c97276d8..0e021feeb 100644
--- a/apps/documenteditor/main/resources/less/rightmenu.less
+++ b/apps/documenteditor/main/resources/less/rightmenu.less
@@ -2,7 +2,7 @@
 .tool-menu.right {
     .tool-menu-btns {
         position: absolute;
-        border-left: 1px solid @gray-dark;
+        border-left: 1px solid @border-toolbar;
         background-color: @gray-light;
         right: 0;
         overflow: hidden;
@@ -16,7 +16,7 @@
     padding: 0 10px 0 15px;
     position: relative;
     overflow: hidden;
-    border-left: 1px solid @gray-dark;
+    border-left: 1px solid @border-toolbar;
     line-height: 15px;
 }
 
@@ -78,7 +78,7 @@
         width: 100%;
         resize: none;
         margin-bottom: 5px;
-        border: 1px solid @gray-dark;
+        border: 1px solid @border-toolbar;
         height: 100%;
 
         &.disabled {
diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less
index 176835bb4..6de4f322f 100644
--- a/apps/documenteditor/main/resources/less/statusbar.less
+++ b/apps/documenteditor/main/resources/less/statusbar.less
@@ -3,7 +3,7 @@
     padding: 2px;
     height: 25px;
     background-color: @gray-light;
-    .box-inner-shadow(0 1px 0 @gray-dark);
+    .box-inner-shadow(0 1px 0 @border-toolbar);
 
     .status-label {
         font-weight: bold;
@@ -181,7 +181,7 @@
                 height: 12px;
                 display: inline-block;
                 vertical-align: middle;
-                border: 1px solid @gray-dark;
+                border: 1px solid @border-toolbar;
             }
 
             .name {