diff --git a/libs/barista-components/table/src/_row-theme.scss b/libs/barista-components/table/src/_row-theme.scss
deleted file mode 100644
index 5bc4d89052..0000000000
--- a/libs/barista-components/table/src/_row-theme.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-@import '../../core/src/theming/theming';
-
-@mixin dt-theme-row($theme) {
-  $palette-names: 'error', 'warning', 'recovered';
-
-  @each $name in $palette-names {
-    $palette: dt-get-theme-palette($theme, $name);
-    $default-color: dt-get-theme-color($palette, 'default');
-
-    :host.dt-table-row-indicator.dt-color-#{$name}::before {
-      background-color: $default-color;
-    }
-  }
-}
diff --git a/libs/barista-components/table/src/expandable/_expandable-row-theme.scss b/libs/barista-components/table/src/expandable/_expandable-row-theme.scss
deleted file mode 100644
index 16490253b3..0000000000
--- a/libs/barista-components/table/src/expandable/_expandable-row-theme.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-@import '../../../core/src/theming/theming';
-
-@mixin dt-theme-expandable-row($theme, $theme-name) {
-  $palette: dt-get-theme-palette($theme, 'main');
-  $default-color: dt-get-theme-color($palette, 'default');
-  $border-color: get-color($theme-name, 500);
-
-  // if color not found, fallback to theme's default color
-  @if ($border-color == null) {
-    $border-color: $default-color;
-  }
-
-  :host {
-    > .dt-expandable-row-base-expanded {
-      border-top-color: $border-color;
-
-      $bg-color: get-color($theme-name, 100);
-      @if ($bg-color) {
-        background-color: $bg-color;
-      }
-      // if color not found, fallback to default color
-      // defined in expandable-row.scss
-    }
-
-    .dt-expandable-row-expandable-expanded {
-      border-bottom-color: $border-color;
-    }
-  }
-
-  $palette-names: 'error', 'warning';
-  $default-palette: 'error';
-
-  @each $name in $palette-names {
-    $palette: dt-get-theme-palette($theme, $name);
-    $default-color: dt-get-theme-color($palette, 'default');
-
-    :host.dt-table-row-indicator.dt-color-#{$name}
-      > .dt-expandable-row-base::before {
-      background-color: $default-color;
-    }
-  }
-}
diff --git a/libs/barista-components/table/src/expandable/expandable-row.scss b/libs/barista-components/table/src/expandable/expandable-row.scss
index ffec558dce..7923b43052 100644
--- a/libs/barista-components/table/src/expandable/expandable-row.scss
+++ b/libs/barista-components/table/src/expandable/expandable-row.scss
@@ -1,8 +1,51 @@
 @import '../../../core/src/style/variables';
 @import '../../../core/src/style/table';
-@import '../../../core/src/theming/theming';
 @import '../table-mixins';
-@import './expandable-row-theme';
+
+:host {
+  --dt-expandable-row-border-color: #{$turquoise-500};
+  --dt-expandable-row-background-color: #{$turquoise-100};
+}
+:host-context(.dt-theme-turquoise) {
+  --dt-expandable-row-border-color: #{$turquoise-500};
+  --dt-expandable-row-background-color: #{$turquoise-100};
+}
+:host-context(.dt-theme-blue) {
+  --dt-expandable-row-border-color: #{$blue-500};
+  --dt-expandable-row-background-color: #{$blue-100};
+}
+:host-context(.dt-theme-purple) {
+  --dt-expandable-row-border-color: #{$purple-500};
+  --dt-expandable-row-background-color: #{$purple-100};
+}
+:host-context(.dt-theme-royalblue) {
+  --dt-expandable-row-border-color: #{$royalblue-500};
+  --dt-expandable-row-background-color: #{$royalblue-100};
+}
+
+:host {
+  > .dt-expandable-row-base-expanded {
+    border-top-color: var(--dt-expandable-row-border-color);
+    background-color: var(--dt-expandable-row-background-color);
+  }
+  .dt-expandable-row-expandable-expanded {
+    border-bottom-color: var(--dt-expandable-row-border-color);
+  }
+}
+
+:host.dt-table-row-indicator.dt-color-warning
+  > .dt-expandable-row-base::before {
+  background-color: var(--dt-warning-default-color);
+}
+
+:host.dt-table-row-indicator.dt-color-error > .dt-expandable-row-base::before {
+  background-color: var(--dt-error-default-color);
+}
+
+:host.dt-table-row-indicator.dt-color-recovered
+  > .dt-expandable-row-base::before {
+  background-color: var(--dt-recovered-default-color);
+}
 
 :host.dt-expandable-row {
   &:nth-child(even) {
@@ -72,8 +115,3 @@
     left: 4px;
   }
 }
-
-// Apply current theme
-@include dt-apply-theme() {
-  @include dt-theme-expandable-row($dt-current-theme, $dt-current-theme-name);
-}
diff --git a/libs/barista-components/table/src/row.scss b/libs/barista-components/table/src/row.scss
index c74cc83c93..658e9cd23c 100644
--- a/libs/barista-components/table/src/row.scss
+++ b/libs/barista-components/table/src/row.scss
@@ -1,8 +1,12 @@
 @import '../../core/src/style/variables';
 @import '../../core/src/style/table';
-@import '../../core/src/theming/theming';
 @import './table-mixins';
-@import './row-theme';
+
+:host {
+  --dt-row-color-even: #{$dt-table-row-color-even};
+  --dt-row-color-odd: #{$white};
+  --interactive-border-color: #{$gray-500};
+}
 
 :host {
   min-height: $dt-table-row-height;
@@ -24,10 +28,17 @@
 }
 
 :host-context(.dt-table-interactive-rows):hover {
-  border: solid 1px $gray-500;
+  border: solid 1px var(--interactive-border-color);
 }
 
-// Apply the row theme to all theme definitions
-@include dt-apply-theme() {
-  @include dt-theme-row($dt-current-theme);
+:host.dt-table-row-indicator {
+  &.dt-color-error::before {
+    background-color: var(--dt-error-default-color);
+  }
+  &.dt-color-warning::before {
+    background-color: var(--dt-warning-default-color);
+  }
+  &.dt-color-recovered::before {
+    background-color: var(--dt-recovered-default-color);
+  }
 }
diff --git a/libs/barista-components/tree-table/BUILD.bazel b/libs/barista-components/tree-table/BUILD.bazel
index 8649a2fd19..7d8e9980ec 100644
--- a/libs/barista-components/tree-table/BUILD.bazel
+++ b/libs/barista-components/tree-table/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library")
+load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
 load("@npm//@bazel/typescript:index.bzl", "ts_config")
 load("//tools/bazel_rules:index.bzl", "jest", "ng_module_view_engine", "stylelint")
 
@@ -65,12 +65,6 @@ sass_binary(
 sass_binary(
     name = "styles_row",
     src = "src/tree-table-row.scss",
-    deps = ["styles_row_theme"]
-)
-
-sass_library(
-    name = "styles_row_theme",
-    srcs = ["src/_tree-table-row-theme.scss"],
 )
 
 sass_binary(
diff --git a/libs/barista-components/tree-table/src/_tree-table-row-theme.scss b/libs/barista-components/tree-table/src/_tree-table-row-theme.scss
deleted file mode 100644
index a9df6bd0c8..0000000000
--- a/libs/barista-components/tree-table/src/_tree-table-row-theme.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-@import '../../core/src/theming/theming';
-
-@mixin dt-theme-tree-table-row($theme) {
-  $palette-names: 'error', 'warning', 'recovered';
-
-  @each $name in $palette-names {
-    $palette: dt-get-theme-palette($theme, $name);
-    $default-color: dt-get-theme-color($palette, 'default');
-
-    :host.dt-table-row-indicator.dt-color-#{$name}
-      ::ng-deep
-      .dt-tree-table-toggle-cell-wrap::before {
-      background-color: $default-color;
-    }
-  }
-}
diff --git a/libs/barista-components/tree-table/src/tree-table-row.scss b/libs/barista-components/tree-table/src/tree-table-row.scss
index f093a99686..0ef6f16165 100644
--- a/libs/barista-components/tree-table/src/tree-table-row.scss
+++ b/libs/barista-components/tree-table/src/tree-table-row.scss
@@ -1,13 +1,27 @@
 @import '../../core/src/style/variables';
 @import '../../core/src/style/table';
-@import '../../core/src/theming/theming';
-@import './tree-table-row-theme';
 
 :host {
   display: table-row;
   position: relative;
   min-height: $dt-table-row-height;
 
+  &.dt-table-row-indicator.dt-color-error
+    ::ng-deep
+    .dt-tree-table-toggle-cell-wrap::before {
+    background-color: var(--dt-error-default-color);
+  }
+  &.dt-table-row-indicator.dt-color-warning
+    ::ng-deep
+    .dt-tree-table-toggle-cell-wrap::before {
+    background-color: var(--dt-warning-default-color);
+  }
+  &.dt-table-row-indicator.dt-color-recovered
+    ::ng-deep
+    .dt-tree-table-toggle-cell-wrap::before {
+    background-color: var(--dt-recovered-default-color);
+  }
+
   &:nth-child(even) ::ng-deep .dt-cell {
     background-color: $dt-table-row-color-even;
     border-top: solid 1px $dt-table-row-color-even;
@@ -57,8 +71,3 @@
 :host-context(.dt-table-interactive-rows):hover ::ng-deep .dt-tree-toggle-cell {
   border-left: solid 1px $gray-500;
 }
-
-// Apply the row theme to all theme definitions
-@include dt-apply-theme() {
-  @include dt-theme-tree-table-row($dt-current-theme);
-}