diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index b58b603fe..000000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/BO1LER-Kitchen.iml b/.idea/BO1LER-Kitchen.iml
deleted file mode 100644
index 0c8867d7e..000000000
--- a/.idea/BO1LER-Kitchen.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 7c4836fbe..000000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index b532a4388..000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/BO1LER-Kitchen.iml" filepath="$PROJECT_DIR$/.idea/BO1LER-Kitchen.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/prettier.xml b/.idea/prettier.xml
deleted file mode 100644
index b0ab31a95..000000000
--- a/.idea/prettier.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myRunOnSave" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/rcb-settings.xml b/.idea/rcb-settings.xml
deleted file mode 100644
index b77de4295..000000000
--- a/.idea/rcb-settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="StorybookProjectConfigState">
-    <option name="defaultDirectory" value="$PROJECT_DIR$/packages/storybook" />
-    <option name="useDefaultDirectory" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1ddfb..000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/commitlint.config.js b/commitlint.config.js
index 30b411e7c..0ef9d7484 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -3,6 +3,5 @@ module.exports = {
   rules: {
     'header-max-length': [2, 'always', 140],
     'scope-enum': [2, 'always', ['all', 'ui-library', 'icons', 'figma-design-tokens', 'tokens', 'storybook']],
-    'scope-empty': [2, 'never'],
   },
 };
diff --git a/package-lock.json b/package-lock.json
index fa321fe60..64a9ba426 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,7 +64,6 @@
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.0",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.1.0",
@@ -76,7 +75,6 @@
     },
     "node_modules/@ampproject/remapping/node_modules/@jridgewell/gen-mapping": {
       "version": "0.1.1",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.0.0",
@@ -88,7 +86,6 @@
     },
     "node_modules/@babel/code-frame": {
       "version": "7.18.6",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/highlight": "^7.18.6"
@@ -99,7 +96,6 @@
     },
     "node_modules/@babel/compat-data": {
       "version": "7.20.10",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -107,7 +103,6 @@
     },
     "node_modules/@babel/core": {
       "version": "7.20.12",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.1.0",
@@ -136,7 +131,6 @@
     },
     "node_modules/@babel/core/node_modules/semver": {
       "version": "6.3.0",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -144,7 +138,6 @@
     },
     "node_modules/@babel/generator": {
       "version": "7.20.7",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.20.7",
@@ -180,7 +173,6 @@
     },
     "node_modules/@babel/helper-compilation-targets": {
       "version": "7.20.7",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.20.5",
@@ -198,7 +190,6 @@
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
       "version": "5.1.1",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
@@ -206,7 +197,6 @@
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
       "version": "6.3.0",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -214,7 +204,6 @@
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
       "version": "3.1.1",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
@@ -279,7 +268,6 @@
     },
     "node_modules/@babel/helper-environment-visitor": {
       "version": "7.18.9",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -298,7 +286,6 @@
     },
     "node_modules/@babel/helper-function-name": {
       "version": "7.19.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.18.10",
@@ -310,7 +297,6 @@
     },
     "node_modules/@babel/helper-hoist-variables": {
       "version": "7.18.6",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.18.6"
@@ -332,7 +318,6 @@
     },
     "node_modules/@babel/helper-module-imports": {
       "version": "7.18.6",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.18.6"
@@ -343,7 +328,6 @@
     },
     "node_modules/@babel/helper-module-transforms": {
       "version": "7.20.11",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.18.9",
@@ -413,7 +397,6 @@
     },
     "node_modules/@babel/helper-simple-access": {
       "version": "7.20.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.20.2"
@@ -435,7 +418,6 @@
     },
     "node_modules/@babel/helper-split-export-declaration": {
       "version": "7.18.6",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.18.6"
@@ -446,7 +428,6 @@
     },
     "node_modules/@babel/helper-string-parser": {
       "version": "7.19.4",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -461,7 +442,6 @@
     },
     "node_modules/@babel/helper-validator-option": {
       "version": "7.18.6",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -483,7 +463,6 @@
     },
     "node_modules/@babel/helpers": {
       "version": "7.20.7",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.20.7",
@@ -558,7 +537,6 @@
     },
     "node_modules/@babel/parser": {
       "version": "7.20.7",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1958,7 +1936,6 @@
     },
     "node_modules/@babel/template": {
       "version": "7.20.7",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.18.6",
@@ -1971,7 +1948,6 @@
     },
     "node_modules/@babel/traverse": {
       "version": "7.20.12",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.18.6",
@@ -1991,7 +1967,6 @@
     },
     "node_modules/@babel/types": {
       "version": "7.20.7",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.19.4",
@@ -2416,6 +2391,344 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz",
+      "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==",
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.15.tgz",
+      "integrity": "sha512-sRSOVlLawAktpMvDyJIkdLI/c/kdRTOqo8t6ImVxg8yT7LQDUYV5Rp2FKeEosLr6ZCja9UjYAzyRSxGteSJPYg==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.15.tgz",
+      "integrity": "sha512-0kOB6Y7Br3KDVgHeg8PRcvfLkq+AccreK///B4Z6fNZGr/tNHX0z2VywCc7PTeWp+bPvjA5WMvNXltHw5QjAIA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.15.tgz",
+      "integrity": "sha512-MzDqnNajQZ63YkaUWVl9uuhcWyEyh69HGpMIrf+acR4otMkfLJ4sUCxqwbCyPGicE9dVlrysI3lMcDBjGiBBcQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.15.tgz",
+      "integrity": "sha512-7siLjBc88Z4+6qkMDxPT2juf2e8SJxmsbNVKFY2ifWCDT72v5YJz9arlvBw5oB4W/e61H1+HDB/jnu8nNg0rLA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.15.tgz",
+      "integrity": "sha512-NbImBas2rXwYI52BOKTW342Tm3LTeVlaOQ4QPZ7XuWNKiO226DisFk/RyPk3T0CKZkKMuU69yOvlapJEmax7cg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.15.tgz",
+      "integrity": "sha512-Xk9xMDjBVG6CfgoqlVczHAdJnCs0/oeFOspFap5NkYAmRCT2qTn1vJWA2f419iMtsHSLm+O8B6SLV/HlY5cYKg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.15.tgz",
+      "integrity": "sha512-3TWAnnEOdclvb2pnfsTWtdwthPfOz7qAfcwDLcfZyGJwm1SRZIMOeB5FODVhnM93mFSPsHB9b/PmxNNbSnd0RQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.15.tgz",
+      "integrity": "sha512-MLTgiXWEMAMr8nmS9Gigx43zPRmEfeBfGCwxFQEMgJ5MC53QKajaclW6XDPjwJvhbebv+RzK05TQjvH3/aM4Xw==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.15.tgz",
+      "integrity": "sha512-T0MVnYw9KT6b83/SqyznTs/3Jg2ODWrZfNccg11XjDehIved2oQfrX/wVuev9N936BpMRaTR9I1J0tdGgUgpJA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.15.tgz",
+      "integrity": "sha512-wp02sHs015T23zsQtU4Cj57WiteiuASHlD7rXjKUyAGYzlOKDAjqK6bk5dMi2QEl/KVOcsjwL36kD+WW7vJt8Q==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.15.tgz",
+      "integrity": "sha512-k7FsUJjGGSxwnBmMh8d7IbObWu+sF/qbwc+xKZkBe/lTAF16RqxRCnNHA7QTd3oS2AfGBAnHlXL67shV5bBThQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.15.tgz",
+      "integrity": "sha512-ZLWk6czDdog+Q9kE/Jfbilu24vEe/iW/Sj2d8EVsmiixQ1rM2RKH2n36qfxK4e8tVcaXkvuV3mU5zTZviE+NVQ==",
+      "cpu": [
+        "mips64el"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.15.tgz",
+      "integrity": "sha512-mY6dPkIRAiFHRsGfOYZC8Q9rmr8vOBZBme0/j15zFUKM99d4ILY4WpOC7i/LqoY+RE7KaMaSfvY8CqjJtuO4xg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.15.tgz",
+      "integrity": "sha512-EcyUtxffdDtWjjwIH8sKzpDRLcVtqANooMNASO59y+xmqqRYBBM7xVLQhqF7nksIbm2yHABptoioS9RAbVMWVA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.15.tgz",
+      "integrity": "sha512-BuS6Jx/ezxFuHxgsfvz7T4g4YlVrmCmg7UAwboeyNNg0OzNzKsIZXpr3Sb/ZREDXWgt48RO4UQRDBxJN3B9Rbg==",
+      "cpu": [
+        "s390x"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.15.tgz",
+      "integrity": "sha512-JsdS0EgEViwuKsw5tiJQo9UdQdUJYuB+Mf6HxtJSPN35vez1hlrNb1KajvKWF5Sa35j17+rW1ECEO9iNrIXbNg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.15.tgz",
+      "integrity": "sha512-R6fKjtUysYGym6uXf6qyNephVUQAGtf3n2RCsOST/neIwPqRWcnc3ogcielOd6pT+J0RDR1RGcy0ZY7d3uHVLA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.15.tgz",
+      "integrity": "sha512-mVD4PGc26b8PI60QaPUltYKeSX0wxuy0AltC+WCTFwvKCq2+OgLP4+fFd+hZXzO2xW1HPKcytZBdjqL6FQFa7w==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.15.tgz",
+      "integrity": "sha512-U6tYPovOkw3459t2CBwGcFYfFRjivcJJc1WC8Q3funIwX8x4fP+R6xL/QuTPNGOblbq/EUDxj9GU+dWKX0oWlQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.15.tgz",
+      "integrity": "sha512-W+Z5F++wgKAleDABemiyXVnzXgvRFs+GVKThSI+mGgleLWluv0D7Diz4oQpgdpNzh4i2nNDzQtWbjJiqutRp6Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.15.tgz",
+      "integrity": "sha512-Muz/+uGgheShKGqSVS1KsHtCyEzcdOn/W/Xbh6H91Etm+wiIfwZaBn1W58MeGtfI8WA961YMHFYTthBdQs4t+w==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.15.tgz",
+      "integrity": "sha512-DjDa9ywLUUmjhV2Y9wUTIF+1XsmuFGvZoCmOWkli1XcNAh5t25cc7fgsCx4Zi/Uurep3TTLyDiKATgGEg61pkA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
@@ -2748,7 +3061,6 @@
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.0.1",
@@ -2761,7 +3073,6 @@
     },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
@@ -2769,7 +3080,6 @@
     },
     "node_modules/@jridgewell/set-array": {
       "version": "1.1.2",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
@@ -2786,18 +3096,21 @@
     },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.14",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.9",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
+    "node_modules/@juggle/resize-observer": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz",
+      "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="
+    },
     "node_modules/@lit-labs/react": {
       "version": "1.1.1",
       "license": "BSD-3-Clause"
@@ -4179,6 +4492,131 @@
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
+    "node_modules/@storybook/blocks": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-7.0.2.tgz",
+      "integrity": "sha512-JzHmU8jZLzeQ6bunzci8j/2Ji18GBTyhrPFLk5RjEbMNGWpGjvER/yR127tZOdbPguVNr4iVbRfGzd1wGHlrzA==",
+      "dependencies": {
+        "@storybook/channels": "7.0.2",
+        "@storybook/client-logger": "7.0.2",
+        "@storybook/components": "7.0.2",
+        "@storybook/core-events": "7.0.2",
+        "@storybook/csf": "^0.1.0",
+        "@storybook/docs-tools": "7.0.2",
+        "@storybook/global": "^5.0.0",
+        "@storybook/manager-api": "7.0.2",
+        "@storybook/preview-api": "7.0.2",
+        "@storybook/theming": "7.0.2",
+        "@storybook/types": "7.0.2",
+        "@types/lodash": "^4.14.167",
+        "color-convert": "^2.0.1",
+        "dequal": "^2.0.2",
+        "lodash": "^4.17.21",
+        "markdown-to-jsx": "^7.1.8",
+        "memoizerific": "^1.11.3",
+        "polished": "^4.2.2",
+        "react-colorful": "^5.1.2",
+        "telejson": "^7.0.3",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@storybook/blocks/node_modules/@storybook/channels": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.0.2.tgz",
+      "integrity": "sha512-qkI8mFy9c8mxN2f01etayKhCaauL6RAsxRzbX1/pKj6UqhHWqqUbtHwymrv4hG5qDYjV1e9pd7ae5eNF8Kui0g==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/blocks/node_modules/@storybook/client-logger": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-7.0.2.tgz",
+      "integrity": "sha512-rv7W2BhzIQHbFpUM5/CP/acS6T5lTmaxT0MbZ9n+9h++9QQU/cFOdkZgSUbLVAb1AeUGoLsk0HYzcqPpV35Xsw==",
+      "dependencies": {
+        "@storybook/global": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/blocks/node_modules/@storybook/components": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/components/-/components-7.0.2.tgz",
+      "integrity": "sha512-Ee9pY6WlpricPUdYiyR0Ov8zgHkUt541yl1CZ6Ytaom2TA12cAnRjKewbLAgVPPhIE1LsMRhOPFYql0JMtnN4Q==",
+      "dependencies": {
+        "@storybook/client-logger": "7.0.2",
+        "@storybook/csf": "^0.1.0",
+        "@storybook/global": "^5.0.0",
+        "@storybook/theming": "7.0.2",
+        "@storybook/types": "7.0.2",
+        "memoizerific": "^1.11.3",
+        "use-resize-observer": "^9.1.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@storybook/blocks/node_modules/@storybook/core-events": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-7.0.2.tgz",
+      "integrity": "sha512-1DCHCwHRL3+rlvnVVc/BCfReP31XaT2WYgcLeGTmkX1E43Po1MkgcM7PnJPSaa9POvSqZ+6YLZv5Bs1SXbufow==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/blocks/node_modules/@storybook/csf": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.0.tgz",
+      "integrity": "sha512-uk+jMXCZ8t38jSTHk2o5btI+aV2Ksbvl6DoOv3r6VaCM1KZqeuMwtwywIQdflkA8/6q/dKT8z8L+g8hC4GC3VQ==",
+      "dependencies": {
+        "type-fest": "^2.19.0"
+      }
+    },
+    "node_modules/@storybook/blocks/node_modules/@storybook/theming": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-7.0.2.tgz",
+      "integrity": "sha512-c9sE+QAZNbopPvLiJ6BMxBERfTaq1ATyIri97FBvTucuSotNXw7X5q+ip5/nrCOPZuvK2f5wF4DRyD2HnB/rIQ==",
+      "dependencies": {
+        "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
+        "@storybook/client-logger": "7.0.2",
+        "@storybook/global": "^5.0.0",
+        "memoizerific": "^1.11.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@storybook/blocks/node_modules/telejson": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
+      "integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
+      "dependencies": {
+        "memoizerific": "^1.11.3"
+      }
+    },
     "node_modules/@storybook/builder-webpack4": {
       "version": "6.5.16",
       "dev": true,
@@ -7560,6 +7998,394 @@
         "lodash": "^4.17.15"
       }
     },
+    "node_modules/@storybook/docs-tools": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/docs-tools/-/docs-tools-7.0.2.tgz",
+      "integrity": "sha512-w4D5BURrYjLbLGG9VKAaKU2dSdukszxRE3HWkJyhQU9R1JHvS3n8ntcMqYPqRfoHCOeBLBxP0edDYcAfzGNDYQ==",
+      "dependencies": {
+        "@babel/core": "^7.12.10",
+        "@storybook/core-common": "7.0.2",
+        "@storybook/preview-api": "7.0.2",
+        "@storybook/types": "7.0.2",
+        "@types/doctrine": "^0.0.3",
+        "doctrine": "^3.0.0",
+        "lodash": "^4.17.21"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/@storybook/core-common": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-7.0.2.tgz",
+      "integrity": "sha512-DayFPTCj695tnEKLuDlogclBim8mzdrbj9U1xzFm23BUReheGSGdLl2zrb3mP1l9Zj4xJ/Ctst1KN9SFbW84vw==",
+      "dependencies": {
+        "@storybook/node-logger": "7.0.2",
+        "@storybook/types": "7.0.2",
+        "@types/node": "^16.0.0",
+        "@types/pretty-hrtime": "^1.0.0",
+        "chalk": "^4.1.0",
+        "esbuild": "^0.17.0",
+        "esbuild-register": "^3.4.0",
+        "file-system-cache": "^2.0.0",
+        "find-up": "^5.0.0",
+        "fs-extra": "^11.1.0",
+        "glob": "^8.1.0",
+        "glob-promise": "^6.0.2",
+        "handlebars": "^4.7.7",
+        "lazy-universal-dotenv": "^4.0.0",
+        "picomatch": "^2.3.0",
+        "pkg-dir": "^5.0.0",
+        "pretty-hrtime": "^1.0.3",
+        "resolve-from": "^5.0.0",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/@storybook/node-logger": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-7.0.2.tgz",
+      "integrity": "sha512-UENpXxB1yDqP7JXaODJo+pbGt5y3NFBNurBr4+pI4bMAC4ARjpgRE4wp6fxUKFPu9MAR10oCdcLEHkaVUAjYRg==",
+      "dependencies": {
+        "@types/npmlog": "^4.1.2",
+        "chalk": "^4.1.0",
+        "npmlog": "^5.0.1",
+        "pretty-hrtime": "^1.0.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/@types/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==",
+      "dependencies": {
+        "@types/minimatch": "^5.1.2",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/@types/node": {
+      "version": "16.18.23",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.23.tgz",
+      "integrity": "sha512-XAMpaw1s1+6zM+jn2tmw8MyaRDIJfXxqmIQIS0HfoGYPuf7dUWeiUKopwq13KFX9lEp1+THGtlaaYx39Nxr58g=="
+    },
+    "node_modules/@storybook/docs-tools/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/dotenv": {
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz",
+      "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/dotenv-expand": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
+      "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/esbuild": {
+      "version": "0.17.15",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.15.tgz",
+      "integrity": "sha512-LBUV2VsUIc/iD9ME75qhT4aJj0r75abCVS0jakhFzOtR7TQsqQA5w0tZ+KTKnwl3kXE0MhskNdHDh/I5aCR1Zw==",
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/android-arm": "0.17.15",
+        "@esbuild/android-arm64": "0.17.15",
+        "@esbuild/android-x64": "0.17.15",
+        "@esbuild/darwin-arm64": "0.17.15",
+        "@esbuild/darwin-x64": "0.17.15",
+        "@esbuild/freebsd-arm64": "0.17.15",
+        "@esbuild/freebsd-x64": "0.17.15",
+        "@esbuild/linux-arm": "0.17.15",
+        "@esbuild/linux-arm64": "0.17.15",
+        "@esbuild/linux-ia32": "0.17.15",
+        "@esbuild/linux-loong64": "0.17.15",
+        "@esbuild/linux-mips64el": "0.17.15",
+        "@esbuild/linux-ppc64": "0.17.15",
+        "@esbuild/linux-riscv64": "0.17.15",
+        "@esbuild/linux-s390x": "0.17.15",
+        "@esbuild/linux-x64": "0.17.15",
+        "@esbuild/netbsd-x64": "0.17.15",
+        "@esbuild/openbsd-x64": "0.17.15",
+        "@esbuild/sunos-x64": "0.17.15",
+        "@esbuild/win32-arm64": "0.17.15",
+        "@esbuild/win32-ia32": "0.17.15",
+        "@esbuild/win32-x64": "0.17.15"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/file-system-cache": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/file-system-cache/-/file-system-cache-2.0.2.tgz",
+      "integrity": "sha512-lp4BHO4CWqvRyx88Tt3quZic9ZMf4cJyquYq7UI8sH42Bm2ArlBBjKQAalZOo+UfaBassb7X123Lik5qZ/tSAA==",
+      "dependencies": {
+        "fs-extra": "^11.1.0",
+        "ramda": "^0.28.0"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/glob-promise": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-6.0.2.tgz",
+      "integrity": "sha512-Ni2aDyD1ekD6x8/+K4hDriRDbzzfuK4yKpqSymJ4P7IxbtARiOOuU+k40kbHM0sLIlbf1Qh0qdMkAHMZYE6XJQ==",
+      "dependencies": {
+        "@types/glob": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://github.com/sponsors/ahmadnassri"
+      },
+      "peerDependencies": {
+        "glob": "^8.0.3"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/lazy-universal-dotenv": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/lazy-universal-dotenv/-/lazy-universal-dotenv-4.0.0.tgz",
+      "integrity": "sha512-aXpZJRnTkpK6gQ/z4nk+ZBLd/Qdp118cvPruLSIQzQNRhKwEcdXCOzXuF55VDqIiuAaY3UGZ10DJtvZzDcvsxg==",
+      "dependencies": {
+        "app-root-dir": "^1.0.2",
+        "dotenv": "^16.0.0",
+        "dotenv-expand": "^10.0.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@storybook/docs-tools/node_modules/pkg-dir": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
+      "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
+      "dependencies": {
+        "find-up": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@storybook/global": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@storybook/global/-/global-5.0.0.tgz",
+      "integrity": "sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ=="
+    },
+    "node_modules/@storybook/manager-api": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-7.0.2.tgz",
+      "integrity": "sha512-PbLj9Rc5uCMPfMdaXv1wE3koA3+d0rmZ3BJI8jeq+mfZEvpvfI4OOpRioT1q04CkkVomFOVFTyO0Q/o6Rb5N7g==",
+      "dependencies": {
+        "@storybook/channels": "7.0.2",
+        "@storybook/client-logger": "7.0.2",
+        "@storybook/core-events": "7.0.2",
+        "@storybook/csf": "^0.1.0",
+        "@storybook/global": "^5.0.0",
+        "@storybook/router": "7.0.2",
+        "@storybook/theming": "7.0.2",
+        "@storybook/types": "7.0.2",
+        "dequal": "^2.0.2",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "semver": "^7.3.7",
+        "store2": "^2.14.2",
+        "telejson": "^7.0.3",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@storybook/manager-api/node_modules/@storybook/channels": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.0.2.tgz",
+      "integrity": "sha512-qkI8mFy9c8mxN2f01etayKhCaauL6RAsxRzbX1/pKj6UqhHWqqUbtHwymrv4hG5qDYjV1e9pd7ae5eNF8Kui0g==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/manager-api/node_modules/@storybook/client-logger": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-7.0.2.tgz",
+      "integrity": "sha512-rv7W2BhzIQHbFpUM5/CP/acS6T5lTmaxT0MbZ9n+9h++9QQU/cFOdkZgSUbLVAb1AeUGoLsk0HYzcqPpV35Xsw==",
+      "dependencies": {
+        "@storybook/global": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/manager-api/node_modules/@storybook/core-events": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-7.0.2.tgz",
+      "integrity": "sha512-1DCHCwHRL3+rlvnVVc/BCfReP31XaT2WYgcLeGTmkX1E43Po1MkgcM7PnJPSaa9POvSqZ+6YLZv5Bs1SXbufow==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/manager-api/node_modules/@storybook/csf": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.0.tgz",
+      "integrity": "sha512-uk+jMXCZ8t38jSTHk2o5btI+aV2Ksbvl6DoOv3r6VaCM1KZqeuMwtwywIQdflkA8/6q/dKT8z8L+g8hC4GC3VQ==",
+      "dependencies": {
+        "type-fest": "^2.19.0"
+      }
+    },
+    "node_modules/@storybook/manager-api/node_modules/@storybook/router": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/router/-/router-7.0.2.tgz",
+      "integrity": "sha512-ZB2vucfayZUrMLBlXju4v6CNOQQb0YKDLw5RoojdBxOsUFtnp5UiPOE+I8PQR63EBwnRjozeibV1XSM+GlQb5w==",
+      "dependencies": {
+        "@storybook/client-logger": "7.0.2",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@storybook/manager-api/node_modules/@storybook/theming": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-7.0.2.tgz",
+      "integrity": "sha512-c9sE+QAZNbopPvLiJ6BMxBERfTaq1ATyIri97FBvTucuSotNXw7X5q+ip5/nrCOPZuvK2f5wF4DRyD2HnB/rIQ==",
+      "dependencies": {
+        "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
+        "@storybook/client-logger": "7.0.2",
+        "@storybook/global": "^5.0.0",
+        "memoizerific": "^1.11.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@storybook/manager-api/node_modules/telejson": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
+      "integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
+      "dependencies": {
+        "memoizerific": "^1.11.3"
+      }
+    },
     "node_modules/@storybook/manager-webpack4": {
       "version": "6.5.16",
       "dev": true,
@@ -9212,6 +10038,95 @@
         "url": "https://opencollective.com/storybook"
       }
     },
+    "node_modules/@storybook/preview-api": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-7.0.2.tgz",
+      "integrity": "sha512-QAlJM/r92+dQe/kB7MTTR9b/1mt9UJjxNjazGdEWipA/nw23kOF3o/hBcvKwBYkit4zGYsX70H+vuzW8hCo/lA==",
+      "dependencies": {
+        "@storybook/channel-postmessage": "7.0.2",
+        "@storybook/channels": "7.0.2",
+        "@storybook/client-logger": "7.0.2",
+        "@storybook/core-events": "7.0.2",
+        "@storybook/csf": "^0.1.0",
+        "@storybook/global": "^5.0.0",
+        "@storybook/types": "7.0.2",
+        "@types/qs": "^6.9.5",
+        "dequal": "^2.0.2",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0",
+        "synchronous-promise": "^2.0.15",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/preview-api/node_modules/@storybook/channel-postmessage": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-7.0.2.tgz",
+      "integrity": "sha512-SZ/KqnZcx10W9hJbrzBKcP9dmgaeTaXugUhcgw1IkmjKWdsKazqFZCPwQWZZKAmhO4wYbyYOhkz3wfSIeB4mFw==",
+      "dependencies": {
+        "@storybook/channels": "7.0.2",
+        "@storybook/client-logger": "7.0.2",
+        "@storybook/core-events": "7.0.2",
+        "@storybook/global": "^5.0.0",
+        "qs": "^6.10.0",
+        "telejson": "^7.0.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/preview-api/node_modules/@storybook/channels": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.0.2.tgz",
+      "integrity": "sha512-qkI8mFy9c8mxN2f01etayKhCaauL6RAsxRzbX1/pKj6UqhHWqqUbtHwymrv4hG5qDYjV1e9pd7ae5eNF8Kui0g==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/preview-api/node_modules/@storybook/client-logger": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-7.0.2.tgz",
+      "integrity": "sha512-rv7W2BhzIQHbFpUM5/CP/acS6T5lTmaxT0MbZ9n+9h++9QQU/cFOdkZgSUbLVAb1AeUGoLsk0HYzcqPpV35Xsw==",
+      "dependencies": {
+        "@storybook/global": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/preview-api/node_modules/@storybook/core-events": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-7.0.2.tgz",
+      "integrity": "sha512-1DCHCwHRL3+rlvnVVc/BCfReP31XaT2WYgcLeGTmkX1E43Po1MkgcM7PnJPSaa9POvSqZ+6YLZv5Bs1SXbufow==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/preview-api/node_modules/@storybook/csf": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.0.tgz",
+      "integrity": "sha512-uk+jMXCZ8t38jSTHk2o5btI+aV2Ksbvl6DoOv3r6VaCM1KZqeuMwtwywIQdflkA8/6q/dKT8z8L+g8hC4GC3VQ==",
+      "dependencies": {
+        "type-fest": "^2.19.0"
+      }
+    },
+    "node_modules/@storybook/preview-api/node_modules/telejson": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
+      "integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
+      "dependencies": {
+        "memoizerific": "^1.11.3"
+      }
+    },
     "node_modules/@storybook/preview-web": {
       "version": "6.5.16",
       "dev": true,
@@ -9371,6 +10286,39 @@
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
+    "node_modules/@storybook/types": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/types/-/types-7.0.2.tgz",
+      "integrity": "sha512-0OCt/kAexa8MCcljxA+yZxGMn0n2U2Ync0KxotItqNbKBKVkaLQUls0+IXTWSCpC/QJvNZ049jxUHHanNi/96w==",
+      "dependencies": {
+        "@storybook/channels": "7.0.2",
+        "@types/babel__core": "^7.0.0",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/types/node_modules/@storybook/channels": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.0.2.tgz",
+      "integrity": "sha512-qkI8mFy9c8mxN2f01etayKhCaauL6RAsxRzbX1/pKj6UqhHWqqUbtHwymrv4hG5qDYjV1e9pd7ae5eNF8Kui0g==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/types/node_modules/file-system-cache": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/file-system-cache/-/file-system-cache-2.0.2.tgz",
+      "integrity": "sha512-lp4BHO4CWqvRyx88Tt3quZic9ZMf4cJyquYq7UI8sH42Bm2ArlBBjKQAalZOo+UfaBassb7X123Lik5qZ/tSAA==",
+      "dependencies": {
+        "fs-extra": "^11.1.0",
+        "ramda": "^0.28.0"
+      }
+    },
     "node_modules/@storybook/ui": {
       "version": "6.5.16",
       "dev": true,
@@ -10497,9 +11445,45 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz",
+      "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==",
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz",
+      "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==",
+      "dependencies": {
+        "@babel/types": "^7.3.0"
+      }
+    },
     "node_modules/@types/body-parser": {
       "version": "1.19.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
@@ -10546,7 +11530,6 @@
     },
     "node_modules/@types/connect": {
       "version": "3.4.35",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -10578,6 +11561,11 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/doctrine": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.3.tgz",
+      "integrity": "sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA=="
+    },
     "node_modules/@types/eslint": {
       "version": "8.4.10",
       "dev": true,
@@ -10603,7 +11591,6 @@
     },
     "node_modules/@types/express": {
       "version": "4.17.17",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
@@ -10614,7 +11601,6 @@
     },
     "node_modules/@types/express-serve-static-core": {
       "version": "4.17.33",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -10740,7 +11726,6 @@
     },
     "node_modules/@types/lodash": {
       "version": "4.14.191",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/mdast": {
@@ -10753,7 +11738,6 @@
     },
     "node_modules/@types/mime": {
       "version": "3.0.1",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/mime-types": {
@@ -10763,7 +11747,6 @@
     },
     "node_modules/@types/minimatch": {
       "version": "5.1.2",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/minimist": {
@@ -10797,7 +11780,6 @@
     },
     "node_modules/@types/npmlog": {
       "version": "4.1.4",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/parse-json": {
@@ -10814,7 +11796,6 @@
     },
     "node_modules/@types/pretty-hrtime": {
       "version": "1.0.1",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/prop-types": {
@@ -10823,12 +11804,10 @@
     },
     "node_modules/@types/qs": {
       "version": "6.9.7",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.4",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/react": {
@@ -10874,7 +11853,6 @@
     },
     "node_modules/@types/serve-static": {
       "version": "1.15.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/mime": "*",
@@ -12150,19 +13128,16 @@
     },
     "node_modules/app-root-dir": {
       "version": "1.0.2",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/aproba": {
       "version": "1.2.0",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/are-we-there-yet": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
       "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-      "dev": true,
       "dependencies": {
         "delegates": "^1.0.0",
         "readable-stream": "^3.6.0"
@@ -12175,7 +13150,6 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -13072,7 +14046,6 @@
     },
     "node_modules/brace-expansion": {
       "version": "2.0.1",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -13213,7 +14186,6 @@
     },
     "node_modules/browserslist": {
       "version": "4.21.4",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -14182,7 +15154,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true,
       "bin": {
         "color-support": "bin.js"
       }
@@ -14482,7 +15453,6 @@
     },
     "node_modules/console-control-strings": {
       "version": "1.1.0",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/constant-case": {
@@ -14584,7 +15554,6 @@
     },
     "node_modules/convert-source-map": {
       "version": "1.9.0",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/cookie": {
@@ -15863,7 +16832,6 @@
     },
     "node_modules/delegates": {
       "version": "1.0.0",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/depd": {
@@ -15882,6 +16850,14 @@
         "node": ">= 0.6.0"
       }
     },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/des.js": {
       "version": "1.0.1",
       "dev": true,
@@ -16201,7 +17177,6 @@
     },
     "node_modules/electron-to-chromium": {
       "version": "1.4.284",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/elliptic": {
@@ -16732,6 +17707,17 @@
         "node": ">=12"
       }
     },
+    "node_modules/esbuild-register": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.4.2.tgz",
+      "integrity": "sha512-kG/XyTDyz6+YDuyfB9ZoSIOOmgyFCH+xPRtsCa8W85HLRV5Csp+o3jWVbOSHgSLfyLc5DmP+KFDNwty4mEjC+Q==",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "peerDependencies": {
+        "esbuild": ">=0.12 <1"
+      }
+    },
     "node_modules/esbuild-sunos-64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
@@ -16814,7 +17800,6 @@
     },
     "node_modules/escalade": {
       "version": "3.1.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -18968,7 +19953,6 @@
     },
     "node_modules/fs-extra": {
       "version": "11.1.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -19057,7 +20041,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
       "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-      "dev": true,
       "dependencies": {
         "aproba": "^1.0.3 || ^2.0.0",
         "color-support": "^1.1.2",
@@ -19077,7 +20060,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -19086,7 +20068,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -19112,7 +20093,6 @@
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -19352,7 +20332,6 @@
     },
     "node_modules/globals": {
       "version": "11.12.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -19469,7 +20448,6 @@
     },
     "node_modules/handlebars": {
       "version": "4.7.7",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.5",
@@ -19598,8 +20576,7 @@
     "node_modules/has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
-      "dev": true
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
     },
     "node_modules/has-value": {
       "version": "1.0.0",
@@ -21632,7 +22609,6 @@
     },
     "node_modules/jsesc": {
       "version": "2.5.2",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
@@ -21666,7 +22642,6 @@
     },
     "node_modules/json5": {
       "version": "2.2.3",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
@@ -21682,7 +22657,6 @@
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
@@ -22544,7 +23518,6 @@
     },
     "node_modules/map-or-similar": {
       "version": "1.5.0",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/map-visit": {
@@ -22567,6 +23540,17 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/markdown-to-jsx": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.2.0.tgz",
+      "integrity": "sha512-3l4/Bigjm4bEqjCR6Xr+d4DtM1X6vvtGsMGSjJYyep8RjjIvcWtrXBS8Wbfe1/P+atKNMccpsraESIaWVplzVg==",
+      "engines": {
+        "node": ">= 10"
+      },
+      "peerDependencies": {
+        "react": ">= 0.14.0"
+      }
+    },
     "node_modules/marky": {
       "version": "1.2.5",
       "dev": true,
@@ -22776,7 +23760,6 @@
     },
     "node_modules/memoizerific": {
       "version": "1.11.3",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "map-or-similar": "^1.5.0"
@@ -23119,7 +24102,6 @@
     },
     "node_modules/minimatch": {
       "version": "5.1.4",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -23358,7 +24340,6 @@
     },
     "node_modules/neo-async": {
       "version": "2.6.2",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/nerf-dart": {
@@ -23571,7 +24552,6 @@
     },
     "node_modules/node-releases": {
       "version": "2.0.8",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/node.extend": {
@@ -26223,7 +27203,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
       "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-      "dev": true,
       "dependencies": {
         "are-we-there-yet": "^2.0.0",
         "console-control-strings": "^1.1.0",
@@ -27291,7 +28270,6 @@
     },
     "node_modules/polished": {
       "version": "4.2.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.17.8"
@@ -28161,7 +29139,6 @@
     },
     "node_modules/pretty-hrtime": {
       "version": "1.0.3",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -28529,7 +29506,6 @@
     },
     "node_modules/qs": {
       "version": "6.11.0",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.0.4"
@@ -28583,7 +29559,6 @@
     },
     "node_modules/ramda": {
       "version": "0.28.0",
-      "dev": true,
       "license": "MIT",
       "funding": {
         "type": "opencollective",
@@ -28689,6 +29664,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/react-colorful": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.6.1.tgz",
+      "integrity": "sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==",
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
     "node_modules/react-dom": {
       "version": "18.2.0",
       "dev": true,
@@ -29366,7 +30350,6 @@
     },
     "node_modules/resolve-from": {
       "version": "5.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -29790,7 +30773,6 @@
     },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/safe-identifier": {
@@ -30337,7 +31319,6 @@
     },
     "node_modules/set-blocking": {
       "version": "2.0.0",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/set-value": {
@@ -30482,7 +31463,6 @@
     },
     "node_modules/signal-exit": {
       "version": "3.0.7",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/sisteransi": {
@@ -30740,7 +31720,6 @@
     },
     "node_modules/source-map": {
       "version": "0.6.1",
-      "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -30995,7 +31974,6 @@
     },
     "node_modules/store2": {
       "version": "2.14.2",
-      "dev": true,
       "license": "(MIT OR GPL-3.0)"
     },
     "node_modules/stream-browserify": {
@@ -31035,7 +32013,6 @@
     },
     "node_modules/string_decoder": {
       "version": "1.1.1",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
@@ -31617,7 +32594,6 @@
     },
     "node_modules/synchronous-promise": {
       "version": "2.0.17",
-      "dev": true,
       "license": "BSD-3-Clause"
     },
     "node_modules/synckit": {
@@ -32121,7 +33097,6 @@
     },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -32488,6 +33463,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/type-is": {
       "version": "1.6.18",
       "dev": true,
@@ -32565,7 +33551,6 @@
     },
     "node_modules/uglify-js": {
       "version": "3.17.4",
-      "dev": true,
       "license": "BSD-2-Clause",
       "optional": true,
       "bin": {
@@ -32849,7 +33834,6 @@
     },
     "node_modules/universalify": {
       "version": "2.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
@@ -32931,7 +33915,6 @@
     },
     "node_modules/update-browserslist-db": {
       "version": "1.0.10",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -33088,6 +34071,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/use-resize-observer": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/use-resize-observer/-/use-resize-observer-9.1.0.tgz",
+      "integrity": "sha512-R25VqO9Wb3asSD4eqtcxk8sJalvIOYBqS8MNZlpDSQ4l4xMQxC/J7Id9HoTqPq8FwULIn0PVW+OAqF2dyYbjow==",
+      "dependencies": {
+        "@juggle/resize-observer": "^3.3.1"
+      },
+      "peerDependencies": {
+        "react": "16.8.0 - 18",
+        "react-dom": "16.8.0 - 18"
+      }
+    },
     "node_modules/util": {
       "version": "0.11.1",
       "dev": true,
@@ -33098,7 +34093,6 @@
     },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/util.promisify": {
@@ -33834,7 +34828,6 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
       "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-      "dev": true,
       "dependencies": {
         "string-width": "^1.0.2 || 2 || 3 || 4"
       }
@@ -33864,7 +34857,6 @@
     },
     "node_modules/wordwrap": {
       "version": "1.0.0",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/wordwrapjs": {
@@ -34143,6 +35135,9 @@
       "name": "@boiler/storybook",
       "version": "0.0.1",
       "license": "ISC",
+      "dependencies": {
+        "@storybook/blocks": "^7.0.2"
+      },
       "devDependencies": {
         "@boiler/ui-library": "^0.0.1",
         "@storybook/addon-actions": "^6.5.16",
diff --git a/packages/figma-design-tokens/input/tokens/semantics/BLR_CMP.json b/packages/figma-design-tokens/input/tokens/semantics/BLR_CMP.json
index 120eeafb2..6a67d09dd 100644
--- a/packages/figma-design-tokens/input/tokens/semantics/BLR_CMP.json
+++ b/packages/figma-design-tokens/input/tokens/semantics/BLR_CMP.json
@@ -565,7 +565,7 @@
         "Background": {
           "Default": {
             "value": {
-              "color": "{Feedback.Brand.Default.Shape.Background}",
+              "color": "{Feedback.brand.Default.Shape.Background}",
               "width": "{core.dimensionPX.2}",
               "style": "solid"
             },
@@ -573,7 +573,7 @@
           },
           "Inverted": {
             "value": {
-              "color": "{Feedback.Brand.Inverted.Shape.Background}",
+              "color": "{Feedback.brand.Inverted.Shape.Background}",
               "width": "{core.dimensionPX.2}",
               "style": "solid"
             },
@@ -583,7 +583,7 @@
         "Foreground": {
           "Default": {
             "value": {
-              "color": "{Feedback.Brand.Default.Shape.Foreground}",
+              "color": "{Feedback.brand.Default.Shape.Foreground}",
               "width": "{core.dimensionPX.2}",
               "style": "solid"
             },
@@ -591,7 +591,7 @@
           },
           "Inverted": {
             "value": {
-              "color": "{Feedback.Brand.Inverted.Shape.Foreground}",
+              "color": "{Feedback.brand.Inverted.Shape.Foreground}",
               "width": "{core.dimensionPX.2}",
               "style": "solid"
             },
@@ -611,7 +611,7 @@
         "Background": {
           "Default": {
             "value": {
-              "color": "{Feedback.Brand.Default.Shape.Background}",
+              "color": "{Feedback.brand.Default.Shape.Background}",
               "width": "{core.dimensionPX.2}",
               "style": "solid"
             },
@@ -619,7 +619,7 @@
           },
           "Inverted": {
             "value": {
-              "color": "{Feedback.Brand.Inverted.Shape.Background}",
+              "color": "{Feedback.brand.Inverted.Shape.Background}",
               "width": "{core.dimensionPX.2}",
               "style": "solid"
             },
@@ -629,7 +629,7 @@
         "Foreground": {
           "Default": {
             "value": {
-              "color": "{Feedback.Brand.Default.Shape.Foreground}",
+              "color": "{Feedback.brand.Default.Shape.Foreground}",
               "width": "{core.dimensionPX.2}",
               "style": "solid"
             },
@@ -637,7 +637,7 @@
           },
           "Inverted": {
             "value": {
-              "color": "{Feedback.Brand.Inverted.Shape.Foreground}",
+              "color": "{Feedback.brand.Inverted.Shape.Foreground}",
               "width": "{core.dimensionPX.2}",
               "style": "solid"
             },
@@ -657,7 +657,7 @@
         "Background": {
           "Default": {
             "value": {
-              "color": "{Feedback.Brand.Default.Shape.Background}",
+              "color": "{Feedback.brand.Default.Shape.Background}",
               "width": "{core.dimensionPX.3}",
               "style": "solid"
             },
@@ -665,7 +665,7 @@
           },
           "Inverted": {
             "value": {
-              "color": "{Feedback.Brand.Inverted.Shape.Background}",
+              "color": "{Feedback.brand.Inverted.Shape.Background}",
               "width": "{core.dimensionPX.3}",
               "style": "solid"
             },
@@ -675,7 +675,7 @@
         "Foreground": {
           "Default": {
             "value": {
-              "color": "{Feedback.Brand.Default.Shape.Foreground}",
+              "color": "{Feedback.brand.Default.Shape.Foreground}",
               "width": "{core.dimensionPX.3}",
               "style": "solid"
             },
@@ -683,7 +683,7 @@
           },
           "Inverted": {
             "value": {
-              "color": "{Feedback.Brand.Inverted.Shape.Foreground}",
+              "color": "{Feedback.brand.Inverted.Shape.Foreground}",
               "width": "{core.dimensionPX.3}",
               "style": "solid"
             },
@@ -827,80 +827,6 @@
             "Error": {
               "value": "{core.dimensionPX.16}",
               "type": "sizing"
-            },
-            "Fill": {
-              "Rest": {
-                "value": "{q.surface.brand.primary.rest}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Fill.Rest"
-              },
-              "Hover": {
-                "value": "{q.surface.brand.primary.hover}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Fill.Hover"
-              },
-              "Pressed": {
-                "value": "{q.surface.brand.primary.pressed}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Fill.Pressed"
-              },
-              "Focus": {
-                "value": "{q.surface.brand.primary.rest}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Fill.Focus"
-              },
-              "Disabled": {
-                "value": "{q.surface.disabled.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Fill.Disabled"
-              },
-              "ReadOnly": {
-                "value": "{q.surface.disabled.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Fill.ReadOnly"
-              },
-              "Error": {
-                "value": "{q.stroke.error}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Fill.Error"
-              }
-            },
-            "Stroke": {
-              "Rest": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Stroke.Rest"
-              },
-              "Hover": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Stroke.Hover"
-              },
-              "Pressed": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Stroke.Pressed"
-              },
-              "Focus": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Stroke.Focus"
-              },
-              "Disabled": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Stroke.Disabled"
-              },
-              "ReadOnly": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Stroke.ReadOnly"
-              },
-              "Error": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Unselected.Stroke.Error"
-              }
             }
           },
           "Selected": {
@@ -927,70 +853,66 @@
             "ReadOnly": {
               "value": "{core.dimensionPX.16}",
               "type": "sizing"
+            }
+          },
+          "Fill": {
+            "Rest": {
+              "value": "{q.surface.brand.primary.rest}",
+              "type": "color"
             },
-            "Fill": {
-              "Rest": {
-                "value": "{q.surface.brand.primary.rest}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Selected.Fill.Rest"
-              },
-              "Hover": {
-                "value": "{q.surface.brand.primary.hover}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Selected.Fill.Hover"
-              },
-              "Pressed": {
-                "value": "{q.surface.brand.primary.pressed}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Selected.Fill.Pressed"
-              },
-              "Focus": {
-                "value": "{q.surface.brand.primary.rest}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Selected.Fill.Focus"
-              },
-              "Disabled": {
-                "value": "{q.surface.disabled.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Selected.Fill.Disabled"
-              },
-              "ReadOnly": {
-                "value": "{q.surface.disabled.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Selected.Fill.ReadOnly"
-              }
+            "Hover": {
+              "value": "{q.surface.brand.primary.hover}",
+              "type": "color"
             },
-            "Stroke": {
-              "Rest": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Selected.Stroke.Rest"
-              },
-              "Hover": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Selected.Stroke.Hover"
-              },
-              "Pressed": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Selected.Stroke.Pressed"
-              },
-              "Focus": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Selected.Stroke.Focus"
-              },
-              "Disabled": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Selected.Stroke.Disabled"
-              },
-              "ReadOnly": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Background.Selected.Stroke.ReadOnly"
-              }
+            "Pressed": {
+              "value": "{q.surface.brand.primary.pressed}",
+              "type": "color"
+            },
+            "Focus": {
+              "value": "{q.surface.brand.primary.rest}",
+              "type": "color"
+            },
+            "Disabled": {
+              "value": "{q.surface.disabled.alpha}",
+              "type": "color"
+            },
+            "ReadOnly": {
+              "value": "{q.surface.disabled.alpha}",
+              "type": "color"
+            },
+            "Error": {
+              "value": "{q.stroke.error}",
+              "type": "color"
+            }
+          },
+          "Stroke": {
+            "Rest": {
+              "value": "{q.surface.brand.primary.rest}",
+              "type": "color"
+            },
+            "Hover": {
+              "value": "{q.surface.brand.primary.hover}",
+              "type": "color"
+            },
+            "Pressed": {
+              "value": "{q.surface.brand.primary.pressed}",
+              "type": "color"
+            },
+            "Focus": {
+              "value": "{q.surface.brand.primary.rest}",
+              "type": "color"
+            },
+            "Disabled": {
+              "value": "{q.surface.disabled.alpha}",
+              "type": "color"
+            },
+            "ReadOnly": {
+              "value": "{q.surface.disabled.alpha}",
+              "type": "color"
+            },
+            "Error": {
+              "value": "{q.stroke.error}",
+              "type": "color"
             }
           }
         },
@@ -1023,80 +945,6 @@
             "Error": {
               "value": "{core.dimensionPX.14}",
               "type": "sizing"
-            },
-            "Fill": {
-              "Rest": {
-                "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Fill.Rest"
-              },
-              "Hover": {
-                "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Fill.Hover"
-              },
-              "Pressed": {
-                "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Fill.Pressed"
-              },
-              "Focus": {
-                "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Fill.Focus"
-              },
-              "Disabled": {
-                "value": "{q.content.ondisabled.inverted}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Fill.Disabled"
-              },
-              "ReadOnly": {
-                "value": "{q.content.ondisabled.inverted}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Fill.ReadOnly"
-              },
-              "Error": {
-                "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Fill.Error"
-              }
-            },
-            "Stroke": {
-              "Rest": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Stroke.Rest"
-              },
-              "Hover": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Stroke.Hover"
-              },
-              "Pressed": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Stroke.Pressed"
-              },
-              "Focus": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Stroke.Focus"
-              },
-              "Disabled": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Stroke.Disabled"
-              },
-              "ReadOnly": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Stroke.ReadOnly"
-              },
-              "Error": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Unselected.Stroke.Error"
-              }
             }
           },
           "Selected": {
@@ -1123,129 +971,37 @@
             "ReadOnly": {
               "value": "{core.dimensionPX.6}",
               "type": "sizing"
-            },
-            "Fill": {
-              "Rest": {
-                "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Selected.Fill.Rest"
-              },
-              "Hover": {
-                "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Selected.Fill.Hover"
-              },
-              "Pressed": {
-                "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Selected.Fill.Pressed"
-              },
-              "Focus": {
-                "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Selected.Fill.Focus"
-              },
-              "Disabled": {
-                "value": "{q.content.ondisabled.inverted}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Selected.Fill.Disabled"
-              },
-              "ReadOnly": {
-                "value": "{q.content.ondisabled.inverted}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Selected.Fill.ReadOnly"
-              }
-            },
-            "Stroke": {
-              "Rest": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Selected.Stroke.Rest"
-              },
-              "Hover": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Selected.Stroke.Hover"
-              },
-              "Pressed": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Selected.Stroke.Pressed"
-              },
-              "Focus": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Selected.Stroke.Pressed"
-              },
-              "Disabled": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Selected.Stroke.Disabled"
-              },
-              "ReadOnly": {
-                "value": "{core.color.neutral.transparent}",
-                "type": "color",
-                "description": "Forms.Radio.Control.Foreground.Selected.Stroke.ReadOnly"
-              }
             }
-          }
-        },
-        "Unselected": {
-          "Rest": {
-            "value": {
-              "color": "{Forms.Radio.Control.Background.Unselected.Fill.Rest}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
-            },
-            "type": "border"
           },
-          "Hover": {
-            "value": {
-              "color": "{Forms.Radio.Control.Background.Unselected.Fill.Hover}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
+          "Fill": {
+            "Rest": {
+              "value": "{q.content.onbrand.alpha}",
+              "type": "color"
             },
-            "type": "border"
-          },
-          "Pressed": {
-            "value": {
-              "color": "{Forms.Radio.Control.Background.Unselected.Fill.Pressed}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
+            "Hover": {
+              "value": "{q.content.onbrand.alpha}",
+              "type": "color"
             },
-            "type": "border"
-          },
-          "Focus": {
-            "value": {
-              "color": "{Forms.Radio.Control.Background.Unselected.Fill.Focus}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
+            "Pressed": {
+              "value": "{q.content.onbrand.alpha}",
+              "type": "color"
             },
-            "type": "border"
-          },
-          "Disabled": {
-            "value": {
-              "color": "{Forms.Radio.Control.Background.Unselected.Fill.Disabled}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
+            "Focus": {
+              "value": "{q.content.onbrand.alpha}",
+              "type": "color"
             },
-            "type": "border"
-          },
-          "ReadOnly": {
-            "value": {
-              "color": "{Forms.Radio.Control.Background.Unselected.Fill.ReadOnly}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
+            "Disabled": {
+              "value": "{q.content.ondisabled.inverted}",
+              "type": "color"
             },
-            "type": "border"
-          },
-          "Error": {
-            "value": {
-              "color": "{Forms.Radio.Control.Background.Unselected.Fill.Error}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
+            "ReadOnly": {
+              "value": "{q.content.ondisabled.inverted}",
+              "type": "color"
             },
-            "type": "border"
+            "Error": {
+              "value": "{q.content.onbrand.alpha}",
+              "type": "color"
+            }
           }
         }
       },
@@ -1331,75 +1087,61 @@
             "Fill": {
               "Rest": {
                 "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Fill.Rest"
+                "type": "color"
               },
               "Hover": {
                 "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Fill.Hover"
+                "type": "color"
               },
               "Pressed": {
                 "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Fill.Pressed"
+                "type": "color"
               },
               "Focus": {
                 "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Fill.Focus"
+                "type": "color"
               },
               "Disabled": {
                 "value": "{q.content.ondisabled.inverted}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Fill.Disabled"
+                "type": "color"
               },
               "ReadOnly": {
                 "value": "{q.content.ondisabled.inverted}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Fill.ReadOnly"
+                "type": "color"
               },
               "Error": {
                 "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Fill.Error"
+                "type": "color"
               }
             },
             "Stroke": {
               "Rest": {
                 "value": "{q.surface.brand.primary.rest}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Stroke.Rest"
+                "type": "color"
               },
               "Hover": {
                 "value": "{q.surface.brand.primary.hover}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Stroke.Hover"
+                "type": "color"
               },
               "Pressed": {
                 "value": "{q.surface.brand.primary.pressed}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Stroke.Pressed"
+                "type": "color"
               },
               "Focus": {
                 "value": "{q.surface.brand.primary.rest}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Stroke.Focus"
+                "type": "color"
               },
               "Disabled": {
                 "value": "{q.surface.disabled.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Stroke.Disabled"
+                "type": "color"
               },
               "ReadOnly": {
                 "value": "{q.surface.disabled.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Stroke.ReadOnly"
+                "type": "color"
               },
               "Error": {
                 "value": "{q.stroke.error}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Unselected.Stroke.Error"
+                "type": "color"
               }
             }
           },
@@ -1431,65 +1173,68 @@
             "Fill": {
               "Rest": {
                 "value": "{q.surface.brand.primary.rest}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Selected.Fill.Rest\n//\nalso applies to indeterminate"
+                "type": "color"
               },
               "Hover": {
                 "value": "{q.surface.brand.primary.hover}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Selected.Fill.Hover\n//\nalso applies to indeterminate"
+                "type": "color"
               },
               "Pressed": {
                 "value": "{q.surface.brand.primary.pressed}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Selected.Fill.Pressed\n//\nalso applies to indeterminate"
+                "type": "color"
               },
               "Focus": {
                 "value": "{q.surface.brand.primary.rest}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Selected.Fill.Focus\n//\nalso applies to indeterminate"
+                "type": "color"
               },
               "Disabled": {
                 "value": "{q.surface.disabled.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Selected.Fill.Disabled\n//\nalso applies to indeterminate"
+                "type": "color"
               },
               "ReadOnly": {
                 "value": "{q.surface.disabled.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Selected.Fill.ReadOnly\n//\nalso applies to indeterminate"
+                "type": "color"
+              },
+              "Error": {
+                "value": "{q.stroke.error}",
+                "type": "color"
               }
             },
             "Stroke": {
               "Rest": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Selected.Stroke.Rest\n//\nalso applies to indeterminate"
+                "description": "also applies to indeterminate"
               },
               "Hover": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Selected.Stroke.Hover\n//\nalso applies to indeterminate"
+                "description": "also applies to indeterminate"
               },
               "Pressed": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Selected.Stroke.Pressed\n//\nalso applies to indeterminate"
+                "description": "also applies to indeterminate"
               },
               "Focus": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Selected.Stroke.Focus\n//\nalso applies to indeterminate"
+                "description": "also applies to indeterminate"
               },
               "Disabled": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Selected.Stroke.Disabled\n//\nalso applies to indeterminate"
+                "description": "also applies to indeterminate"
               },
               "ReadOnly": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Background.Selected.Stroke.ReadOnly\n//\nalso applies to indeterminate"
+                "description": "also applies to indeterminate"
+              },
+              "Error": {
+                "value": "{core.color.neutral.transparent}",
+                "type": "color",
+                "description": "also applies to indeterminate"
               }
             }
           },
@@ -1554,69 +1299,69 @@
               "Rest": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Fill.Rest"
+                "description": "also applies to indeterminate"
               },
               "Hover": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Fill.Hover"
+                "description": "also applies to indeterminate"
               },
               "Pressed": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Fill.Pressed"
+                "description": "also applies to indeterminate"
               },
               "Focus": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Fill.Focus"
+                "description": "also applies to indeterminate"
               },
               "Disabled": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Fill.Disabled"
+                "description": "also applies to indeterminate"
               },
               "ReadOnly": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Fill.ReadOnly"
+                "description": "also applies to indeterminate"
               },
               "Error": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Fill.Error"
+                "description": "also applies to indeterminate"
               }
             },
             "Stroke": {
               "Rest": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Stroke.Rest"
+                "description": "also applies to indeterminate"
               },
               "Hover": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Stroke.Hover"
+                "description": "also applies to indeterminate"
               },
               "Pressed": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Stroke.Pressed"
+                "description": "also applies to indeterminate"
               },
               "Focus": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Stroke.Focus"
+                "description": "also applies to indeterminate"
               },
               "Disabled": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Stroke.Disabled"
+                "description": "also applies to indeterminate"
               },
               "ReadOnly": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Unselected.Stroke.ReadOnly"
+                "description": "also applies to indeterminate"
               },
               "Error": {
                 "value": "{core.color.neutral.transparent}",
@@ -1653,65 +1398,68 @@
             "Fill": {
               "Rest": {
                 "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Selected.Fill.Rest\n//\nalso applies to indeterminate"
+                "type": "color"
               },
               "Hover": {
                 "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Selected.Fill.Hover\n//\nalso applies to indeterminate"
+                "type": "color"
               },
               "Pressed": {
                 "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Selected.Fill.Pressed\n//\nalso applies to indeterminate"
+                "type": "color"
               },
               "Focus": {
                 "value": "{q.content.onbrand.alpha}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Selected.Fill.Focus\n//\nalso applies to indeterminate"
+                "type": "color"
               },
               "Disabled": {
                 "value": "{q.content.ondisabled.inverted}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Selected.Fill.Disabled\n//\nalso applies to indeterminate"
+                "type": "color"
               },
               "ReadOnly": {
                 "value": "{q.content.ondisabled.inverted}",
-                "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Selected.Fill.ReadOnly\n//\nalso applies to indeterminate"
+                "type": "color"
+              },
+              "Error": {
+                "value": "{q.content.onbrand.alpha}",
+                "type": "color"
               }
             },
             "Stroke": {
               "Rest": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Selected.Stroke.Rest\n//\nalso applies to indeterminate"
+                "description": "also applies to indeterminate"
               },
               "Hover": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Selected.Stroke.Hover\n//\nalso applies to indeterminate"
+                "description": "also applies to indeterminate"
               },
               "Pressed": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Selected.Stroke.Pressed\n//\nalso applies to indeterminate"
+                "description": "also applies to indeterminate"
               },
               "Focus": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Selected.Stroke.Focus\n//\nalso applies to indeterminate"
+                "description": "also applies to indeterminate"
               },
               "Disabled": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Selected.Stroke.Disabled\n//\nalso applies to indeterminate"
+                "description": "also applies to indeterminate"
               },
               "ReadOnly": {
                 "value": "{core.color.neutral.transparent}",
                 "type": "color",
-                "description": "Forms.Checkbox.Control.Foreground.Selected.Stroke.ReadOnly\n//\nalso applies to indeterminate"
+                "description": "also applies to indeterminate"
+              },
+              "Error": {
+                "value": "{core.color.neutral.transparent}",
+                "type": "color",
+                "description": "also applies to indeterminate"
               }
             }
           },
@@ -1745,64 +1493,6 @@
         "IconSize": {
           "value": "SM",
           "type": "componentConfig"
-        },
-        "Unselected": {
-          "Rest": {
-            "value": {
-              "color": "{Forms.Checkbox.Control.Background.Unselected.Stroke.Rest}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
-            },
-            "type": "border"
-          },
-          "Hover": {
-            "value": {
-              "color": "{Forms.Checkbox.Control.Background.Unselected.Stroke.Hover}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
-            },
-            "type": "border"
-          },
-          "Pressed": {
-            "value": {
-              "color": "{Forms.Checkbox.Control.Background.Unselected.Stroke.Pressed}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
-            },
-            "type": "border"
-          },
-          "Focus": {
-            "value": {
-              "color": "{Forms.Checkbox.Control.Background.Unselected.Stroke.Pressed}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
-            },
-            "type": "border"
-          },
-          "Disabled": {
-            "value": {
-              "color": "{Forms.Checkbox.Control.Background.Unselected.Stroke.Disabled}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
-            },
-            "type": "border"
-          },
-          "ReadOnly": {
-            "value": {
-              "color": "{Forms.Checkbox.Control.Background.Unselected.Stroke.ReadOnly}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
-            },
-            "type": "border"
-          },
-          "Error": {
-            "value": {
-              "color": "{Forms.Checkbox.Control.Background.Unselected.Stroke.Error}",
-              "width": "{core.dimensionPX.1}",
-              "style": "solid"
-            },
-            "type": "border"
-          }
         }
       },
       "ControlBorderRadius": {
diff --git a/packages/figma-design-tokens/input/tokens/semantics/BLR_SEM.json b/packages/figma-design-tokens/input/tokens/semantics/BLR_SEM.json
index f6c9d7587..47530dd04 100644
--- a/packages/figma-design-tokens/input/tokens/semantics/BLR_SEM.json
+++ b/packages/figma-design-tokens/input/tokens/semantics/BLR_SEM.json
@@ -1646,6 +1646,102 @@
         "type": "color"
       }
     },
+    "Control": {
+      "Background": {
+        "Fill": {
+          "Rest": {
+            "value": "{q.surface.brand.primary.rest}",
+            "type": "color"
+          },
+          "Hover": {
+            "value": "{q.surface.brand.primary.hover}",
+            "type": "color"
+          },
+          "Pressed": {
+            "value": "{q.surface.brand.primary.pressed}",
+            "type": "color"
+          },
+          "Focus": {
+            "value": "{q.surface.brand.primary.rest}",
+            "type": "color"
+          },
+          "Disabled": {
+            "value": "{q.surface.disabled.alpha}",
+            "type": "color"
+          },
+          "ReadOnly": {
+            "value": "{q.surface.disabled.alpha}",
+            "type": "color"
+          },
+          "Error": {
+            "value": "{q.stroke.error}",
+            "type": "color"
+          }
+        },
+        "Stroke": {
+          "Rest": {
+            "value": "{q.surface.brand.primary.rest}",
+            "type": "color"
+          },
+          "Hover": {
+            "value": "{q.surface.brand.primary.hover}",
+            "type": "color"
+          },
+          "Pressed": {
+            "value": "{q.surface.brand.primary.pressed}",
+            "type": "color"
+          },
+          "Focus": {
+            "value": "{q.surface.brand.primary.rest}",
+            "type": "color"
+          },
+          "Disabled": {
+            "value": "{q.surface.disabled.alpha}",
+            "type": "color"
+          },
+          "ReadOnly": {
+            "value": "{q.surface.disabled.alpha}",
+            "type": "color"
+          },
+          "Error": {
+            "value": "{q.stroke.error}",
+            "type": "color"
+          }
+        }
+      },
+      "Foreground": {
+        "Fill": {
+          "Rest": {
+            "value": "{q.content.onbrand.alpha}",
+            "type": "color"
+          },
+          "Hover": {
+            "value": "{q.content.onbrand.alpha}",
+            "type": "color"
+          },
+          "Pressed": {
+            "value": "{q.content.onbrand.alpha}",
+            "type": "color"
+          },
+          "Focus": {
+            "value": "{q.content.onbrand.alpha}",
+            "type": "color"
+          },
+          "Disabled": {
+            "value": "{q.content.ondisabled.inverted}",
+            "type": "color"
+          },
+          "ReadOnly": {
+            "value": "{q.content.ondisabled.inverted}",
+            "type": "color"
+          },
+          "Error": {
+            "value": "{q.content.onbrand.alpha}",
+            "type": "color"
+          }
+        }
+      }
+    },
     "LabelNextToControl": {
       "Rest": {
         "value": "{q.content.ondefault.alpha}",
@@ -1675,6 +1771,64 @@
         "value": "{q.content.ondefault.error}",
         "type": "color"
       }
+    },
+    "Controls": {
+      "Rest": {
+        "value": {
+          "color": "{Forms.Control.Background.Fill.Rest}",
+          "width": "{core.dimensionPX.1}",
+          "style": "solid"
+        },
+        "type": "border"
+      },
+      "Hover": {
+        "value": {
+          "color": "{Forms.Control.Background.Fill.Hover}",
+          "width": "{core.dimensionPX.1}",
+          "style": "solid"
+        },
+        "type": "border"
+      },
+      "Pressed": {
+        "value": {
+          "color": "{Forms.Control.Background.Fill.Pressed}",
+          "width": "{core.dimensionPX.1}",
+          "style": "solid"
+        },
+        "type": "border"
+      },
+      "Focus": {
+        "value": {
+          "color": "{Forms.Control.Background.Fill.Focus}",
+          "width": "{core.dimensionPX.1}",
+          "style": "solid"
+        },
+        "type": "border"
+      },
+      "Disabled": {
+        "value": {
+          "color": "{Forms.Control.Background.Fill.Disabled}",
+          "width": "{core.dimensionPX.1}",
+          "style": "solid"
+        },
+        "type": "border"
+      },
+      "ReadOnly": {
+        "value": {
+          "color": "{Forms.Control.Background.Fill.ReadOnly}",
+          "width": "{core.dimensionPX.1}",
+          "style": "solid"
+        },
+        "type": "border"
+      },
+      "Error": {
+        "value": {
+          "color": "{Forms.Control.Background.Fill.Error}",
+          "width": "{core.dimensionPX.1}",
+          "style": "solid"
+        },
+        "type": "border"
+      }
     }
   },
   "Global": {
@@ -1746,7 +1900,7 @@
         "type": "color"
       }
     },
-    "Brand": {
+    "brand": {
       "Default": {
         "Shape": {
           "Background": {
diff --git a/packages/icons/icon-set/Error_filled_lg.svg b/packages/icons/icon-set/Error_filled_lg.svg
deleted file mode 100644
index 0890c3c8d..000000000
--- a/packages/icons/icon-set/Error_filled_lg.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16 3C8.8203 3 3 8.8203 3 16C3 23.1797 8.8203 29 16 29C23.1797 29 29 23.1797 29 16C29 8.8203 23.1797 3 16 3ZM14.9952 8.77269C14.9952 8.45359 15.2538 8.19491 15.5729 8.19491H16.427C16.7461 8.19491 17.0048 8.45359 17.0048 8.77269V18.3108C17.0048 18.6299 16.7461 18.8886 16.427 18.8886H15.5729C15.2538 18.8886 14.9952 18.6299 14.9952 18.3108V8.77269ZM14.7829 21.4885C14.7829 21.1694 15.0416 20.9107 15.3607 20.9107H16.6548C16.9739 20.9107 17.2326 21.1694 17.2326 21.4885V22.7256C17.2326 23.0447 16.9739 23.3034 16.6548 23.3034L15.3607 23.3034C15.0416 23.3034 14.7829 23.0447 14.7829 22.7256V21.4885Z" fill="black"/>
-</svg>
diff --git a/packages/icons/icon-set/Error_filled_md.svg b/packages/icons/icon-set/Error_filled_md.svg
deleted file mode 100644
index 6a4b1320a..000000000
--- a/packages/icons/icon-set/Error_filled_md.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 2.5C6.75329 2.5 2.5 6.75329 2.5 12C2.5 17.2467 6.75329 21.5 12 21.5C17.2467 21.5 21.5 17.2467 21.5 12C21.5 6.75329 17.2467 2.5 12 2.5ZM11.2657 6.7185C11.2657 6.48531 11.4547 6.29628 11.6879 6.29628H12.3121C12.5453 6.29628 12.7343 6.48531 12.7343 6.7185V13.6887C12.7343 13.9219 12.5453 14.1109 12.3121 14.1109H11.6879C11.4547 14.1109 11.2657 13.9219 11.2657 13.6887V6.7185ZM11.2657 16.0108C11.2657 15.7776 11.4547 15.5886 11.6879 15.5886H12.3121C12.5453 15.5886 12.7343 15.7776 12.7343 16.0108V16.6441C12.7343 16.8773 12.5453 17.0663 12.3121 17.0663H11.6879C11.4547 17.0663 11.2657 16.8773 11.2657 16.6441V16.0108Z" fill="black"/>
-</svg>
diff --git a/packages/icons/icon-set/Error_filled_sm.svg b/packages/icons/icon-set/Error_filled_sm.svg
deleted file mode 100644
index 9996661b6..000000000
--- a/packages/icons/icon-set/Error_filled_sm.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00001 1.59985C4.46538 1.59985 1.60001 4.46523 1.60001 7.99985C1.60001 11.5345 4.46538 14.3999 8.00001 14.3999C11.5346 14.3999 14.4 11.5345 14.4 7.99985C14.4 4.46523 11.5346 1.59985 8.00001 1.59985ZM7.50533 4.44178C7.50533 4.28469 7.63267 4.15734 7.78977 4.15734H8.21025C8.36734 4.15734 8.49469 4.28469 8.49469 4.44178V8.5477C8.49469 8.70479 8.36734 8.83214 8.21025 8.83214H7.78977C7.63268 8.83214 7.50533 8.70479 7.50533 8.5477V4.44178ZM7.42698 10.6909C7.42698 10.5338 7.55433 10.4065 7.71142 10.4065H8.27002C8.42711 10.4065 8.55446 10.5338 8.55446 10.6909V11.3212C8.55446 11.4783 8.42711 11.6057 8.27002 11.6057H7.71142C7.55433 11.6057 7.42698 11.4783 7.42698 11.3212V10.6909Z" fill="black"/>
-</svg>
diff --git a/packages/icons/icon-set/Error_filled_xl.svg b/packages/icons/icon-set/Error_filled_xl.svg
deleted file mode 100644
index 0fae7c5a4..000000000
--- a/packages/icons/icon-set/Error_filled_xl.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24 4.6438C13.3099 4.6438 4.64392 13.3098 4.64392 23.9999C4.64392 34.69 13.3099 43.356 24 43.356C34.6901 43.356 43.3561 34.69 43.3561 23.9999C43.3561 13.3098 34.6901 4.6438 24 4.6438ZM22.5039 13.239C22.5039 12.7639 22.889 12.3788 23.3641 12.3788H24.6358C25.1109 12.3788 25.4961 12.7639 25.4961 13.239V27.4406C25.4961 27.9158 25.1109 28.3009 24.6358 28.3009H23.3641C22.889 28.3009 22.5039 27.9158 22.5039 27.4406V13.239ZM22.1879 32.1719C22.1879 31.6968 22.573 31.3117 23.0481 31.3117L24.975 31.3117C25.4501 31.3117 25.8352 31.6968 25.8352 32.1719V34.0139C25.8352 34.489 25.4501 34.8742 24.975 34.8742L23.0481 34.8742C22.573 34.8742 22.1879 34.489 22.1879 34.0139V32.1719Z" fill="black"/>
-</svg>
diff --git a/packages/icons/icon-set/Error_filled_xs.svg b/packages/icons/icon-set/Error_filled_xs.svg
deleted file mode 100644
index 39725172e..000000000
--- a/packages/icons/icon-set/Error_filled_xs.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6 1.5C3.51472 1.5 1.5 3.51472 1.5 6C1.5 8.48528 3.51472 10.5 6 10.5C8.48528 10.5 10.5 8.48528 10.5 6C10.5 3.51472 8.48528 1.5 6 1.5ZM5.65217 3.49815C5.65217 3.3877 5.74172 3.29815 5.85217 3.29815H6.14782C6.25828 3.29815 6.34782 3.3877 6.34782 3.49815L6.34782 6.38513C6.34782 6.49558 6.25828 6.58512 6.14782 6.58512H5.85217C5.74172 6.58512 5.65217 6.49558 5.65217 6.38513V3.49815ZM5.59708 7.89208C5.59708 7.78162 5.68663 7.69208 5.79708 7.69208H6.18985C6.30031 7.69208 6.38985 7.78162 6.38985 7.89208V8.33525C6.38985 8.44571 6.30031 8.53525 6.18985 8.53525H5.79708C5.68663 8.53525 5.59708 8.44571 5.59708 8.33525V7.89208Z" fill="black"/>
-</svg>
diff --git a/packages/icons/icon-set/Error_filled_xxs.svg b/packages/icons/icon-set/Error_filled_xxs.svg
deleted file mode 100644
index a4b10a51d..000000000
--- a/packages/icons/icon-set/Error_filled_xxs.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_15_31)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 0.75C2.20507 0.75 0.75 2.20507 0.75 4C0.75 5.79493 2.20507 7.25 4 7.25C5.79493 7.25 7.25 5.79493 7.25 4C7.25 2.20507 5.79493 0.75 4 0.75ZM3.74879 2.19311C3.74879 2.11334 3.81346 2.04867 3.89324 2.04867H4.10676C4.18654 2.04867 4.25121 2.11334 4.25121 2.19311V4.27815C4.25121 4.35792 4.18654 4.42259 4.10676 4.42259H3.89324C3.81346 4.42259 3.74879 4.35792 3.74879 4.27815V2.19311ZM3.70901 5.3665C3.70901 5.28673 3.77368 5.22206 3.85345 5.22206H4.13711C4.21689 5.22206 4.28156 5.28673 4.28156 5.3665V5.68657C4.28156 5.76635 4.21689 5.83102 4.13711 5.83102H3.85345C3.77368 5.83102 3.70901 5.76635 3.70901 5.68657V5.3665Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_15_31">
-<rect width="8" height="8" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/packages/icons/icon-set/Error_lg.svg b/packages/icons/icon-set/Error_lg.svg
deleted file mode 100644
index 844f1ba9f..000000000
--- a/packages/icons/icon-set/Error_lg.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16.12 17.4644V9.40442M4.03 16.1208C4.03 9.44364 9.44288 4.03076 16.12 4.03076C22.7971 4.03076 28.21 9.44364 28.21 16.1208C28.21 22.7979 22.7971 28.2108 16.12 28.2108C9.44288 28.2108 4.03 22.7979 4.03 16.1208ZM16.4558 22.8375V21.4941H15.7841V22.8375H16.4558Z" stroke="black" stroke-width="1.34333" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/packages/icons/icon-set/Error_md.svg b/packages/icons/icon-set/Error_md.svg
deleted file mode 100644
index 49ec2a476..000000000
--- a/packages/icons/icon-set/Error_md.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.09 13.0986V7.05362M3.02249 12.0907C3.02249 7.08285 7.08215 3.02319 12.09 3.02319C17.0978 3.02319 21.1575 7.08285 21.1575 12.0907C21.1575 17.0985 17.0978 21.1582 12.09 21.1582C7.08215 21.1582 3.02249 17.0985 3.02249 12.0907ZM12.3418 17.1284V16.1209H11.8381V17.1284H12.3418Z" stroke="black" stroke-width="1.0075" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/packages/icons/icon-set/Error_sm.svg b/packages/icons/icon-set/Error_sm.svg
deleted file mode 100644
index a3f34ee3e..000000000
--- a/packages/icons/icon-set/Error_sm.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.05997 8.73185V4.70185M2.01498 8.06014C2.01498 4.72158 4.72142 2.01514 8.05998 2.01514C11.3985 2.01514 14.105 4.72158 14.105 8.06014C14.105 11.3987 11.3985 14.1051 8.05998 14.1051C4.72142 14.1051 2.01498 11.3987 2.01498 8.06014ZM8.22788 11.4184V10.7467H7.89205V11.4184H8.22788Z" stroke="black" stroke-width="0.671667" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/packages/icons/icon-set/Error_xl.svg b/packages/icons/icon-set/Error_xl.svg
deleted file mode 100644
index 52c6ed437..000000000
--- a/packages/icons/icon-set/Error_xl.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M24.18 26.1972V14.1072M6.04498 24.1814C6.04498 14.1657 14.1643 6.04639 24.18 6.04639C34.1957 6.04639 42.315 14.1657 42.315 24.1814C42.315 34.1971 34.1957 42.3164 24.18 42.3164C14.1643 42.3164 6.04498 34.1971 6.04498 24.1814ZM24.6837 34.2568V32.2418L23.6762 32.2418V34.2568H24.6837Z" stroke="black" stroke-width="2.015" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/packages/icons/icon-set/Error_xs.svg b/packages/icons/icon-set/Error_xs.svg
deleted file mode 100644
index 980f6c2b3..000000000
--- a/packages/icons/icon-set/Error_xs.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 6.50024V3.50024M1.5 6C1.5 3.51472 3.51472 1.5 6 1.5C8.48528 1.5 10.5 3.51472 10.5 6C10.5 8.48528 8.48528 10.5 6 10.5C3.51472 10.5 1.5 8.48528 1.5 6ZM6.12499 8.49975V7.99975H5.87499V8.49975H6.12499Z" stroke="black" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/packages/icons/icon-set/Error_xxs.svg b/packages/icons/icon-set/Error_xxs.svg
deleted file mode 100644
index dded5d273..000000000
--- a/packages/icons/icon-set/Error_xxs.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_15_11)">
-<path d="M4 4.33325V2.33325M1 4C1 2.34315 2.34315 1 4 1C5.65685 1 7 2.34315 7 4C7 5.65685 5.65685 7 4 7C2.34315 7 1 5.65685 1 4ZM4.08334 5.66675V5.33341H3.91667V5.66675H4.08334Z" stroke="black" stroke-width="0.333333" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<clipPath id="clip0_15_11">
-<rect width="8" height="8" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/packages/icons/icons-optimized/Error_filled_lg.svg b/packages/icons/icons-optimized/Error_filled_lg.svg
deleted file mode 100644
index 8e25b3b35..000000000
--- a/packages/icons/icons-optimized/Error_filled_lg.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 32 32" fill="none"><path fill-rule="evenodd" clip-rule="evenodd" d="M16 3C8.8203 3 3 8.8203 3 16C3 23.1797 8.8203 29 16 29C23.1797 29 29 23.1797 29 16C29 8.8203 23.1797 3 16 3ZM14.9952 8.77269C14.9952 8.45359 15.2538 8.19491 15.5729 8.19491H16.427C16.7461 8.19491 17.0048 8.45359 17.0048 8.77269V18.3108C17.0048 18.6299 16.7461 18.8886 16.427 18.8886H15.5729C15.2538 18.8886 14.9952 18.6299 14.9952 18.3108V8.77269ZM14.7829 21.4885C14.7829 21.1694 15.0416 20.9107 15.3607 20.9107H16.6548C16.9739 20.9107 17.2326 21.1694 17.2326 21.4885V22.7256C17.2326 23.0447 16.9739 23.3034 16.6548 23.3034L15.3607 23.3034C15.0416 23.3034 14.7829 23.0447 14.7829 22.7256V21.4885Z" fill="currentColor"/></svg>
\ No newline at end of file
diff --git a/packages/icons/icons-optimized/Error_filled_md.svg b/packages/icons/icons-optimized/Error_filled_md.svg
deleted file mode 100644
index 4beb08acc..000000000
--- a/packages/icons/icons-optimized/Error_filled_md.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" fill="none"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 2.5C6.75329 2.5 2.5 6.75329 2.5 12C2.5 17.2467 6.75329 21.5 12 21.5C17.2467 21.5 21.5 17.2467 21.5 12C21.5 6.75329 17.2467 2.5 12 2.5ZM11.2657 6.7185C11.2657 6.48531 11.4547 6.29628 11.6879 6.29628H12.3121C12.5453 6.29628 12.7343 6.48531 12.7343 6.7185V13.6887C12.7343 13.9219 12.5453 14.1109 12.3121 14.1109H11.6879C11.4547 14.1109 11.2657 13.9219 11.2657 13.6887V6.7185ZM11.2657 16.0108C11.2657 15.7776 11.4547 15.5886 11.6879 15.5886H12.3121C12.5453 15.5886 12.7343 15.7776 12.7343 16.0108V16.6441C12.7343 16.8773 12.5453 17.0663 12.3121 17.0663H11.6879C11.4547 17.0663 11.2657 16.8773 11.2657 16.6441V16.0108Z" fill="currentColor"/></svg>
\ No newline at end of file
diff --git a/packages/icons/icons-optimized/Error_filled_sm.svg b/packages/icons/icons-optimized/Error_filled_sm.svg
deleted file mode 100644
index 414b627df..000000000
--- a/packages/icons/icons-optimized/Error_filled_sm.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 16 16" fill="none"><path fill-rule="evenodd" clip-rule="evenodd" d="M8.00001 1.59985C4.46538 1.59985 1.60001 4.46523 1.60001 7.99985C1.60001 11.5345 4.46538 14.3999 8.00001 14.3999C11.5346 14.3999 14.4 11.5345 14.4 7.99985C14.4 4.46523 11.5346 1.59985 8.00001 1.59985ZM7.50533 4.44178C7.50533 4.28469 7.63267 4.15734 7.78977 4.15734H8.21025C8.36734 4.15734 8.49469 4.28469 8.49469 4.44178V8.5477C8.49469 8.70479 8.36734 8.83214 8.21025 8.83214H7.78977C7.63268 8.83214 7.50533 8.70479 7.50533 8.5477V4.44178ZM7.42698 10.6909C7.42698 10.5338 7.55433 10.4065 7.71142 10.4065H8.27002C8.42711 10.4065 8.55446 10.5338 8.55446 10.6909V11.3212C8.55446 11.4783 8.42711 11.6057 8.27002 11.6057H7.71142C7.55433 11.6057 7.42698 11.4783 7.42698 11.3212V10.6909Z" fill="currentColor"/></svg>
\ No newline at end of file
diff --git a/packages/icons/icons-optimized/Error_filled_xl.svg b/packages/icons/icons-optimized/Error_filled_xl.svg
deleted file mode 100644
index caffa6cc8..000000000
--- a/packages/icons/icons-optimized/Error_filled_xl.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" fill="none"><path fill-rule="evenodd" clip-rule="evenodd" d="M24 4.6438C13.3099 4.6438 4.64392 13.3098 4.64392 23.9999C4.64392 34.69 13.3099 43.356 24 43.356C34.6901 43.356 43.3561 34.69 43.3561 23.9999C43.3561 13.3098 34.6901 4.6438 24 4.6438ZM22.5039 13.239C22.5039 12.7639 22.889 12.3788 23.3641 12.3788H24.6358C25.1109 12.3788 25.4961 12.7639 25.4961 13.239V27.4406C25.4961 27.9158 25.1109 28.3009 24.6358 28.3009H23.3641C22.889 28.3009 22.5039 27.9158 22.5039 27.4406V13.239ZM22.1879 32.1719C22.1879 31.6968 22.573 31.3117 23.0481 31.3117L24.975 31.3117C25.4501 31.3117 25.8352 31.6968 25.8352 32.1719V34.0139C25.8352 34.489 25.4501 34.8742 24.975 34.8742L23.0481 34.8742C22.573 34.8742 22.1879 34.489 22.1879 34.0139V32.1719Z" fill="currentColor"/></svg>
\ No newline at end of file
diff --git a/packages/icons/icons-optimized/Error_filled_xs.svg b/packages/icons/icons-optimized/Error_filled_xs.svg
deleted file mode 100644
index a33a5b10f..000000000
--- a/packages/icons/icons-optimized/Error_filled_xs.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 12 12" fill="none"><path fill-rule="evenodd" clip-rule="evenodd" d="M6 1.5C3.51472 1.5 1.5 3.51472 1.5 6C1.5 8.48528 3.51472 10.5 6 10.5C8.48528 10.5 10.5 8.48528 10.5 6C10.5 3.51472 8.48528 1.5 6 1.5ZM5.65217 3.49815C5.65217 3.3877 5.74172 3.29815 5.85217 3.29815H6.14782C6.25828 3.29815 6.34782 3.3877 6.34782 3.49815L6.34782 6.38513C6.34782 6.49558 6.25828 6.58512 6.14782 6.58512H5.85217C5.74172 6.58512 5.65217 6.49558 5.65217 6.38513V3.49815ZM5.59708 7.89208C5.59708 7.78162 5.68663 7.69208 5.79708 7.69208H6.18985C6.30031 7.69208 6.38985 7.78162 6.38985 7.89208V8.33525C6.38985 8.44571 6.30031 8.53525 6.18985 8.53525H5.79708C5.68663 8.53525 5.59708 8.44571 5.59708 8.33525V7.89208Z" fill="currentColor"/></svg>
\ No newline at end of file
diff --git a/packages/icons/icons-optimized/Error_filled_xxs.svg b/packages/icons/icons-optimized/Error_filled_xxs.svg
deleted file mode 100644
index 85535c155..000000000
--- a/packages/icons/icons-optimized/Error_filled_xxs.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 8 8" fill="none"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M4 0.75C2.20507 0.75 0.75 2.20507 0.75 4C0.75 5.79493 2.20507 7.25 4 7.25C5.79493 7.25 7.25 5.79493 7.25 4C7.25 2.20507 5.79493 0.75 4 0.75ZM3.74879 2.19311C3.74879 2.11334 3.81346 2.04867 3.89324 2.04867H4.10676C4.18654 2.04867 4.25121 2.11334 4.25121 2.19311V4.27815C4.25121 4.35792 4.18654 4.42259 4.10676 4.42259H3.89324C3.81346 4.42259 3.74879 4.35792 3.74879 4.27815V2.19311ZM3.70901 5.3665C3.70901 5.28673 3.77368 5.22206 3.85345 5.22206H4.13711C4.21689 5.22206 4.28156 5.28673 4.28156 5.3665V5.68657C4.28156 5.76635 4.21689 5.83102 4.13711 5.83102H3.85345C3.77368 5.83102 3.70901 5.76635 3.70901 5.68657V5.3665Z" fill="currentColor"/></g><defs><clipPath id="a"><rect width="8" height="8" fill="currentColor"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/icons/icons-optimized/Error_lg.svg b/packages/icons/icons-optimized/Error_lg.svg
deleted file mode 100644
index a3bf06e84..000000000
--- a/packages/icons/icons-optimized/Error_lg.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 32 32" fill="none"><path d="M16.12 17.4644V9.40442M4.03 16.1208C4.03 9.44364 9.44288 4.03076 16.12 4.03076C22.7971 4.03076 28.21 9.44364 28.21 16.1208C28.21 22.7979 22.7971 28.2108 16.12 28.2108C9.44288 28.2108 4.03 22.7979 4.03 16.1208ZM16.4558 22.8375V21.4941H15.7841V22.8375H16.4558Z" stroke="currentColor" stroke-width="1.34333" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/packages/icons/icons-optimized/Error_md.svg b/packages/icons/icons-optimized/Error_md.svg
deleted file mode 100644
index a910b9b4f..000000000
--- a/packages/icons/icons-optimized/Error_md.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" fill="none"><path d="M12.09 13.0986V7.05362M3.02249 12.0907C3.02249 7.08285 7.08215 3.02319 12.09 3.02319C17.0978 3.02319 21.1575 7.08285 21.1575 12.0907C21.1575 17.0985 17.0978 21.1582 12.09 21.1582C7.08215 21.1582 3.02249 17.0985 3.02249 12.0907ZM12.3418 17.1284V16.1209H11.8381V17.1284H12.3418Z" stroke="currentColor" stroke-width="1.0075" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/packages/icons/icons-optimized/Error_sm.svg b/packages/icons/icons-optimized/Error_sm.svg
deleted file mode 100644
index bcd0bc1b1..000000000
--- a/packages/icons/icons-optimized/Error_sm.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 16 16" fill="none"><path d="M8.05997 8.73185V4.70185M2.01498 8.06014C2.01498 4.72158 4.72142 2.01514 8.05998 2.01514C11.3985 2.01514 14.105 4.72158 14.105 8.06014C14.105 11.3987 11.3985 14.1051 8.05998 14.1051C4.72142 14.1051 2.01498 11.3987 2.01498 8.06014ZM8.22788 11.4184V10.7467H7.89205V11.4184H8.22788Z" stroke="currentColor" stroke-width="0.671667" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/packages/icons/icons-optimized/Error_xl.svg b/packages/icons/icons-optimized/Error_xl.svg
deleted file mode 100644
index 246b7f4e7..000000000
--- a/packages/icons/icons-optimized/Error_xl.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" fill="none"><path d="M24.18 26.1972V14.1072M6.04498 24.1814C6.04498 14.1657 14.1643 6.04639 24.18 6.04639C34.1957 6.04639 42.315 14.1657 42.315 24.1814C42.315 34.1971 34.1957 42.3164 24.18 42.3164C14.1643 42.3164 6.04498 34.1971 6.04498 24.1814ZM24.6837 34.2568V32.2418L23.6762 32.2418V34.2568H24.6837Z" stroke="currentColor" stroke-width="2.015" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/packages/icons/icons-optimized/Error_xs.svg b/packages/icons/icons-optimized/Error_xs.svg
deleted file mode 100644
index 790ca87aa..000000000
--- a/packages/icons/icons-optimized/Error_xs.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 12 12" fill="none"><path d="M6 6.50024V3.50024M1.5 6C1.5 3.51472 3.51472 1.5 6 1.5C8.48528 1.5 10.5 3.51472 10.5 6C10.5 8.48528 8.48528 10.5 6 10.5C3.51472 10.5 1.5 8.48528 1.5 6ZM6.12499 8.49975V7.99975H5.87499V8.49975H6.12499Z" stroke="currentColor" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/packages/icons/icons-optimized/Error_xxs.svg b/packages/icons/icons-optimized/Error_xxs.svg
deleted file mode 100644
index 48749a95f..000000000
--- a/packages/icons/icons-optimized/Error_xxs.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 8 8" fill="none"><g clip-path="url(#a)"><path d="M4 4.33325V2.33325M1 4C1 2.34315 2.34315 1 4 1C5.65685 1 7 2.34315 7 4C7 5.65685 5.65685 7 4 7C2.34315 7 1 5.65685 1 4ZM4.08334 5.66675V5.33341H3.91667V5.66675H4.08334Z" stroke="currentColor" stroke-width="0.333333" stroke-linecap="round" stroke-linejoin="round"/></g><defs><clipPath id="a"><rect width="8" height="8" fill="currentColor"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/icons/icons-optimized/icons.ts b/packages/icons/icons-optimized/icons.ts
index 7a9e24a04..f2657cf9e 100644
--- a/packages/icons/icons-optimized/icons.ts
+++ b/packages/icons/icons-optimized/icons.ts
@@ -3475,142 +3475,6 @@ const blrEqualXxs = (className: string) =>
     />
   </svg>`;
 
-const blrErrorFilledLg = (className: string) =>
-  html`<svg class="${className}" viewBox="0 0 32 32" fill="none">
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M16 3C8.8203 3 3 8.8203 3 16C3 23.1797 8.8203 29 16 29C23.1797 29 29 23.1797 29 16C29 8.8203 23.1797 3 16 3ZM14.9952 8.77269C14.9952 8.45359 15.2538 8.19491 15.5729 8.19491H16.427C16.7461 8.19491 17.0048 8.45359 17.0048 8.77269V18.3108C17.0048 18.6299 16.7461 18.8886 16.427 18.8886H15.5729C15.2538 18.8886 14.9952 18.6299 14.9952 18.3108V8.77269ZM14.7829 21.4885C14.7829 21.1694 15.0416 20.9107 15.3607 20.9107H16.6548C16.9739 20.9107 17.2326 21.1694 17.2326 21.4885V22.7256C17.2326 23.0447 16.9739 23.3034 16.6548 23.3034L15.3607 23.3034C15.0416 23.3034 14.7829 23.0447 14.7829 22.7256V21.4885Z"
-      fill="currentColor"
-    />
-  </svg>`;
-
-const blrErrorFilledMd = (className: string) =>
-  html`<svg class="${className}" viewBox="0 0 24 24" fill="none">
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M12 2.5C6.75329 2.5 2.5 6.75329 2.5 12C2.5 17.2467 6.75329 21.5 12 21.5C17.2467 21.5 21.5 17.2467 21.5 12C21.5 6.75329 17.2467 2.5 12 2.5ZM11.2657 6.7185C11.2657 6.48531 11.4547 6.29628 11.6879 6.29628H12.3121C12.5453 6.29628 12.7343 6.48531 12.7343 6.7185V13.6887C12.7343 13.9219 12.5453 14.1109 12.3121 14.1109H11.6879C11.4547 14.1109 11.2657 13.9219 11.2657 13.6887V6.7185ZM11.2657 16.0108C11.2657 15.7776 11.4547 15.5886 11.6879 15.5886H12.3121C12.5453 15.5886 12.7343 15.7776 12.7343 16.0108V16.6441C12.7343 16.8773 12.5453 17.0663 12.3121 17.0663H11.6879C11.4547 17.0663 11.2657 16.8773 11.2657 16.6441V16.0108Z"
-      fill="currentColor"
-    />
-  </svg>`;
-
-const blrErrorFilledSm = (className: string) =>
-  html`<svg class="${className}" viewBox="0 0 16 16" fill="none">
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M8.00001 1.59985C4.46538 1.59985 1.60001 4.46523 1.60001 7.99985C1.60001 11.5345 4.46538 14.3999 8.00001 14.3999C11.5346 14.3999 14.4 11.5345 14.4 7.99985C14.4 4.46523 11.5346 1.59985 8.00001 1.59985ZM7.50533 4.44178C7.50533 4.28469 7.63267 4.15734 7.78977 4.15734H8.21025C8.36734 4.15734 8.49469 4.28469 8.49469 4.44178V8.5477C8.49469 8.70479 8.36734 8.83214 8.21025 8.83214H7.78977C7.63268 8.83214 7.50533 8.70479 7.50533 8.5477V4.44178ZM7.42698 10.6909C7.42698 10.5338 7.55433 10.4065 7.71142 10.4065H8.27002C8.42711 10.4065 8.55446 10.5338 8.55446 10.6909V11.3212C8.55446 11.4783 8.42711 11.6057 8.27002 11.6057H7.71142C7.55433 11.6057 7.42698 11.4783 7.42698 11.3212V10.6909Z"
-      fill="currentColor"
-    />
-  </svg>`;
-
-const blrErrorFilledXl = (className: string) =>
-  html`<svg class="${className}" viewBox="0 0 48 48" fill="none">
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M24 4.6438C13.3099 4.6438 4.64392 13.3098 4.64392 23.9999C4.64392 34.69 13.3099 43.356 24 43.356C34.6901 43.356 43.3561 34.69 43.3561 23.9999C43.3561 13.3098 34.6901 4.6438 24 4.6438ZM22.5039 13.239C22.5039 12.7639 22.889 12.3788 23.3641 12.3788H24.6358C25.1109 12.3788 25.4961 12.7639 25.4961 13.239V27.4406C25.4961 27.9158 25.1109 28.3009 24.6358 28.3009H23.3641C22.889 28.3009 22.5039 27.9158 22.5039 27.4406V13.239ZM22.1879 32.1719C22.1879 31.6968 22.573 31.3117 23.0481 31.3117L24.975 31.3117C25.4501 31.3117 25.8352 31.6968 25.8352 32.1719V34.0139C25.8352 34.489 25.4501 34.8742 24.975 34.8742L23.0481 34.8742C22.573 34.8742 22.1879 34.489 22.1879 34.0139V32.1719Z"
-      fill="currentColor"
-    />
-  </svg>`;
-
-const blrErrorFilledXs = (className: string) =>
-  html`<svg class="${className}" viewBox="0 0 12 12" fill="none">
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M6 1.5C3.51472 1.5 1.5 3.51472 1.5 6C1.5 8.48528 3.51472 10.5 6 10.5C8.48528 10.5 10.5 8.48528 10.5 6C10.5 3.51472 8.48528 1.5 6 1.5ZM5.65217 3.49815C5.65217 3.3877 5.74172 3.29815 5.85217 3.29815H6.14782C6.25828 3.29815 6.34782 3.3877 6.34782 3.49815L6.34782 6.38513C6.34782 6.49558 6.25828 6.58512 6.14782 6.58512H5.85217C5.74172 6.58512 5.65217 6.49558 5.65217 6.38513V3.49815ZM5.59708 7.89208C5.59708 7.78162 5.68663 7.69208 5.79708 7.69208H6.18985C6.30031 7.69208 6.38985 7.78162 6.38985 7.89208V8.33525C6.38985 8.44571 6.30031 8.53525 6.18985 8.53525H5.79708C5.68663 8.53525 5.59708 8.44571 5.59708 8.33525V7.89208Z"
-      fill="currentColor"
-    />
-  </svg>`;
-
-const blrErrorFilledXxs = (className: string) =>
-  html`<svg class="${className}" viewBox="0 0 8 8" fill="none">
-    <g clip-path="url(#a)">
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M4 0.75C2.20507 0.75 0.75 2.20507 0.75 4C0.75 5.79493 2.20507 7.25 4 7.25C5.79493 7.25 7.25 5.79493 7.25 4C7.25 2.20507 5.79493 0.75 4 0.75ZM3.74879 2.19311C3.74879 2.11334 3.81346 2.04867 3.89324 2.04867H4.10676C4.18654 2.04867 4.25121 2.11334 4.25121 2.19311V4.27815C4.25121 4.35792 4.18654 4.42259 4.10676 4.42259H3.89324C3.81346 4.42259 3.74879 4.35792 3.74879 4.27815V2.19311ZM3.70901 5.3665C3.70901 5.28673 3.77368 5.22206 3.85345 5.22206H4.13711C4.21689 5.22206 4.28156 5.28673 4.28156 5.3665V5.68657C4.28156 5.76635 4.21689 5.83102 4.13711 5.83102H3.85345C3.77368 5.83102 3.70901 5.76635 3.70901 5.68657V5.3665Z"
-        fill="currentColor"
-      />
-    </g>
-    <defs>
-      <clipPath id="a"><rect width="8" height="8" fill="currentColor" /></clipPath>
-    </defs>
-  </svg>`;
-
-const blrErrorLg = (className: string) =>
-  html`<svg class="${className}" viewBox="0 0 32 32" fill="none">
-    <path
-      d="M16.12 17.4644V9.40442M4.03 16.1208C4.03 9.44364 9.44288 4.03076 16.12 4.03076C22.7971 4.03076 28.21 9.44364 28.21 16.1208C28.21 22.7979 22.7971 28.2108 16.12 28.2108C9.44288 28.2108 4.03 22.7979 4.03 16.1208ZM16.4558 22.8375V21.4941H15.7841V22.8375H16.4558Z"
-      stroke="currentColor"
-      stroke-width="1.34333"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-  </svg>`;
-
-const blrErrorMd = (className: string) =>
-  html`<svg class="${className}" viewBox="0 0 24 24" fill="none">
-    <path
-      d="M12.09 13.0986V7.05362M3.02249 12.0907C3.02249 7.08285 7.08215 3.02319 12.09 3.02319C17.0978 3.02319 21.1575 7.08285 21.1575 12.0907C21.1575 17.0985 17.0978 21.1582 12.09 21.1582C7.08215 21.1582 3.02249 17.0985 3.02249 12.0907ZM12.3418 17.1284V16.1209H11.8381V17.1284H12.3418Z"
-      stroke="currentColor"
-      stroke-width="1.0075"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-  </svg>`;
-
-const blrErrorSm = (className: string) =>
-  html`<svg class="${className}" viewBox="0 0 16 16" fill="none">
-    <path
-      d="M8.05997 8.73185V4.70185M2.01498 8.06014C2.01498 4.72158 4.72142 2.01514 8.05998 2.01514C11.3985 2.01514 14.105 4.72158 14.105 8.06014C14.105 11.3987 11.3985 14.1051 8.05998 14.1051C4.72142 14.1051 2.01498 11.3987 2.01498 8.06014ZM8.22788 11.4184V10.7467H7.89205V11.4184H8.22788Z"
-      stroke="currentColor"
-      stroke-width="0.671667"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-  </svg>`;
-
-const blrErrorXl = (className: string) =>
-  html`<svg class="${className}" viewBox="0 0 48 48" fill="none">
-    <path
-      d="M24.18 26.1972V14.1072M6.04498 24.1814C6.04498 14.1657 14.1643 6.04639 24.18 6.04639C34.1957 6.04639 42.315 14.1657 42.315 24.1814C42.315 34.1971 34.1957 42.3164 24.18 42.3164C14.1643 42.3164 6.04498 34.1971 6.04498 24.1814ZM24.6837 34.2568V32.2418L23.6762 32.2418V34.2568H24.6837Z"
-      stroke="currentColor"
-      stroke-width="2.015"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-  </svg>`;
-
-const blrErrorXs = (className: string) =>
-  html`<svg class="${className}" viewBox="0 0 12 12" fill="none">
-    <path
-      d="M6 6.50024V3.50024M1.5 6C1.5 3.51472 3.51472 1.5 6 1.5C8.48528 1.5 10.5 3.51472 10.5 6C10.5 8.48528 8.48528 10.5 6 10.5C3.51472 10.5 1.5 8.48528 1.5 6ZM6.12499 8.49975V7.99975H5.87499V8.49975H6.12499Z"
-      stroke="currentColor"
-      stroke-width="0.5"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-  </svg>`;
-
-const blrErrorXxs = (className: string) =>
-  html`<svg class="${className}" viewBox="0 0 8 8" fill="none">
-    <g clip-path="url(#a)">
-      <path
-        d="M4 4.33325V2.33325M1 4C1 2.34315 2.34315 1 4 1C5.65685 1 7 2.34315 7 4C7 5.65685 5.65685 7 4 7C2.34315 7 1 5.65685 1 4ZM4.08334 5.66675V5.33341H3.91667V5.66675H4.08334Z"
-        stroke="currentColor"
-        stroke-width="0.333333"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-      />
-    </g>
-    <defs>
-      <clipPath id="a"><rect width="8" height="8" fill="currentColor" /></clipPath>
-    </defs>
-  </svg>`;
-
 const blrEyeLg = (className: string) =>
   html`<svg class="${className}" viewBox="0 0 32 32" fill="none">
     <path
@@ -8392,18 +8256,6 @@ export const IconMapping = {
   blrEqualXl,
   blrEqualXs,
   blrEqualXxs,
-  blrErrorFilledLg,
-  blrErrorFilledMd,
-  blrErrorFilledSm,
-  blrErrorFilledXl,
-  blrErrorFilledXs,
-  blrErrorFilledXxs,
-  blrErrorLg,
-  blrErrorMd,
-  blrErrorSm,
-  blrErrorXl,
-  blrErrorXs,
-  blrErrorXxs,
   blrEyeLg,
   blrEyeMd,
   blrEyeSm,
diff --git a/packages/ui-library/src/components/icon-button/index.stories.ts b/packages/ui-library/src/components/icon-button/index.stories.ts
index 96b272d37..f740f3139 100644
--- a/packages/ui-library/src/components/icon-button/index.stories.ts
+++ b/packages/ui-library/src/components/icon-button/index.stories.ts
@@ -23,12 +23,6 @@ export default {
       control: { type: 'select' },
     },
   },
-  parameters: {
-    previewTabs: {
-      canvas: { hidden: true },
-    },
-    viewMode: 'docs',
-  },
 };
 
 export const BlrIconButton = ({
diff --git a/packages/ui-library/src/components/icon-button/index.ts b/packages/ui-library/src/components/icon-button/index.ts
index 43a5dcb6c..5209b4953 100644
--- a/packages/ui-library/src/components/icon-button/index.ts
+++ b/packages/ui-library/src/components/icon-button/index.ts
@@ -1,4 +1,4 @@
-import { LitElement, html, nothing } from 'lit';
+import { LitElement, html } from 'lit';
 import { classMap } from 'lit/directives/class-map.js';
 import { customElement, property } from 'lit/decorators.js';
 import { IconType } from '@boiler/icons';
@@ -32,20 +32,20 @@ export class BlrIconButton extends LitElement {
     const loaderVariant = determineLoaderVariant(this.variant);
 
     return html`<button
+      aria-label="${this.ariaLabel}"
       class="blr-semantic-action blr-icon-button ${classes}"
-      id=${this.buttonId || nothing}
-      @click=${this.onClick}
-      @blur=${this.onBlur}
-      ?disabled=${this.disabled}
-      aria-label=${this.ariaLabel || nothing}
+      @click="${this.onClick}"
+      @blur="${this.onBlur}"
+      ?disabled="${this.disabled}"
+      id=${this.buttonId}
     >
       ${this.loading
         ? html`<blr-loader
-            .size=${this.size}
-            .variant=${loaderVariant}
-            .loadingStatus=${this.loadingStatus}
+            .size="${this.size}"
+            .variant="${loaderVariant}"
+            .loadingStatus="${this.loadingStatus}"
           ></blr-loader>`
-        : html`<blr-icon icon=${this.icon} size=${this.size} aria-hidden></blr-icon>`}
+        : html`<blr-icon icon="${this.icon}" size="${this.size}" aria-hidden></blr-icon>`}
     </button>`;
   }
 }
diff --git a/packages/ui-library/src/components/icon-button/tests/__snapshots__/index.test.snap.js b/packages/ui-library/src/components/icon-button/tests/__snapshots__/index.test.snap.js
index b0483d294..5cf94fdc5 100644
--- a/packages/ui-library/src/components/icon-button/tests/__snapshots__/index.test.snap.js
+++ b/packages/ui-library/src/components/icon-button/tests/__snapshots__/index.test.snap.js
@@ -16,17 +16,3 @@ snapshots['blr-icon-button renders correctly'] = `<button
 </button>
 `;
 /* end snapshot blr-icon-button renders correctly */
-snapshots['blr-icon-button renders correctly'] = `<button
-  class="blr-icon-button blr-semantic-action cta md"
-  disabled=""
-  id="id"
->
-  <blr-icon
-    aria-hidden=""
-    icon="blrChevronDown"
-    size="md"
-  >
-  </blr-icon>
-</button>
-`;
-/* end snapshot blr-icon-button renders correctly */
diff --git a/packages/ui-library/src/components/icon-link/index.stories.ts b/packages/ui-library/src/components/icon-link/index.stories.ts
index f83845e0f..4d34f590d 100644
--- a/packages/ui-library/src/components/icon-link/index.stories.ts
+++ b/packages/ui-library/src/components/icon-link/index.stories.ts
@@ -23,12 +23,6 @@ export default {
       control: { type: 'select' },
     },
   },
-  parameters: {
-    previewTabs: {
-      canvas: { hidden: true },
-    },
-    viewMode: 'docs',
-  },
 };
 
 export const BlrIconLink = ({
diff --git a/packages/ui-library/src/components/icon/index.stories.ts b/packages/ui-library/src/components/icon/index.stories.ts
index 158f35f9a..34ab6fd2a 100644
--- a/packages/ui-library/src/components/icon/index.stories.ts
+++ b/packages/ui-library/src/components/icon/index.stories.ts
@@ -2,11 +2,10 @@ import { html } from 'lit-html';
 import { IconKeys } from '@boiler/icons';
 
 import './index';
-import { BlrIcon as BlrIconClass, BlrIconRenderFunction } from './index';
+import { BlrIcon as BlrIconClass } from './index';
 import { Sizes } from '../../globals/constants';
 import { getIconName } from '../../utils/get-icon-name';
 import { calculateIconName } from '../../utils/calculate-icon-name';
-import { classMap } from 'lit/directives/class-map.js';
 
 export default {
   title: 'BlrIcon',
@@ -16,32 +15,25 @@ export default {
       control: { type: 'select' },
     },
   },
-  parameters: {
-    previewTabs: {
-      canvas: { hidden: true },
-    },
-    viewMode: 'docs',
-  },
 };
 
 const allIcons = getIconName(IconKeys);
 
-export const BlrIcon = ({ size }: BlrIconClass) => {
-  const classes = classMap({
-    'icon-gallery-layout': true,
-  });
-
-  return html`<div class="icon-gallery row-fluid">
+export const BlrIcon = ({ size }: BlrIconClass) =>
+  html` <div class="icon-gallery row-fluid">
     <ul class="icon-gallery icon-thumbnails">
       ${allIcons.map((icon) => {
-        return html`<li>
-          ${BlrIconRenderFunction({ icon: calculateIconName(icon as string, size), size: size, classMap: classes })}
+        return html` <li>
+          <blr-icon
+            icon="${calculateIconName(icon as string, size)}"
+            size="${size}"
+            class="icon-gallery-layout"
+          ></blr-icon>
           <span class="icon-label">${icon}</span>
         </li>`;
       })}
     </ul>
   </div>`;
-};
 
 BlrIcon.storyName = 'BlrIcon';
 
diff --git a/packages/ui-library/src/components/icon/index.ts b/packages/ui-library/src/components/icon/index.ts
index 8a2523643..c6f57afee 100644
--- a/packages/ui-library/src/components/icon/index.ts
+++ b/packages/ui-library/src/components/icon/index.ts
@@ -2,11 +2,9 @@ import { LitElement, html, nothing } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { IconMapping, IconType } from '@boiler/icons';
 import { icon } from '../../foundation/component-tokens/ui.css';
+// import { Sizes } from '../../globals/constants';
 import { styleCustom } from './index.css';
 import { SizesType } from '../../globals/types';
-import { DirectiveResult } from 'lit-html/directive';
-import { ClassMapDirective } from 'lit-html/directives/class-map';
-import { styleMap } from 'lit/directives/style-map.js';
 
 @customElement('blr-icon')
 export class BlrIcon extends LitElement {
@@ -15,7 +13,7 @@ export class BlrIcon extends LitElement {
   @property() icon!: IconType;
   @property() size!: SizesType;
 
-  protected render() {
+  render() {
     if (IconMapping.hasOwnProperty(this.icon) && typeof IconMapping[this.icon] === 'function') {
       return html`${IconMapping[this.icon](`blr-icon ${this.size.toLowerCase()}`)}`;
     } else {
@@ -23,33 +21,3 @@ export class BlrIcon extends LitElement {
     }
   }
 }
-
-// BlrIconType is a new Type containing all properties of BlrIcon without the properties of LitElement
-// and some additional properties which are not part of the component
-export type BlrIconType = Partial<Omit<BlrIcon, keyof LitElement>> & {
-  classMap?: DirectiveResult<typeof ClassMapDirective>;
-  onClick?: HTMLElement['onclick'];
-  hideAria?: boolean;
-  name?: string;
-  disablePointerEvents?: boolean;
-};
-
-export const BlrIconRenderFunction = ({
-  icon,
-  size,
-  classMap,
-  onClick,
-  hideAria,
-  name,
-  disablePointerEvents,
-}: BlrIconType) => {
-  return html`<blr-icon
-    class="blr-input-icon ${classMap}"
-    .icon=${icon || nothing}
-    .size=${size}
-    .name=${name || nothing}
-    aria-hidden=${hideAria || nothing}
-    @click=${onClick}
-    style=${disablePointerEvents ? styleMap({ pointerEvents: 'none' }) : nothing}
-  ></blr-icon>`;
-};
diff --git a/packages/ui-library/src/components/link/index.css.ts b/packages/ui-library/src/components/link/index.css.ts
deleted file mode 100644
index 6e3bbdba1..000000000
--- a/packages/ui-library/src/components/link/index.css.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { css } from 'lit';
-
-export const styleCustom = css`
-  .blr-link {
-    display: flex;
-    align-items: center;
-    text-decoration: none;
-    width: fit-content;
-  }
-
-  //
-  //.blr-link:disabled {
-  //  pointer-events: none;
-  //}
-  //
-  //.blr-link:focus {
-  //  /*  Component Tokens for Outline are missing */
-  //  /* Need to make sure we meet AA requirements with this custom outline */
-  //  outline: 2px solid black;
-  //}
-`;
diff --git a/packages/ui-library/src/components/link/index.stories.ts b/packages/ui-library/src/components/link/index.stories.ts
deleted file mode 100644
index aef235acf..000000000
--- a/packages/ui-library/src/components/link/index.stories.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-/* eslint-disable no-console */
-import { html } from 'lit-html';
-import { RelTypes, Sizes, TargetTypes } from '../../globals/constants';
-import { IconKeys } from '@boiler/icons';
-import { BlrLink as BlrLinkClass } from './index';
-import './index';
-import { getIconName } from '../../utils/get-icon-name';
-import { calculateIconName } from '../../utils/calculate-icon-name';
-
-export default {
-  title: 'BlrLink',
-  argTypes: {
-    leadingIcon: {
-      options: [undefined, ...getIconName(IconKeys)],
-      control: { type: 'select' },
-    },
-    trailingIcon: {
-      options: [undefined, ...getIconName(IconKeys)],
-      control: { type: 'select' },
-    },
-    rel: {
-      options: [undefined, ...RelTypes],
-      control: { type: 'select' },
-    },
-    target: {
-      options: [undefined, ...TargetTypes],
-      control: { type: 'select' },
-    },
-    size: {
-      options: Sizes,
-      control: { type: 'select' },
-    },
-    variant: {
-      options: ['cta', 'primary', 'secondary', 'silent', 'destructive', 'encourage'],
-      control: { type: 'select' },
-    },
-  },
-  parameters: {
-    previewTabs: {
-      canvas: { hidden: true },
-    },
-    viewMode: 'docs',
-  },
-};
-export const BlrLink = ({
-  label,
-  ariaLabel,
-  onClick,
-  onBlur,
-  disabled,
-  linkId,
-  href,
-  target,
-  rel,
-  size,
-  leadingIcon,
-  loading,
-  trailingIcon,
-  loadingStatus,
-  variant,
-}: BlrLinkClass) =>
-  html`
-    <blr-link
-      .label=${label}
-      .aria-label="${ariaLabel}"
-      .onClick=${onClick}
-      .onBlur=${onBlur}
-      .disabled=${disabled}
-      .linkId=${linkId}
-      .href=${href}
-      .target=${target}
-      .rel=${rel}
-      .size=${size}
-      .loadingStatus=${loadingStatus}
-      .loading=${loading}
-      .leadingIcon=${calculateIconName(leadingIcon, size)}
-      .trailingIcon=${calculateIconName(trailingIcon, size)}
-      .variant=${variant}
-      class="example-layout-class"
-    >
-    </blr-link>
-  `;
-BlrLink.storyName = 'BlrLink';
-BlrLink.args = {
-  label: 'Link',
-  onClick: () => console.log('onClick'),
-  onBlur: () => console.log('onBlur'),
-  leadingIcon: undefined,
-  trailingIcon: 'blrChevronDown',
-  size: 'md',
-  iconPosition: 'left',
-  loadingStatus: 'Loading',
-  loading: false,
-  disabled: false,
-  variant: 'cta',
-  linkId: 'link-id',
-  href: '#',
-  target: '_self',
-  rel: 'nofollow',
-};
diff --git a/packages/ui-library/src/components/link/index.ts b/packages/ui-library/src/components/link/index.ts
deleted file mode 100644
index 0d24ed545..000000000
--- a/packages/ui-library/src/components/link/index.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { LitElement, html, nothing } from 'lit';
-import { classMap } from 'lit/directives/class-map.js';
-import { customElement, property } from 'lit/decorators.js';
-import { styleCustom } from './index.css';
-import { action } from '../../foundation/semantic-tokens/action.css';
-import { textButton } from '../../foundation/component-tokens/action.css';
-import { ActionVariants, RelTypes, SizesType, TargetTypes } from '../../globals/types';
-import { determineLoaderVariant } from '../../utils/determine-loader-variant';
-import { IconType } from '@boiler/icons';
-
-@customElement('blr-link')
-export class BlrLink extends LitElement {
-  static styles = [styleCustom, action, textButton];
-
-  @property() label!: string;
-  @property() onClick!: HTMLButtonElement['onclick'];
-  @property() onBlur?: HTMLButtonElement['onblur'];
-  @property() leadingIcon?: IconType;
-  @property() trailingIcon?: IconType;
-  @property() disabled?: boolean;
-  @property() linkId?: string;
-  @property() href!: string;
-  @property() target?: TargetTypes;
-  @property() rel?: RelTypes;
-  @property() ariaLabel!: string;
-  @property() variant: ActionVariants = 'primary';
-  @property() loadingStatus!: string;
-  @property() loading!: boolean;
-  @property() size!: SizesType;
-
-  render() {
-    const classes = classMap({
-      'blr-semantic-action': true,
-      'blr-text-button': true,
-      [`${this.variant}`]: this.variant,
-      [`${this.size}`]: this.size || 'md',
-      'blr-link': true,
-    });
-
-    const loaderVariant = determineLoaderVariant(this.variant);
-    return html`<a
-      class=${classes}
-      aria-label=${this.ariaLabel || nothing}
-      href=${this.href || nothing}
-      @click=${this.onClick}
-      @blur=${this.onBlur}
-      ?disabled=${this.disabled}
-      id=${this.linkId || nothing}
-      rel=${this.rel || nothing}
-      target=${this.target || nothing}
-    >
-      ${this.loading
-        ? html`<blr-loader
-            .size=${this.size}
-            .variant=${loaderVariant}
-            .loadingStatus=${this.loadingStatus}
-          ></blr-loader>`
-        : html`
-            ${this.leadingIcon && html`<blr-icon icon=${this.leadingIcon} size=${this.size} aria-hidden></blr-icon>`}
-            <span>${this.label}</span>
-            ${this.trailingIcon && html`<blr-icon icon=${this.trailingIcon} size=${this.size} aria-hidden></blr-icon>`}
-          `}
-    </a>`;
-  }
-}
diff --git a/packages/ui-library/src/components/link/indexReact.ts b/packages/ui-library/src/components/link/indexReact.ts
deleted file mode 100644
index b4e6e86d0..000000000
--- a/packages/ui-library/src/components/link/indexReact.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import { createComponent, EventName } from '@lit-labs/react';
-
-import { BlrLink } from '.';
-
-export const BlrLinkReact = createComponent({
-  tagName: 'blr-link',
-  elementClass: BlrLink,
-  react: React,
-  events: {
-    onClick: 'pointerdown' as EventName<PointerEvent>,
-  },
-});
diff --git a/packages/ui-library/src/components/link/test/__snapshots__/index.test.snap.js b/packages/ui-library/src/components/link/test/__snapshots__/index.test.snap.js
deleted file mode 100644
index 58af721e1..000000000
--- a/packages/ui-library/src/components/link/test/__snapshots__/index.test.snap.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/* @web/test-runner snapshot v1 */
-export const snapshots = {};
-
-snapshots['blr-link renders correctly'] = `<button
-  class="blr-semantic-action blr-text-button md primary"
-  disabled=""
-  id="id"
->
-  <blr-icon
-    aria-hidden=""
-    icon="blrChevronDown"
-    size="md"
-  >
-  </blr-icon>
-  <span>
-    Label
-  </span>
-  <blr-icon
-    aria-hidden=""
-    icon="blrChevronDown"
-    size="md"
-  >
-  </blr-icon>
-</button>
-`;
-/* end snapshot blr-text-button renders correctly */
-snapshots['blr-link renders correctly'] = `<a
-  aria-label=""
-  class="blr-link blr-semantic-action blr-text-button md primary"
-  disabled=""
-  href=""
-  rel="nofollow"
-  target="_self"
-  variant="inverted"
->
-  <blr-icon
-    aria-hidden=""
-    icon="blrChevronDown"
-    size="md"
-  >
-  </blr-icon>
-  <span>
-    Label
-  </span>
-  <blr-icon
-    aria-hidden=""
-    icon="blrChevronDown"
-    size="md"
-  >
-  </blr-icon>
-</a>
-`;
-/* end snapshot blr-link renders correctly */
-snapshots['blr-link renders correctly'] = `<a
-  class="blr-link blr-semantic-action blr-text-button md primary"
-  disabled=""
-  rel="nofollow"
-  target="_self"
->
-  <blr-icon
-    aria-hidden=""
-    icon="blrChevronDown"
-    size="md"
-  >
-  </blr-icon>
-  <span>
-    Label
-  </span>
-  <blr-icon
-    aria-hidden=""
-    icon="blrChevronDown"
-    size="md"
-  >
-  </blr-icon>
-</a>
-`;
-/* end snapshot blr-link renders correctly */
diff --git a/packages/ui-library/src/components/link/test/index.test.ts b/packages/ui-library/src/components/link/test/index.test.ts
deleted file mode 100644
index 7cb4cdc65..000000000
--- a/packages/ui-library/src/components/link/test/index.test.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* eslint-disable @typescript-eslint/await-thenable */
-import '../index';
-import { fixture, expect } from '@open-wc/testing';
-
-describe('blr-link', () => {
-  it('renders correctly', async () => {
-    const element = await fixture(`
-      <blr-link      
-      label="Label"
-      leadingIcon="blrChevronDown"
-      trailingIcon="blrChevronDown"
-      buttonId="id"
-      disabled="true"
-      variant="primary"
-      size="md"
-      rel="nofollow"
-      target="_self"
-      class="example-layout-class" ></blr-link>
-    `);
-
-    await expect(element).shadowDom.to.equalSnapshot();
-  });
-});
diff --git a/packages/ui-library/src/components/loader/index.stories.ts b/packages/ui-library/src/components/loader/index.stories.ts
index 9e3cfd03c..a961384ec 100644
--- a/packages/ui-library/src/components/loader/index.stories.ts
+++ b/packages/ui-library/src/components/loader/index.stories.ts
@@ -15,12 +15,6 @@ export default {
       control: { type: 'select' },
     },
   },
-  parameters: {
-    previewTabs: {
-      canvas: { hidden: true },
-    },
-    viewMode: 'docs',
-  },
 };
 
 export const BlrLoader = ({ size, variant, loadingStatus }: BlrLoaderClass) =>
diff --git a/packages/ui-library/src/components/select/index.css.ts b/packages/ui-library/src/components/select/index.css.ts
deleted file mode 100644
index 0e7d1e8c3..000000000
--- a/packages/ui-library/src/components/select/index.css.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { css } from 'lit';
-
-export const styleCustom = css`
-  .blr-select {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    position: relative;
-  }
-
-  .blr-select-option {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-  }
-`;
diff --git a/packages/ui-library/src/components/select/index.stories.ts b/packages/ui-library/src/components/select/index.stories.ts
deleted file mode 100644
index f18718b01..000000000
--- a/packages/ui-library/src/components/select/index.stories.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/* eslint-disable no-console */
-import { html } from 'lit-html';
-import { BlrSelectRenderFunction, BlrSelectType } from './index';
-import { FormSizes } from '../../globals/constants';
-import { IconKeys } from '@boiler/icons';
-import { getIconName } from '../../utils/get-icon-name';
-import './index';
-
-export default {
-  title: 'BlrSelect',
-  argTypes: {
-    size: {
-      options: FormSizes,
-      control: { type: 'select' },
-    },
-    trailingIcon: {
-      options: [...getIconName(IconKeys)],
-      control: { type: 'select' },
-    },
-    hintIcon: {
-      options: [...getIconName(IconKeys)],
-      control: { type: 'select' },
-    },
-    options: {
-      control: 'array',
-      options: [
-        { value: 'uschi', label: 'Uschi', selected: false, disabled: false },
-        { value: '1', label: 'Option 1', selected: false, disabled: false },
-        { value: '2', label: 'Option 2', selected: true, disabled: false },
-        { value: 'dieter', label: 'Dieter', selected: true, disabled: false },
-      ],
-    },
-    onChange: {
-      action: 'onChange',
-      description: '(@change)="onChange($event)"',
-    },
-  },
-  parameters: {
-    previewTabs: {
-      canvas: { hidden: true },
-    },
-    viewMode: 'docs',
-  },
-};
-
-export const BlrSelect = ({
-  selectId,
-  onChange,
-  name,
-  options,
-  disabled,
-  size,
-  required,
-  errorMessage,
-  hint,
-  hintIcon,
-  hasError,
-  labelAppendix,
-  showTrailingIcon,
-  trailingIcon,
-  hasLabel,
-  label,
-}: BlrSelectType) =>
-  html`
-    ${BlrSelectRenderFunction({
-      selectId,
-      onChange,
-      name,
-      options,
-      disabled,
-      size,
-      required,
-      errorMessage,
-      hint,
-      hintIcon,
-      hasError,
-      labelAppendix,
-      showTrailingIcon,
-      trailingIcon,
-      hasLabel,
-      label,
-    })}
-  `;
-
-BlrSelect.storyName = 'BlrSelect';
-
-BlrSelect.args = {
-  name: 'Text Input',
-  hasLabel: true,
-  label: 'Label',
-  labelAppendix: '(Optional)',
-  showTrailingIcon: true,
-  size: 'md',
-  hasError: false,
-  errorMessage: 'This is error message',
-  disabled: false,
-  required: false,
-  hint: 'Field is used for hint',
-  hintIcon: 'blrInfo',
-  selectId: 'Peter',
-  trailingIcon: 'blr360',
-  options: [
-    { value: 'uschi', label: 'Uschi', disabled: true },
-    { value: '1', label: 'Option 1' },
-    { value: '2', label: 'Option 2', selected: true },
-    { value: 'dieter', label: 'Dieter' },
-  ],
-};
diff --git a/packages/ui-library/src/components/select/index.ts b/packages/ui-library/src/components/select/index.ts
deleted file mode 100644
index 5ba39654f..000000000
--- a/packages/ui-library/src/components/select/index.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import { LitElement, html, nothing } from 'lit';
-import { ClassMapDirective, classMap } from 'lit/directives/class-map.js';
-import { customElement, property } from 'lit/decorators.js';
-import { styleCustom } from './index.css';
-import { FormSizesType } from '../../globals/types';
-import { BlrFormLabel } from '../internal-components/form-label';
-import { BlrFormHint } from '../internal-components/form-hint';
-
-import { IconType } from '@boiler/icons';
-import { form } from '../../foundation/semantic-tokens/form.css';
-import { calculateIconName } from '../../utils/calculate-icon-name';
-import { DirectiveResult } from 'lit-html/directive';
-import { BlrIconRenderFunction } from '../icon';
-
-type Option = {
-  value: string;
-  label: string;
-  selected?: boolean;
-  disabled?: boolean;
-};
-
-@customElement('blr-select')
-export class BlrSelect extends LitElement {
-  static styles = [styleCustom, form];
-
-  @property() selectId!: string;
-  @property() labelAppendix?: string;
-  @property() name!: string;
-  @property() hasLabel?: boolean;
-  @property() label!: string;
-  @property() disabled?: boolean;
-  @property() size: FormSizesType = 'md';
-  @property() required?: boolean;
-  @property() onChange?: HTMLElement['oninput'];
-  @property({ type: Array }) options: Option[] = [];
-  @property() hasError?: boolean;
-  @property() errorMessage?: string;
-  @property() hint?: string;
-  @property() hintIcon: IconType = 'blrInfoSm';
-  @property() showTrailingIcon?: boolean;
-  @property() trailingIcon: IconType = 'blr360Sm';
-
-  protected renderTrailingIcon(classes: DirectiveResult<typeof ClassMapDirective>) {
-    if (this.showTrailingIcon) {
-      if (this.hasError) {
-        return html`${BlrIconRenderFunction({
-          icon: 'blrErrorFilledSm',
-          size: this.size,
-          classMap: classes,
-          hideAria: true,
-          disablePointerEvents: true,
-        })}`;
-      } else {
-        return html`${BlrIconRenderFunction({
-          icon: calculateIconName(this.trailingIcon, this.size),
-          size: this.size,
-          classMap: classes,
-          hideAria: true,
-          disablePointerEvents: true,
-        })}`;
-      }
-    }
-
-    return nothing;
-  }
-
-  protected render() {
-    const classes = classMap({
-      [`${this.size}`]: this.size || 'md',
-      disabled: this.disabled || false,
-    });
-
-    const inputClasses = classMap({
-      'error': this.hasError || false,
-      'error-input': this.hasError || false,
-      [`${this.size}`]: this.size || 'md',
-    });
-
-    return html`
-      <div class="blr-select ${classes}">
-        ${this.hasLabel
-          ? BlrFormLabel({
-              labelText: this.label,
-              labelAppendix: this.labelAppendix,
-              labelSize: 'md',
-              forValue: this.selectId,
-            })
-          : nothing}
-        <div class="blr-input-inner-container">
-          <select
-            class="blr-form-element ${inputClasses}"
-            id=${this.selectId || nothing}
-            name=${this.name || nothing}
-            ?disabled=${this.disabled}
-            ?required=${this.required}
-            @change=${this.onChange}
-          >
-            ${this.options?.map((opt: Option) => {
-              return html`<option
-                class="blr-select-option"
-                id=${opt.value}
-                value=${opt.value}
-                ?selected=${opt.selected}
-                ?disabled=${opt.disabled}
-              >
-                ${opt.label}
-              </option>`;
-            })}
-          </select>
-
-          ${this.renderTrailingIcon(inputClasses)}
-        </div>
-        ${BlrFormHint({
-          message: (this.hasError ? this.errorMessage : this.hint) || 'This is dummy message',
-          variant: this.hasError ? 'error' : 'hint',
-          size: 'sm',
-          iconName: calculateIconName(this.hintIcon, this.size),
-        })}
-      </div>
-    `;
-  }
-}
-
-export type BlrSelectType = Omit<BlrSelect, keyof LitElement>;
-
-export const BlrSelectRenderFunction = ({
-  selectId,
-  labelAppendix,
-  name,
-  hasLabel,
-  label,
-  disabled,
-  size,
-  required,
-  onChange,
-  options,
-  hasError,
-  errorMessage,
-  hint,
-  hintIcon,
-  showTrailingIcon,
-  trailingIcon,
-}: BlrSelectType) => {
-  return html`<blr-select
-    class="example-layout-class"
-    .selectId=${selectId}
-    .name=${name}
-    .disabled=${disabled}
-    .size=${size}
-    .required=${required}
-    .onChange=${onChange}
-    .errorMessage=${errorMessage}
-    .hint=${hint}
-    .hintIcon=${hintIcon}
-    .hasError=${hasError}
-    .options=${options}
-    .labelAppendix=${labelAppendix}
-    .showTrailingIcon=${showTrailingIcon}
-    .trailingIcon=${trailingIcon}
-    .hasLabel=${hasLabel}
-    .label=${label}
-  ></blr-select>`;
-};
diff --git a/packages/ui-library/src/components/select/indexReact.ts b/packages/ui-library/src/components/select/indexReact.ts
deleted file mode 100644
index d97d83e3a..000000000
--- a/packages/ui-library/src/components/select/indexReact.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-import { createComponent, EventName } from '@lit-labs/react';
-
-import { BlrSelect } from '.';
-
-export const BlrSelectReact = createComponent({
-  tagName: 'blr-select',
-  elementClass: BlrSelect,
-  react: React,
-  events: {
-    onInput: 'pointerdown' as EventName<PointerEvent>,
-    onFocus: 'pointerdown' as EventName<PointerEvent>,
-  },
-});
diff --git a/packages/ui-library/src/components/select/test/__snapshots__/index.test.snap.js b/packages/ui-library/src/components/select/test/__snapshots__/index.test.snap.js
deleted file mode 100644
index fb0d80890..000000000
--- a/packages/ui-library/src/components/select/test/__snapshots__/index.test.snap.js
+++ /dev/null
@@ -1,211 +0,0 @@
-/* @web/test-runner snapshot v1 */
-export const snapshots = {};
-
-snapshots['blr-text-input renders correctly'] = `<input
-  type="text"
-  inputValue="inputValue"
-  placeholder="Test Placeholder 3"
-  defaultValue="default Value"
-  class="blr-semantic-action blr-text-input disabled md"
-  disabled=""
-  required=""
-  id="id"
-  maxLength="200px"
-  minLength="50px"
-  pattern=""
-/>
-`;
-/* end snapshot blr-text-input renders correctly */
-
-snapshots['blr-select renders correctly'] = `<div class="blr-select-option disabled md">
-  <label
-    class="blr-form-label md"
-    for=""
-  >
-  </label>
-  <select
-    class="blr-select"
-    disabled="false"
-    required="true"
-  >
-  </select>
-  <span class="blr-form-hint hint">
-    <blr-icon
-      aria-hidden=""
-      icon=""
-      size="md"
-    >
-    </blr-icon>
-    <span class="blr-caption-text">
-      This is dummy message
-    </span>
-  </span>
-</div>
-`;
-/* end snapshot blr-select renders correctly */
-snapshots['blr-select renders correctly'] = `<div class="blr-select-option disabled md">
-  <label
-    class="blr-form-label md"
-    for=""
-  >
-  </label>
-  <select
-    class="blr-select md"
-    disabled="false"
-    required="true"
-  >
-    <option
-      disabled=""
-      hidden=""
-      selected=""
-    >
-      Test Placeholder 2
-    </option>
-  </select>
-  <span class="blr-form-hint hint">
-    <blr-icon
-      aria-hidden=""
-      icon=""
-      size="md"
-    >
-    </blr-icon>
-    <span class="blr-caption-text">
-      This is dummy message
-    </span>
-  </span>
-</div>
-`;
-/* end snapshot blr-select renders correctly */
-snapshots['blr-select renders correctly'] = `<div class="blr-select blr-select-option disabled md">
-  <label
-    class="blr-form-label md"
-    for=""
-  >
-  </label>
-  <div class="blr-input-inner-container">
-    <select
-      class="blr-form-element md"
-      disabled="false"
-      required="true"
-    >
-      <option
-        class="blr-select-placeholder"
-        disabled=""
-        hidden=""
-        selected=""
-      >
-        Test Placeholder 2
-      </option>
-    </select>
-  </div>
-  <span class="blr-form-hint hint">
-    <blr-icon
-      aria-hidden=""
-      icon="blrInfoSmSm"
-      size="sm"
-    >
-    </blr-icon>
-    <span class="blr-caption-text">
-      This is dummy message
-    </span>
-  </span>
-</div>
-`;
-/* end snapshot blr-select renders correctly */
-snapshots['blr-select renders correctly'] = `<div class="blr-select disabled md">
-  <label
-    class="blr-form-label md"
-    for=""
-  >
-  </label>
-  <div class="blr-input-inner-container">
-    <select
-      class="blr-form-element md"
-      disabled="false"
-      required="true"
-    >
-    </select>
-  </div>
-  <span class="blr-form-hint hint">
-    <blr-icon
-      aria-hidden=""
-      icon="blrInfoSmSm"
-      size="sm"
-    >
-    </blr-icon>
-    <span class="blr-caption-text">
-      This is dummy message
-    </span>
-  </span>
-</div>
-`;
-/* end snapshot blr-select renders correctly */
-snapshots['blr-select renders correctly'] = `<div class="blr-select disabled md">
-  <div class="blr-input-inner-container">
-    <select
-      class="blr-form-element md"
-      disabled="false"
-      required="true"
-    >
-    </select>
-  </div>
-  <span class="blr-form-hint hint">
-    <blr-icon
-      aria-hidden=""
-      icon="blrInfoSmSm"
-      size="sm"
-    >
-    </blr-icon>
-    <span class="blr-caption-text">
-      This is dummy message
-    </span>
-  </span>
-</div>
-`;
-/* end snapshot blr-select renders correctly */
-snapshots['blr-select renders correctly'] = `<div class="blr-select disabled md">
-  <div class="blr-input-inner-container">
-    <select
-      class="blr-form-element md"
-      disabled="false"
-      required="true"
-    >
-    </select>
-  </div>
-  <span class="blr-form-hint hint sm">
-    <blr-icon
-      aria-hidden=""
-      icon="blrInfoSmSm"
-      size="sm"
-    >
-    </blr-icon>
-    <span class="blr-caption-text">
-      This is dummy message
-    </span>
-  </span>
-</div>
-`;
-/* end snapshot blr-select renders correctly */
-snapshots['blr-select renders correctly'] = `<div class="blr-select disabled md">
-  <div class="blr-input-inner-container">
-    <select
-      class="blr-form-element md"
-      disabled=""
-      required=""
-    >
-    </select>
-  </div>
-  <span class="blr-form-hint hint sm">
-    <blr-icon
-      aria-hidden=""
-      icon=""
-      size="sm"
-    >
-    </blr-icon>
-    <span class="blr-caption-text">
-      This is dummy message
-    </span>
-  </span>
-</div>
-`;
-/* end snapshot blr-select renders correctly */
diff --git a/packages/ui-library/src/components/select/test/index.test.ts b/packages/ui-library/src/components/select/test/index.test.ts
deleted file mode 100644
index af2584457..000000000
--- a/packages/ui-library/src/components/select/test/index.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/* eslint-disable @typescript-eslint/await-thenable */
-import '../index';
-import { fixture, expect } from '@open-wc/testing';
-
-describe('blr-select', () => {
-  it('renders correctly', async () => {
-    const element = await fixture(`
-      <blr-select      
-      type="text"
-      textInputId="select-id"
-      label="Test Input Name"
-      placeholder="Test Placeholder 2"
-      defaultValue="Test defaultValue"
-      disabled="false"
-      required="true"
-      size="md"
-      maxLength="200"
-      minLength="50"
-      pattern=""
-      class="example-layout-class" ></blr-select>
-    `);
-
-    await expect(element).shadowDom.to.equalSnapshot();
-  });
-});
diff --git a/packages/ui-library/src/components/text-button/index.stories.ts b/packages/ui-library/src/components/text-button/index.stories.ts
index af7abec12..7012116dd 100644
--- a/packages/ui-library/src/components/text-button/index.stories.ts
+++ b/packages/ui-library/src/components/text-button/index.stories.ts
@@ -27,12 +27,6 @@ export default {
       control: { type: 'select' },
     },
   },
-  parameters: {
-    previewTabs: {
-      canvas: { hidden: true },
-    },
-    viewMode: 'docs',
-  },
 };
 
 export const BlrTextButton = ({
diff --git a/packages/ui-library/src/components/text-input/index.stories.ts b/packages/ui-library/src/components/text-input/index.stories.ts
index 16b21f419..147e5a33d 100644
--- a/packages/ui-library/src/components/text-input/index.stories.ts
+++ b/packages/ui-library/src/components/text-input/index.stories.ts
@@ -27,12 +27,6 @@ export default {
       control: { type: 'select' },
     },
   },
-  parameters: {
-    previewTabs: {
-      canvas: { hidden: true },
-    },
-    viewMode: 'docs',
-  },
 };
 
 export const BlrTextInput = ({
diff --git a/packages/ui-library/src/components/text-input/index.ts b/packages/ui-library/src/components/text-input/index.ts
index 7440d4ce7..7089bc40e 100644
--- a/packages/ui-library/src/components/text-input/index.ts
+++ b/packages/ui-library/src/components/text-input/index.ts
@@ -1,4 +1,4 @@
-import { LitElement, html, nothing } from 'lit';
+import { LitElement, html } from 'lit';
 import { classMap } from 'lit/directives/class-map.js';
 import { customElement, property, state } from 'lit/decorators.js';
 import { styleCustom } from './index.css';
@@ -99,7 +99,7 @@ export class BlrTextInput extends LitElement {
                 size="sm"
                 aria-hidden
               ></blr-icon>`
-            : nothing}
+            : html``}
           ${wasInitialPasswordField
             ? html`<blr-icon
                 class="blr-input-icon ${inputClasses}"
@@ -109,7 +109,7 @@ export class BlrTextInput extends LitElement {
                 name="${getPasswordIcon()}"
                 aria-hidden
               ></blr-icon>`
-            : nothing}
+            : html``}
         </div>
         ${this.showHint
           ? html`
@@ -120,7 +120,7 @@ export class BlrTextInput extends LitElement {
                 size: this.size,
               })}
             `
-          : nothing}
+          : html``}
       </div>
     `;
   }
diff --git a/packages/ui-library/src/foundation/_tokens-generated/__component-tokens.generated.js b/packages/ui-library/src/foundation/_tokens-generated/__component-tokens.generated.js
index 026e18be3..1f024309a 100644
--- a/packages/ui-library/src/foundation/_tokens-generated/__component-tokens.generated.js
+++ b/packages/ui-library/src/foundation/_tokens-generated/__component-tokens.generated.js
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Fri, 02 Jun 2023 10:34:53 GMT
+ * Generated on Wed, 31 May 2023 16:00:17 GMT
  */
 
 export const componentTokens = {
diff --git a/packages/ui-library/src/foundation/_tokens-generated/__semantic-tokens.generated.js b/packages/ui-library/src/foundation/_tokens-generated/__semantic-tokens.generated.js
index 33dd44ad6..8bfb8a441 100644
--- a/packages/ui-library/src/foundation/_tokens-generated/__semantic-tokens.generated.js
+++ b/packages/ui-library/src/foundation/_tokens-generated/__semantic-tokens.generated.js
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Fri, 02 Jun 2023 10:34:53 GMT
+ * Generated on Wed, 31 May 2023 16:00:17 GMT
  */
 
 export const semanticTokens = {
diff --git a/packages/ui-library/src/foundation/_tokens-generated/_border-radius.generated.scss b/packages/ui-library/src/foundation/_tokens-generated/_border-radius.generated.scss
index 4dcaea6b5..c4b248363 100644
--- a/packages/ui-library/src/foundation/_tokens-generated/_border-radius.generated.scss
+++ b/packages/ui-library/src/foundation/_tokens-generated/_border-radius.generated.scss
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Fri, 02 Jun 2023 10:34:52 GMT
+ * Generated on Wed, 31 May 2023 16:00:16 GMT
  */
 
 :root {
diff --git a/packages/ui-library/src/foundation/_tokens-generated/_border-width.generated.scss b/packages/ui-library/src/foundation/_tokens-generated/_border-width.generated.scss
index 7f6444190..5556ced7e 100644
--- a/packages/ui-library/src/foundation/_tokens-generated/_border-width.generated.scss
+++ b/packages/ui-library/src/foundation/_tokens-generated/_border-width.generated.scss
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Fri, 02 Jun 2023 10:34:52 GMT
+ * Generated on Wed, 31 May 2023 16:00:16 GMT
  */
 
 :root {
diff --git a/packages/ui-library/src/foundation/_tokens-generated/_color.generated.scss b/packages/ui-library/src/foundation/_tokens-generated/_color.generated.scss
index 31f236c55..60b0c02fb 100644
--- a/packages/ui-library/src/foundation/_tokens-generated/_color.generated.scss
+++ b/packages/ui-library/src/foundation/_tokens-generated/_color.generated.scss
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Fri, 02 Jun 2023 10:34:53 GMT
+ * Generated on Wed, 31 May 2023 16:00:16 GMT
  */
 
 :root {
diff --git a/packages/ui-library/src/foundation/_tokens-generated/_font-families.generated.scss b/packages/ui-library/src/foundation/_tokens-generated/_font-families.generated.scss
index d5dd2876a..9058423cf 100644
--- a/packages/ui-library/src/foundation/_tokens-generated/_font-families.generated.scss
+++ b/packages/ui-library/src/foundation/_tokens-generated/_font-families.generated.scss
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Fri, 02 Jun 2023 10:34:52 GMT
+ * Generated on Wed, 31 May 2023 16:00:16 GMT
  */
 
 :root {
diff --git a/packages/ui-library/src/foundation/_tokens-generated/_font-sizes.generated.scss b/packages/ui-library/src/foundation/_tokens-generated/_font-sizes.generated.scss
index 59deab744..5c663f44e 100644
--- a/packages/ui-library/src/foundation/_tokens-generated/_font-sizes.generated.scss
+++ b/packages/ui-library/src/foundation/_tokens-generated/_font-sizes.generated.scss
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Fri, 02 Jun 2023 10:34:53 GMT
+ * Generated on Wed, 31 May 2023 16:00:16 GMT
  */
 
 :root {
diff --git a/packages/ui-library/src/foundation/_tokens-generated/_font-weights.generated.scss b/packages/ui-library/src/foundation/_tokens-generated/_font-weights.generated.scss
index f22f6657f..0ca309d92 100644
--- a/packages/ui-library/src/foundation/_tokens-generated/_font-weights.generated.scss
+++ b/packages/ui-library/src/foundation/_tokens-generated/_font-weights.generated.scss
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Fri, 02 Jun 2023 10:34:53 GMT
+ * Generated on Wed, 31 May 2023 16:00:16 GMT
  */
 
 :root {
diff --git a/packages/ui-library/src/foundation/_tokens-generated/_letter-spacing.generated.scss b/packages/ui-library/src/foundation/_tokens-generated/_letter-spacing.generated.scss
index 58231844a..9bd899250 100644
--- a/packages/ui-library/src/foundation/_tokens-generated/_letter-spacing.generated.scss
+++ b/packages/ui-library/src/foundation/_tokens-generated/_letter-spacing.generated.scss
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Fri, 02 Jun 2023 10:34:53 GMT
+ * Generated on Wed, 31 May 2023 16:00:16 GMT
  */
 
 :root {
diff --git a/packages/ui-library/src/foundation/_tokens-generated/_line-heights.generated.scss b/packages/ui-library/src/foundation/_tokens-generated/_line-heights.generated.scss
index ce23ac178..248cf839c 100644
--- a/packages/ui-library/src/foundation/_tokens-generated/_line-heights.generated.scss
+++ b/packages/ui-library/src/foundation/_tokens-generated/_line-heights.generated.scss
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Fri, 02 Jun 2023 10:34:53 GMT
+ * Generated on Wed, 31 May 2023 16:00:16 GMT
  */
 
 :root {
diff --git a/packages/ui-library/src/foundation/_tokens-generated/_pargraph-spacing.generated.scss b/packages/ui-library/src/foundation/_tokens-generated/_pargraph-spacing.generated.scss
index b256d5725..8435ca39a 100644
--- a/packages/ui-library/src/foundation/_tokens-generated/_pargraph-spacing.generated.scss
+++ b/packages/ui-library/src/foundation/_tokens-generated/_pargraph-spacing.generated.scss
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Fri, 02 Jun 2023 10:34:53 GMT
+ * Generated on Wed, 31 May 2023 16:00:16 GMT
  */
 
 :root {
diff --git a/packages/ui-library/src/foundation/_tokens-generated/config-tokens/__component-config.generated.js b/packages/ui-library/src/foundation/_tokens-generated/config-tokens/__component-config.generated.js
index a82d6931d..e3bd225d9 100644
--- a/packages/ui-library/src/foundation/_tokens-generated/config-tokens/__component-config.generated.js
+++ b/packages/ui-library/src/foundation/_tokens-generated/config-tokens/__component-config.generated.js
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Fri, 02 Jun 2023 10:34:53 GMT
+ * Generated on Wed, 31 May 2023 16:00:17 GMT
  */
 
 export const componentConfig = {
diff --git a/packages/ui-library/src/foundation/semantic-tokens/form.css.js b/packages/ui-library/src/foundation/semantic-tokens/form.css.js
index 767e879f0..bc333b7c6 100644
--- a/packages/ui-library/src/foundation/semantic-tokens/form.css.js
+++ b/packages/ui-library/src/foundation/semantic-tokens/form.css.js
@@ -12,8 +12,6 @@ const forms = {
 
 export const form = css`
 .blr-form-element {
-  all: initial;
-  color: ${Forms.UserInput.Default.Rest};
   font-weight: ${Forms.MD.UserInput.fontWeight};
   font-size: ${Forms.MD.UserInput.fontSize};
   font-family: ${Forms.MD.UserInput.fontFamily}, sans-serif;
@@ -64,8 +62,6 @@ export const form = css`
     border-width: ${Forms.Input.Default.Disabled.width};
     border-style: ${Forms.Input.Default.Disabled.style};
     border-color: ${Forms.Input.Default.Disabled.color};
-    background-color: ${Forms.SurfaceFill.Default.Disabled};
-    color: ${Forms.UserInput.Default.Disabled};
 
     &::placeholder {
       color: ${Forms.Placeholder.Default.Disabled};
@@ -133,15 +129,7 @@ export const form = css`
 }
 
 .blr-input-icon {
-  &.sm {
-    margin-left: -25px;
-  }
-  &.md {
-    margin-left: -32px;
-  }
-  &.lg {
-    margin-left: -40px;
-  }
+  margin-left: -25px;
   color: ${Forms.Placeholder.Default.Rest};
 }
 
@@ -161,7 +149,6 @@ export const form = css`
     padding-bottom: ${Forms.LG.LabelSlot.Padding};
   }
 }
-
 .blr-form-hint {
   display: flex;
   align-items: center;
@@ -240,21 +227,21 @@ export const form = css`
   }
 }
 .blr-form-label-appendix {
-  padding-left: ${Forms.MD.LabelSlot.ItemSpacing};
+  padding-left: ${Forms.MD.LabelSlot.Padding};
   font-weight: ${Forms.MD.LabelAppendix.fontWeight};
   font-size: ${Forms.MD.LabelAppendix.fontSize};
   font-family: ${Forms.MD.LabelAppendix.fontFamily}, sans-serif;
   line-height: ${Forms.MD.LabelAppendix.lineHeight};
   color: ${Forms.LabelAppendix.Rest};
   &.sm {
-    padding-left: ${Forms.SM.LabelSlot.ItemSpacing};
+    padding-left: ${Forms.SM.LabelSlot.Padding};
     font-weight: ${Forms.SM.LabelAppendix.fontWeight};
     font-size: ${Forms.SM.LabelAppendix.fontSize};
     font-family: ${Forms.MD.LabelAppendix.fontFamily}, sans-serif;
     line-height: ${Forms.MD.LabelAppendix.lineHeight};
   }
   &.lg {
-    padding-left: ${Forms.LG.LabelSlot.ItemSpacing};
+    padding-left: ${Forms.LG.LabelSlot.Padding};
     font-weight: ${Forms.LG.LabelAppendix.fontWeight};
     font-size: ${Forms.LG.LabelAppendix.fontSize};
     font-family: ${Forms.LG.LabelAppendix.fontFamily}, sans-serif;
diff --git a/packages/ui-library/src/globals/constants.ts b/packages/ui-library/src/globals/constants.ts
index f1dfe99ae..51e0fd4d1 100644
--- a/packages/ui-library/src/globals/constants.ts
+++ b/packages/ui-library/src/globals/constants.ts
@@ -1,22 +1,5 @@
 export const Sizes = ['xxs', 'xs', 'sm', 'md', 'lg', 'xl'] as const;
-export const ActionTypes = ['primary', 'secondary', 'cta', 'silent', 'destructive', 'encourage'] as const;
 export const InputSizes = ['sm', 'md', 'lg'] as const;
 export const FeedbackSizes = ['xs', 'sm', 'md', 'lg', 'xl'] as const;
 export const FormSizes = ['sm', 'md', 'lg'] as const;
 export const InputTypes = ['text', 'email', 'number', 'password'] as const;
-export const RelTypes = [
-  'alternate',
-  'author',
-  'bookmark',
-  'external',
-  'help',
-  'licence',
-  'next',
-  'nofollow',
-  'noopener',
-  'noreferrer',
-  'prev',
-  'search',
-  'tag',
-];
-export const TargetTypes = ['_blank', '_parent', '_self', '_top'];
diff --git a/packages/ui-library/src/globals/types.ts b/packages/ui-library/src/globals/types.ts
index 3197afea0..f0b032ab4 100644
--- a/packages/ui-library/src/globals/types.ts
+++ b/packages/ui-library/src/globals/types.ts
@@ -1,20 +1,9 @@
-import {
-  FeedbackSizes,
-  Sizes,
-  ActionTypes,
-  InputTypes,
-  FormSizes,
-  InputSizes,
-  RelTypes,
-  TargetTypes,
-} from './constants';
+import { FeedbackSizes, Sizes, InputTypes, FormSizes, InputSizes } from './constants';
 
 export type SizesType = (typeof Sizes)[number];
-export type ActionVariants = (typeof ActionTypes)[number];
+export type ActionVariants = 'primary' | 'secondary' | 'cta' | 'silent' | 'destructive' | 'encourage';
 export type FeedbackVariants = 'default' | 'inverted';
 export type FeedbackSizesType = (typeof FeedbackSizes)[number];
 export type FormSizesType = (typeof FormSizes)[number];
 export type InputTypes = (typeof InputTypes)[number];
 export type InputSizesType = (typeof InputSizes)[number];
-export type RelTypes = (typeof RelTypes)[number];
-export type TargetTypes = (typeof TargetTypes)[number];
diff --git a/packages/ui-library/src/utils/calculate-icon-name.ts b/packages/ui-library/src/utils/calculate-icon-name.ts
index ad9eabb50..416063068 100644
--- a/packages/ui-library/src/utils/calculate-icon-name.ts
+++ b/packages/ui-library/src/utils/calculate-icon-name.ts
@@ -1,11 +1,7 @@
-import { IconKeys, IconType } from '@boiler/icons';
+import { IconKeys } from '@boiler/icons';
 import { SizesType } from '../globals/types';
-import { Sizes } from '../globals/constants';
 
-// 'Xxs|Xs|Sm|Md|Lg|Xl' but from same source as the type def
-const keyws = Sizes.map((a) => a.charAt(0).toUpperCase() + a.substring(1)).join('|');
-// /(?<size>Xxs|Xs|Sm|Md|Lg|Xl)/;
-const capturingRegex = new RegExp('(?<size>' + keyws + ')');
+const capturingRegex = /(?<size>Xxs|Xs|Sm|Md|Lg|Xl)/;
 
 const hasIconSize = (icon: string) => IconKeys.includes(icon);
 
@@ -22,26 +18,17 @@ const getSizeSubstitute = (icon: string) => {
   }
 };
 
-export const calculateIconName = (icon: string | undefined, size: SizesType) => {
+export const calculateIconName = (icon: string, size: SizesType) => {
   if (!icon) {
     return undefined;
   }
-  const formattedIconKey = icon.toString() + size.charAt(0).toUpperCase() + size.slice(1);
-
-  if (IconKeys.indexOf(formattedIconKey) !== -1 && hasIconSize(formattedIconKey)) {
-    return formattedIconKey as IconType;
-  } else {
-    return getIconReplacement(icon);
-  }
+  const formattedIcon = `${icon.toString()}${size.charAt(0).toUpperCase() + size.slice(1)}`;
+  return hasIconSize(formattedIcon) ? formattedIcon : getIconReplacement(icon);
 };
 
-export const getIconReplacement = (icon: string): IconType | undefined => {
+export const getIconReplacement = (icon: string) => {
   const sizeSubstitute = getSizeSubstitute(icon);
-  const iconKey = icon.toString() + sizeSubstitute?.charAt(0).toUpperCase() + sizeSubstitute?.slice(1);
-
-  if (IconKeys.indexOf(iconKey) !== -1 && sizeSubstitute) {
-    return iconKey as IconType;
-  }
-
-  return undefined;
+  return sizeSubstitute
+    ? `${icon.toString()}${sizeSubstitute.charAt(0).toUpperCase() + sizeSubstitute.slice(1)}`
+    : 'Icon Does not exist in this size';
 };