diff --git a/.github/workflows/ci_nightly.yml b/.github/workflows/ci_nightly.yml
index bc0b0cf5839..0791d6b8e90 100644
--- a/.github/workflows/ci_nightly.yml
+++ b/.github/workflows/ci_nightly.yml
@@ -60,6 +60,9 @@ jobs:
       - name: Check docs
         run: npm run docs:check
 
+      - name: Ensure standalone build
+        run: npm run sass:standalone
+
       - name: Build themes using dart-sass (full)
         run: npm run dart
 
diff --git a/.github/workflows/ci_unit.yml b/.github/workflows/ci_unit.yml
index 9a34d246fbb..dc7e1e451ff 100644
--- a/.github/workflows/ci_unit.yml
+++ b/.github/workflows/ci_unit.yml
@@ -44,6 +44,9 @@ jobs:
       - name: Bootstrap
         run: npm run bootstrap
 
+      - name: Ensure standalone build
+        run: npm run sass:standalone
+
       - name: Build themes
         run: npm run sass:flat
 
diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml
index 0de60b865ca..d41bf91bca3 100644
--- a/.github/workflows/release_dev.yml
+++ b/.github/workflows/release_dev.yml
@@ -58,6 +58,9 @@ jobs:
       - name: Check docs
         run: npm run docs:check
 
+      - name: Ensure standalone build
+        run: npm run sass:standalone
+
       - name: Build themes
         run: |
           npm run dart:flat
diff --git a/.github/workflows/release_stable.yml b/.github/workflows/release_stable.yml
index f838cc7360f..d15a692ac66 100644
--- a/.github/workflows/release_stable.yml
+++ b/.github/workflows/release_stable.yml
@@ -77,6 +77,9 @@ jobs:
       - name: Check docs
         run: npm run docs:check
 
+      - name: Ensure standalone build
+        run: npm run sass:standalone
+
       - name: Build themes
         run: |
           npm run dart:flat
diff --git a/gulpfile.js b/gulpfile.js
index 16deee313e4..7dacfa825b2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -79,8 +79,9 @@ gulp.task("sass", function( done ) {
     let file = getArg('--file') || paths.sass.theme;
     let dest = getArg('--dest') || paths.sass.dist;
     let themes = glob.sync( getArg('--theme') || paths.sass.themes );
+    let dryRun = getArg('--dry-run') || false;
 
-    buildAll( themes, { file, dest, compiler: nodeSass, postcssPlugins } );
+    buildAll( themes, { file, dest, dryRun, compiler: nodeSass, postcssPlugins } );
 
     done();
 });
@@ -120,8 +121,9 @@ gulp.task("dart", function( done ) {
     let file = getArg('--file') || paths.sass.theme;
     let dest = getArg('--dest') || paths.sass.dist;
     let themes = glob.sync( getArg('--theme') || paths.sass.themes );
+    let dryRun = getArg('--dry-run') || false;
 
-    buildAll( themes, { file, dest, compiler: dartSass, postcssPlugins } );
+    buildAll( themes, { file, dest, dryRun, compiler: dartSass, postcssPlugins } );
 
     done();
 });
diff --git a/package.json b/package.json
index aed84f39016..41ae24fdbf7 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "sass:flat": "gulp sass:flat",
     "sass:watch": "gulp sass:watch",
     "sass:swatches": "gulp sass:swatches",
+    "sass:standalone": "gulp sass --file 'scss/!(common|styling)*/_index.scss'  --dry-run",
     "dart": "gulp dart",
     "dart:flat": "gulp dart:flat",
     "dart:watch": "gulp dart:watch",
diff --git a/packages/bootstrap/scss/_variables.scss b/packages/bootstrap/scss/_variables.scss
index 77f947e6d90..e775badf506 100644
--- a/packages/bootstrap/scss/_variables.scss
+++ b/packages/bootstrap/scss/_variables.scss
@@ -106,6 +106,9 @@ $zindex-window: 2 !default;
 // Color settings
 $is-dark-theme: false;
 
+$white: #ffffff !default;
+$black: #000000 !default;
+
 // Deprecated
 /// The color that focuses the user attention.
 /// @deprecated Will be removed in v5. Use `$primary` variable instead.
diff --git a/packages/bootstrap/scss/adaptive/_index.scss b/packages/bootstrap/scss/adaptive/_index.scss
index fb04d844394..3f146cd62b9 100644
--- a/packages/bootstrap/scss/adaptive/_index.scss
+++ b/packages/bootstrap/scss/adaptive/_index.scss
@@ -2,11 +2,12 @@
 @import "../mixins/_index.scss";
 
 
-// Dependencies
+// Dependencies (TODO: extract variables)
 @import "../listgroup/_index.scss";
 @import "../checkbox/_index.scss";
 @import "../radio/_index.scss";
 @import "../switch/_index.scss";
+@import "../toolbar/_index.scss";
 
 
 // Component
diff --git a/packages/bootstrap/scss/chat/_index.scss b/packages/bootstrap/scss/chat/_index.scss
index 24a93650b35..6412910e454 100644
--- a/packages/bootstrap/scss/chat/_index.scss
+++ b/packages/bootstrap/scss/chat/_index.scss
@@ -7,6 +7,7 @@
 @import "../input/_index.scss";
 @import "../card/_index.scss";
 @import "../icons/_index.scss";
+@import "../toolbar/_index.scss";
 
 
 // Component
diff --git a/packages/bootstrap/scss/dataviz/_index.scss b/packages/bootstrap/scss/dataviz/_index.scss
index 97b769f0945..3b5bb21fef9 100644
--- a/packages/bootstrap/scss/dataviz/_index.scss
+++ b/packages/bootstrap/scss/dataviz/_index.scss
@@ -5,6 +5,7 @@
 // Dependencies
 @import "../common/_index.scss";
 @import "../popup/_index.scss";
+@import "../tooltip/_index.scss";
 
 
 // Component
diff --git a/packages/bootstrap/scss/dropdowngrid/_index.scss b/packages/bootstrap/scss/dropdowngrid/_index.scss
index 6c8eb67756a..411702c46aa 100644
--- a/packages/bootstrap/scss/dropdowngrid/_index.scss
+++ b/packages/bootstrap/scss/dropdowngrid/_index.scss
@@ -8,6 +8,7 @@
 @import "../floating-label/_index.scss";
 @import "../combobox/_index.scss";
 @import "../popup/_index.scss";
+@import "../toolbar/_variables.scss";
 @import "../grid/_variables.scss";
 
 
diff --git a/packages/bootstrap/scss/editor/_index.scss b/packages/bootstrap/scss/editor/_index.scss
index fa04e84c546..dd3d560ef21 100644
--- a/packages/bootstrap/scss/editor/_index.scss
+++ b/packages/bootstrap/scss/editor/_index.scss
@@ -9,8 +9,8 @@
 @import "../colorpicker/_index.scss";
 @import "../combobox/_index.scss";
 @import "../dropdownlist/_index.scss";
-@import "../upload/_index.scss";
 @import "../toolbar/_index.scss";
+@import "../upload/_index.scss";
 @import "../window/_index.scss";
 
 
diff --git a/packages/bootstrap/scss/filemanager/_index.scss b/packages/bootstrap/scss/filemanager/_index.scss
index 657698f092b..90863b9482d 100644
--- a/packages/bootstrap/scss/filemanager/_index.scss
+++ b/packages/bootstrap/scss/filemanager/_index.scss
@@ -5,10 +5,10 @@
 // Dependencies
 @import "../common/_index.scss";
 @import "../input/_index.scss";
+@import "../toolbar/_index.scss";
 @import "../upload/_index.scss";
 @import "../switch/_index.scss";
 @import "../menu/_index.scss";
-@import "../toolbar/_index.scss";
 @import "../dialog/_index.scss";
 @import "../breadcrumb/_index.scss";
 @import "../treeview/_index.scss";
diff --git a/packages/bootstrap/scss/floating-label/_index.scss b/packages/bootstrap/scss/floating-label/_index.scss
index 0a0e86f4ce1..b71f776aa0b 100644
--- a/packages/bootstrap/scss/floating-label/_index.scss
+++ b/packages/bootstrap/scss/floating-label/_index.scss
@@ -4,6 +4,7 @@
 
 // Dependencies
 @import "../common/_index.scss";
+@import "../input/_index.scss";
 
 
 // Component
diff --git a/packages/bootstrap/scss/forms/_index.scss b/packages/bootstrap/scss/forms/_index.scss
index e8c0909bc2c..a6e5189ca01 100644
--- a/packages/bootstrap/scss/forms/_index.scss
+++ b/packages/bootstrap/scss/forms/_index.scss
@@ -3,7 +3,8 @@
 
 
 // Dependencies // TODO: extract variables
-@import "../tooltip/variables";
+@import "../common/_index.scss";
+@import "../tooltip/_variables.scss";
 @import "../button/_variables.scss";
 @import "../input/_variables.scss";
 @import "../toolbar/_index.scss";
diff --git a/packages/bootstrap/scss/input/_index.scss b/packages/bootstrap/scss/input/_index.scss
index 0a0e86f4ce1..cbf6c2df84e 100644
--- a/packages/bootstrap/scss/input/_index.scss
+++ b/packages/bootstrap/scss/input/_index.scss
@@ -4,6 +4,7 @@
 
 // Dependencies
 @import "../common/_index.scss";
+@import "../button/_variables.scss";
 
 
 // Component
diff --git a/packages/bootstrap/scss/menu/_index.scss b/packages/bootstrap/scss/menu/_index.scss
index 23bc65d0aaf..984dd494948 100644
--- a/packages/bootstrap/scss/menu/_index.scss
+++ b/packages/bootstrap/scss/menu/_index.scss
@@ -4,6 +4,7 @@
 
 // Dependencies
 @import "../common/_index.scss";
+@import "../popup/_index.scss";
 @import "../icons/_index.scss";
 
 
diff --git a/packages/bootstrap/scss/pager/_index.scss b/packages/bootstrap/scss/pager/_index.scss
index 81cb1ad8124..734262bd340 100644
--- a/packages/bootstrap/scss/pager/_index.scss
+++ b/packages/bootstrap/scss/pager/_index.scss
@@ -6,6 +6,7 @@
 @import "../common/_index.scss";
 @import "../dropdownlist/_index.scss";
 @import "../icons/_index.scss";
+@import "../toolbar/_variables.scss";
 
 
 // Component
diff --git a/packages/bootstrap/scss/popup/_index.scss b/packages/bootstrap/scss/popup/_index.scss
index 60565646a9c..84ca1e4f180 100644
--- a/packages/bootstrap/scss/popup/_index.scss
+++ b/packages/bootstrap/scss/popup/_index.scss
@@ -5,6 +5,8 @@
 // Dependencies
 @import "../common/_index.scss";
 @import "../icons/_index.scss";
+@import "../button/_index.scss";
+@import "../input/_index.scss";
 @import "../forms/_variables.scss";
 
 
diff --git a/packages/bootstrap/scss/popup/_theme.scss b/packages/bootstrap/scss/popup/_theme.scss
index 72f2fcae624..dcffe208f32 100644
--- a/packages/bootstrap/scss/popup/_theme.scss
+++ b/packages/bootstrap/scss/popup/_theme.scss
@@ -65,10 +65,6 @@
 
     .k-list-container {
 
-        .k-list-optionlabel {
-            border-bottom-color: $input-border;
-        }
-
         // Button normal state
         .k-button {}
 
diff --git a/packages/bootstrap/scss/splitter/_variables.scss b/packages/bootstrap/scss/splitter/_variables.scss
index d0f5da52d0f..46259903fef 100644
--- a/packages/bootstrap/scss/splitter/_variables.scss
+++ b/packages/bootstrap/scss/splitter/_variables.scss
@@ -14,11 +14,11 @@ $splitter-drag-handle-length: 20px !default;
 $splitter-drag-handle-thickness: 2px !default;
 $splitter-drag-icon-margin: 7px !default;
 
-$splitbar-bg: darken($button-bg, 5) !default;
-$splitbar-text: $button-text !default;
+$splitbar-bg: try-shade( $base-bg, .5 ) !default;
+$splitbar-text: $base-text !default;
 
-$splitbar-hovered-bg: darken($button-hovered-bg, 5) !default;
-$splitbar-hovered-text: $button-hovered-text !default;
+$splitbar-hover-bg: try-shade( $splitbar-bg, .5 ) !default;
+$splitbar-hover-text: $splitbar-text !default;
 
 $splitbar-selected-bg: $selected-bg !default;
 $splitbar-selected-text: $selected-text !default;
diff --git a/packages/bootstrap/scss/spreadsheet/_index.scss b/packages/bootstrap/scss/spreadsheet/_index.scss
index 3fe623de9de..7ea97550a17 100644
--- a/packages/bootstrap/scss/spreadsheet/_index.scss
+++ b/packages/bootstrap/scss/spreadsheet/_index.scss
@@ -11,9 +11,9 @@
 @import "../combobox/_index.scss";
 @import "../datetime/_index.scss";
 @import "../dropdownlist/_index.scss";
+@import "../toolbar/_index.scss";
 @import "../upload/_index.scss";
 @import "../menu/_index.scss";
-@import "../toolbar/_index.scss";
 @import "../window/_index.scss";
 @import "../tabstrip/_index.scss";
 @import "../treeview/_index.scss";
diff --git a/packages/bootstrap/scss/switch/_variables.scss b/packages/bootstrap/scss/switch/_variables.scss
index 6979fa9e213..3dd07c9a14a 100644
--- a/packages/bootstrap/scss/switch/_variables.scss
+++ b/packages/bootstrap/scss/switch/_variables.scss
@@ -42,7 +42,7 @@ $switch-on-focused-border: null !default;
 $switch-on-focused-gradient: null !default;
 $switch-on-focused-shadow: 0 0 1px 2px tint( $switch-on-bg, 6 ) !default;
 
-$switch-on-hovered-bg: $primary-button-hovered-bg !default;
+$switch-on-hovered-bg: try-darken( $switch-on-bg, 7.5% ) !default;
 $switch-on-hovered-text: $switch-on-text !default;
 $switch-on-hovered-border: null !default;
 $switch-on-hovered-gradient: null !default;
@@ -58,7 +58,7 @@ $switch-on-handle-hovered-text: $switch-on-text !default;
 $switch-on-handle-hovered-border: null !default;
 $switch-on-handle-hovered-gradient: null !default;
 
-$switch-off-bg: $button-bg !default;
+$switch-off-bg: $secondary !default;
 $switch-off-text: black !default;
 $switch-off-border: null !default;
 $switch-off-gradient: null !default;
@@ -70,7 +70,7 @@ $switch-off-focused-border: null !default;
 $switch-off-focused-gradient: null !default;
 $switch-off-focused-shadow: 0 0 1px 2px tint( $switch-off-bg, 6 ) !default;
 
-$switch-off-hovered-bg: $button-hovered-bg !default;
+$switch-off-hovered-bg: try-darken( $switch-off-bg, 7.5% ) !default;
 $switch-off-hovered-text: $switch-off-text !default;
 $switch-off-hovered-border: null !default;
 $switch-off-hovered-gradient: null !default;
diff --git a/packages/bootstrap/scss/textbox/_variables.scss b/packages/bootstrap/scss/textbox/_variables.scss
index c754c516262..adcb9ebb81c 100644
--- a/packages/bootstrap/scss/textbox/_variables.scss
+++ b/packages/bootstrap/scss/textbox/_variables.scss
@@ -1,5 +1,5 @@
 // Textboxe
-$textbox-line-height: $form-line-height-em !default;
+$textbox-line-height: $input-line-height !default;
 $textbox-icon-width: calc( #{$icon-size} + #{$input-padding-x * 2} ) !default;
 $textbox-icon-padding-x: 6px !default;
 $textbox-icon-padding-y: $textbox-icon-padding-x !default;
diff --git a/packages/bootstrap/scss/toolbar/_variables.scss b/packages/bootstrap/scss/toolbar/_variables.scss
index 66ef61c57d8..88b6c6427f4 100644
--- a/packages/bootstrap/scss/toolbar/_variables.scss
+++ b/packages/bootstrap/scss/toolbar/_variables.scss
@@ -22,7 +22,4 @@ $toolbar-border: $header-border !default;
 $toolbar-gradient: null !default;
 $toolbar-shadow: null !default;
 
-$toolbar-button-expanded-bg: null !default;
-$toolbar-button-expanded-shadow: none !default;
-
 $toolbar-separator-border: inherit !default;
diff --git a/packages/bootstrap/scss/treeview/_variables.scss b/packages/bootstrap/scss/treeview/_variables.scss
index 07b11467a2e..900efda91a2 100644
--- a/packages/bootstrap/scss/treeview/_variables.scss
+++ b/packages/bootstrap/scss/treeview/_variables.scss
@@ -3,14 +3,14 @@ $treeview-padding-x: 2px !default;
 $treeview-padding-y: $treeview-padding-x !default;
 $treeview-font-family: $font-family !default;
 $treeview-font-size: $font-size !default;
-$treeview-line-height: $form-line-height !default;
+$treeview-line-height: $line-height !default;
 
 $treeview-indent: 16px !default;
 
-$treeview-item-padding-x: $button-padding-y !default;
+$treeview-item-padding-x: ( map-get( $spacing, 1 ) * 1.5 ) !default;
 $treeview-item-padding-y: $treeview-item-padding-x !default;
 $treeview-item-border-width: 1px !default;
-$treeview-item-border-radius: $border-radius !default;
+$treeview-item-border-radius: map-get( $spacing, 1 ) !default;
 
 $treeview-bg: null !default;
 $treeview-text: $component-text !default;
diff --git a/packages/bootstrap/scss/upload/_index.scss b/packages/bootstrap/scss/upload/_index.scss
index e1ed83e67d4..87e9c0ab24c 100644
--- a/packages/bootstrap/scss/upload/_index.scss
+++ b/packages/bootstrap/scss/upload/_index.scss
@@ -7,6 +7,8 @@
 @import "../button/_index.scss";
 @import "../action-buttons/_index.scss";
 @import "../icons/_index.scss";
+@import "../dropzone/_index.scss";
+@import "../toolbar/_variables.scss";
 
 
 // Component
diff --git a/packages/bootstrap/scss/utils/_index.scss b/packages/bootstrap/scss/utils/_index.scss
index cc52ad14c38..d33a2a2eba5 100644
--- a/packages/bootstrap/scss/utils/_index.scss
+++ b/packages/bootstrap/scss/utils/_index.scss
@@ -3,6 +3,7 @@
 
 
 // Dependencies
+@import "../typography/_variables.scss";
 
 
 // Component
diff --git a/packages/classic/scss/_variables.scss b/packages/classic/scss/_variables.scss
index 115cbcc2ef5..8b43701fc1a 100644
--- a/packages/classic/scss/_variables.scss
+++ b/packages/classic/scss/_variables.scss
@@ -100,6 +100,9 @@ $zindex-window: 2 !default;
 // Color settings
 $is-dark-theme: false !default;
 
+$white: #ffffff !default;
+$black: #000000 !default;
+
 
 // Theme colors
 /// The color that focuses the user attention.
diff --git a/packages/classic/scss/adaptive/_index.scss b/packages/classic/scss/adaptive/_index.scss
index 6a2acbf971d..b9a86a6fe34 100644
--- a/packages/classic/scss/adaptive/_index.scss
+++ b/packages/classic/scss/adaptive/_index.scss
@@ -2,11 +2,12 @@
 @import "../mixins/_index.scss";
 
 
-// Dependencies
+// Dependencies (TODO: extract variables)
 @import "../listgroup/_index.scss";
 @import "../checkbox/_index.scss";
 @import "../radio/_index.scss";
 @import "../switch/_index.scss";
+@import "../toolbar/_index.scss";
 
 
 // Component
diff --git a/packages/classic/scss/barcode/_index.scss b/packages/classic/scss/barcode/_index.scss
deleted file mode 100644
index 1dd0d7ec015..00000000000
--- a/packages/classic/scss/barcode/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Component
-@import "~@progress/kendo-theme-default/scss/barcode/_layout.scss";
-// @import "~@progress/kendo-theme-default/scss/barcode/_theme.scss";
diff --git a/packages/classic/scss/chat/_index.scss b/packages/classic/scss/chat/_index.scss
index 0abf916a78a..b52be614ecf 100644
--- a/packages/classic/scss/chat/_index.scss
+++ b/packages/classic/scss/chat/_index.scss
@@ -7,6 +7,7 @@
 @import "../input/_index.scss";
 @import "../card/_index.scss";
 @import "../icons/_index.scss";
+@import "../toolbar/_index.scss";
 
 
 // Component
diff --git a/packages/classic/scss/checkbox/_variables.scss b/packages/classic/scss/checkbox/_variables.scss
index f9cfbbdfa47..cbe2f1729ea 100644
--- a/packages/classic/scss/checkbox/_variables.scss
+++ b/packages/classic/scss/checkbox/_variables.scss
@@ -17,12 +17,12 @@ $checkbox-square-height: ( $checkbox-size / 2 ) !default;
 
 $checkbox-label-margin-x: 8px !default;
 
-$checkbox-bg: $input-bg !default;
-$checkbox-text: $input-text !default;
-$checkbox-border: $input-border !default;
-$checkbox-hovered-bg: $checkbox-bg !default;
-$checkbox-hovered-text: $primary !default;
-$checkbox-hovered-border: $input-hovered-border !default;
+$checkbox-bg: $white !default;
+$checkbox-text: transparent !default;
+$checkbox-border: $base-border !default;
+$checkbox-hovered-bg: null !default;
+$checkbox-hovered-text: null !default;
+$checkbox-hovered-border: $hovered-border !default;
 $checkbox-checked-bg: $primary !default;
 $checkbox-checked-text: contrast-wcag( $checkbox-checked-bg ) !default;
 $checkbox-checked-border: $checkbox-checked-bg !default;
diff --git a/packages/classic/scss/dropdowngrid/_index.scss b/packages/classic/scss/dropdowngrid/_index.scss
index 595efc99ad1..e03107bf6c0 100644
--- a/packages/classic/scss/dropdowngrid/_index.scss
+++ b/packages/classic/scss/dropdowngrid/_index.scss
@@ -8,6 +8,7 @@
 @import "../floating-label/_index.scss";
 @import "../combobox/_index.scss";
 @import "../popup/_index.scss";
+@import "../toolbar/_variables.scss";
 @import "../grid/_variables.scss";
 
 
diff --git a/packages/classic/scss/edit-form/_index.scss b/packages/classic/scss/edit-form/_index.scss
deleted file mode 100644
index a788acf92f9..00000000000
--- a/packages/classic/scss/edit-form/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Component
-@import "~@progress/kendo-theme-default/scss/edit-form/_layout.scss";
-@import "~@progress/kendo-theme-default/scss/edit-form/_theme.scss";
diff --git a/packages/classic/scss/editor/_index.scss b/packages/classic/scss/editor/_index.scss
index eada39205b7..24b9e9a31a0 100644
--- a/packages/classic/scss/editor/_index.scss
+++ b/packages/classic/scss/editor/_index.scss
@@ -9,8 +9,8 @@
 @import "../colorpicker/_index.scss";
 @import "../combobox/_index.scss";
 @import "../dropdownlist/_index.scss";
-@import "../upload/_index.scss";
 @import "../toolbar/_index.scss";
+@import "../upload/_index.scss";
 @import "../window/_index.scss";
 
 
diff --git a/packages/classic/scss/filemanager/_index.scss b/packages/classic/scss/filemanager/_index.scss
index 5b331537f8a..2dda558169e 100644
--- a/packages/classic/scss/filemanager/_index.scss
+++ b/packages/classic/scss/filemanager/_index.scss
@@ -5,10 +5,10 @@
 // Dependencies
 @import "../common/_index.scss";
 @import "../input/_index.scss";
+@import "../toolbar/_index.scss";
 @import "../upload/_index.scss";
 @import "../switch/_index.scss";
 @import "../menu/_index.scss";
-@import "../toolbar/_index.scss";
 @import "../dialog/_index.scss";
 @import "../breadcrumb/_index.scss";
 @import "../treeview/_index.scss";
diff --git a/packages/classic/scss/floating-label/_index.scss b/packages/classic/scss/floating-label/_index.scss
index f85c0643988..5f6e2c0c44d 100644
--- a/packages/classic/scss/floating-label/_index.scss
+++ b/packages/classic/scss/floating-label/_index.scss
@@ -4,6 +4,7 @@
 
 // Dependencies
 @import "../common/_index.scss";
+@import "../input/_index.scss";
 
 
 // Component
diff --git a/packages/classic/scss/forms/_index.scss b/packages/classic/scss/forms/_index.scss
index cda3f0ca9a4..39eac11df47 100644
--- a/packages/classic/scss/forms/_index.scss
+++ b/packages/classic/scss/forms/_index.scss
@@ -3,7 +3,8 @@
 
 
 // Dependencies // TODO: extract variables
-@import "../tooltip/variables";
+@import "../common/_index.scss";
+@import "../tooltip/_variables.scss";
 @import "../button/_variables.scss";
 @import "../input/_variables.scss";
 @import "../toolbar/_index.scss";
diff --git a/packages/classic/scss/input/_index.scss b/packages/classic/scss/input/_index.scss
index 79efe80e51f..2cb57b29d21 100644
--- a/packages/classic/scss/input/_index.scss
+++ b/packages/classic/scss/input/_index.scss
@@ -4,6 +4,7 @@
 
 // Dependencies
 @import "../common/_index.scss";
+@import "../button/_variables.scss";
 
 
 // Component
diff --git a/packages/classic/scss/menu/_index.scss b/packages/classic/scss/menu/_index.scss
index 2cf9612d101..63ed0794dbb 100644
--- a/packages/classic/scss/menu/_index.scss
+++ b/packages/classic/scss/menu/_index.scss
@@ -4,6 +4,7 @@
 
 // Dependencies
 @import "../common/_index.scss";
+@import "../popup/_index.scss";
 @import "../icons/_index.scss";
 
 
diff --git a/packages/classic/scss/pager/_index.scss b/packages/classic/scss/pager/_index.scss
index bf19d8c76bd..8c26b02dcb6 100644
--- a/packages/classic/scss/pager/_index.scss
+++ b/packages/classic/scss/pager/_index.scss
@@ -6,6 +6,7 @@
 @import "../common/_index.scss";
 @import "../dropdownlist/_index.scss";
 @import "../icons/_index.scss";
+@import "../toolbar/_variables.scss";
 
 
 // Component
diff --git a/packages/classic/scss/popup/_index.scss b/packages/classic/scss/popup/_index.scss
index b4d50a580eb..14673fcce60 100644
--- a/packages/classic/scss/popup/_index.scss
+++ b/packages/classic/scss/popup/_index.scss
@@ -5,6 +5,8 @@
 // Dependencies
 @import "../common/_index.scss";
 @import "../icons/_index.scss";
+@import "../button/_index.scss";
+@import "../input/_index.scss";
 @import "../forms/_variables.scss";
 
 
diff --git a/packages/classic/scss/qrcode/_index.scss b/packages/classic/scss/qrcode/_index.scss
deleted file mode 100644
index 1e61dc0a76b..00000000000
--- a/packages/classic/scss/qrcode/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Component
-@import "~@progress/kendo-theme-default/scss/qrcode/_layout.scss";
-// @import "~@progress/kendo-theme-default/scss/qrcode/_theme.scss";
diff --git a/packages/classic/scss/splitter/_variables.scss b/packages/classic/scss/splitter/_variables.scss
index ea417fcfec5..46259903fef 100644
--- a/packages/classic/scss/splitter/_variables.scss
+++ b/packages/classic/scss/splitter/_variables.scss
@@ -14,11 +14,11 @@ $splitter-drag-handle-length: 20px !default;
 $splitter-drag-handle-thickness: 2px !default;
 $splitter-drag-icon-margin: 7px !default;
 
-$splitbar-bg: rgba( try-darken( $panel-bg, 8 ), .8 ) !default;
-$splitbar-text: $panel-text !default;
+$splitbar-bg: try-shade( $base-bg, .5 ) !default;
+$splitbar-text: $base-text !default;
 
-$splitbar-hovered-bg: try-darken( $panel-bg, 8 ) !default;
-$splitbar-hovered-text: $panel-text !default;
+$splitbar-hover-bg: try-shade( $splitbar-bg, .5 ) !default;
+$splitbar-hover-text: $splitbar-text !default;
 
 $splitbar-selected-bg: $selected-bg !default;
-$splitbar-selected-text: contrast-wcag( $splitbar-selected-bg ) !default;
+$splitbar-selected-text: $selected-text !default;
diff --git a/packages/classic/scss/spreadsheet/_index.scss b/packages/classic/scss/spreadsheet/_index.scss
index 28db73e7a48..0d8eee528b9 100644
--- a/packages/classic/scss/spreadsheet/_index.scss
+++ b/packages/classic/scss/spreadsheet/_index.scss
@@ -11,9 +11,9 @@
 @import "../combobox/_index.scss";
 @import "../datetime/_index.scss";
 @import "../dropdownlist/_index.scss";
+@import "../toolbar/_index.scss";
 @import "../upload/_index.scss";
 @import "../menu/_index.scss";
-@import "../toolbar/_index.scss";
 @import "../window/_index.scss";
 @import "../tabstrip/_index.scss";
 @import "../treeview/_index.scss";
diff --git a/packages/classic/scss/textbox/_variables.scss b/packages/classic/scss/textbox/_variables.scss
index 4e90b1845d0..4db76e0f906 100644
--- a/packages/classic/scss/textbox/_variables.scss
+++ b/packages/classic/scss/textbox/_variables.scss
@@ -1,5 +1,5 @@
 // Textboxe
-$textbox-line-height: $form-line-height-em !default;
+$textbox-line-height: $input-line-height !default;
 $textbox-icon-width: calc( #{$icon-size} + #{$input-padding-x * 2} ) !default;
 $textbox-icon-padding-x: 6px !default;
 $textbox-icon-padding-y: $textbox-icon-padding-x !default;
diff --git a/packages/classic/scss/toolbar/_variables.scss b/packages/classic/scss/toolbar/_variables.scss
index 9d0372e53e3..0f3f5b45c8b 100644
--- a/packages/classic/scss/toolbar/_variables.scss
+++ b/packages/classic/scss/toolbar/_variables.scss
@@ -1,42 +1,25 @@
 // Toolbar
 
-$toolbar-bg: $button-bg !default;
-$toolbar-text: $button-text !default;
-$toolbar-border: $button-border !default;
-$toolbar-gradient: null !default;
-
-$toolbar-border-width: 1px !default;
-$toolbar-border-radius: 0px !default;
-
 /// The horizontal padding of the container.
 /// @group toolbar
 $toolbar-padding-x: $padding-x !default;
-
 /// The vertical padding of the container.
 /// @group toolbar
 $toolbar-padding-y: $padding-x !default;
+$toolbar-border-width: 1px !default;
+$toolbar-border-radius: null !default;
+$toolbar-spacing: $toolbar-padding-x !default;
+
+$toolbar-inner-calc-size: calc( #{$button-calc-size} + #{$toolbar-padding-y * 2} ) !default;
 
 $toolbar-font-family: $font-family !default;
 $toolbar-font-size: $font-size !default;
 $toolbar-line-height: $line-height !default;
 
-$toolbar-spacing: $toolbar-padding-x !default;
-
-$toolbar-button-border-width: $button-border-width !default;
-$toolbar-button-border-radius: 0px !default;
-
-$toolbar-button-padding-x: $button-padding-x !default;
-$toolbar-button-padding-y: $button-padding-y !default;
-$toolbar-button-line-height: $button-line-height !default;
-
-$toolbar-button-calc-size: calc( #{$toolbar-button-line-height * 1em} + #{$toolbar-button-padding-y * 2} + #{$toolbar-button-border-width * 2} ) !default;
-$toolbar-button-inner-calc-size: calc( #{$toolbar-button-line-height * 1em} + #{$toolbar-button-padding-y * 2} ) !default;
-
-$toolbar-inner-calc-size: calc( #{$toolbar-button-line-height * 1em} + #{$toolbar-button-padding-y * 2} + #{$toolbar-button-border-width * 2} + #{$toolbar-padding-y * 2} ) !default;
-
-$toolbar-button-expanded-bg: null !default;
-$toolbar-button-expanded-shadow: none !default;
+$toolbar-bg: $button-bg !default;
+$toolbar-text: $button-text !default;
+$toolbar-border: $button-border !default;
+$toolbar-gradient: null !default;
+$toolbar-shadow: null !default;
 
-$toolbar-shadow: none !default;
-$toolbar-separator-padding-y: $toolbar-button-padding-y !default;
 $toolbar-separator-border: inherit !default;
diff --git a/packages/classic/scss/treeview/_variables.scss b/packages/classic/scss/treeview/_variables.scss
index 0b30f93c9db..d9fe9db56cd 100644
--- a/packages/classic/scss/treeview/_variables.scss
+++ b/packages/classic/scss/treeview/_variables.scss
@@ -3,14 +3,14 @@ $treeview-padding-x: 0px !default;
 $treeview-padding-y: 0px !default;
 $treeview-font-family: $font-family !default;
 $treeview-font-size: $font-size !default;
-$treeview-line-height: $form-line-height !default;
+$treeview-line-height: $line-height !default;
 
 $treeview-indent: 16px !default;
 
-$treeview-item-padding-x: $button-padding-x !default;
-$treeview-item-padding-y: $button-padding-y !default;
+$treeview-item-padding-x: map-get( $spacing, 1 ) !default;
+$treeview-item-padding-y: $treeview-item-padding-x !default;
 $treeview-item-border-width: 0px !default;
-$treeview-item-border-radius: 0px !default;
+$treeview-item-border-radius: map-get( $spacing, 1 ) !default;
 
 $treeview-bg: null !default;
 $treeview-text: $component-text !default;
diff --git a/packages/classic/scss/upload/_index.scss b/packages/classic/scss/upload/_index.scss
index b7b15916a7a..85b8a813d6b 100644
--- a/packages/classic/scss/upload/_index.scss
+++ b/packages/classic/scss/upload/_index.scss
@@ -8,6 +8,7 @@
 @import "../action-buttons/_index.scss";
 @import "../icons/_index.scss";
 @import "../dropzone/_index.scss";
+@import "../toolbar/_variables.scss";
 
 
 // Component
diff --git a/packages/classic/scss/utils/_index.scss b/packages/classic/scss/utils/_index.scss
index cc52ad14c38..d33a2a2eba5 100644
--- a/packages/classic/scss/utils/_index.scss
+++ b/packages/classic/scss/utils/_index.scss
@@ -3,6 +3,7 @@
 
 
 // Dependencies
+@import "../typography/_variables.scss";
 
 
 // Component
diff --git a/packages/default/scss/_variables.scss b/packages/default/scss/_variables.scss
index 19baeb91d96..e589d68018b 100644
--- a/packages/default/scss/_variables.scss
+++ b/packages/default/scss/_variables.scss
@@ -103,6 +103,9 @@ $zindex-window: 2 !default;
 // Color settings
 $is-dark-theme: false !default;
 
+$white: #ffffff !default;
+$black: #000000 !default;
+
 
 // Deprecated
 /// The color that focuses the user attention.
diff --git a/packages/default/scss/adaptive/_index.scss b/packages/default/scss/adaptive/_index.scss
index fb04d844394..3f146cd62b9 100644
--- a/packages/default/scss/adaptive/_index.scss
+++ b/packages/default/scss/adaptive/_index.scss
@@ -2,11 +2,12 @@
 @import "../mixins/_index.scss";
 
 
-// Dependencies
+// Dependencies (TODO: extract variables)
 @import "../listgroup/_index.scss";
 @import "../checkbox/_index.scss";
 @import "../radio/_index.scss";
 @import "../switch/_index.scss";
+@import "../toolbar/_index.scss";
 
 
 // Component
diff --git a/packages/default/scss/chat/_index.scss b/packages/default/scss/chat/_index.scss
index 24a93650b35..6412910e454 100644
--- a/packages/default/scss/chat/_index.scss
+++ b/packages/default/scss/chat/_index.scss
@@ -7,6 +7,7 @@
 @import "../input/_index.scss";
 @import "../card/_index.scss";
 @import "../icons/_index.scss";
+@import "../toolbar/_index.scss";
 
 
 // Component
diff --git a/packages/default/scss/checkbox/_variables.scss b/packages/default/scss/checkbox/_variables.scss
index f9cfbbdfa47..cbe2f1729ea 100644
--- a/packages/default/scss/checkbox/_variables.scss
+++ b/packages/default/scss/checkbox/_variables.scss
@@ -17,12 +17,12 @@ $checkbox-square-height: ( $checkbox-size / 2 ) !default;
 
 $checkbox-label-margin-x: 8px !default;
 
-$checkbox-bg: $input-bg !default;
-$checkbox-text: $input-text !default;
-$checkbox-border: $input-border !default;
-$checkbox-hovered-bg: $checkbox-bg !default;
-$checkbox-hovered-text: $primary !default;
-$checkbox-hovered-border: $input-hovered-border !default;
+$checkbox-bg: $white !default;
+$checkbox-text: transparent !default;
+$checkbox-border: $base-border !default;
+$checkbox-hovered-bg: null !default;
+$checkbox-hovered-text: null !default;
+$checkbox-hovered-border: $hovered-border !default;
 $checkbox-checked-bg: $primary !default;
 $checkbox-checked-text: contrast-wcag( $checkbox-checked-bg ) !default;
 $checkbox-checked-border: $checkbox-checked-bg !default;
diff --git a/packages/default/scss/dropdowngrid/_index.scss b/packages/default/scss/dropdowngrid/_index.scss
index 6c8eb67756a..411702c46aa 100644
--- a/packages/default/scss/dropdowngrid/_index.scss
+++ b/packages/default/scss/dropdowngrid/_index.scss
@@ -8,6 +8,7 @@
 @import "../floating-label/_index.scss";
 @import "../combobox/_index.scss";
 @import "../popup/_index.scss";
+@import "../toolbar/_variables.scss";
 @import "../grid/_variables.scss";
 
 
diff --git a/packages/default/scss/editor/_index.scss b/packages/default/scss/editor/_index.scss
index fa04e84c546..dd3d560ef21 100644
--- a/packages/default/scss/editor/_index.scss
+++ b/packages/default/scss/editor/_index.scss
@@ -9,8 +9,8 @@
 @import "../colorpicker/_index.scss";
 @import "../combobox/_index.scss";
 @import "../dropdownlist/_index.scss";
-@import "../upload/_index.scss";
 @import "../toolbar/_index.scss";
+@import "../upload/_index.scss";
 @import "../window/_index.scss";
 
 
diff --git a/packages/default/scss/filemanager/_index.scss b/packages/default/scss/filemanager/_index.scss
index 657698f092b..90863b9482d 100644
--- a/packages/default/scss/filemanager/_index.scss
+++ b/packages/default/scss/filemanager/_index.scss
@@ -5,10 +5,10 @@
 // Dependencies
 @import "../common/_index.scss";
 @import "../input/_index.scss";
+@import "../toolbar/_index.scss";
 @import "../upload/_index.scss";
 @import "../switch/_index.scss";
 @import "../menu/_index.scss";
-@import "../toolbar/_index.scss";
 @import "../dialog/_index.scss";
 @import "../breadcrumb/_index.scss";
 @import "../treeview/_index.scss";
diff --git a/packages/default/scss/floating-label/_index.scss b/packages/default/scss/floating-label/_index.scss
index 0a0e86f4ce1..b71f776aa0b 100644
--- a/packages/default/scss/floating-label/_index.scss
+++ b/packages/default/scss/floating-label/_index.scss
@@ -4,6 +4,7 @@
 
 // Dependencies
 @import "../common/_index.scss";
+@import "../input/_index.scss";
 
 
 // Component
diff --git a/packages/default/scss/forms/_index.scss b/packages/default/scss/forms/_index.scss
index e8c0909bc2c..a6e5189ca01 100644
--- a/packages/default/scss/forms/_index.scss
+++ b/packages/default/scss/forms/_index.scss
@@ -3,7 +3,8 @@
 
 
 // Dependencies // TODO: extract variables
-@import "../tooltip/variables";
+@import "../common/_index.scss";
+@import "../tooltip/_variables.scss";
 @import "../button/_variables.scss";
 @import "../input/_variables.scss";
 @import "../toolbar/_index.scss";
diff --git a/packages/default/scss/forms/_layout.scss b/packages/default/scss/forms/_layout.scss
index cf155d6b676..5276af90bcd 100644
--- a/packages/default/scss/forms/_layout.scss
+++ b/packages/default/scss/forms/_layout.scss
@@ -7,6 +7,56 @@
         line-height: $form-line-height;
     }
 
+
+    // Fieldset
+    .k-fieldset {
+        margin: $fieldset-margin;
+        border-width: 1px 0 0;
+        border-style: solid;
+        padding: 25px 0 0;
+
+        > legend {
+            margin-left: 0;
+            padding: 0 $padding-x 0 0;
+            text-transform: uppercase;
+        }
+    }
+
+
+    // Label
+    kendo-label > .k-label {
+        margin: 0;
+    }
+
+    .k-label-optional {
+        margin-left: $label-optional-margin-x;
+        font-size: $label-optional-font-size;
+        font-style: $label-optional-font-style;
+        align-self: center;
+    }
+
+    .k-label-empty {
+        &::before {
+            content: "";
+            display: inline-block;
+        }
+    }
+
+    .k-input-label {
+        margin-right: $horizontal-form-label-margin-x;
+        z-index: 1;
+
+        &:dir(rtl),
+        .k-rtl &,
+        &.k-rtl,
+        [dir="rtl"] &,
+        &[dir="rtl"] {
+            margin-right: 0;
+            margin-left: $horizontal-form-label-margin-x;
+        }
+    }
+
+
     // Vertical Form
     .k-form {
         border: 0;
diff --git a/packages/default/scss/input/_index.scss b/packages/default/scss/input/_index.scss
index 0a0e86f4ce1..cbf6c2df84e 100644
--- a/packages/default/scss/input/_index.scss
+++ b/packages/default/scss/input/_index.scss
@@ -4,6 +4,7 @@
 
 // Dependencies
 @import "../common/_index.scss";
+@import "../button/_variables.scss";
 
 
 // Component
diff --git a/packages/default/scss/input/_layout.scss b/packages/default/scss/input/_layout.scss
index 67b54ee0a54..72722e88d4f 100644
--- a/packages/default/scss/input/_layout.scss
+++ b/packages/default/scss/input/_layout.scss
@@ -131,41 +131,6 @@
         flex-flow: row nowrap;
     }
 
-
-    // Fieldset
-    .k-fieldset {
-        margin: $fieldset-margin;
-        border-width: 1px 0 0;
-        border-style: solid;
-        padding: 25px 0 0;
-
-        > legend {
-            margin-left: 0;
-            padding: 0 $padding-x 0 0;
-            text-transform: uppercase;
-        }
-    }
-
-
-    // Label
-    kendo-label > .k-label {
-        margin: 0;
-    }
-
-    .k-label-optional {
-        margin-left: $label-optional-margin-x;
-        font-size: $label-optional-font-size;
-        font-style: $label-optional-font-style;
-        align-self: center;
-    }
-
-    .k-label-empty {
-        &::before {
-            content: "";
-            display: inline-block;
-        }
-    }
-
     .k-text-disabled {
         @include disabled( $disabled-styling );
     }
@@ -177,20 +142,6 @@
 
 @include exports("input/layout/jQuery-label") {
 
-    .k-input-label {
-        margin-right: $horizontal-form-label-margin-x;
-        z-index: 1;
-
-        &:dir(rtl),
-        .k-rtl &,
-        &.k-rtl,
-        [dir="rtl"] &,
-        &[dir="rtl"] {
-            margin-right: 0;
-            margin-left: $horizontal-form-label-margin-x;
-        }
-    }
-
 }
 
 
diff --git a/packages/default/scss/menu/_index.scss b/packages/default/scss/menu/_index.scss
index 23bc65d0aaf..984dd494948 100644
--- a/packages/default/scss/menu/_index.scss
+++ b/packages/default/scss/menu/_index.scss
@@ -4,6 +4,7 @@
 
 // Dependencies
 @import "../common/_index.scss";
+@import "../popup/_index.scss";
 @import "../icons/_index.scss";
 
 
diff --git a/packages/default/scss/pager/_index.scss b/packages/default/scss/pager/_index.scss
index 81cb1ad8124..734262bd340 100644
--- a/packages/default/scss/pager/_index.scss
+++ b/packages/default/scss/pager/_index.scss
@@ -6,6 +6,7 @@
 @import "../common/_index.scss";
 @import "../dropdownlist/_index.scss";
 @import "../icons/_index.scss";
+@import "../toolbar/_variables.scss";
 
 
 // Component
diff --git a/packages/default/scss/popup/_index.scss b/packages/default/scss/popup/_index.scss
index 60565646a9c..84ca1e4f180 100644
--- a/packages/default/scss/popup/_index.scss
+++ b/packages/default/scss/popup/_index.scss
@@ -5,6 +5,8 @@
 // Dependencies
 @import "../common/_index.scss";
 @import "../icons/_index.scss";
+@import "../button/_index.scss";
+@import "../input/_index.scss";
 @import "../forms/_variables.scss";
 
 
diff --git a/packages/default/scss/popup/_layout.scss b/packages/default/scss/popup/_layout.scss
index 00a68cf793a..940813a862d 100644
--- a/packages/default/scss/popup/_layout.scss
+++ b/packages/default/scss/popup/_layout.scss
@@ -206,7 +206,6 @@
         display: block;
         position: relative;
         padding: $padding-x;
-        min-height: calc( #{$padding-y * 4} + #{$form-line-height-em} + #{$button-padding-y * 2} );
         box-sizing: border-box;
         flex: 1 0 auto;
 
diff --git a/packages/default/scss/splitter/_theme.scss b/packages/default/scss/splitter/_theme.scss
index 311fd3751a6..904c3eeef40 100644
--- a/packages/default/scss/splitter/_theme.scss
+++ b/packages/default/scss/splitter/_theme.scss
@@ -13,21 +13,24 @@
     .k-splitbar {
         color: $splitbar-text;
         background-color: $splitbar-bg;
-
-        &:active,
-        &.k-state-focused {
-            color: $splitbar-selected-text;
-            background: $splitbar-selected-bg;
-        }
     }
+    .k-splitbar:hover,
+    .k-splitbar.k-state-hover,
     .k-splitbar-horizontal-hover,
     .k-splitbar-vertical-hover {
-        color: $splitbar-hovered-text;
-        background-color: $splitbar-hovered-bg;
+        color: $splitbar-hover-text;
+        background-color: $splitbar-hover-bg;
+    }
+    .k-splitbar:active,
+    .k-splitbar.k-state-focus,
+    .k-splitbar.k-state-focused {
+        color: $splitbar-selected-text;
+        background: $splitbar-selected-bg;
     }
 
+    // Ghost splitbar
     .k-ghost-splitbar {
-        background-color: $splitbar-hovered-bg;
+        background-color: $splitbar-hover-bg;
     }
 
 }
diff --git a/packages/default/scss/splitter/_variables.scss b/packages/default/scss/splitter/_variables.scss
index ea417fcfec5..46259903fef 100644
--- a/packages/default/scss/splitter/_variables.scss
+++ b/packages/default/scss/splitter/_variables.scss
@@ -14,11 +14,11 @@ $splitter-drag-handle-length: 20px !default;
 $splitter-drag-handle-thickness: 2px !default;
 $splitter-drag-icon-margin: 7px !default;
 
-$splitbar-bg: rgba( try-darken( $panel-bg, 8 ), .8 ) !default;
-$splitbar-text: $panel-text !default;
+$splitbar-bg: try-shade( $base-bg, .5 ) !default;
+$splitbar-text: $base-text !default;
 
-$splitbar-hovered-bg: try-darken( $panel-bg, 8 ) !default;
-$splitbar-hovered-text: $panel-text !default;
+$splitbar-hover-bg: try-shade( $splitbar-bg, .5 ) !default;
+$splitbar-hover-text: $splitbar-text !default;
 
 $splitbar-selected-bg: $selected-bg !default;
-$splitbar-selected-text: contrast-wcag( $splitbar-selected-bg ) !default;
+$splitbar-selected-text: $selected-text !default;
diff --git a/packages/default/scss/spreadsheet/_index.scss b/packages/default/scss/spreadsheet/_index.scss
index 3fe623de9de..7ea97550a17 100644
--- a/packages/default/scss/spreadsheet/_index.scss
+++ b/packages/default/scss/spreadsheet/_index.scss
@@ -11,9 +11,9 @@
 @import "../combobox/_index.scss";
 @import "../datetime/_index.scss";
 @import "../dropdownlist/_index.scss";
+@import "../toolbar/_index.scss";
 @import "../upload/_index.scss";
 @import "../menu/_index.scss";
-@import "../toolbar/_index.scss";
 @import "../window/_index.scss";
 @import "../tabstrip/_index.scss";
 @import "../treeview/_index.scss";
diff --git a/packages/default/scss/textbox/_variables.scss b/packages/default/scss/textbox/_variables.scss
index 4e90b1845d0..4db76e0f906 100644
--- a/packages/default/scss/textbox/_variables.scss
+++ b/packages/default/scss/textbox/_variables.scss
@@ -1,5 +1,5 @@
 // Textboxe
-$textbox-line-height: $form-line-height-em !default;
+$textbox-line-height: $input-line-height !default;
 $textbox-icon-width: calc( #{$icon-size} + #{$input-padding-x * 2} ) !default;
 $textbox-icon-padding-x: 6px !default;
 $textbox-icon-padding-y: $textbox-icon-padding-x !default;
diff --git a/packages/default/scss/toolbar/_theme.scss b/packages/default/scss/toolbar/_theme.scss
index 8d5f251ac23..559d02e3868 100644
--- a/packages/default/scss/toolbar/_theme.scss
+++ b/packages/default/scss/toolbar/_theme.scss
@@ -18,19 +18,6 @@
         }
 
 
-        // Expanded state
-        .k-state-border-up,
-        .k-state-border-down {
-            background: $toolbar-button-expanded-bg;
-            box-shadow: $toolbar-button-expanded-shadow;
-
-            &::before,
-            .k-button::before {
-                opacity: 0;
-            }
-        }
-
-
         // Separator
         .k-separator {
             border-color: $toolbar-separator-border;
@@ -48,13 +35,6 @@
         // Button group
         .k-button-group {}
 
-        .k-combobox {
-            .k-state-border-up,
-            .k-state-border-down {
-                box-shadow: $toolbar-button-expanded-shadow;
-            }
-        }
-
     }
 
 }
diff --git a/packages/default/scss/toolbar/_variables.scss b/packages/default/scss/toolbar/_variables.scss
index c4b6d8f2334..0f3f5b45c8b 100644
--- a/packages/default/scss/toolbar/_variables.scss
+++ b/packages/default/scss/toolbar/_variables.scss
@@ -22,7 +22,4 @@ $toolbar-border: $button-border !default;
 $toolbar-gradient: null !default;
 $toolbar-shadow: null !default;
 
-$toolbar-button-expanded-bg: null !default;
-$toolbar-button-expanded-shadow: none !default;
-
 $toolbar-separator-border: inherit !default;
diff --git a/packages/default/scss/treeview/_variables.scss b/packages/default/scss/treeview/_variables.scss
index 0b30f93c9db..1aae8afba85 100644
--- a/packages/default/scss/treeview/_variables.scss
+++ b/packages/default/scss/treeview/_variables.scss
@@ -3,14 +3,14 @@ $treeview-padding-x: 0px !default;
 $treeview-padding-y: 0px !default;
 $treeview-font-family: $font-family !default;
 $treeview-font-size: $font-size !default;
-$treeview-line-height: $form-line-height !default;
+$treeview-line-height: $line-height !default;
 
 $treeview-indent: 16px !default;
 
-$treeview-item-padding-x: $button-padding-x !default;
-$treeview-item-padding-y: $button-padding-y !default;
+$treeview-item-padding-x: map-get( $spacing, 2 ) !default;
+$treeview-item-padding-y: map-get( $spacing, 1 ) !default;
 $treeview-item-border-width: 0px !default;
-$treeview-item-border-radius: 0px !default;
+$treeview-item-border-radius: null !default;
 
 $treeview-bg: null !default;
 $treeview-text: $component-text !default;
diff --git a/packages/default/scss/upload/_index.scss b/packages/default/scss/upload/_index.scss
index a23dc1fb14b..87e9c0ab24c 100644
--- a/packages/default/scss/upload/_index.scss
+++ b/packages/default/scss/upload/_index.scss
@@ -8,6 +8,7 @@
 @import "../action-buttons/_index.scss";
 @import "../icons/_index.scss";
 @import "../dropzone/_index.scss";
+@import "../toolbar/_variables.scss";
 
 
 // Component
diff --git a/packages/default/scss/upload/_layout.scss b/packages/default/scss/upload/_layout.scss
index 12ef24419ce..c872543cd6f 100644
--- a/packages/default/scss/upload/_layout.scss
+++ b/packages/default/scss/upload/_layout.scss
@@ -39,8 +39,6 @@
             }
 
             .k-upload-status {
-                font-size: $font-size;
-                line-height: $form-line-height;
                 font-weight: normal;
                 display: flex;
                 align-items: center;
diff --git a/packages/default/scss/utils/_index.scss b/packages/default/scss/utils/_index.scss
index cc52ad14c38..d33a2a2eba5 100644
--- a/packages/default/scss/utils/_index.scss
+++ b/packages/default/scss/utils/_index.scss
@@ -3,6 +3,7 @@
 
 
 // Dependencies
+@import "../typography/_variables.scss";
 
 
 // Component
diff --git a/packages/material/scss/_variables.scss b/packages/material/scss/_variables.scss
index fb01776b36e..fac0ac289fd 100644
--- a/packages/material/scss/_variables.scss
+++ b/packages/material/scss/_variables.scss
@@ -148,6 +148,9 @@ $zindex-window: 2;
 // Color settings
 $is-dark-theme: map-get($theme, is-dark);
 
+$white: #ffffff !default;
+$black: #000000 !default;
+
 
 // Theme colors
 /// The color that focuses the user attention.
diff --git a/packages/material/scss/adaptive/_index.scss b/packages/material/scss/adaptive/_index.scss
index fb04d844394..3f146cd62b9 100644
--- a/packages/material/scss/adaptive/_index.scss
+++ b/packages/material/scss/adaptive/_index.scss
@@ -2,11 +2,12 @@
 @import "../mixins/_index.scss";
 
 
-// Dependencies
+// Dependencies (TODO: extract variables)
 @import "../listgroup/_index.scss";
 @import "../checkbox/_index.scss";
 @import "../radio/_index.scss";
 @import "../switch/_index.scss";
+@import "../toolbar/_index.scss";
 
 
 // Component
diff --git a/packages/material/scss/chat/_index.scss b/packages/material/scss/chat/_index.scss
index 24a93650b35..6412910e454 100644
--- a/packages/material/scss/chat/_index.scss
+++ b/packages/material/scss/chat/_index.scss
@@ -7,6 +7,7 @@
 @import "../input/_index.scss";
 @import "../card/_index.scss";
 @import "../icons/_index.scss";
+@import "../toolbar/_index.scss";
 
 
 // Component
diff --git a/packages/material/scss/checkbox/_variables.scss b/packages/material/scss/checkbox/_variables.scss
index 4da7dcfc864..fc6d199a3d7 100644
--- a/packages/material/scss/checkbox/_variables.scss
+++ b/packages/material/scss/checkbox/_variables.scss
@@ -19,10 +19,10 @@ $checkbox-label-margin-x: 8px !default;
 
 $checkbox-bg: null !default;
 $checkbox-text: transparent !default;
-$checkbox-border: rgba(0, 0, 0, .54) !default;
+$checkbox-border: rgba( 0, 0, 0, .54 ) !default;
 $checkbox-hovered-bg: null !default;
 $checkbox-hovered-text: null !default;
-$checkbox-hovered-border: $input-hovered-border !default;
+$checkbox-hovered-border: rgba( 0, 0, 0, .87 ) !default;
 $checkbox-checked-bg: $primary !default;
 $checkbox-checked-text: contrast-wcag( $checkbox-checked-bg ) !default;
 $checkbox-checked-border: $checkbox-checked-bg !default;
diff --git a/packages/material/scss/dataviz/_index.scss b/packages/material/scss/dataviz/_index.scss
index 97b769f0945..3b5bb21fef9 100644
--- a/packages/material/scss/dataviz/_index.scss
+++ b/packages/material/scss/dataviz/_index.scss
@@ -5,6 +5,7 @@
 // Dependencies
 @import "../common/_index.scss";
 @import "../popup/_index.scss";
+@import "../tooltip/_index.scss";
 
 
 // Component
diff --git a/packages/material/scss/dropdowngrid/_index.scss b/packages/material/scss/dropdowngrid/_index.scss
index 6c8eb67756a..411702c46aa 100644
--- a/packages/material/scss/dropdowngrid/_index.scss
+++ b/packages/material/scss/dropdowngrid/_index.scss
@@ -8,6 +8,7 @@
 @import "../floating-label/_index.scss";
 @import "../combobox/_index.scss";
 @import "../popup/_index.scss";
+@import "../toolbar/_variables.scss";
 @import "../grid/_variables.scss";
 
 
diff --git a/packages/material/scss/editor/_index.scss b/packages/material/scss/editor/_index.scss
index fa04e84c546..dd3d560ef21 100644
--- a/packages/material/scss/editor/_index.scss
+++ b/packages/material/scss/editor/_index.scss
@@ -9,8 +9,8 @@
 @import "../colorpicker/_index.scss";
 @import "../combobox/_index.scss";
 @import "../dropdownlist/_index.scss";
-@import "../upload/_index.scss";
 @import "../toolbar/_index.scss";
+@import "../upload/_index.scss";
 @import "../window/_index.scss";
 
 
diff --git a/packages/material/scss/filemanager/_index.scss b/packages/material/scss/filemanager/_index.scss
index 657698f092b..90863b9482d 100644
--- a/packages/material/scss/filemanager/_index.scss
+++ b/packages/material/scss/filemanager/_index.scss
@@ -5,10 +5,10 @@
 // Dependencies
 @import "../common/_index.scss";
 @import "../input/_index.scss";
+@import "../toolbar/_index.scss";
 @import "../upload/_index.scss";
 @import "../switch/_index.scss";
 @import "../menu/_index.scss";
-@import "../toolbar/_index.scss";
 @import "../dialog/_index.scss";
 @import "../breadcrumb/_index.scss";
 @import "../treeview/_index.scss";
diff --git a/packages/material/scss/floating-label/_index.scss b/packages/material/scss/floating-label/_index.scss
index 0a0e86f4ce1..b71f776aa0b 100644
--- a/packages/material/scss/floating-label/_index.scss
+++ b/packages/material/scss/floating-label/_index.scss
@@ -4,6 +4,7 @@
 
 // Dependencies
 @import "../common/_index.scss";
+@import "../input/_index.scss";
 
 
 // Component
diff --git a/packages/material/scss/forms/_index.scss b/packages/material/scss/forms/_index.scss
index e8c0909bc2c..a6e5189ca01 100644
--- a/packages/material/scss/forms/_index.scss
+++ b/packages/material/scss/forms/_index.scss
@@ -3,7 +3,8 @@
 
 
 // Dependencies // TODO: extract variables
-@import "../tooltip/variables";
+@import "../common/_index.scss";
+@import "../tooltip/_variables.scss";
 @import "../button/_variables.scss";
 @import "../input/_variables.scss";
 @import "../toolbar/_index.scss";
diff --git a/packages/material/scss/input/_index.scss b/packages/material/scss/input/_index.scss
index 0a0e86f4ce1..cbf6c2df84e 100644
--- a/packages/material/scss/input/_index.scss
+++ b/packages/material/scss/input/_index.scss
@@ -4,6 +4,7 @@
 
 // Dependencies
 @import "../common/_index.scss";
+@import "../button/_variables.scss";
 
 
 // Component
diff --git a/packages/material/scss/menu/_index.scss b/packages/material/scss/menu/_index.scss
index 23bc65d0aaf..984dd494948 100644
--- a/packages/material/scss/menu/_index.scss
+++ b/packages/material/scss/menu/_index.scss
@@ -4,6 +4,7 @@
 
 // Dependencies
 @import "../common/_index.scss";
+@import "../popup/_index.scss";
 @import "../icons/_index.scss";
 
 
diff --git a/packages/material/scss/pager/_index.scss b/packages/material/scss/pager/_index.scss
index 81cb1ad8124..734262bd340 100644
--- a/packages/material/scss/pager/_index.scss
+++ b/packages/material/scss/pager/_index.scss
@@ -6,6 +6,7 @@
 @import "../common/_index.scss";
 @import "../dropdownlist/_index.scss";
 @import "../icons/_index.scss";
+@import "../toolbar/_variables.scss";
 
 
 // Component
diff --git a/packages/material/scss/popup/_index.scss b/packages/material/scss/popup/_index.scss
index 60565646a9c..84ca1e4f180 100644
--- a/packages/material/scss/popup/_index.scss
+++ b/packages/material/scss/popup/_index.scss
@@ -5,6 +5,8 @@
 // Dependencies
 @import "../common/_index.scss";
 @import "../icons/_index.scss";
+@import "../button/_index.scss";
+@import "../input/_index.scss";
 @import "../forms/_variables.scss";
 
 
diff --git a/packages/material/scss/splitter/_variables.scss b/packages/material/scss/splitter/_variables.scss
index 1b2b2f89a29..1e9fe06ce32 100644
--- a/packages/material/scss/splitter/_variables.scss
+++ b/packages/material/scss/splitter/_variables.scss
@@ -14,11 +14,11 @@ $splitter-drag-handle-length: 20px !default;
 $splitter-drag-handle-thickness: 2px !default;
 $splitter-drag-icon-margin: 7px !default;
 
-$splitbar-bg: rgba($base-text, .12) !default;
-$splitbar-text: rgba($base-text, .54) !default;
+$splitbar-bg: try-shade( $base-bg, 1 ) !default;
+$splitbar-text: $base-text !default;
 
-$splitbar-hovered-bg: rgba($base-text, .22);
-$splitbar-hovered-text: $base-text !default;
+$splitbar-hover-bg: try-shade( $splitbar-bg, .5 ) !default;
+$splitbar-hover-text: $splitbar-text !default;
 
 $splitbar-selected-bg: $primary !default;
-$splitbar-selected-text: contrast-wcag( $splitbar-selected-bg ) !default;
+$splitbar-selected-text: $primary-contrast !default;
diff --git a/packages/material/scss/spreadsheet/_index.scss b/packages/material/scss/spreadsheet/_index.scss
index 3fe623de9de..7ea97550a17 100644
--- a/packages/material/scss/spreadsheet/_index.scss
+++ b/packages/material/scss/spreadsheet/_index.scss
@@ -11,9 +11,9 @@
 @import "../combobox/_index.scss";
 @import "../datetime/_index.scss";
 @import "../dropdownlist/_index.scss";
+@import "../toolbar/_index.scss";
 @import "../upload/_index.scss";
 @import "../menu/_index.scss";
-@import "../toolbar/_index.scss";
 @import "../window/_index.scss";
 @import "../tabstrip/_index.scss";
 @import "../treeview/_index.scss";
diff --git a/packages/material/scss/toolbar/_variables.scss b/packages/material/scss/toolbar/_variables.scss
index afb8a32f1c3..048f06f9a46 100644
--- a/packages/material/scss/toolbar/_variables.scss
+++ b/packages/material/scss/toolbar/_variables.scss
@@ -22,7 +22,4 @@ $toolbar-border: null !default;
 $toolbar-gradient: null !default;
 $toolbar-shadow: $box-shadow-depth-2 !default;
 
-$toolbar-button-expanded-bg: $popup-bg !default;
-$toolbar-button-expanded-shadow: $button-focused-shadow !default;
-
 $toolbar-separator-border: $component-border !default;
diff --git a/packages/material/scss/treeview/_variables.scss b/packages/material/scss/treeview/_variables.scss
index d1203f7b167..063feff9497 100644
--- a/packages/material/scss/treeview/_variables.scss
+++ b/packages/material/scss/treeview/_variables.scss
@@ -10,7 +10,7 @@ $treeview-indent: 16px !default;
 $treeview-item-padding-x: 8px !default;
 $treeview-item-padding-y: 6px !default;
 $treeview-item-border-width: 0px !default;
-$treeview-item-border-radius: 0px !default;
+$treeview-item-border-radius: null !default;
 
 $treeview-bg: null !default;
 $treeview-text: $component-text !default;
diff --git a/packages/material/scss/upload/_index.scss b/packages/material/scss/upload/_index.scss
index e1ed83e67d4..87e9c0ab24c 100644
--- a/packages/material/scss/upload/_index.scss
+++ b/packages/material/scss/upload/_index.scss
@@ -7,6 +7,8 @@
 @import "../button/_index.scss";
 @import "../action-buttons/_index.scss";
 @import "../icons/_index.scss";
+@import "../dropzone/_index.scss";
+@import "../toolbar/_variables.scss";
 
 
 // Component
diff --git a/packages/material/scss/utils/_index.scss b/packages/material/scss/utils/_index.scss
index cc52ad14c38..d33a2a2eba5 100644
--- a/packages/material/scss/utils/_index.scss
+++ b/packages/material/scss/utils/_index.scss
@@ -3,6 +3,7 @@
 
 
 // Dependencies
+@import "../typography/_variables.scss";
 
 
 // Component
diff --git a/scripts/sass-build.js b/scripts/sass-build.js
index 12e76fb7dcb..add27a799f8 100644
--- a/scripts/sass-build.js
+++ b/scripts/sass-build.js
@@ -18,6 +18,8 @@ const defaults = {
     dest: './',
     destFile: '[name].css',
 
+    dryRun: false,
+
     // sass options
     compiler: nodeSass,
     importer: sassImporterFactory( { cache: true } ),
@@ -69,7 +71,7 @@ function parsePathData( options ) {
 function build( options ) {
 
     let opts = Object.assign( {}, defaults, options );
-    let { cwd, file, dir, dest, destFile, postcssPlugins } = opts;
+    let { cwd, file, dir, dest, destFile, dryRun, postcssPlugins } = opts;
     let files = [];
 
     delete opts.cwd;
@@ -77,6 +79,7 @@ function build( options ) {
     delete opts.dir;
     delete opts.dest;
     delete opts.destFile;
+    delete opts.dryRun;
     delete opts.postcssPlugins;
 
     if ( typeof file === 'string' ) {
@@ -106,8 +109,10 @@ function build( options ) {
             result = postcss( postcssPlugins ).process( result ).css;
         }
 
-        utils.ensureDirSync( path.dirname( fileMeta.outFile ) );
-        fs.writeFileSync( fileMeta.outFile, result );
+        if ( dryRun === false ) {
+            utils.ensureDirSync( path.dirname( fileMeta.outFile ) );
+            fs.writeFileSync( fileMeta.outFile, result );
+        }
 
     });
 }
diff --git a/tests/visual/output/bootstrap/gantt.png b/tests/visual/output/bootstrap/gantt.png
index e06f5e38a77..30c41c803fc 100644
Binary files a/tests/visual/output/bootstrap/gantt.png and b/tests/visual/output/bootstrap/gantt.png differ
diff --git a/tests/visual/output/bootstrap/splitter.png b/tests/visual/output/bootstrap/splitter.png
index 90996060f30..14c6ad16fe2 100644
Binary files a/tests/visual/output/bootstrap/splitter.png and b/tests/visual/output/bootstrap/splitter.png differ
diff --git a/tests/visual/output/bootstrap/toolbar-components-rtl.png b/tests/visual/output/bootstrap/toolbar-components-rtl.png
index 343463c5d92..7a247604282 100644
Binary files a/tests/visual/output/bootstrap/toolbar-components-rtl.png and b/tests/visual/output/bootstrap/toolbar-components-rtl.png differ
diff --git a/tests/visual/output/bootstrap/toolbar-components.png b/tests/visual/output/bootstrap/toolbar-components.png
index f83682ef9c9..198bc1cecd7 100644
Binary files a/tests/visual/output/bootstrap/toolbar-components.png and b/tests/visual/output/bootstrap/toolbar-components.png differ
diff --git a/tests/visual/output/default/splitter.png b/tests/visual/output/default/splitter.png
index d3f6bd40434..07e104b6ceb 100644
Binary files a/tests/visual/output/default/splitter.png and b/tests/visual/output/default/splitter.png differ
diff --git a/tests/visual/output/default/toolbar-components-rtl.png b/tests/visual/output/default/toolbar-components-rtl.png
index cec9753bb0d..a7eedbe00fd 100644
Binary files a/tests/visual/output/default/toolbar-components-rtl.png and b/tests/visual/output/default/toolbar-components-rtl.png differ
diff --git a/tests/visual/output/default/toolbar-components.png b/tests/visual/output/default/toolbar-components.png
index 8c85b81fa7c..7b200613fa0 100644
Binary files a/tests/visual/output/default/toolbar-components.png and b/tests/visual/output/default/toolbar-components.png differ
diff --git a/tests/visual/output/material/gantt.png b/tests/visual/output/material/gantt.png
index 99b5c20907d..78d2bd76d1a 100644
Binary files a/tests/visual/output/material/gantt.png and b/tests/visual/output/material/gantt.png differ
diff --git a/tests/visual/output/material/splitter.png b/tests/visual/output/material/splitter.png
index a5cba4d55e4..84b4fe06a21 100644
Binary files a/tests/visual/output/material/splitter.png and b/tests/visual/output/material/splitter.png differ