diff --git a/components/lib/themes/primeone/base/breadcrumb/index.js b/components/lib/themes/primeone/base/breadcrumb/index.js
index e61007f0e..fad7a89a4 100644
--- a/components/lib/themes/primeone/base/breadcrumb/index.js
+++ b/components/lib/themes/primeone/base/breadcrumb/index.js
@@ -1,9 +1,9 @@
 export default {
     css: ({ dt }) => `
 .p-breadcrumb {
-    background: var(--p-breadcrumb-background);
+    background: ${dt('breadcrumb.background')};
     border: 0 none;
-    border-radius: 6px;
+    border-radius: ${dt('rounded.base')};
     padding: 1rem;
     overflow-x: auto;
 }
@@ -44,23 +44,23 @@ export default {
 }
 
 .p-breadcrumb .p-menuitem-text {
-    color: var(--p-breadcrumb-item-text-color);
+    color: ${dt('breadcrumb.item.color')};
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     line-height: 1;
 }
 
 .p-breadcrumb .p-menuitem-text:hover {
-    color: var(--p-breadcrumb-item-text-color-hover);
+    color: ${dt('breadcrumb.item.hover.color')};
     line-height: 1;
 }
 
 .p-breadcrumb .p-menuitem-icon {
-    color: var(--p-breadcrumb-item-icon-color);
+    color: ${dt('breadcrumb.item.icon.color')};
 }
 
 .p-breadcrumb .p-breadcrumb-list li.p-menuitem-separator {
     margin: 0 0.5rem 0 0.5rem;
-    color: var(--p-breadcrumb-separator-color);
+    color: ${dt('breadcrumb.separator.color')};
 }
 `
 };
diff --git a/components/lib/themes/primeone/base/contextmenu/index.js b/components/lib/themes/primeone/base/contextmenu/index.js
index 11d9e4b1a..82574c67c 100644
--- a/components/lib/themes/primeone/base/contextmenu/index.js
+++ b/components/lib/themes/primeone/base/contextmenu/index.js
@@ -2,9 +2,9 @@ export default {
     css: ({ dt }) => `
 .p-contextmenu {
     padding: 0.25rem 0.25rem;
-    background: var(--p-contextmenu-background);
-    color: var(--p-contextmenu-text-color);
-    border: 1px solid var(--p-contextmenu-border-color);
+    background: ${dt('contextmenu.background')};
+    color: ${dt('contextmenu.color')};
+    border: 1px solid ${dt('contextmenu.border.color')};
     border-radius: ${dt('rounded.base')};
     box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1);
     min-width: 12.5rem;
@@ -25,9 +25,9 @@ export default {
     min-width: 100%;
     z-index: 1;
     padding: 0.25rem 0.25rem;
-    background: var(--p-contextmenu-background);
-    color: var(--p-contextmenu-text-color);
-    border: 1px solid var(--p-contextmenu-border-color);
+    background: ${dt('contextmenu.background')};
+    color: ${dt('contextmenu.color')};
+    border: 1px solid ${dt('contextmenu.border.color')};
     border-radius: ${dt('rounded.base')};
     box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1);
 }
@@ -62,17 +62,17 @@ export default {
 
 .p-contextmenu .p-menuitem-content {
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')};
-    border-radius: var(--p-rounded-sm);
-    color: var(--p-contextmenu-item-text-color);
+    border-radius: ${dt('rounded.sm')};
+    color: ${dt('contextmenu.item.color')};
 }
 
 .p-contextmenu .p-menuitem-icon {
-    color: var(--p-contextmenu-item-icon-color);
+    color: ${dt('contextmenu.item.icom.color')};
     margin-right: 0.5rem;
 }
 
 .p-contextmenu .p-submenu-icon {
-    color: var(--p-contextmenu-item-icon-color);
+    color: ${dt('contextmenu.item.icon.color')};
     margin-left: auto;
     font-size: 0.875rem;
     width: 0.875rem;
@@ -80,37 +80,37 @@ export default {
 }
 
 .p-contextmenu .p-menuitem.p-focus > .p-menuitem-content {
-    color: var(--p-contextmenu-item-text-color-focus);
-    background: var(--p-contextmenu-item-background-focus);
+    color: ${dt('contextmenu.item.focus.color')};
+    background: ${dt('contextmenu.item.focus.background')};
 }
 
 .p-contextmenu .p-menuitem.p-focus > .p-menuitem-content .p-menuitem-icon,
 .p-contextmenu .p-menuitem.p-focus > .p-menuitem-content .p-submenu-icon {
-    color: var(--p-contextmenu-item-icon-color-focus);
+    color: ${dt('contextmenu.item.icon.focus.color')};
 }
 
 .p-contextmenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover {
-    color: var(--p-contextmenu-item-text-color-focus);
-    background: var(--p-contextmenu-item-background-focus);
+    color: ${dt('contextmenu.item.focus.color')};
+    background: ${dt('contextmenu.item.focus.background')};
 }
 
 .p-contextmenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover .p-menuitem-icon,
 .p-contextmenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover .p-submenu-icon {
-    color: var(--p-contextmenu-item-icon-color-focus);
+    color: ${dt('contextmenu.item.icon.focus.color')};
 }
 
 .p-contextmenu .p-menuitem.p-menuitem-active > .p-menuitem-content {
-    color: var(--p-contextmenu-item-text-color-focus);
-    background: var(--p-contextmenu-item-background-focus);
+    color: ${dt('contextmenu.item.focus.color')};
+    background: ${dt('contextmenu.item.focus.background')};
 }
 
 .p-contextmenu .p-menuitem.p-menuitem-active > .p-menuitem-content .p-menuitem-icon,
 .p-contextmenu .p-menuitem.p-menuitem-active > .p-menuitem-content .p-submenu-icon {
-    color: var(--p-contextmenu-item-icon-color-focus);
+    color: ${dt('contextmenu.item.icon.focus.color')};
 }
 
 .p-contextmenu .p-menuitem-separator {
-    border-top: 1px solid var(--p-contextmenu-separator-border-color);
+    border-top: 1px solid  ${dt('contextmenu.separator.border.color')};
     margin: 2px 0;
 }
 
diff --git a/components/lib/themes/primeone/base/megamenu/index.js b/components/lib/themes/primeone/base/megamenu/index.js
index cc5e71f6e..871fd5c92 100644
--- a/components/lib/themes/primeone/base/megamenu/index.js
+++ b/components/lib/themes/primeone/base/megamenu/index.js
@@ -4,9 +4,9 @@ export default {
     display: flex;
     position: relative;
     padding: 0.5rem 0.5rem;
-    background: var(--p-megamenu-background);
-    color: var(--p-megamenu-text-color);
-    border: 1px solid var(--p-megamenu-border-color);
+    background: ${dt('megamenu.background')};
+    color: ${dt('megamenu.color')};
+    border: 1px solid ${dt('megamenu.border.color')};
     border-radius: ${dt('rounded.base')};
 }
 
@@ -18,8 +18,8 @@ export default {
 
 .p-megamenu .p-menuitem-content {
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')};
-    border-radius: var(--p-rounded-sm);
-    color: var(--p-megamenu-item-text-color);
+    border-radius: ${dt('rounded.sm')};
+    color: ${dt('megamenu.item.color')};
 }
 
 .p-megamenu .p-menuitem-link {
@@ -39,42 +39,41 @@ export default {
 }
 
 .p-megamenu .p-menuitem-icon {
-    color: var(--p-megamenu-item-icon-color);
+    color: ${dt('megamenu.item.icon.color')};
     margin-right: 0.5rem;
 }
 
 .p-megamenu .p-menuitem.p-focus > .p-menuitem-content {
-    color: var(--p-megamenu-item-text-color-focus);
-    background: var(--p-megamenu-item-background-focus);
+    color: ${dt('megamenu.item.focus.color')};
+    background: ${dt('megamenu.item.focus.background')};
 }
 
 .p-megamenu .p-menuitem.p-focus > .p-menuitem-content .p-menuitem-icon,
 .p-megamenu .p-menuitem.p-focus > .p-menuitem-content .p-submenu-icon {
-    color: var(--p-megamenu-item-icon-color-focus);
+    color: ${dt('megamenu.item.icon.focus.color')};
 }
 
 .p-megamenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover {
-    color: var(--p-megamenu-item-text-color-focus);
-    background: var(--p-megamenu-item-background-focus);
+    color: ${dt('megamenu.item.focus.color')};
+    background: ${dt('megamenu.item.focus.background')};
 }
 
 .p-megamenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover .p-menuitem-icon,
 .p-megamenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover .p-submenu-icon {
-    color: var(--p-megamenu-item-icon-color-focus);
-}
+    color: ${dt('megamenu.item.icon.focus.color')};
 
 .p-megamenu .p-menuitem-active > .p-menuitem-content {
-    color: var(--p-megamenu-item-text-color-focus);
-    background: var(--p-megamenu-item-background-focus);
+    color: ${dt('megamenu.item.focus.color')};
+    background: ${dt('megamenu.item.focus.background')};
 }
 
 .p-megamenu .p-menuitem-active > .p-menuitem-content .p-menuitem-icon,
 .p-megamenu .p-menuitem-active > .p-menuitem-content .p-submenu-icon {
-    color: var(--p-megamenu-item-icon-color-focus);
+    color: ${dt('megamenu.item.icon.focus.color')};
 }
 
 .p-megamenu .p-submenu-icon {
-    color: var(--p-megamenu-item-icon-color);
+    color: ${dt('megamenu.item.icon.color')};
     margin-left: 0.5rem;
     font-size: 0.875rem;
     width: 0.875rem;
@@ -88,9 +87,9 @@ export default {
     z-index: 1;
     left: 0;
     min-width: 100%;
-    background: var(--p-megamenu-background);
-    color: var(--p-megamenu-text-color);
-    border: 1px solid var(--p-megamenu-border-color);
+    background: ${dt('megamenu.background')};
+    color: ${dt('megamenu.color')};
+    border: 1px solid ${dt('megamenu.border.color')};
     border-radius: ${dt('rounded.base')};
     box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1)
 }
@@ -121,13 +120,13 @@ export default {
 .p-megamenu-submenu .p-submenu-header {
     margin: 0;
     padding: 0.5rem 0.75rem;
-    color: var(--p-megamenu-submenu-header-text-color);
+    color: ${dt('megamenu.submenu.header.color')};
     font-weight: 600;
     margin-bottom: 2px;
 }
 
 .p-megamenu-submenu .p-menuitem-separator {
-    border-top: 1px solid var(--p-megamenu-separator-border-color);
+    border-top: 1px solid ${dt('megamenu.separator.border.color')};
     margin: 2px 0;
 }
 
@@ -207,7 +206,7 @@ export default {
     width: 1.75rem;
     height: 1.75rem;
     position: relative;
-    color: var(--p-megamenu-mobile-toggle-color);
+    color: ${dt('megamenu.mobile.toggle.color')};
     border: 0 none;
     background: transparent;
     border-radius: 50%;
@@ -216,8 +215,8 @@ export default {
 }
 
 .p-megamenu-button:hover {
-    color: var(--p-megamenu-mobile-toggle-color-hover);
-    background: var(--p-megamenu-mobile-toggle-background-hover);
+    color: ${dt('megamenu.mobile.toggle.hover.color')};
+    background: ${dt('megamenu.mobile.toggle.hover.background')};
 }
 
 .p-megamenu-button:focus-visible {
@@ -242,8 +241,8 @@ export default {
     z-index: 1;
     width: 100%;
     padding: 0.25rem 0.25rem;
-    background: var(--p-megamenu-background);
-    border: 1px solid var(--p-megamenu-border-color);
+    background: ${dt('megamenu.background')};
+    border: 1px solid ${dt('megamenu.border.color')};
     box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1);
     gap: 2px;
 }
diff --git a/components/lib/themes/primeone/base/menu/index.js b/components/lib/themes/primeone/base/menu/index.js
index 454bb06db..7a697c846 100644
--- a/components/lib/themes/primeone/base/menu/index.js
+++ b/components/lib/themes/primeone/base/menu/index.js
@@ -2,9 +2,9 @@ export default {
     css: ({ dt }) => `
 .p-menu {
     padding: 0.25rem 0.25rem;
-    background: var(--p-menu-background);
-    color: var(--p-menu-text-color);
-    border: 1px solid var(--p-menu-border-color);
+    background: ${dt('menu.background')};
+    color: ${dt('menu.color')};
+    border: 1px solid ${dt('menu.border.color')};
     border-radius: ${dt('rounded.base')};
     min-width: 12.5rem;
 }
@@ -45,32 +45,32 @@ export default {
 
 .p-menu .p-menuitem-content {
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')};
-    border-radius: var(--p-rounded-sm);
-    color: var(--p-menu-item-text-color);
+    border-radius:  ${dt('rounded.sm')};
+    color: ${dt('menu.item.color')};
 }
 
 .p-menu .p-menuitem-icon {
-    color: var(--p-menu-item-icon-color);
+    color: ${dt('menu.item.icon.color')};
     margin-right: 0.5rem;
 }
 
 .p-menu .p-menuitem.p-focus .p-menuitem-content {
-    color: var(--p-menu-item-text-color-focus);
-    background: var(--p-menu-item-background-focus);
+    color: ${dt('menu.item.focus.color')};
+    background: ${dt('menu.item.focus.background')};
 }
 
 .p-menu .p-menuitem.p-focus .p-menuitem-icon {
-    color: var(--p-menu-item-icon-color-focus);
+    color: ${dt('menu.item.icon.focus.color')};
 }
 
 .p-menu .p-menuitem:not(.p-disabled) .p-menuitem-content:hover {
-    color: var(--p-menu-item-text-color-focus);
-    background: var(--p-menu-item-background-focus);
+    color: ${dt('menu.item.focus.color')};
+    background: ${dt('menu.item.focus.background')};
 }
 
 .p-menu .p-menuitem:not(.p-disabled) .p-menuitem-content:hover .p-menuitem-icon,
 .p-menu .p-menuitem:not(.p-disabled) .p-menuitem-content:hover .p-submenu-icon {
-    color: var(--p-menu-item-icon-color-focus);
+    color: ${dt('menu.item.icon.focus.color')};
 }
 
 .p-menu.p-menu-overlay {
@@ -80,12 +80,12 @@ export default {
 .p-menu .p-submenu-header {
     margin: 0;
     padding: 0.5rem 0.75rem;
-    color: var(--p-menu-submenu-header-text-color);
+    color: ${dt('menu.submenu.header.color')};
     font-weight: 600;
 }
 
 .p-menu .p-menuitem-separator {
-    border-top: 1px solid var(--p-menu-separator-border-color);
+    border-top: 1px solid ${dt('menu.separator.border.color.color')};
     margin: 2px 0;
 }
 `
diff --git a/components/lib/themes/primeone/base/menubar/index.js b/components/lib/themes/primeone/base/menubar/index.js
index 1234db5b7..55ae4bd83 100644
--- a/components/lib/themes/primeone/base/menubar/index.js
+++ b/components/lib/themes/primeone/base/menubar/index.js
@@ -4,9 +4,9 @@ export default {
     display: flex;
     align-items: center;
     padding: 0.5rem 0.5rem;
-    background: var(--p-menubar-background);
-    color: var(--p-menubar-text-color);
-    border: 1px solid var(--p-menubar-border-color);
+    background: ${dt('menubar.background')};
+    color: ${dt('menubar.color')};
+    border: 1px solid ${dt('menubar.border.color')};
     border-radius: ${dt('rounded.base')};
 }
 
@@ -45,47 +45,47 @@ export default {
 
 .p-menubar .p-menuitem-content {
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')};
-    border-radius: var(--p-rounded-sm);
-    color: var(--p-menubar-item-text-color);
+    border-radius: ${dt('rounded.sm')});
+    color: ${dt('menubar.item.color')};
 }
 
 .p-menubar .p-menuitem-icon {
-    color: var(--p-menubar-item-icon-color);
+    color: ${dt('menubar.item.icon.color')};
     margin-right: 0.5rem;
 }
 
 .p-menubar .p-menuitem.p-focus > .p-menuitem-content {
-    color: var(--p-menubar-item-text-color-focus);
-    background: var(--p-menubar-item-background-focus);
+    color: ${dt('menubar.item.focus.color')};
+    background: ${dt('menubar.item.focus.background')};
 }
 
 .p-menubar .p-menuitem.p-focus > .p-menuitem-content .p-menuitem-icon,
 .p-menubar .p-menuitem.p-focus > .p-menuitem-content .p-submenu-icon {
-    color: var(--p-menubar-item-icon-color-focus);
+    color: ${dt('menubar.item.icon.focus.color')};
 }
 
 .p-menubar .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover {
-    color: var(--p-menubar-item-text-color-focus);
-    background: var(--p-menubar-item-background-focus);
+    color: ${dt('menubar.item.focus.color')};
+    background: ${dt('menubar.item.focus.background')};
 }
 
 .p-menubar .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover .p-menuitem-icon,
 .p-menubar .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover .p-submenu-icon {
-    color: var(--p-menubar-item-icon-color-focus);
+    color: ${dt('menubar.item.icon.focus.color')};
 }
 
 .p-menubar .p-menuitem-active > .p-menuitem-content {
-    color: var(--p-menubar-item-text-color-focus);
-    background: var(--p-menubar-item-background-focus);
+    color: ${dt('menubar.item.focus.color')};
+    background: ${dt('menubar.item.focus.background')};
 }
 
 .p-menubar .p-menuitem-active > .p-menuitem-content .p-menuitem-icon,
 .p-menubar .p-menuitem-active > .p-menuitem-content .p-submenu-icon {
-    color: var(--p-menubar-item-icon-color-focus);
+    color: ${dt('menubar.item.icon.focus.color')};
 }
 
 .p-menubar .p-submenu-icon {
-    color: var(--p-menubar-item-icon-color);
+    color: ${dt('menubar.item.icon.color')};
     margin-left: auto;
     font-size: 0.875rem;
     width: 0.875rem;
@@ -102,15 +102,15 @@ export default {
     min-width: 12.5rem;
     z-index: 1;
     padding: 0.25rem 0.25rem;
-    background: var(--p-menubar-background);
-    color: var(--p-menubar-text-color);
-    border: 1px solid var(--p-menubar-border-color);
+    background: ${dt('menubar.background')};
+    color: ${dt('menubar.color')};
+    border: 1px solid ${dt('menubar.border.color')};
     border-radius: ${dt('rounded.base')};
     box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1);
 }
 
 .p-menubar .p-submenu-list .p-menuitem-separator {
-    border-top: 1px solid var(--p-menubar-separator-border-color);
+    border-top: 1px solid ${dt('menubar.separator.border.color')};
     margin: 2px 0;
 }
 
@@ -146,7 +146,7 @@ export default {
     width: 1.75rem;
     height: 1.75rem;
     position: relative;
-    color: var(--p-menubar-mobile-toggle-color);
+    color: ${dt('menubar.mobile.toggle.color')};
     border: 0 none;
     background: transparent;
     border-radius: 50%;
@@ -155,8 +155,8 @@ export default {
 }
 
 .p-menubar-button:hover {
-    color: var(--p-menubar-mobile-toggle-color-hover);
-    background: var(--p-menubar-mobile-toggle-background-hover);
+    color: ${dt('menubar.mobile.toggle.hover.color')};
+    background: ${dt('menubar.mobile.toggle.hover.background')};
 }
 
 .p-menubar-button:focus-visible {
@@ -177,8 +177,8 @@ export default {
     display: none;
     width: 100%;
     padding: 0.25rem 0.25rem;
-    background: var(--p-menubar-background);
-    border: 1px solid var(--p-menubar-border-color);
+    background: ${dt('menubar.background')};
+    border: 1px solid ${dt('menubar.border.color')};
     box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1);
 }
 
diff --git a/components/lib/themes/primeone/base/panelmenu/index.js b/components/lib/themes/primeone/base/panelmenu/index.js
index cb9683a29..cb2faf1fe 100644
--- a/components/lib/themes/primeone/base/panelmenu/index.js
+++ b/components/lib/themes/primeone/base/panelmenu/index.js
@@ -7,9 +7,9 @@ export default {
 }
 
 .p-panelmenu-panel {
-    background: var(--p-panelmenu-panel-background);
-    border: 1px solid var(--p-panelmenu-panel-border-color);
-    color: var(--p-panelmenu-panel-text-color);
+    background: ${dt('panelmenu.panel.background')};
+    border: 1px solid ${dt('panelmenu.panel.border.color')};
+    color: ${dt('panelmenu.panel.color')};
     border-radius: ${dt('rounded.base')};
     padding: 0.25rem 0.25rem;
 }
@@ -21,9 +21,9 @@ export default {
 
 .p-panelmenu-header-content {
     border: 0 none;
-    color: var(--p-panelmenu-item-text-color);
+    color: ${dt('panelmenu.item.color')};
     border-radius: ${dt('rounded.base')};
-    transition: background-color 0.2s, color 0.2s, outline-color 0.2s;
+    transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     outline-color: transparent;
 }
 
@@ -42,27 +42,27 @@ export default {
 
 .p-panelmenu .p-submenu-icon,
 .p-panelmenu .p-menuitem-icon {
-    color: var(--p-panelmenu-item-icon-color);
+    color: ${dt('panelmenu.item.icon.icolor')};
 }
 
 .p-panelmenu-header:not(.p-disabled):focus-visible .p-panelmenu-header-content {
-    background: var(--p-panelmenu-item-background-focus);
-    color: var(--p-panelmenu-item-text-color-focus);
+    background: ${dt('panelmenu.item.focus.background')};
+    color: ${dt('panelmenu.item.focus.color')};
 }
 
 .p-panelmenu-header:not(.p-disabled):focus-visible .p-panelmenu-header-content .p-submenu-icon,
 .p-panelmenu-header:not(.p-disabled):focus-visible .p-panelmenu-header-content .p-menuitem-icon {
-    color: var(--p-panelmenu-item-icon-color-focus);
+    color: ${dt('panelmenu.item.icon.focus.color')};
 }
 
 .p-panelmenu-header:not(.p-disabled) .p-panelmenu-header-content:hover {
-    background: var(--p-panelmenu-item-background-focus);
-    color: var(--p-panelmenu-item-text-color-focus);
+    background: ${dt('panelmenu.item.focus.background')};
+    color: ${dt('panelmenu.item.focus.color')};
 }
 
 .p-panelmenu-header:not(.p-disabled).p-panelmenu-header-content:hover .p-submenu-icon,
 .p-panelmenu-header:not(.p-disabled) .p-panelmenu-header-content:hover .p-menuitem-icon {
-    color: var(--p-panelmenu-item-icon-color-focus);
+    color: ${dt('panelmenu.item.icon.focus.color')};
 }
 
 .p-panelmenu .p-menuitem {
@@ -102,27 +102,27 @@ export default {
 
 .p-panelmenu .p-menuitem-content {
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')};
-    border-radius: var(--p-rounded-sm);
-    color: var(--p-menu-item-text-color);
+    border-radius: ${dt('rounded.sm')};
+    color: ${dt('panelmenu.item.color')};
 }
 
 .p-panelmenu .p-menuitem.p-focus > .p-menuitem-content {
-    color: var(--p-panelmenu-item-text-color-focus);
-    background: var(--p-panelmenu-item-background-focus);
+    background: ${dt('panelmenu.item.focus.background')};
+    color: ${dt('panelmenu.item.focus.color')};
 }
 
 .p-panelmenu .p-menuitem.p-focus > .p-menuitem-icon {
-    color: var(--p-panelmenu-item-icon-color-focus);
+    color: ${dt('panelmenu.item.focus.color')};
 }
 
 .p-panelmenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover {
-    color: var(--p-panelmenu-item-text-color-focus);
-    background: var(--p-panelmenu-item-background-focus);
+    background: ${dt('panelmenu.item.focus.background')};
+    color: ${dt('panelmenu.item.focus.color')};
 }
 
 .p-panelmenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover .p-menuitem-icon,
 .p-panelmenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover .p-submenu-icon {
-    color: var(--p-panelmenu-item-icon-color-focus);
+    color: ${dt('panelmenu.item.focus.color')};
 }
 `
 };
diff --git a/components/lib/themes/primeone/base/steps/index.js b/components/lib/themes/primeone/base/steps/index.js
index c396da106..14f068c05 100644
--- a/components/lib/themes/primeone/base/steps/index.js
+++ b/components/lib/themes/primeone/base/steps/index.js
@@ -28,7 +28,7 @@ export default {
 
 .p-steps-item:before {
     content: " ";
-    border-top: 2px solid var(--p-steps-connector-border-color);
+    border-top: 2px solid ${dt('steps.connector.border.color')};
     width: 100%;
     top: 50%;
     left: 0;
@@ -69,7 +69,7 @@ export default {
     text-overflow: ellipsis;
     max-width: 100%;
     margin-top: 0.5rem;
-    color: var(--p-steps-item-text-color);
+    color: ${dt('steps.item.color')};
     display: block;
     font-weight: 500;
 }
@@ -78,9 +78,9 @@ export default {
     display: flex;
     align-items: center;
     justify-content: center;
-    color: var(--p-steps-marker-text-color);
-    border: 2px solid var(--p-steps-marker-border-color);
-    background: var(--p-steps-marker-background);
+    color: ${dt('steps.marker.color')};
+    border: 2px solid ${dt('steps.marker.border.color')};
+    background: ${dt('steps.marker.background')};
     min-width: 2rem;
     height: 2rem;
     line-height: 2rem;
@@ -105,13 +105,13 @@ export default {
 }
 
 .p-steps-current .p-steps-number {
-    background: var(--p-steps-marker-background-active);
-    color: var(--p-steps-marker-text-color-active);
+    background: ${dt('steps.marker.active.background')};
+    color: ${dt('steps.marker.active.color')};
 }
 
 .p-steps-current .p-steps-title {
     font-weight: 500;
-    color: var(--p-steps-item-text-color-active);
+    color: ${dt('steps.item.active.color')};
 }
 `
 };
diff --git a/components/lib/themes/primeone/base/tabmenu/index.js b/components/lib/themes/primeone/base/tabmenu/index.js
index 494f5d217..b75ee6a3a 100644
--- a/components/lib/themes/primeone/base/tabmenu/index.js
+++ b/components/lib/themes/primeone/base/tabmenu/index.js
@@ -10,8 +10,8 @@ export default {
     padding: 0;
     list-style-type: none;
     flex: 1 1 auto;
-    background: var(--p-tabmenu-nav-background);
-    border: 1px solid var(--p-tabmenu-nav-border-color);
+    background: ${dt('tabmenu.nav.background')};
+    border: 1px solid ${dt('tabmenu.nav.border.color')};
     border-width: 0 0 1px 0;
     position: relative;
 }
@@ -26,8 +26,8 @@ export default {
     overflow: hidden;
     border-style: solid;
     border-width: 0 0 1px 0;
-    border-color: transparent transparent var(--p-tabmenu-header-border-color) transparent;
-    color: var(--p-tabmenu-header-text-color);
+    border-color: transparent transparent ${dt('tabmenu.header.border.color')} transparent;
+    color: ${dt('tabmenu.header.color')};
     padding: 1rem 1.125rem;
     font-weight: 600;
     border-top-right-radius: ${dt('rounded.base')};
@@ -51,11 +51,11 @@ export default {
 }
 
 .p-tabmenuitem:not(.p-highlight):not(.p-disabled):hover .p-menuitem-link {
-    color: var(--p-tabmenu-header-text-color-hover);
+    color: ${dt('tabmenu.header.hover.color')};
 }
 
 .p-tabmenuitem.p-highlight .p-menuitem-link {
-    color: var(--p-primary-color);
+    color: ${dt('tabmenu.header.active.border.color')};
 }
 
 .p-tabmenu-ink-bar {
@@ -64,7 +64,7 @@ export default {
     position: absolute;
     bottom: -1px;
     height: 1px;
-    background-color: var(--p-primary-color);
+    background-color: ${dt('tabmenu.header.active.border.color')};
     transition: 250ms cubic-bezier(0.35, 0, 0.25, 1);
 }
 
diff --git a/components/lib/themes/primeone/base/tieredmenu/index.js b/components/lib/themes/primeone/base/tieredmenu/index.js
index 080fbbfae..cd3cfb37d 100644
--- a/components/lib/themes/primeone/base/tieredmenu/index.js
+++ b/components/lib/themes/primeone/base/tieredmenu/index.js
@@ -2,9 +2,9 @@ export default {
     css: ({ dt }) => `
 .p-tieredmenu {
     padding: 0.25rem 0.25rem;
-    background: var(--p-tieredmenu-background);
-    color: var(--p-tieredmenu-text-color);
-    border: 1px solid var(--p-tieredmenu-border-color);
+    background: ${dt('tieredmenu.background')};
+    color: ${dt('tieredmenu.color')};
+    border: 1px solid ${dt('tieredmenu.border.color')};
     border-radius: ${dt('rounded.base')};
     min-width: 12.5rem;
 }
@@ -24,9 +24,9 @@ export default {
     min-width: 100%;
     z-index: 1;
     padding: 0.25rem 0.25rem;
-    background: var(--p-tieredmenu-background);
-    color: var(--p-tieredmenu-text-color);
-    border: 1px solid var(--p-tieredmenu-border-color);
+    background: ${dt('tieredmenu.background')};
+    color: ${dt('tieredmenu.color')};
+    border: 1px solid ${dt('tieredmenu.border.color')};
     border-radius: ${dt('rounded.base')};
     box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1);
 }
@@ -61,17 +61,17 @@ export default {
 
 .p-tieredmenu .p-menuitem-content {
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')};
-    border-radius: var(--p-rounded-sm);
-    color: var(--p-tieredmenu-item-text-color);
+    border-radius: ${dt('rounded.sm')};
+    color: ${dt('tieredmenu.item.color')};
 }
 
 .p-tieredmenu .p-menuitem-icon {
-    color: var(--p-tieredmenu-item-icon-color);
+    color: ${dt('tieredmenu.item.icon.color')};
     margin-right: 0.5rem;
 }
 
 .p-tieredmenu .p-submenu-icon {
-    color: var(--p-tieredmenu-item-icon-color);
+    color: ${dt('tieredmenu.item.icon.color')};
     margin-left: auto;
     font-size: 0.875rem;
     width: 0.875rem;
@@ -79,37 +79,37 @@ export default {
 }
 
 .p-tieredmenu .p-menuitem.p-focus > .p-menuitem-content {
-    color: var(--p-tieredmenu-item-text-color-focus);
-    background: var(--p-tieredmenu-item-background-focus);
+    color: ${dt('tieredmenu.item.focus.color')};
+    background: ${dt('tieredmenu.item.focus.background')};
 }
 
 .p-tieredmenu .p-menuitem.p-focus > .p-menuitem-content .p-menuitem-icon,
 .p-tieredmenu .p-menuitem.p-focus > .p-menuitem-content .p-submenu-icon {
-    color: var(--p-tieredmenu-item-icon-color-focus);
+    color: ${dt('tieredmenu.item.icon.focus.color')};
 }
 
 .p-tieredmenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover {
-    color: var(--p-tieredmenu-item-text-color-focus);
-    background: var(--p-tieredmenu-item-background-focus);
+    color: ${dt('tieredmenu.item.focus.color')};
+    background: ${dt('tieredmenu.item.focus.background')};
 }
 
 .p-tieredmenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover .p-menuitem-icon,
 .p-tieredmenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover .p-submenu-icon {
-    color: var(--p-tieredmenu-item-icon-color-focus);
+    color: ${dt('tieredmenu.item.icon.focus.color')};
 }
 
 .p-tieredmenu .p-menuitem.p-menuitem-active > .p-menuitem-content {
-    color: var(--p-tieredmenu-item-text-color-focus);
-    background: var(--p-tieredmenu-item-background-focus);
+    color: ${dt('tieredmenu.item.focus.color')};
+    background: ${dt('tieredmenu.item.focus.background')};
 }
 
 .p-tieredmenu .p-menuitem.p-menuitem-active > .p-menuitem-content .p-menuitem-icon,
 .p-tieredmenu .p-menuitem.p-menuitem-active > .p-menuitem-content .p-submenu-icon {
-    color: var(--p-tieredmenu-item-icon-color-focus);
+    color: ${dt('tieredmenu.item.icon.focus.color')};
 }
 
 .p-tieredmenu .p-menuitem-separator {
-    border-top: 1px solid var(--p-tieredmenu-separator-border-color);
+    border-top: 1px solid ${dt('tieredmenu.separator.border.color')};
     margin: 2px 0;
 }
 
diff --git a/components/lib/themes/primeone/presets/aura/breadcrumb/index.js b/components/lib/themes/primeone/presets/aura/breadcrumb/index.js
index 5f2dce622..254fc64fd 100644
--- a/components/lib/themes/primeone/presets/aura/breadcrumb/index.js
+++ b/components/lib/themes/primeone/presets/aura/breadcrumb/index.js
@@ -5,8 +5,8 @@ export default {
         },
         light: {
             item: {
-                textColor: '{surface.500}',
-                textColorHover: '{surface.700}',
+                color: '{surface.500}',
+                hoverColor: '{surface.700}',
                 iconColor: '{surface.400}'
             },
             separator: {
@@ -18,8 +18,8 @@ export default {
                 background: '{surface.900}'
             },
             item: {
-                textColor: '{surface.400}',
-                textColorHover: '{surface.0}',
+                color: '{surface.400}',
+                hoverColor: '{surface.0}',
                 iconColor: '{surface.500}'
             },
             separator: {
diff --git a/components/lib/themes/primeone/presets/aura/contextmenu/index.js b/components/lib/themes/primeone/presets/aura/contextmenu/index.js
index 1813399e6..8af36aebd 100644
--- a/components/lib/themes/primeone/presets/aura/contextmenu/index.js
+++ b/components/lib/themes/primeone/presets/aura/contextmenu/index.js
@@ -4,14 +4,12 @@ export default {
             root: {
                 background: '{surface.0}',
                 borderColor: '{surface.200}',
-                textColor: '{surface.700}'
+                color: '{surface.700}'
             },
             item: {
-                backgroundFocus: '{surface.100}',
-                text: {
-                    color: '{surface.700}',
-                    colorFocus: '{surface.800}'
-                },
+                focusBackground: '{surface.100}',
+                color: '{surface.700}',
+                colorFocus: '{surface.800}',
                 icon: {
                     color: '{surface.400}',
                     colorFocus: '{surface.500}'
@@ -25,14 +23,12 @@ export default {
             root: {
                 background: '{surface.900}',
                 borderColor: '{surface.700}',
-                textColor: '{surface.0}'
+                color: '{surface.0}'
             },
             item: {
-                backgroundFocus: '{surface.800}',
-                text: {
-                    color: '{surface.0}',
-                    colorFocus: '{surface.0}'
-                },
+                focusBackground: '{surface.800}',
+                color: '{surface.0}',
+                colorFocus: '{surface.0}',
                 icon: {
                     color: '{surface.500}',
                     colorFocus: '{surface.400}'
diff --git a/components/lib/themes/primeone/presets/aura/megamenu/index.js b/components/lib/themes/primeone/presets/aura/megamenu/index.js
index edae232a5..b07588ed6 100644
--- a/components/lib/themes/primeone/presets/aura/megamenu/index.js
+++ b/components/lib/themes/primeone/presets/aura/megamenu/index.js
@@ -4,58 +4,54 @@ export default {
             root: {
                 background: '{surface.0}',
                 borderColor: '{surface.200}',
-                textColor: '{surface.700}'
+                color: '{surface.700}'
             },
             item: {
-                backgroundFocus: '{surface.100}',
-                text: {
-                    color: '{surface.700}',
-                    colorFocus: '{surface.800}'
-                },
+                focusBackground: '{surface.100}',
+                color: '{surface.700}',
+                focusColor: '{surface.800}',
                 icon: {
                     color: '{surface.400}',
-                    colorFocus: '{surface.500}'
+                    focusColor: '{surface.500}'
                 }
             },
             submenuHeader: {
-                textColor: '{surface.400}'
+                color: '{surface.400}'
             },
             separator: {
                 borderColor: '{surface.200}'
             },
             mobileToggle: {
                 color: '{surface.500}',
-                colorHover: '{surface.600}',
-                backgroundHover: '{surface.100}'
+                hoverColor: '{surface.600}',
+                hoverBackground: '{surface.100}'
             }
         },
         dark: {
             root: {
                 background: '{surface.900}',
                 borderColor: '{surface.700}',
-                textColor: '{surface.0}'
+                color: '{surface.0}'
             },
             item: {
-                backgroundFocus: '{surface.800}',
-                text: {
-                    color: '{surface.0}',
-                    colorFocus: '{surface.0}'
-                },
+                focusBackground: '{surface.800}',
+                color: '{surface.0}',
+                focusColor: '{surface.0}',
                 icon: {
                     color: '{surface.500}',
-                    colorFocus: '{surface.400}'
+                    focusColor: '{surface.400}'
                 }
             },
             submenuHeader: {
-                textColor: '{surface.500}'
+                color: '{surface.500}'
             },
             separator: {
                 borderColor: '{surface.700}'
             },
             toggleIcon: {
                 color: '{surface.400}',
-                colorHover: '{surface.300}',
-                backgroundHover: '{surface.800}'
+                hoverColor: '{surface.300}',
+                hoverBackground: '{surface.800}'
             }
         }
     }
diff --git a/components/lib/themes/primeone/presets/aura/menu/index.js b/components/lib/themes/primeone/presets/aura/menu/index.js
index 6ea935ee0..56ab8a4dc 100644
--- a/components/lib/themes/primeone/presets/aura/menu/index.js
+++ b/components/lib/themes/primeone/presets/aura/menu/index.js
@@ -4,21 +4,19 @@ export default {
             root: {
                 background: '{surface.0}',
                 borderColor: '{surface.200}',
-                textColor: '{surface.700}'
+                color: '{surface.700}'
             },
             item: {
-                backgroundFocus: '{surface.100}',
-                text: {
-                    color: '{surface.700}',
-                    colorFocus: '{surface.800}'
-                },
+                focusBackground: '{surface.100}',
+                color: '{surface.700}',
+                focusColor: '{surface.800}',
                 icon: {
                     color: '{surface.400}',
-                    colorFocus: '{surface.500}'
+                    focusColor: '{surface.500}'
                 }
             },
             submenuHeader: {
-                textColor: '{surface.400}'
+                color: '{surface.400}'
             },
             separator: {
                 borderColor: '{surface.200}'
@@ -28,21 +26,19 @@ export default {
             root: {
                 background: '{surface.900}',
                 borderColor: '{surface.700}',
-                textColor: '{surface.0}'
+                color: '{surface.0}'
             },
             item: {
-                backgroundFocus: '{surface.800}',
-                text: {
-                    color: '{surface.0}',
-                    colorFocus: '{surface.0}'
-                },
+                focusBackground: '{surface.800}',
+                color: '{surface.0}',
+                focusColor: '{surface.0}',
                 icon: {
                     color: '{surface.500}',
-                    colorFocus: '{surface.400}'
+                    focusColor: '{surface.400}'
                 }
             },
             submenuHeader: {
-                textColor: '{surface.500}'
+                color: '{surface.500}'
             },
             separator: {
                 borderColor: '{surface.700}'
diff --git a/components/lib/themes/primeone/presets/aura/menubar/index.js b/components/lib/themes/primeone/presets/aura/menubar/index.js
index 515e96e26..e5796991d 100644
--- a/components/lib/themes/primeone/presets/aura/menubar/index.js
+++ b/components/lib/themes/primeone/presets/aura/menubar/index.js
@@ -4,17 +4,15 @@ export default {
             root: {
                 background: '{surface.0}',
                 borderColor: '{surface.200}',
-                textColor: '{surface.700}'
+                color: '{surface.700}'
             },
             item: {
-                backgroundFocus: '{surface.100}',
-                text: {
-                    color: '{surface.700}',
-                    colorFocus: '{surface.800}'
-                },
+                focusBackground: '{surface.100}',
+                color: '{surface.700}',
+                focusColor: '{surface.800}',
                 icon: {
                     color: '{surface.400}',
-                    colorFocus: '{surface.500}'
+                    focusColor: '{surface.500}'
                 }
             },
             separator: {
@@ -22,25 +20,23 @@ export default {
             },
             mobileToggle: {
                 color: '{surface.500}',
-                colorHover: '{surface.600}',
-                backgroundHover: '{surface.100}'
+                hoverColor: '{surface.600}',
+                hoverBackground: '{surface.100}'
             }
         },
         dark: {
             root: {
                 background: '{surface.900}',
                 borderColor: '{surface.700}',
-                textColor: '{surface.0}'
+                color: '{surface.0}'
             },
             item: {
-                backgroundFocus: '{surface.800}',
-                text: {
-                    color: '{surface.0}',
-                    colorFocus: '{surface.0}'
-                },
+                focusBackground: '{surface.800}',
+                color: '{surface.0}',
+                focusColor: '{surface.0}',
                 icon: {
                     color: '{surface.500}',
-                    colorFocus: '{surface.400}'
+                    focusColor: '{surface.400}'
                 }
             },
             separator: {
@@ -48,8 +44,8 @@ export default {
             },
             mobileToggle: {
                 color: '{surface.400}',
-                colorHover: '{surface.300}',
-                backgroundHover: '{surface.800}'
+                hoverColor: '{surface.300}',
+                hoverBackground: '{surface.800}'
             }
         }
     }
diff --git a/components/lib/themes/primeone/presets/aura/panelmenu/index.js b/components/lib/themes/primeone/presets/aura/panelmenu/index.js
index ccd4359d2..9328b39a6 100644
--- a/components/lib/themes/primeone/presets/aura/panelmenu/index.js
+++ b/components/lib/themes/primeone/presets/aura/panelmenu/index.js
@@ -4,17 +4,15 @@ export default {
             panel: {
                 background: '{surface.0}',
                 borderColor: '{surface.200}',
-                textColor: '{surface.700}'
+                color: '{surface.700}'
             },
             item: {
-                backgroundFocus: '{surface.100}',
-                text: {
-                    color: '{surface.700}',
-                    colorFocus: '{surface.800}'
-                },
+                focusBackground: '{surface.100}',
+                color: '{surface.700}',
+                focusColor: '{surface.800}',
                 icon: {
                     color: '{surface.400}',
-                    colorFocus: '{surface.500}'
+                    focusColor: '{surface.500}'
                 }
             }
         },
@@ -22,17 +20,15 @@ export default {
             panel: {
                 background: '{surface.900}',
                 borderColor: '{surface.700}',
-                textColor: '{surface.0}'
+                color: '{surface.0}'
             },
             item: {
-                backgroundFocus: '{surface.800}',
-                text: {
-                    color: '{surface.0}',
-                    colorFocus: '{surface.0}'
-                },
+                focusBackground: '{surface.800}',
+                color: '{surface.0}',
+                focusColor: '{surface.0}',
                 icon: {
                     color: '{surface.500}',
-                    colorFocus: '{surface.400}'
+                    focusColor: '{surface.400}'
                 }
             }
         }
diff --git a/components/lib/themes/primeone/presets/aura/steps/index.js b/components/lib/themes/primeone/presets/aura/steps/index.js
index 5fda1e822..b82cee3e4 100644
--- a/components/lib/themes/primeone/presets/aura/steps/index.js
+++ b/components/lib/themes/primeone/presets/aura/steps/index.js
@@ -5,15 +5,15 @@ export default {
                 borderColor: '{surface.200}'
             },
             item: {
-                textColor: '{surface.700}',
-                textColorActive: '{primary.color}'
+                color: '{surface.700}',
+                activeColor: '{primary.color}'
             },
             marker: {
                 background: '{surface.0}',
-                backgroundActive: '{surface.0}',
+                activeBackground: '{surface.0}',
                 borderColor: '{surface.200}',
-                textColor: '{surface.500}',
-                textColorActive: '{primary.color}'
+                color: '{surface.500}',
+                activeColor: '{primary.color}'
             }
         },
         dark: {
@@ -21,15 +21,15 @@ export default {
                 borderColor: '{surface.700}'
             },
             item: {
-                textColor: '{surface.0}',
-                textColorActive: '{primary.color}'
+                color: '{surface.0}',
+                activeColor: '{primary.color}'
             },
             marker: {
                 background: '{surface.900}',
-                backgroundActive: '{surface.900}',
+                activeBackground: '{surface.900}',
                 borderColor: '{surface.700}',
-                textColor: '{surface.400}',
-                textColorActive: '{primary.color}'
+                color: '{surface.400}',
+                activeColor: '{primary.color}'
             }
         }
     }
diff --git a/components/lib/themes/primeone/presets/aura/tabmenu/index.js b/components/lib/themes/primeone/presets/aura/tabmenu/index.js
index 05b0c6e2e..b1ba81b9e 100644
--- a/components/lib/themes/primeone/presets/aura/tabmenu/index.js
+++ b/components/lib/themes/primeone/presets/aura/tabmenu/index.js
@@ -7,8 +7,9 @@ export default {
             },
             header: {
                 borderColor: '{surface.200}',
-                textColor: '{surface.500}',
-                textColorHover: '{surface.700}'
+                activeBorderColor: '{primary.color}',
+                color: '{surface.500}',
+                hoverColor: '{surface.700}'
             }
         },
         dark: {
@@ -18,8 +19,9 @@ export default {
             },
             header: {
                 borderColor: '{surface.700}',
-                textColor: '{surface.400}',
-                textColorHover: '{surface.0}'
+                activeBorderColor: '{primary.color}',
+                color: '{surface.400}',
+                hoverColor: '{surface.0}'
             }
         }
     }
diff --git a/components/lib/themes/primeone/presets/aura/tieredmenu/index.js b/components/lib/themes/primeone/presets/aura/tieredmenu/index.js
index 1813399e6..59771d3f6 100644
--- a/components/lib/themes/primeone/presets/aura/tieredmenu/index.js
+++ b/components/lib/themes/primeone/presets/aura/tieredmenu/index.js
@@ -4,17 +4,15 @@ export default {
             root: {
                 background: '{surface.0}',
                 borderColor: '{surface.200}',
-                textColor: '{surface.700}'
+                color: '{surface.700}'
             },
             item: {
-                backgroundFocus: '{surface.100}',
-                text: {
-                    color: '{surface.700}',
-                    colorFocus: '{surface.800}'
-                },
+                focusBackground: '{surface.100}',
+                color: '{surface.700}',
+                focusColor: '{surface.800}',
                 icon: {
                     color: '{surface.400}',
-                    colorFocus: '{surface.500}'
+                    focusColor: '{surface.500}'
                 }
             },
             separator: {
@@ -25,17 +23,15 @@ export default {
             root: {
                 background: '{surface.900}',
                 borderColor: '{surface.700}',
-                textColor: '{surface.0}'
+                color: '{surface.0}'
             },
             item: {
-                backgroundFocus: '{surface.800}',
-                text: {
-                    color: '{surface.0}',
-                    colorFocus: '{surface.0}'
-                },
+                focusBackground: '{surface.800}',
+                color: '{surface.0}',
+                focusColor: '{surface.0}',
                 icon: {
                     color: '{surface.500}',
-                    colorFocus: '{surface.400}'
+                    focusColor: '{surface.400}'
                 }
             },
             separator: {