diff --git a/packages/material/scss/_variables.scss b/packages/material/scss/_variables.scss
index fe3bf36f460..b65d4f5052e 100644
--- a/packages/material/scss/_variables.scss
+++ b/packages/material/scss/_variables.scss
@@ -14,6 +14,8 @@ $kendo-use-input-button-width: false !default;
 $kendo-use-input-spinner-width: false !default;
 $kendo-use-input-spinner-icon-offset: false !default;
 
+$kendo-auto-bootstrap: true !default;
+
 
 // Spacing
 $kendo-spacing: (
diff --git a/packages/material/scss/action-buttons/_index.scss b/packages/material/scss/action-buttons/_index.scss
index e0684d85bb2..092a313ea8d 100644
--- a/packages/material/scss/action-buttons/_index.scss
+++ b/packages/material/scss/action-buttons/_index.scss
@@ -18,3 +18,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-actions--styles() {
+    @include module-render( "actions" ) {
+        @include kendo-actions--layout();
+        @include kendo-actions--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-actions--styles();
+}
diff --git a/packages/material/scss/action-buttons/_layout.scss b/packages/material/scss/action-buttons/_layout.scss
index 0209fd141a4..ae2d2e26495 100644
--- a/packages/material/scss/action-buttons/_layout.scss
+++ b/packages/material/scss/action-buttons/_layout.scss
@@ -1,7 +1,11 @@
 @import "@progress/kendo-theme-default/scss/action-buttons/_layout.scss";
 
-@include exports("action-buttons/layout/material") {
 
+@mixin kendo-actions--layout() {
+
+    @include kendo-actions--layout-base();
+
+    // Actions
     .k-actions {
 
         // Button
@@ -20,6 +24,7 @@
         .k-split-button {
             @include box-shadow( none );
         }
+
     }
 
 }
diff --git a/packages/material/scss/action-buttons/_theme.scss b/packages/material/scss/action-buttons/_theme.scss
index fdcee8c07a6..e3f3802dc34 100644
--- a/packages/material/scss/action-buttons/_theme.scss
+++ b/packages/material/scss/action-buttons/_theme.scss
@@ -1,7 +1,11 @@
 @import "@progress/kendo-theme-default/scss/action-buttons/_theme.scss";
 
-@include exports("action-buttons/theme/material") {
 
+@mixin kendo-actions--theme() {
+
+    @include kendo-actions--theme-base();
+
+    // Actions
     .k-actions {
 
         .k-button-solid-base {
diff --git a/packages/material/scss/action-buttons/_variables.scss b/packages/material/scss/action-buttons/_variables.scss
index 75bd3938e2a..4d1582fd9a9 100644
--- a/packages/material/scss/action-buttons/_variables.scss
+++ b/packages/material/scss/action-buttons/_variables.scss
@@ -1,3 +1,6 @@
+@import "../button/_variables.scss";
+
+
 // Actions
 $kendo-actions-margin-top: k-map-get( $kendo-spacing, 4 ) !default;
 $kendo-actions-padding-x: k-map-get( $kendo-spacing, 2 ) !default;
diff --git a/packages/material/scss/action-sheet/_index.scss b/packages/material/scss/action-sheet/_index.scss
index 6776ebcb238..9260b8e6445 100644
--- a/packages/material/scss/action-sheet/_index.scss
+++ b/packages/material/scss/action-sheet/_index.scss
@@ -23,3 +23,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-action-sheet--styles() {
+    @include module-render( "action-sheet" ) {
+        @include kendo-action-sheet--layout();
+        @include kendo-action-sheet--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-action-sheet--styles();
+}
diff --git a/packages/material/scss/action-sheet/_layout.scss b/packages/material/scss/action-sheet/_layout.scss
index 5f417234c9c..7ad88946722 100644
--- a/packages/material/scss/action-sheet/_layout.scss
+++ b/packages/material/scss/action-sheet/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/action-sheet/_layout.scss";
+
+
+@mixin kendo-action-sheet--layout() {
+    @include kendo-action-sheet--layout-base();
+}
diff --git a/packages/material/scss/action-sheet/_theme.scss b/packages/material/scss/action-sheet/_theme.scss
index e74d95a6848..81ea0b1a6ff 100644
--- a/packages/material/scss/action-sheet/_theme.scss
+++ b/packages/material/scss/action-sheet/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/action-sheet/_theme.scss";
+
+
+@mixin kendo-action-sheet--theme() {
+    @include kendo-action-sheet--theme-base();
+}
diff --git a/packages/material/scss/adaptive/_index.scss b/packages/material/scss/adaptive/_index.scss
index dd60ff1a008..6d67a118947 100644
--- a/packages/material/scss/adaptive/_index.scss
+++ b/packages/material/scss/adaptive/_index.scss
@@ -27,3 +27,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-adaptive--styles() {
+    @include module-render( "adaptive" ) {
+        @include kendo-adaptive--layout();
+        @include kendo-adaptive--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-adaptive--styles();
+}
diff --git a/packages/material/scss/adaptive/_layout.scss b/packages/material/scss/adaptive/_layout.scss
index 21922358f96..ef4193815a9 100644
--- a/packages/material/scss/adaptive/_layout.scss
+++ b/packages/material/scss/adaptive/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/adaptive/_layout.scss";
+
+
+@mixin kendo-adaptive--layout() {
+    @include kendo-adaptive--layout-base();
+}
diff --git a/packages/material/scss/adaptive/_theme.scss b/packages/material/scss/adaptive/_theme.scss
index 58c4780e9e3..4c10d2d4ae1 100644
--- a/packages/material/scss/adaptive/_theme.scss
+++ b/packages/material/scss/adaptive/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/adaptive/_theme.scss";
+
+
+@mixin kendo-adaptive--theme() {
+    @include kendo-adaptive--theme-base();
+}
diff --git a/packages/material/scss/all.scss b/packages/material/scss/all.scss
index eb273a52f76..25ed8ba7b7f 100644
--- a/packages/material/scss/all.scss
+++ b/packages/material/scss/all.scss
@@ -1 +1,7 @@
 @import "./index.scss";
+
+
+@if not $kendo-auto-bootstrap {
+    @include kendo-theme--config();
+    @include kendo-theme--styles();
+}
diff --git a/packages/material/scss/appbar/_index.scss b/packages/material/scss/appbar/_index.scss
index 4b008e7e7db..f5b0071a252 100644
--- a/packages/material/scss/appbar/_index.scss
+++ b/packages/material/scss/appbar/_index.scss
@@ -17,3 +17,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-appbar--styles() {
+    @include module-render( "appbar" ) {
+        @include kendo-appbar--layout();
+        @include kendo-appbar--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-appbar--styles();
+}
diff --git a/packages/material/scss/appbar/_layout.scss b/packages/material/scss/appbar/_layout.scss
index 62a9640ee2e..afa7778401d 100644
--- a/packages/material/scss/appbar/_layout.scss
+++ b/packages/material/scss/appbar/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/appbar/_layout.scss";
+
+
+@mixin kendo-appbar--layout() {
+    @include kendo-appbar--layout-base();
+}
diff --git a/packages/material/scss/appbar/_theme.scss b/packages/material/scss/appbar/_theme.scss
index 09f37650428..e050c4ba8ff 100644
--- a/packages/material/scss/appbar/_theme.scss
+++ b/packages/material/scss/appbar/_theme.scss
@@ -1,2 +1,6 @@
 @import "@progress/kendo-theme-default/scss/appbar/_theme.scss";
 
+
+@mixin kendo-appbar--theme() {
+    @include kendo-appbar--theme-base();
+}
diff --git a/packages/material/scss/autocomplete/_index.scss b/packages/material/scss/autocomplete/_index.scss
index b670f358179..32fa04fb0c2 100644
--- a/packages/material/scss/autocomplete/_index.scss
+++ b/packages/material/scss/autocomplete/_index.scss
@@ -27,3 +27,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-autocomplete--styles() {
+    @include module-render( "autocomplete" ) {
+        @include kendo-autocomplete--layout();
+        @include kendo-autocomplete--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-autocomplete--styles();
+}
diff --git a/packages/material/scss/autocomplete/_layout.scss b/packages/material/scss/autocomplete/_layout.scss
index fd4c42272c6..2b505531532 100644
--- a/packages/material/scss/autocomplete/_layout.scss
+++ b/packages/material/scss/autocomplete/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/autocomplete/_layout.scss";
+
+
+@mixin kendo-autocomplete--layout() {
+    @include kendo-autocomplete--layout-base();
+}
diff --git a/packages/material/scss/autocomplete/_theme.scss b/packages/material/scss/autocomplete/_theme.scss
index 0ae9d67d500..beeae4533b3 100644
--- a/packages/material/scss/autocomplete/_theme.scss
+++ b/packages/material/scss/autocomplete/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/autocomplete/_theme.scss";
+
+
+@mixin kendo-autocomplete--theme() {
+    @include kendo-autocomplete--theme-base();
+}
diff --git a/packages/material/scss/avatar/_index.scss b/packages/material/scss/avatar/_index.scss
index 77e054347ab..4a6ba224931 100644
--- a/packages/material/scss/avatar/_index.scss
+++ b/packages/material/scss/avatar/_index.scss
@@ -17,3 +17,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-avatar--styles() {
+    @include module-render( "avatar" ) {
+        @include kendo-avatar--layout();
+        @include kendo-avatar--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-avatar--styles();
+}
diff --git a/packages/material/scss/avatar/_layout.scss b/packages/material/scss/avatar/_layout.scss
index e9f3b9a91f0..4b0f93e04d2 100644
--- a/packages/material/scss/avatar/_layout.scss
+++ b/packages/material/scss/avatar/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/avatar/_layout.scss";
+
+
+@mixin kendo-avatar--layout() {
+    @include kendo-avatar--layout-base();
+}
diff --git a/packages/material/scss/avatar/_theme.scss b/packages/material/scss/avatar/_theme.scss
index 7613e6b2be1..c7cc03ec834 100644
--- a/packages/material/scss/avatar/_theme.scss
+++ b/packages/material/scss/avatar/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/avatar/_theme.scss";
+
+
+@mixin kendo-avatar--theme() {
+    @include kendo-avatar--theme-base();
+}
diff --git a/packages/material/scss/badge/_index.scss b/packages/material/scss/badge/_index.scss
index f1d80a32e63..6bd13526e07 100644
--- a/packages/material/scss/badge/_index.scss
+++ b/packages/material/scss/badge/_index.scss
@@ -21,3 +21,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-badge--styles() {
+    @include module-render( "badge" ) {
+        @include kendo-badge--layout();
+        @include kendo-badge--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-badge--styles();
+}
diff --git a/packages/material/scss/badge/_layout.scss b/packages/material/scss/badge/_layout.scss
index 85e89f7f8da..6d3e6eb77c2 100644
--- a/packages/material/scss/badge/_layout.scss
+++ b/packages/material/scss/badge/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/badge/_layout.scss";
+
+
+@mixin kendo-badge--layout() {
+    @include kendo-badge--layout-base();
+}
diff --git a/packages/material/scss/badge/_theme.scss b/packages/material/scss/badge/_theme.scss
index aa79bc89428..b80e60c98eb 100644
--- a/packages/material/scss/badge/_theme.scss
+++ b/packages/material/scss/badge/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/badge/_theme.scss";
+
+
+@mixin kendo-badge--theme() {
+    @include kendo-badge--theme-base();
+}
diff --git a/packages/material/scss/bottom-navigation/_index.scss b/packages/material/scss/bottom-navigation/_index.scss
index 305104c8817..d6fdea31429 100644
--- a/packages/material/scss/bottom-navigation/_index.scss
+++ b/packages/material/scss/bottom-navigation/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-bottom-navigation--styles() {
+    @include module-render( "bottom-navigation" ) {
+        @include kendo-bottom-navigation--layout();
+        @include kendo-bottom-navigation--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-bottom-navigation--styles();
+}
diff --git a/packages/material/scss/bottom-navigation/_layout.scss b/packages/material/scss/bottom-navigation/_layout.scss
index c785bf4a935..e3a5acb6a9a 100644
--- a/packages/material/scss/bottom-navigation/_layout.scss
+++ b/packages/material/scss/bottom-navigation/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/bottom-navigation/_layout.scss";
+
+
+@mixin kendo-bottom-navigation--layout() {
+    @include kendo-bottom-navigation--layout-base();
+}
diff --git a/packages/material/scss/bottom-navigation/_theme.scss b/packages/material/scss/bottom-navigation/_theme.scss
index 0e3af6da8e9..28b117e2251 100644
--- a/packages/material/scss/bottom-navigation/_theme.scss
+++ b/packages/material/scss/bottom-navigation/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/bottom-navigation/_theme.scss";
+
+
+@mixin kendo-bottom-navigation--theme() {
+    @include kendo-bottom-navigation--theme-base();
+}
diff --git a/packages/material/scss/breadcrumb/_index.scss b/packages/material/scss/breadcrumb/_index.scss
index a59dd9bf460..1b8b7044a56 100644
--- a/packages/material/scss/breadcrumb/_index.scss
+++ b/packages/material/scss/breadcrumb/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-breadcrumb--styles() {
+    @include module-render( "breadcrumb" ) {
+        @include kendo-breadcrumb--layout();
+        @include kendo-breadcrumb--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-breadcrumb--styles();
+}
diff --git a/packages/material/scss/breadcrumb/_layout.scss b/packages/material/scss/breadcrumb/_layout.scss
index 4813bad51b0..1495feb2cd2 100644
--- a/packages/material/scss/breadcrumb/_layout.scss
+++ b/packages/material/scss/breadcrumb/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/breadcrumb/_layout.scss";
+
+
+@mixin kendo-breadcrumb--layout() {
+    @include kendo-breadcrumb--layout-base();
+}
diff --git a/packages/material/scss/breadcrumb/_theme.scss b/packages/material/scss/breadcrumb/_theme.scss
index 633b68b3613..69a95fd5da6 100644
--- a/packages/material/scss/breadcrumb/_theme.scss
+++ b/packages/material/scss/breadcrumb/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/breadcrumb/_theme.scss";
+
+
+@mixin kendo-breadcrumb--theme() {
+    @include kendo-breadcrumb--theme-base();
+}
diff --git a/packages/material/scss/button/_index.scss b/packages/material/scss/button/_index.scss
index c7f0ce5d2dc..59b4369e3b8 100644
--- a/packages/material/scss/button/_index.scss
+++ b/packages/material/scss/button/_index.scss
@@ -21,3 +21,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-button--styles() {
+    @include module-render( "button" ) {
+        @include kendo-button--layout();
+        @include kendo-button--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-button--styles();
+}
diff --git a/packages/material/scss/button/_layout.scss b/packages/material/scss/button/_layout.scss
index bd0dfbd990d..a334640c870 100644
--- a/packages/material/scss/button/_layout.scss
+++ b/packages/material/scss/button/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/button/_layout.scss";
 
-@include exports("button/layout/material") {
+
+@mixin kendo-button--layout() {
+
+    @include kendo-button--layout-base();
 
     // Button
     .k-button {
diff --git a/packages/material/scss/button/_theme.scss b/packages/material/scss/button/_theme.scss
index 9390795405c..6e73350b854 100644
--- a/packages/material/scss/button/_theme.scss
+++ b/packages/material/scss/button/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/button/_theme.scss";
 
-@include exports( "button/theme/material" ) {
+
+@mixin kendo-button--theme() {
+
+    @include kendo-button--theme-base();
 
     // Solid button
     @each $name, $color in $kendo-button-theme-colors {
diff --git a/packages/material/scss/calendar/_index.scss b/packages/material/scss/calendar/_index.scss
index a457ebca0bd..e844473f32b 100644
--- a/packages/material/scss/calendar/_index.scss
+++ b/packages/material/scss/calendar/_index.scss
@@ -24,3 +24,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-calendar--styles() {
+    @include module-render( "calendar" ) {
+        @include kendo-calendar--layout();
+        @include kendo-calendar--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-calendar--styles();
+}
diff --git a/packages/material/scss/calendar/_layout.scss b/packages/material/scss/calendar/_layout.scss
index a67e16c0bd2..9fc912d74bb 100644
--- a/packages/material/scss/calendar/_layout.scss
+++ b/packages/material/scss/calendar/_layout.scss
@@ -1,7 +1,11 @@
 @import "@progress/kendo-theme-default/scss/calendar/_layout.scss";
 
-@include exports ( "calendar/layout/material" ) {
 
+@mixin kendo-calendar--layout() {
+
+    @include kendo-calendar--layout-base();
+
+    // Calendar
     .k-calendar {
 
         .k-title,
diff --git a/packages/material/scss/calendar/_theme.scss b/packages/material/scss/calendar/_theme.scss
index 9266e64bf7a..d6b8e95af9a 100644
--- a/packages/material/scss/calendar/_theme.scss
+++ b/packages/material/scss/calendar/_theme.scss
@@ -1,7 +1,11 @@
 @import "@progress/kendo-theme-default/scss/calendar/_theme.scss";
 
-@include exports("calendar/theme/material") {
 
+@mixin kendo-calendar--theme() {
+
+    @include kendo-calendar--theme-base();
+
+    // Calendar
     .k-calendar {
 
         .k-focus .k-link {
@@ -20,4 +24,5 @@
         }
 
     }
+
 }
diff --git a/packages/material/scss/captcha/_index.scss b/packages/material/scss/captcha/_index.scss
index 2cdcefaf76c..26f1105d6ea 100644
--- a/packages/material/scss/captcha/_index.scss
+++ b/packages/material/scss/captcha/_index.scss
@@ -17,8 +17,6 @@ $_kendo-module-meta: (
 );
 
 
-
-
 // Dependencies
 // @import "../utils/_index.scss";
 @import "../common/_index.scss";
@@ -33,3 +31,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-captcha--styles() {
+    @include module-render( "captcha" ) {
+        @include kendo-captcha--layout();
+        @include kendo-captcha--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-captcha--styles();
+}
diff --git a/packages/material/scss/captcha/_layout.scss b/packages/material/scss/captcha/_layout.scss
index 52c2285f6a0..4b967343d9f 100644
--- a/packages/material/scss/captcha/_layout.scss
+++ b/packages/material/scss/captcha/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/captcha/_layout.scss";
+
+
+@mixin kendo-captcha--layout() {
+    @include kendo-captcha--layout-base();
+}
diff --git a/packages/material/scss/captcha/_theme.scss b/packages/material/scss/captcha/_theme.scss
index a28c6cccd90..5bd3d4e1ad3 100644
--- a/packages/material/scss/captcha/_theme.scss
+++ b/packages/material/scss/captcha/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/captcha/_theme.scss";
+
+
+@mixin kendo-captcha--theme() {
+    @include kendo-captcha--theme-base();
+}
diff --git a/packages/material/scss/card/_index.scss b/packages/material/scss/card/_index.scss
index b0a830e088f..64252bc174d 100644
--- a/packages/material/scss/card/_index.scss
+++ b/packages/material/scss/card/_index.scss
@@ -27,3 +27,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-card--styles() {
+    @include module-render( "card" ) {
+        @include kendo-card--layout();
+        @include kendo-card--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-card--styles();
+}
diff --git a/packages/material/scss/card/_layout.scss b/packages/material/scss/card/_layout.scss
index 5cbbc95ceb3..aae22298785 100644
--- a/packages/material/scss/card/_layout.scss
+++ b/packages/material/scss/card/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/card/_layout.scss";
+
+
+@mixin kendo-card--layout() {
+    @include kendo-card--layout-base();
+}
diff --git a/packages/material/scss/card/_theme.scss b/packages/material/scss/card/_theme.scss
index d240422b0db..272cfdde52e 100644
--- a/packages/material/scss/card/_theme.scss
+++ b/packages/material/scss/card/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/card/_theme.scss";
+
+
+@mixin kendo-card--theme() {
+    @include kendo-card--theme-base();
+}
diff --git a/packages/material/scss/chat/_index.scss b/packages/material/scss/chat/_index.scss
index 85746e63545..a24a9d3b6cd 100644
--- a/packages/material/scss/chat/_index.scss
+++ b/packages/material/scss/chat/_index.scss
@@ -27,3 +27,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-chat--styles() {
+    @include module-render( "chat" ) {
+        @include kendo-chat--layout();
+        @include kendo-chat--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-chat--styles();
+}
diff --git a/packages/material/scss/chat/_layout.scss b/packages/material/scss/chat/_layout.scss
index 9c14224aadd..0a93102fc22 100644
--- a/packages/material/scss/chat/_layout.scss
+++ b/packages/material/scss/chat/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/chat/_layout.scss";
+
+
+@mixin kendo-chat--layout() {
+    @include kendo-chat--layout-base();
+}
diff --git a/packages/material/scss/chat/_theme.scss b/packages/material/scss/chat/_theme.scss
index 21d893fc091..5ecfbb1a98c 100644
--- a/packages/material/scss/chat/_theme.scss
+++ b/packages/material/scss/chat/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/chat/_theme.scss";
+
+
+@mixin kendo-chat--theme() {
+    @include kendo-chat--theme-base();
+}
diff --git a/packages/material/scss/checkbox/_index.scss b/packages/material/scss/checkbox/_index.scss
index 087f7255c65..07077776155 100644
--- a/packages/material/scss/checkbox/_index.scss
+++ b/packages/material/scss/checkbox/_index.scss
@@ -16,3 +16,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-checkbox--styles() {
+    @include module-render( "checkbox" ) {
+        @include kendo-checkbox--layout();
+        @include kendo-checkbox--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-checkbox--styles();
+}
diff --git a/packages/material/scss/checkbox/_layout.scss b/packages/material/scss/checkbox/_layout.scss
index c1d772bbffa..c0d1dac0a65 100644
--- a/packages/material/scss/checkbox/_layout.scss
+++ b/packages/material/scss/checkbox/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/checkbox/_layout.scss";
+
+
+@mixin kendo-checkbox--layout() {
+    @include kendo-checkbox--layout-base();
+}
diff --git a/packages/material/scss/checkbox/_theme.scss b/packages/material/scss/checkbox/_theme.scss
index a6fe4bb8de9..26be9c66218 100644
--- a/packages/material/scss/checkbox/_theme.scss
+++ b/packages/material/scss/checkbox/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/checkbox/_theme.scss";
 
-@include exports( "checkbox/theme/material" ) {
+
+@mixin kendo-checkbox--theme() {
+
+    @include kendo-checkbox--theme-base();
 
     // Checkbox
     .k-checkbox-label {
diff --git a/packages/material/scss/chip/_index.scss b/packages/material/scss/chip/_index.scss
index 94c32099f7f..491daacc780 100644
--- a/packages/material/scss/chip/_index.scss
+++ b/packages/material/scss/chip/_index.scss
@@ -20,3 +20,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-chip--styles() {
+    @include module-render( "chip" ) {
+        @include kendo-chip--layout();
+        @include kendo-chip--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-chip--styles();
+}
diff --git a/packages/material/scss/chip/_layout.scss b/packages/material/scss/chip/_layout.scss
index bfc4ec74ae4..27c70349837 100644
--- a/packages/material/scss/chip/_layout.scss
+++ b/packages/material/scss/chip/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/chip/_layout.scss";
+
+
+@mixin kendo-chip--layout() {
+    @include kendo-chip--layout-base();
+}
diff --git a/packages/material/scss/chip/_theme.scss b/packages/material/scss/chip/_theme.scss
index fb684bbb910..8da3fc722b6 100644
--- a/packages/material/scss/chip/_theme.scss
+++ b/packages/material/scss/chip/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/chip/_theme.scss";
 
-@include exports( "chip/theme/material" ) {
+
+@mixin kendo-chip--theme() {
+
+    @include kendo-chip--theme-base();
 
     // Solid
     .k-chip-solid {
diff --git a/packages/material/scss/color-preview/_index.scss b/packages/material/scss/color-preview/_index.scss
index f1c88200c42..5715f4eb5a9 100644
--- a/packages/material/scss/color-preview/_index.scss
+++ b/packages/material/scss/color-preview/_index.scss
@@ -9,8 +9,6 @@ $_kendo-module-meta: (
 );
 
 
-
-
 // Dependencies
 
 
@@ -19,3 +17,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-color-preview--styles() {
+    @include module-render( "color-preview" ) {
+        @include kendo-color-preview--layout();
+        @include kendo-color-preview--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-color-preview--styles();
+}
diff --git a/packages/material/scss/color-preview/_layout.scss b/packages/material/scss/color-preview/_layout.scss
index a81b1676dba..df9025e634a 100644
--- a/packages/material/scss/color-preview/_layout.scss
+++ b/packages/material/scss/color-preview/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/color-preview/_layout.scss";
+
+
+@mixin kendo-color-preview--layout() {
+    @include kendo-color-preview--layout-base();
+}
diff --git a/packages/material/scss/color-preview/_theme.scss b/packages/material/scss/color-preview/_theme.scss
index 1de18223676..b1f8738bcae 100644
--- a/packages/material/scss/color-preview/_theme.scss
+++ b/packages/material/scss/color-preview/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/color-preview/_theme.scss";
+
+
+@mixin kendo-color-preview--theme() {
+    @include kendo-color-preview--theme-base();
+}
diff --git a/packages/material/scss/coloreditor/_index.scss b/packages/material/scss/coloreditor/_index.scss
index 5e33870c933..7a3c5c24475 100644
--- a/packages/material/scss/coloreditor/_index.scss
+++ b/packages/material/scss/coloreditor/_index.scss
@@ -26,3 +26,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-color-editor--styles() {
+    @include module-render( "color-editor" ) {
+        @include kendo-color-editor--layout();
+        @include kendo-color-editor--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-color-editor--styles();
+}
diff --git a/packages/material/scss/coloreditor/_layout.scss b/packages/material/scss/coloreditor/_layout.scss
index c88d82aec12..8ff9d3c47f2 100644
--- a/packages/material/scss/coloreditor/_layout.scss
+++ b/packages/material/scss/coloreditor/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/coloreditor/_layout.scss";
+
+
+@mixin kendo-color-editor--layout() {
+    @include kendo-color-editor--layout-base();
+}
diff --git a/packages/material/scss/coloreditor/_theme.scss b/packages/material/scss/coloreditor/_theme.scss
index 754222eb523..38b727dbfc9 100644
--- a/packages/material/scss/coloreditor/_theme.scss
+++ b/packages/material/scss/coloreditor/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/coloreditor/_theme.scss";
+
+
+@mixin kendo-color-editor--theme() {
+    @include kendo-color-editor--theme-base();
+}
diff --git a/packages/material/scss/colorgradient/_index.scss b/packages/material/scss/colorgradient/_index.scss
index 623d7705ded..8d15e79897a 100644
--- a/packages/material/scss/colorgradient/_index.scss
+++ b/packages/material/scss/colorgradient/_index.scss
@@ -28,7 +28,24 @@ $_kendo-module-meta: (
 
 
 // Component
-@import "./images/alpha-slider-bgr.scss";
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-color-gradient--styles() {
+    @include module-render( "color-gradient" ) {
+        @include kendo-color-gradient--layout();
+        @include kendo-color-gradient--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-color-gradient--styles();
+}
diff --git a/packages/material/scss/colorgradient/_layout.scss b/packages/material/scss/colorgradient/_layout.scss
index 98258044938..e0f502f8e59 100644
--- a/packages/material/scss/colorgradient/_layout.scss
+++ b/packages/material/scss/colorgradient/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/colorgradient/_layout.scss";
+
+
+@mixin kendo-color-gradient--layout() {
+    @include kendo-color-gradient--layout-base();
+}
diff --git a/packages/material/scss/colorgradient/_theme.scss b/packages/material/scss/colorgradient/_theme.scss
index f3e522f0b0a..70ca9de9008 100644
--- a/packages/material/scss/colorgradient/_theme.scss
+++ b/packages/material/scss/colorgradient/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/colorgradient/_theme.scss";
+
+
+@mixin kendo-color-gradient--theme() {
+    @include kendo-color-gradient--theme-base();
+}
diff --git a/packages/material/scss/colorgradient/_variables.scss b/packages/material/scss/colorgradient/_variables.scss
index c6c85f23bbc..53af6a3e436 100644
--- a/packages/material/scss/colorgradient/_variables.scss
+++ b/packages/material/scss/colorgradient/_variables.scss
@@ -1,3 +1,6 @@
+@import "./images/alpha-slider-bgr.scss";
+
+
 // ColorGradient
 $kendo-color-gradient-spacer: k-map-get( $kendo-spacing, 3 ) !default;
 
diff --git a/packages/material/scss/colorpalette/_index.scss b/packages/material/scss/colorpalette/_index.scss
index 79b7302baa2..43f36abfd02 100644
--- a/packages/material/scss/colorpalette/_index.scss
+++ b/packages/material/scss/colorpalette/_index.scss
@@ -20,3 +20,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-color-palette--styles() {
+    @include module-render( "color-palette" ) {
+        @include kendo-color-palette--layout();
+        @include kendo-color-palette--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-color-palette--styles();
+}
diff --git a/packages/material/scss/colorpalette/_layout.scss b/packages/material/scss/colorpalette/_layout.scss
index 6c275337846..c5fcfc0dbdf 100644
--- a/packages/material/scss/colorpalette/_layout.scss
+++ b/packages/material/scss/colorpalette/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/colorpalette/_layout.scss";
+
+
+@mixin kendo-color-palette--layout() {
+    @include kendo-color-palette--layout-base();
+}
diff --git a/packages/material/scss/colorpalette/_theme.scss b/packages/material/scss/colorpalette/_theme.scss
index 73ffc8925b4..d6897237186 100644
--- a/packages/material/scss/colorpalette/_theme.scss
+++ b/packages/material/scss/colorpalette/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/colorpalette/_theme.scss";
+
+
+@mixin kendo-color-palette--theme() {
+    @include kendo-color-palette--theme-base();
+}
diff --git a/packages/material/scss/colorpicker/_index.scss b/packages/material/scss/colorpicker/_index.scss
index 16beadb7056..424885b23aa 100644
--- a/packages/material/scss/colorpicker/_index.scss
+++ b/packages/material/scss/colorpicker/_index.scss
@@ -27,3 +27,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-color-picker--styles() {
+    @include module-render( "color-picker" ) {
+        @include kendo-color-picker--layout();
+        @include kendo-color-picker--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-color-picker--styles();
+}
diff --git a/packages/material/scss/colorpicker/_layout.scss b/packages/material/scss/colorpicker/_layout.scss
index 30567073342..9dcef3ac45a 100644
--- a/packages/material/scss/colorpicker/_layout.scss
+++ b/packages/material/scss/colorpicker/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/colorpicker/_layout.scss";
+
+
+@mixin kendo-color-picker--layout() {
+    @include kendo-color-picker--layout-base();
+}
diff --git a/packages/material/scss/colorpicker/_theme.scss b/packages/material/scss/colorpicker/_theme.scss
index cf74d4653d3..af7819e7b7a 100644
--- a/packages/material/scss/colorpicker/_theme.scss
+++ b/packages/material/scss/colorpicker/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/colorpicker/_theme.scss";
+
+
+@mixin kendo-color-picker--theme() {
+    @include kendo-color-picker--theme-base();
+}
diff --git a/packages/material/scss/combobox/_index.scss b/packages/material/scss/combobox/_index.scss
index 1748eb3a6fb..7b2bd8d940d 100644
--- a/packages/material/scss/combobox/_index.scss
+++ b/packages/material/scss/combobox/_index.scss
@@ -27,3 +27,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-combobox--styles() {
+    @include module-render( "combobox" ) {
+        @include kendo-combobox--layout();
+        @include kendo-combobox--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-combobox--styles();
+}
diff --git a/packages/material/scss/combobox/_layout.scss b/packages/material/scss/combobox/_layout.scss
index a79d78a3771..e8c8cc8a311 100644
--- a/packages/material/scss/combobox/_layout.scss
+++ b/packages/material/scss/combobox/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/combobox/_layout.scss";
+
+
+@mixin kendo-combobox--layout() {
+    @include kendo-combobox--layout-base();
+}
diff --git a/packages/material/scss/combobox/_theme.scss b/packages/material/scss/combobox/_theme.scss
index 58f7c173903..351d92c0dbc 100644
--- a/packages/material/scss/combobox/_theme.scss
+++ b/packages/material/scss/combobox/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/combobox/_theme.scss";
+
+
+@mixin kendo-combobox--theme() {
+    @include kendo-combobox--theme-base();
+}
diff --git a/packages/material/scss/dataviz/_index.scss b/packages/material/scss/dataviz/_index.scss
index ebd12ec691d..95603751d58 100644
--- a/packages/material/scss/dataviz/_index.scss
+++ b/packages/material/scss/dataviz/_index.scss
@@ -23,3 +23,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-dataviz--styles() {
+    @include module-render( "dataviz" ) {
+        @include kendo-dataviz--layout();
+        @include kendo-dataviz--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-dataviz--styles();
+}
diff --git a/packages/material/scss/dataviz/_layout.scss b/packages/material/scss/dataviz/_layout.scss
index 6cebdff9d90..2e56d31cdad 100644
--- a/packages/material/scss/dataviz/_layout.scss
+++ b/packages/material/scss/dataviz/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/dataviz/_layout.scss";
+
+
+@mixin kendo-dataviz--layout() {
+    @include kendo-dataviz--layout-base();
+}
diff --git a/packages/material/scss/dataviz/_theme.scss b/packages/material/scss/dataviz/_theme.scss
index a72e4c2b390..b5aec582e6f 100644
--- a/packages/material/scss/dataviz/_theme.scss
+++ b/packages/material/scss/dataviz/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/dataviz/_theme.scss";
+
+
+@mixin kendo-dataviz--theme() {
+    @include kendo-dataviz--theme-base();
+}
diff --git a/packages/material/scss/dateinput/_index.scss b/packages/material/scss/dateinput/_index.scss
index 9b5eeeac7ef..9b71721e0db 100644
--- a/packages/material/scss/dateinput/_index.scss
+++ b/packages/material/scss/dateinput/_index.scss
@@ -20,3 +20,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-date-input--styles() {
+    @include module-render( "date-input" ) {
+        @include kendo-date-input--layout();
+        @include kendo-date-input--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-date-input--styles();
+}
diff --git a/packages/material/scss/dateinput/_layout.scss b/packages/material/scss/dateinput/_layout.scss
index ef8f4411d57..72f09fe487b 100644
--- a/packages/material/scss/dateinput/_layout.scss
+++ b/packages/material/scss/dateinput/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/dateinput/_layout.scss";
+
+
+@mixin kendo-date-input--layout() {
+    @include kendo-date-input--layout-base();
+}
diff --git a/packages/material/scss/dateinput/_theme.scss b/packages/material/scss/dateinput/_theme.scss
index c494c04cd54..702d3ea8e15 100644
--- a/packages/material/scss/dateinput/_theme.scss
+++ b/packages/material/scss/dateinput/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/dateinput/_theme.scss";
+
+
+@mixin kendo-date-input--theme() {
+    @include kendo-date-input--theme-base();
+}
diff --git a/packages/material/scss/datepicker/_index.scss b/packages/material/scss/datepicker/_index.scss
index 7eb43c07134..cc3362fe047 100644
--- a/packages/material/scss/datepicker/_index.scss
+++ b/packages/material/scss/datepicker/_index.scss
@@ -24,3 +24,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-date-picker--styles() {
+    @include module-render( "date-picker" ) {
+        @include kendo-date-picker--layout();
+        @include kendo-date-picker--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-date-picker--styles();
+}
diff --git a/packages/material/scss/datepicker/_layout.scss b/packages/material/scss/datepicker/_layout.scss
index af93d2559e7..a2288f63f73 100644
--- a/packages/material/scss/datepicker/_layout.scss
+++ b/packages/material/scss/datepicker/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/datepicker/_layout.scss";
+
+
+@mixin kendo-date-picker--layout() {
+    @include kendo-date-picker--layout-base();
+}
diff --git a/packages/material/scss/datepicker/_theme.scss b/packages/material/scss/datepicker/_theme.scss
index 7d9f05d05cc..2b197a1b19f 100644
--- a/packages/material/scss/datepicker/_theme.scss
+++ b/packages/material/scss/datepicker/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/datepicker/_theme.scss";
+
+
+@mixin kendo-date-picker--theme() {
+    @include kendo-date-picker--theme-base();
+}
diff --git a/packages/material/scss/daterangepicker/_index.scss b/packages/material/scss/daterangepicker/_index.scss
index e6ae5f4dd65..0ab711d7296 100644
--- a/packages/material/scss/daterangepicker/_index.scss
+++ b/packages/material/scss/daterangepicker/_index.scss
@@ -16,8 +16,6 @@ $_kendo-module-meta: (
 );
 
 
-
-
 // Dependencies
 @import "../common/_index.scss";
 @import "../input/_index.scss";
@@ -30,3 +28,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-date-range-picker--styles() {
+    @include module-render( "date-range-picker" ) {
+        @include kendo-date-range-picker--layout();
+        @include kendo-date-range-picker--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-date-range-picker--styles();
+}
diff --git a/packages/material/scss/daterangepicker/_layout.scss b/packages/material/scss/daterangepicker/_layout.scss
index 514a69ae489..4370036e921 100644
--- a/packages/material/scss/daterangepicker/_layout.scss
+++ b/packages/material/scss/daterangepicker/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/daterangepicker/_layout.scss";
+
+
+@mixin kendo-date-range-picker--layout() {
+    @include kendo-date-range-picker--layout-base();
+}
diff --git a/packages/material/scss/daterangepicker/_theme.scss b/packages/material/scss/daterangepicker/_theme.scss
index 9779b5af6ca..808ba27e461 100644
--- a/packages/material/scss/daterangepicker/_theme.scss
+++ b/packages/material/scss/daterangepicker/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/daterangepicker/_theme.scss";
+
+
+@mixin kendo-date-range-picker--theme() {
+    @include kendo-date-range-picker--theme-base();
+}
diff --git a/packages/material/scss/datetimepicker/_index.scss b/packages/material/scss/datetimepicker/_index.scss
index 7836edca8db..50c1d0a4122 100644
--- a/packages/material/scss/datetimepicker/_index.scss
+++ b/packages/material/scss/datetimepicker/_index.scss
@@ -32,3 +32,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-date-time-picker--styles() {
+    @include module-render( "date-time-picker" ) {
+        @include kendo-date-time-picker--layout();
+        @include kendo-date-time-picker--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-date-time-picker--styles();
+}
diff --git a/packages/material/scss/datetimepicker/_layout.scss b/packages/material/scss/datetimepicker/_layout.scss
index d2407c922cd..7f2ce4771ee 100644
--- a/packages/material/scss/datetimepicker/_layout.scss
+++ b/packages/material/scss/datetimepicker/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/datetimepicker/_layout.scss";
+
+
+@mixin kendo-date-time-picker--layout() {
+    @include kendo-date-time-picker--layout-base();
+}
diff --git a/packages/material/scss/datetimepicker/_theme.scss b/packages/material/scss/datetimepicker/_theme.scss
index dfb2a4e5def..f064ebf3577 100644
--- a/packages/material/scss/datetimepicker/_theme.scss
+++ b/packages/material/scss/datetimepicker/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/datetimepicker/_theme.scss";
+
+
+@mixin kendo-date-time-picker--theme() {
+    @include kendo-date-time-picker--theme-base();
+}
diff --git a/packages/material/scss/dialog/_index.scss b/packages/material/scss/dialog/_index.scss
index ea768e6edcc..3694b042237 100644
--- a/packages/material/scss/dialog/_index.scss
+++ b/packages/material/scss/dialog/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-dialog--styles() {
+    @include module-render( "dialog" ) {
+        @include kendo-dialog--layout();
+        @include kendo-dialog--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-dialog--styles();
+}
diff --git a/packages/material/scss/dialog/_layout.scss b/packages/material/scss/dialog/_layout.scss
index 927dea0c04c..30d4fb463ad 100644
--- a/packages/material/scss/dialog/_layout.scss
+++ b/packages/material/scss/dialog/_layout.scss
@@ -1,7 +1,11 @@
 @import "@progress/kendo-theme-default/scss/dialog/_layout.scss";
 
-@include exports("dialog/layout/material") {
 
+@mixin kendo-dialog--layout() {
+
+    @include kendo-dialog--layout-base();
+
+    // Dialog
     .k-dialog-content.k-scroll {
         border-width: 1px 0;
         border-style: solid;
diff --git a/packages/material/scss/dialog/_theme.scss b/packages/material/scss/dialog/_theme.scss
index 960d4520c70..33e543cb1f3 100644
--- a/packages/material/scss/dialog/_theme.scss
+++ b/packages/material/scss/dialog/_theme.scss
@@ -1,5 +1,11 @@
-@include exports("dialog/theme") {
+@import "@progress/kendo-theme-default/scss/dialog/_theme.scss";
 
+
+@mixin kendo-dialog--theme() {
+
+    @include kendo-dialog--theme-base();
+
+    // Dialog
     .k-dialog {}
 
 
@@ -17,5 +23,4 @@
         border-color: $kendo-component-border;
     }
 
-
 }
diff --git a/packages/material/scss/draggable/_index.scss b/packages/material/scss/draggable/_index.scss
index a92ab96a395..c450ce1f1bf 100644
--- a/packages/material/scss/draggable/_index.scss
+++ b/packages/material/scss/draggable/_index.scss
@@ -16,3 +16,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-draggable--styles() {
+    @include module-render( "draggable" ) {
+        @include kendo-draggable--layout();
+        @include kendo-draggable--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-draggable--styles();
+}
diff --git a/packages/material/scss/draggable/_layout.scss b/packages/material/scss/draggable/_layout.scss
index f34e3e5a49f..5663dfbacaf 100644
--- a/packages/material/scss/draggable/_layout.scss
+++ b/packages/material/scss/draggable/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/draggable/_layout.scss";
+
+
+@mixin kendo-draggable--layout() {
+    @include kendo-draggable--layout-base();
+}
diff --git a/packages/material/scss/draggable/_theme.scss b/packages/material/scss/draggable/_theme.scss
index 5a574cc89d9..543fc040ee4 100644
--- a/packages/material/scss/draggable/_theme.scss
+++ b/packages/material/scss/draggable/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/draggable/_theme.scss";
+
+
+@mixin kendo-draggable--theme() {
+    @include kendo-draggable--theme-base();
+}
diff --git a/packages/material/scss/drawer/_index.scss b/packages/material/scss/drawer/_index.scss
index 4371b5d0da4..9b5db0770c2 100644
--- a/packages/material/scss/drawer/_index.scss
+++ b/packages/material/scss/drawer/_index.scss
@@ -24,3 +24,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-drawer--styles() {
+    @include module-render( "drawer" ) {
+        @include kendo-drawer--layout();
+        @include kendo-drawer--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-drawer--styles();
+}
diff --git a/packages/material/scss/drawer/_layout.scss b/packages/material/scss/drawer/_layout.scss
index c389d445383..93851f90e2a 100644
--- a/packages/material/scss/drawer/_layout.scss
+++ b/packages/material/scss/drawer/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/drawer/_layout.scss";
+
+
+@mixin kendo-drawer--layout() {
+    @include kendo-drawer--layout-base();
+}
diff --git a/packages/material/scss/drawer/_theme.scss b/packages/material/scss/drawer/_theme.scss
index 8a8a6da2fbf..308c9a702a5 100644
--- a/packages/material/scss/drawer/_theme.scss
+++ b/packages/material/scss/drawer/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/drawer/_theme.scss";
 
-@include exports( "drawer/theme/material" ) {
+
+@mixin kendo-drawer--theme() {
+
+    @include kendo-drawer--theme-base();
 
     .k-drawer-item {
         &.k-selected {
diff --git a/packages/material/scss/dropdowngrid/_index.scss b/packages/material/scss/dropdowngrid/_index.scss
index 505384f57d7..10f38b06266 100644
--- a/packages/material/scss/dropdowngrid/_index.scss
+++ b/packages/material/scss/dropdowngrid/_index.scss
@@ -27,3 +27,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-dropdown-grid--styles() {
+    @include module-render( "dropdown-grid" ) {
+        @include kendo-dropdown-grid--layout();
+        @include kendo-dropdown-grid--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-dropdown-grid--styles();
+}
diff --git a/packages/material/scss/dropdowngrid/_layout.scss b/packages/material/scss/dropdowngrid/_layout.scss
index 8830b68298f..9ce75b064ef 100644
--- a/packages/material/scss/dropdowngrid/_layout.scss
+++ b/packages/material/scss/dropdowngrid/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/dropdowngrid/_layout.scss";
+
+
+@mixin kendo-dropdown-grid--layout() {
+    @include kendo-dropdown-grid--layout-base();
+}
diff --git a/packages/material/scss/dropdowngrid/_theme.scss b/packages/material/scss/dropdowngrid/_theme.scss
index 058f5cee50d..796fd15a17b 100644
--- a/packages/material/scss/dropdowngrid/_theme.scss
+++ b/packages/material/scss/dropdowngrid/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/dropdowngrid/_theme.scss";
+
+
+@mixin kendo-dropdown-grid--theme() {
+    @include kendo-dropdown-grid--theme-base();
+}
diff --git a/packages/material/scss/dropdownlist/_index.scss b/packages/material/scss/dropdownlist/_index.scss
index 03ad55780c5..7f7860585cc 100644
--- a/packages/material/scss/dropdownlist/_index.scss
+++ b/packages/material/scss/dropdownlist/_index.scss
@@ -26,3 +26,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-dropdown-list--styles() {
+    @include module-render( "dropdown-list" ) {
+        @include kendo-dropdown-list--layout();
+        @include kendo-dropdown-list--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-dropdown-list--styles();
+}
diff --git a/packages/material/scss/dropdownlist/_layout.scss b/packages/material/scss/dropdownlist/_layout.scss
index a878412d8c4..1ffbc9ab775 100644
--- a/packages/material/scss/dropdownlist/_layout.scss
+++ b/packages/material/scss/dropdownlist/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/dropdownlist/_layout.scss";
+
+
+@mixin kendo-dropdown-list--layout() {
+    @include kendo-dropdown-list--layout-base();
+}
diff --git a/packages/material/scss/dropdownlist/_theme.scss b/packages/material/scss/dropdownlist/_theme.scss
index 940e3ddd782..8bcf9e3863b 100644
--- a/packages/material/scss/dropdownlist/_theme.scss
+++ b/packages/material/scss/dropdownlist/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/dropdownlist/_theme.scss";
+
+
+@mixin kendo-dropdown-list--theme() {
+    @include kendo-dropdown-list--theme-base();
+}
diff --git a/packages/material/scss/dropdowntree/_index.scss b/packages/material/scss/dropdowntree/_index.scss
index 0f48305112b..0a2f1d8cb76 100644
--- a/packages/material/scss/dropdowntree/_index.scss
+++ b/packages/material/scss/dropdowntree/_index.scss
@@ -26,3 +26,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-dropdown-tree--styles() {
+    @include module-render( "dropdown-tree" ) {
+        @include kendo-dropdown-tree--layout();
+        @include kendo-dropdown-tree--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-dropdown-tree--styles();
+}
diff --git a/packages/material/scss/dropdowntree/_layout.scss b/packages/material/scss/dropdowntree/_layout.scss
index e470dc8d620..8e64dd10046 100644
--- a/packages/material/scss/dropdowntree/_layout.scss
+++ b/packages/material/scss/dropdowntree/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/dropdowntree/_layout.scss";
+
+
+@mixin kendo-dropdown-tree--layout() {
+    @include kendo-dropdown-tree--layout-base();
+}
diff --git a/packages/material/scss/dropdowntree/_theme.scss b/packages/material/scss/dropdowntree/_theme.scss
index 5185d14dd7e..3ba3dc38ef1 100644
--- a/packages/material/scss/dropdowntree/_theme.scss
+++ b/packages/material/scss/dropdowntree/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/dropdowntree/_theme.scss";
+
+
+@mixin kendo-dropdown-tree--theme() {
+    @include kendo-dropdown-tree--theme-base();
+}
diff --git a/packages/material/scss/dropzone/_index.scss b/packages/material/scss/dropzone/_index.scss
index 62d592d45d1..5e75304a804 100644
--- a/packages/material/scss/dropzone/_index.scss
+++ b/packages/material/scss/dropzone/_index.scss
@@ -17,3 +17,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-dropzone--styles() {
+    @include module-render( "dropzone" ) {
+        @include kendo-dropzone--layout();
+        @include kendo-dropzone--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-dropzone--styles();
+}
diff --git a/packages/material/scss/dropzone/_layout.scss b/packages/material/scss/dropzone/_layout.scss
index 15ff0380407..8ae50f513d0 100644
--- a/packages/material/scss/dropzone/_layout.scss
+++ b/packages/material/scss/dropzone/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/dropzone/_layout.scss";
+
+
+@mixin kendo-dropzone--layout() {
+    @include kendo-dropzone--layout-base();
+}
diff --git a/packages/material/scss/dropzone/_theme.scss b/packages/material/scss/dropzone/_theme.scss
index 6c57d4a3309..5105b0ad0c1 100644
--- a/packages/material/scss/dropzone/_theme.scss
+++ b/packages/material/scss/dropzone/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/dropzone/_theme.scss";
+
+
+@mixin kendo-dropzone--theme() {
+    @include kendo-dropzone--theme-base();
+}
diff --git a/packages/material/scss/editor/_index.scss b/packages/material/scss/editor/_index.scss
index 228d00245ff..34ff166bc8c 100644
--- a/packages/material/scss/editor/_index.scss
+++ b/packages/material/scss/editor/_index.scss
@@ -36,3 +36,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-editor--styles() {
+    @include module-render( "editor" ) {
+        @include kendo-editor--layout();
+        @include kendo-editor--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-editor--styles();
+}
diff --git a/packages/material/scss/editor/_layout.scss b/packages/material/scss/editor/_layout.scss
index 4d57489ff3e..cb5f7779560 100644
--- a/packages/material/scss/editor/_layout.scss
+++ b/packages/material/scss/editor/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/editor/_layout.scss";
 
-@include exports("editor/layout/material") {
+
+@mixin kendo-editor--layout() {
+
+    @include kendo-editor--layout-base();
 
     // Insert table
     .k-ct-popup {
diff --git a/packages/material/scss/editor/_theme.scss b/packages/material/scss/editor/_theme.scss
index ad9bfa3b56d..a4e40590a48 100644
--- a/packages/material/scss/editor/_theme.scss
+++ b/packages/material/scss/editor/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/editor/_theme.scss";
+
+
+@mixin kendo-editor--theme() {
+    @include kendo-editor--theme-base();
+}
diff --git a/packages/material/scss/expansion-panel/_index.scss b/packages/material/scss/expansion-panel/_index.scss
index 517798def0a..06643ae8c61 100644
--- a/packages/material/scss/expansion-panel/_index.scss
+++ b/packages/material/scss/expansion-panel/_index.scss
@@ -25,3 +25,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-expander--styles() {
+    @include module-render( "expander" ) {
+        @include kendo-expander--layout();
+        @include kendo-expander--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-expander--styles();
+}
diff --git a/packages/material/scss/expansion-panel/_layout.scss b/packages/material/scss/expansion-panel/_layout.scss
index 2e8aacb6d1e..f2745cfbdf8 100644
--- a/packages/material/scss/expansion-panel/_layout.scss
+++ b/packages/material/scss/expansion-panel/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/expansion-panel/_layout.scss";
+
+
+@mixin kendo-expander--layout() {
+    @include kendo-expander--layout-base();
+}
diff --git a/packages/material/scss/expansion-panel/_theme.scss b/packages/material/scss/expansion-panel/_theme.scss
index 251cd8f6d0c..50c441ec00f 100644
--- a/packages/material/scss/expansion-panel/_theme.scss
+++ b/packages/material/scss/expansion-panel/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/expansion-panel/_theme.scss";
+
+
+@mixin kendo-expander--theme() {
+    @include kendo-expander--theme-base();
+}
diff --git a/packages/material/scss/fab/_index.scss b/packages/material/scss/fab/_index.scss
index 8e7d56f388b..8b28c8c52d1 100644
--- a/packages/material/scss/fab/_index.scss
+++ b/packages/material/scss/fab/_index.scss
@@ -26,3 +26,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-fab--styles() {
+    @include module-render( "fab" ) {
+        @include kendo-fab--layout();
+        @include kendo-fab--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-fab--styles();
+}
diff --git a/packages/material/scss/fab/_layout.scss b/packages/material/scss/fab/_layout.scss
index 4892728ea4e..b67d986b136 100644
--- a/packages/material/scss/fab/_layout.scss
+++ b/packages/material/scss/fab/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/fab/_layout.scss";
 
-@include exports("fab/layout/material") {
+
+@mixin kendo-fab--layout() {
+
+    @include kendo-fab--layout-base();
 
     .k-fab-text {
         text-transform: uppercase;
diff --git a/packages/material/scss/fab/_theme.scss b/packages/material/scss/fab/_theme.scss
index 3488ebc0e38..5aab4e1b393 100644
--- a/packages/material/scss/fab/_theme.scss
+++ b/packages/material/scss/fab/_theme.scss
@@ -1,4 +1,7 @@
-@include exports( "fab/theme/material" ) {
+@import "@progress/kendo-theme-default/scss/fab/_theme.scss";
+
+
+@mixin kendo-fab--theme() {
 
     // Normal state
     @each $name, $color in $kendo-fab-theme-colors {
@@ -110,4 +113,5 @@
     .k-animation-container > .k-fab-popup {
         @include box-shadow( none );
     }
+
 }
diff --git a/packages/material/scss/filemanager/_index.scss b/packages/material/scss/filemanager/_index.scss
index 97f13711ea3..9557386ddbd 100644
--- a/packages/material/scss/filemanager/_index.scss
+++ b/packages/material/scss/filemanager/_index.scss
@@ -40,3 +40,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-file-manager--styles() {
+    @include module-render( "file-manager" ) {
+        @include kendo-file-manager--layout();
+        @include kendo-file-manager--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-file-manager--styles();
+}
diff --git a/packages/material/scss/filemanager/_layout.scss b/packages/material/scss/filemanager/_layout.scss
index 0273fc0ec5e..0deeac773ac 100644
--- a/packages/material/scss/filemanager/_layout.scss
+++ b/packages/material/scss/filemanager/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/filemanager/_layout.scss";
+
+
+@mixin kendo-file-manager--layout() {
+    @include kendo-file-manager--layout-base();
+}
diff --git a/packages/material/scss/filemanager/_theme.scss b/packages/material/scss/filemanager/_theme.scss
index a7c96170cab..73571ac2ed0 100644
--- a/packages/material/scss/filemanager/_theme.scss
+++ b/packages/material/scss/filemanager/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/filemanager/_theme.scss";
+
+
+@mixin kendo-file-manager--theme() {
+    @include kendo-file-manager--theme-base();
+}
diff --git a/packages/material/scss/filter/_index.scss b/packages/material/scss/filter/_index.scss
index 97ed5111079..dc251a2429d 100644
--- a/packages/material/scss/filter/_index.scss
+++ b/packages/material/scss/filter/_index.scss
@@ -32,3 +32,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-filter--styles() {
+    @include module-render( "filter" ) {
+        @include kendo-filter--layout();
+        @include kendo-filter--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-filter--styles();
+}
diff --git a/packages/material/scss/filter/_layout.scss b/packages/material/scss/filter/_layout.scss
index ad5b2feee87..4283331d123 100644
--- a/packages/material/scss/filter/_layout.scss
+++ b/packages/material/scss/filter/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/filter/_layout.scss";
+
+
+@mixin kendo-filter--layout() {
+    @include kendo-filter--layout-base();
+}
diff --git a/packages/material/scss/filter/_theme.scss b/packages/material/scss/filter/_theme.scss
index 82446ed87ea..18476d81f56 100644
--- a/packages/material/scss/filter/_theme.scss
+++ b/packages/material/scss/filter/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/filter/_theme.scss";
+
+
+@mixin kendo-filter--theme() {
+    @include kendo-filter--theme-base();
+}
diff --git a/packages/material/scss/floating-label/_index.scss b/packages/material/scss/floating-label/_index.scss
index 39aa2d86c21..ae6dc23b0a4 100644
--- a/packages/material/scss/floating-label/_index.scss
+++ b/packages/material/scss/floating-label/_index.scss
@@ -20,3 +20,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-floating-label--styles() {
+    @include module-render( "floating-label" ) {
+        @include kendo-floating-label--layout();
+        @include kendo-floating-label--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-floating-label--styles();
+}
diff --git a/packages/material/scss/floating-label/_layout.scss b/packages/material/scss/floating-label/_layout.scss
index 6868a966239..e0554af4a3e 100644
--- a/packages/material/scss/floating-label/_layout.scss
+++ b/packages/material/scss/floating-label/_layout.scss
@@ -1,8 +1,9 @@
 @import "@progress/kendo-theme-default/scss/floating-label/_layout.scss";
 
 
-@include exports( "floating-label/layout/material" ) {
+@mixin kendo-floating-label--layout() {
 
+    @include kendo-floating-label--layout-base();
 
     // Floating label
     .k-floating-label-container {
diff --git a/packages/material/scss/floating-label/_theme.scss b/packages/material/scss/floating-label/_theme.scss
index 788641ca50a..acf1384c7b2 100644
--- a/packages/material/scss/floating-label/_theme.scss
+++ b/packages/material/scss/floating-label/_theme.scss
@@ -1,7 +1,9 @@
 @import "@progress/kendo-theme-default/scss/floating-label/_theme.scss";
 
 
-@include exports( "floating-label/theme/material" ) {
+@mixin kendo-floating-label--theme() {
+
+    @include kendo-floating-label--theme-base();
 
     // Floating label
     .k-floating-label-container {
diff --git a/packages/material/scss/forms/_index.scss b/packages/material/scss/forms/_index.scss
index adc35ac5c3d..d0781f081b4 100644
--- a/packages/material/scss/forms/_index.scss
+++ b/packages/material/scss/forms/_index.scss
@@ -23,3 +23,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-form--styles() {
+    @include module-render( "form" ) {
+        @include kendo-form--layout();
+        @include kendo-form--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-form--styles();
+}
diff --git a/packages/material/scss/forms/_layout.scss b/packages/material/scss/forms/_layout.scss
index 9a5bccdbd25..3c49f770e97 100644
--- a/packages/material/scss/forms/_layout.scss
+++ b/packages/material/scss/forms/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/forms/_layout.scss";
 
-@include exports("edit-form/layout/material") {
+
+@mixin kendo-form--layout() {
+
+    @include kendo-form--layout-base();
 
     // Fields
     .k-edit-label {
diff --git a/packages/material/scss/forms/_theme.scss b/packages/material/scss/forms/_theme.scss
index 7569f683fd0..8e9a53fa0fe 100644
--- a/packages/material/scss/forms/_theme.scss
+++ b/packages/material/scss/forms/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/forms/_theme.scss";
+
+
+@mixin kendo-form--theme() {
+    @include kendo-form--theme-base();
+}
diff --git a/packages/material/scss/gantt/_index.scss b/packages/material/scss/gantt/_index.scss
index 0ab1e91f862..4863d31a200 100644
--- a/packages/material/scss/gantt/_index.scss
+++ b/packages/material/scss/gantt/_index.scss
@@ -35,3 +35,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-gantt--styles() {
+    @include module-render( "gantt" ) {
+        @include kendo-gantt--layout();
+        @include kendo-gantt--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-gantt--styles();
+}
diff --git a/packages/material/scss/gantt/_layout.scss b/packages/material/scss/gantt/_layout.scss
index 171ea478ebe..3958c3a6179 100644
--- a/packages/material/scss/gantt/_layout.scss
+++ b/packages/material/scss/gantt/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/gantt/_layout.scss";
 
-@include exports("gantt/layout/material") {
+
+@mixin kendo-gantt--layout() {
+
+    @include kendo-gantt--layout-base();
 
     // Timeline
     .k-gantt-timeline {
diff --git a/packages/material/scss/gantt/_theme.scss b/packages/material/scss/gantt/_theme.scss
index ed116be4525..e97c5a0eab7 100644
--- a/packages/material/scss/gantt/_theme.scss
+++ b/packages/material/scss/gantt/_theme.scss
@@ -1,7 +1,9 @@
 @import "@progress/kendo-theme-default/scss/gantt/_theme.scss";
 
-@include exports("gantt/theme/material") {
 
+@mixin kendo-gantt--theme() {
+
+    @include kendo-gantt--theme-base();
 
     // Timeline
     .k-gantt-timeline {
diff --git a/packages/material/scss/grid/_index.scss b/packages/material/scss/grid/_index.scss
index a657776faca..1227fe343c4 100644
--- a/packages/material/scss/grid/_index.scss
+++ b/packages/material/scss/grid/_index.scss
@@ -64,3 +64,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-grid--styles() {
+    @include module-render( "grid" ) {
+        @include kendo-grid--layout();
+        @include kendo-grid--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-grid--styles();
+}
diff --git a/packages/material/scss/grid/_layout.scss b/packages/material/scss/grid/_layout.scss
index d3462079400..3acf759df6b 100644
--- a/packages/material/scss/grid/_layout.scss
+++ b/packages/material/scss/grid/_layout.scss
@@ -1,7 +1,11 @@
 @import "@progress/kendo-theme-default/scss/grid/_layout.scss";
 
-@include exports ("grid/layout/material") {
 
+@mixin kendo-grid--layout() {
+
+    @include kendo-grid--layout-base();
+
+    // Grid
     .k-grid {
 
         .k-group-footer td,
@@ -14,6 +18,7 @@
         }
     }
 
+    // Grid header
     .k-grid-header {
 
         .k-table-th {
@@ -98,4 +103,5 @@
             }
         }
     }
+
 }
diff --git a/packages/material/scss/grid/_theme.scss b/packages/material/scss/grid/_theme.scss
index 1cba12441cf..0d5b345c078 100644
--- a/packages/material/scss/grid/_theme.scss
+++ b/packages/material/scss/grid/_theme.scss
@@ -1,6 +1,10 @@
 @import "@progress/kendo-theme-default/scss/grid/_theme.scss";
 
-@include exports ("grid/theme/material") {
+
+@mixin kendo-grid--theme() {
+
+    @include kendo-grid--theme-base();
+
     $kendo-grid-filter-button-focus: rgba( black, .12 ) !default;
 
     .k-grid {
@@ -240,4 +244,5 @@
             }
         }
     }
+
 }
diff --git a/packages/material/scss/icons/_index.scss b/packages/material/scss/icons/_index.scss
index f74c1ba047c..1c4b08c80dd 100644
--- a/packages/material/scss/icons/_index.scss
+++ b/packages/material/scss/icons/_index.scss
@@ -9,10 +9,25 @@ $_kendo-module-meta: (
 );
 
 
-// Dependencies
-@import "../common/_index.scss";
-
-
 // Component
+@import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-icon--styles() {
+    @include module-render( "icon" ) {
+        @include kendo-icon--layout();
+        @include kendo-icon--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-icon--styles();
+}
diff --git a/packages/material/scss/icons/_layout.scss b/packages/material/scss/icons/_layout.scss
index 941bb6f4877..adebd6267f2 100644
--- a/packages/material/scss/icons/_layout.scss
+++ b/packages/material/scss/icons/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/icons/_layout.scss";
+
+
+@mixin kendo-icon--layout() {
+    @include kendo-icon--layout-base();
+}
diff --git a/packages/material/scss/icons/_theme.scss b/packages/material/scss/icons/_theme.scss
index e69de29bb2d..7994b962627 100644
--- a/packages/material/scss/icons/_theme.scss
+++ b/packages/material/scss/icons/_theme.scss
@@ -0,0 +1,6 @@
+@import "@progress/kendo-theme-default/scss/icons/_theme.scss";
+
+
+@mixin kendo-icon--theme() {
+    @include kendo-icon--theme-base();
+}
diff --git a/packages/material/scss/icons/_variables.scss b/packages/material/scss/icons/_variables.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packages/material/scss/imageeditor/_index.scss b/packages/material/scss/imageeditor/_index.scss
index 6bb56c7d1ad..912e95c6485 100644
--- a/packages/material/scss/imageeditor/_index.scss
+++ b/packages/material/scss/imageeditor/_index.scss
@@ -28,3 +28,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-image-editor--styles() {
+    @include module-render( "image-editor" ) {
+        @include kendo-image-editor--layout();
+        @include kendo-image-editor--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-image-editor--styles();
+}
diff --git a/packages/material/scss/imageeditor/_layout.scss b/packages/material/scss/imageeditor/_layout.scss
index 01431f64132..2bde1513109 100644
--- a/packages/material/scss/imageeditor/_layout.scss
+++ b/packages/material/scss/imageeditor/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/imageeditor/_layout.scss";
+
+
+@mixin kendo-image-editor--layout() {
+    @include kendo-image-editor--layout-base();
+}
diff --git a/packages/material/scss/imageeditor/_theme.scss b/packages/material/scss/imageeditor/_theme.scss
index 2b29d1013f0..790eabfc7f5 100644
--- a/packages/material/scss/imageeditor/_theme.scss
+++ b/packages/material/scss/imageeditor/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/imageeditor/_theme.scss";
+
+
+@mixin kendo-image-editor--theme() {
+    @include kendo-image-editor--theme-base();
+}
diff --git a/packages/material/scss/index.scss b/packages/material/scss/index.scss
index 8b09d320731..ec4d686dcf5 100644
--- a/packages/material/scss/index.scss
+++ b/packages/material/scss/index.scss
@@ -29,7 +29,7 @@
 @import "./chip/_index.scss";
 @import "./color-preview/_index.scss";
 @import "./loader/_index.scss";
-// @import "/loading/_index.scss";
+// @import "./loading/_index.scss";
 @import "./skeleton/_index.scss";
 
 
@@ -70,6 +70,7 @@
 @import "./datepicker/_index.scss";
 @import "./timepicker/_index.scss";
 @import "./datetimepicker/_index.scss";
+@import "./timedurationpicker/_index.scss";
 @import "./daterangepicker/_index.scss";
 @import "./dropdowngrid/_index.scss";
 @import "./dropdownlist/_index.scss";
@@ -157,3 +158,172 @@
 @import "./map/_index.scss";
 @import "./orgchart/_index.scss";
 @import "./signature/_index.scss";
+
+
+// Configuration
+@mixin kendo-theme--config( $config: null ) {
+}
+
+
+// Styles
+@mixin kendo-theme--styles() {
+    // Core
+    @include kendo-core--styles();
+
+    // Color system
+
+    // Typography and utils
+    @include kendo-typography--styles();
+    @include kendo-utils--styles();
+
+
+    // Generic content
+    @include kendo-icon--styles();
+    @include kendo-messagebox--styles();
+
+
+    // Primitive components
+    @include kendo-actions--styles();
+    @include kendo-list--styles();
+    @include kendo-listgroup--styles();
+    @include kendo-overlay--styles();
+    @include kendo-popup--styles();
+    @include kendo-ripple--styles();
+    @include kendo-table--styles();
+    @include kendo-virtual-scroller--styles();
+
+
+    // Indicators
+    @include kendo-avatar--styles();
+    @include kendo-badge--styles();
+    @include kendo-chip--styles();
+    @include kendo-color-preview--styles();
+    @include kendo-loader--styles();
+    @include kendo-skeleton--styles();
+    @include kendo-tooltip--styles();
+
+
+    // Form helpers
+    @include kendo-form--styles();
+    @include kendo-validator--styles();
+    @include kendo-floating-label--styles();
+
+
+    // Native forms
+    @include kendo-button--styles();
+    @include kendo-split-button--styles();
+    @include kendo-menu-button--styles();
+    @include kendo-input--styles();
+    @include kendo-textbox--styles();
+    @include kendo-textarea--styles();
+    @include kendo-checkbox--styles();
+    @include kendo-listbox--styles();
+    @include kendo-progressbar--styles();
+    @include kendo-radio--styles();
+    @include kendo-slider--styles();
+
+
+    // Form requirements
+    @include kendo-calendar--styles();
+    @include kendo-time-selector--styles();
+
+
+    // Augmented forms
+    @include kendo-autocomplete--styles();
+    @include kendo-captcha--styles();
+    @include kendo-color-palette--styles();
+    @include kendo-color-gradient--styles();
+    @include kendo-color-editor--styles();
+    @include kendo-color-picker--styles();
+    @include kendo-combobox--styles();
+    @include kendo-date-input--styles();
+    @include kendo-date-picker--styles();
+    @include kendo-time-picker--styles();
+    @include kendo-time-duration-picker--styles();
+    @include kendo-date-time-picker--styles();
+    @include kendo-date-range-picker--styles();
+    @include kendo-dropdown-grid--styles();
+    @include kendo-dropdown-list--styles();
+    @include kendo-dropdown-tree--styles();
+    @include kendo-masked-textbox--styles();
+    @include kendo-multiselect--styles();
+    @include kendo-numeric-textbox--styles();
+    @include kendo-rating--styles();
+    @include kendo-searchbox--styles();
+    @include kendo-switch--styles();
+    @include kendo-upload--styles();
+    @include kendo-dropzone--styles();
+
+
+    // Command interfaces
+    @include kendo-appbar--styles();
+    @include kendo-fab--styles();
+    @include kendo-menu--styles();
+    @include kendo-toolbar--styles();
+
+
+    // Popups and modals
+    @include kendo-window--styles();
+    @include kendo-action-sheet--styles();
+    @include kendo-dialog--styles();
+    @include kendo-drawer--styles();
+    @include kendo-notification--styles();
+    @include kendo-popover--styles();
+    @include kendo-responsive-panel--styles();
+
+
+    // Navigation
+    @include kendo-bottom-navigation--styles();
+    @include kendo-breadcrumb--styles();
+    @include kendo-pager--styles();
+    @include kendo-stepper--styles();
+    @include kendo-tabstrip--styles();
+    @include kendo-treeview--styles();
+    @include kendo-wizard--styles();
+
+
+    // Layout & containers
+    @include kendo-card--styles();
+    @include kendo-expander--styles();
+    @include kendo-panelbar--styles();
+    @include kendo-splitter--styles();
+    @include kendo-tile-layout--styles();
+
+
+    // Data management
+    @include kendo-grid--styles();
+    @include kendo-listview--styles();
+    @include kendo-spreadsheet--styles();
+    @include kendo-pivotgrid--styles();
+    @include kendo-treelist--styles();
+    @include kendo-filter--styles();
+    @include kendo-file-manager--styles();
+    @include kendo-task-board--styles();
+
+
+    // Editors
+    @include kendo-editor--styles();
+    @include kendo-image-editor--styles();
+
+
+    // Scheduling
+    @include kendo-gantt--styles();
+    @include kendo-scheduler--styles();
+
+
+    // Misc
+    @include kendo-adaptive--styles();
+    @include kendo-chat--styles();
+    @include kendo-media-player--styles();
+    @include kendo-timeline--styles();
+    @include kendo-pdf-viewer--styles();
+    @include kendo-scroller--styles();
+    @include kendo-scrollview--styles();
+
+
+    // Dataviz
+    @include kendo-dataviz--styles();
+    @include kendo-map--styles();
+    @include kendo-orgchart--styles();
+    @include kendo-signature--styles();
+}
diff --git a/packages/material/scss/input/_index.scss b/packages/material/scss/input/_index.scss
index 4af426a3208..4efa1e3f56f 100644
--- a/packages/material/scss/input/_index.scss
+++ b/packages/material/scss/input/_index.scss
@@ -21,3 +21,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-input--styles() {
+    @include module-render( "input" ) {
+        @include kendo-input--layout();
+        @include kendo-input--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-input--styles();
+}
diff --git a/packages/material/scss/input/_layout.scss b/packages/material/scss/input/_layout.scss
index c712e61aec7..a9700192dcd 100644
--- a/packages/material/scss/input/_layout.scss
+++ b/packages/material/scss/input/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/input/_layout.scss";
 
-@include exports("input/layout/material") {
+
+@mixin kendo-input--layout() {
+
+    @include kendo-input--layout-base();
 
     // Fill mode
     .k-input-solid,
diff --git a/packages/material/scss/input/_theme.scss b/packages/material/scss/input/_theme.scss
index 3740d63bd2e..d81146eeb40 100644
--- a/packages/material/scss/input/_theme.scss
+++ b/packages/material/scss/input/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/input/_theme.scss";
+
+
+@mixin kendo-input--theme() {
+    @include kendo-input--theme-base();
+}
diff --git a/packages/material/scss/list/_index.scss b/packages/material/scss/list/_index.scss
index 105dbb70fed..95d3a8a8619 100644
--- a/packages/material/scss/list/_index.scss
+++ b/packages/material/scss/list/_index.scss
@@ -21,3 +21,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-list--styles() {
+    @include module-render( "list" ) {
+        @include kendo-list--layout();
+        @include kendo-list--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-list--styles();
+}
diff --git a/packages/material/scss/list/_layout.scss b/packages/material/scss/list/_layout.scss
index 771fd046f0b..e1cab3d9790 100644
--- a/packages/material/scss/list/_layout.scss
+++ b/packages/material/scss/list/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/list/_layout.scss";
+
+
+@mixin kendo-list--layout() {
+    @include kendo-list--layout-base();
+}
diff --git a/packages/material/scss/list/_theme.scss b/packages/material/scss/list/_theme.scss
index 9131b3cb62e..9d3647c2e46 100644
--- a/packages/material/scss/list/_theme.scss
+++ b/packages/material/scss/list/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/list/_theme.scss";
+
+
+@mixin kendo-list--theme() {
+    @include kendo-list--theme-base();
+}
diff --git a/packages/material/scss/listbox/_index.scss b/packages/material/scss/listbox/_index.scss
index e4bf1cfd71d..72401343d62 100644
--- a/packages/material/scss/listbox/_index.scss
+++ b/packages/material/scss/listbox/_index.scss
@@ -27,3 +27,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-listbox--styles() {
+    @include module-render( "listbox" ) {
+        @include kendo-listbox--layout();
+        @include kendo-listbox--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-listbox--styles();
+}
diff --git a/packages/material/scss/listbox/_layout.scss b/packages/material/scss/listbox/_layout.scss
index ce2217b6e6d..5e449ab1fb3 100644
--- a/packages/material/scss/listbox/_layout.scss
+++ b/packages/material/scss/listbox/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/listbox/_layout.scss";
 
-@include exports( "listbox/layout/material" ) {
+
+@mixin kendo-listbox--layout() {
+
+    @include kendo-listbox--layout-base();
 
     .k-listbox {
         .k-item {
diff --git a/packages/material/scss/listbox/_theme.scss b/packages/material/scss/listbox/_theme.scss
index c61676088c2..5f9f9421975 100644
--- a/packages/material/scss/listbox/_theme.scss
+++ b/packages/material/scss/listbox/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/listbox/_theme.scss";
+
+
+@mixin kendo-listbox--theme() {
+    @include kendo-listbox--theme-base();
+}
diff --git a/packages/material/scss/listgroup/_index.scss b/packages/material/scss/listgroup/_index.scss
index ff61bcdf110..e287ad5fd41 100644
--- a/packages/material/scss/listgroup/_index.scss
+++ b/packages/material/scss/listgroup/_index.scss
@@ -20,3 +20,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-listgroup--styles() {
+    @include module-render( "listgroup" ) {
+        @include kendo-listgroup--layout();
+        @include kendo-listgroup--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-listgroup--styles();
+}
diff --git a/packages/material/scss/listgroup/_layout.scss b/packages/material/scss/listgroup/_layout.scss
index 41b22267a47..b35d610e1f8 100644
--- a/packages/material/scss/listgroup/_layout.scss
+++ b/packages/material/scss/listgroup/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/listgroup/_layout.scss";
+
+
+@mixin kendo-listgroup--layout() {
+    @include kendo-listgroup--layout-base();
+}
diff --git a/packages/material/scss/listgroup/_theme.scss b/packages/material/scss/listgroup/_theme.scss
index 1bd2b92041b..7611908a4f8 100644
--- a/packages/material/scss/listgroup/_theme.scss
+++ b/packages/material/scss/listgroup/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/listgroup/_theme.scss";
+
+
+@mixin kendo-listgroup--theme() {
+    @include kendo-listgroup--theme-base();
+}
diff --git a/packages/material/scss/listview/_index.scss b/packages/material/scss/listview/_index.scss
index 6e10bd1332b..391e9600282 100644
--- a/packages/material/scss/listview/_index.scss
+++ b/packages/material/scss/listview/_index.scss
@@ -25,3 +25,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-listview--styles() {
+    @include module-render( "listview" ) {
+        @include kendo-listview--layout();
+        @include kendo-listview--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-listview--styles();
+}
diff --git a/packages/material/scss/listview/_layout.scss b/packages/material/scss/listview/_layout.scss
index 404e16f924b..dd054be08b0 100644
--- a/packages/material/scss/listview/_layout.scss
+++ b/packages/material/scss/listview/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/listview/_layout.scss";
+
+
+@mixin kendo-listview--layout() {
+    @include kendo-listview--layout-base();
+}
diff --git a/packages/material/scss/listview/_theme.scss b/packages/material/scss/listview/_theme.scss
index 193c132796d..eb49888a603 100644
--- a/packages/material/scss/listview/_theme.scss
+++ b/packages/material/scss/listview/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/listview/_theme.scss";
 
-@include exports( "listview/theme/material" ) {
+
+@mixin kendo-listview--theme() {
+
+    @include kendo-listview--theme-base();
 
     // Listview
     .k-listview {}
diff --git a/packages/material/scss/loader/_index.scss b/packages/material/scss/loader/_index.scss
index e2a92604e2d..33dbf22864d 100644
--- a/packages/material/scss/loader/_index.scss
+++ b/packages/material/scss/loader/_index.scss
@@ -20,3 +20,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-loader--styles() {
+    @include module-render( "loader" ) {
+        @include kendo-loader--layout();
+        @include kendo-loader--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-loader--styles();
+}
diff --git a/packages/material/scss/loader/_layout.scss b/packages/material/scss/loader/_layout.scss
index 512cdbac48c..62edf2ab15e 100644
--- a/packages/material/scss/loader/_layout.scss
+++ b/packages/material/scss/loader/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/loader/_layout.scss";
+
+
+@mixin kendo-loader--layout() {
+    @include kendo-loader--layout-base();
+}
diff --git a/packages/material/scss/loader/_theme.scss b/packages/material/scss/loader/_theme.scss
index 9d33028f370..4bcfd262b6f 100644
--- a/packages/material/scss/loader/_theme.scss
+++ b/packages/material/scss/loader/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/loader/_theme.scss";
+
+
+@mixin kendo-loader--theme() {
+    @include kendo-loader--theme-base();
+}
diff --git a/packages/material/scss/map/_index.scss b/packages/material/scss/map/_index.scss
index 2940b99b5c3..af682671f2c 100644
--- a/packages/material/scss/map/_index.scss
+++ b/packages/material/scss/map/_index.scss
@@ -24,6 +24,23 @@ $_kendo-module-meta: (
 
 // Component
 @import "./_variables.scss";
-@import "./images/markers.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-map--styles() {
+    @include module-render( "map" ) {
+        @include kendo-map--layout();
+        @include kendo-map--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-map--styles();
+}
diff --git a/packages/material/scss/map/_layout.scss b/packages/material/scss/map/_layout.scss
index 2fd71ba60d1..ccacbeece57 100644
--- a/packages/material/scss/map/_layout.scss
+++ b/packages/material/scss/map/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/map/_layout.scss";
+
+
+@mixin kendo-map--layout() {
+    @include kendo-map--layout-base();
+}
diff --git a/packages/material/scss/map/_theme.scss b/packages/material/scss/map/_theme.scss
index bfee7407533..b863f81e0a3 100644
--- a/packages/material/scss/map/_theme.scss
+++ b/packages/material/scss/map/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/map/_theme.scss";
+
+
+@mixin kendo-map--theme() {
+    @include kendo-map--theme-base();
+}
diff --git a/packages/material/scss/map/_variables.scss b/packages/material/scss/map/_variables.scss
index 40e412ec608..8c82352dda9 100644
--- a/packages/material/scss/map/_variables.scss
+++ b/packages/material/scss/map/_variables.scss
@@ -1,3 +1,6 @@
+@import "./images/markers.scss";
+
+
 // Map
 $kendo-map-border-width: 0px !default;
 
diff --git a/packages/material/scss/maskedtextbox/_index.scss b/packages/material/scss/maskedtextbox/_index.scss
index 63271f62866..13995ba048a 100644
--- a/packages/material/scss/maskedtextbox/_index.scss
+++ b/packages/material/scss/maskedtextbox/_index.scss
@@ -23,3 +23,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-masked-textbox--styles() {
+    @include module-render( "masked-textbox" ) {
+        @include kendo-masked-textbox--layout();
+        @include kendo-masked-textbox--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-masked-textbox--styles();
+}
diff --git a/packages/material/scss/maskedtextbox/_layout.scss b/packages/material/scss/maskedtextbox/_layout.scss
index 61d5c436fc5..39169958cb8 100644
--- a/packages/material/scss/maskedtextbox/_layout.scss
+++ b/packages/material/scss/maskedtextbox/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/maskedtextbox/_layout.scss";
+
+
+@mixin kendo-masked-textbox--layout() {
+    @include kendo-masked-textbox--layout-base();
+}
diff --git a/packages/material/scss/maskedtextbox/_theme.scss b/packages/material/scss/maskedtextbox/_theme.scss
index 4459aed7542..32ef4805fda 100644
--- a/packages/material/scss/maskedtextbox/_theme.scss
+++ b/packages/material/scss/maskedtextbox/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/maskedtextbox/_theme.scss";
+
+
+@mixin kendo-masked-textbox--theme() {
+    @include kendo-masked-textbox--theme-base();
+}
diff --git a/packages/material/scss/mediaplayer/_index.scss b/packages/material/scss/mediaplayer/_index.scss
index de236289404..28d7cb1925d 100644
--- a/packages/material/scss/mediaplayer/_index.scss
+++ b/packages/material/scss/mediaplayer/_index.scss
@@ -24,3 +24,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-media-player--styles() {
+    @include module-render( "media-player" ) {
+        @include kendo-media-player--layout();
+        @include kendo-media-player--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-media-player--styles();
+}
diff --git a/packages/material/scss/mediaplayer/_layout.scss b/packages/material/scss/mediaplayer/_layout.scss
index 38d1259c9c6..8a6e76d3ae9 100644
--- a/packages/material/scss/mediaplayer/_layout.scss
+++ b/packages/material/scss/mediaplayer/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/mediaplayer/_layout.scss";
+
+
+@mixin kendo-media-player--layout() {
+    @include kendo-media-player--layout-base();
+}
diff --git a/packages/material/scss/mediaplayer/_theme.scss b/packages/material/scss/mediaplayer/_theme.scss
index 54367713577..9c53f51ab86 100644
--- a/packages/material/scss/mediaplayer/_theme.scss
+++ b/packages/material/scss/mediaplayer/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/mediaplayer/_theme.scss";
+
+
+@mixin kendo-media-player--theme() {
+    @include kendo-media-player--theme-base();
+}
diff --git a/packages/material/scss/menu-button/_index.scss b/packages/material/scss/menu-button/_index.scss
index e45c8a24190..75d508b6b1f 100644
--- a/packages/material/scss/menu-button/_index.scss
+++ b/packages/material/scss/menu-button/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-menu-button--styles() {
+    @include module-render( "menu-button" ) {
+        @include kendo-menu-button--layout();
+        @include kendo-menu-button--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-menu-button--styles();
+}
diff --git a/packages/material/scss/menu-button/_layout.scss b/packages/material/scss/menu-button/_layout.scss
index 82a2dbed6dd..17960680715 100644
--- a/packages/material/scss/menu-button/_layout.scss
+++ b/packages/material/scss/menu-button/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/menu-button/_layout.scss";
+
+
+@mixin kendo-menu-button--layout() {
+    @include kendo-menu-button--layout-base();
+}
diff --git a/packages/material/scss/menu-button/_theme.scss b/packages/material/scss/menu-button/_theme.scss
index 695a510ab07..5102184feab 100644
--- a/packages/material/scss/menu-button/_theme.scss
+++ b/packages/material/scss/menu-button/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/menu-button/_theme.scss";
+
+
+@mixin kendo-menu-button--theme() {
+    @include kendo-menu-button--theme-base();
+}
diff --git a/packages/material/scss/menu/_index.scss b/packages/material/scss/menu/_index.scss
index acec534f5df..a3da7335e54 100644
--- a/packages/material/scss/menu/_index.scss
+++ b/packages/material/scss/menu/_index.scss
@@ -26,3 +26,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-menu--styles() {
+    @include module-render( "menu" ) {
+        @include kendo-menu--layout();
+        @include kendo-menu--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-menu--styles();
+}
diff --git a/packages/material/scss/menu/_layout.scss b/packages/material/scss/menu/_layout.scss
index 67fa30fa86c..77764650665 100644
--- a/packages/material/scss/menu/_layout.scss
+++ b/packages/material/scss/menu/_layout.scss
@@ -1,7 +1,11 @@
 @import "@progress/kendo-theme-default/scss/menu/_layout.scss";
 
-@include exports("menu/layout/material") {
 
+@mixin kendo-menu--layout() {
+
+    @include kendo-menu--layout-base();
+
+    // Menubar
     .k-menu:not(.k-context-menu) {
 
         // Root items
@@ -25,4 +29,5 @@
             height: calc( #{$kendo-line-height-em} + #{k-map-get( $kendo-spacing, 1 )});
         }
     }
+
 }
diff --git a/packages/material/scss/menu/_theme.scss b/packages/material/scss/menu/_theme.scss
index f576f4db289..62d9aacb3b5 100644
--- a/packages/material/scss/menu/_theme.scss
+++ b/packages/material/scss/menu/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/menu/_theme.scss";
 
-@include exports("menu/theme/material") {
+
+@mixin kendo-menu--theme() {
+
+    @include kendo-menu--theme-base();
 
     .k-menu:not(.k-context-menu) {
 
diff --git a/packages/material/scss/messagebox/_index.scss b/packages/material/scss/messagebox/_index.scss
index d28c2d56d81..386cccadfee 100644
--- a/packages/material/scss/messagebox/_index.scss
+++ b/packages/material/scss/messagebox/_index.scss
@@ -20,3 +20,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-messagebox--styles() {
+    @include module-render( "messagebox" ) {
+        @include kendo-messagebox--layout();
+        @include kendo-messagebox--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-messagebox--styles();
+}
diff --git a/packages/material/scss/messagebox/_layout.scss b/packages/material/scss/messagebox/_layout.scss
index c85e0f94808..20190561d04 100644
--- a/packages/material/scss/messagebox/_layout.scss
+++ b/packages/material/scss/messagebox/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/messagebox/_layout.scss";
+
+
+@mixin kendo-messagebox--layout() {
+    @include kendo-messagebox--layout-base();
+}
diff --git a/packages/material/scss/messagebox/_theme.scss b/packages/material/scss/messagebox/_theme.scss
index a0aceb23457..84519808b1d 100644
--- a/packages/material/scss/messagebox/_theme.scss
+++ b/packages/material/scss/messagebox/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/messagebox/_theme.scss";
+
+
+@mixin kendo-messagebox--theme() {
+    @include kendo-messagebox--theme-base();
+}
diff --git a/packages/material/scss/multiselect/_index.scss b/packages/material/scss/multiselect/_index.scss
index adba81c8005..44c0e3f4a88 100644
--- a/packages/material/scss/multiselect/_index.scss
+++ b/packages/material/scss/multiselect/_index.scss
@@ -31,3 +31,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-multiselect--styles() {
+    @include module-render( "multiselect" ) {
+        @include kendo-multiselect--layout();
+        @include kendo-multiselect--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-multiselect--styles();
+}
diff --git a/packages/material/scss/multiselect/_layout.scss b/packages/material/scss/multiselect/_layout.scss
index 827e2ca468b..bc37f17be6a 100644
--- a/packages/material/scss/multiselect/_layout.scss
+++ b/packages/material/scss/multiselect/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/multiselect/_layout.scss";
+
+
+@mixin kendo-multiselect--layout() {
+    @include kendo-multiselect--layout-base();
+}
diff --git a/packages/material/scss/multiselect/_theme.scss b/packages/material/scss/multiselect/_theme.scss
index a6ef8bbdf6a..fc1fe8124a3 100644
--- a/packages/material/scss/multiselect/_theme.scss
+++ b/packages/material/scss/multiselect/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/multiselect/_theme.scss";
+
+
+@mixin kendo-multiselect--theme() {
+    @include kendo-multiselect--theme-base();
+}
diff --git a/packages/material/scss/notification/_index.scss b/packages/material/scss/notification/_index.scss
index af4ded8fdad..f0aafe3441f 100644
--- a/packages/material/scss/notification/_index.scss
+++ b/packages/material/scss/notification/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-notification--styles() {
+    @include module-render( "notification" ) {
+        @include kendo-notification--layout();
+        @include kendo-notification--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-notification--styles();
+}
diff --git a/packages/material/scss/notification/_layout.scss b/packages/material/scss/notification/_layout.scss
index 8c21f3bec43..928addecf1e 100644
--- a/packages/material/scss/notification/_layout.scss
+++ b/packages/material/scss/notification/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/notification/_layout.scss";
+
+
+@mixin kendo-notification--layout() {
+    @include kendo-notification--layout-base();
+}
diff --git a/packages/material/scss/notification/_theme.scss b/packages/material/scss/notification/_theme.scss
index 393424df348..db1c2de83b0 100644
--- a/packages/material/scss/notification/_theme.scss
+++ b/packages/material/scss/notification/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/notification/_theme.scss";
+
+
+@mixin kendo-notification--theme() {
+    @include kendo-notification--theme-base();
+}
diff --git a/packages/material/scss/numerictextbox/_index.scss b/packages/material/scss/numerictextbox/_index.scss
index 065e4a5fc41..bc346242fc1 100644
--- a/packages/material/scss/numerictextbox/_index.scss
+++ b/packages/material/scss/numerictextbox/_index.scss
@@ -23,3 +23,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-numeric-textbox--styles() {
+    @include module-render( "numeric-textbox" ) {
+        @include kendo-numeric-textbox--layout();
+        @include kendo-numeric-textbox--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-numeric-textbox--styles();
+}
diff --git a/packages/material/scss/numerictextbox/_layout.scss b/packages/material/scss/numerictextbox/_layout.scss
index f33e4da114d..88a1b4007a4 100644
--- a/packages/material/scss/numerictextbox/_layout.scss
+++ b/packages/material/scss/numerictextbox/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/numerictextbox/_layout.scss";
+
+
+@mixin kendo-numeric-textbox--layout() {
+    @include kendo-numeric-textbox--layout-base();
+}
diff --git a/packages/material/scss/numerictextbox/_theme.scss b/packages/material/scss/numerictextbox/_theme.scss
index 5cb01d0909f..875522c7697 100644
--- a/packages/material/scss/numerictextbox/_theme.scss
+++ b/packages/material/scss/numerictextbox/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/numerictextbox/_theme.scss";
+
+
+@mixin kendo-numeric-textbox--theme() {
+    @include kendo-numeric-textbox--theme-base();
+}
diff --git a/packages/material/scss/orgchart/_index.scss b/packages/material/scss/orgchart/_index.scss
index c8e3b1187c9..24f4bd13e0b 100644
--- a/packages/material/scss/orgchart/_index.scss
+++ b/packages/material/scss/orgchart/_index.scss
@@ -35,3 +35,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-orgchart--styles() {
+    @include module-render( "orgchart" ) {
+        @include kendo-orgchart--layout();
+        @include kendo-orgchart--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-orgchart--styles();
+}
diff --git a/packages/material/scss/orgchart/_layout.scss b/packages/material/scss/orgchart/_layout.scss
index f48d66ba023..6b82e1a98e2 100644
--- a/packages/material/scss/orgchart/_layout.scss
+++ b/packages/material/scss/orgchart/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/orgchart/_layout.scss";
+
+
+@mixin kendo-orgchart--layout() {
+    @include kendo-orgchart--layout-base();
+}
diff --git a/packages/material/scss/orgchart/_theme.scss b/packages/material/scss/orgchart/_theme.scss
index 0581cd5ecb1..b721939fb16 100644
--- a/packages/material/scss/orgchart/_theme.scss
+++ b/packages/material/scss/orgchart/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/orgchart/_theme.scss";
+
+
+@mixin kendo-orgchart--theme() {
+    @include kendo-orgchart--theme-base();
+}
diff --git a/packages/material/scss/overlay/_index.scss b/packages/material/scss/overlay/_index.scss
index efc04227f1b..574836cc845 100644
--- a/packages/material/scss/overlay/_index.scss
+++ b/packages/material/scss/overlay/_index.scss
@@ -16,3 +16,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-overlay--styles() {
+    @include module-render( "overlay" ) {
+        @include kendo-overlay--layout();
+        @include kendo-overlay--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-overlay--styles();
+}
diff --git a/packages/material/scss/overlay/_layout.scss b/packages/material/scss/overlay/_layout.scss
index 4d799cd7db3..a8dd4616891 100644
--- a/packages/material/scss/overlay/_layout.scss
+++ b/packages/material/scss/overlay/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/overlay/_layout.scss";
+
+
+@mixin kendo-overlay--layout() {
+    @include kendo-overlay--layout-base();
+}
diff --git a/packages/material/scss/overlay/_theme.scss b/packages/material/scss/overlay/_theme.scss
index c8f3f209027..095dc9e08fd 100644
--- a/packages/material/scss/overlay/_theme.scss
+++ b/packages/material/scss/overlay/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/overlay/_theme.scss";
+
+
+@mixin kendo-overlay--theme() {
+    @include kendo-overlay--theme-base();
+}
diff --git a/packages/material/scss/pager/_index.scss b/packages/material/scss/pager/_index.scss
index 767a2d14a89..b3e3d244dd6 100644
--- a/packages/material/scss/pager/_index.scss
+++ b/packages/material/scss/pager/_index.scss
@@ -24,3 +24,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-pager--styles() {
+    @include module-render( "pager" ) {
+        @include kendo-pager--layout();
+        @include kendo-pager--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-pager--styles();
+}
diff --git a/packages/material/scss/pager/_layout.scss b/packages/material/scss/pager/_layout.scss
index 51da6a79e22..02fa203e9dc 100644
--- a/packages/material/scss/pager/_layout.scss
+++ b/packages/material/scss/pager/_layout.scss
@@ -1,7 +1,11 @@
 @import "@progress/kendo-theme-default/scss/pager/_layout.scss";
 
-@include exports("pager/layout/material") {
 
+@mixin kendo-pager--layout() {
+
+    @include kendo-pager--layout-base();
+
+    // Pager
     .k-pager {
 
         .k-pager-numbers-wrap {
diff --git a/packages/material/scss/pager/_theme.scss b/packages/material/scss/pager/_theme.scss
index 6474ecde644..c32025b2d8f 100644
--- a/packages/material/scss/pager/_theme.scss
+++ b/packages/material/scss/pager/_theme.scss
@@ -1,2 +1,6 @@
 @import "@progress/kendo-theme-default/scss/pager/_theme.scss";
 
+
+@mixin kendo-pager--theme() {
+    @include kendo-pager--theme-base();
+}
diff --git a/packages/material/scss/panelbar/_index.scss b/packages/material/scss/panelbar/_index.scss
index 60c290f707e..1a86be6fafc 100644
--- a/packages/material/scss/panelbar/_index.scss
+++ b/packages/material/scss/panelbar/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-panelbar--styles() {
+    @include module-render( "panelbar" ) {
+        @include kendo-panelbar--layout();
+        @include kendo-panelbar--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-panelbar--styles();
+}
diff --git a/packages/material/scss/panelbar/_layout.scss b/packages/material/scss/panelbar/_layout.scss
index b3725fe5fd5..831fb10f244 100644
--- a/packages/material/scss/panelbar/_layout.scss
+++ b/packages/material/scss/panelbar/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/panelbar/_layout.scss";
+
+
+@mixin kendo-panelbar--layout() {
+    @include kendo-panelbar--layout-base();
+}
diff --git a/packages/material/scss/panelbar/_theme.scss b/packages/material/scss/panelbar/_theme.scss
index 8b5afe24d73..6d9638f5695 100644
--- a/packages/material/scss/panelbar/_theme.scss
+++ b/packages/material/scss/panelbar/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/panelbar/_theme.scss";
+
+
+@mixin kendo-panelbar--theme() {
+    @include kendo-panelbar--theme-base();
+}
diff --git a/packages/material/scss/pdf-viewer/_index.scss b/packages/material/scss/pdf-viewer/_index.scss
index 759c9f0440e..4a00f827c71 100644
--- a/packages/material/scss/pdf-viewer/_index.scss
+++ b/packages/material/scss/pdf-viewer/_index.scss
@@ -33,3 +33,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-pdf-viewer--styles() {
+    @include module-render( "pdf-viewer" ) {
+        @include kendo-pdf-viewer--layout();
+        @include kendo-pdf-viewer--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-pdf-viewer--styles();
+}
diff --git a/packages/material/scss/pdf-viewer/_layout.scss b/packages/material/scss/pdf-viewer/_layout.scss
index 86db6937ac0..2e440e0890a 100644
--- a/packages/material/scss/pdf-viewer/_layout.scss
+++ b/packages/material/scss/pdf-viewer/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/pdf-viewer/_layout.scss";
+
+
+@mixin kendo-pdf-viewer--layout() {
+    @include kendo-pdf-viewer--layout-base();
+}
diff --git a/packages/material/scss/pdf-viewer/_theme.scss b/packages/material/scss/pdf-viewer/_theme.scss
index 40595ba5c1d..8f1d10d8a79 100644
--- a/packages/material/scss/pdf-viewer/_theme.scss
+++ b/packages/material/scss/pdf-viewer/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/pdf-viewer/_theme.scss";
+
+
+@mixin kendo-pdf-viewer--theme() {
+    @include kendo-pdf-viewer--theme-base();
+}
diff --git a/packages/material/scss/pivotgrid/_index.scss b/packages/material/scss/pivotgrid/_index.scss
index 7e8e12e9994..a8fc5bc6bac 100644
--- a/packages/material/scss/pivotgrid/_index.scss
+++ b/packages/material/scss/pivotgrid/_index.scss
@@ -32,3 +32,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-pivotgrid--styles() {
+    @include module-render( "pivotgrid" ) {
+        @include kendo-pivotgrid--layout();
+        @include kendo-pivotgrid--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-pivotgrid--styles();
+}
diff --git a/packages/material/scss/pivotgrid/_layout.scss b/packages/material/scss/pivotgrid/_layout.scss
index 6dd0286f748..f311bc6ac3e 100644
--- a/packages/material/scss/pivotgrid/_layout.scss
+++ b/packages/material/scss/pivotgrid/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/pivotgrid/_layout.scss";
 
-@include exports ("pivotgrid/layout/material/legacy") {
+
+@mixin kendo-pivotgrid--layout() {
+
+    @include kendo-pivotgrid--layout-base();
 
     .k-pivot-rowheaders .k-grid tr .k-grid-footer {
         border-bottom-width: 0;
diff --git a/packages/material/scss/pivotgrid/_theme.scss b/packages/material/scss/pivotgrid/_theme.scss
index e74c6c62313..b1089a64cb1 100644
--- a/packages/material/scss/pivotgrid/_theme.scss
+++ b/packages/material/scss/pivotgrid/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/pivotgrid/_theme.scss";
 
-@include exports("pivotgrid/theme/material") {
+
+@mixin kendo-pivotgrid--theme() {
+
+    @include kendo-pivotgrid--theme-base();
 
     // Hover and Focus state have the same bg color
     .k-pivotgrid-cell:focus,
diff --git a/packages/material/scss/popover/_index.scss b/packages/material/scss/popover/_index.scss
index 2b4a1aeeff4..0f2ae23710a 100644
--- a/packages/material/scss/popover/_index.scss
+++ b/packages/material/scss/popover/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-popover--styles() {
+    @include module-render( "popover" ) {
+        @include kendo-popover--layout();
+        @include kendo-popover--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-popover--styles();
+}
diff --git a/packages/material/scss/popover/_layout.scss b/packages/material/scss/popover/_layout.scss
index 362e38a9e43..c2ecca04bd8 100644
--- a/packages/material/scss/popover/_layout.scss
+++ b/packages/material/scss/popover/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/popover/_layout.scss";
+
+
+@mixin kendo-popover--layout() {
+    @include kendo-popover--layout-base();
+}
diff --git a/packages/material/scss/popover/_theme.scss b/packages/material/scss/popover/_theme.scss
index da3d2343a51..312435bac59 100644
--- a/packages/material/scss/popover/_theme.scss
+++ b/packages/material/scss/popover/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/popover/_theme.scss";
+
+
+@mixin kendo-popover--theme() {
+    @include kendo-popover--theme-base();
+}
diff --git a/packages/material/scss/popup/_index.scss b/packages/material/scss/popup/_index.scss
index 17216fee133..54e91e6d227 100644
--- a/packages/material/scss/popup/_index.scss
+++ b/packages/material/scss/popup/_index.scss
@@ -17,3 +17,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-popup--styles() {
+    @include module-render( "popup" ) {
+        @include kendo-popup--layout();
+        @include kendo-popup--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-popup--styles();
+}
diff --git a/packages/material/scss/popup/_layout.scss b/packages/material/scss/popup/_layout.scss
index cb904316d0d..8566ee58204 100644
--- a/packages/material/scss/popup/_layout.scss
+++ b/packages/material/scss/popup/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/popup/_layout.scss";
+
+
+@mixin kendo-popup--layout() {
+    @include kendo-popup--layout-base();
+}
diff --git a/packages/material/scss/popup/_theme.scss b/packages/material/scss/popup/_theme.scss
index 02ee5d89525..a0c9aa480c0 100644
--- a/packages/material/scss/popup/_theme.scss
+++ b/packages/material/scss/popup/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/popup/_theme.scss";
+
+
+@mixin kendo-popup--theme() {
+    @include kendo-popup--theme-base();
+}
diff --git a/packages/material/scss/progressbar/_index.scss b/packages/material/scss/progressbar/_index.scss
index 65f3b60f8f6..d1d6b8b489b 100644
--- a/packages/material/scss/progressbar/_index.scss
+++ b/packages/material/scss/progressbar/_index.scss
@@ -17,3 +17,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-progressbar--styles() {
+    @include module-render( "progressbar" ) {
+        @include kendo-progressbar--layout();
+        @include kendo-progressbar--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-progressbar--styles();
+}
diff --git a/packages/material/scss/progressbar/_layout.scss b/packages/material/scss/progressbar/_layout.scss
index e149263f489..a1d3f05c0ff 100644
--- a/packages/material/scss/progressbar/_layout.scss
+++ b/packages/material/scss/progressbar/_layout.scss
@@ -1,6 +1,10 @@
 @import "@progress/kendo-theme-default/scss/progressbar/_layout.scss";
 
-@include exports("progressbar/layout/material") {
+
+@mixin kendo-progressbar--layout() {
+
+    @include kendo-progressbar--layout-base();
+
     $kendo-progressbar-status-font-size: 11px !default;
     $kendo-progressbar-indeterminate-animation-timing: 2s infinite !default;
 
diff --git a/packages/material/scss/progressbar/_theme.scss b/packages/material/scss/progressbar/_theme.scss
index eafa737a195..f2f4849a246 100644
--- a/packages/material/scss/progressbar/_theme.scss
+++ b/packages/material/scss/progressbar/_theme.scss
@@ -47,7 +47,10 @@
     }
 }
 
-@include exports("progressbar/theme/material") {
+@mixin kendo-progressbar--theme() {
+
+    @include kendo-progressbar--theme-base();
+
     @include kendo-progressbar-indeterminate-animation(horizontal);
     @include kendo-progressbar-indeterminate-animation(vertical);
 
@@ -59,4 +62,5 @@
             background: $kendo-progressbar-value-bg;
         }
     }
+
 }
diff --git a/packages/material/scss/radio/_index.scss b/packages/material/scss/radio/_index.scss
index 9dc1195f189..010cca79fd1 100644
--- a/packages/material/scss/radio/_index.scss
+++ b/packages/material/scss/radio/_index.scss
@@ -16,3 +16,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-radio--styles() {
+    @include module-render( "radio" ) {
+        @include kendo-radio--layout();
+        @include kendo-radio--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-radio--styles();
+}
diff --git a/packages/material/scss/radio/_layout.scss b/packages/material/scss/radio/_layout.scss
index 1c8ca7d9c7a..a2f9b387009 100644
--- a/packages/material/scss/radio/_layout.scss
+++ b/packages/material/scss/radio/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/radio/_layout.scss";
 
-@include exports( "radio/layout/material" ) {
+
+@mixin kendo-radio--layout() {
+
+    @include kendo-radio--layout-base();
 
     .k-radio::before {
         transition: transform linear 280ms;
diff --git a/packages/material/scss/radio/_theme.scss b/packages/material/scss/radio/_theme.scss
index 4287a0f7813..c9f8f8281b9 100644
--- a/packages/material/scss/radio/_theme.scss
+++ b/packages/material/scss/radio/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/radio/_theme.scss";
 
-@include exports( "radio/theme/material" ) {
+
+@mixin kendo-radio--theme() {
+
+    @include kendo-radio--theme-base();
 
     // Radio
     .k-radio-label {
diff --git a/packages/material/scss/rating/_index.scss b/packages/material/scss/rating/_index.scss
index 80bda909d71..b39ab789e37 100644
--- a/packages/material/scss/rating/_index.scss
+++ b/packages/material/scss/rating/_index.scss
@@ -20,3 +20,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-rating--styles() {
+    @include module-render( "rating" ) {
+        @include kendo-rating--layout();
+        @include kendo-rating--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-rating--styles();
+}
diff --git a/packages/material/scss/rating/_layout.scss b/packages/material/scss/rating/_layout.scss
index f389e09267f..2f2972788d3 100644
--- a/packages/material/scss/rating/_layout.scss
+++ b/packages/material/scss/rating/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/rating/_layout.scss";
+
+
+@mixin kendo-rating--layout() {
+    @include kendo-rating--layout-base();
+}
diff --git a/packages/material/scss/rating/_theme.scss b/packages/material/scss/rating/_theme.scss
index 79881ee9e0d..70d9ea683cb 100644
--- a/packages/material/scss/rating/_theme.scss
+++ b/packages/material/scss/rating/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/rating/_theme.scss";
+
+
+@mixin kendo-rating--theme() {
+    @include kendo-rating--theme-base();
+}
diff --git a/packages/material/scss/responsivepanel/_index.scss b/packages/material/scss/responsivepanel/_index.scss
index 345334e9a92..567d3a0de3b 100644
--- a/packages/material/scss/responsivepanel/_index.scss
+++ b/packages/material/scss/responsivepanel/_index.scss
@@ -20,3 +20,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-responsive-panel--styles() {
+    @include module-render( "responsive-panel" ) {
+        @include kendo-responsive-panel--layout();
+        @include kendo-responsive-panel--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-responsive-panel--styles();
+}
diff --git a/packages/material/scss/responsivepanel/_layout.scss b/packages/material/scss/responsivepanel/_layout.scss
index b79f8041cfc..ab5628e6702 100644
--- a/packages/material/scss/responsivepanel/_layout.scss
+++ b/packages/material/scss/responsivepanel/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/responsivepanel/_layout.scss";
+
+
+@mixin kendo-responsive-panel--layout() {
+    @include kendo-responsive-panel--layout-base();
+}
diff --git a/packages/material/scss/responsivepanel/_theme.scss b/packages/material/scss/responsivepanel/_theme.scss
index 41c53fdd8f2..b64fd59bcce 100644
--- a/packages/material/scss/responsivepanel/_theme.scss
+++ b/packages/material/scss/responsivepanel/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/responsivepanel/_theme.scss";
+
+
+@mixin kendo-responsive-panel--theme() {
+    @include kendo-responsive-panel--theme-base();
+}
diff --git a/packages/material/scss/ripple/_index.scss b/packages/material/scss/ripple/_index.scss
index 32c2b50d414..2365863bb56 100644
--- a/packages/material/scss/ripple/_index.scss
+++ b/packages/material/scss/ripple/_index.scss
@@ -17,3 +17,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-ripple--styles() {
+    @include module-render( "ripple" ) {
+        @include kendo-ripple--layout();
+        @include kendo-ripple--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-ripple--styles();
+}
diff --git a/packages/material/scss/ripple/_layout.scss b/packages/material/scss/ripple/_layout.scss
index 286fd7b516a..a1e153e0973 100644
--- a/packages/material/scss/ripple/_layout.scss
+++ b/packages/material/scss/ripple/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/ripple/_layout.scss";
+
+
+@mixin kendo-ripple--layout() {
+    @include kendo-ripple--layout-base();
+}
diff --git a/packages/material/scss/ripple/_theme.scss b/packages/material/scss/ripple/_theme.scss
index 723abdae913..67ac7cf8d55 100644
--- a/packages/material/scss/ripple/_theme.scss
+++ b/packages/material/scss/ripple/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/ripple/_theme.scss";
+
+
+@mixin kendo-ripple--theme() {
+    @include kendo-ripple--theme-base();
+}
diff --git a/packages/material/scss/scheduler/_index.scss b/packages/material/scss/scheduler/_index.scss
index 2a2d1c0e883..7aab0fc22b3 100644
--- a/packages/material/scss/scheduler/_index.scss
+++ b/packages/material/scss/scheduler/_index.scss
@@ -32,3 +32,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-scheduler--styles() {
+    @include module-render( "scheduler" ) {
+        @include kendo-scheduler--layout();
+        @include kendo-scheduler--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-scheduler--styles();
+}
diff --git a/packages/material/scss/scheduler/_layout.scss b/packages/material/scss/scheduler/_layout.scss
index d2b53f6ceec..3fb43be8471 100644
--- a/packages/material/scss/scheduler/_layout.scss
+++ b/packages/material/scss/scheduler/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/scheduler/_layout.scss";
 
-@include exports("scheduler/layout/material") {
+
+@mixin kendo-scheduler--layout() {
+
+    @include kendo-scheduler--layout-base();
 
 
     .k-scheduler-footer {
@@ -117,12 +120,6 @@
     .k-scheduler-layout-flex .k-scheduler-cell {
         min-height: $kendo-line-height-em;
     }
-}
-
-
-
-
-@include exports("scheduler-views/layout/material") {
 
     // Month view
     .k-scheduler-monthview {
@@ -131,13 +128,6 @@
         }
     }
 
-}
-
-
-
-
-@include exports("scheduler-edit-form/layout/material") {
-
 
     .k-scheduler-edit-form {
 
diff --git a/packages/material/scss/scheduler/_theme.scss b/packages/material/scss/scheduler/_theme.scss
index 5d7f87f1432..088550d8408 100644
--- a/packages/material/scss/scheduler/_theme.scss
+++ b/packages/material/scss/scheduler/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/scheduler/_theme.scss";
 
-@include exports("scheduler/theme/material") {
+
+@mixin kendo-scheduler--theme() {
+
+    @include kendo-scheduler--theme-base();
 
     // Events
     .k-event {
@@ -18,13 +21,6 @@
         }
     }
 
-}
-
-
-
-
-@include exports("scheduler-edit-form/theme/material") {
-
     .k-scheduler-edit-form {
         .k-edit-label {
             color: $kendo-floating-label-text;
diff --git a/packages/material/scss/scroller/_index.scss b/packages/material/scss/scroller/_index.scss
index c169b73e0f4..501a5b2ddea 100644
--- a/packages/material/scss/scroller/_index.scss
+++ b/packages/material/scss/scroller/_index.scss
@@ -20,3 +20,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-scroller--styles() {
+    @include module-render( "scroller" ) {
+        @include kendo-scroller--layout();
+        @include kendo-scroller--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-scroller--styles();
+}
diff --git a/packages/material/scss/scroller/_layout.scss b/packages/material/scss/scroller/_layout.scss
index d76efa5f143..66def9ddd19 100644
--- a/packages/material/scss/scroller/_layout.scss
+++ b/packages/material/scss/scroller/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/scroller/_layout.scss";
+
+
+@mixin kendo-scroller--layout() {
+    @include kendo-scroller--layout-base();
+}
diff --git a/packages/material/scss/scroller/_theme.scss b/packages/material/scss/scroller/_theme.scss
index 0f6c9051839..58fc1f6ef6f 100644
--- a/packages/material/scss/scroller/_theme.scss
+++ b/packages/material/scss/scroller/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/scroller/_theme.scss";
+
+
+@mixin kendo-scroller--theme() {
+    @include kendo-scroller--theme-base();
+}
diff --git a/packages/material/scss/scrollview/_index.scss b/packages/material/scss/scrollview/_index.scss
index 9002f4d08e7..7440f11f040 100644
--- a/packages/material/scss/scrollview/_index.scss
+++ b/packages/material/scss/scrollview/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-scrollview--styles() {
+    @include module-render( "scrollview" ) {
+        @include kendo-scrollview--layout();
+        @include kendo-scrollview--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-scrollview--styles();
+}
diff --git a/packages/material/scss/scrollview/_layout.scss b/packages/material/scss/scrollview/_layout.scss
index c97a4f9fbcb..01cb3d04ee0 100644
--- a/packages/material/scss/scrollview/_layout.scss
+++ b/packages/material/scss/scrollview/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/scrollview/_layout.scss";
+
+
+@mixin kendo-scrollview--layout() {
+    @include kendo-scrollview--layout-base();
+}
diff --git a/packages/material/scss/scrollview/_theme.scss b/packages/material/scss/scrollview/_theme.scss
index da78b2f7bd6..cc4ac18810d 100644
--- a/packages/material/scss/scrollview/_theme.scss
+++ b/packages/material/scss/scrollview/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/scrollview/_theme.scss";
+
+
+@mixin kendo-scrollview--theme() {
+    @include kendo-scrollview--theme-base();
+}
diff --git a/packages/material/scss/searchbox/_index.scss b/packages/material/scss/searchbox/_index.scss
index 231483fc858..3bf22b6ccad 100644
--- a/packages/material/scss/searchbox/_index.scss
+++ b/packages/material/scss/searchbox/_index.scss
@@ -23,3 +23,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-searchbox--styles() {
+    @include module-render( "searchbox" ) {
+        @include kendo-searchbox--layout();
+        @include kendo-searchbox--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-searchbox--styles();
+}
diff --git a/packages/material/scss/searchbox/_layout.scss b/packages/material/scss/searchbox/_layout.scss
index f262c3ab4e5..723e110c6ed 100644
--- a/packages/material/scss/searchbox/_layout.scss
+++ b/packages/material/scss/searchbox/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/searchbox/_layout.scss";
+
+
+@mixin kendo-searchbox--layout() {
+    @include kendo-searchbox--layout-base();
+}
diff --git a/packages/material/scss/searchbox/_theme.scss b/packages/material/scss/searchbox/_theme.scss
index 6ef9702005e..0f27ae4ae98 100644
--- a/packages/material/scss/searchbox/_theme.scss
+++ b/packages/material/scss/searchbox/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/searchbox/_theme.scss";
+
+
+@mixin kendo-searchbox--theme() {
+    @include kendo-searchbox--theme-base();
+}
diff --git a/packages/material/scss/signature/_index.scss b/packages/material/scss/signature/_index.scss
index d447a3d4291..72a61462059 100644
--- a/packages/material/scss/signature/_index.scss
+++ b/packages/material/scss/signature/_index.scss
@@ -21,3 +21,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-signature--styles() {
+    @include module-render( "signature" ) {
+        @include kendo-signature--layout();
+        @include kendo-signature--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-signature--styles();
+}
diff --git a/packages/material/scss/signature/_layout.scss b/packages/material/scss/signature/_layout.scss
index b3296f644e9..60308f2187b 100644
--- a/packages/material/scss/signature/_layout.scss
+++ b/packages/material/scss/signature/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/signature/_layout.scss";
+
+
+@mixin kendo-signature--layout() {
+    @include kendo-signature--layout-base();
+}
diff --git a/packages/material/scss/signature/_theme.scss b/packages/material/scss/signature/_theme.scss
index d170c0e61e9..92a00680d06 100644
--- a/packages/material/scss/signature/_theme.scss
+++ b/packages/material/scss/signature/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/signature/_theme.scss";
+
+
+@mixin kendo-signature--theme() {
+    @include kendo-signature--theme-base();
+}
diff --git a/packages/material/scss/skeleton/_index.scss b/packages/material/scss/skeleton/_index.scss
index a4e51d50e3c..77d686d581e 100644
--- a/packages/material/scss/skeleton/_index.scss
+++ b/packages/material/scss/skeleton/_index.scss
@@ -16,3 +16,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-skeleton--styles() {
+    @include module-render( "skeleton" ) {
+        @include kendo-skeleton--layout();
+        @include kendo-skeleton--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-skeleton--styles();
+}
diff --git a/packages/material/scss/skeleton/_layout.scss b/packages/material/scss/skeleton/_layout.scss
index ccf41659ab4..2a4c8475890 100644
--- a/packages/material/scss/skeleton/_layout.scss
+++ b/packages/material/scss/skeleton/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/skeleton/_layout.scss";
+
+
+@mixin kendo-skeleton--layout() {
+    @include kendo-skeleton--layout-base();
+}
diff --git a/packages/material/scss/skeleton/_theme.scss b/packages/material/scss/skeleton/_theme.scss
index 9e6a272d8a7..e4a642950e0 100644
--- a/packages/material/scss/skeleton/_theme.scss
+++ b/packages/material/scss/skeleton/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/skeleton/_theme.scss";
+
+
+@mixin kendo-skeleton--theme() {
+    @include kendo-skeleton--theme-base();
+}
diff --git a/packages/material/scss/slider/_index.scss b/packages/material/scss/slider/_index.scss
index ff02981be62..47b649df775 100644
--- a/packages/material/scss/slider/_index.scss
+++ b/packages/material/scss/slider/_index.scss
@@ -22,7 +22,23 @@ $_kendo-module-meta: (
 
 // Component
 @import "./_variables.scss";
-@import "./images/slider-h.scss";
-@import "./images/slider-v.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-slider--styles() {
+    @include module-render( "slider" ) {
+        @include kendo-slider--layout();
+        @include kendo-slider--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-slider--styles();
+}
diff --git a/packages/material/scss/slider/_layout.scss b/packages/material/scss/slider/_layout.scss
index f51de39abee..406974acd0c 100644
--- a/packages/material/scss/slider/_layout.scss
+++ b/packages/material/scss/slider/_layout.scss
@@ -1,6 +1,10 @@
 @import "@progress/kendo-theme-default/scss/slider/_layout.scss";
 
-@include exports("slider/layout/material") {
+
+@mixin kendo-slider--layout() {
+
+    @include kendo-slider--layout-base();
+
     .k-slider {
         .k-tick {
             margin: 0;
@@ -47,4 +51,5 @@
             }
         }
     }
+
 }
diff --git a/packages/material/scss/slider/_theme.scss b/packages/material/scss/slider/_theme.scss
index 10526d52288..f63671d22f3 100644
--- a/packages/material/scss/slider/_theme.scss
+++ b/packages/material/scss/slider/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/slider/_theme.scss";
 
-@include exports("slider/theme/material") {
+
+@mixin kendo-slider--theme() {
+
+    @include kendo-slider--theme-base();
 
     .k-slider {
         cursor: pointer;
@@ -36,4 +39,5 @@
             }
         }
     }
+
 }
diff --git a/packages/material/scss/slider/_variables.scss b/packages/material/scss/slider/_variables.scss
index 008d42acadb..8e4ef5bc4f0 100644
--- a/packages/material/scss/slider/_variables.scss
+++ b/packages/material/scss/slider/_variables.scss
@@ -1,3 +1,7 @@
+@import "./images/slider-h.scss";
+@import "./images/slider-v.scss";
+
+
 // Slider
 $kendo-slider-size: 200px !default;
 $kendo-slider-tick-size: 2px !default;
diff --git a/packages/material/scss/split-button/_index.scss b/packages/material/scss/split-button/_index.scss
index 487559ea470..24d0cb71f3f 100644
--- a/packages/material/scss/split-button/_index.scss
+++ b/packages/material/scss/split-button/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-split-button--styles() {
+    @include module-render( "split-button" ) {
+        @include kendo-split-button--layout();
+        @include kendo-split-button--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-split-button--styles();
+}
diff --git a/packages/material/scss/split-button/_layout.scss b/packages/material/scss/split-button/_layout.scss
index 4bc33eca578..5ac70f541b8 100644
--- a/packages/material/scss/split-button/_layout.scss
+++ b/packages/material/scss/split-button/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/split-button/_layout.scss";
+
+
+@mixin kendo-split-button--layout() {
+    @include kendo-split-button--layout-base();
+}
diff --git a/packages/material/scss/split-button/_theme.scss b/packages/material/scss/split-button/_theme.scss
index 0c8b507799e..11b6e313a5a 100644
--- a/packages/material/scss/split-button/_theme.scss
+++ b/packages/material/scss/split-button/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/split-button/_theme.scss";
+
+
+@mixin kendo-split-button--theme() {
+    @include kendo-split-button--theme-base();
+}
diff --git a/packages/material/scss/splitter/_index.scss b/packages/material/scss/splitter/_index.scss
index 48eb009c1f8..494db1b3acb 100644
--- a/packages/material/scss/splitter/_index.scss
+++ b/packages/material/scss/splitter/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-splitter--styles() {
+    @include module-render( "splitter" ) {
+        @include kendo-splitter--layout();
+        @include kendo-splitter--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-splitter--styles();
+}
diff --git a/packages/material/scss/splitter/_layout.scss b/packages/material/scss/splitter/_layout.scss
index 9b2914b0c70..67ffdd00ae0 100644
--- a/packages/material/scss/splitter/_layout.scss
+++ b/packages/material/scss/splitter/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/splitter/_layout.scss";
+
+
+@mixin kendo-splitter--layout() {
+    @include kendo-splitter--layout-base();
+}
diff --git a/packages/material/scss/splitter/_theme.scss b/packages/material/scss/splitter/_theme.scss
index 870d4bb451a..764046fd4dc 100644
--- a/packages/material/scss/splitter/_theme.scss
+++ b/packages/material/scss/splitter/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/splitter/_theme.scss";
+
+
+@mixin kendo-splitter--theme() {
+    @include kendo-splitter--theme-base();
+}
diff --git a/packages/material/scss/spreadsheet/_index.scss b/packages/material/scss/spreadsheet/_index.scss
index a14fbc60c1e..648564f6903 100644
--- a/packages/material/scss/spreadsheet/_index.scss
+++ b/packages/material/scss/spreadsheet/_index.scss
@@ -46,6 +46,23 @@ $_kendo-module-meta: (
 
 // Component
 @import "./_variables.scss";
-@import "./images/image-default.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-spreadsheet--styles() {
+    @include module-render( "spreadsheet" ) {
+        @include kendo-spreadsheet--layout();
+        @include kendo-spreadsheet--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-spreadsheet--styles();
+}
diff --git a/packages/material/scss/spreadsheet/_layout.scss b/packages/material/scss/spreadsheet/_layout.scss
index 0a4eb724523..01bfb577c5d 100644
--- a/packages/material/scss/spreadsheet/_layout.scss
+++ b/packages/material/scss/spreadsheet/_layout.scss
@@ -1,7 +1,9 @@
 @import "@progress/kendo-theme-default/scss/spreadsheet/_layout.scss";
 
-@include exports( "spreadsheet/layout/material" ) {
 
+@mixin kendo-spreadsheet--layout() {
+
+    @include kendo-spreadsheet--layout-base();
 
     // Quick access toolbar
     .k-spreadsheet-quick-access-toolbar {
diff --git a/packages/material/scss/spreadsheet/_theme.scss b/packages/material/scss/spreadsheet/_theme.scss
index e0eda5ef220..b5332c6f805 100644
--- a/packages/material/scss/spreadsheet/_theme.scss
+++ b/packages/material/scss/spreadsheet/_theme.scss
@@ -1,4 +1,7 @@
-@include exports("sreadsheet/theme/material") {
+@import "@progress/kendo-theme-default/scss/spreadsheet/_theme.scss";
+
+
+@mixin kendo-spreadsheet--theme() {
 
     // Spreadsheet
     .k-spreadsheet {
@@ -143,12 +146,6 @@
         border-color: $kendo-color-error transparent transparent $kendo-color-error;
     }
 
-}
-
-
-
-
-@include exports( "spreadsheet/filter/theme" ) {
 
     // Filter button
     .k-spreadsheet .k-filter-range {
@@ -196,12 +193,6 @@
         }
     }
 
-}
-
-
-
-
-@include exports( "spreadsheet/drawing/theme" ) {
 
     .k-spreadsheet-insert-image-dialog {
         border-color: $kendo-spreadsheet-insert-image-dialog-preview-border;
@@ -234,12 +225,6 @@
         background: $kendo-spreadsheet-drawing-anchor-bg;
     }
 
-}
-
-
-
-
-@include exports( "spreadsheet/tools/theme" ) {
 
     .k-spreadsheet-popup {
 
@@ -264,12 +249,6 @@
 
     }
 
-}
-
-
-
-
-@include exports("spreadsheet/rtl/theme") {
 
     .k-rtl .k-spreadsheet,
     .k-spreadsheet[dir="rtl"],
diff --git a/packages/material/scss/spreadsheet/_variables.scss b/packages/material/scss/spreadsheet/_variables.scss
index c02e08ceb13..0a924e7794f 100644
--- a/packages/material/scss/spreadsheet/_variables.scss
+++ b/packages/material/scss/spreadsheet/_variables.scss
@@ -1,3 +1,6 @@
+@import "./images/image-default.scss";
+
+
 // Spreadsheet
 $kendo-spreadsheet-border-width: 1px !default;
 $kendo-spreadsheet-font-family: $kendo-font-family !default;
diff --git a/packages/material/scss/stepper/_index.scss b/packages/material/scss/stepper/_index.scss
index fdabfdcbf8f..fa170d3ea69 100644
--- a/packages/material/scss/stepper/_index.scss
+++ b/packages/material/scss/stepper/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-stepper--styles() {
+    @include module-render( "stepper" ) {
+        @include kendo-stepper--layout();
+        @include kendo-stepper--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-stepper--styles();
+}
diff --git a/packages/material/scss/stepper/_layout.scss b/packages/material/scss/stepper/_layout.scss
index 377c57f417d..b511c727f46 100644
--- a/packages/material/scss/stepper/_layout.scss
+++ b/packages/material/scss/stepper/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/stepper/_layout.scss";
 
-@include exports("stepper/layout/material") {
+
+@mixin kendo-stepper--layout() {
+
+    @include kendo-stepper--layout-base();
 
     // Stepper
     .k-stepper {}
diff --git a/packages/material/scss/stepper/_theme.scss b/packages/material/scss/stepper/_theme.scss
index 4576d707e02..5f88360a93d 100644
--- a/packages/material/scss/stepper/_theme.scss
+++ b/packages/material/scss/stepper/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/stepper/_theme.scss";
+
+
+@mixin kendo-stepper--theme() {
+    @include kendo-stepper--theme-base();
+}
diff --git a/packages/material/scss/switch/_index.scss b/packages/material/scss/switch/_index.scss
index 3dac7b01e38..1883a33f67d 100644
--- a/packages/material/scss/switch/_index.scss
+++ b/packages/material/scss/switch/_index.scss
@@ -18,3 +18,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-switch--styles() {
+    @include module-render( "switch" ) {
+        @include kendo-switch--layout();
+        @include kendo-switch--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-switch--styles();
+}
diff --git a/packages/material/scss/switch/_layout.scss b/packages/material/scss/switch/_layout.scss
index b261c79ad87..bb5a343b8bc 100644
--- a/packages/material/scss/switch/_layout.scss
+++ b/packages/material/scss/switch/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/switch/_layout.scss";
 
-@include exports( "switch/layout/material" ) {
+
+@mixin kendo-switch--layout() {
+
+    @include kendo-switch--layout-base();
 
     // Switch
     .k-switch {
diff --git a/packages/material/scss/switch/_theme.scss b/packages/material/scss/switch/_theme.scss
index 89e8dc8076c..1f7464c343e 100644
--- a/packages/material/scss/switch/_theme.scss
+++ b/packages/material/scss/switch/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/switch/_theme.scss";
 
-@include exports( "switch/theme/material" ) {
+
+@mixin kendo-switch--theme() {
+
+    @include kendo-switch--theme-base();
 
     // Switch
     .k-switch {
diff --git a/packages/material/scss/table/_index.scss b/packages/material/scss/table/_index.scss
index 063f5c8f63a..5936356d488 100644
--- a/packages/material/scss/table/_index.scss
+++ b/packages/material/scss/table/_index.scss
@@ -17,3 +17,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-table--styles() {
+    @include module-render( "table" ) {
+        @include kendo-table--layout();
+        @include kendo-table--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-table--styles();
+}
diff --git a/packages/material/scss/table/_layout.scss b/packages/material/scss/table/_layout.scss
index f02856f2d50..3b359454f82 100644
--- a/packages/material/scss/table/_layout.scss
+++ b/packages/material/scss/table/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/table/_layout.scss";
+
+
+@mixin kendo-table--layout() {
+    @include kendo-table--layout-base();
+}
diff --git a/packages/material/scss/table/_theme.scss b/packages/material/scss/table/_theme.scss
index 4bbd5eedbfe..647335bf2e6 100644
--- a/packages/material/scss/table/_theme.scss
+++ b/packages/material/scss/table/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/table/_theme.scss";
 
-@include exports( "table/theme/material" ) {
+
+@mixin kendo-table--theme() {
+
+    @include kendo-table--theme-base();
 
     // Selected state
     .k-table-tbody .k-table-row.k-selected,
diff --git a/packages/material/scss/tabstrip/_index.scss b/packages/material/scss/tabstrip/_index.scss
index 6e908d84ee6..94499f38915 100644
--- a/packages/material/scss/tabstrip/_index.scss
+++ b/packages/material/scss/tabstrip/_index.scss
@@ -24,3 +24,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-tabstrip--styles() {
+    @include module-render( "tabstrip" ) {
+        @include kendo-tabstrip--layout();
+        @include kendo-tabstrip--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-tabstrip--styles();
+}
diff --git a/packages/material/scss/tabstrip/_layout.scss b/packages/material/scss/tabstrip/_layout.scss
index 0abee0a0772..21275a2d5e1 100644
--- a/packages/material/scss/tabstrip/_layout.scss
+++ b/packages/material/scss/tabstrip/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/tabstrip/_layout.scss";
 
-@include exports( "tabstrip/layout/material" ) {
+
+@mixin kendo-tabstrip--layout() {
+
+    @include kendo-tabstrip--layout-base();
 
     .k-tabstrip-items {
         text-transform: uppercase;
diff --git a/packages/material/scss/tabstrip/_theme.scss b/packages/material/scss/tabstrip/_theme.scss
index 157932868eb..b63e8be0e24 100644
--- a/packages/material/scss/tabstrip/_theme.scss
+++ b/packages/material/scss/tabstrip/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/tabstrip/_theme.scss";
+
+
+@mixin kendo-tabstrip--theme() {
+    @include kendo-tabstrip--theme-base();
+}
diff --git a/packages/material/scss/taskboard/_index.scss b/packages/material/scss/taskboard/_index.scss
index 49cc2d87ed9..394929245e4 100644
--- a/packages/material/scss/taskboard/_index.scss
+++ b/packages/material/scss/taskboard/_index.scss
@@ -33,3 +33,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-task-board--styles() {
+    @include module-render( "task-board" ) {
+        @include kendo-task-board--layout();
+        @include kendo-task-board--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-task-board--styles();
+}
diff --git a/packages/material/scss/taskboard/_layout.scss b/packages/material/scss/taskboard/_layout.scss
index 1dfee80b05d..bb54cace935 100644
--- a/packages/material/scss/taskboard/_layout.scss
+++ b/packages/material/scss/taskboard/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/taskboard/_layout.scss";
+
+
+@mixin kendo-task-board--layout() {
+    @include kendo-task-board--layout-base();
+}
diff --git a/packages/material/scss/taskboard/_theme.scss b/packages/material/scss/taskboard/_theme.scss
index 586319ab660..18ad1a0666e 100644
--- a/packages/material/scss/taskboard/_theme.scss
+++ b/packages/material/scss/taskboard/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/taskboard/_theme.scss";
+
+
+@mixin kendo-task-board--theme() {
+    @include kendo-task-board--theme-base();
+}
diff --git a/packages/material/scss/textarea/_index.scss b/packages/material/scss/textarea/_index.scss
index 47c2dc2616f..d6f3e6508d2 100644
--- a/packages/material/scss/textarea/_index.scss
+++ b/packages/material/scss/textarea/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-textarea--styles() {
+    @include module-render( "textarea" ) {
+        @include kendo-textarea--layout();
+        @include kendo-textarea--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-textarea--styles();
+}
diff --git a/packages/material/scss/textarea/_layout.scss b/packages/material/scss/textarea/_layout.scss
index a377d8a088f..ff143325397 100644
--- a/packages/material/scss/textarea/_layout.scss
+++ b/packages/material/scss/textarea/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/textarea/_layout.scss";
+
+
+@mixin kendo-textarea--layout() {
+    @include kendo-textarea--layout-base();
+}
diff --git a/packages/material/scss/textarea/_theme.scss b/packages/material/scss/textarea/_theme.scss
index 54ea83a1172..6c3636b815e 100644
--- a/packages/material/scss/textarea/_theme.scss
+++ b/packages/material/scss/textarea/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/textarea/_theme.scss";
+
+
+@mixin kendo-textarea--theme() {
+    @include kendo-textarea--theme-base();
+}
diff --git a/packages/material/scss/textbox/_index.scss b/packages/material/scss/textbox/_index.scss
index a988a522420..6426ebb8425 100644
--- a/packages/material/scss/textbox/_index.scss
+++ b/packages/material/scss/textbox/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-textbox--styles() {
+    @include module-render( "textbox" ) {
+        @include kendo-textbox--layout();
+        @include kendo-textbox--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-textbox--styles();
+}
diff --git a/packages/material/scss/textbox/_layout.scss b/packages/material/scss/textbox/_layout.scss
index 090c8110673..c2a66ec5073 100644
--- a/packages/material/scss/textbox/_layout.scss
+++ b/packages/material/scss/textbox/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/textbox/_layout.scss";
+
+
+@mixin kendo-textbox--layout() {
+    @include kendo-textbox--layout-base();
+}
diff --git a/packages/material/scss/textbox/_theme.scss b/packages/material/scss/textbox/_theme.scss
index ca75fffa985..4be83fd717b 100644
--- a/packages/material/scss/textbox/_theme.scss
+++ b/packages/material/scss/textbox/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/textbox/_theme.scss";
+
+
+@mixin kendo-textbox--theme() {
+    @include kendo-textbox--theme-base();
+}
diff --git a/packages/material/scss/tilelayout/_index.scss b/packages/material/scss/tilelayout/_index.scss
index d63525d25c1..4bc7fc999e2 100644
--- a/packages/material/scss/tilelayout/_index.scss
+++ b/packages/material/scss/tilelayout/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-tile-layout--styles() {
+    @include module-render( "tile-layout" ) {
+        @include kendo-tile-layout--layout();
+        @include kendo-tile-layout--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-tile-layout--styles();
+}
diff --git a/packages/material/scss/tilelayout/_layout.scss b/packages/material/scss/tilelayout/_layout.scss
index 18624dd3281..aab0e297172 100644
--- a/packages/material/scss/tilelayout/_layout.scss
+++ b/packages/material/scss/tilelayout/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/tilelayout/_layout.scss";
+
+
+@mixin kendo-tile-layout--layout() {
+    @include kendo-tile-layout--layout-base();
+}
diff --git a/packages/material/scss/tilelayout/_theme.scss b/packages/material/scss/tilelayout/_theme.scss
index a837a2d5477..d05a33fed3b 100644
--- a/packages/material/scss/tilelayout/_theme.scss
+++ b/packages/material/scss/tilelayout/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/tilelayout/_theme.scss";
+
+
+@mixin kendo-tile-layout--theme() {
+    @include kendo-tile-layout--theme-base();
+}
diff --git a/packages/material/scss/timedurationpicker/_index.scss b/packages/material/scss/timedurationpicker/_index.scss
index 132881d259a..46d6c0f1d60 100644
--- a/packages/material/scss/timedurationpicker/_index.scss
+++ b/packages/material/scss/timedurationpicker/_index.scss
@@ -29,3 +29,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-time-duration-picker--styles() {
+    @include module-render( "time-duration-picker" ) {
+        @include kendo-time-duration-picker--layout();
+        @include kendo-time-duration-picker--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-time-duration-picker--styles();
+}
diff --git a/packages/material/scss/timedurationpicker/_layout.scss b/packages/material/scss/timedurationpicker/_layout.scss
index d24cedb5e1f..d7594157f18 100644
--- a/packages/material/scss/timedurationpicker/_layout.scss
+++ b/packages/material/scss/timedurationpicker/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/timedurationpicker/_layout.scss";
+
+
+@mixin kendo-time-duration-picker--layout() {
+    @include kendo-time-duration-picker--layout-base();
+}
diff --git a/packages/material/scss/timedurationpicker/_theme.scss b/packages/material/scss/timedurationpicker/_theme.scss
index 89cf4ce63f1..30b34525dab 100644
--- a/packages/material/scss/timedurationpicker/_theme.scss
+++ b/packages/material/scss/timedurationpicker/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/timedurationpicker/_theme.scss";
+
+
+@mixin kendo-time-duration-picker--theme() {
+    @include kendo-time-duration-picker--theme-base();
+}
diff --git a/packages/material/scss/timeline/_index.scss b/packages/material/scss/timeline/_index.scss
index ee21be31be6..e164e4670ed 100644
--- a/packages/material/scss/timeline/_index.scss
+++ b/packages/material/scss/timeline/_index.scss
@@ -24,3 +24,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-timeline--styles() {
+    @include module-render( "timeline" ) {
+        @include kendo-timeline--layout();
+        @include kendo-timeline--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-timeline--styles();
+}
diff --git a/packages/material/scss/timeline/_layout.scss b/packages/material/scss/timeline/_layout.scss
index 80805961ae1..23669e97abe 100644
--- a/packages/material/scss/timeline/_layout.scss
+++ b/packages/material/scss/timeline/_layout.scss
@@ -1,6 +1,10 @@
 @import "@progress/kendo-theme-default/scss/timeline/_layout.scss";
 
-@include exports( "timeline/layout/material" ) {
+
+@mixin kendo-timeline--layout() {
+
+    @include kendo-timeline--layout-base();
+
     .k-timeline-horizontal .k-timeline-card {
         padding: 0 5px 5px;
     }
@@ -17,4 +21,5 @@
     .k-timeline-track-item.k-focus .k-timeline-circle::before {
         opacity: $kendo-flat-button-focus-opacity;
     }
+
 }
diff --git a/packages/material/scss/timeline/_theme.scss b/packages/material/scss/timeline/_theme.scss
index 2a165963f8d..2f7186e09d2 100644
--- a/packages/material/scss/timeline/_theme.scss
+++ b/packages/material/scss/timeline/_theme.scss
@@ -1,2 +1,6 @@
 @import "@progress/kendo-theme-default/scss/timeline/_theme.scss";
 
+
+@mixin kendo-timeline--theme() {
+    @include kendo-timeline--theme-base();
+}
diff --git a/packages/material/scss/timepicker/_index.scss b/packages/material/scss/timepicker/_index.scss
index d87ea473f34..06d30a3a9dd 100644
--- a/packages/material/scss/timepicker/_index.scss
+++ b/packages/material/scss/timepicker/_index.scss
@@ -28,3 +28,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-time-picker--styles() {
+    @include module-render( "time-picker" ) {
+        @include kendo-time-picker--layout();
+        @include kendo-time-picker--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-time-picker--styles();
+}
diff --git a/packages/material/scss/timepicker/_layout.scss b/packages/material/scss/timepicker/_layout.scss
index ccf3f9e16a9..7a84dae436e 100644
--- a/packages/material/scss/timepicker/_layout.scss
+++ b/packages/material/scss/timepicker/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/timepicker/_layout.scss";
+
+
+@mixin kendo-time-picker--layout() {
+    @include kendo-time-picker--layout-base();
+}
diff --git a/packages/material/scss/timepicker/_theme.scss b/packages/material/scss/timepicker/_theme.scss
index 258e9d51af8..5e349ab32c2 100644
--- a/packages/material/scss/timepicker/_theme.scss
+++ b/packages/material/scss/timepicker/_theme.scss
@@ -1 +1,5 @@
 @import "@progress/kendo-theme-default/scss/timepicker/_theme.scss";
+
+@mixin kendo-time-picker--theme() {
+    @include kendo-time-picker--theme-base();
+}
diff --git a/packages/material/scss/timeselector/_index.scss b/packages/material/scss/timeselector/_index.scss
index 6c845d7223b..2676a9e1370 100644
--- a/packages/material/scss/timeselector/_index.scss
+++ b/packages/material/scss/timeselector/_index.scss
@@ -24,3 +24,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-time-selector--styles() {
+    @include module-render( "time-selector" ) {
+        @include kendo-time-selector--layout();
+        @include kendo-time-selector--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-time-selector--styles();
+}
diff --git a/packages/material/scss/timeselector/_layout.scss b/packages/material/scss/timeselector/_layout.scss
index 0c7c2b5ff1e..b9d2cbf3f58 100644
--- a/packages/material/scss/timeselector/_layout.scss
+++ b/packages/material/scss/timeselector/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/timeselector/_layout.scss";
+
+
+@mixin kendo-time-selector--layout() {
+    @include kendo-time-selector--layout-base();
+}
diff --git a/packages/material/scss/timeselector/_theme.scss b/packages/material/scss/timeselector/_theme.scss
index 4e3b46302d2..86dffd8c96f 100644
--- a/packages/material/scss/timeselector/_theme.scss
+++ b/packages/material/scss/timeselector/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/timeselector/_theme.scss";
 
-@include exports( "timeselector/theme/material" ) {
+
+@mixin kendo-time-selector--theme() {
+
+    @include kendo-time-selector--theme-base();
 
     // Time selector
     .k-timeselector {}
diff --git a/packages/material/scss/toolbar/_index.scss b/packages/material/scss/toolbar/_index.scss
index bc92f55ca43..ffc0c81d2b9 100644
--- a/packages/material/scss/toolbar/_index.scss
+++ b/packages/material/scss/toolbar/_index.scss
@@ -26,3 +26,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-toolbar--styles() {
+    @include module-render( "toolbar" ) {
+        @include kendo-toolbar--layout();
+        @include kendo-toolbar--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-toolbar--styles();
+}
diff --git a/packages/material/scss/toolbar/_layout.scss b/packages/material/scss/toolbar/_layout.scss
index cf7de634989..0e98e612927 100644
--- a/packages/material/scss/toolbar/_layout.scss
+++ b/packages/material/scss/toolbar/_layout.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/toolbar/_layout.scss";
 
-@include exports("toolbar/layout/material") {
+
+@mixin kendo-toolbar--layout() {
+
+    @include kendo-toolbar--layout-base();
 
     .k-toolbar {
 
@@ -22,15 +25,6 @@
         }
     }
 
-}
-
-
-
-
-// Remove once the Overflow Popup uses
-// the proper Menu rendering in all suites.
-@include exports("toolbar/layout/material/legacy") {
-
     // Overflow container
     .k-overflow-container {
 
diff --git a/packages/material/scss/toolbar/_theme.scss b/packages/material/scss/toolbar/_theme.scss
index b3d5f2ac96c..01329f6ddc4 100644
--- a/packages/material/scss/toolbar/_theme.scss
+++ b/packages/material/scss/toolbar/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/toolbar/_theme.scss";
 
-@include exports("toolbar/theme/material") {
+
+@mixin kendo-toolbar--theme() {
+
+    @include kendo-toolbar--theme-base();
 
     .k-toolbar {
 
diff --git a/packages/material/scss/tooltip/_index.scss b/packages/material/scss/tooltip/_index.scss
index d0616a80894..0a10203adff 100644
--- a/packages/material/scss/tooltip/_index.scss
+++ b/packages/material/scss/tooltip/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-tooltip--styles() {
+    @include module-render( "tooltip" ) {
+        @include kendo-tooltip--layout();
+        @include kendo-tooltip--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-tooltip--styles();
+}
diff --git a/packages/material/scss/tooltip/_layout.scss b/packages/material/scss/tooltip/_layout.scss
index 43d1682ce7c..42b35e40c03 100644
--- a/packages/material/scss/tooltip/_layout.scss
+++ b/packages/material/scss/tooltip/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/tooltip/_layout.scss";
+
+
+@mixin kendo-tooltip--layout() {
+    @include kendo-tooltip--layout-base();
+}
diff --git a/packages/material/scss/tooltip/_theme.scss b/packages/material/scss/tooltip/_theme.scss
index 18821b8162b..e50ea7cf9a9 100644
--- a/packages/material/scss/tooltip/_theme.scss
+++ b/packages/material/scss/tooltip/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/tooltip/_theme.scss";
+
+
+@mixin kendo-tooltip--theme() {
+    @include kendo-tooltip--theme-base();
+}
diff --git a/packages/material/scss/treelist/_index.scss b/packages/material/scss/treelist/_index.scss
index 25ca12eca07..c1018f18b00 100644
--- a/packages/material/scss/treelist/_index.scss
+++ b/packages/material/scss/treelist/_index.scss
@@ -23,3 +23,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-treelist--styles() {
+    @include module-render( "treelist" ) {
+        @include kendo-treelist--layout();
+        @include kendo-treelist--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-treelist--styles();
+}
diff --git a/packages/material/scss/treelist/_layout.scss b/packages/material/scss/treelist/_layout.scss
index dd6b2ed5b1e..cc656cfbdda 100644
--- a/packages/material/scss/treelist/_layout.scss
+++ b/packages/material/scss/treelist/_layout.scss
@@ -1,6 +1,10 @@
 @import "@progress/kendo-theme-default/scss/treelist/_layout.scss";
 
-@include exports("treelist/layout/material") {
+
+@mixin kendo-treelist--layout() {
+
+    @include kendo-treelist--layout-base();
+
     .k-treelist {
         tr.k-footer-template td {
             border-width: $kendo-treelist-footer-row-border-width 0;
@@ -17,4 +21,5 @@
             border-bottom-width: $kendo-treelist-footer-row-border-width;
         }
     }
+
 }
diff --git a/packages/material/scss/treelist/_theme.scss b/packages/material/scss/treelist/_theme.scss
index 12028c83642..d8fd8e14992 100644
--- a/packages/material/scss/treelist/_theme.scss
+++ b/packages/material/scss/treelist/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/treelist/_theme.scss";
 
-@include exports("treelist/theme/material") {
+@mixin kendo-treelist--theme() {
+
+    @include kendo-treelist--theme-base();
+
     .k-treelist {
         tr.k-footer,
         tr.k-footer-template {
@@ -24,4 +27,5 @@
             background-color: $kendo-treelist-footer-row-bg;
         }
     }
+
 }
diff --git a/packages/material/scss/treeview/_index.scss b/packages/material/scss/treeview/_index.scss
index 4daaccfe478..6be8dbebb2e 100644
--- a/packages/material/scss/treeview/_index.scss
+++ b/packages/material/scss/treeview/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-treeview--styles() {
+    @include module-render( "treeview" ) {
+        @include kendo-treeview--layout();
+        @include kendo-treeview--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-treeview--styles();
+}
diff --git a/packages/material/scss/treeview/_layout.scss b/packages/material/scss/treeview/_layout.scss
index 7bab5ba6ce9..8ae26f89d9c 100644
--- a/packages/material/scss/treeview/_layout.scss
+++ b/packages/material/scss/treeview/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/treeview/_layout.scss";
+
+
+@mixin kendo-treeview--layout() {
+    @include kendo-treeview--layout-base();
+}
diff --git a/packages/material/scss/treeview/_theme.scss b/packages/material/scss/treeview/_theme.scss
index 0210ab5c5b8..4da25727756 100644
--- a/packages/material/scss/treeview/_theme.scss
+++ b/packages/material/scss/treeview/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/treeview/_theme.scss";
 
-@include exports( "treeview/theme/material" ) {
+
+@mixin kendo-treeview--theme() {
+
+    @include kendo-treeview--theme-base();
 
     // Treeview
     .k-treeview {}
diff --git a/packages/material/scss/typography/_index.scss b/packages/material/scss/typography/_index.scss
index 95c58ebe137..15254900927 100644
--- a/packages/material/scss/typography/_index.scss
+++ b/packages/material/scss/typography/_index.scss
@@ -16,3 +16,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-typography--styles() {
+    @include module-render( "typography" ) {
+        @include kendo-typography--layout();
+        @include kendo-typography--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-typography--styles();
+}
diff --git a/packages/material/scss/typography/_layout.scss b/packages/material/scss/typography/_layout.scss
index 0a2696f3c9a..14754e46d01 100644
--- a/packages/material/scss/typography/_layout.scss
+++ b/packages/material/scss/typography/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/typography/_layout.scss";
+
+
+@mixin kendo-typography--layout() {
+    @include kendo-typography--layout-base();
+}
diff --git a/packages/material/scss/typography/_theme.scss b/packages/material/scss/typography/_theme.scss
index ba8d2ce9ab5..7eb68af4b40 100644
--- a/packages/material/scss/typography/_theme.scss
+++ b/packages/material/scss/typography/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/typography/_theme.scss";
+
+
+@mixin kendo-typography--theme() {
+    @include kendo-typography--theme-base();
+}
diff --git a/packages/material/scss/upload/_index.scss b/packages/material/scss/upload/_index.scss
index 20ff2c2d02a..aa6390bcad3 100644
--- a/packages/material/scss/upload/_index.scss
+++ b/packages/material/scss/upload/_index.scss
@@ -26,3 +26,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-upload--styles() {
+    @include module-render( "upload" ) {
+        @include kendo-upload--layout();
+        @include kendo-upload--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-upload--styles();
+}
diff --git a/packages/material/scss/upload/_layout.scss b/packages/material/scss/upload/_layout.scss
index 18ef1f5a6d8..96b0aabaf11 100644
--- a/packages/material/scss/upload/_layout.scss
+++ b/packages/material/scss/upload/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/upload/_layout.scss";
+
+
+@mixin kendo-upload--layout() {
+    @include kendo-upload--layout-base();
+}
diff --git a/packages/material/scss/upload/_theme.scss b/packages/material/scss/upload/_theme.scss
index b6de834bc61..a2478ac97c4 100644
--- a/packages/material/scss/upload/_theme.scss
+++ b/packages/material/scss/upload/_theme.scss
@@ -1,6 +1,9 @@
 @import "@progress/kendo-theme-default/scss/upload/_theme.scss";
 
-@include exports("upload/theme/material") {
+
+@mixin kendo-upload--theme() {
+
+    @include kendo-upload--theme-base();
 
     // Upload
     .k-upload {
@@ -9,4 +12,5 @@
             background-color: k-try-shade( $kendo-upload-dropzone-bg );
         }
     }
+
 }
diff --git a/packages/material/scss/utils/_index.scss b/packages/material/scss/utils/_index.scss
index 0241bcc3563..92857c4d816 100644
--- a/packages/material/scss/utils/_index.scss
+++ b/packages/material/scss/utils/_index.scss
@@ -15,6 +15,18 @@ $_kendo-module-meta: (
 @import "@progress/kendo-theme-utils/scss/index.import.scss";
 
 
-@include exports("kendo-utils") {
-    @include kendo-utils();
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-utils--styles() {
+    @include module-render( "utils" ) {
+        @include kendo-utils();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-utils--styles();
 }
diff --git a/packages/material/scss/validator/_index.scss b/packages/material/scss/validator/_index.scss
index 49877260363..ceba609b423 100644
--- a/packages/material/scss/validator/_index.scss
+++ b/packages/material/scss/validator/_index.scss
@@ -22,3 +22,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-validator--styles() {
+    @include module-render( "validator" ) {
+        @include kendo-validator--layout();
+        @include kendo-validator--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-validator--styles();
+}
diff --git a/packages/material/scss/validator/_layout.scss b/packages/material/scss/validator/_layout.scss
index ea6de908f88..ce082e61ccb 100644
--- a/packages/material/scss/validator/_layout.scss
+++ b/packages/material/scss/validator/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/validator/_layout.scss";
+
+
+@mixin kendo-validator--layout() {
+    @include kendo-validator--layout-base();
+}
diff --git a/packages/material/scss/validator/_theme.scss b/packages/material/scss/validator/_theme.scss
index 5d7c6a03945..0271748ea44 100644
--- a/packages/material/scss/validator/_theme.scss
+++ b/packages/material/scss/validator/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/validator/_theme.scss";
+
+
+@mixin kendo-validator--theme() {
+    @include kendo-validator--theme-base();
+}
diff --git a/packages/material/scss/virtual-scroller/_index.scss b/packages/material/scss/virtual-scroller/_index.scss
index 5ab3e3a8724..e7324176c40 100644
--- a/packages/material/scss/virtual-scroller/_index.scss
+++ b/packages/material/scss/virtual-scroller/_index.scss
@@ -16,3 +16,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-virtual-scroller--styles() {
+    @include module-render( "virtual-scroller" ) {
+        @include kendo-virtual-scroller--layout();
+        @include kendo-virtual-scroller--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-virtual-scroller--styles();
+}
diff --git a/packages/material/scss/virtual-scroller/_layout.scss b/packages/material/scss/virtual-scroller/_layout.scss
index 3c7aff1dc71..d7c1418bdb0 100644
--- a/packages/material/scss/virtual-scroller/_layout.scss
+++ b/packages/material/scss/virtual-scroller/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/virtual-scroller/_layout.scss";
+
+
+@mixin kendo-virtual-scroller--layout() {
+    @include kendo-virtual-scroller--layout-base();
+}
diff --git a/packages/material/scss/virtual-scroller/_theme.scss b/packages/material/scss/virtual-scroller/_theme.scss
index bd34e0d58be..cdb2460fe47 100644
--- a/packages/material/scss/virtual-scroller/_theme.scss
+++ b/packages/material/scss/virtual-scroller/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/virtual-scroller/_theme.scss";
+
+
+@mixin kendo-virtual-scroller--theme() {
+    @include kendo-virtual-scroller--theme-base();
+}
diff --git a/packages/material/scss/window/_index.scss b/packages/material/scss/window/_index.scss
index a623b8dbf67..933b48015a7 100644
--- a/packages/material/scss/window/_index.scss
+++ b/packages/material/scss/window/_index.scss
@@ -28,3 +28,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-window--styles() {
+    @include module-render( "window" ) {
+        @include kendo-window--layout();
+        @include kendo-window--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-window--styles();
+}
diff --git a/packages/material/scss/window/_layout.scss b/packages/material/scss/window/_layout.scss
index fb502124f13..8adfac2e679 100644
--- a/packages/material/scss/window/_layout.scss
+++ b/packages/material/scss/window/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/window/_layout.scss";
+
+
+@mixin kendo-window--layout() {
+    @include kendo-window--layout-base();
+}
diff --git a/packages/material/scss/window/_theme.scss b/packages/material/scss/window/_theme.scss
index e0457097090..d9eb776f8dd 100644
--- a/packages/material/scss/window/_theme.scss
+++ b/packages/material/scss/window/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/window/_theme.scss";
+
+
+@mixin kendo-window--theme() {
+    @include kendo-window--theme-base();
+}
diff --git a/packages/material/scss/wizard/_index.scss b/packages/material/scss/wizard/_index.scss
index f198b4068f8..e1d717fa503 100644
--- a/packages/material/scss/wizard/_index.scss
+++ b/packages/material/scss/wizard/_index.scss
@@ -26,3 +26,21 @@ $_kendo-module-meta: (
 @import "./_variables.scss";
 @import "./_layout.scss";
 @import "./_theme.scss";
+
+
+// Register
+@import "../core/module-system/index.import.scss";
+@include module-register( $_kendo-module-meta... );
+
+
+// Expose
+@mixin kendo-wizard--styles() {
+    @include module-render( "wizard" ) {
+        @include kendo-wizard--layout();
+        @include kendo-wizard--theme();
+    }
+}
+
+@if $kendo-auto-bootstrap {
+    @include kendo-wizard--styles();
+}
diff --git a/packages/material/scss/wizard/_layout.scss b/packages/material/scss/wizard/_layout.scss
index 87ea8e359b6..215920c1590 100644
--- a/packages/material/scss/wizard/_layout.scss
+++ b/packages/material/scss/wizard/_layout.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/wizard/_layout.scss";
+
+
+@mixin kendo-wizard--layout() {
+    @include kendo-wizard--layout-base();
+}
diff --git a/packages/material/scss/wizard/_theme.scss b/packages/material/scss/wizard/_theme.scss
index 29ad55ddf3d..1218111537d 100644
--- a/packages/material/scss/wizard/_theme.scss
+++ b/packages/material/scss/wizard/_theme.scss
@@ -1 +1,6 @@
 @import "@progress/kendo-theme-default/scss/wizard/_theme.scss";
+
+
+@mixin kendo-wizard--theme() {
+    @include kendo-wizard--theme-base();
+}