diff --git a/components/base/themeClassMixin.js b/components/base/themeClassMixin.js
index aef703e07..bb57b4288 100644
--- a/components/base/themeClassMixin.js
+++ b/components/base/themeClassMixin.js
@@ -2,23 +2,10 @@ const themeProps = [
   'primary',
   'secondary',
   'background',
+  'on-primary',
+  'on-secondary',
   'primary-bg',
   'secondary-bg',
-  'text-primary-on-primary',
-  'text-secondary-on-primary',
-  'text-hint-on-primary',
-  'text-disabled-on-primary',
-  'text-icon-on-primary',
-  'text-primary-on-secondary',
-  'text-secondary-on-secondary',
-  'text-hint-on-secondary',
-  'text-disabled-on-secondary',
-  'text-icon-on-secondary',
-  'text-primary-on-background',
-  'text-secondary-on-background',
-  'text-hint-on-background',
-  'text-disabled-on-background',
-  'text-icon-on-background',
   'text-primary-on-light',
   'text-secondary-on-light',
   'text-hint-on-light',