diff --git a/src/framework/theme/components/checkbox/_checkbox.component.theme.scss b/src/framework/theme/components/checkbox/_checkbox.component.theme.scss
index d9bd924cc2..7e2c5c612b 100644
--- a/src/framework/theme/components/checkbox/_checkbox.component.theme.scss
+++ b/src/framework/theme/components/checkbox/_checkbox.component.theme.scss
@@ -131,6 +131,7 @@
       &:indeterminate + .custom-checkbox,
       &:checked + .custom-checkbox {
         background-color: nb-theme(checkbox-#{$status}-disabled-checked-background-color);
+        border-color: nb-theme(checkbox-#{$status}-disabled-checked-border-color);
       }
     }
   }
diff --git a/src/framework/theme/components/radio/_radio.component.theme.scss b/src/framework/theme/components/radio/_radio.component.theme.scss
index cbb7fcd87b..a80f8bf0c6 100644
--- a/src/framework/theme/components/radio/_radio.component.theme.scss
+++ b/src/framework/theme/components/radio/_radio.component.theme.scss
@@ -38,10 +38,17 @@
       }
 
       &.status-#{$status} .native-input:enabled:focus + .outer-circle {
+        background-color: nb-theme(radio-#{$status}-focus-background-color);
         border-color: nb-theme(radio-#{$status}-focus-border-color);
       }
-      &.status-#{$status} .native-input:enabled:checked:focus ~ .inner-circle {
-        background-color: nb-theme(radio-#{$status}-focus-inner-circle-color);
+      &.status-#{$status} .native-input:enabled:checked:focus {
+        & + .outer-circle {
+          background-color: nb-theme(radio-#{$status}-focus-checked-background-color);
+          border-color: nb-theme(radio-#{$status}-focus-checked-border-color);
+        }
+        & ~ .inner-circle {
+          background-color: nb-theme(radio-#{$status}-focus-inner-circle-color);
+        }
       }
 
       &.status-#{$status} label:hover .native-input:enabled + .outer-circle {
@@ -51,6 +58,7 @@
       &.status-#{$status} label:hover .native-input:checked:enabled {
         + .outer-circle {
           background-color: nb-theme(radio-#{$status}-hover-checked-background-color);
+          border-color: nb-theme(radio-#{$status}-hover-checked-border-color);
         }
         ~ .inner-circle {
           background-color: nb-theme(radio-#{$status}-hover-inner-circle-color);
@@ -58,10 +66,17 @@
       }
 
       &.status-#{$status} label .native-input:enabled:active + .outer-circle {
+        background-color: nb-theme(radio-#{$status}-active-background-color);
         border-color: nb-theme(radio-#{$status}-active-border-color);
       }
-      &.status-#{$status} label .native-input:enabled:checked:active ~ .inner-circle {
-        background-color: nb-theme(radio-#{$status}-active-inner-circle-color);
+      &.status-#{$status} label .native-input:enabled:checked:active {
+        & + .outer-circle {
+          background-color: nb-theme(radio-#{$status}-active-checked-background-color);
+          border-color: nb-theme(radio-#{$status}-active-checked-border-color);
+        }
+        & ~ .inner-circle {
+          background-color: nb-theme(radio-#{$status}-active-inner-circle-color);
+        }
       }
 
       &.status-#{$status} .text {
diff --git a/src/framework/theme/styles/themes/_dark.scss b/src/framework/theme/styles/themes/_dark.scss
index 7fae3d7647..c796ae8fa8 100644
--- a/src/framework/theme/styles/themes/_dark.scss
+++ b/src/framework/theme/styles/themes/_dark.scss
@@ -33,9 +33,7 @@ $theme: (
 
   text-basic-color: color-basic-100,
   text-alternate-color: color-basic-900,
-  text-control-color: color-basic-100,
   text-disabled-color: color-basic-transparent-600,
-  text-hint-color: color-basic-600,
 
   shadow: 0 0.5rem 1rem 0 #1a1f33,
   outline-color: color-basic-700,
diff --git a/src/framework/theme/styles/themes/_mapping.scss b/src/framework/theme/styles/themes/_mapping.scss
index b52b66d137..a86b389464 100644
--- a/src/framework/theme/styles/themes/_mapping.scss
+++ b/src/framework/theme/styles/themes/_mapping.scss
@@ -558,7 +558,7 @@ $eva-mapping: (
   button-filled-basic-active-background-color: color-basic-active,
   button-filled-basic-active-border-color: color-basic-active-border,
   button-filled-basic-disabled-background-color: color-basic-disabled,
-  button-filled-basic-disabled-border-color: transparent,
+  button-filled-basic-disabled-border-color: color-basic-disabled-border,
   button-filled-basic-disabled-text-color: text-disabled-color,
 
   button-filled-primary-background-color: color-primary-default,
@@ -571,7 +571,7 @@ $eva-mapping: (
   button-filled-primary-active-background-color: color-primary-active,
   button-filled-primary-active-border-color: color-primary-active-border,
   button-filled-primary-disabled-background-color: color-primary-disabled,
-  button-filled-primary-disabled-border-color: transparent,
+  button-filled-primary-disabled-border-color: color-primary-disabled-border,
   button-filled-primary-disabled-text-color: text-disabled-color,
 
   button-filled-success-background-color: color-success-default,
@@ -584,7 +584,7 @@ $eva-mapping: (
   button-filled-success-active-background-color: color-success-active,
   button-filled-success-active-border-color: color-success-active-border,
   button-filled-success-disabled-background-color: color-success-disabled,
-  button-filled-success-disabled-border-color: transparent,
+  button-filled-success-disabled-border-color: color-success-disabled-border,
   button-filled-success-disabled-text-color: text-disabled-color,
 
   button-filled-info-background-color: color-info-default,
@@ -597,7 +597,7 @@ $eva-mapping: (
   button-filled-info-active-background-color: color-info-active,
   button-filled-info-active-border-color: color-info-active-border,
   button-filled-info-disabled-background-color: color-info-disabled,
-  button-filled-info-disabled-border-color: transparent,
+  button-filled-info-disabled-border-color: color-info-disabled-border,
   button-filled-info-disabled-text-color: text-disabled-color,
 
   button-filled-warning-background-color: color-warning-default,
@@ -610,7 +610,7 @@ $eva-mapping: (
   button-filled-warning-active-background-color: color-warning-active,
   button-filled-warning-active-border-color: color-warning-active-border,
   button-filled-warning-disabled-background-color: color-warning-disabled,
-  button-filled-warning-disabled-border-color: transparent,
+  button-filled-warning-disabled-border-color: color-warning-disabled-border,
   button-filled-warning-disabled-text-color: text-disabled-color,
 
   button-filled-danger-background-color: color-danger-default,
@@ -623,7 +623,7 @@ $eva-mapping: (
   button-filled-danger-active-background-color: color-danger-active,
   button-filled-danger-active-border-color: color-danger-active-border,
   button-filled-danger-disabled-background-color: color-danger-disabled,
-  button-filled-danger-disabled-border-color: transparent,
+  button-filled-danger-disabled-border-color: color-danger-disabled-border,
   button-filled-danger-disabled-text-color: text-disabled-color,
 
   button-filled-control-background-color: color-control-default,
@@ -636,7 +636,7 @@ $eva-mapping: (
   button-filled-control-active-background-color: color-control-active,
   button-filled-control-active-border-color: color-control-active-border,
   button-filled-control-disabled-background-color: color-control-disabled,
-  button-filled-control-disabled-border-color: transparent,
+  button-filled-control-disabled-border-color: color-control-disabled-border,
   button-filled-control-disabled-text-color: text-disabled-color,
 
   button-outline-border-style: solid,
@@ -651,16 +651,16 @@ $eva-mapping: (
 
   button-outline-basic-background-color: color-basic-transparent-default,
   button-outline-basic-border-color: color-basic-transparent-default-border,
-  button-outline-basic-text-color: color-basic-600,
+  button-outline-basic-text-color: text-hint-color,
   button-outline-basic-focus-background-color: color-basic-transparent-focus,
   button-outline-basic-focus-border-color: color-basic-transparent-focus-border,
-  button-outline-basic-focus-text-color: color-basic-600,
+  button-outline-basic-focus-text-color: text-hint-color,
   button-outline-basic-hover-background-color: color-basic-transparent-hover,
   button-outline-basic-hover-border-color: color-basic-transparent-hover-border,
-  button-outline-basic-hover-text-color: color-basic-600,
+  button-outline-basic-hover-text-color: text-hint-color,
   button-outline-basic-active-background-color: color-basic-transparent-active,
   button-outline-basic-active-border-color: color-basic-transparent-active-border,
-  button-outline-basic-active-text-color: color-basic-600,
+  button-outline-basic-active-text-color: text-hint-color,
   button-outline-basic-disabled-background-color: color-basic-transparent-disabled,
   button-outline-basic-disabled-border-color: color-basic-transparent-disabled-border,
   button-outline-basic-disabled-text-color: text-disabled-color,
@@ -747,16 +747,16 @@ $eva-mapping: (
 
   button-outline-control-background-color: color-control-transparent-default,
   button-outline-control-border-color: color-control-transparent-default-border,
-  button-outline-control-text-color: color-basic-100,
+  button-outline-control-text-color: text-control-color,
   button-outline-control-focus-background-color: color-control-transparent-focus,
   button-outline-control-focus-border-color: color-control-transparent-focus-border,
-  button-outline-control-focus-text-color: color-basic-100,
+  button-outline-control-focus-text-color: text-control-color,
   button-outline-control-hover-background-color: color-control-transparent-hover,
   button-outline-control-hover-border-color: color-control-transparent-hover-border,
-  button-outline-control-hover-text-color: color-basic-100,
+  button-outline-control-hover-text-color: text-control-color,
   button-outline-control-active-background-color: color-control-transparent-active,
   button-outline-control-active-border-color: color-control-transparent-active-border,
-  button-outline-control-active-text-color: color-basic-100,
+  button-outline-control-active-text-color: text-control-color,
   button-outline-control-disabled-background-color: color-control-transparent-disabled,
   button-outline-control-disabled-border-color: color-control-transparent-disabled-border,
   button-outline-control-disabled-text-color: text-disabled-color,
@@ -999,7 +999,7 @@ $eva-mapping: (
   input-basic-background-color: background-basic-color-2,
   input-basic-border-color: border-basic-color-4,
   input-basic-focus-background-color: background-basic-color-1,
-  input-basic-focus-border-color: color-primary-default,
+  input-basic-focus-border-color: color-primary-default-border,
   input-basic-hover-background-color: background-basic-color-3,
   input-basic-hover-border-color: border-basic-color-4,
   input-basic-disabled-background-color: background-basic-color-2,
@@ -1012,9 +1012,9 @@ $eva-mapping: (
   input-primary-background-color: background-basic-color-2,
   input-primary-border-color: color-primary-default,
   input-primary-focus-background-color: background-basic-color-1,
-  input-primary-focus-border-color: color-primary-focus,
+  input-primary-focus-border-color: color-primary-focus-border,
   input-primary-hover-background-color: background-basic-color-3,
-  input-primary-hover-border-color: color-primary-hover,
+  input-primary-hover-border-color: color-primary-hover-border,
   input-primary-disabled-background-color: background-basic-color-2,
   input-primary-disabled-border-color: border-basic-color-4,
   input-primary-disabled-text-color: text-disabled-color,
@@ -1025,9 +1025,9 @@ $eva-mapping: (
   input-success-background-color: background-basic-color-2,
   input-success-border-color: color-success-default,
   input-success-focus-background-color: background-basic-color-1,
-  input-success-focus-border-color: color-success-focus,
+  input-success-focus-border-color: color-success-focus-border,
   input-success-hover-background-color: background-basic-color-3,
-  input-success-hover-border-color: color-success-hover,
+  input-success-hover-border-color: color-success-hover-border,
   input-success-disabled-background-color: background-basic-color-2,
   input-success-disabled-border-color: border-basic-color-4,
   input-success-disabled-text-color: text-disabled-color,
@@ -1038,9 +1038,9 @@ $eva-mapping: (
   input-info-background-color: background-basic-color-2,
   input-info-border-color: color-info-default,
   input-info-focus-background-color: background-basic-color-1,
-  input-info-focus-border-color: color-info-focus,
+  input-info-focus-border-color: color-info-focus-border,
   input-info-hover-background-color: background-basic-color-3,
-  input-info-hover-border-color: color-info-hover,
+  input-info-hover-border-color: color-info-hover-border,
   input-info-disabled-background-color: background-basic-color-2,
   input-info-disabled-border-color: border-basic-color-4,
   input-info-disabled-text-color: text-disabled-color,
@@ -1051,9 +1051,9 @@ $eva-mapping: (
   input-warning-background-color: background-basic-color-2,
   input-warning-border-color: color-warning-default,
   input-warning-focus-background-color: background-basic-color-1,
-  input-warning-focus-border-color: color-warning-focus,
+  input-warning-focus-border-color: color-warning-focus-border,
   input-warning-hover-background-color: background-basic-color-3,
-  input-warning-hover-border-color: color-warning-hover,
+  input-warning-hover-border-color: color-warning-hover-border,
   input-warning-disabled-background-color: background-basic-color-2,
   input-warning-disabled-border-color: border-basic-color-4,
   input-warning-disabled-text-color: text-disabled-color,
@@ -1064,16 +1064,16 @@ $eva-mapping: (
   input-danger-background-color: background-basic-color-2,
   input-danger-border-color: color-danger-default,
   input-danger-focus-background-color: background-basic-color-1,
-  input-danger-focus-border-color: color-danger-focus,
+  input-danger-focus-border-color: color-danger-focus-border,
   input-danger-hover-background-color: background-basic-color-3,
-  input-danger-hover-border-color: color-danger-hover,
+  input-danger-hover-border-color: color-danger-hover-border,
   input-danger-disabled-background-color: background-basic-color-2,
   input-danger-disabled-border-color: border-basic-color-4,
   input-danger-disabled-text-color: text-disabled-color,
   input-danger-disabled-placeholder-text-color: text-disabled-color,
 
-  input-control-text-color: color-basic-100,
-  input-control-placeholder-text-color: color-basic-100,
+  input-control-text-color: text-control-color,
+  input-control-placeholder-text-color: text-control-color,
   input-control-background-color: color-basic-control-transparent-300,
   input-control-border-color: color-basic-control-transparent-500,
   input-control-focus-background-color: color-basic-control-transparent-500,
@@ -1082,8 +1082,8 @@ $eva-mapping: (
   input-control-hover-border-color: color-control-transparent-hover-border,
   input-control-disabled-background-color: color-control-transparent-disabled,
   input-control-disabled-border-color: color-control-transparent-disabled-border,
-  input-control-disabled-text-color: color-basic-100,
-  input-control-disabled-placeholder-text-color: color-basic-100,
+  input-control-disabled-text-color: text-control-color,
+  input-control-disabled-placeholder-text-color: text-control-color,
 
   input-rectangle-border-radius: border-radius,
   input-semi-round-border-radius: 0.75rem,
@@ -1174,6 +1174,7 @@ $eva-mapping: (
   checkbox-basic-disabled-checkmark-color: text-control-color,
   checkbox-basic-disabled-text-color: text-disabled-color,
   checkbox-basic-disabled-checked-background-color: color-basic-transparent-600,
+  checkbox-basic-disabled-checked-border-color: color-basic-transparent-600,
 
   checkbox-primary-text-color: text-basic-color,
   checkbox-primary-background-color: color-primary-transparent-default,
@@ -1201,6 +1202,7 @@ $eva-mapping: (
   checkbox-primary-disabled-checkmark-color: text-control-color,
   checkbox-primary-disabled-text-color: text-disabled-color,
   checkbox-primary-disabled-checked-background-color: color-basic-transparent-600,
+  checkbox-primary-disabled-checked-border-color: color-basic-transparent-600,
 
   checkbox-success-text-color: text-basic-color,
   checkbox-success-background-color: color-success-transparent-default,
@@ -1228,6 +1230,7 @@ $eva-mapping: (
   checkbox-success-disabled-checkmark-color: text-control-color,
   checkbox-success-disabled-text-color: text-disabled-color,
   checkbox-success-disabled-checked-background-color: color-basic-transparent-600,
+  checkbox-success-disabled-checked-border-color: color-basic-transparent-600,
 
   checkbox-info-text-color: text-basic-color,
   checkbox-info-background-color: color-info-transparent-default,
@@ -1255,6 +1258,7 @@ $eva-mapping: (
   checkbox-info-disabled-checkmark-color: text-control-color,
   checkbox-info-disabled-text-color: text-disabled-color,
   checkbox-info-disabled-checked-background-color: color-basic-transparent-600,
+  checkbox-info-disabled-checked-border-color: color-basic-transparent-600,
 
   checkbox-warning-text-color: text-basic-color,
   checkbox-warning-background-color: color-warning-transparent-default,
@@ -1282,6 +1286,7 @@ $eva-mapping: (
   checkbox-warning-disabled-checkmark-color: text-control-color,
   checkbox-warning-disabled-text-color: text-disabled-color,
   checkbox-warning-disabled-checked-background-color: color-basic-transparent-600,
+  checkbox-warning-disabled-checked-border-color: color-basic-transparent-600,
 
   checkbox-danger-text-color: text-basic-color,
   checkbox-danger-background-color: color-danger-transparent-default,
@@ -1309,8 +1314,9 @@ $eva-mapping: (
   checkbox-danger-disabled-checkmark-color: text-control-color,
   checkbox-danger-disabled-text-color: text-disabled-color,
   checkbox-danger-disabled-checked-background-color: color-basic-transparent-600,
+  checkbox-danger-disabled-checked-border-color: color-basic-transparent-600,
 
-  checkbox-control-text-color: color-basic-100,
+  checkbox-control-text-color: text-control-color,
   checkbox-control-background-color: color-control-transparent-default,
   checkbox-control-border-color: color-control-transparent-default-border,
   checkbox-control-checked-background-color: color-control-default,
@@ -1331,11 +1337,12 @@ $eva-mapping: (
   checkbox-control-active-border-color: color-control-transparent-active-border,
   checkbox-control-active-checked-background-color: color-control-active,
   checkbox-control-active-checked-border-color: color-control-active-border,
-  checkbox-control-disabled-background-color: color-basic-control-transparent-200,
-  checkbox-control-disabled-border-color: color-basic-control-transparent-500,
+  checkbox-control-disabled-background-color: color-control-transparent-disabled,
+  checkbox-control-disabled-border-color: color-control-transparent-disabled-border,
   checkbox-control-disabled-checkmark-color: text-control-color,
-  checkbox-control-disabled-text-color: color-basic-100,
-  checkbox-control-disabled-checked-background-color: color-basic-control-transparent-200,
+  checkbox-control-disabled-text-color: text-control-color,
+  checkbox-control-disabled-checked-background-color: color-basic-transparent-600,
+  checkbox-control-disabled-checked-border-color: color-basic-transparent-600,
 
   badge-border-radius: border-radius,
   badge-text-font-family: text-button-font-family,
@@ -2249,19 +2256,26 @@ $eva-mapping: (
   radio-outline-width: outline-width,
 
   radio-basic-text-color: text-basic-color,
-  radio-basic-border-color: color-basic-600,
+  radio-basic-border-color: color-basic-transparent-default-border,
   radio-basic-background-color: color-basic-transparent-default,
   radio-basic-checked-background-color: transparent,
   radio-basic-checked-border-color: color-primary-default-border,
   radio-basic-inner-circle-color: color-primary-default,
-  radio-basic-focus-border-color: color-primary-focus-border,
+  radio-basic-focus-border-color: color-primary-transparent-focus-border,
+  radio-basic-focus-background-color: color-primary-transparent-focus,
+  radio-basic-focus-checked-background-color: transparent,
+  radio-basic-focus-checked-border-color: color-primary-focus-border,
   radio-basic-focus-inner-circle-color: color-primary-focus,
   radio-basic-hover-background-color: color-primary-transparent-hover,
   radio-basic-hover-border-color: color-primary-transparent-hover-border,
   radio-basic-hover-inner-circle-color: color-primary-hover,
   radio-basic-hover-checked-background-color: transparent,
-  radio-basic-active-border-color: color-primary-active,
+  radio-basic-hover-checked-border-color: color-primary-hover-border,
+  radio-basic-active-background-color: color-primary-transparent-active,
+  radio-basic-active-border-color: color-primary-transparent-active-border,
   radio-basic-active-inner-circle-color: color-primary-active,
+  radio-basic-active-checked-background-color: transparent,
+  radio-basic-active-checked-border-color: color-primary-active-border,
   radio-basic-disabled-background-color: color-basic-transparent-disabled,
   radio-basic-disabled-border-color: color-basic-transparent-disabled-border,
   radio-basic-disabled-text-color: text-disabled-color,
@@ -2275,13 +2289,20 @@ $eva-mapping: (
   radio-primary-checked-background-color: transparent,
   radio-primary-checked-border-color: color-primary-default-border,
   radio-primary-inner-circle-color: color-primary-default,
-  radio-primary-focus-border-color: color-primary-focus-border,
+  radio-primary-focus-border-color: color-primary-transparent-focus-border,
+  radio-primary-focus-background-color: color-primary-transparent-focus,
+  radio-primary-focus-checked-background-color: transparent,
+  radio-primary-focus-checked-border-color: color-primary-focus-border,
   radio-primary-focus-inner-circle-color: color-primary-focus,
   radio-primary-hover-background-color: color-primary-transparent-hover,
   radio-primary-hover-border-color: color-primary-transparent-hover-border,
   radio-primary-hover-inner-circle-color: color-primary-hover,
   radio-primary-hover-checked-background-color: transparent,
-  radio-primary-active-border-color: color-primary-active,
+  radio-primary-hover-checked-border-color: color-primary-hover-border,
+  radio-primary-active-border-color: color-primary-transparent-active-border,
+  radio-primary-active-background-color: color-primary-transparent-active,
+  radio-primary-active-checked-background-color: transparent,
+  radio-primary-active-checked-border-color: color-primary-active-border,
   radio-primary-active-inner-circle-color: color-primary-active,
   radio-primary-disabled-background-color: color-basic-transparent-disabled,
   radio-primary-disabled-border-color: color-basic-transparent-disabled-border,
@@ -2296,13 +2317,20 @@ $eva-mapping: (
   radio-success-checked-background-color: transparent,
   radio-success-checked-border-color: color-success-default-border,
   radio-success-inner-circle-color: color-success-default,
-  radio-success-focus-border-color: color-success-focus-border,
+  radio-success-focus-border-color: color-success-transparent-focus-border,
+  radio-success-focus-background-color: color-success-transparent-focus,
+  radio-success-focus-checked-background-color: transparent,
+  radio-success-focus-checked-border-color: color-success-focus-border,
   radio-success-focus-inner-circle-color: color-success-focus,
   radio-success-hover-background-color: color-success-transparent-hover,
   radio-success-hover-border-color: color-success-transparent-hover-border,
   radio-success-hover-inner-circle-color: color-success-hover,
   radio-success-hover-checked-background-color: transparent,
-  radio-success-active-border-color: color-success-active,
+  radio-success-hover-checked-border-color: color-success-hover-border,
+  radio-success-active-background-color: color-success-transparent-active,
+  radio-success-active-border-color: color-success-transparent-active-border,
+  radio-success-active-checked-background-color: transparent,
+  radio-success-active-checked-border-color: color-success-active-border,
   radio-success-active-inner-circle-color: color-success-active,
   radio-success-disabled-background-color: color-basic-transparent-disabled,
   radio-success-disabled-border-color: color-basic-transparent-disabled-border,
@@ -2317,13 +2345,20 @@ $eva-mapping: (
   radio-info-checked-background-color: transparent,
   radio-info-checked-border-color: color-info-default-border,
   radio-info-inner-circle-color: color-info-default,
-  radio-info-focus-border-color: color-info-focus-border,
+  radio-info-focus-background-color: color-info-transparent-focus,
+  radio-info-focus-border-color: color-info-transparent-focus-border,
+  radio-info-focus-checked-background-color: transparent,
+  radio-info-focus-checked-border-color: color-info-focus-border,
   radio-info-focus-inner-circle-color: color-info-focus,
   radio-info-hover-background-color: color-info-transparent-hover,
   radio-info-hover-border-color: color-info-transparent-hover-border,
   radio-info-hover-inner-circle-color: color-info-hover,
   radio-info-hover-checked-background-color: transparent,
-  radio-info-active-border-color: color-info-active,
+  radio-info-hover-checked-border-color: color-info-hover-border,
+  radio-info-active-background-color: color-info-transparent-active,
+  radio-info-active-border-color: color-info-transparent-active-border,
+  radio-info-active-checked-background-color: transparent,
+  radio-info-active-checked-border-color: color-info-active-border,
   radio-info-active-inner-circle-color: color-info-active,
   radio-info-disabled-background-color: color-basic-transparent-disabled,
   radio-info-disabled-border-color: color-basic-transparent-disabled-border,
@@ -2338,13 +2373,20 @@ $eva-mapping: (
   radio-warning-checked-background-color: transparent,
   radio-warning-checked-border-color: color-warning-default-border,
   radio-warning-inner-circle-color: color-warning-default,
-  radio-warning-focus-border-color: color-warning-focus-border,
+  radio-warning-focus-background-color: color-warning-transparent-focus,
+  radio-warning-focus-border-color: color-warning-transparent-focus-border,
+  radio-warning-focus-checked-background-color: transparent,
+  radio-warning-focus-checked-border-color: color-warning-focus-border,
   radio-warning-focus-inner-circle-color: color-warning-focus,
   radio-warning-hover-background-color: color-warning-transparent-hover,
   radio-warning-hover-border-color: color-warning-transparent-hover-border,
   radio-warning-hover-inner-circle-color: color-warning-hover,
   radio-warning-hover-checked-background-color: transparent,
-  radio-warning-active-border-color: color-warning-active,
+  radio-warning-hover-checked-border-color: color-warning-hover-border,
+  radio-warning-active-background-color: color-warning-transparent-active,
+  radio-warning-active-border-color: color-warning-transparent-active-border,
+  radio-warning-active-checked-background-color: transparent,
+  radio-warning-active-checked-border-color: color-warning-active-border,
   radio-warning-active-inner-circle-color: color-warning-active,
   radio-warning-disabled-background-color: color-basic-transparent-disabled,
   radio-warning-disabled-border-color: color-basic-transparent-disabled-border,
@@ -2359,13 +2401,20 @@ $eva-mapping: (
   radio-danger-checked-background-color: transparent,
   radio-danger-checked-border-color: color-danger-default-border,
   radio-danger-inner-circle-color: color-danger-default,
-  radio-danger-focus-border-color: color-danger-focus-border,
+  radio-danger-focus-background-color: color-danger-transparent-focus,
+  radio-danger-focus-border-color: color-danger-transparent-focus-border,
+  radio-danger-focus-checked-background-color: transparent,
+  radio-danger-focus-checked-border-color: color-danger-focus-border,
   radio-danger-focus-inner-circle-color: color-danger-focus,
   radio-danger-hover-background-color: color-danger-transparent-hover,
   radio-danger-hover-border-color: color-danger-transparent-hover-border,
   radio-danger-hover-inner-circle-color: color-danger-hover,
   radio-danger-hover-checked-background-color: transparent,
-  radio-danger-active-border-color: color-danger-active,
+  radio-danger-hover-checked-border-color: color-danger-hover-border,
+  radio-danger-active-background-color: color-danger-transparent-active,
+  radio-danger-active-border-color: color-danger-transparent-active-border,
+  radio-danger-active-checked-background-color: transparent,
+  radio-danger-active-checked-border-color: color-danger-active-border,
   radio-danger-active-inner-circle-color: color-danger-active,
   radio-danger-disabled-background-color: color-basic-transparent-disabled,
   radio-danger-disabled-border-color: color-basic-transparent-disabled-border,
@@ -2375,25 +2424,32 @@ $eva-mapping: (
   radio-danger-disabled-checked-inner-circle-color: color-basic-transparent-600,
 
   radio-control-text-color: text-control-color,
-  radio-control-background-color: color-basic-control-transparent-300,
-  radio-control-border-color: color-basic-100,
+  radio-control-background-color: color-control-transparent-default,
+  radio-control-border-color: color-control-transparent-default-border,
   radio-control-checked-background-color: transparent,
-  radio-control-checked-border-color: color-basic-100,
-  radio-control-inner-circle-color: color-basic-100,
-  radio-control-focus-border-color: color-basic-100,
-  radio-control-focus-inner-circle-color: color-basic-100,
-  radio-control-hover-background-color: color-basic-control-transparent-400,
-  radio-control-hover-border-color: color-basic-100,
-  radio-control-hover-inner-circle-color: color-basic-100,
+  radio-control-checked-border-color: color-control-default-border,
+  radio-control-inner-circle-color: color-control-default,
+  radio-control-focus-background-color: color-control-transparent-focus,
+  radio-control-focus-border-color: color-control-transparent-focus-border,
+  radio-control-focus-checked-background-color: transparent,
+  radio-control-focus-checked-border-color: color-control-focus-border,
+  radio-control-focus-inner-circle-color: color-control-focus,
+  radio-control-hover-background-color: color-control-transparent-hover,
+  radio-control-hover-border-color: color-control-transparent-hover-border,
+  radio-control-hover-inner-circle-color: color-control-hover,
   radio-control-hover-checked-background-color: transparent,
-  radio-control-active-border-color: color-basic-100,
-  radio-control-active-inner-circle-color: color-basic-100,
-  radio-control-disabled-background-color: color-basic-control-transparent-200,
-  radio-control-disabled-border-color: color-basic-control-transparent-500,
+  radio-control-hover-checked-border-color: color-control-hover-border,
+  radio-control-active-background-color: color-control-transparent-active,
+  radio-control-active-border-color: color-control-transparent-active-border,
+  radio-control-active-checked-background-color: transparent,
+  radio-control-active-checked-border-color: color-control-active-border,
+  radio-control-active-inner-circle-color: color-control-active,
+  radio-control-disabled-background-color: color-control-transparent-disabled,
+  radio-control-disabled-border-color: color-control-transparent-disabled-border,
   radio-control-disabled-text-color: color-basic-100,
   radio-control-disabled-checked-background-color: transparent,
-  radio-control-disabled-checked-border-color: color-basic-control-transparent-500,
-  radio-control-disabled-checked-inner-circle-color: color-basic-control-transparent-400,
+  radio-control-disabled-checked-border-color: color-basic-transparent-600,
+  radio-control-disabled-checked-inner-circle-color: color-basic-transparent-600,
 
   tree-grid-cell-border-width: 1px,
   tree-grid-cell-border-style: solid,
@@ -2456,35 +2512,35 @@ $eva-mapping: (
   toggle-disabled-cursor: default,
 
   toggle-basic-text-color: text-basic-color,
-  toggle-basic-background-color: color-basic-transparent-200,
-  toggle-basic-border-color: color-basic-500,
+  toggle-basic-background-color: color-basic-transparent-default,
+  toggle-basic-border-color: color-basic-transparent-default-border,
   toggle-basic-checked-background-color: color-primary-default,
-  toggle-basic-checked-border-color: color-primary-default,
+  toggle-basic-checked-border-color: color-primary-default-border,
   toggle-basic-checked-switcher-background-color: background-basic-color-1,
   toggle-basic-checked-switcher-checkmark-color: color-primary-default,
-  toggle-basic-focus-background-color: color-basic-transparent-500,
-  toggle-basic-focus-border-color: color-basic-transparent-focus-border,
+  toggle-basic-focus-background-color: color-primary-transparent-focus,
+  toggle-basic-focus-border-color: color-primary-transparent-focus-border,
   toggle-basic-focus-checked-background-color: color-primary-focus,
   toggle-basic-focus-checked-border-color: color-primary-focus-border,
   toggle-basic-hover-background-color: color-primary-transparent-hover,
-  toggle-basic-hover-border-color: color-primary-400,
+  toggle-basic-hover-border-color: color-primary-transparent-hover-border,
   toggle-basic-hover-checked-background-color: color-primary-hover,
   toggle-basic-hover-checked-border-color: color-primary-hover-border,
-  toggle-basic-active-background-color: color-basic-transparent-500,
-  toggle-basic-active-border-color: color-basic-transparent-focus-border,
+  toggle-basic-active-background-color: color-primary-transparent-active,
+  toggle-basic-active-border-color: color-primary-transparent-active-border,
   toggle-basic-active-checked-background-color: color-primary-active,
-  toggle-basic-active-checked-border-color: color-primary-active,
+  toggle-basic-active-checked-border-color: color-primary-active-border,
   toggle-basic-disabled-background-color: color-basic-transparent-disabled,
   toggle-basic-disabled-border-color: color-basic-transparent-disabled-border,
   toggle-basic-disabled-switcher-background-color: color-basic-disabled,
-  toggle-basic-disabled-checked-switcher-checkmark-color: text-alternate-color,
+  toggle-basic-disabled-checked-switcher-checkmark-color: text-control-color,
   toggle-basic-disabled-text-color: text-disabled-color,
 
   toggle-primary-text-color: text-basic-color,
   toggle-primary-background-color: color-primary-transparent-default,
   toggle-primary-border-color: color-primary-transparent-default-border,
   toggle-primary-checked-background-color: color-primary-default,
-  toggle-primary-checked-border-color: color-primary-default,
+  toggle-primary-checked-border-color: color-primary-default-border,
   toggle-primary-checked-switcher-background-color: background-basic-color-1,
   toggle-primary-checked-switcher-checkmark-color: color-primary-default,
   toggle-primary-focus-background-color: color-primary-transparent-focus,
@@ -2502,14 +2558,14 @@ $eva-mapping: (
   toggle-primary-disabled-background-color: color-basic-transparent-disabled,
   toggle-primary-disabled-border-color: color-basic-transparent-disabled-border,
   toggle-primary-disabled-switcher-background-color: color-basic-disabled,
-  toggle-primary-disabled-checked-switcher-checkmark-color: text-alternate-color,
+  toggle-primary-disabled-checked-switcher-checkmark-color: text-control-color,
   toggle-primary-disabled-text-color: text-disabled-color,
 
   toggle-success-text-color: text-basic-color,
   toggle-success-background-color: color-success-transparent-default,
   toggle-success-border-color: color-success-transparent-default-border,
   toggle-success-checked-background-color: color-success-default,
-  toggle-success-checked-border-color: color-success-default,
+  toggle-success-checked-border-color: color-success-default-border,
   toggle-success-checked-switcher-background-color: background-basic-color-1,
   toggle-success-checked-switcher-checkmark-color: color-success-default,
   toggle-success-focus-background-color: color-success-transparent-focus,
@@ -2527,14 +2583,14 @@ $eva-mapping: (
   toggle-success-disabled-background-color: color-basic-transparent-disabled,
   toggle-success-disabled-border-color: color-basic-transparent-disabled-border,
   toggle-success-disabled-switcher-background-color: color-basic-disabled,
-  toggle-success-disabled-checked-switcher-checkmark-color: text-alternate-color,
+  toggle-success-disabled-checked-switcher-checkmark-color: text-control-color,
   toggle-success-disabled-text-color: text-disabled-color,
 
   toggle-info-text-color: text-basic-color,
   toggle-info-background-color: color-info-transparent-default,
   toggle-info-border-color: color-info-transparent-default-border,
   toggle-info-checked-background-color: color-info-default,
-  toggle-info-checked-border-color: color-info-default,
+  toggle-info-checked-border-color: color-info-default-border,
   toggle-info-checked-switcher-background-color: background-basic-color-1,
   toggle-info-checked-switcher-checkmark-color: color-info-default,
   toggle-info-focus-background-color: color-info-transparent-focus,
@@ -2552,14 +2608,14 @@ $eva-mapping: (
   toggle-info-disabled-background-color: color-basic-transparent-disabled,
   toggle-info-disabled-border-color: color-basic-transparent-disabled-border,
   toggle-info-disabled-switcher-background-color: color-basic-disabled,
-  toggle-info-disabled-checked-switcher-checkmark-color: text-alternate-color,
+  toggle-info-disabled-checked-switcher-checkmark-color: text-control-color,
   toggle-info-disabled-text-color: text-disabled-color,
 
   toggle-warning-text-color: text-basic-color,
   toggle-warning-background-color: color-warning-transparent-default,
   toggle-warning-border-color: color-warning-transparent-default-border,
   toggle-warning-checked-background-color: color-warning-default,
-  toggle-warning-checked-border-color: color-warning-default,
+  toggle-warning-checked-border-color: color-warning-default-border,
   toggle-warning-checked-switcher-background-color: background-basic-color-1,
   toggle-warning-checked-switcher-checkmark-color: color-warning-default,
   toggle-warning-focus-background-color: color-warning-transparent-focus,
@@ -2577,14 +2633,14 @@ $eva-mapping: (
   toggle-warning-disabled-background-color: color-basic-transparent-disabled,
   toggle-warning-disabled-border-color: color-basic-transparent-disabled-border,
   toggle-warning-disabled-switcher-background-color: color-basic-disabled,
-  toggle-warning-disabled-checked-switcher-checkmark-color: text-alternate-color,
+  toggle-warning-disabled-checked-switcher-checkmark-color: text-control-color,
   toggle-warning-disabled-text-color: text-disabled-color,
 
   toggle-danger-text-color: text-basic-color,
   toggle-danger-background-color: color-danger-transparent-default,
   toggle-danger-border-color: color-danger-transparent-default-border,
   toggle-danger-checked-background-color: color-danger-default,
-  toggle-danger-checked-border-color: color-danger-default,
+  toggle-danger-checked-border-color: color-danger-default-border,
   toggle-danger-checked-switcher-background-color: background-basic-color-1,
   toggle-danger-checked-switcher-checkmark-color: color-danger-default,
   toggle-danger-focus-background-color: color-danger-transparent-focus,
@@ -2602,32 +2658,32 @@ $eva-mapping: (
   toggle-danger-disabled-background-color: color-basic-transparent-disabled,
   toggle-danger-disabled-border-color: color-basic-transparent-disabled-border,
   toggle-danger-disabled-switcher-background-color: color-basic-disabled,
-  toggle-danger-disabled-checked-switcher-checkmark-color: text-alternate-color,
+  toggle-danger-disabled-checked-switcher-checkmark-color: text-control-color,
   toggle-danger-disabled-text-color: text-disabled-color,
 
   toggle-control-text-color: color-basic-100,
-  toggle-control-background-color: color-basic-control-transparent-300,
-  toggle-control-border-color: color-basic-control-transparent-500,
-  toggle-control-checked-background-color: color-basic-control-transparent-300,
-  toggle-control-checked-border-color: color-basic-100,
-  toggle-control-checked-switcher-background-color: color-basic-100,
-  toggle-control-checked-switcher-checkmark-color: color-basic-700,
-  toggle-control-focus-background-color: color-basic-control-transparent-500,
-  toggle-control-focus-border-color: color-basic-100,
-  toggle-control-focus-checked-background-color: color-basic-control-transparent-500,
-  toggle-control-focus-checked-border-color: color-basic-100,
-  toggle-control-hover-background-color: color-basic-control-transparent-400,
-  toggle-control-hover-border-color: color-basic-control-transparent-500,
-  toggle-control-hover-checked-background-color: color-basic-control-transparent-400,
-  toggle-control-hover-checked-border-color: color-basic-100,
-  toggle-control-active-background-color: color-basic-control-transparent-500,
-  toggle-control-active-border-color: color-basic-100,
-  toggle-control-active-checked-background-color: color-basic-control-transparent-500,
-  toggle-control-active-checked-border-color: color-basic-100,
-  toggle-control-disabled-background-color: color-basic-control-transparent-200,
-  toggle-control-disabled-border-color: color-basic-control-transparent-500,
-  toggle-control-disabled-switcher-background-color: color-basic-control-transparent-400,
+  toggle-control-background-color: color-control-transparent-default,
+  toggle-control-border-color: color-control-transparent-default-border,
+  toggle-control-checked-background-color: color-control-transparent-default,
+  toggle-control-checked-border-color: color-control-transparent-default-border,
+  toggle-control-checked-switcher-background-color: color-control-default,
+  toggle-control-checked-switcher-checkmark-color: color-basic-800,
+  toggle-control-focus-background-color: color-control-transparent-focus,
+  toggle-control-focus-border-color: color-control-transparent-focus-border,
+  toggle-control-focus-checked-background-color: color-control-transparent-focus,
+  toggle-control-focus-checked-border-color: color-control-transparent-focus-border,
+  toggle-control-hover-background-color: color-control-transparent-hover,
+  toggle-control-hover-border-color: color-control-transparent-hover-border,
+  toggle-control-hover-checked-background-color: color-control-transparent-hover,
+  toggle-control-hover-checked-border-color: color-control-transparent-hover-border,
+  toggle-control-active-background-color: color-control-transparent-active,
+  toggle-control-active-border-color: color-control-transparent-active-border,
+  toggle-control-active-checked-background-color: color-control-transparent-active,
+  toggle-control-active-checked-border-color: color-control-transparent-active-border,
+  toggle-control-disabled-background-color: color-control-transparent-disabled,
+  toggle-control-disabled-border-color: color-control-transparent-disabled-border,
+  toggle-control-disabled-switcher-background-color: color-basic-transparent-600,
   toggle-control-disabled-checked-switcher-checkmark-color: color-basic-100,
-  toggle-control-disabled-text-color: color-basic-100,
+  toggle-control-disabled-text-color: text-control-color,
 
 );