diff --git a/components/lib/autocomplete/style/AutoCompleteStyle.js b/components/lib/autocomplete/style/AutoCompleteStyle.js
index 213e7f4be..6c800fd80 100644
--- a/components/lib/autocomplete/style/AutoCompleteStyle.js
+++ b/components/lib/autocomplete/style/AutoCompleteStyle.js
@@ -151,7 +151,7 @@ const theme = ({ dt }) => `
     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: ${dt('autocomplete.input.multiple.box.shadow')};
+    box-shadow: ${dt('autocomplete.input.multiple.shadow')};
 }
 
 .p-autocomplete:not(.p-disabled):hover .p-autocomplete-input-multiple {
diff --git a/components/lib/cascadeselect/style/CascadeSelectStyle.js b/components/lib/cascadeselect/style/CascadeSelectStyle.js
index 13819b843..923fb6ba4 100644
--- a/components/lib/cascadeselect/style/CascadeSelectStyle.js
+++ b/components/lib/cascadeselect/style/CascadeSelectStyle.js
@@ -11,7 +11,7 @@ const theme = ({ dt }) => `
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     border-radius: ${dt('border.radius.md')};
     outline-color: transparent;
-    box-shadow: ${dt('cascadeselect.box.shadow')};
+    box-shadow: ${dt('cascadeselect.shadow')};
 }
 
 .p-cascadeselect:not(.p-disabled):hover {
diff --git a/components/lib/checkbox/style/CheckboxStyle.js b/components/lib/checkbox/style/CheckboxStyle.js
index 28d576f99..a27e07f30 100644
--- a/components/lib/checkbox/style/CheckboxStyle.js
+++ b/components/lib/checkbox/style/CheckboxStyle.js
@@ -38,7 +38,7 @@ const theme = ({ dt }) => `
     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: ${dt('checkbox.box.shadow')};
+    box-shadow: ${dt('checkbox.shadow')};
 }
 
 .p-checkbox-icon {
diff --git a/components/lib/inlinemessage/style/InlineMessageStyle.js b/components/lib/inlinemessage/style/InlineMessageStyle.js
index 152288add..e24f76bf7 100644
--- a/components/lib/inlinemessage/style/InlineMessageStyle.js
+++ b/components/lib/inlinemessage/style/InlineMessageStyle.js
@@ -32,7 +32,7 @@ const theme = ({ dt }) => `
     background: ${dt('inlinemessage.info.background')};
     border: 1px solid ${dt('inlinemessage.info.border.color')};
     color: ${dt('inlinemessage.info.color')};
-    box-shadow: ${dt('inlinemessage.info.box.shadow')};
+    box-shadow: ${dt('inlinemessage.info.shadow')};
 }
 
 .p-inline-message-info .p-inline-message-icon {
@@ -43,7 +43,7 @@ const theme = ({ dt }) => `
     background: ${dt('inlinemessage.success.background')};
     border: 1px solid ${dt('inlinemessage.success.border.color')};
     color: ${dt('inlinemessage.success.color')};
-    box-shadow: ${dt('inlinemessage.success.box.shadow')};
+    box-shadow: ${dt('inlinemessage.success.shadow')};
 }
 .p-inline-message-success .p-inline-message-icon {
     color: ${dt('inlinemessage.success.color')};
@@ -53,7 +53,7 @@ const theme = ({ dt }) => `
     background: ${dt('inlinemessage.warn.background')};
     border: 1px solid ${dt('inlinemessage.warn.border.color')};
     color: ${dt('inlinemessage.warn.color')};
-    box-shadow: ${dt('inlinemessage.warn.box.shadow')};
+    box-shadow: ${dt('inlinemessage.warn.shadow')};
 }
 .p-inline-message-warn .p-inline-message-icon {
     color: ${dt('inlinemessage.warn.color')};
@@ -63,7 +63,7 @@ const theme = ({ dt }) => `
     background: ${dt('inlinemessage.error.background')};
     border: 1px solid ${dt('inlinemessage.error.border.color')};
     color: ${dt('inlinemessage.error.color')};
-    box-shadow: ${dt('inlinemessage.error.box.shadow')};
+    box-shadow: ${dt('inlinemessage.error.shadow')};
 }
 .p-inline-message-error .p-inline-message-icon {
     color: ${dt('inlinemessage.error.color')};
@@ -73,7 +73,7 @@ const theme = ({ dt }) => `
     background: ${dt('inlinemessage.secondary.background')};
     border: 1px solid ${dt('inlinemessage.secondary.border.color')};
     color: ${dt('inlinemessage.secondary.color')};
-    box-shadow: ${dt('inlinemessage.secondary.box.shadow')};
+    box-shadow: ${dt('inlinemessage.secondary.shadow')};
 }
 .p-inline-message-secondary .p-inline-message-icon {
     color: ${dt('inlinemessage.secondary.color')};
@@ -83,7 +83,7 @@ const theme = ({ dt }) => `
     background: ${dt('inlinemessage.contrast.background')};
     border: 1px solid ${dt('inlinemessage.contrast.border.color')};
     color: ${dt('inlinemessage.contrast.color')};
-    box-shadow: ${dt('inlinemessage.contrast.box.shadow')};
+    box-shadow: ${dt('inlinemessage.contrast.shadow')};
 }
 .p-inline-message-contrast .p-inline-message-icon {
     color: ${dt('inlinemessage.contrast.color')};
diff --git a/components/lib/inputchips/style/InputChipsStyle.js b/components/lib/inputchips/style/InputChipsStyle.js
index 6d193d3f3..c709b4cdb 100644
--- a/components/lib/inputchips/style/InputChipsStyle.js
+++ b/components/lib/inputchips/style/InputChipsStyle.js
@@ -23,7 +23,7 @@ const theme = ({ dt }) => `
     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: ${dt('inputchips.box.shadow')};
+    box-shadow: ${dt('inputchips.shadow')};
 }
 
 .p-inputchips:not(.p-disabled):hover .p-inputchips-input {
diff --git a/components/lib/inputtext/style/InputTextStyle.js b/components/lib/inputtext/style/InputTextStyle.js
index 10acfe48b..dbd7c893d 100644
--- a/components/lib/inputtext/style/InputTextStyle.js
+++ b/components/lib/inputtext/style/InputTextStyle.js
@@ -13,7 +13,7 @@ const theme = ({ dt }) => `
     appearance: none;
     border-radius: ${dt('inputtext.border.radius')};
     outline-color: transparent;
-    box-shadow: ${dt('inputtext.box.shadow')};
+    box-shadow: ${dt('inputtext.shadow')};
 }
 
 .p-inputtext:enabled:hover {
@@ -22,7 +22,7 @@ const theme = ({ dt }) => `
 
 .p-inputtext:enabled:focus {
     border-color: ${dt('inputtext.focus.border.color')};
-    box-shadow: ${dt('inputtext.focus.box.shadow')};
+    box-shadow: ${dt('inputtext.focus.shadow')};
     outline: 0 none;
 }
 
diff --git a/components/lib/message/style/MessageStyle.js b/components/lib/message/style/MessageStyle.js
index f53eea87c..ef0fba47d 100644
--- a/components/lib/message/style/MessageStyle.js
+++ b/components/lib/message/style/MessageStyle.js
@@ -47,7 +47,7 @@ const theme = ({ dt }) => `
     background: ${dt('message.info.background')};
     border: 1px solid ${dt('message.info.border.color')};
     color: ${dt('message.info.color')};
-    box-shadow: ${dt('message.info.box.shadow')};
+    box-shadow: ${dt('message.info.shadow')};
 }
 
 .p-message-info .p-message-close-button:focus-visible {
@@ -62,7 +62,7 @@ const theme = ({ dt }) => `
     background: ${dt('message.success.background')};
     border: 1px solid ${dt('message.success.border.color')};
     color: ${dt('message.success.color')};
-    box-shadow: ${dt('message.success.box.shadow')};
+    box-shadow: ${dt('message.success.shadow')};
 }
 
 .p-message-success .p-message-close-button:focus-visible {
@@ -77,7 +77,7 @@ const theme = ({ dt }) => `
     background: ${dt('message.warn.background')};
     border: 1px solid ${dt('message.warn.border.color')};
     color: ${dt('message.warn.color')};
-    box-shadow: ${dt('message.warn.box.shadow')};
+    box-shadow: ${dt('message.warn.shadow')};
 }
 
 .p-message-warn .p-message-close-button:focus-visible {
@@ -92,7 +92,7 @@ const theme = ({ dt }) => `
     background: ${dt('message.error.background')};
     border: 1px solid ${dt('message.error.border.color')};
     color: ${dt('message.error.color')};
-    box-shadow: ${dt('message.error.box.shadow')};
+    box-shadow: ${dt('message.error.shadow')};
 }
 
 .p-message-error .p-message-close-button:focus-visible {
@@ -107,7 +107,7 @@ const theme = ({ dt }) => `
     background: ${dt('message.secondary.background')};
     border: 1px solid ${dt('message.secondary.border.color')};
     color: ${dt('message.secondary.color')};
-    box-shadow: ${dt('message.secondary.box.shadow')};
+    box-shadow: ${dt('message.secondary.shadow')};
 }
 
 .p-message-secondary .p-message-close-button:focus-visible {
@@ -122,7 +122,7 @@ const theme = ({ dt }) => `
     background: ${dt('message.contrast.background')};
     border: 1px solid ${dt('message.contrast.border.color')};
     color: ${dt('message.contrast.color')};
-    box-shadow: ${dt('message.contrast.box.shadow')};
+    box-shadow: ${dt('message.contrast.shadow')};
 }
 
 .p-message-contrast .p-message-close-button:focus-visible {
diff --git a/components/lib/multiselect/style/MultiSelectStyle.js b/components/lib/multiselect/style/MultiSelectStyle.js
index 1852b4d69..71e76de8b 100644
--- a/components/lib/multiselect/style/MultiSelectStyle.js
+++ b/components/lib/multiselect/style/MultiSelectStyle.js
@@ -11,7 +11,7 @@ const theme = ({ dt }) => `
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     border-radius: ${dt('border.radius.md')};
     outline-color: transparent;
-    box-shadow: ${dt('multiselect.box.shadow')};
+    box-shadow: ${dt('multiselect.shadow')};
 }
 
 .p-multiselect:not(.p-disabled):hover {
diff --git a/components/lib/radiobutton/style/RadioButtonStyle.js b/components/lib/radiobutton/style/RadioButtonStyle.js
index c5671986c..a9b4fb8b1 100644
--- a/components/lib/radiobutton/style/RadioButtonStyle.js
+++ b/components/lib/radiobutton/style/RadioButtonStyle.js
@@ -38,7 +38,7 @@ const theme = ({ dt }) => `
     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: ${dt('radiobutton.box.shadow')};
+    box-shadow: ${dt('radiobutton.shadow')};
 }
 
 .p-radiobutton-icon {
diff --git a/components/lib/select/style/SelectStyle.js b/components/lib/select/style/SelectStyle.js
index 9937f6764..2e04a28f6 100644
--- a/components/lib/select/style/SelectStyle.js
+++ b/components/lib/select/style/SelectStyle.js
@@ -11,7 +11,7 @@ const theme = ({ dt }) => `
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     border-radius: ${dt('border.radius.md')};
     outline-color: transparent;
-    box-shadow: ${dt('select.box.shadow')};
+    box-shadow: ${dt('select.shadow')};
 }
 
 .p-select:not(.p-disabled):hover {
diff --git a/components/lib/tabs/style/TabsStyle.js b/components/lib/tabs/style/TabsStyle.js
index e33a44677..90ce669c9 100644
--- a/components/lib/tabs/style/TabsStyle.js
+++ b/components/lib/tabs/style/TabsStyle.js
@@ -47,7 +47,7 @@ const theme = ({ dt }) => `
     color: ${dt('tabs.nav.button.color')};
     width: 2.5rem;
     transition: color ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
-    box-shadow: ${dt('tabs.nav.button.box.shadow')};
+    box-shadow: ${dt('tabs.nav.button.shadow')};
     cursor: pointer;
 }
 
diff --git a/components/lib/tabview/style/TabViewStyle.js b/components/lib/tabview/style/TabViewStyle.js
index 0a7a8d441..d9247381c 100644
--- a/components/lib/tabview/style/TabViewStyle.js
+++ b/components/lib/tabview/style/TabViewStyle.js
@@ -89,7 +89,7 @@ const theme = ({ dt }) => `
     border-radius: 0;
     outline-color: transparent;
     transition: color ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
-    box-shadow: ${dt('tabview.nav.button.box.shadow')};
+    box-shadow: ${dt('tabview.nav.button.shadow')};
     border: none;
     cursor: pointer;
     user-select: none;
diff --git a/components/lib/textarea/style/TextareaStyle.js b/components/lib/textarea/style/TextareaStyle.js
index cf90a247d..ce45d65c8 100644
--- a/components/lib/textarea/style/TextareaStyle.js
+++ b/components/lib/textarea/style/TextareaStyle.js
@@ -13,7 +13,7 @@ const theme = ({ dt }) => `
     appearance: none;
     border-radius: ${dt('border.radius.md')};
     outline-color: transparent;
-    box-shadow: ${dt('textarea.box.shadow')};
+    box-shadow: ${dt('textarea.shadow')};
 }
 
 .p-inputtextarea:enabled:hover {
diff --git a/components/lib/themes/aura/autocomplete/index.js b/components/lib/themes/aura/autocomplete/index.js
index 720613cdf..0bc88abfd 100644
--- a/components/lib/themes/aura/autocomplete/index.js
+++ b/components/lib/themes/aura/autocomplete/index.js
@@ -11,7 +11,7 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     overlay: {
         background: '{overlay.select.background}',
diff --git a/components/lib/themes/aura/cascadeselect/index.js b/components/lib/themes/aura/cascadeselect/index.js
index 96b2a199c..bbb649272 100644
--- a/components/lib/themes/aura/cascadeselect/index.js
+++ b/components/lib/themes/aura/cascadeselect/index.js
@@ -11,7 +11,7 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     dropdown: {
         color: '{form.field.icon.color}'
@@ -31,7 +31,7 @@ export default {
         selectedFocusColor: '{list.option.selected.focus.color}',
         icon: {
             color: '{list.option.icon.color}',
-            focusColor: '{list.option.icon.focus.color}',
+            focusColor: '{list.option.icon.focus.color}'
         }
     }
 };
diff --git a/components/lib/themes/aura/checkbox/index.js b/components/lib/themes/aura/checkbox/index.js
index 15ccb8e37..bab6c1f50 100644
--- a/components/lib/themes/aura/checkbox/index.js
+++ b/components/lib/themes/aura/checkbox/index.js
@@ -13,7 +13,7 @@ export default {
         checkedBorderColor: '{primary.color}',
         checkedHoverBorderColor: '{primary.hover.color}',
         invalidBorderColor: '{form.field.invalid.border.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     icon: {
         size: '0.875rem',
diff --git a/components/lib/themes/aura/index.js b/components/lib/themes/aura/index.js
index 92aafe8fc..b5164a449 100644
--- a/components/lib/themes/aura/index.js
+++ b/components/lib/themes/aura/index.js
@@ -187,8 +187,8 @@ export default {
                     floatLabelFocusColor: '{surface.500}',
                     floatLabelInvalidColor: '{red.400}',
                     iconColor: '{surface.400}',
-                    boxShadow: '0 0 #0000, 0 0 #0000, 0 1px 2px 0 rgba(18, 18, 23, 0.05)',
-                    focusBoxShadow: 'none'
+                    shadow: '0 0 #0000, 0 0 #0000, 0 1px 2px 0 rgba(18, 18, 23, 0.05)',
+                    focusShadow: 'none'
                 },
                 text: {
                     color: '{surface.700}',
@@ -293,8 +293,8 @@ export default {
                     floatLabelFocusColor: '{surface.400}',
                     floatLabelInvalidColor: '{red.300}',
                     iconColor: '{surface.400}',
-                    boxShadow: '0 0 #0000, 0 0 #0000, 0 1px 2px 0 rgba(18, 18, 23, 0.05)',
-                    focusBoxShadow: 'none'
+                    shadow: '0 0 #0000, 0 0 #0000, 0 1px 2px 0 rgba(18, 18, 23, 0.05)',
+                    focusShadow: 'none'
                 },
                 text: {
                     color: '{surface.0}',
diff --git a/components/lib/themes/aura/inputchips/index.js b/components/lib/themes/aura/inputchips/index.js
index ee6501b37..ea3c65e2d 100644
--- a/components/lib/themes/aura/inputchips/index.js
+++ b/components/lib/themes/aura/inputchips/index.js
@@ -11,6 +11,6 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     }
 };
diff --git a/components/lib/themes/aura/inputtext/index.js b/components/lib/themes/aura/inputtext/index.js
index c84aaccd1..40f295d51 100644
--- a/components/lib/themes/aura/inputtext/index.js
+++ b/components/lib/themes/aura/inputtext/index.js
@@ -11,8 +11,8 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}',
-        focusBoxShadow: '{form.field.focus.box.shadow}',
+        shadow: '{form.field.shadow}',
+        focusShadow: '{form.field.focus.shadow}',
         paddingX: '{form.field.padding.x}',
         paddingY: '{form.field.padding.y}',
         borderRadius: '{form.field.border.radius}'
diff --git a/components/lib/themes/aura/listbox/index.js b/components/lib/themes/aura/listbox/index.js
index 5ac90ddf8..adaa8b1aa 100644
--- a/components/lib/themes/aura/listbox/index.js
+++ b/components/lib/themes/aura/listbox/index.js
@@ -8,7 +8,7 @@ export default {
         invalidBorderColor: '{form.field.invalid.border.color}',
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     option: {
         focusBackground: '{list.option.focus.background}',
diff --git a/components/lib/themes/aura/multiselect/index.js b/components/lib/themes/aura/multiselect/index.js
index eeadcb602..9f44920da 100644
--- a/components/lib/themes/aura/multiselect/index.js
+++ b/components/lib/themes/aura/multiselect/index.js
@@ -11,7 +11,7 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     dropdown: {
         color: '{form.field.icon.color}'
diff --git a/components/lib/themes/aura/radiobutton/index.js b/components/lib/themes/aura/radiobutton/index.js
index 423303dcb..1d0d05d3f 100644
--- a/components/lib/themes/aura/radiobutton/index.js
+++ b/components/lib/themes/aura/radiobutton/index.js
@@ -12,7 +12,7 @@ export default {
         checkedBorderColor: '{primary.color}',
         checkedHoverBorderColor: '{primary.hover.color}',
         invalidBorderColor: '{form.field.invalid.border.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     icon: {
         size: '0.75rem',
diff --git a/components/lib/themes/aura/select/index.js b/components/lib/themes/aura/select/index.js
index e636df8cf..2af90a30d 100644
--- a/components/lib/themes/aura/select/index.js
+++ b/components/lib/themes/aura/select/index.js
@@ -11,7 +11,7 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     dropdown: {
         color: '{form.field.icon.color}'
diff --git a/components/lib/themes/aura/textarea/index.js b/components/lib/themes/aura/textarea/index.js
index ee6501b37..ea3c65e2d 100644
--- a/components/lib/themes/aura/textarea/index.js
+++ b/components/lib/themes/aura/textarea/index.js
@@ -11,6 +11,6 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     }
 };
diff --git a/components/lib/themes/aura/treeselect/index.js b/components/lib/themes/aura/treeselect/index.js
index 602e2d12b..86822f2f8 100644
--- a/components/lib/themes/aura/treeselect/index.js
+++ b/components/lib/themes/aura/treeselect/index.js
@@ -11,7 +11,7 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     dropdown: {
         color: '{form.field.icon.color}'
diff --git a/components/lib/themes/lara/autocomplete/index.js b/components/lib/themes/lara/autocomplete/index.js
index 720613cdf..0bc88abfd 100644
--- a/components/lib/themes/lara/autocomplete/index.js
+++ b/components/lib/themes/lara/autocomplete/index.js
@@ -11,7 +11,7 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     overlay: {
         background: '{overlay.select.background}',
diff --git a/components/lib/themes/lara/cascadeselect/index.js b/components/lib/themes/lara/cascadeselect/index.js
index 96b2a199c..bbb649272 100644
--- a/components/lib/themes/lara/cascadeselect/index.js
+++ b/components/lib/themes/lara/cascadeselect/index.js
@@ -11,7 +11,7 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     dropdown: {
         color: '{form.field.icon.color}'
@@ -31,7 +31,7 @@ export default {
         selectedFocusColor: '{list.option.selected.focus.color}',
         icon: {
             color: '{list.option.icon.color}',
-            focusColor: '{list.option.icon.focus.color}',
+            focusColor: '{list.option.icon.focus.color}'
         }
     }
 };
diff --git a/components/lib/themes/lara/checkbox/index.js b/components/lib/themes/lara/checkbox/index.js
index 15ccb8e37..bab6c1f50 100644
--- a/components/lib/themes/lara/checkbox/index.js
+++ b/components/lib/themes/lara/checkbox/index.js
@@ -13,7 +13,7 @@ export default {
         checkedBorderColor: '{primary.color}',
         checkedHoverBorderColor: '{primary.hover.color}',
         invalidBorderColor: '{form.field.invalid.border.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     icon: {
         size: '0.875rem',
diff --git a/components/lib/themes/lara/index.js b/components/lib/themes/lara/index.js
index 1e85053f7..c7c1ecf41 100644
--- a/components/lib/themes/lara/index.js
+++ b/components/lib/themes/lara/index.js
@@ -187,8 +187,8 @@ export default {
                     floatLabelFocusColor: '{surface.500}',
                     floatLabelInvalidColor: '{red.400}',
                     iconColor: '{surface.400}',
-                    boxShadow: 'none',
-                    focusBoxShadow: '0 0 0 0.2rem {primary.200}'
+                    shadow: 'none',
+                    focusShadow: '0 0 0 0.2rem {primary.200}'
                 },
                 text: {
                     color: '{surface.700}',
@@ -293,8 +293,8 @@ export default {
                     floatLabelFocusColor: '{surface.400}',
                     floatLabelInvalidColor: '{red.300}',
                     iconColor: '{surface.400}',
-                    boxShadow: 'none',
-                    focusBoxShadow: '0 0 0 0.2rem color-mix(in srgb, {primary.color}, transparent 80%)'
+                    shadow: 'none',
+                    focusShadow: '0 0 0 0.2rem color-mix(in srgb, {primary.color}, transparent 80%)'
                 },
                 text: {
                     color: '{surface.0}',
diff --git a/components/lib/themes/lara/inputchips/index.js b/components/lib/themes/lara/inputchips/index.js
index ee6501b37..ea3c65e2d 100644
--- a/components/lib/themes/lara/inputchips/index.js
+++ b/components/lib/themes/lara/inputchips/index.js
@@ -11,6 +11,6 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     }
 };
diff --git a/components/lib/themes/lara/inputtext/index.js b/components/lib/themes/lara/inputtext/index.js
index c84aaccd1..40f295d51 100644
--- a/components/lib/themes/lara/inputtext/index.js
+++ b/components/lib/themes/lara/inputtext/index.js
@@ -11,8 +11,8 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}',
-        focusBoxShadow: '{form.field.focus.box.shadow}',
+        shadow: '{form.field.shadow}',
+        focusShadow: '{form.field.focus.shadow}',
         paddingX: '{form.field.padding.x}',
         paddingY: '{form.field.padding.y}',
         borderRadius: '{form.field.border.radius}'
diff --git a/components/lib/themes/lara/listbox/index.js b/components/lib/themes/lara/listbox/index.js
index 5ac90ddf8..adaa8b1aa 100644
--- a/components/lib/themes/lara/listbox/index.js
+++ b/components/lib/themes/lara/listbox/index.js
@@ -8,7 +8,7 @@ export default {
         invalidBorderColor: '{form.field.invalid.border.color}',
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     option: {
         focusBackground: '{list.option.focus.background}',
diff --git a/components/lib/themes/lara/multiselect/index.js b/components/lib/themes/lara/multiselect/index.js
index eeadcb602..9f44920da 100644
--- a/components/lib/themes/lara/multiselect/index.js
+++ b/components/lib/themes/lara/multiselect/index.js
@@ -11,7 +11,7 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     dropdown: {
         color: '{form.field.icon.color}'
diff --git a/components/lib/themes/lara/radiobutton/index.js b/components/lib/themes/lara/radiobutton/index.js
index 423303dcb..1d0d05d3f 100644
--- a/components/lib/themes/lara/radiobutton/index.js
+++ b/components/lib/themes/lara/radiobutton/index.js
@@ -12,7 +12,7 @@ export default {
         checkedBorderColor: '{primary.color}',
         checkedHoverBorderColor: '{primary.hover.color}',
         invalidBorderColor: '{form.field.invalid.border.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     icon: {
         size: '0.75rem',
diff --git a/components/lib/themes/lara/select/index.js b/components/lib/themes/lara/select/index.js
index e636df8cf..2af90a30d 100644
--- a/components/lib/themes/lara/select/index.js
+++ b/components/lib/themes/lara/select/index.js
@@ -11,7 +11,7 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     dropdown: {
         color: '{form.field.icon.color}'
diff --git a/components/lib/themes/lara/textarea/index.js b/components/lib/themes/lara/textarea/index.js
index ee6501b37..ea3c65e2d 100644
--- a/components/lib/themes/lara/textarea/index.js
+++ b/components/lib/themes/lara/textarea/index.js
@@ -11,6 +11,6 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     }
 };
diff --git a/components/lib/themes/lara/treeselect/index.js b/components/lib/themes/lara/treeselect/index.js
index 602e2d12b..86822f2f8 100644
--- a/components/lib/themes/lara/treeselect/index.js
+++ b/components/lib/themes/lara/treeselect/index.js
@@ -11,7 +11,7 @@ export default {
         color: '{form.field.color}',
         disabledColor: '{form.field.disabled.color}',
         placeholderColor: '{form.field.placeholder.color}',
-        boxShadow: '{form.field.box.shadow}'
+        shadow: '{form.field.shadow}'
     },
     dropdown: {
         color: '{form.field.icon.color}'
diff --git a/components/lib/toast/style/ToastStyle.js b/components/lib/toast/style/ToastStyle.js
index 27f9c33ca..c9d040a73 100644
--- a/components/lib/toast/style/ToastStyle.js
+++ b/components/lib/toast/style/ToastStyle.js
@@ -70,7 +70,7 @@ const theme = ({ dt }) => `
     background: ${dt('toast.info.background')};
     border: 1px solid ${dt('toast.info.border.color')};
     color: ${dt('toast.info.color')};
-    box-shadow: ${dt('toast.info.box.shadow')};
+    box-shadow: ${dt('toast.info.shadow')};
 }
 
 .p-toast-message-info .p-toast-detail {
@@ -89,7 +89,7 @@ const theme = ({ dt }) => `
     background: ${dt('toast.success.background')};
     border: 1px solid ${dt('toast.success.border.color')};
     color: ${dt('toast.success.color')};
-    box-shadow: ${dt('toast.success.box.shadow')};
+    box-shadow: ${dt('toast.success.shadow')};
 }
 
 .p-toast-message-success .p-toast-detail {
@@ -108,7 +108,7 @@ const theme = ({ dt }) => `
     background: ${dt('toast.warn.background')};
     border: 1px solid ${dt('toast.warn.border.color')};
     color: ${dt('toast.warn.color')};
-    box-shadow: ${dt('toast.warn.box.shadow')};
+    box-shadow: ${dt('toast.warn.shadow')};
 }
 
 .p-toast-message-warn .p-toast-detail {
@@ -127,7 +127,7 @@ const theme = ({ dt }) => `
     background: ${dt('toast.error.background')};
     border: 1px solid ${dt('toast.error.border.color')};
     color: ${dt('toast.error.color')};
-    box-shadow: ${dt('toast.error.box.shadow')};
+    box-shadow: ${dt('toast.error.shadow')};
 }
 
 .p-toast-message-error .p-toast-detail {
@@ -146,7 +146,7 @@ const theme = ({ dt }) => `
     background: ${dt('toast.secondary.background')};
     border: 1px solid ${dt('toast.secondary.border.color')};
     color: ${dt('toast.secondary.color')};
-    box-shadow: ${dt('toast.secondary.box.shadow')};
+    box-shadow: ${dt('toast.secondary.shadow')};
 }
 
 .p-toast-message-secondary .p-toast-detail {
@@ -165,7 +165,7 @@ const theme = ({ dt }) => `
     background: ${dt('toast.contrast.background')};
     border: 1px solid ${dt('toast.contrast.border.color')};
     color: ${dt('toast.contrast.color')};
-    box-shadow: ${dt('toast.contrast.box.shadow')};
+    box-shadow: ${dt('toast.contrast.shadow')};
 }
 
 .p-toast-message-contrast .p-toast-detail {
diff --git a/components/lib/treeselect/style/TreeSelectStyle.js b/components/lib/treeselect/style/TreeSelectStyle.js
index 9b6f99010..dcd80d7cd 100644
--- a/components/lib/treeselect/style/TreeSelectStyle.js
+++ b/components/lib/treeselect/style/TreeSelectStyle.js
@@ -11,7 +11,7 @@ const theme = ({ dt }) => `
     transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
     border-radius: ${dt('border.radius.md')};
     outline-color: transparent;
-    box-shadow: ${dt('treeselect.box.shadow')};
+    box-shadow: ${dt('treeselect.shadow')};
 }
 
 .p-treeselect:not(.p-disabled):hover {