diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-angular-dark.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-angular-dark.scss
index 79474abfe8f..1abcc93a326 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-angular-dark.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-angular-dark.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $material-typeface, $type-scale: $material-type-scale);
-@include dark-theme($dark-material-palette);
+@include typography(
+    $font-family: $material-typeface,
+    $type-scale: $material-type-scale
+);
+@include theme(
+    $schema: $dark-material-schema,
+    $palette: $dark-material-palette,
+);
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-angular.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-angular.scss
index d16a377b988..06c50496586 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-angular.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-angular.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $material-typeface, $type-scale: $material-type-scale);
-@include theme($light-material-palette);
+@include typography(
+    $font-family: $material-typeface,
+    $type-scale: $material-type-scale
+);
+@include theme(
+    $schema: $light-material-schema,
+    $palette: $light-material-palette,
+);
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-bootstrap-dark.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-bootstrap-dark.scss
index 49a85a736fc..d00f518d41b 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-bootstrap-dark.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-bootstrap-dark.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $bootstrap-typeface, $type-scale: $bootstrap-type-scale);
-@include bootstrap-dark-theme($dark-bootstrap-palette);
+@include typography(
+    $font-family: $bootstrap-typeface,
+    $type-scale: $bootstrap-type-scale
+);
+@include theme(
+    $schema: $dark-bootstrap-schema,
+    $palette: $dark-bootstrap-palette,
+);
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-bootstrap-light.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-bootstrap-light.scss
index 9c96d7c094e..ac40cce40ff 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-bootstrap-light.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-bootstrap-light.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $bootstrap-typeface, $type-scale: $bootstrap-type-scale);
-@include bootstrap-light-theme($light-bootstrap-palette);
+@include typography(
+    $font-family: $bootstrap-typeface,
+    $type-scale: $bootstrap-type-scale
+);
+@include theme(
+    $schema: $light-bootstrap-schema,
+    $palette: $light-bootstrap-palette,
+);
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-dark-green.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-dark-green.scss
index eabe08c2449..c14a1f0d6bd 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-dark-green.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-dark-green.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $material-typeface, $type-scale: $material-type-scale);
-@include dark-theme($dark-green-palette);
+@include typography(
+    $font-family: $material-typeface,
+    $type-scale: $material-type-scale
+);
+@include theme(
+    $schema: $dark-material-schema,
+    $palette: $dark-green-palette,
+);
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-dark-excel.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-dark-excel.scss
index 6bc90fd4e85..c9f6d6829bf 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-dark-excel.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-dark-excel.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $fluent-typeface, $type-scale: $fluent-type-scale);
-@include fluent-dark-theme($dark-fluent-excel-palette);
+@include typography(
+    $font-family: $fluent-typeface,
+    $type-scale: $fluent-type-scale
+);
+@include theme(
+    $schema: $dark-fluent-schema,
+    $palette: $dark-fluent-excel-palette,
+);
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-dark-word.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-dark-word.scss
index cb1a00cc362..6acaabd7053 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-dark-word.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-dark-word.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $fluent-typeface, $type-scale: $fluent-type-scale);
-@include fluent-dark-theme($dark-fluent-word-palette);
+@include typography(
+    $font-family: $fluent-typeface,
+    $type-scale: $fluent-type-scale
+);
+@include theme(
+    $schema: $dark-fluent-schema,
+    $palette: $dark-fluent-word-palette,
+);
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-dark.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-dark.scss
index ee545a8c803..99e9039cff4 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-dark.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-dark.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $fluent-typeface, $type-scale: $fluent-type-scale);
-@include fluent-dark-theme($dark-fluent-palette);
+@include typography(
+    $font-family: $fluent-typeface,
+    $type-scale: $fluent-type-scale
+);
+@include theme(
+    $schema: $dark-fluent-schema,
+    $palette: $dark-fluent-palette,
+);
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-light-excel.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-light-excel.scss
index 44c122cd937..f5ac2ea5987 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-light-excel.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-light-excel.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $fluent-typeface, $type-scale: $fluent-type-scale);
-@include fluent-light-theme($light-fluent-excel-palette);
+@include typography(
+    $font-family: $fluent-typeface,
+    $type-scale: $fluent-type-scale
+);
+@include theme(
+    $schema: $light-fluent-schema,
+    $palette: $light-fluent-excel-palette,
+);
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-light-word.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-light-word.scss
index bedee852a17..d8eb01368ed 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-light-word.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-light-word.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $fluent-typeface, $type-scale: $fluent-type-scale);
-@include fluent-light-theme($light-fluent-word-palette);
+@include typography(
+    $font-family: $fluent-typeface,
+    $type-scale: $fluent-type-scale
+);
+@include theme(
+    $schema: $light-fluent-schema,
+    $palette: $light-fluent-word-palette,
+);
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-light.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-light.scss
index a1fdcca4c1e..794c94c6cad 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-light.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-fluent-light.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $fluent-typeface, $type-scale: $fluent-type-scale);
-@include fluent-light-theme($light-fluent-palette);
+@include typography(
+    $font-family: $fluent-typeface,
+    $type-scale: $fluent-type-scale
+);
+@include theme(
+    $schema: $light-fluent-schema,
+    $palette: $light-fluent-palette,
+);
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-indigo-dark.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-indigo-dark.scss
index 8f6c49448d3..9090d4234c2 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-indigo-dark.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-indigo-dark.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $indigo-typeface, $type-scale: $indigo-type-scale);
-@include indigo-dark-theme($dark-indigo-palette);
+@include typography(
+    $font-family: $indigo-typeface,
+    $type-scale: $indigo-type-scale
+);
+@include theme(
+    $schema: $dark-indigo-schema,
+    $palette: $dark-indigo-palette,
+);
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-indigo-light.scss b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-indigo-light.scss
index 5b2b9b793e0..c1a770634e9 100644
--- a/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-indigo-light.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-indigo-light.scss
@@ -1,5 +1,11 @@
 @use '../../themes' as *;
 
 @include core();
-@include typography($font-family: $indigo-typeface, $type-scale: $indigo-type-scale);
-@include indigo-light-theme($light-indigo-palette);
+@include typography(
+    $font-family: $indigo-typeface,
+    $type-scale: $indigo-type-scale
+);
+@include theme(
+    $schema: $light-indigo-schema,
+    $palette: $light-indigo-palette,
+);