diff --git a/packages/ui-scripts/lib/build/tokensStudio/$themes.json b/packages/ui-scripts/lib/build/tokensStudio/$themes.json
index 61c8a457eb..1116439634 100644
--- a/packages/ui-scripts/lib/build/tokensStudio/$themes.json
+++ b/packages/ui-scripts/lib/build/tokensStudio/$themes.json
@@ -674,8 +674,8 @@
       "baseButton.dangerHoverBackground": "6e254161e259b5fde36dc04a4ca13482cf5be5f3",
       "baseButton.destructiveActiveBorderColor": "8ddb9f8e4c7e5407f54f625dc57ddcf8fa88aa25",
       "baseButton.destructiveActiveTextColor": "52624a070cd187d4c93fdfd6ff20f1ccba5fdf3e",
-      "baseButton.destructiveBackgroundColor": "745e966770e54d70bd8f2929d163425fa6f664a4",
-      "baseButton.destructiveBaseTextColor": "cf8c92bd37c01cf342a82886f09e4e6c04907605",
+      "baseButton.dangerBackground": "745e966770e54d70bd8f2929d163425fa6f664a4",
+      "baseButton.dangerColor": "cf8c92bd37c01cf342a82886f09e4e6c04907605",
       "baseButton.destructiveDisabledBackgroundColor": "8be486825a0e8c0dca2d83ff6cbf3474d4ae146f",
       "baseButton.destructiveDisabledBorderColor": "014e6007e1d93f3f368f52eb91d9cae13f59512a",
       "baseButton.destructiveDisabledTextColor": "51c66874aaea183b04e26c9b0773ed213dd0733d",
@@ -722,7 +722,7 @@
       "baseButton.smallFontSize": "42b551631a1e8f006fd0bbf3341c78142714252e",
       "baseButton.smallHeight": "439b6458875abe9ee62bf1d56d5e8b875cb539ee",
       "baseButton.smallPaddingHorizontal": "99c02c4cd713e0aa1de7fcea944e39ec7c92b193",
-      "baseButton.borderRadiusBase": "032d979862a71bba5c059e267a548b909fbdd10e",
+      "baseButton.borderRadius": "032d979862a71bba5c059e267a548b909fbdd10e",
       "baseButton.borderRadiusFull": "3653b2517cc077ba99ea202eeb6bba2dca28fbdb",
       "baseButton.borderRadiusSm": "dc6505e855768e1113a1bfd6f67951b98157af4a",
       "baseButton.borderWidth": "845ff471d096f386c841be05303f5ffdb70375d8",
@@ -2510,8 +2510,8 @@
       "baseButton.dangerHoverBackground": "6e254161e259b5fde36dc04a4ca13482cf5be5f3",
       "baseButton.destructiveActiveBorderColor": "8ddb9f8e4c7e5407f54f625dc57ddcf8fa88aa25",
       "baseButton.destructiveActiveTextColor": "52624a070cd187d4c93fdfd6ff20f1ccba5fdf3e",
-      "baseButton.destructiveBackgroundColor": "745e966770e54d70bd8f2929d163425fa6f664a4",
-      "baseButton.destructiveBaseTextColor": "cf8c92bd37c01cf342a82886f09e4e6c04907605",
+      "baseButton.dangerBackground": "745e966770e54d70bd8f2929d163425fa6f664a4",
+      "baseButton.dangerColor": "cf8c92bd37c01cf342a82886f09e4e6c04907605",
       "baseButton.destructiveDisabledBackgroundColor": "8be486825a0e8c0dca2d83ff6cbf3474d4ae146f",
       "baseButton.destructiveDisabledBorderColor": "014e6007e1d93f3f368f52eb91d9cae13f59512a",
       "baseButton.destructiveDisabledTextColor": "51c66874aaea183b04e26c9b0773ed213dd0733d",
@@ -2558,7 +2558,7 @@
       "baseButton.smallFontSize": "42b551631a1e8f006fd0bbf3341c78142714252e",
       "baseButton.smallHeight": "439b6458875abe9ee62bf1d56d5e8b875cb539ee",
       "baseButton.smallPaddingHorizontal": "99c02c4cd713e0aa1de7fcea944e39ec7c92b193",
-      "baseButton.borderRadiusBase": "032d979862a71bba5c059e267a548b909fbdd10e",
+      "baseButton.borderRadius": "032d979862a71bba5c059e267a548b909fbdd10e",
       "baseButton.borderRadiusFull": "3653b2517cc077ba99ea202eeb6bba2dca28fbdb",
       "baseButton.borderRadiusSm": "dc6505e855768e1113a1bfd6f67951b98157af4a",
       "baseButton.borderWidth": "845ff471d096f386c841be05303f5ffdb70375d8",
@@ -4495,8 +4495,8 @@
       "baseButton.dangerHoverBackground": "6e254161e259b5fde36dc04a4ca13482cf5be5f3",
       "baseButton.destructiveActiveBorderColor": "8ddb9f8e4c7e5407f54f625dc57ddcf8fa88aa25",
       "baseButton.destructiveActiveTextColor": "52624a070cd187d4c93fdfd6ff20f1ccba5fdf3e",
-      "baseButton.destructiveBackgroundColor": "745e966770e54d70bd8f2929d163425fa6f664a4",
-      "baseButton.destructiveBaseTextColor": "cf8c92bd37c01cf342a82886f09e4e6c04907605",
+      "baseButton.dangerBackground": "745e966770e54d70bd8f2929d163425fa6f664a4",
+      "baseButton.dangerColor": "cf8c92bd37c01cf342a82886f09e4e6c04907605",
       "baseButton.destructiveDisabledBackgroundColor": "8be486825a0e8c0dca2d83ff6cbf3474d4ae146f",
       "baseButton.destructiveDisabledBorderColor": "014e6007e1d93f3f368f52eb91d9cae13f59512a",
       "baseButton.destructiveDisabledTextColor": "51c66874aaea183b04e26c9b0773ed213dd0733d",
@@ -4543,7 +4543,7 @@
       "baseButton.smallFontSize": "42b551631a1e8f006fd0bbf3341c78142714252e",
       "baseButton.smallHeight": "439b6458875abe9ee62bf1d56d5e8b875cb539ee",
       "baseButton.smallPaddingHorizontal": "99c02c4cd713e0aa1de7fcea944e39ec7c92b193",
-      "baseButton.borderRadiusBase": "032d979862a71bba5c059e267a548b909fbdd10e",
+      "baseButton.borderRadius": "032d979862a71bba5c059e267a548b909fbdd10e",
       "baseButton.borderRadiusFull": "3653b2517cc077ba99ea202eeb6bba2dca28fbdb",
       "baseButton.borderRadiusSm": "dc6505e855768e1113a1bfd6f67951b98157af4a",
       "baseButton.borderWidth": "845ff471d096f386c841be05303f5ffdb70375d8",
@@ -6329,8 +6329,8 @@
       "baseButton.dangerHoverBackground": "6e254161e259b5fde36dc04a4ca13482cf5be5f3",
       "baseButton.destructiveActiveBorderColor": "8ddb9f8e4c7e5407f54f625dc57ddcf8fa88aa25",
       "baseButton.destructiveActiveTextColor": "52624a070cd187d4c93fdfd6ff20f1ccba5fdf3e",
-      "baseButton.destructiveBackgroundColor": "745e966770e54d70bd8f2929d163425fa6f664a4",
-      "baseButton.destructiveBaseTextColor": "cf8c92bd37c01cf342a82886f09e4e6c04907605",
+      "baseButton.dangerBackground": "745e966770e54d70bd8f2929d163425fa6f664a4",
+      "baseButton.dangerColor": "cf8c92bd37c01cf342a82886f09e4e6c04907605",
       "baseButton.destructiveDisabledBackgroundColor": "8be486825a0e8c0dca2d83ff6cbf3474d4ae146f",
       "baseButton.destructiveDisabledBorderColor": "014e6007e1d93f3f368f52eb91d9cae13f59512a",
       "baseButton.destructiveDisabledTextColor": "51c66874aaea183b04e26c9b0773ed213dd0733d",
@@ -6377,7 +6377,7 @@
       "baseButton.smallFontSize": "42b551631a1e8f006fd0bbf3341c78142714252e",
       "baseButton.smallHeight": "439b6458875abe9ee62bf1d56d5e8b875cb539ee",
       "baseButton.smallPaddingHorizontal": "99c02c4cd713e0aa1de7fcea944e39ec7c92b193",
-      "baseButton.borderRadiusBase": "032d979862a71bba5c059e267a548b909fbdd10e",
+      "baseButton.borderRadius": "032d979862a71bba5c059e267a548b909fbdd10e",
       "baseButton.borderRadiusFull": "3653b2517cc077ba99ea202eeb6bba2dca28fbdb",
       "baseButton.borderRadiusSm": "dc6505e855768e1113a1bfd6f67951b98157af4a",
       "baseButton.borderWidth": "845ff471d096f386c841be05303f5ffdb70375d8",
diff --git a/packages/ui-scripts/lib/build/tokensStudio/canvas/component/BaseButton.json b/packages/ui-scripts/lib/build/tokensStudio/canvas/component/BaseButton.json
index 7369587bff..b254ec6959 100644
--- a/packages/ui-scripts/lib/build/tokensStudio/canvas/component/BaseButton.json
+++ b/packages/ui-scripts/lib/build/tokensStudio/canvas/component/BaseButton.json
@@ -339,11 +339,11 @@
       "value": "{color.text.interactive.action.status.active}",
       "type": "color"
     },
-    "destructiveBackgroundColor": {
+    "dangerBackground": {
       "value": "{color.background.interactive.action.destructive.base}",
       "type": "color"
     },
-    "destructiveBaseTextColor": {
+    "dangerColor": {
       "value": "{color.text.interactive.action.status.base}",
       "type": "color"
     },
@@ -531,7 +531,7 @@
       "value": "{spacing.padding.interactive.horizontal.sm}",
       "type": "spacing"
     },
-    "borderRadiusBase": {
+    "borderRadius": {
       "value": "{borderRadius.interactive.base}",
       "type": "borderRadius"
     },
@@ -770,6 +770,10 @@
     "transform": {
       "value": "none",
       "type": "text"
+    },
+    "borderStyle": {
+      "value": "solid",
+      "type": "other"
     }
   }
 }
\ No newline at end of file
diff --git a/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/BaseButton.json b/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/BaseButton.json
index e3c0c0b990..1b10180378 100644
--- a/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/BaseButton.json
+++ b/packages/ui-scripts/lib/build/tokensStudio/rebrand/component/BaseButton.json
@@ -339,11 +339,11 @@
       "value": "{color.text.interactive.action.status.active}",
       "type": "color"
     },
-    "destructiveBackgroundColor": {
+    "dangerBackground": {
       "value": "{color.background.interactive.action.destructive.base}",
       "type": "color"
     },
-    "destructiveBaseTextColor": {
+    "dangerColor": {
       "value": "{color.text.interactive.action.status.base}",
       "type": "color"
     },
@@ -531,7 +531,7 @@
       "value": "{spacing.padding.interactive.horizontal.sm}",
       "type": "spacing"
     },
-    "borderRadiusBase": {
+    "borderRadius": {
       "value": "{borderRadius.interactive.base}",
       "type": "borderRadius"
     },
@@ -770,6 +770,10 @@
     "transform": {
       "value": "none",
       "type": "text"
+    },
+    "borderStyle": {
+      "value": "solid",
+      "type": "other"
     }
   }
 }
\ No newline at end of file