@angular/material 20.1.0-next.0 → 20.1.0-next.2

package/button-toggle/_button-toggle-theme.scss

@@ -1,6 +1,4 @@
-@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
-@use '../core/theming/theming';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use './m2-button-toggle';
@@ -11,14 +9,12 @@
 /// for the mat-button-toggle.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-button-toggle.get-unthemable-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-button-toggle.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-          m2-button-toggle.get-unthemable-tokens($theme));
-    }
+    $tokens: map.get(m3-button-toggle.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-button-toggle.
@@ -26,43 +22,34 @@
 /// @param {String} $color-variant: The color variant to use for the button toggle: primary,
 ///        secondary, tertiary, or error (If not specified, default secondary color will be used).
 @mixin color($theme, $color-variant: null) {
+  $tokens: m2-button-toggle.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-button-toggle.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-button-toggle.get-color-tokens($theme)
-      );
-    }
+    $tokens: map.get(m3-button-toggle.get-tokens($theme, $color-variant), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs typography theme styles for the mat-button-toggle.
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: m2-button-toggle.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-button-toggle.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-          m2-button-toggle.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-button-toggle.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs density theme styles for the mat-button-toggle.
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: m2-button-toggle.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-button-toggle.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-button-toggle.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-button-toggle.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -86,23 +73,21 @@
 /// @param {String} $color-variant: The color variant to use for the button toggle: primary,
 ///   secondary, tertiary, or error (If not specified, default secondary color will be used).
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-button-toggle') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
-      @include color($theme, $color-variant);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme, $color-variant);
+    @include density($theme);
+    @include typography($theme);
+  } @else {
+    @include base($theme);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
+    }
+    @if inspection.theme-has($theme, density) {
       @include density($theme);
+    }
+    @if inspection.theme-has($theme, typography) {
       @include typography($theme);
-    } @else {
-      @include base($theme);
-      @if inspection.theme-has($theme, color) {
-        @include color($theme);
-      }
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
-      @if inspection.theme-has($theme, typography) {
-        @include typography($theme);
-      }
     }
   }
 }

package/button-toggle/_m2-button-toggle.scss

@@ -53,24 +53,18 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    button-toggle-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    button-toggle-label-text-line-height:
-        inspection.get-theme-typography($theme, body-1, line-height),
-    button-toggle-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    button-toggle-label-text-tracking:
-        inspection.get-theme-typography($theme, body-1, letter-spacing),
-    button-toggle-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
-    button-toggle-legacy-label-text-font:
-        inspection.get-theme-typography($theme, body-1, font-family),
-    button-toggle-legacy-label-text-line-height:
-        inspection.get-theme-typography($theme, body-1, line-height),
-    button-toggle-legacy-label-text-size:
-        inspection.get-theme-typography($theme, body-1, font-size),
-    button-toggle-legacy-label-text-tracking:
-        inspection.get-theme-typography($theme, body-1, letter-spacing),
-    button-toggle-legacy-label-text-weight:
-        inspection.get-theme-typography($theme, body-1, font-weight),
+    button-toggle-label-text-font: map.get($system, body-large-font),
+    button-toggle-label-text-line-height: map.get($system, body-large-line-height),
+    button-toggle-label-text-size: map.get($system, body-large-size),
+    button-toggle-label-text-tracking: map.get($system, body-large-tracking),
+    button-toggle-label-text-weight: map.get($system, body-large-weight),
+    button-toggle-legacy-label-text-font: map.get($system, body-large-font),
+    button-toggle-legacy-label-text-line-height: map.get($system, body-large-line-height),
+    button-toggle-legacy-label-text-size: map.get($system, body-large-size),
+    button-toggle-legacy-label-text-tracking: map.get($system, body-large-tracking),
+    button-toggle-legacy-label-text-weight: map.get($system, body-large-weight),
   );
 }
 

package/card/_card-theme.scss

@@ -1,6 +1,4 @@
 @use 'sass:map';
-@use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
@@ -8,43 +6,39 @@
 @use './m3-card';
 
 @mixin base($theme) {
+  $tokens: m2-card.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-card.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-card.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-card.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin color($theme) {
+  $tokens: m2-card.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-card.get-tokens($theme), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-card.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-card.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin typography($theme) {
+  $tokens: m2-card.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-card.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-card.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-card.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin density($theme) {
+  $tokens: m2-card.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-card.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-card.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-card.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -62,23 +56,21 @@
 }
 
 @mixin theme($theme) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-card') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme);
+    @include density($theme);
+    @include typography($theme);
+  } @else {
+    @include base($theme);
+    @if inspection.theme-has($theme, color) {
       @include color($theme);
+    }
+    @if inspection.theme-has($theme, density) {
       @include density($theme);
+    }
+    @if inspection.theme-has($theme, typography) {
       @include typography($theme);
-    } @else {
-      @include base($theme);
-      @if inspection.theme-has($theme, color) {
-        @include color($theme);
-      }
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
-      @if inspection.theme-has($theme, typography) {
-        @include typography($theme);
-      }
     }
   }
 }

package/card/_m2-card.scss

@@ -1,4 +1,3 @@
-@use '../core/theming/inspection';
 @use '../core/style/elevation';
 @use '../core/tokens/m2-utils';
 @use 'sass:map';
@@ -23,7 +22,7 @@
     card-elevated-container-elevation: elevation.get-box-shadow(1),
     card-outlined-container-color: map.get($system, surface),
     card-outlined-container-elevation: elevation.get-box-shadow(0),
-    card-outlined-outline-color: inspection.get-theme-color($theme, system, outline),
+    card-outlined-outline-color: map.get($system, outline),
     card-subtitle-text-color: map.get($system, on-surface-variant),
     card-filled-container-color: map.get($system, surface),
     card-filled-container-elevation: elevation.get-box-shadow(0)
@@ -32,19 +31,18 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    card-title-text-font: inspection.get-theme-typography($theme, headline-6, font-family),
-    card-title-text-line-height: inspection.get-theme-typography($theme, headline-6, line-height),
-    card-title-text-size: inspection.get-theme-typography($theme, headline-6, font-size),
-    card-title-text-tracking: inspection.get-theme-typography($theme, headline-6, letter-spacing),
-    card-title-text-weight: inspection.get-theme-typography($theme, headline-6, font-weight),
-    card-subtitle-text-font: inspection.get-theme-typography($theme, subtitle-2, font-family),
-    card-subtitle-text-line-height:
-        inspection.get-theme-typography($theme, subtitle-2, line-height),
-    card-subtitle-text-size: inspection.get-theme-typography($theme, subtitle-2, font-size),
-    card-subtitle-text-tracking:
-        inspection.get-theme-typography($theme, subtitle-2, letter-spacing),
-    card-subtitle-text-weight: inspection.get-theme-typography($theme, subtitle-2, font-weight),
+    card-title-text-font: map.get($system, title-small-font),
+    card-title-text-line-height: map.get($system, title-small-line-height),
+    card-title-text-size: map.get($system, title-small-size),
+    card-title-text-tracking: map.get($system, title-small-tracking),
+    card-title-text-weight: map.get($system, title-small-weight),
+    card-subtitle-text-font: map.get($system, label-medium-font),
+    card-subtitle-text-line-height: map.get($system, label-medium-line-height),
+    card-subtitle-text-size: map.get($system, label-medium-size),
+    card-subtitle-text-tracking: map.get($system, label-medium-tracking),
+    card-subtitle-text-weight: map.get($system, label-medium-weight),
   );
 }
 

package/checkbox/_checkbox-theme.scss

@@ -1,5 +1,3 @@
-@use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
@@ -11,69 +9,58 @@
 /// for the mat-checkbox.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-checkbox.get-unthemable-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-checkbox.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-checkbox.get-unthemable-tokens($theme));
-    }
+    $tokens: map.get(m3-checkbox.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-checkbox.
 /// @param {Map} $theme The theme to generate color styles for.
 /// @param {String} $color-variant The color variant to use for the component
 @mixin color($theme, $color-variant: null) {
+  $tokens: m2-checkbox.get-color-tokens($theme, secondary);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-checkbox.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-          m2-checkbox.get-color-tokens($theme, secondary));
-    }
+    $tokens: map.get(m3-checkbox.get-tokens($theme, $color-variant), color);
+  }
+
+  @include token-utils.values($tokens);
 
+  @if inspection.get-theme-version($theme) != 1 {
     .mat-mdc-checkbox {
       &.mat-primary {
-        @include token-utils.create-token-values-mixed(
-            m2-checkbox.get-color-tokens($theme, primary,
-                $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
+        @include token-utils.values(m2-checkbox.get-color-tokens($theme, primary,
+          $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
         );
       }
 
       &.mat-warn {
-        @include token-utils.create-token-values-mixed(
-          m2-checkbox.get-color-tokens($theme, error,
-              $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
+        @include token-utils.values(m2-checkbox.get-color-tokens($theme, error,
+          $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
         );
       }
     }
   }
 }
 
-/// Outputs typography theme styles for the mat-checkbox.
-/// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: m2-checkbox.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-checkbox.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-checkbox.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-checkbox.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs density theme styles for the mat-checkbox.
-/// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: m2-checkbox.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-checkbox.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-checkbox.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-checkbox.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -96,23 +83,21 @@
 /// @param {Map} $theme The theme to generate styles for.
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-checkbox') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
-      @include color($theme, $color-variant);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme, $color-variant);
+    @include density($theme);
+    @include typography($theme);
+  } @else {
+    @include base($theme);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
+    }
+    @if inspection.theme-has($theme, density) {
       @include density($theme);
+    }
+    @if inspection.theme-has($theme, typography) {
       @include typography($theme);
-    } @else {
-      @include base($theme);
-      @if inspection.theme-has($theme, color) {
-        @include color($theme);
-      }
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
-      @if inspection.theme-has($theme, typography) {
-        @include typography($theme);
-      }
     }
   }
 }

package/checkbox/_m2-checkbox.scss

@@ -10,7 +10,7 @@
   $system: m2-utils.get-system($theme);
 
   @return (
-    checkbox-disabled-selected-checkmark-color: #fff,
+    checkbox-disabled-selected-checkmark-color: map.get($system, surface),
     checkbox-selected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
     checkbox-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
     checkbox-selected-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
@@ -25,7 +25,6 @@
   $system: m2-utils.get-system($theme);
   $system: m3-utils.replace-colors-with-variant($system, secondary, $color-variant);
   $is-dark: inspection.get-theme-type($theme) == dark;
-  $foreground-base: inspection.get-theme-color($theme, foreground, base);
   $disabled: m3-utils.color-with-opacity(map.get($system, on-surface), 38%);
 
   $tokens: (
@@ -46,7 +45,7 @@
     checkbox-selected-pressed-state-layer-color: map.get($system, secondary),
     checkbox-unselected-focus-state-layer-color: map.get($system, on-surface),
     checkbox-unselected-hover-state-layer-color: map.get($system, on-surface),
-    checkbox-unselected-pressed-state-layer-color: $foreground-base,
+    checkbox-unselected-pressed-state-layer-color: map.get($system, on-surface),
   );
 
   @each $token in $exclude {
@@ -58,12 +57,13 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    checkbox-label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    checkbox-label-text-line-height: inspection.get-theme-typography($theme, body-2, line-height),
-    checkbox-label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    checkbox-label-text-tracking: inspection.get-theme-typography($theme, body-2, letter-spacing),
-    checkbox-label-text-weight: inspection.get-theme-typography($theme, body-2, font-weight)
+    checkbox-label-text-font: map.get($system, body-medium-font),
+    checkbox-label-text-line-height: map.get($system, body-medium-line-height),
+    checkbox-label-text-size: map.get($system, body-medium-size),
+    checkbox-label-text-tracking: map.get($system, body-medium-tracking),
+    checkbox-label-text-weight: map.get($system, body-medium-weight)
   );
 }
 

package/chips/_chips-theme.scss

@@ -2,7 +2,6 @@
 @use './m2-chip';
 @use './m3-chip';
 @use '../core/tokens/token-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
 @use 'sass:map';
@@ -12,10 +11,10 @@
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-chip.get-tokens($theme), base));
+    @include token-utils.values(map.get(m3-chip.get-tokens($theme), base));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(m2-chip.get-unthemable-tokens($theme));
+      @include token-utils.values(m2-chip.get-unthemable-tokens($theme));
     }
   }
 }
@@ -25,27 +24,24 @@
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin color($theme, $color-variant: null) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
+    @include token-utils.values(
         map.get(m3-chip.get-tokens($theme, $color-variant), color));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(m2-chip.get-color-tokens($theme));
+      @include token-utils.values(m2-chip.get-color-tokens($theme));
 
       &.mat-mdc-chip-selected,
       &.mat-mdc-chip-highlighted {
         &.mat-primary {
-          @include token-utils.create-token-values-mixed(
-              m2-chip.get-color-tokens($theme, primary));
+          @include token-utils.values(m2-chip.get-color-tokens($theme, primary));
         }
 
         &.mat-accent {
-          @include token-utils.create-token-values-mixed(
-              m2-chip.get-color-tokens($theme, secondary));
+          @include token-utils.values(m2-chip.get-color-tokens($theme, secondary));
         }
 
         &.mat-warn {
-          @include token-utils.create-token-values-mixed(
-              m2-chip.get-color-tokens($theme, error));
+          @include token-utils.values(m2-chip.get-color-tokens($theme, error));
         }
       }
     }
@@ -56,10 +52,10 @@
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-chip.get-tokens($theme), typography));
+    @include token-utils.values(map.get(m3-chip.get-tokens($theme), typography));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(m2-chip.get-typography-tokens($theme));
+      @include token-utils.values(m2-chip.get-typography-tokens($theme));
     }
   }
 }
@@ -68,10 +64,10 @@
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-chip.get-tokens($theme), density));
+    @include token-utils.values(map.get(m3-chip.get-tokens($theme), density));
   } @else {
     .mat-mdc-chip.mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(m2-chip.get-density-tokens($theme));
+      @include token-utils.values(m2-chip.get-density-tokens($theme));
     }
   }
 }
@@ -96,23 +92,21 @@
 /// @param {Map} $theme The theme to generate styles for.
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-chips') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
-      @include color($theme, $color-variant);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme, $color-variant);
+    @include density($theme);
+    @include typography($theme);
+  } @else {
+    @include base($theme);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
+    }
+    @if inspection.theme-has($theme, density) {
       @include density($theme);
+    }
+    @if inspection.theme-has($theme, typography) {
       @include typography($theme);
-    } @else {
-      @include base($theme);
-      @if inspection.theme-has($theme, color) {
-        @include color($theme);
-      }
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
-      @if inspection.theme-has($theme, typography) {
-        @include typography($theme);
-      }
     }
   }
 }