diff --git a/src/__integ__/__snapshots__/themes.test.ts.snap b/src/__integ__/__snapshots__/themes.test.ts.snap
index a1b0b50133..ec1c8233a0 100644
--- a/src/__integ__/__snapshots__/themes.test.ts.snap
+++ b/src/__integ__/__snapshots__/themes.test.ts.snap
@@ -189,6 +189,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "compact" 1`] =
   "color-background-table-header": "#fafafa",
   "color-background-tiles-disabled": "#eaeded",
   "color-background-toggle-button-normal-pressed": "#eaeded",
+  "color-background-toggle-button-normal-default": "#ffffff",
   "color-background-toggle-checked-disabled": "#99cbe4",
   "color-background-toggle-default": "#545b64",
   "color-black": "#000000",
@@ -522,6 +523,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "compact" 1`] =
   "color-text-button-primary-disabled": "#879596",
   "color-text-button-primary-hover": "#ffffff",
   "color-text-calendar-date-hover": "#16191f",
+  "color-text-calendar-date-selected": "#ffffff",
   "color-text-calendar-month": "#545b64",
   "color-text-chat-bubble-incoming": "#16191f",
   "color-text-chat-bubble-outgoing": "#16191f",
@@ -1060,6 +1062,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "dark" 1`] = `
   "color-background-table-header": "#21252c",
   "color-background-tiles-disabled": "#2a2e33",
   "color-background-toggle-button-normal-pressed": "#16191f",
+  "color-background-toggle-button-normal-default": "#2a2e33",
   "color-background-toggle-checked-disabled": "#0a4a74",
   "color-background-toggle-default": "#879596",
   "color-black": "#000000",
@@ -1393,6 +1396,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "dark" 1`] = `
   "color-text-button-primary-disabled": "#879596",
   "color-text-button-primary-hover": "#16191f",
   "color-text-calendar-date-hover": "#eaeded",
+  "color-text-calendar-date-selected": "#1a2029",
   "color-text-calendar-month": "#d5dbdb",
   "color-text-chat-bubble-incoming": "#d5dbdb",
   "color-text-chat-bubble-outgoing": "#d5dbdb",
@@ -1931,6 +1935,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "light" 1`] = `
   "color-background-table-header": "#fafafa",
   "color-background-tiles-disabled": "#eaeded",
   "color-background-toggle-button-normal-pressed": "#eaeded",
+  "color-background-toggle-button-normal-default": "#ffffff",
   "color-background-toggle-checked-disabled": "#99cbe4",
   "color-background-toggle-default": "#545b64",
   "color-black": "#000000",
@@ -2264,6 +2269,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "light" 1`] = `
   "color-text-button-primary-disabled": "#879596",
   "color-text-button-primary-hover": "#ffffff",
   "color-text-calendar-date-hover": "#16191f",
+  "color-text-calendar-date-selected": "#ffffff",
   "color-text-calendar-month": "#545b64",
   "color-text-chat-bubble-incoming": "#16191f",
   "color-text-chat-bubble-outgoing": "#16191f",
@@ -2802,6 +2808,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "reduced-motion"
   "color-background-table-header": "#fafafa",
   "color-background-tiles-disabled": "#eaeded",
   "color-background-toggle-button-normal-pressed": "#eaeded",
+  "color-background-toggle-button-normal-default": "#ffffff",
   "color-background-toggle-checked-disabled": "#99cbe4",
   "color-background-toggle-default": "#545b64",
   "color-black": "#000000",
@@ -3135,6 +3142,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "reduced-motion"
   "color-text-button-primary-disabled": "#879596",
   "color-text-button-primary-hover": "#ffffff",
   "color-text-calendar-date-hover": "#16191f",
+  "color-text-calendar-date-selected": "#ffffff",
   "color-text-calendar-month": "#545b64",
   "color-text-chat-bubble-incoming": "#16191f",
   "color-text-chat-bubble-outgoing": "#16191f",
@@ -3673,6 +3681,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh"
   "color-background-table-header": "#ffffff",
   "color-background-tiles-disabled": "#ebebf0",
   "color-background-toggle-button-normal-pressed": "#d1f1ff",
+  "color-background-toggle-button-normal-default": "#ffffff",
   "color-background-toggle-checked-disabled": "#b8e7ff",
   "color-background-toggle-default": "#424650",
   "color-black": "#000000",
@@ -4006,6 +4015,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh"
   "color-text-button-primary-disabled": "#8c8c94",
   "color-text-button-primary-hover": "#ffffff",
   "color-text-calendar-date-hover": "#0f141a",
+  "color-text-calendar-date-selected": "#ffffff",
   "color-text-calendar-month": "#656871",
   "color-text-chat-bubble-incoming": "#0f141a",
   "color-text-chat-bubble-outgoing": "#0f141a",
@@ -4544,6 +4554,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "color-background-table-header": "#ffffff",
   "color-background-tiles-disabled": "#ebebf0",
   "color-background-toggle-button-normal-pressed": "#d1f1ff",
+  "color-background-toggle-button-normal-default": "#ffffff",
   "color-background-toggle-checked-disabled": "#b8e7ff",
   "color-background-toggle-default": "#424650",
   "color-black": "#000000",
@@ -4877,6 +4888,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "color-text-button-primary-disabled": "#8c8c94",
   "color-text-button-primary-hover": "#ffffff",
   "color-text-calendar-date-hover": "#0f141a",
+  "color-text-calendar-date-selected": "#ffffff",
   "color-text-calendar-month": "#656871",
   "color-text-chat-bubble-incoming": "#0f141a",
   "color-text-chat-bubble-outgoing": "#0f141a",
@@ -5415,6 +5427,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "color-background-table-header": "#0f141a",
   "color-background-tiles-disabled": "#1b232d",
   "color-background-toggle-button-normal-pressed": "#333843",
+  "color-background-toggle-button-normal-default": "#0f141a",
   "color-background-toggle-checked-disabled": "#002b66",
   "color-background-toggle-default": "#8c8c94",
   "color-black": "#000000",
@@ -5748,6 +5761,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "color-text-button-primary-disabled": "#8c8c94",
   "color-text-button-primary-hover": "#0f141a",
   "color-text-calendar-date-hover": "#dedee3",
+  "color-text-calendar-date-selected": "#0f141a",
   "color-text-calendar-month": "#a4a4ad",
   "color-text-chat-bubble-incoming": "#c6c6cd",
   "color-text-chat-bubble-outgoing": "#c6c6cd",
@@ -6286,6 +6300,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "color-background-table-header": "#161d26",
   "color-background-tiles-disabled": "#1b232d",
   "color-background-toggle-button-normal-pressed": "#333843",
+  "color-background-toggle-button-normal-default": "#161d26",
   "color-background-toggle-checked-disabled": "#002b66",
   "color-background-toggle-default": "#8c8c94",
   "color-black": "#000000",
@@ -6619,6 +6634,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "color-text-button-primary-disabled": "#8c8c94",
   "color-text-button-primary-hover": "#0f141a",
   "color-text-calendar-date-hover": "#dedee3",
+  "color-text-calendar-date-selected": "#161d26",
   "color-text-calendar-month": "#a4a4ad",
   "color-text-chat-bubble-incoming": "#c6c6cd",
   "color-text-chat-bubble-outgoing": "#c6c6cd",
diff --git a/src/__tests__/snapshot-tests/__snapshots__/design-tokens.test.ts.snap b/src/__tests__/snapshot-tests/__snapshots__/design-tokens.test.ts.snap
index cdaca6d187..0a5a69165f 100644
--- a/src/__tests__/snapshot-tests/__snapshots__/design-tokens.test.ts.snap
+++ b/src/__tests__/snapshot-tests/__snapshots__/design-tokens.test.ts.snap
@@ -689,6 +689,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#fffef0",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "#2a2e33",
+            "light": "#ffffff",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -703,6 +710,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#99cbe4",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#879596",
+            "light": "#545b64",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -2299,6 +2313,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#ffffff",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#1a2029",
+            "light": "#ffffff",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -3922,6 +3943,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#fffef0",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "#2a2e33",
+            "light": "#ffffff",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -3936,6 +3964,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#99cbe4",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#879596",
+            "light": "#545b64",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -5532,6 +5567,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#ffffff",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#1a2029",
+            "light": "#ffffff",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -7155,6 +7197,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#fffef0",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "#2a2e33",
+            "light": "#ffffff",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -7169,6 +7218,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#99cbe4",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#879596",
+            "light": "#545b64",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -8765,6 +8821,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#ffffff",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#1a2029",
+            "light": "#ffffff",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -10388,6 +10451,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#fffef0",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "transparent",
+            "light": "transparent",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -10402,6 +10472,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#99cbe4",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#879596",
+            "light": "#545b64",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -11998,6 +12075,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#ffffff",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#1a2029",
+            "light": "#ffffff",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -13621,6 +13705,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#fffef0",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "transparent",
+            "light": "transparent",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -13635,6 +13726,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#99cbe4",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#879596",
+            "light": "#545b64",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -15231,6 +15329,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#ffffff",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#1a2029",
+            "light": "#ffffff",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -16854,6 +16959,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#191100",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "#2a2e33",
+            "light": "#2a2e33",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -16868,6 +16980,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#0a4a74",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#879596",
+            "light": "#879596",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -18464,6 +18583,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "light": "#16191f",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#1a2029",
+            "light": "#1a2029",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -20087,6 +20213,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
         "light": "#fffef0",
       },
     },
+    "color-background-toggle-button-normal-default": {
+      "$description": "The default background color of normal toggle buttons.",
+      "$value": {
+        "dark": "#2a2e33",
+        "light": "#ffffff",
+      },
+    },
     "color-background-toggle-button-normal-pressed": {
       "$description": "The background color of normal toggle buttons in pressed state.",
       "$value": {
@@ -20101,6 +20234,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
         "light": "#99cbe4",
       },
     },
+    "color-background-toggle-default": {
+      "$description": "The default background color of the toggle track in its unchecked state.",
+      "$value": {
+        "dark": "#879596",
+        "light": "#545b64",
+      },
+    },
     "color-board-placeholder-active": {
       "$description": "The color of board placeholder in active state.",
       "$value": {
@@ -21697,6 +21837,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
         "light": "#ffffff",
       },
     },
+    "color-text-calendar-date-selected": {
+      "$description": "The text color of selected dates in the calendar.",
+      "$value": {
+        "dark": "#1a2029",
+        "light": "#ffffff",
+      },
+    },
     "color-text-chat-bubble-incoming": {
       "$description": "Text color of \`incoming\` chat bubble.",
       "$value": {
@@ -23325,6 +23472,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#fffef0",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "transparent",
+            "light": "transparent",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -23339,6 +23493,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#b8e7ff",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#8c8c94",
+            "light": "#424650",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -24935,6 +25096,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#ffffff",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#161d26",
+            "light": "#ffffff",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -26558,6 +26726,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#191100",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "transparent",
+            "light": "transparent",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -26572,6 +26747,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#002b66",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#8c8c94",
+            "light": "#8c8c94",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -28168,6 +28350,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#0f141a",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#161d26",
+            "light": "#161d26",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -29791,6 +29980,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#fffef0",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "#161d26",
+            "light": "#ffffff",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -29805,6 +30001,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#b8e7ff",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#8c8c94",
+            "light": "#424650",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -31401,6 +31604,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#ffffff",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#161d26",
+            "light": "#ffffff",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -33024,6 +33234,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#fffef0",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "#161d26",
+            "light": "#ffffff",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -33038,6 +33255,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#b8e7ff",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#8c8c94",
+            "light": "#424650",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -34634,6 +34858,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#ffffff",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#161d26",
+            "light": "#ffffff",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -36257,6 +36488,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#fffef0",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "transparent",
+            "light": "transparent",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -36271,6 +36509,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#b8e7ff",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#8c8c94",
+            "light": "#424650",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -37867,6 +38112,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#ffffff",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#161d26",
+            "light": "#ffffff",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -39490,6 +39742,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#fffef0",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "transparent",
+            "light": "transparent",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -39504,6 +39763,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#b8e7ff",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#8c8c94",
+            "light": "#424650",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -41100,6 +41366,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#ffffff",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#161d26",
+            "light": "#ffffff",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -42723,6 +42996,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#191100",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "#0f141a",
+            "light": "#0f141a",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -42737,6 +43017,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#002b66",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#8c8c94",
+            "light": "#8c8c94",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -44333,6 +44620,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#0f141a",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#0f141a",
+            "light": "#0f141a",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -45956,6 +46250,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#191100",
           },
         },
+        "color-background-toggle-button-normal-default": {
+          "$description": "The default background color of normal toggle buttons.",
+          "$value": {
+            "dark": "#161d26",
+            "light": "#161d26",
+          },
+        },
         "color-background-toggle-button-normal-pressed": {
           "$description": "The background color of normal toggle buttons in pressed state.",
           "$value": {
@@ -45970,6 +46271,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#002b66",
           },
         },
+        "color-background-toggle-default": {
+          "$description": "The default background color of the toggle track in its unchecked state.",
+          "$value": {
+            "dark": "#8c8c94",
+            "light": "#8c8c94",
+          },
+        },
         "color-board-placeholder-active": {
           "$description": "The color of board placeholder in active state.",
           "$value": {
@@ -47566,6 +47874,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "light": "#0f141a",
           },
         },
+        "color-text-calendar-date-selected": {
+          "$description": "The text color of selected dates in the calendar.",
+          "$value": {
+            "dark": "#161d26",
+            "light": "#161d26",
+          },
+        },
         "color-text-chat-bubble-incoming": {
           "$description": "Text color of \`incoming\` chat bubble.",
           "$value": {
@@ -49189,6 +49504,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
         "light": "#fffef0",
       },
     },
+    "color-background-toggle-button-normal-default": {
+      "$description": "The default background color of normal toggle buttons.",
+      "$value": {
+        "dark": "#161d26",
+        "light": "#ffffff",
+      },
+    },
     "color-background-toggle-button-normal-pressed": {
       "$description": "The background color of normal toggle buttons in pressed state.",
       "$value": {
@@ -49203,6 +49525,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
         "light": "#b8e7ff",
       },
     },
+    "color-background-toggle-default": {
+      "$description": "The default background color of the toggle track in its unchecked state.",
+      "$value": {
+        "dark": "#8c8c94",
+        "light": "#424650",
+      },
+    },
     "color-board-placeholder-active": {
       "$description": "The color of board placeholder in active state.",
       "$value": {
@@ -50799,6 +51128,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
         "light": "#ffffff",
       },
     },
+    "color-text-calendar-date-selected": {
+      "$description": "The text color of selected dates in the calendar.",
+      "$value": {
+        "dark": "#161d26",
+        "light": "#ffffff",
+      },
+    },
     "color-text-chat-bubble-incoming": {
       "$description": "Text color of \`incoming\` chat bubble.",
       "$value": {
diff --git a/src/calendar/calendar.scss b/src/calendar/calendar.scss
index 813bda038e..6847ea15eb 100644
--- a/src/calendar/calendar.scss
+++ b/src/calendar/calendar.scss
@@ -15,7 +15,7 @@ $grid-nonmonth-day-color: awsui.$color-text-dropdown-item-secondary;
 $grid-hover-background-color: awsui.$color-background-dropdown-item-hover;
 $grid-hover-border-color: awsui.$color-border-dropdown-item-hover;
 $grid-current-date-background-color: awsui.$color-background-calendar-current-date;
-$grid-selected-text-color: awsui.$color-background-control-default;
+$grid-selected-text-color: awsui.$color-text-calendar-date-selected;
 $grid-selected-background-color: awsui.$color-background-control-checked;
 $grid-selected-border-color: awsui.$color-background-control-checked;
 $grid-in-range-background-color: awsui.$color-background-dropdown-item-selected;
diff --git a/src/toggle-button/styles.scss b/src/toggle-button/styles.scss
index eacd937eb4..4d90713b4c 100644
--- a/src/toggle-button/styles.scss
+++ b/src/toggle-button/styles.scss
@@ -5,6 +5,10 @@
 
 @use '../internal/styles/tokens' as awsui;
 
+.variant-normal {
+  background: awsui.$color-background-toggle-button-normal-default;
+}
+
 .variant-normal.pressed {
   background: awsui.$color-background-toggle-button-normal-pressed;
   border-color: awsui.$color-border-toggle-button-normal-pressed;
diff --git a/style-dictionary/classic/colors.ts b/style-dictionary/classic/colors.ts
index 5a6c0e1c4e..bc672e73cc 100644
--- a/style-dictionary/classic/colors.ts
+++ b/style-dictionary/classic/colors.ts
@@ -19,6 +19,7 @@ const tokens: StyleDictionary.ColorsDictionary = {
   colorBackgroundButtonNormalDisabled: { dark: '{colorNeutral750}' },
   colorBackgroundButtonNormalHover: { light: '{colorNeutral100}' },
   colorBackgroundToggleButtonNormalPressed: { light: '{colorNeutral250}', dark: '{colorNeutral950}' },
+  colorBackgroundToggleButtonNormalDefault: '{colorBackgroundButtonNormalDefault}',
   colorBackgroundButtonPrimaryActive: { light: '{colorPrimary1000}', dark: '{colorPrimary300}' },
   colorBackgroundButtonPrimaryDefault: { light: '{colorPrimary600}', dark: '{colorPrimary300}' },
   colorBackgroundButtonPrimaryDisabled: { light: '{colorWhite}', dark: '{colorNeutral750}' },
@@ -119,6 +120,7 @@ const tokens: StyleDictionary.ColorsDictionary = {
   colorTextButtonLinkDefault: '{colorTextButtonNormalDefault}',
   colorTextButtonLinkHover: '{colorTextButtonNormalHover}',
   colorTextCalendarDateHover: '{colorTextDropdownItemHighlighted}',
+  colorTextCalendarDateSelected: '{colorBackgroundControlDefault}',
   colorTextCalendarMonth: '{colorTextBodySecondary}',
   colorTextColumnHeader: { dark: '{colorNeutral450}' },
   colorTextColumnSortingIcon: { light: '{colorNeutral600}', dark: '{colorNeutral450}' },
diff --git a/style-dictionary/utils/token-names.ts b/style-dictionary/utils/token-names.ts
index 4b68611181..2a879898b7 100644
--- a/style-dictionary/utils/token-names.ts
+++ b/style-dictionary/utils/token-names.ts
@@ -509,6 +509,7 @@ export type ColorsTokenName =
   | 'colorBackgroundButtonNormalDisabled'
   | 'colorBackgroundButtonNormalHover'
   | 'colorBackgroundToggleButtonNormalPressed'
+  | 'colorBackgroundToggleButtonNormalDefault'
   | 'colorBackgroundButtonPrimaryActive'
   | 'colorBackgroundButtonPrimaryDefault'
   | 'colorBackgroundButtonPrimaryDisabled'
@@ -707,6 +708,7 @@ export type ColorsTokenName =
   | 'colorTextDirectionButtonDefault'
   | 'colorTextDirectionButtonDisabled'
   | 'colorTextCalendarDateHover'
+  | 'colorTextCalendarDateSelected'
   | 'colorTextCalendarMonth'
   | 'colorTextCodeEditorGutterActiveLine'
   | 'colorTextCodeEditorGutterDefault'
diff --git a/style-dictionary/visual-refresh/colors.ts b/style-dictionary/visual-refresh/colors.ts
index bda2b1ebd8..df41a9dd77 100644
--- a/style-dictionary/visual-refresh/colors.ts
+++ b/style-dictionary/visual-refresh/colors.ts
@@ -24,6 +24,7 @@ const tokens: StyleDictionary.ColorsDictionary = {
   colorBackgroundButtonNormalDisabled: { light: '{colorWhite}', dark: '{colorNeutral850}' },
   colorBackgroundButtonNormalHover: { light: '{colorPrimary50}', dark: '{colorNeutral800}' },
   colorBackgroundToggleButtonNormalPressed: { light: '{colorPrimary100}', dark: '{colorNeutral700}' },
+  colorBackgroundToggleButtonNormalDefault: '{colorBackgroundButtonNormalDefault}',
   colorBackgroundButtonPrimaryActive: { light: '{colorPrimary900}', dark: '{colorPrimary400}' },
   colorBackgroundButtonPrimaryDefault: '{colorBorderButtonNormalDefault}',
   colorBackgroundButtonPrimaryDisabled: { light: '{colorNeutral250}', dark: '{colorNeutral750}' },
@@ -228,6 +229,7 @@ const tokens: StyleDictionary.ColorsDictionary = {
   colorTextButtonPrimaryDefault: { light: '{colorWhite}', dark: '{colorNeutral950}' },
   colorTextButtonPrimaryHover: { light: '{colorWhite}', dark: '{colorNeutral950}' },
   colorTextCalendarDateHover: '{colorTextDropdownItemDefault}',
+  colorTextCalendarDateSelected: '{colorBackgroundControlDefault}',
   colorTextCalendarMonth: { light: '{colorNeutral600}', dark: '{colorNeutral450}' },
   colorTextCodeEditorGutterActiveLine: { light: '{colorWhite}', dark: '{colorNeutral950}' },
   colorTextCodeEditorGutterDefault: { light: '{colorNeutral950}', dark: '{colorNeutral300}' },
diff --git a/style-dictionary/visual-refresh/metadata/colors.ts b/style-dictionary/visual-refresh/metadata/colors.ts
index 8b632f0371..0d3e6edf0a 100644
--- a/style-dictionary/visual-refresh/metadata/colors.ts
+++ b/style-dictionary/visual-refresh/metadata/colors.ts
@@ -48,6 +48,11 @@ const metadata: StyleDictionary.MetadataIndex = {
     themeable: true,
     public: true,
   },
+  colorBackgroundToggleButtonNormalDefault: {
+    description: 'The default background color of normal toggle buttons.',
+    themeable: true,
+    public: true,
+  },
   colorBackgroundButtonPrimaryActive: {
     description: 'The background color of primary buttons in active state.',
     themeable: true,
@@ -320,6 +325,11 @@ const metadata: StyleDictionary.MetadataIndex = {
     themeable: true,
     public: true,
   },
+  colorBackgroundToggleDefault: {
+    description: 'The default background color of the toggle track in its unchecked state.',
+    themeable: true,
+    public: true,
+  },
   colorBackgroundAvatarDefault: {
     description: 'The default background color of avatars.',
     themeable: false,
@@ -603,6 +613,11 @@ const metadata: StyleDictionary.MetadataIndex = {
     themeable: true,
     public: true,
   },
+  colorTextCalendarDateSelected: {
+    description: 'The text color of selected dates in the calendar.',
+    themeable: true,
+    public: true,
+  },
   colorTextButtonInlineIconDefault: {
     description: 'The default color of inline button icons.',
     themeable: true,