diff --git a/data/tokens/$themes.json b/data/tokens/$themes.json
index 2ac12cca..12cf9d05 100644
--- a/data/tokens/$themes.json
+++ b/data/tokens/$themes.json
@@ -558,7 +558,6 @@
       "form.radius.fileselector": "6da4daf4c6de1738cdec5b5451ac119fea4c0bbb",
       "form.radius.input": "1b8cc21bdbdf9e0165cf3c07d70fc582ca5368e2",
       "form.radius.validationbar": "d58c5bf1620aca7f5445956eab232c398a106e1d",
-      "form.color.typical.border-enabled": "3029f124e1a5d4a703744dbd4fb34cb022aaec77",
       "form.color.switch.bg-active": "ce1251804c65070fdaab00ed6621d61635ba51fc",
       "form.color.switch.border-enabled": "aedb7374d5118ec49daa4b5963955e1191d9564f",
       "form.color.switch.fg-enabled": "dbdd158d7af6257de31c7f45996e2d45bdb1baa5",
@@ -1295,7 +1294,7 @@
       "form.size.validation.bar": "29b9786d6cfe6d92d686d948787aeced98b07cf9",
       "form.size.rating.M": "9535faae8a6ad0f08b22dd8bf3db495f0793b76d",
       "form.size.rating.L": "32958c33d5e7fd421cefeb3693bb30e6dc237f90",
-      "form.color.calendar.bg-active": "4720658e790bd37e028977a7d01c2fc873fe2424",
+      "form.color.calendar.bg-active": "3029f124e1a5d4a703744dbd4fb34cb022aaec77",
       "form.color.calendar.bg-disabled": "0cddb2bba3505dba0b7558fb35cb4aad3ea1a4e5",
       "form.color.calendar.bg-duration": "a16bff728a9a003402db04aec7b813fbb4bd6ce1",
       "form.color.calendar.bg-hover": "b28c3339932b3133d2f89f236245d340f240b17b",
@@ -1905,7 +1904,6 @@
       "form.radius.fileselector": "6da4daf4c6de1738cdec5b5451ac119fea4c0bbb",
       "form.radius.input": "1b8cc21bdbdf9e0165cf3c07d70fc582ca5368e2",
       "form.radius.validationbar": "d58c5bf1620aca7f5445956eab232c398a106e1d",
-      "form.color.typical.border-enabled": "3029f124e1a5d4a703744dbd4fb34cb022aaec77",
       "form.color.switch.bg-active": "ce1251804c65070fdaab00ed6621d61635ba51fc",
       "form.color.switch.border-enabled": "aedb7374d5118ec49daa4b5963955e1191d9564f",
       "form.color.switch.fg-enabled": "dbdd158d7af6257de31c7f45996e2d45bdb1baa5",
@@ -2640,7 +2638,7 @@
       "form.size.validation.bar": "29b9786d6cfe6d92d686d948787aeced98b07cf9",
       "form.size.rating.M": "9535faae8a6ad0f08b22dd8bf3db495f0793b76d",
       "form.size.rating.L": "32958c33d5e7fd421cefeb3693bb30e6dc237f90",
-      "form.color.calendar.bg-active": "4720658e790bd37e028977a7d01c2fc873fe2424",
+      "form.color.calendar.bg-active": "3029f124e1a5d4a703744dbd4fb34cb022aaec77",
       "form.color.calendar.bg-disabled": "0cddb2bba3505dba0b7558fb35cb4aad3ea1a4e5",
       "form.color.calendar.bg-duration": "a16bff728a9a003402db04aec7b813fbb4bd6ce1",
       "form.color.calendar.bg-hover": "b28c3339932b3133d2f89f236245d340f240b17b",
@@ -3970,7 +3968,7 @@
       "form.size.validation.bar": "29b9786d6cfe6d92d686d948787aeced98b07cf9",
       "form.size.rating.M": "9535faae8a6ad0f08b22dd8bf3db495f0793b76d",
       "form.size.rating.L": "32958c33d5e7fd421cefeb3693bb30e6dc237f90",
-      "form.color.calendar.bg-active": "4720658e790bd37e028977a7d01c2fc873fe2424",
+      "form.color.calendar.bg-active": "3029f124e1a5d4a703744dbd4fb34cb022aaec77",
       "form.color.calendar.bg-disabled": "0cddb2bba3505dba0b7558fb35cb4aad3ea1a4e5",
       "form.color.calendar.bg-duration": "a16bff728a9a003402db04aec7b813fbb4bd6ce1",
       "form.color.calendar.bg-hover": "b28c3339932b3133d2f89f236245d340f240b17b",
@@ -4000,7 +3998,6 @@
       "form.color.typical.bg-hover": "a303f97d80723dd4185eed0cf4b06f2d11a1123e",
       "form.color.typical.bg-readOnly": "ceaaef94fc3c401a8473ab41166a142c80f3590b",
       "form.color.typical.border-alt": "673b9e3ccb7ab7e0a8f82693f4c6c24e0c0807e7",
-      "form.color.typical.border-enabled": "3029f124e1a5d4a703744dbd4fb34cb022aaec77",
       "form.color.typical.border-disabled": "98f6123baf39be0014f0e6ab58550136deebe5ca",
       "form.color.typical.border-hover": "3cf9b812a335e8ef7b27a4ea6037a583e12ac115",
       "form.color.typical.border-readOnly": "0f23eb41b218b1a7f932a06ccf1d7e4d839eef86",
@@ -4673,7 +4670,6 @@
       "form.radius.fileselector": "6da4daf4c6de1738cdec5b5451ac119fea4c0bbb",
       "form.radius.input": "1b8cc21bdbdf9e0165cf3c07d70fc582ca5368e2",
       "form.radius.validationbar": "d58c5bf1620aca7f5445956eab232c398a106e1d",
-      "form.color.typical.border-enabled": "3029f124e1a5d4a703744dbd4fb34cb022aaec77",
       "form.color.switch.bg-active": "ce1251804c65070fdaab00ed6621d61635ba51fc",
       "form.color.switch.border-enabled": "aedb7374d5118ec49daa4b5963955e1191d9564f",
       "form.color.switch.fg-enabled": "dbdd158d7af6257de31c7f45996e2d45bdb1baa5",
@@ -5407,7 +5403,7 @@
       "form.size.validation.bar": "29b9786d6cfe6d92d686d948787aeced98b07cf9",
       "form.size.rating.M": "9535faae8a6ad0f08b22dd8bf3db495f0793b76d",
       "form.size.rating.L": "32958c33d5e7fd421cefeb3693bb30e6dc237f90",
-      "form.color.calendar.bg-active": "4720658e790bd37e028977a7d01c2fc873fe2424",
+      "form.color.calendar.bg-active": "3029f124e1a5d4a703744dbd4fb34cb022aaec77",
       "form.color.calendar.bg-disabled": "0cddb2bba3505dba0b7558fb35cb4aad3ea1a4e5",
       "form.color.calendar.bg-duration": "a16bff728a9a003402db04aec7b813fbb4bd6ce1",
       "form.color.calendar.bg-hover": "b28c3339932b3133d2f89f236245d340f240b17b",
diff --git a/data/tokens/context/frozenproduct.json b/data/tokens/context/frozenproduct.json
index 99511fbd..2d1a1869 100644
--- a/data/tokens/context/frozenproduct.json
+++ b/data/tokens/context/frozenproduct.json
@@ -253,6 +253,12 @@
       }
     },
     "color": {
+      "calendar": {
+        "bg-active": {
+          "value": "{primitives.colors.navy}",
+          "type": "color"
+        }
+      },
       "typical": {
         "border-enabled": {
           "value": "{modes.color.interactive.dataEntry.frozen.withDefault}",