diff --git a/components/lib/themes/primeone/base/autocomplete/index.js b/components/lib/themes/primeone/base/autocomplete/index.js
index 063ec8e2a..e88a0b03d 100644
--- a/components/lib/themes/primeone/base/autocomplete/index.js
+++ b/components/lib/themes/primeone/base/autocomplete/index.js
@@ -40,9 +40,9 @@ export default {
     overflow: auto;
     top: 0;
     left: 0;
-    background: var(--p-autocomplete-overlay-background);
-    color: var(--p-autocomplete-overlay-text-color);
-    border: 1px solid var(--p-autocomplete-overlay-border-color);
+    background: ${dt('autocomplete.overlay.background')};
+    color: ${dt('autocomplete.overlay.color')};
+    border: 1px solid ${dt('autocomplete.overlay.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,10 +62,10 @@ export default {
     margin: 2px 0;
     padding: 0.5rem 0.75rem;
     border: 0 none;
-    color: var(--p-autocomplete-item-text-color);
+    color: ${dt('autocomplete.item.color')};
     background: transparent;
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')};
-    border-radius: var(--p-rounded-sm);
+    border-radius: ${dt('rounded.sm')};
 }
 
 .p-autocomplete-item:first-child {
@@ -77,25 +77,25 @@ export default {
 }
 
 .p-autocomplete-item:not(.p-highlight):not(.p-disabled).p-focus {
-    background: var(--p-autocomplete-item-background-focus);
-    color: var(--p-autocomplete-item-text-color-focus);
+    background: ${dt('autocomplete.item.focus.background')};
+    color: ${dt('autocomplete.item.focus.background')};
 }
 
 .p-autocomplete-item.p-highlight {
-    color: var(--p-autocomplete-item-background-selected);
-    background: var(--p-autocomplete-item-text-color-selected);
+    color: ${dt('autocomplete.item.selected.background')};
+    background: ${dt('autocomplete.item.selected.background')};
 }
 
 .p-autocomplete-item.p-highlight.p-focus {
-    color: var(--p-autocomplete-item-background-selected-focus);
-    background: var(--p-autocomplete-item-text-color-selected-focus);
+    color: ${dt('autocomplete.item.selected.focus.background')};
+    background: ${dt('autocomplete.item.selected.focus.background')};
 }
 
 .p-autocomplete-item-group {
     margin: 0;
     padding: 0.5rem 0.75rem;
-    color: var(--p-autocomplete-item-group-text-color);
-    background: var(--p-autocomplete-item-group-background);
+    color: ${dt('autocomplete.item.group.color')};
+    background: ${dt('autocomplete.item.group.background')};
     font-weight: 600;
 }
 
@@ -110,41 +110,41 @@ export default {
     flex-wrap: wrap;
     padding: 0.25rem 0.25rem;
     gap: 0.25rem;
-    color: var(--p-autocomplete-input-multiple-text-color);
-    background: var(--p-autocomplete-input-multiple-background);
-    border: 1px solid var(--p-autocomplete-input-multiple-border-color);
+    color: ${dt('autocomplete.input.multiple.color')};
+    background: ${dt('autocomplete.input.multiple.background')};
+    border: 1px solid ${dt('autocomplete.input.multiple.border.color')});
     border-radius: ${dt('rounded.base')};
     width: 100%;
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     outline-color: transparent;
-    box-shadow: var(--p-autocomplete-input-multiple-box-shadow);
+    box-shadow: ${dt('autocomplete.input.multiple.box.shadow')};
 }
 
 .p-autocomplete:not(.p-disabled):hover .p-autocomplete-multiple-container {
-    border-color:  var(--p-autocomplete-input-multiple-border-color-hover);
+    border-color: ${dt('autocomplete.input.multiple.hover.border.color')};
 }
 
 .p-autocomplete:not(.p-disabled).p-focus .p-autocomplete-multiple-container {
-    border-color: var(--p-autocomplete-input-multiple-border-color-focus);
+    border-color: ${dt('autocomplete.input.multiple.focus.border.color')};
     outline: 0 none;
 }
 
 .p-autocomplete.p-invalid .p-autocomplete-multiple-container {
-    border-color: var(--p-autocomplete-input-multiple-border-color-invalid);
+    border-color: ${dt('autocomplete.input.multiple.invalid.border.color')};
 }
 
 .p-variant-filled.p-autocomplete-multiple-container {
-    background: var(--p-autocomplete-input-multiple-background-filled);
+    background: ${dt('autocomplete.input.multiple.filled.background')};
 }
 
 .p-autocomplete:not(.p-disabled).p-focus .p-variant-filled.p-autocomplete-multiple-container  {
-    background: var(--p-autocomplete-input-multiple-background-filled-focus);
+    background: ${dt('autocomplete.input.multiple.filled.focus.background')};
 }
 
 .p-autocomplete.p-disabled .p-autocomplete-multiple-container {
     opacity: 1;
-    background: var(--p-autocomplete-input-multiple-background-disabled);
-    color: var(--p-autocomplete-input-multiple-text-color-disabled);
+    background: ${dt('autocomplete.input.multiple.disabled.background')};
+    color: ${dt('autocomplete.input.multiple.disabled.color')};
 }
 
 .p-autocomplete-token {
@@ -153,14 +153,14 @@ export default {
     align-items: center;
     flex: 0 0 auto;
     padding: 0.25rem 0.75rem;
-    background: var(--p-autocomplete-chip-background);
-    color: var(--p-autocomplete-chip-text-color);
-    border-radius: var(--p-rounded-sm);
+    background: ${dt('autocomplete.chip.background')};
+    color: ${dt('autocomplete.chip.color')};
+    border-radius: ${dt('rounded.sm')};
 }
 
 .p-autocomplete-token.p-focus {
-    background: var(--p-autocomplete-chip-background-focus);
-    color: var(--p-autocomplete-chip-text-color-focus);
+    background: ${dt('autocomplete.chip.focus.background')};
+    color: ${dt('autocomplete.chip.focus.color')};
 }
 
 .p-autocomplete-input-token {
@@ -196,7 +196,7 @@ export default {
 }
 
 .p-autocomplete-input-token input::placeholder {
-    color: var(--p-chips-placeholder-text-color);
+    color: ${dt('autocomplete.input.multiple.placeholder.color')};
 }
 
 .p-fluid .p-autocomplete {
diff --git a/components/lib/themes/primeone/base/calendar/index.js b/components/lib/themes/primeone/base/calendar/index.js
index 7955e2656..8c1bfbb08 100644
--- a/components/lib/themes/primeone/base/calendar/index.js
+++ b/components/lib/themes/primeone/base/calendar/index.js
@@ -39,9 +39,9 @@ export default {
 .p-datepicker {
     width: auto;
     padding: 0.75rem;
-    background: var(--p-calendar-background);
-    color: var(--p-calendar-text-color);
-    border: 1px solid var(--p-calendar-border-color);
+    background: ${dt('calendar.background')};
+    color: ${dt('calendar.color')};
+    border: 1px solid ${dt('calendar.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);
 }
@@ -58,9 +58,9 @@ export default {
     justify-content: space-between;
     padding: 0 0 0.5rem 0;
     font-weight: 500;
-    background: var(--p-calendar-header-background);
-    color: var(--p-calendar-header-text-color);
-    border-bottom: 1px solid var(--p-calendar-header-border-color);
+    background: ${dt('calendar.header.background')};
+    color: ${dt('calendar.header.color')};
+    border-bottom: 1px solid ${dt('calendar.header.border.color')};
 }
 
 .p-datepicker-title {
@@ -78,7 +78,7 @@ export default {
     position: relative;
     width: 1.75rem;
     height: 1.75rem;
-    color: var(--p-calendar-navigator-color);
+    color: ${dt('calendar.navigator.color')};
     border: 0 none;
     background: transparent;
     border-radius: 50%;
@@ -88,8 +88,8 @@ export default {
 
 .p-datepicker-prev:enabled:hover,
 .p-datepicker-next:enabled:hover {
-    color: var(--p-calendar-navigator-color-hover);
-    background: var(--p-calendar-navigator-background-hover);
+    background: ${dt('calendar.navigator.hover.background')};
+    color: ${dt('calendar.navigator.hover.color')};
 }
 
 .p-datepicker-prev:focus-visible,
@@ -107,22 +107,22 @@ export default {
 
 .p-datepicker-month {
     margin-right: 0.5rem;
-    color: var(--p-calendar-month-picker-text-color);
+    color: ${dt('calendar.month.picker.color')};
 }
 
 .p-datepicker-year {
     margin-right: 0.5rem;
-    color: var(--p-calendar-year-picker-text-color);
+    color: ${dt('calendar.year.picker.color')};
 }
 
 .p-datepicker-month:enabled:hover {
-    color: var(--p-calendar-month-picker-text-color-hover);
-    background: var(--p-calendar-month-picker-background-hover);
+    background: ${dt('calendar.month.picker.hover.background')};
+    color: ${dt('calendar.month.picker.hover.color')};
 }
 
 .p-datepicker-year:enabled:hover {
-    color: var(--p-calendar-year-picker-text-color-hover);
-    background: var(--p-calendar-year-picker-background-hover);
+    background: ${dt('calendar.year.picker.hover.background')};
+    color: ${dt('calendar.year.picker.hover.color')};
 }
 
 .p-datepicker-multiple-month .p-datepicker-group-container {
@@ -131,7 +131,7 @@ export default {
 
 .p-datepicker-multiple-month .p-datepicker-group {
     flex: 1 1 auto;
-    border-left: 1px solid var(--p-calendar-group-border-color);
+    border-left: 1px solid ${dt('calendar.group.border.color')};
     padding-right: 0.75rem;
     padding-left: 0.75rem;
     padding-top: 0;
@@ -182,12 +182,12 @@ export default {
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, box-shadow ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     border: 1px solid transparent;
     outline-color: transparent;
-    color: var(--p-calendar-date-text-color);
+    color: ${dt('calendar.date.color')};
 }
 
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
-    background: var(--p-calendar-date-background-hover);
-    color: var(--p-calendar-date-text-color-hover);
+    background: ${dt('calendar.date.hover.background')};
+    color: ${dt('calendar.date.hover.color')};
 }
 
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):focus-visible {
@@ -196,18 +196,18 @@ export default {
 }
 
 .p-datepicker table td > span.p-highlight {
-    background: var(--p-calendar-date-background-highlight);
-    color: var(--p-calendar-date-text-color-highlight);
+    background: ${dt('calendar.date.selected.background')};
+    color: ${dt('calendar.date.selected.color')};
 }
 
 .p-datepicker table td.p-datepicker-today > span {
-    background: var(--p-calendar-today-background);
-    color: var(--p-calendar-today-text-color);
+    background: ${dt('calendar.today.background')};
+    color: ${dt('calendar.today.color')};
 }
 
 .p-datepicker table td.p-datepicker-today > span.p-highlight {
-    background: var(--p-calendar-date-background-highlight);
-    color: var(--p-calendar-date-text-color-highlight);
+    background: ${dt('calendar.date.selected.background')};
+    color: ${dt('calendar.date.selected.color')};
 }
 
 .p-monthpicker {
@@ -226,17 +226,17 @@ export default {
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, box-shadow ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     border-radius: ${dt('rounded.base')};
     outline-color: transparent;
-    color: var(--p-calendar-month-text-color);
+    color: ${dt('calendar.month.color')};
 }
 
 .p-datepicker:not(.p-disabled) .p-monthpicker .p-monthpicker-month:not(.p-disabled):not(.p-highlight):hover {
-    background: var(--p-calendar-month-background-hover);
-    color: var(--p-calendar-month-text-color-hover);
+    color:  ${dt('calendar.month.hover.color')};
+    background: ${dt('calendar.month.hover.background')};
 }
 
 .p-monthpicker-month.p-highlight {
-    background: var(--p-calendar-month-background-selected);
-    color: var(--p-calendar-month-text-color-selected);
+    color: ${dt('calendar.month.selected.color')};
+    background: ${dt('calendar.month.selected.background')};
 }
 
 .p-datepicker:not(.p-disabled) .p-monthpicker .p-monthpicker-month:not(.p-disabled):focus-visible {
@@ -261,17 +261,17 @@ export default {
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, box-shadow ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     border-radius: ${dt('rounded.base')};
     outline-color: transparent;
-    color: var(--p-calendar-year-text-color);
+    color: ${dt('calendar.year.color')};
 }
 
 .p-datepicker:not(.p-disabled) .p-yearpicker .p-yearpicker-year:not(.p-disabled):not(.p-highlight):hover {
-    background: var(--p-calendar-year-background-hover);
-    color: var(--p-calendar-year-text-color-hover);
+    color:  ${dt('calendar.year.hover.color')};
+    background: ${dt('calendar.year.hover.background')};
 }
 
 .p-yearpicker-year.p-highlight {
-    background: var(--p-calendar-year-background-selected);
-    color: var(--p-calendar-year-text-color-selected);
+    color: ${dt('calendar.year.selected.color')};
+    background: ${dt('calendar.year.selected.background')};
 }
 
 .p-datepicker:not(.p-disabled) .p-yearpicker .p-yearpicker-year:not(.p-disabled):focus-visible {
@@ -284,7 +284,7 @@ export default {
     justify-content: space-between;
     align-items: center;
     padding: 0.5rem 0 0 0;
-    border-top: 1px solid var(--p-calendar-buttonbar-border-color);
+    border-top: 1px solid ${dt('calendar.buttonbar.border.color')};
 }
 
 .p-datepicker-buttonbar .p-button {
@@ -297,7 +297,7 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
-    border-top: 1px solid var(--p-calendar-timepicker-border-color);
+    border-top: 1px solid ${dt('calendar.timepicker.border.color')};
     padding: 0;
 }
 
@@ -322,7 +322,7 @@ export default {
     position: relative;
     width: 1.75rem;
     height: 1.75rem;
-    color: var(--p-calendar-timepicker-spin-color);
+    color: ${dt('calendar.timepicker.spin.color')};
     border: 0 none;
     background: transparent;
     border-radius: 50%;
@@ -331,8 +331,8 @@ export default {
 }
 
 .p-timepicker button:enabled:hover {
-    background: var(--p-calendar-timepicker-spin-background-hover);
-    color: var(--p-calendar-timepicker-spin-color-hover);
+    background: ${dt('calendar.timepicker.spin.hover.background')};
+    color: ${dt('calendar.timepicker.spin.hover.color')};
 }
 
 .p-timepicker button:focus-visible {
diff --git a/components/lib/themes/primeone/base/checkbox/index.js b/components/lib/themes/primeone/base/checkbox/index.js
index a9e95d0b7..be953d6bb 100644
--- a/components/lib/themes/primeone/base/checkbox/index.js
+++ b/components/lib/themes/primeone/base/checkbox/index.js
@@ -5,8 +5,8 @@ export default {
     display: inline-flex;
     user-select: none;
     vertical-align: bottom;
-    width: var(--p-checkbox-width);
-    height: var(--p-checkbox-height);
+    width: ${dt('checkbox.width')};
+    height: ${dt('checkbox.height')};
 }
 
 .p-checkbox-input {
@@ -23,51 +23,51 @@ export default {
     z-index: 1;
     outline: 0 none;
     border: 1px solid transparent;
-    border-radius: var(--p-checkbox-border-radius);
+    border-radius: ${dt('checkbox.border.radius')};
 }
 
 .p-checkbox-box {
     display: flex;
     justify-content: center;
     align-items: center;
-    border-radius: var(--p-rounded-sm);
-    border: 1px solid var(--p-checkbox-border-color);
-    background:  var(--p-checkbox-background);
-    width: var(--p-checkbox-width);
-    height: var(--p-checkbox-height);
+    border-radius: ${dt('checkbox.border.radius')};
+    border: 1px solid ${dt('checkbox.border.color')};
+    background: ${dt('checkbox.background')};
+    width: ${dt('checkbox.width')};
+    height: ${dt('checkbox.width')};
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, box-shadow ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     outline-color: transparent;
-    box-shadow: var(--p-checkbox-box-shadow);
+    box-shadow: ${dt('checkbox.box.shadow')};
 }
 
 .p-checkbox-icon {
     transition-duration: ${dt('transition.duration')};
-    color: var(--p-checkbox-icon-color);
-    font-size: var(--p-checkbox-icon-size);
-    width: var(--p-checkbox-icon-size);
-    height: var(--p-checkbox-icon-size);
+    color: ${dt('checkbox.icon.color')};
+    font-size: ${dt('checkbox.icon.size')};
+    width: ${dt('checkbox.icon.size')};
+    height: ${dt('checkbox.icon.size')};
 }
 
 .p-checkbox:not(.p-disabled):has(.p-checkbox-input:hover) .p-checkbox-box {
-    border-color: var(--p-checkbox-border-color-hover);
+    border-color: ${dt('checkbox.hover.border.color')};
 }
 
 .p-checkbox.p-highlight .p-checkbox-box {
-    border-color: var(--p-checkbox-border-color-checked);
-    background: var(--p-checkbox-background-checked);
+    border-color: ${dt('checkbox.checked.border.color')};
+    background: ${dt('checkbox.checked.background')};
 }
 
 .p-checkbox.p-highlight .p-checkbox-box .p-checkbox-icon {
-    color: var(--p-checkbox-icon-color-checked);
+    color: ${dt('checkbox.icon.checked.color')};
 }
 
 .p-checkbox:not(.p-disabled):has(.p-checkbox-input:hover).p-highlight .p-checkbox-box {
-    border-color: var(--p-checkbox-border-color-checked-hover);
-    background: var(--p-checkbox-background-checked-hover)
+    background: ${dt('checkbox.checked.hover.background')};
+    border-color: ${dt('checkbox.checked.hover.border.color')};
 }
 
 .p-checkbox:not(.p-disabled):has(.p-checkbox-input:hover).p-highlight .p-checkbox-box .p-checkbox-icon {
-    color: var(--p-checkbox-icon-color-checked-hover);
+    color: ${dt('checkbox.icon.checked.hover.color')};
 }
 
 .p-checkbox:not(.p-disabled):has(.p-checkbox-input:focus-visible) .p-checkbox-box {
@@ -76,19 +76,19 @@ export default {
 }
 
 .p-checkbox.p-invalid > .p-checkbox-box {
-    border-color: var(--p-checkbox-border-color-invalid);
+    border-color: ${dt('checkbox.invalid.border.color')};
 }
 
 .p-checkbox.p-variant-filled .p-checkbox-box {
-    background: var(--p-checkbox-background-filled);
+    background: ${dt('checkbox.checked.filled.background')};
 }
 
 .p-checkbox.p-variant-filled.p-highlight .p-checkbox-box {
-    background: var(--p-checkbox-background-checked);
+    background: ${dt('checkbox.checked.background')};
 }
 
 .p-checkbox.p-variant-filled:not(.p-disabled):has(.p-checkbox-input:hover).p-highlight .p-checkbox-box {
-    background: var(--p-checkbox-background-checked-hover);
+    background: ${dt('checkbox.checked.hover.background')};
 }
 
 .p-checkbox.p-disabled {
@@ -96,11 +96,11 @@ export default {
 }
 
 .p-checkbox.p-disabled .p-checkbox-box {
-    background: var(--p-checkbox-background-disabled);
+    background: ${dt('checkbox.disabled.background')};
 }
 
 .p-checkbox.p-disabled .p-checkbox-box .p-checkbox-icon {
-    color: var(--p-checkbox-icon-color-disabled);
+    color: ${dt('checkbox.icon.disabled.color')};
 }
 `
 };
diff --git a/components/lib/themes/primeone/base/inputtext/index.js b/components/lib/themes/primeone/base/inputtext/index.js
index e1bda5c27..718198463 100644
--- a/components/lib/themes/primeone/base/inputtext/index.js
+++ b/components/lib/themes/primeone/base/inputtext/index.js
@@ -4,42 +4,42 @@ export default {
     font-family: inherit;
     font-feature-settings: inherit;
     font-size: 1rem;
-    color: var(--p-inputtext-text-color);
-    background: var(--p-inputtext-background);
+    color: ${dt('inputtext.color')};
+    background: ${dt('inputtext.background')};
     padding: 0.5rem 0.75rem;
-    border: 1px solid var(--p-inputtext-border-color);
+    border: 1px solid ${dt('inputtext.border.color')};
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     appearance: none;
     border-radius: ${dt('rounded.base')};
     outline-color: transparent;
-    box-shadow: var(--p-inputtext-box-shadow);
+    box-shadow: ${dt('inputtext.box.shadow')};
 }
 
 .p-inputtext:enabled:hover {
-    border-color: var(--p-inputtext-border-color-hover);
+    border-color: ${dt('inputtext.hover.border.color')};
 }
 
 .p-inputtext:enabled:focus {
-    border-color: var(--p-inputtext-border-color-focus);
+    border-color: ${dt('inputtext.focus.border.color')};
     outline: 0 none;
 }
 
 .p-inputtext.p-invalid {
-    border-color: var(--p-inputtext-border-color-invalid);
+    border-color: ${dt('inputtext.invalid.border.color')};
 }
 
 .p-inputtext.p-variant-filled {
-    background-color: var(--p-inputtext-background-filled);
+    background: ${dt('inputtext.filled.background')};
 }
 
 .p-inputtext.p-variant-filled:enabled:focus {
-    background-color: var(--p-inputtext-background-filled-focus);
+    background-color: ${dt('inputtext.filled.focus.background')};
 }
 
 .p-inputtext:disabled {
     opacity: 1;
-    background: var(--p-inputtext-background-disabled);
-    color: var(--p-inputtext-text-color-disabled);
+    background: ${dt('inputtext.disabled.background')};
+    color: ${dt('inputtext.disabled.color')};
 }
 
 .p-input-icon-right > svg:last-of-type,
@@ -53,7 +53,7 @@ export default {
 }
 
 .p-inputtext::placeholder {
-    color: var(--p-inputtext-placeholder-text-color);
+    color: ${dt('inputtext.placeholder.color')};
 }
 
 .p-fluid .p-inputtext {
diff --git a/components/lib/themes/primeone/base/radiobutton/index.js b/components/lib/themes/primeone/base/radiobutton/index.js
index 441b6e825..de166f646 100644
--- a/components/lib/themes/primeone/base/radiobutton/index.js
+++ b/components/lib/themes/primeone/base/radiobutton/index.js
@@ -5,8 +5,8 @@ export default {
     display: inline-flex;
     user-select: none;
     vertical-align: bottom;
-    width: var(--p-radiobutton-width);
-    height: var(--p-radiobutton-height);
+    width: ${dt('radiobutton.width')};
+    height: ${dt('radiobutton.height')};
 }
 
 .p-radiobutton-input {
@@ -31,48 +31,48 @@ export default {
     justify-content: center;
     align-items: center;
     border-radius: 50%;
-    border: 1px solid var(--p-radiobutton-border-color);
-    background:  var(--p-radiobutton-background);
-    width: var(--p-radiobutton-width);
-    height: var(--p-radiobutton-height);
+    border: 1px solid ${dt('radiobutton.border.color')};
+    background: ${dt('radiobutton.background')};
+    width: ${dt('radiobutton.width')};
+    height: ${dt('radiobutton.height')};
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, box-shadow ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     outline-color: transparent;
-    box-shadow: var(--p-radiobutton-box-shadow);
+    box-shadow: ${dt('radiobutton.box.shadow')};
 }
 
 .p-radiobutton-icon {
     transition-duration: ${dt('transition.duration')};
     background: transparent;
-    font-size: var(--p-radiobutton-icon-size);
-    width: var(--p-radiobutton-icon-size);
-    height: var(--p-radiobutton-icon-size);
+    font-size: ${dt('radiobutton.icon.size')};
+    width: ${dt('radiobutton.icon.size')};
+    height: ${dt('radiobutton.icon.size')};
     border-radius: 50%;
     backface-visibility: hidden;
     transform: translateZ(0) scale(0.1);
 }
 
 .p-radiobutton:not(.p-disabled):has(.p-radiobutton-input:hover) .p-radiobutton-box {
-    border-color: var(--p-radiobutton-border-color-hover);
+    border-color: ${dt('radiobutton.hover.border.color')};
 }
 
 .p-radiobutton.p-highlight .p-radiobutton-box {
-    border-color: var(--p-radiobutton-border-color-checked);
-    background: var(--p-radiobutton-background-checked);
+    border-color: ${dt('radiobutton.checked.border.color')};
+    background: ${dt('radiobutton.checked.background')};
 }
 
 .p-radiobutton.p-highlight .p-radiobutton-box .p-radiobutton-icon {
-    background: var(--p-radiobutton-icon-color-checked);
+    background: ${dt('radiobutton.icon.checked.color')};
     transform: translateZ(0) scale(1, 1);
     visibility: visible;
 }
 
 .p-radiobutton:not(.p-disabled):has(.p-radiobutton-input:hover).p-highlight .p-radiobutton-box {
-    border-color: var(--p-radiobutton-border-color-checked-hover);
-    background: var(--p-radiobutton-background-checked-hover)
+    border-color: ${dt('radiobutton.checked.hover.border.color')};
+    background: ${dt('radiobutton.checked.hover.background')};
 }
 
 .p-radiobutton:not(.p-disabled):has(.p-radiobutton-input:hover).p-highlight .p-radiobutton-box .p-radiobutton-icon {
-    background: var(--p-radiobutton-icon-color-checked-hover);
+    background: ${dt('radiobutton.icon.checked.hover.color')};
 }
 
 .p-radiobutton:not(.p-disabled):has(.p-radiobutton-input:focus-visible) .p-radiobutton-box {
@@ -81,19 +81,19 @@ export default {
 }
 
 .p-radiobutton.p-invalid > .p-radiobutton-box {
-    border-color: var(--p-radiobutton-border-color-invalid);
+    border-color: ${dt('radiobutton.invalid.border.color')};
 }
 
 .p-radiobutton.p-variant-filled .p-radiobutton-box {
-    background: var(--p-radiobutton-background-filled);
+    background: ${dt('radiobutton.filled.background')};
 }
 
 .p-radiobutton.p-variant-filled.p-highlight .p-radiobutton-box {
-    background: var(--p-radiobutton-background-checked);
+    background: ${dt('radiobutton.checked.background')};
 }
 
 .p-radiobutton.p-variant-filled:not(.p-disabled):has(.p-radiobutton-input:hover).p-highlight .p-radiobutton-box {
-    background: var(--p-radiobutton-background-checked-hover);
+    background: ${dt('radiobutton.checked.hover.background')};
 }
 
 .p-radiobutton.p-disabled {
@@ -101,11 +101,11 @@ export default {
 }
 
 .p-radiobutton.p-disabled .p-radiobutton-box {
-    background: var(--p-radiobutton-background-disabled);
+    background: ${dt('radiobutton.disabled.background')};
 }
 
 .p-radiobutton.p-disabled .p-radiobutton-box .p-radiobutton-icon {
-    color: var(--p-radiobutton-icon-color-disabled);
+    color: ${dt('radiobutton.icon.disabled.color')};
 }
 `
 };
diff --git a/components/lib/themes/primeone/base/textarea/index.js b/components/lib/themes/primeone/base/textarea/index.js
index 4583f2bd5..a7b136e14 100644
--- a/components/lib/themes/primeone/base/textarea/index.js
+++ b/components/lib/themes/primeone/base/textarea/index.js
@@ -4,46 +4,46 @@ export default {
     font-family: inherit;
     font-feature-settings: inherit;
     font-size: 1rem;
-    color: var(--p-textarea-text-color);
-    background: var(--p-textarea-background);
+    color: ${dt('textara.color')};
+    background: ${dt('textara.background')};
     padding: 0.5rem 0.75rem;
-    border: 1px solid var(--p-textarea-border-color);
+    border: 1px solid ${dt('textara.border.color')};
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     appearance: none;
     border-radius: ${dt('rounded.base')};
     outline-color: transparent;
-    box-shadow: var(--p-textarea-box-shadow);
+    box-shadow: ${dt('textara.box.shadow')};
 }
 
 .p-inputtextarea:enabled:hover {
-    border-color: var(--p-textarea-border-color-hover);
+    border-color: ${dt('textara.hover.border.color')};
 }
 
 .p-inputtextarea:enabled:focus {
-    border-color: var(--p-textarea-border-color-focus);
+    border-color: ${dt('textara.focus.border.color')};
     outline: 0 none;
 }
 
 .p-inputtextarea.p-invalid {
-    border-color: var(--p-textarea-border-color-invalid);
+    border-color: ${dt('textara.invalid.border.color')};
 }
 
 .p-inputtextarea.p-variant-filled {
-    background-color: var(--p-textarea-background-filled);
+    background-color: ${dt('textara.filled.background')};
 }
 
 .p-inputtextarea.p-variant-filled:enabled:focus {
-    background-color: var(--p-textarea-background-filled-focus);
+    background-color: ${dt('textara.filled.focus.background')};
 }
 
 .p-inputtextarea:disabled {
     opacity: 1;
-    background: var(--p-textarea-background-disabled);
-    color: var(--p-textarea-text-color-disabled);
+    background: ${dt('textara.disabled.background')};
+    color: ${dt('textara.disabled.color')};
 }
 
 .p-inputtextarea::placeholder {
-    color: var(--p-textarea-placeholder-text-color);
+    color: ${dt('textara.placeholder.color')};
 }
 
 .p-fluid .p-inputtextarea {
diff --git a/components/lib/themes/primeone/presets/aura/autocomplete/index.js b/components/lib/themes/primeone/presets/aura/autocomplete/index.js
index 1314fe230..4532d1188 100644
--- a/components/lib/themes/primeone/presets/aura/autocomplete/index.js
+++ b/components/lib/themes/primeone/presets/aura/autocomplete/index.js
@@ -1,69 +1,69 @@
 export default {
     inputMultiple: {
         background: '{form.field.background}',
-        backgroundDisabled: '{form.field.background.disabled}',
-        backgroundFilled: '{form.field.background.filled}',
-        backgroundFilledFocus: '{form.field.background.filled.focus}',
+        disabledBackground: '{form.field.disabled.background}',
+        filledBackground: '{form.field.filled.background}',
+        filledFocusBackground: '{form.field.filled.focus.background}',
         borderColor: '{form.field.border.color}',
-        borderColorHover: '{form.field.border.color.hover}',
-        borderColorFocus: '{form.field.border.color.focus}',
-        borderColorInvalid: '{form.field.border.color.invalid}',
-        textColor: '{form.field.text.color}',
-        textColorDisabled: '{form.field.text.disabled}',
-        placeholderTextColor: '{form.field.placeholder.text.color}',
+        hoverBorderColor: '{form.field.hover.border.color}',
+        focusBorderColor: '{form.field.focus.border.color}',
+        invalidBorderColor: '{form.field.invalid.border.color}',
+        color: '{form.field.color}',
+        disabledColor: '{form.field.disabled.color}',
+        placeholderColor: '{form.field.placeholder.color}',
         boxShadow: '{form.field.box.shadow}'
     },
     colorScheme: {
         light: {
             chip: {
                 background: '{surface.100}',
-                backgroundFocus: '{surface.200}',
-                textColor: '{surface.800}',
-                textColorFocus: '{surface.900}'
+                focusBackground: '{surface.200}',
+                color: '{surface.800}',
+                focusColor: '{surface.900}'
             },
             overlay: {
                 background: '{surface.0}',
                 borderColor: '{surface.200}',
-                textColor: '{surface.700}'
+                color: '{surface.700}'
             },
             item: {
-                backgroundFocus: '{surface.100}',
-                backgroundSelected: '{highlight.background}',
-                backgroundSelectedFocus: '{highlight.background.focus}',
-                textColor: '{surface.700}',
-                textColorFocus: '{surface.800}',
-                textColorSelected: '{highlight.text.color}',
-                textColorSelectedFocus: '{highlight.text.color.focus}'
+                focusBackground: '{surface.100}',
+                selectedBackground: '{highlight.background}',
+                selectedFocusBackground: '{highlight.background.focus}',
+                color: '{surface.700}',
+                focusColor: '{surface.800}',
+                selectedColor: '{highlight.text.color}',
+                selectedFocusColor: '{highlight.text.color.focus}'
             },
             itemGroup: {
                 background: '{surface.0}',
-                textColor: '{surface.500}'
+                color: '{surface.500}'
             }
         },
         dark: {
             chip: {
                 background: '{surface.700}',
-                backgroundFocus: '{surface.600}',
-                textColor: '{surface.0}',
-                textColorFocus: '{surface.0}'
+                focusBackground: '{surface.600}',
+                color: '{surface.0}',
+                focusColor: '{surface.0}'
             },
             overlay: {
                 background: '{surface.900}',
                 borderColor: '{surface.700}',
-                textColor: '{surface.0}'
+                color: '{surface.0}'
             },
             item: {
-                backgroundFocus: '{surface.800}',
-                backgroundSelected: '{highlight.background}',
-                backgroundSelectedFocus: '{highlight.background.focus}',
-                textColor: '{surface.0}',
-                textColorFocus: '{surface.0}',
-                textColorSelected: '{highlight.text.color}',
-                textColorSelectedFocus: '{highlight.text.color.focus}'
+                focusBackground: '{surface.800}',
+                selectedBackground: '{highlight.background}',
+                selectedFocusBackground: '{highlight.background.focus}',
+                color: '{surface.0}',
+                focusColor: '{surface.0}',
+                selectedColor: '{highlight.text.color}',
+                selectedFocusColor: '{highlight.text.color.focus}'
             },
             itemGroup: {
                 background: '{surface.0}',
-                textColor: '{surface.400}'
+                color: '{surface.400}'
             }
         }
     }
diff --git a/components/lib/themes/primeone/presets/aura/calendar/index.js b/components/lib/themes/primeone/presets/aura/calendar/index.js
index 70ac57f27..f52f07ac6 100644
--- a/components/lib/themes/primeone/presets/aura/calendar/index.js
+++ b/components/lib/themes/primeone/presets/aura/calendar/index.js
@@ -12,47 +12,47 @@ export default {
                 color: '{surface.700}'
             },
             navigator: {
-                backgroundHover: '{surface.100}',
+                hoverBackground: '{surface.100}',
                 color: '{surface.500}',
-                colorHover: '{surface.600}'
+                hoverColor: '{surface.600}'
             },
             monthPicker: {
-                backgroundHover: '{surface.100}',
-                textColor: '{surface.700}',
-                textColorHover: '{surface.800}'
+                hoverBackground: '{surface.100}',
+                color: '{surface.700}',
+                hoverColor: '{surface.800}'
             },
             yearPicker: {
-                backgroundHover: '{surface.100}',
-                textColor: '{surface.700}',
-                textColorHover: '{surface.800}'
+                hoverBackground: '{surface.100}',
+                color: '{surface.700}',
+                hoverColor: '{surface.800}'
             },
             group: {
                 borderColor: '{surface.200}'
             },
             date: {
-                backgroundHover: '{surface.100}',
-                backgroundSelected: '{highlight.background}',
-                textColor: '{surface.700}',
-                textColorHover: '{surface.800}',
-                textColorSelected: '{highlight.text.color}'
+                hoverBackground: '{surface.100}',
+                selectedBackground: '{highlight.background}',
+                color: '{surface.700}',
+                hoverColor: '{surface.800}',
+                selectedColor: '{highlight.text.color}'
             },
             today: {
                 background: '{surface.200}',
-                textColor: '{surface.900}'
+                color: '{surface.900}'
             },
             month: {
-                backgroundHover: '{surface.100}',
-                backgroundSelected: '{highlight.background}',
-                textColor: '{surface.700}',
-                textColorHover: '{surface.800}',
-                textColorSelected: '{highlight.text.color}'
+                hoverBackground: '{surface.100}',
+                selectedBackground: '{highlight.background}',
+                color: '{surface.700}',
+                hoverColor: '{surface.800}',
+                selectedColor: '{highlight.text.color}'
             },
             year: {
-                backgroundHover: '{surface.100}',
-                backgroundSelected: '{highlight.background}',
-                textColor: '{surface.700}',
-                textColorHover: '{surface.800}',
-                textColorSelected: '{highlight.text.color}'
+                hoverBackground: '{surface.100}',
+                selectedBackground: '{highlight.background}',
+                color: '{surface.700}',
+                hoverColor: '{surface.800}',
+                selectedColor: '{highlight.text.color}'
             },
             buttonbar: {
                 borderColor: '{surface.200}'
@@ -61,9 +61,9 @@ export default {
                 borderColor: '{surface.200}'
             },
             timepickerSpin: {
-                backgroundHover: '{surface.100}',
+                hoverBackground: '{surface.100}',
                 color: '{surface.500}',
-                colorHover: '{surface.600}'
+                hoverColor: '{surface.600}'
             }
         },
         dark: {
@@ -78,47 +78,47 @@ export default {
                 color: '{surface.0}'
             },
             navigator: {
-                backgroundHover: '{surface.800}',
+                hoverBackground: '{surface.800}',
                 color: '{surface.400}',
-                colorHover: '{surface.300}'
+                hoverColor: '{surface.300}'
             },
             monthPicker: {
-                backgroundHover: '{surface.800}',
-                textColor: '{surface.0}',
-                textColorHover: '{surface.0}'
+                hoverBackground: '{surface.800}',
+                color: '{surface.0}',
+                hoverColor: '{surface.0}'
             },
             yearPicker: {
-                backgroundHover: '{surface.800}',
-                textColor: '{surface.0}',
-                textColorHover: '{surface.0}'
+                hoverBackground: '{surface.800}',
+                color: '{surface.0}',
+                hoverColor: '{surface.0}'
             },
             group: {
                 borderColor: '{surface.700}'
             },
             date: {
-                backgroundHover: '{surface.800}',
-                backgroundSelected: '{highlight.background}',
-                textColor: '{surface.0}',
-                textColorHover: '{surface.0}',
-                textColorSelected: '{highlight.text.color}'
+                hoverBackground: '{surface.800}',
+                selectedBackground: '{highlight.background}',
+                color: '{surface.0}',
+                hoverColor: '{surface.0}',
+                selectedColor: '{highlight.text.color}'
             },
             today: {
                 background: '{surface.700}',
-                textColor: '{surface.0}'
+                color: '{surface.0}'
             },
             month: {
-                backgroundHover: '{surface.800}',
-                backgroundSelected: '{highlight.background}',
-                textColor: '{surface.0}',
-                textColorHover: '{surface.0}',
-                textColorSelected: '{highlight.text.color}'
+                hoverBackground: '{surface.800}',
+                selectedBackground: '{highlight.background}',
+                color: '{surface.0}',
+                hoverColor: '{surface.0}',
+                selectedColor: '{highlight.text.color}'
             },
             year: {
-                backgroundHover: '{surface.800}',
-                backgroundSelected: '{highlight.background}',
-                textColor: '{surface.0}',
-                textColorHover: '{surface.0}',
-                textColorSelected: '{highlight.text.color}'
+                hoverBackground: '{surface.800}',
+                selectedBackground: '{highlight.background}',
+                color: '{surface.0}',
+                hoverColor: '{surface.0}',
+                selectedColor: '{highlight.text.color}'
             },
             buttonbar: {
                 borderColor: '{surface.700}'
@@ -127,9 +127,9 @@ export default {
                 borderColor: '{surface.700}'
             },
             timepickerSpin: {
-                backgroundHover: '{surface.800}',
+                hoverBackground: '{surface.800}',
                 color: '{surface.400}',
-                colorHover: '{surface.300}'
+                hoverColor: '{surface.300}'
             }
         }
     }
diff --git a/components/lib/themes/primeone/presets/aura/checkbox/index.js b/components/lib/themes/primeone/presets/aura/checkbox/index.js
index b71a11004..932808c1e 100644
--- a/components/lib/themes/primeone/presets/aura/checkbox/index.js
+++ b/components/lib/themes/primeone/presets/aura/checkbox/index.js
@@ -4,22 +4,22 @@ export default {
         width: '1.25rem',
         height: '1.25rem',
         background: '{form.field.background}',
-        backgroundChecked: '{primary.color}',
-        backgroundCheckedHover: '{primary.hover.color}',
-        backgroundDisabled: '{form.field.background.disabled}',
-        backgroundFilled: '{form.field.background.filled}',
+        checkedBackground: '{primary.color}',
+        checkedHoverBackground: '{primary.hover.color}',
+        disabledBackground: '{form.field.disabled.background}',
+        filledBackground: '{form.field.filled.background}',
         borderColor: '{form.field.border.color}',
-        borderColorHover: '{form.field.border.color.hover}',
-        borderColorChecked: '{primary.color}',
-        borderColorCheckedHover: '{primary.hover.color}',
-        borderColorInvalid: '{form.field.border.color.invalid}',
+        hoverBordercolor: '{form.field.hover.border.color}',
+        checkedBorderColor: '{primary.color}',
+        checkedHoverBorderColor: '{primary.hover.color}',
+        invalidBorderColor: '{form.field.invalid.border.color}',
         boxShadow: '{form.field.box.shadow}'
     },
     icon: {
         size: '0.875rem',
-        color: '{form.field.text.color}',
-        colorChecked: '{primary.inverse.color}',
-        colorCheckedHover: '{primary.inverse.color}',
-        colorDisabled: '{form.field.text.disabled}'
+        color: '{form.field.color}',
+        checkedColor: '{primary.inverse.color}',
+        checkedHoverColor: '{primary.inverse.color}',
+        disabledColor: '{form.field.disabled.color}'
     }
 };
diff --git a/components/lib/themes/primeone/presets/aura/index.js b/components/lib/themes/primeone/presets/aura/index.js
index 770f5b686..8c4d5b1d6 100644
--- a/components/lib/themes/primeone/presets/aura/index.js
+++ b/components/lib/themes/primeone/presets/aura/index.js
@@ -167,19 +167,19 @@ export default {
                 maskBackground: 'rgba(0,0,0,0.4)',
                 formField: {
                     background: '{surface.0}',
-                    backgroundDisabled: '{surface.200}',
-                    backgroundFilled: '{surface.50}',
-                    backgroundFilledFocus: '{surface.0}',
+                    disabledBackground: '{surface.200}',
+                    filledBackground: '{surface.50}',
+                    filledFocusBackground: '{surface.0}',
                     borderColor: '{surface.300}',
-                    borderColorHover: '{surface.400}',
-                    borderColorFocus: '{primary.color}',
-                    borderColorInvalid: '{red.400}',
-                    textColor: '{surface.700}',
-                    textColorDisabled: '{surface.500}',
-                    placeholderTextColor: '{surface.500}',
-                    floatLabelTextColor: '{surface.500}',
-                    floatLabelTextColorInvalid: '{red.400}',
-                    floatLabelTextColorFocus: '{surface.500}',
+                    hoverBorderColor: '{surface.400}',
+                    focusBorderColor: '{primary.color}',
+                    invalidBorderColor: '{red.400}',
+                    color: '{surface.700}',
+                    disabledColor: '{surface.500}',
+                    placeholderColor: '{surface.500}',
+                    floatLabelColor: '{surface.500}',
+                    invalidFloatLabelColor: '{red.400}',
+                    focusFloatLabelColor: '{surface.500}',
                     boxShadow: '0 0 #0000, 0 0 #0000, 0 1px 2px 0 rgba(18, 18, 23, 0.05)'
                 }
             },
diff --git a/components/lib/themes/primeone/presets/aura/inputtext/index.js b/components/lib/themes/primeone/presets/aura/inputtext/index.js
index c9fae444a..ee6501b37 100644
--- a/components/lib/themes/primeone/presets/aura/inputtext/index.js
+++ b/components/lib/themes/primeone/presets/aura/inputtext/index.js
@@ -1,16 +1,16 @@
 export default {
     root: {
         background: '{form.field.background}',
-        backgroundDisabled: '{form.field.background.disabled}',
-        backgroundFilled: '{form.field.background.filled}',
-        backgroundFilledFocus: '{form.field.background.filled.focus}',
+        disabledBackground: '{form.field.disabled.background}',
+        filledBackground: '{form.field.filled.background}',
+        filledFocusBackground: '{form.field.filled.focus.background}',
         borderColor: '{form.field.border.color}',
-        borderColorHover: '{form.field.border.color.hover}',
-        borderColorFocus: '{form.field.border.color.focus}',
-        borderColorInvalid: '{form.field.border.color.invalid}',
-        textColor: '{form.field.text.color}',
-        textColorDisabled: '{form.field.text.disabled}',
-        placeholderTextColor: '{form.field.placeholder.text.color}',
+        hoverBorderColor: '{form.field.hover.border.color}',
+        focusBorderColor: '{form.field.focus.border.color}',
+        invalidBorderColor: '{form.field.invalid.border.color}',
+        color: '{form.field.color}',
+        disabledColor: '{form.field.disabled.color}',
+        placeholderColor: '{form.field.placeholder.color}',
         boxShadow: '{form.field.box.shadow}'
     }
 };
diff --git a/components/lib/themes/primeone/presets/aura/radiobutton/index.js b/components/lib/themes/primeone/presets/aura/radiobutton/index.js
index c0a49839f..423303dcb 100644
--- a/components/lib/themes/primeone/presets/aura/radiobutton/index.js
+++ b/components/lib/themes/primeone/presets/aura/radiobutton/index.js
@@ -3,21 +3,21 @@ export default {
         width: '1.25rem',
         height: '1.25rem',
         background: '{form.field.background}',
-        backgroundChecked: '{form.field.background}',
-        backgroundCheckedHover: '{form.field.background}',
-        backgroundDisabled: '{form.field.background.disabled}',
-        backgroundFilled: '{form.field.background.filled}',
+        checkedBackground: '{primary.color}',
+        checkedHoverBackground: '{primary.hover.color}',
+        disabledBackground: '{form.field.disabled.background}',
+        filledBackground: '{form.field.filled.background}',
         borderColor: '{form.field.border.color}',
-        borderColorHover: '{form.field.border.color.hover}',
-        borderColorChecked: '{primary.color}',
-        borderColorCheckedHover: '{primary.hover.color}',
-        borderColorInvalid: '{form.field.border.color.invalid}',
+        hoverBordercolor: '{form.field.hover.border.color}',
+        checkedBorderColor: '{primary.color}',
+        checkedHoverBorderColor: '{primary.hover.color}',
+        invalidBorderColor: '{form.field.invalid.border.color}',
         boxShadow: '{form.field.box.shadow}'
     },
     icon: {
         size: '0.75rem',
-        colorChecked: '{primary.color}',
-        colorCheckedHover: '{primary.hover.color}',
-        colorDisabled: '{form.field.text.disabled}'
+        checkedColor: '{primary.inverse.color}',
+        checkedHoverColor: '{primary.inverse.color}',
+        disabledColor: '{form.field.disabled.color}'
     }
 };
diff --git a/components/lib/themes/primeone/presets/aura/textarea/index.js b/components/lib/themes/primeone/presets/aura/textarea/index.js
index c9fae444a..ee6501b37 100644
--- a/components/lib/themes/primeone/presets/aura/textarea/index.js
+++ b/components/lib/themes/primeone/presets/aura/textarea/index.js
@@ -1,16 +1,16 @@
 export default {
     root: {
         background: '{form.field.background}',
-        backgroundDisabled: '{form.field.background.disabled}',
-        backgroundFilled: '{form.field.background.filled}',
-        backgroundFilledFocus: '{form.field.background.filled.focus}',
+        disabledBackground: '{form.field.disabled.background}',
+        filledBackground: '{form.field.filled.background}',
+        filledFocusBackground: '{form.field.filled.focus.background}',
         borderColor: '{form.field.border.color}',
-        borderColorHover: '{form.field.border.color.hover}',
-        borderColorFocus: '{form.field.border.color.focus}',
-        borderColorInvalid: '{form.field.border.color.invalid}',
-        textColor: '{form.field.text.color}',
-        textColorDisabled: '{form.field.text.disabled}',
-        placeholderTextColor: '{form.field.placeholder.text.color}',
+        hoverBorderColor: '{form.field.hover.border.color}',
+        focusBorderColor: '{form.field.focus.border.color}',
+        invalidBorderColor: '{form.field.invalid.border.color}',
+        color: '{form.field.color}',
+        disabledColor: '{form.field.disabled.color}',
+        placeholderColor: '{form.field.placeholder.color}',
         boxShadow: '{form.field.box.shadow}'
     }
 };