diff --git a/components/lib/themes/aura/confirmpopup/index.js b/components/lib/themes/aura/confirmpopup/index.js
index 13e74546a..f6ad4d3ea 100644
--- a/components/lib/themes/aura/confirmpopup/index.js
+++ b/components/lib/themes/aura/confirmpopup/index.js
@@ -1,18 +1,7 @@
 export default {
-    colorScheme: {
-        light: {
-            root: {
-                background: '{surface.0}',
-                borderColor: '{surface.200}',
-                color: '{surface.700}'
-            }
-        },
-        dark: {
-            root: {
-                background: '{surface.900}',
-                borderColor: '{surface.700}',
-                color: '{surface.0}'
-            }
-        }
+    root: {
+        background: '{content.background}',
+        borderColor: '{content.border.color}',
+        color: '{content.color}'
     }
 };
diff --git a/components/lib/themes/aura/dialog/index.js b/components/lib/themes/aura/dialog/index.js
index 13e74546a..f6ad4d3ea 100644
--- a/components/lib/themes/aura/dialog/index.js
+++ b/components/lib/themes/aura/dialog/index.js
@@ -1,18 +1,7 @@
 export default {
-    colorScheme: {
-        light: {
-            root: {
-                background: '{surface.0}',
-                borderColor: '{surface.200}',
-                color: '{surface.700}'
-            }
-        },
-        dark: {
-            root: {
-                background: '{surface.900}',
-                borderColor: '{surface.700}',
-                color: '{surface.0}'
-            }
-        }
+    root: {
+        background: '{content.background}',
+        borderColor: '{content.border.color}',
+        color: '{content.color}'
     }
 };
diff --git a/components/lib/themes/aura/drawer/index.js b/components/lib/themes/aura/drawer/index.js
index 13e74546a..f6ad4d3ea 100644
--- a/components/lib/themes/aura/drawer/index.js
+++ b/components/lib/themes/aura/drawer/index.js
@@ -1,18 +1,7 @@
 export default {
-    colorScheme: {
-        light: {
-            root: {
-                background: '{surface.0}',
-                borderColor: '{surface.200}',
-                color: '{surface.700}'
-            }
-        },
-        dark: {
-            root: {
-                background: '{surface.900}',
-                borderColor: '{surface.700}',
-                color: '{surface.0}'
-            }
-        }
+    root: {
+        background: '{content.background}',
+        borderColor: '{content.border.color}',
+        color: '{content.color}'
     }
 };
diff --git a/components/lib/themes/aura/popover/index.js b/components/lib/themes/aura/popover/index.js
index 13e74546a..f6ad4d3ea 100644
--- a/components/lib/themes/aura/popover/index.js
+++ b/components/lib/themes/aura/popover/index.js
@@ -1,18 +1,7 @@
 export default {
-    colorScheme: {
-        light: {
-            root: {
-                background: '{surface.0}',
-                borderColor: '{surface.200}',
-                color: '{surface.700}'
-            }
-        },
-        dark: {
-            root: {
-                background: '{surface.900}',
-                borderColor: '{surface.700}',
-                color: '{surface.0}'
-            }
-        }
+    root: {
+        background: '{content.background}',
+        borderColor: '{content.border.color}',
+        color: '{content.color}'
     }
 };