@sanity/ui 2.0.0-alpha.33 → 2.0.0-alpha.35

package/dist/index.js

@@ -46,7 +46,7 @@ function _getArrayProp(val, defaultVal) {
   if (val === void 0) return defaultVal || EMPTY_ARRAY;
   return Array.isArray(val) ? val : [val];
 }
-function _getResponsiveSpace(theme, props) {
+function _getResponsiveSpace(theme$1, props) {
   let spaceIndexes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : EMPTY_ARRAY;
   if (!Array.isArray(spaceIndexes)) {
     throw new Error("the property must be array of numbers");
@@ -54,23 +54,26 @@ function _getResponsiveSpace(theme, props) {
   if (spaceIndexes.length === 0) {
     return null;
   }
-  return _responsive(theme.sanity.media, spaceIndexes, spaceIndex => _fillCSSObject(props, rem(theme.sanity.space[spaceIndex])));
+  const {
+    media,
+    space
+  } = theme.getTheme_v2(theme$1);
+  return _responsive(media, spaceIndexes, spaceIndex => _fillCSSObject(props, rem(space[spaceIndex])));
 }
 function responsiveFont(fontKey, props) {
   const {
     $size,
-    $weight,
-    theme
+    $weight
   } = props;
   const {
-    fonts,
+    font,
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   const {
     family,
     sizes,
     weights
-  } = fonts[fontKey];
+  } = font[fontKey];
   const fontWeight = $weight && weights[$weight] || weights.regular;
   const defaultSize = sizes[2];
   const base = {
@@ -157,9 +160,9 @@ function responsiveLabelFont(props) {
 }
 function responsiveTextAlignStyle(props) {
   const {
-    theme
-  } = props;
-  return _responsive(theme.sanity.media, props.$align, textAlign => {
+    media
+  } = theme.getTheme_v2(props.theme);
+  return _responsive(media, props.$align, textAlign => {
     return {
       textAlign
     };
@@ -838,17 +841,6 @@ function useGlobalKeyDown(onKeyDown) {
     return () => removeEventListener("keydown", onKeyDown);
   }, [onKeyDown]);
 }
-const DEFAULT_THEME_LAYER = {
-  dialog: {
-    zOffset: 600
-  },
-  popover: {
-    zOffset: 400
-  },
-  tooltip: {
-    zOffset: 200
-  }
-};
 function getGlobalScope() {
   if (typeof globalThis !== "undefined") return globalThis;
   if (typeof window !== "undefined") return window;
@@ -865,57 +857,40 @@ function ThemeProvider(props) {
   const {
     children,
     scheme = (parentTheme == null ? void 0 : parentTheme.scheme) || "light",
-    theme: themeProp = (parentTheme == null ? void 0 : parentTheme.theme) || null,
+    theme: rootTheme = (parentTheme == null ? void 0 : parentTheme.theme) || null,
     tone = (parentTheme == null ? void 0 : parentTheme.tone) || "default"
   } = props;
-  const theme = react.useMemo(() => {
-    if (!themeProp) return null;
-    const {
-      color: rootColor,
-      layer: rootLayer,
-      ...restTheme
-    } = themeProp;
-    const colorScheme = rootColor[scheme] || rootColor.light;
-    const color = colorScheme[tone] || colorScheme.default;
-    const layer = rootLayer || DEFAULT_THEME_LAYER;
+  const themeContext = react.useMemo(() => {
+    if (!rootTheme) return null;
     return {
-      sanity: {
-        ...restTheme,
-        color,
-        layer
-      }
+      version: 0,
+      theme: rootTheme,
+      scheme,
+      tone
     };
-  }, [scheme, themeProp, tone]);
-  const value = react.useMemo(() => themeProp && {
-    version: 0,
-    theme: themeProp,
-    scheme,
-    tone
-  }, [themeProp, scheme, tone]);
-  if (!theme) {
+  }, [rootTheme, scheme, tone]);
+  const theme$1 = react.useMemo(() => {
+    if (!rootTheme) return null;
+    return theme.getScopedTheme(rootTheme, scheme, tone);
+  }, [scheme, rootTheme, tone]);
+  if (!theme$1) {
     return /* @__PURE__ */jsxRuntime.jsx("pre", {
       children: 'ThemeProvider: no "theme" property provided'
     });
   }
   return /* @__PURE__ */jsxRuntime.jsx(ThemeContext.Provider, {
-    value,
+    value: themeContext,
     children: /* @__PURE__ */jsxRuntime.jsx(styled.ThemeProvider, {
-      theme,
+      theme: theme$1,
       children
     })
   });
 }
-function isRecord(value) {
-  return Boolean(value && typeof value === "object" && !Array.isArray(value));
-}
 function useRootTheme() {
   const value = react.useContext(ThemeContext);
   if (!value) {
     throw new Error("useRootTheme(): missing context value");
   }
-  if (!isRecord(value) || value.version !== 0) {
-    throw new Error("useRootTheme(): the context value is not compatible");
-  }
   return value;
 }
 function ThemeColorProvider(props) {
@@ -935,6 +910,9 @@ function ThemeColorProvider(props) {
 function useTheme() {
   return styled.useTheme();
 }
+function useTheme_v2() {
+  return theme.getTheme_v2(styled.useTheme());
+}
 const MEDIA_STORE_CACHE = /* @__PURE__ */new WeakMap();
 function _getMediaQuery(media, index) {
   if (index === 0) {
@@ -996,10 +974,9 @@ function getServerSnapshot$2() {
   return 0;
 }
 function useMediaIndex() {
-  const theme = useTheme();
   const {
     media
-  } = theme.sanity;
+  } = useTheme_v2();
   let store = MEDIA_STORE_CACHE.get(media);
   if (!store) {
     store = _createMediaStore(media);
@@ -1074,13 +1051,10 @@ function responsiveBorderStyle() {
 }
 function border(props) {
   var _a, _b;
-  const {
-    theme
-  } = props;
   const {
     card,
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   const borderStyle = "".concat((_b = (_a = card.border) == null ? void 0 : _a.width) != null ? _b : 1, "px solid var(--card-border-color)");
   return _responsive(media, props.$border, value => value ? {
     "&&": {
@@ -1094,13 +1068,10 @@ function border(props) {
 }
 function borderTop(props) {
   var _a, _b;
-  const {
-    theme
-  } = props;
   const {
     card,
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   const borderStyle = "".concat((_b = (_a = card.border) == null ? void 0 : _a.width) != null ? _b : 1, "px solid var(--card-border-color)");
   return _responsive(media, props.$borderTop, value => value ? {
     "&&": {
@@ -1114,13 +1085,10 @@ function borderTop(props) {
 }
 function borderRight(props) {
   var _a, _b;
-  const {
-    theme
-  } = props;
   const {
     card,
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   const borderStyle = "".concat((_b = (_a = card.border) == null ? void 0 : _a.width) != null ? _b : 1, "px solid var(--card-border-color)");
   return _responsive(media, props.$borderRight, value => value ? {
     "&&": {
@@ -1134,13 +1102,10 @@ function borderRight(props) {
 }
 function borderBottom(props) {
   var _a, _b;
-  const {
-    theme
-  } = props;
   const {
     card,
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   const borderStyle = "".concat((_b = (_a = card.border) == null ? void 0 : _a.width) != null ? _b : 1, "px solid var(--card-border-color)");
   return _responsive(media, props.$borderBottom, value => value ? {
     "&&": {
@@ -1154,13 +1119,10 @@ function borderBottom(props) {
 }
 function borderLeft(props) {
   var _a, _b;
-  const {
-    theme
-  } = props;
   const {
     card,
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   const borderStyle = "".concat((_b = (_a = card.border) == null ? void 0 : _a.width) != null ? _b : 1, "px solid var(--card-border-color)");
   return _responsive(media, props.$borderLeft, value => value ? {
     "&&": {
@@ -1192,12 +1154,9 @@ function responsiveBoxStyle() {
   return [responsiveBoxSizingStyle, responsiveBoxHeightStyle, responsiveBoxOverflowStyle, responsiveBoxDisplayStyle];
 }
 function responsiveBoxDisplayStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$display, display => ({
     "&:not([hidden])": {
       display
@@ -1205,34 +1164,25 @@ function responsiveBoxDisplayStyle(props) {
   }));
 }
 function responsiveBoxSizingStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$sizing, sizing => ({
     boxSizing: BOX_SIZING[sizing]
   }));
 }
 function responsiveBoxHeightStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$height, height => ({
     height: BOX_HEIGHT[height]
   }));
 }
 function responsiveBoxOverflowStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$overflow, overflow => ({
     overflow
   }));
@@ -1246,12 +1196,9 @@ function responsiveFlexStyle() {
   return [BASE_STYLE$3, responsiveFlexAlignStyle, responsiveFlexGapStyle, responsiveFlexWrapStyle, responsiveFlexJustifyStyle, responsiveFlexDirectionStyle];
 }
 function responsiveFlexAlignStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$align, align => {
     return {
       alignItems: align
@@ -1259,24 +1206,18 @@ function responsiveFlexAlignStyle(props) {
   });
 }
 function responsiveFlexGapStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media,
     space
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$gap, gap => ({
     gap: gap ? rem(space[gap]) : void 0
   }));
 }
 function responsiveFlexWrapStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$wrap, wrap => {
     return {
       flexWrap: wrap
@@ -1284,12 +1225,9 @@ function responsiveFlexWrapStyle(props) {
   });
 }
 function responsiveFlexJustifyStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$justify, justify => {
     return {
       justifyContent: justify
@@ -1297,12 +1235,9 @@ function responsiveFlexJustifyStyle(props) {
   });
 }
 function responsiveFlexDirectionStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$direction, direction => {
     return {
       flexDirection: direction
@@ -1317,12 +1252,9 @@ function flexItemStyle() {
   return [BASE_STYLE$2, responsiveFlexItemStyle];
 }
 function responsiveFlexItemStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   if (!props.$flex) return EMPTY_ARRAY;
   return _responsive(media, props.$flex, flex => ({
     flex
@@ -1366,92 +1298,68 @@ function responsiveGridStyle() {
   return [GRID_CSS, responsiveGridAutoFlowStyle, responsiveGridAutoRowsStyle, responsiveGridAutoColsStyle, responsiveGridColumnsStyle, responsiveGridRowsStyle, responsiveGridGapStyle, responsiveGridGapXStyle, responsiveGridGapYStyle];
 }
 function responsiveGridAutoFlowStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$autoFlow, autoFlow => ({
     gridAutoFlow: autoFlow
   }));
 }
 function responsiveGridAutoRowsStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$autoRows, autoRows => ({
     gridAutoRows: autoRows && GRID_AUTO_ROWS[autoRows]
   }));
 }
 function responsiveGridAutoColsStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$autoCols, autoCols => ({
     gridAutoColumns: autoCols && GRID_AUTO_COLUMS[autoCols]
   }));
 }
 function responsiveGridColumnsStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$columns, columns => ({
     gridTemplateColumns: columns && "repeat(".concat(columns, ",minmax(0,1fr));")
   }));
 }
 function responsiveGridRowsStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$rows, rows => ({
     gridTemplateRows: rows && "repeat(".concat(rows, ",minmax(0,1fr));")
   }));
 }
 function responsiveGridGapStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media,
     space
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$gap, gap => ({
     gridGap: gap ? rem(space[gap]) : void 0
   }));
 }
 function responsiveGridGapXStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media,
     space
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$gapX, gapX => ({
     columnGap: gapX ? rem(space[gapX]) : void 0
   }));
 }
 function responsiveGridGapYStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media,
     space
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$gapY, gapY => ({
     rowGap: gapY ? rem(space[gapY]) : void 0
   }));
@@ -1468,12 +1376,9 @@ const GRID_ITEM_COLUMN = {
   full: "1 / -1"
 };
 function responsiveGridItemRowStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$row, row => {
     if (typeof row === "number") {
       return {
@@ -1486,34 +1391,25 @@ function responsiveGridItemRowStyle(props) {
   });
 }
 function responsiveGridItemRowStartStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$rowStart, rowStart => ({
     gridRowStart: rowStart
   }));
 }
 function responsiveGridItemRowEndStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$rowEnd, rowEnd => ({
     gridRowEnd: rowEnd
   }));
 }
 function responsiveGridItemColumnStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$column, column => {
     if (typeof column === "number") {
       return {
@@ -1526,23 +1422,17 @@ function responsiveGridItemColumnStyle(props) {
   });
 }
 function responsiveGridItemColumnStartStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$columnStart, columnStart => ({
     gridColumnStart: columnStart
   }));
 }
 function responsiveGridItemColumnEndStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$columnEnd, columnEnd => ({
     gridColumnEnd: columnEnd
   }));
@@ -1553,14 +1443,13 @@ function responsiveInputPaddingStyle(props) {
     $iconLeft,
     $iconRight,
     $padding,
-    $space,
-    theme
+    $space
   } = props;
   const {
-    fonts,
+    font,
     media,
-    space: spaceScale
-  } = theme.sanity;
+    space
+  } = theme.getTheme_v2(props.theme);
   const len = Math.max($padding.length, $space.length, $fontSize.length);
   const _padding = [];
   const _space = [];
@@ -1571,10 +1460,10 @@ function responsiveInputPaddingStyle(props) {
     _space[i] = $space[i] === void 0 ? _space[i - 1] : $space[i];
   }
   return _responsive(media, _padding, (_, i) => {
-    const size = fonts.text.sizes[_fontSize[i]] || fonts.text.sizes[2];
+    const size = font.text.sizes[_fontSize[i]] || font.text.sizes[2];
     const emSize = size.lineHeight - size.ascenderHeight - size.descenderHeight;
-    const p = spaceScale[_padding[i]];
-    const s = spaceScale[_space[i]];
+    const p = space[_padding[i]];
+    const s = space[_space[i]];
     const styles = {
       paddingTop: rem(p - size.ascenderHeight),
       paddingRight: rem(p),
@@ -1604,25 +1493,23 @@ function textInputRootStyle() {
 }
 function textInputBaseStyle(props) {
   const {
-    theme,
     $scheme,
     $tone,
     $weight
   } = props;
-  const font = theme.sanity.fonts.text;
-  const color = theme.sanity.color.input;
-  return styled.css(_b$n || (_b$n = __template$D(["\n    appearance: none;\n    background: none;\n    border: 0;\n    border-radius: 0;\n    outline: none;\n    width: 100%;\n    box-sizing: border-box;\n    font-family: ", ";\n    font-weight: ", ";\n    margin: 0;\n    position: relative;\n    z-index: 1;\n    display: block;\n\n    /* NOTE: This is a hack to disable Chrome\u2019s autofill styles */\n    &:-webkit-autofill,\n    &:-webkit-autofill:hover,\n    &:-webkit-autofill:focus,\n    &:-webkit-autofill:active {\n      -webkit-text-fill-color: var(--input-fg-color) !important;\n      transition: background-color 5000s;\n      transition-delay: 86400s /* 24h */;\n    }\n\n    /* &:is(textarea) */\n    &[data-as='textarea'] {\n      resize: none;\n    }\n\n    color: var(--input-fg-color);\n\n    &::placeholder {\n      color: var(--input-placeholder-color);\n    }\n\n    &[data-scheme='", "'][data-tone='", "'] {\n      --input-fg-color: ", ";\n      --input-placeholder-color: ", ";\n\n      /* enabled */\n      &:not(:invalid):not(:disabled):not(:read-only) {\n        --input-fg-color: ", ";\n        --input-placeholder-color: ", ";\n      }\n\n      /* disabled */\n      &:not(:invalid):disabled {\n        --input-fg-color: ", ";\n        --input-placeholder-color: ", ";\n      }\n\n      /* invalid */\n      &:invalid {\n        --input-fg-color: ", ";\n        --input-placeholder-color: ", ";\n      }\n\n      /* readOnly */\n      &:read-only {\n        --input-fg-color: ", ";\n        --input-placeholder-color: ", ";\n      }\n    }\n  "])), font.family, $weight && font.weights[$weight] || font.weights.regular, $scheme, $tone, color.default.enabled.fg, color.default.enabled.placeholder, color.default.enabled.fg, color.default.enabled.placeholder, color.default.disabled.fg, color.default.disabled.placeholder, color.invalid.enabled.fg, color.invalid.enabled.placeholder, color.default.readOnly.fg, color.default.readOnly.placeholder);
+  const {
+    color,
+    font
+  } = theme.getTheme_v2(props.theme);
+  return styled.css(_b$n || (_b$n = __template$D(["\n    appearance: none;\n    background: none;\n    border: 0;\n    border-radius: 0;\n    outline: none;\n    width: 100%;\n    box-sizing: border-box;\n    font-family: ", ";\n    font-weight: ", ";\n    margin: 0;\n    position: relative;\n    z-index: 1;\n    display: block;\n\n    /* NOTE: This is a hack to disable Chrome\u2019s autofill styles */\n    &:-webkit-autofill,\n    &:-webkit-autofill:hover,\n    &:-webkit-autofill:focus,\n    &:-webkit-autofill:active {\n      -webkit-text-fill-color: var(--input-fg-color) !important;\n      transition: background-color 5000s;\n      transition-delay: 86400s /* 24h */;\n    }\n\n    /* &:is(textarea) */\n    &[data-as='textarea'] {\n      resize: none;\n    }\n\n    color: var(--input-fg-color);\n\n    &::placeholder {\n      color: var(--input-placeholder-color);\n    }\n\n    &[data-scheme='", "'][data-tone='", "'] {\n      --input-fg-color: ", ";\n      --input-placeholder-color: ", ";\n\n      /* enabled */\n      &:not(:invalid):not(:disabled):not(:read-only) {\n        --input-fg-color: ", ";\n        --input-placeholder-color: ", ";\n      }\n\n      /* disabled */\n      &:not(:invalid):disabled {\n        --input-fg-color: ", ";\n        --input-placeholder-color: ", ";\n      }\n\n      /* invalid */\n      &:invalid {\n        --input-fg-color: ", ";\n        --input-placeholder-color: ", ";\n      }\n\n      /* readOnly */\n      &:read-only {\n        --input-fg-color: ", ";\n        --input-placeholder-color: ", ";\n      }\n    }\n  "])), font.text.family, $weight && font.text.weights[$weight] || font.text.weights.regular, $scheme, $tone, color.input.default.enabled.fg, color.input.default.enabled.placeholder, color.input.default.enabled.fg, color.input.default.enabled.placeholder, color.input.default.disabled.fg, color.input.default.disabled.placeholder, color.input.invalid.enabled.fg, color.input.invalid.enabled.placeholder, color.input.default.readOnly.fg, color.input.default.readOnly.placeholder);
 }
 function textInputFontSizeStyle(props) {
   const {
-    theme
-  } = props;
-  const {
-    fonts,
+    font,
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$fontSize, sizeIndex => {
-    const size = fonts.text.sizes[sizeIndex] || fonts.text.sizes[2];
+    const size = font.text.sizes[sizeIndex] || font.text.sizes[2];
     return {
       fontSize: rem(size.fontSize),
       lineHeight: size.lineHeight / size.fontSize
@@ -1635,35 +1522,31 @@ function textInputRepresentationStyle(props) {
     $hasSuffix,
     $scheme,
     $tone,
-    $unstableDisableFocusRing,
-    theme
+    $unstableDisableFocusRing
   } = props;
   const {
+    color,
     input
-  } = theme.sanity;
-  const {
-    focusRing
-  } = input.text;
-  const color = theme.sanity.color.input;
-  return styled.css(_c$c || (_c$c = __template$D(["\n    --input-box-shadow: none;\n\n    position: absolute;\n    top: 0;\n    left: 0;\n    right: 0;\n    bottom: 0;\n    display: block;\n    pointer-events: none;\n    z-index: 0;\n\n    background-color: var(--card-bg-color);\n    box-shadow: var(--input-box-shadow);\n\n    border-top-left-radius: ", ";\n    border-bottom-left-radius: ", ";\n    border-top-right-radius: ", ";\n    border-bottom-right-radius: ", ";\n\n    &[data-scheme='", "'][data-tone='", "'] {\n      --card-bg-color: ", ";\n      --card-fg-color: ", ";\n\n      /* enabled */\n      *:not(:disabled) + &[data-border] {\n        --input-box-shadow: ", ";\n      }\n\n      /* invalid */\n      *:not(:disabled):invalid + & {\n        --card-bg-color: ", ";\n        --card-fg-color: ", ";\n\n        &[data-border] {\n          --input-box-shadow: ", ";\n        }\n      }\n\n      /* focused */\n      *:not(:disabled):focus + & {\n        &[data-border] {\n          --input-box-shadow: ", ";\n        }\n\n        &:not([data-border]) {\n          --input-box-shadow: ", ";\n        }\n      }\n\n      /* disabled */\n      *:disabled + & {\n        --card-bg-color: ", " !important;\n        --card-fg-color: ", " !important;\n\n        &[data-border] {\n          --input-box-shadow: ", ";\n        }\n      }\n\n      /* readOnly */\n      *:read-only + & {\n        --card-bg-color: ", " !important;\n        --card-fg-color: ", " !important;\n      }\n\n      /* hovered */\n      @media (hover: hover) {\n        *:not(:disabled):not(:read-only):not(:invalid):hover + & {\n          --card-bg-color: ", ";\n          --card-fg-color: ", ";\n        }\n\n        *:not(:disabled):not(:read-only):not(:invalid):not(:focus):hover + &[data-border] {\n          --input-box-shadow: ", ";\n        }\n      }\n    }\n  "])), $hasPrefix ? 0 : void 0, $hasPrefix ? 0 : void 0, $hasSuffix ? 0 : void 0, $hasSuffix ? 0 : void 0, $scheme, $tone, color.default.enabled.bg, color.default.enabled.fg, focusRingBorderStyle({
-    color: color.default.enabled.border,
+  } = theme.getTheme_v2(props.theme);
+  return styled.css(_c$c || (_c$c = __template$D(["\n    --input-box-shadow: none;\n\n    position: absolute;\n    top: 0;\n    left: 0;\n    right: 0;\n    bottom: 0;\n    display: block;\n    pointer-events: none;\n    z-index: 0;\n\n    background-color: var(--card-bg-color);\n    box-shadow: var(--input-box-shadow);\n\n    border-top-left-radius: ", ";\n    border-bottom-left-radius: ", ";\n    border-top-right-radius: ", ";\n    border-bottom-right-radius: ", ";\n\n    &[data-scheme='", "'][data-tone='", "'] {\n      --card-bg-color: ", ";\n      --card-fg-color: ", ";\n\n      /* enabled */\n      *:not(:disabled) + &[data-border] {\n        --input-box-shadow: ", ";\n      }\n\n      /* invalid */\n      *:not(:disabled):invalid + & {\n        --card-bg-color: ", ";\n        --card-fg-color: ", ";\n\n        &[data-border] {\n          --input-box-shadow: ", ";\n        }\n      }\n\n      /* focused */\n      *:not(:disabled):focus + & {\n        &[data-border] {\n          --input-box-shadow: ", ";\n        }\n\n        &:not([data-border]) {\n          --input-box-shadow: ", ";\n        }\n      }\n\n      /* disabled */\n      *:disabled + & {\n        --card-bg-color: ", " !important;\n        --card-fg-color: ", " !important;\n\n        &[data-border] {\n          --input-box-shadow: ", ";\n        }\n      }\n\n      /* readOnly */\n      *:read-only + & {\n        --card-bg-color: ", " !important;\n        --card-fg-color: ", " !important;\n      }\n\n      /* hovered */\n      @media (hover: hover) {\n        *:not(:disabled):not(:read-only):not(:invalid):hover + & {\n          --card-bg-color: ", ";\n          --card-fg-color: ", ";\n        }\n\n        *:not(:disabled):not(:read-only):not(:invalid):not(:focus):hover + &[data-border] {\n          --input-box-shadow: ", ";\n        }\n      }\n    }\n  "])), $hasPrefix ? 0 : void 0, $hasPrefix ? 0 : void 0, $hasSuffix ? 0 : void 0, $hasSuffix ? 0 : void 0, $scheme, $tone, color.input.default.enabled.bg, color.input.default.enabled.fg, focusRingBorderStyle({
+    color: color.input.default.enabled.border,
     width: input.border.width
-  }), color.invalid.enabled.bg, color.invalid.enabled.fg, focusRingBorderStyle({
-    color: color.invalid.enabled.border,
+  }), color.input.invalid.enabled.bg, color.input.invalid.enabled.fg, focusRingBorderStyle({
+    color: color.input.invalid.enabled.border,
     width: input.border.width
   }), $unstableDisableFocusRing ? void 0 : focusRingStyle({
     border: {
-      color: color.default.enabled.border,
+      color: color.input.default.enabled.border,
       width: input.border.width
     },
-    focusRing
+    focusRing: input.text.focusRing
   }), $unstableDisableFocusRing ? void 0 : focusRingStyle({
-    focusRing
-  }), color.default.disabled.bg, color.default.disabled.fg, focusRingBorderStyle({
-    color: color.default.disabled.border,
+    focusRing: input.text.focusRing
+  }), color.input.default.disabled.bg, color.input.default.disabled.fg, focusRingBorderStyle({
+    color: color.input.default.disabled.border,
     width: input.border.width
-  }), color.default.readOnly.bg, color.default.readOnly.fg, color.default.hovered.bg, color.default.hovered.fg, focusRingBorderStyle({
-    color: color.default.hovered.border,
+  }), color.input.default.readOnly.bg, color.input.default.readOnly.fg, color.input.default.hovered.bg, color.input.default.hovered.fg, focusRingBorderStyle({
+    color: color.input.default.hovered.border,
     width: input.border.width
   }));
 }
@@ -1680,13 +1563,10 @@ function responsivePaddingStyle(props) {
   return [_getResponsiveSpace(theme, ["padding"], props.$padding), _getResponsiveSpace(theme, ["paddingLeft", "paddingRight"], props.$paddingX), _getResponsiveSpace(theme, ["paddingTop", "paddingBottom"], props.$paddingY), _getResponsiveSpace(theme, ["paddingTop"], props.$paddingTop), _getResponsiveSpace(theme, ["paddingRight"], props.$paddingRight), _getResponsiveSpace(theme, ["paddingBottom"], props.$paddingBottom), _getResponsiveSpace(theme, ["paddingLeft"], props.$paddingLeft)].filter(Boolean);
 }
 function responsiveRadiusStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media,
     radius
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$radius, value => {
     let borderRadius = 0;
     if (typeof value === "number") {
@@ -1715,15 +1595,12 @@ function shadowStyle(shadow) {
   };
 }
 function responsiveShadowStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     card,
     media,
-    shadows
-  } = theme.sanity;
-  return _responsive(media, props.$shadow, shadow => shadowStyle(shadows[shadow], card.shadow.outline));
+    shadow
+  } = theme.getTheme_v2(props.theme);
+  return _responsive(media, props.$shadow, index => shadowStyle(shadow[index], card.shadow.outline));
 }
 var __freeze$C = Object.freeze;
 var __defProp$D = Object.defineProperty;
@@ -1734,13 +1611,12 @@ var _a$C, _b$m, _c$b;
 function labelBaseStyle(props) {
   const {
     $accent,
-    $muted,
-    theme
+    $muted
   } = props;
   const {
-    fonts
-  } = theme.sanity;
-  return styled.css(_c$b || (_c$b = __template$C(["\n    text-transform: uppercase;\n\n    ", "\n\n    ", "\n\n    & code {\n      font-family: ", ";\n      border-radius: 1px;\n    }\n\n    & a {\n      text-decoration: none;\n      border-radius: 1px;\n    }\n\n    & svg {\n      /* Certain popular CSS libraries changes the defaults for SVG display */\n      /* Make sure SVGs are rendered as inline elements */\n      display: inline;\n    }\n\n    & [data-sanity-icon] {\n      vertical-align: baseline;\n    }\n  "])), $accent && styled.css(_a$C || (_a$C = __template$C(["\n      color: var(--card-accent-fg-color);\n    "]))), $muted && styled.css(_b$m || (_b$m = __template$C(["\n      color: var(--card-muted-fg-color);\n    "]))), fonts.code.family);
+    font
+  } = theme.getTheme_v2(props.theme);
+  return styled.css(_c$b || (_c$b = __template$C(["\n    text-transform: uppercase;\n\n    ", "\n\n    ", "\n\n    & code {\n      font-family: ", ";\n      border-radius: 1px;\n    }\n\n    & a {\n      text-decoration: none;\n      border-radius: 1px;\n    }\n\n    & svg {\n      /* Certain popular CSS libraries changes the defaults for SVG display */\n      /* Make sure SVGs are rendered as inline elements */\n      display: inline;\n    }\n\n    & [data-sanity-icon] {\n      vertical-align: baseline;\n    }\n  "])), $accent && styled.css(_a$C || (_a$C = __template$C(["\n      color: var(--card-accent-fg-color);\n    "]))), $muted && styled.css(_b$m || (_b$m = __template$C(["\n      color: var(--card-muted-fg-color);\n    "]))), font.code.family);
 }
 var __freeze$B = Object.freeze;
 var __defProp$C = Object.defineProperty;
@@ -1830,17 +1706,15 @@ function avatarArrowStyle() {
   };
 }
 function avatarRootStyle(props) {
-  var _a, _b, _c, _d;
   const {
-    $color,
-    theme
+    $color
   } = props;
   const {
-    focusRing
-  } = theme.sanity.avatar;
+    avatar
+  } = theme.getTheme_v2(props.theme);
   return {
-    "--avatar-bg-color": ((_b = (_a = theme.sanity.color.avatar) == null ? void 0 : _a[$color]) == null ? void 0 : _b.bg) || theme.sanity.color.spot[$color],
-    "--avatar-fg-color": ((_d = (_c = theme.sanity.color.avatar) == null ? void 0 : _c[$color]) == null ? void 0 : _d.fg) || "var(--card-bg-color)",
+    "--avatar-bg-color": "var(--card-avatar-".concat($color, "-bg-color)"),
+    "--avatar-fg-color": "var(--card-avatar-".concat($color, "-fg-color)"),
     backgroundColor: "var(--avatar-bg-color)",
     position: "relative",
     boxSizing: "border-box",
@@ -1868,7 +1742,7 @@ function avatarRootStyle(props) {
       // @ts-expect-error -- TODO wait for CSSObject types to be fixed in `styled-components` itself
       "&:focus": {
         boxShadow: focusRingStyle({
-          focusRing
+          focusRing: avatar.focusRing
         })
       },
       "&:focus:not(:focus-visible)": {
@@ -1878,13 +1752,10 @@ function avatarRootStyle(props) {
   };
 }
 function responsiveAvatarSizeStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     avatar,
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$size, size => {
     const avatarSize = avatar.sizes[size] || avatar.sizes[0];
     return {
@@ -1961,8 +1832,10 @@ const Avatar = react.forwardRef(function Avatar2(props, ref) {
   } = props;
   const as = ReactIs__default.default.isValidElementType(asProp) ? asProp : "div";
   const size = useArrayProp(sizeProp);
-  const theme = useTheme();
-  const avatarSize = theme.sanity.avatar.sizes[size[0]] || theme.sanity.avatar.sizes[0];
+  const {
+    avatar
+  } = useTheme_v2();
+  const avatarSize = avatar.sizes[size[0]] || avatar.sizes[0];
   const _sizeRem = avatarSize.size;
   const _radius = _sizeRem / 2;
   const elementId = react.useId();
@@ -2061,13 +1934,12 @@ var _a$A, _b$l, _c$a;
 function textBaseStyle(props) {
   const {
     $accent,
-    $muted,
-    theme
+    $muted
   } = props;
   const {
-    weights
-  } = theme.sanity.fonts.text;
-  return styled.css(_c$a || (_c$a = __template$A(["\n    color: var(--card-fg-color);\n\n    ", "\n\n    ", "\n\n    & code {\n      font-family: ", ";\n      border-radius: 1px;\n      background-color: var(--card-code-bg-color);\n      color: var(--card-code-fg-color);\n    }\n\n    & a {\n      text-decoration: none;\n      border-radius: 1px;\n      color: var(--card-link-color);\n      outline: none;\n\n      @media (hover: hover) {\n        &:hover {\n          text-decoration: underline;\n        }\n      }\n\n      &:focus {\n        box-shadow:\n          0 0 0 1px var(--card-bg-color),\n          0 0 0 3px var(--card-focus-ring-color);\n      }\n\n      &:focus:not(:focus-visible) {\n        box-shadow: none;\n      }\n    }\n\n    & strong {\n      font-weight: ", ";\n    }\n\n    & svg {\n      /* Certain popular CSS libraries changes the defaults for SVG display */\n      /* Make sure SVGs are rendered as inline elements */\n      display: inline;\n    }\n\n    & [data-sanity-icon] {\n      vertical-align: baseline;\n      color: var(--card-icon-color);\n    }\n  "])), $accent && styled.css(_a$A || (_a$A = __template$A(["\n      color: var(--card-accent-fg-color);\n    "]))), $muted && styled.css(_b$l || (_b$l = __template$A(["\n      color: var(--card-muted-fg-color);\n    "]))), theme.sanity.fonts.code.family, weights.bold);
+    font
+  } = theme.getTheme_v2(props.theme);
+  return styled.css(_c$a || (_c$a = __template$A(["\n    color: var(--card-fg-color);\n\n    ", "\n\n    ", "\n\n    & code {\n      font-family: ", ";\n      border-radius: 1px;\n      background-color: var(--card-code-bg-color);\n      color: var(--card-code-fg-color);\n    }\n\n    & a {\n      text-decoration: none;\n      border-radius: 1px;\n      color: var(--card-link-color);\n      outline: none;\n\n      @media (hover: hover) {\n        &:hover {\n          text-decoration: underline;\n        }\n      }\n\n      &:focus {\n        box-shadow:\n          0 0 0 1px var(--card-bg-color),\n          0 0 0 3px var(--card-focus-ring-color);\n      }\n\n      &:focus:not(:focus-visible) {\n        box-shadow: none;\n      }\n    }\n\n    & strong {\n      font-weight: ", ";\n    }\n\n    & svg {\n      /* Certain popular CSS libraries changes the defaults for SVG display */\n      /* Make sure SVGs are rendered as inline elements */\n      display: inline;\n    }\n\n    & [data-sanity-icon] {\n      vertical-align: baseline;\n      color: var(--card-icon-color);\n\n      & path {\n        vector-effect: non-scaling-stroke !important;\n      }\n    }\n  "])), $accent && styled.css(_a$A || (_a$A = __template$A(["\n      color: var(--card-accent-fg-color);\n    "]))), $muted && styled.css(_b$l || (_b$l = __template$A(["\n      color: var(--card-muted-fg-color);\n    "]))), font.code.family, font.text.weights.bold);
 }
 var __freeze$z = Object.freeze;
 var __defProp$A = Object.defineProperty;
@@ -2115,13 +1987,10 @@ var __template$y = (cooked, raw) => __freeze$y(__defProp$z(cooked, "raw", {
 }));
 var _a$y;
 function _responsiveAvatarCounterSizeStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     avatar,
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$size, size => {
     const avatarSize = avatar.sizes[size];
     if (!avatarSize) return EMPTY_RECORD;
@@ -2134,9 +2003,9 @@ function _responsiveAvatarCounterSizeStyle(props) {
 }
 function _avatarCounterBaseStyle(props) {
   const {
-    theme
-  } = props;
-  return styled.css(_a$y || (_a$y = __template$y(["\n    align-items: center;\n    justify-content: center;\n    box-sizing: border-box;\n    user-select: none;\n    color: inherit;\n    color: var(--card-fg-color);\n    background: var(--card-bg-color);\n    box-shadow:\n      0 0 0 1px var(--card-bg-color),\n      inset 0 0 0 1px var(--card-hairline-hard-color);\n    padding: 0 ", ";\n\n    &:not([hidden]) {\n      display: flex;\n    }\n  "])), rem(theme.sanity.space[2]));
+    space
+  } = theme.getTheme_v2(props.theme);
+  return styled.css(_a$y || (_a$y = __template$y(["\n    align-items: center;\n    justify-content: center;\n    box-sizing: border-box;\n    user-select: none;\n    color: inherit;\n    color: var(--card-fg-color);\n    background: var(--card-bg-color);\n    box-shadow:\n      0 0 0 1px var(--card-bg-color),\n      inset 0 0 0 1px var(--card-hairline-hard-color);\n    padding: 0 ", ";\n\n    &:not([hidden]) {\n      display: flex;\n    }\n  "])), rem(space[2]));
 }
 const Root$A = styled__default.default.div(_responsiveAvatarCounterSizeStyle, _avatarCounterBaseStyle);
 const AvatarCounter = react.forwardRef(function AvatarCounter2(props, ref) {
@@ -2173,13 +2042,10 @@ function avatarStackStyle() {
   return BASE_STYLES;
 }
 function responsiveAvatarStackSizeStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     avatar,
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$size, size => {
     const avatarSize = avatar.sizes[size];
     if (!avatarSize) return EMPTY_RECORD;
@@ -2292,19 +2158,17 @@ const Box = react.forwardRef(function Box2(props, ref) {
   });
 });
 function badgeStyle(props) {
-  var _a;
   const {
-    $tone,
-    theme
+    $tone
   } = props;
-  const color = ((_a = theme.sanity.color.badge) == null ? void 0 : _a[$tone]) || theme.sanity.color.muted[$tone].enabled;
   return {
-    "--card-bg-color": color.bg,
-    "--card-fg-color": color.fg,
+    "--card-bg-color": "var(--card-badge-".concat($tone, "-bg-color)"),
+    "--card-fg-color": "var(--card-badge-".concat($tone, "-fg-color)"),
     backgroundColor: "var(--card-bg-color)",
     cursor: "default",
     "&:not([hidden])": {
-      display: "inline-block"
+      display: "inline-block",
+      verticalAlign: "top"
     }
   };
 }
@@ -2316,7 +2180,7 @@ const Badge = react.forwardRef(function Badge2(props, ref) {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     mode: _deprecated_mode,
     padding = 1,
-    radius = 2,
+    radius = "full",
     tone = "default",
     ...restProps
   } = props;
@@ -2377,33 +2241,73 @@ const Spinner = react.forwardRef(function Spinner2(props, ref) {
     children: /* @__PURE__ */jsxRuntime.jsx(icons.SpinnerIcon, {})
   });
 });
-function _colorVarsStyle(base, color) {
+function _cardColorStyle(base, color) {
   let checkered = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var _a, _b, _c, _d, _e, _f, _g, _h;
   return {
-    // Base
-    // @todo: rename to "--base-"?
+    // from base
+    "--card-focus-ring-color": base.focusRing,
     "--card-shadow-outline-color": base.shadow.outline,
     "--card-shadow-umbra-color": base.shadow.umbra,
     "--card-shadow-penumbra-color": base.shadow.penumbra,
     "--card-shadow-ambient-color": base.shadow.ambient,
-    "--card-focus-ring-color": base.focusRing,
-    "--card-icon-color": color.icon,
-    // Card
+    // from state
+    "--card-accent-fg-color": color.accent.fg,
+    "--card-avatar-gray-bg-color": color.avatar.gray.bg,
+    "--card-avatar-gray-fg-color": color.avatar.gray.fg,
+    "--card-avatar-blue-bg-color": color.avatar.blue.bg,
+    "--card-avatar-blue-fg-color": color.avatar.blue.fg,
+    "--card-avatar-purple-bg-color": color.avatar.purple.bg,
+    "--card-avatar-purple-fg-color": color.avatar.purple.fg,
+    "--card-avatar-magenta-bg-color": color.avatar.magenta.bg,
+    "--card-avatar-magenta-fg-color": color.avatar.magenta.fg,
+    "--card-avatar-red-bg-color": color.avatar.red.bg,
+    "--card-avatar-red-fg-color": color.avatar.red.fg,
+    "--card-avatar-orange-bg-color": color.avatar.orange.bg,
+    "--card-avatar-orange-fg-color": color.avatar.orange.fg,
+    "--card-avatar-yellow-bg-color": color.avatar.yellow.bg,
+    "--card-avatar-yellow-fg-color": color.avatar.yellow.fg,
+    "--card-avatar-green-bg-color": color.avatar.green.bg,
+    "--card-avatar-green-fg-color": color.avatar.green.fg,
+    "--card-avatar-cyan-bg-color": color.avatar.cyan.bg,
+    "--card-avatar-cyan-fg-color": color.avatar.cyan.fg,
     "--card-bg-color": color.bg,
-    "--card-bg2-color": color.bg2,
-    "--card-bg-image": checkered ? "repeating-conic-gradient(".concat(color.bg, " 0% 25%, ").concat(color.bg2 || color.bg, " 0% 50%)") : void 0,
-    "--card-fg-color": color.fg,
+    "--card-bg-image": checkered ? "repeating-conic-gradient(".concat(color.bg, " 0% 25%, ").concat(color.muted.bg, " 0% 50%)") : void 0,
     "--card-border-color": color.border,
-    "--card-muted-fg-color": (_a = color.muted) == null ? void 0 : _a.fg,
-    "--card-accent-fg-color": (_b = color.accent) == null ? void 0 : _b.fg,
-    "--card-link-fg-color": (_c = color.link) == null ? void 0 : _c.fg,
-    "--card-code-bg-color": (_d = color.code) == null ? void 0 : _d.bg,
-    "--card-code-fg-color": (_e = color.code) == null ? void 0 : _e.fg,
-    "--card-skeleton-color-from": (_f = color.skeleton) == null ? void 0 : _f.from,
-    "--card-skeleton-color-to": (_g = color.skeleton) == null ? void 0 : _g.to,
-    // @todo: deprecate
-    "--card-link-color": (_h = color.link) == null ? void 0 : _h.fg,
+    "--card-badge-default-bg-color": color.badge.default.bg,
+    "--card-badge-default-dot-color": color.badge.default.dot,
+    "--card-badge-default-fg-color": color.badge.default.fg,
+    "--card-badge-default-icon-color": color.badge.default.icon,
+    "--card-badge-primary-bg-color": color.badge.primary.bg,
+    "--card-badge-primary-dot-color": color.badge.primary.dot,
+    "--card-badge-primary-fg-color": color.badge.primary.fg,
+    "--card-badge-primary-icon-color": color.badge.primary.icon,
+    "--card-badge-positive-bg-color": color.badge.positive.bg,
+    "--card-badge-positive-dot-color": color.badge.positive.dot,
+    "--card-badge-positive-fg-color": color.badge.positive.fg,
+    "--card-badge-positive-icon-color": color.badge.positive.icon,
+    "--card-badge-caution-bg-color": color.badge.caution.bg,
+    "--card-badge-caution-dot-color": color.badge.caution.dot,
+    "--card-badge-caution-fg-color": color.badge.caution.fg,
+    "--card-badge-caution-icon-color": color.badge.caution.icon,
+    "--card-badge-critical-bg-color": color.badge.critical.bg,
+    "--card-badge-critical-dot-color": color.badge.critical.dot,
+    "--card-badge-critical-fg-color": color.badge.critical.fg,
+    "--card-badge-critical-icon-color": color.badge.critical.icon,
+    "--card-code-bg-color": color.code.bg,
+    "--card-code-fg-color": color.code.fg,
+    "--card-fg-color": color.fg,
+    "--card-icon-color": color.icon,
+    "--card-kbd-bg-color": color.kbd.bg,
+    "--card-kbd-border-color": color.kbd.border,
+    "--card-kbd-fg-color": color.kbd.fg,
+    "--card-link-fg-color": color.link.fg,
+    "--card-muted-bg-color": color.muted.bg,
+    "--card-muted-fg-color": color.muted.fg,
+    "--card-skeleton-color-from": color.skeleton.from,
+    "--card-skeleton-color-to": color.skeleton.to,
+    // deprecated variables (kept for legacy)
+    "--card-bg2-color": color.muted.bg,
+    "--card-link-color": color.link.fg,
     "--card-hairline-soft-color": color.border,
     "--card-hairline-hard-color": color.border
   };
@@ -2414,15 +2318,14 @@ var __template$v = (cooked, raw) => __freeze$v(__defProp$w(cooked, "raw", {
   value: __freeze$v(raw || cooked.slice())
 }));
 var _a$v, _b$j;
-function buttonBaseStyles(_ref2) {
-  let {
-    $width,
-    theme
-  } = _ref2;
+function buttonBaseStyles(props) {
   const {
-    styles
-  } = theme.sanity;
-  return styled.css(_b$j || (_b$j = __template$v(["\n    ", ";\n\n    -webkit-font-smoothing: inherit;\n    appearance: none;\n    display: inline-flex;\n    align-items: center;\n    font: inherit;\n    border: 0;\n    outline: none;\n    user-select: none;\n    text-decoration: none;\n    border: 0;\n    box-sizing: border-box;\n    padding: 0;\n    margin: 0;\n    white-space: nowrap;\n    text-align: left;\n    position: relative;\n    vertical-align: top;\n\n    ", "\n\n    & > span {\n      display: block;\n      flex: 1;\n      min-width: 0;\n      border-radius: inherit;\n    }\n\n    &::-moz-focus-inner {\n      border: 0;\n      padding: 0;\n    }\n  "])), styles == null ? void 0 : styles.button, $width === "fill" && styled.css(_a$v || (_a$v = __template$v(["\n      width: -moz-available;\n      width: -webkit-fill-available;\n      width: stretch;\n    "]))));
+    $width
+  } = props;
+  const {
+    style
+  } = theme.getTheme_v2(props.theme);
+  return styled.css(_b$j || (_b$j = __template$v(["\n    ", ";\n\n    -webkit-font-smoothing: inherit;\n    appearance: none;\n    display: inline-flex;\n    align-items: center;\n    font: inherit;\n    border: 0;\n    outline: none;\n    user-select: none;\n    text-decoration: none;\n    border: 0;\n    box-sizing: border-box;\n    padding: 0;\n    margin: 0;\n    white-space: nowrap;\n    text-align: left;\n    position: relative;\n    vertical-align: top;\n\n    ", "\n\n    & > span {\n      display: block;\n      flex: 1;\n      min-width: 0;\n      border-radius: inherit;\n    }\n\n    &::-moz-focus-inner {\n      border: 0;\n      padding: 0;\n    }\n  "])), style == null ? void 0 : style.button, $width === "fill" && styled.css(_a$v || (_a$v = __template$v(["\n      width: -moz-available;\n      width: -webkit-fill-available;\n      width: stretch;\n    "]))));
 }
 function combineBoxShadow() {
   for (var _len = arguments.length, boxShadows = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -2431,49 +2334,51 @@ function combineBoxShadow() {
   return boxShadows.filter(Boolean).join(",");
 }
 function buttonColorStyles(props) {
-  var _a2, _b2;
+  var _a2;
   const {
-    $mode,
-    theme
+    $mode
   } = props;
-  const buttonTheme = theme.sanity.button;
+  const {
+    button,
+    color: baseColor,
+    style
+  } = theme.getTheme_v2(props.theme);
   const shadow = props.$mode === "ghost";
-  const base = theme.sanity.color.base;
-  const mode = theme.sanity.color.button[$mode] || theme.sanity.color.button.default;
+  const mode = baseColor.button[$mode] || baseColor.button.default;
   const color = mode[props.$tone] || mode.default;
   const border = {
-    width: buttonTheme.border.width,
+    width: button.border.width,
     color: "var(--card-border-color)"
   };
   const defaultBoxShadow = void 0;
-  return [_colorVarsStyle(base, color.enabled), {
+  return [_cardColorStyle(baseColor, color.enabled), {
     backgroundColor: "var(--card-bg-color)",
     color: "var(--card-fg-color)",
     boxShadow: focusRingBorderStyle(border),
-    '&:disabled, &[data-disabled="true"]': _colorVarsStyle(base, color.disabled),
+    '&:disabled, &[data-disabled="true"]': _cardColorStyle(baseColor, color.disabled),
     "&:not([data-disabled='true'])": {
       boxShadow: combineBoxShadow(focusRingBorderStyle(border), shadow ? defaultBoxShadow : void 0),
       "&:focus": {
         boxShadow: focusRingStyle({
-          base,
+          base: baseColor,
           border: {
             width: 2,
-            color: base.bg
+            color: baseColor.bg
           },
-          focusRing: buttonTheme.focusRing
+          focusRing: button.focusRing
         })
       },
       "&:focus:not(:focus-visible)": {
         boxShadow: combineBoxShadow(focusRingBorderStyle(border), shadow ? defaultBoxShadow : void 0)
       },
       "@media (hover: hover)": {
-        "&:hover": _colorVarsStyle(base, color.hovered),
-        "&:active": _colorVarsStyle(base, color.pressed),
-        "&[data-hovered]": _colorVarsStyle(base, color.hovered)
+        "&:hover": _cardColorStyle(baseColor, color.hovered),
+        "&:active": _cardColorStyle(baseColor, color.pressed),
+        "&[data-hovered]": _cardColorStyle(baseColor, color.hovered)
       },
-      "&[data-selected]": _colorVarsStyle(base, color.pressed)
+      "&[data-selected]": _cardColorStyle(baseColor, color.pressed)
     }
-  }, (_b2 = (_a2 = theme.sanity.styles) == null ? void 0 : _a2.button) == null ? void 0 : _b2.root].filter(Boolean);
+  }, (_a2 = style == null ? void 0 : style.button) == null ? void 0 : _a2.root].filter(Boolean);
 }
 var __freeze$u = Object.freeze;
 var __defProp$v = Object.defineProperty;
@@ -2511,6 +2416,9 @@ const Button = react.forwardRef(function Button2(props, ref) {
     width,
     ...restProps
   } = props;
+  const {
+    button
+  } = useTheme_v2();
   const justify = useArrayProp(justifyProp);
   const padding = useArrayProp(paddingProp);
   const paddingX = useArrayProp(paddingXProp);
@@ -2521,7 +2429,6 @@ const Button = react.forwardRef(function Button2(props, ref) {
   const paddingRight = useArrayProp(paddingRightProp);
   const radius = useArrayProp(radiusProp);
   const space = useArrayProp(spaceProp);
-  const theme = useTheme();
   const boxProps = react.useMemo(() => ({
     // flex: 1,
     padding,
@@ -2563,7 +2470,7 @@ const Button = react.forwardRef(function Button2(props, ref) {
             align: textAlign,
             size: fontSize,
             textOverflow: "ellipsis",
-            weight: theme.sanity.button.textWeight,
+            weight: button.textWeight,
             children: text
           })
         }), iconRight && /* @__PURE__ */jsxRuntime.jsxs(Text, {
@@ -2589,40 +2496,37 @@ function cardStyle(props) {
 }
 function cardBaseStyle(props) {
   const {
-    $checkered,
-    theme
+    $checkered
   } = props;
-  const space = theme.sanity.space;
+  const {
+    space
+  } = theme.getTheme_v2(props.theme);
   return styled.css(_b$i || (_b$i = __template$t(["\n    ", "\n\n    &[data-as='button'] {\n      -webkit-font-smoothing: inherit;\n      appearance: none;\n      outline: none;\n      font: inherit;\n      text-align: inherit;\n      border: 0;\n      width: -moz-available;\n      width: -webkit-fill-available;\n      width: stretch;\n    }\n\n    /* &:is(a) */\n    &[data-as='a'] {\n      outline: none;\n      text-decoration: none;\n    }\n\n    /* &:is(pre) */\n    &[data-as='pre'] {\n      font: inherit;\n    }\n  "])), $checkered && styled.css(_a$t || (_a$t = __template$t(["\n      background-size: ", "px ", "px;\n      background-position: 50% 50%;\n      background-image: var(--card-bg-image);\n    "])), space[3], space[3]));
 }
 function cardColorStyle(props) {
-  var _a2, _b2;
+  var _a2;
   const {
     $checkered,
-    $focusRing,
-    theme
+    $focusRing
   } = props;
   const {
-    focusRing
-  } = theme.sanity.card;
-  const {
-    base,
     card,
-    dark
-  } = theme.sanity.color;
+    color,
+    style
+  } = theme.getTheme_v2(props.theme);
   const border = {
-    width: 0,
+    width: card.border.width,
     color: "var(--card-border-color)"
   };
-  return styled.css(_c$9 || (_c$9 = __template$t(["\n    color-scheme: ", ";\n\n    ", "\n\n    background-color: var(--card-bg-color);\n    color: var(--card-fg-color);\n\n    /* &:is(button) */\n    &[data-as='button'] {\n      --card-focus-ring-box-shadow: none;\n\n      cursor: default;\n      box-shadow: var(--card-focus-ring-box-shadow);\n\n      &:disabled {\n        ", "\n      }\n\n      &:not(:disabled) {\n        &[data-pressed] {\n          ", "\n        }\n\n        &[data-selected] {\n          ", "\n        }\n\n        @media (hover: hover) {\n          &:not([data-pressed]):not([data-selected]) {\n            &[data-hovered],\n            &:hover {\n              ", "\n            }\n\n            &:active {\n              ", "\n            }\n          }\n        }\n\n        &:focus {\n          --card-focus-ring-box-shadow: ", ";\n        }\n\n        &:focus:not(:focus-visible) {\n          --card-focus-ring-box-shadow: ", ";\n        }\n      }\n    }\n\n    /* &:is(a) */\n    &[data-as='a'] {\n      cursor: pointer;\n      box-shadow: var(--card-focus-ring-box-shadow);\n\n      &[data-disabled] {\n        ", "\n      }\n\n      &:not([data-disabled]) {\n        &[data-pressed] {\n          ", "\n        }\n\n        &[data-selected] {\n          ", "\n        }\n\n        @media (hover: hover) {\n          &:not([data-pressed]):not([data-selected]) {\n            &[data-hovered],\n            &:hover {\n              ", "\n            }\n\n            &:active {\n              ", "\n            }\n          }\n        }\n\n        &:focus {\n          --card-focus-ring-box-shadow: ", ";\n        }\n\n        &:focus:not(:focus-visible) {\n          --card-focus-ring-box-shadow: ", ";\n        }\n      }\n    }\n\n    ", "\n  "])), dark ? "dark" : "light", _colorVarsStyle(base, card.enabled, $checkered), _colorVarsStyle(base, card.disabled, $checkered), _colorVarsStyle(base, card.pressed, $checkered), _colorVarsStyle(base, card.selected, $checkered), _colorVarsStyle(base, card.hovered, $checkered), _colorVarsStyle(base, card.pressed, $checkered), $focusRing ? focusRingStyle({
-    base,
+  return styled.css(_c$9 || (_c$9 = __template$t(["\n    color-scheme: ", ";\n\n    ", "\n\n    background-color: var(--card-bg-color);\n    color: var(--card-fg-color);\n\n    /* &:is(button) */\n    &[data-as='button'] {\n      --card-focus-ring-box-shadow: none;\n\n      cursor: default;\n      box-shadow: var(--card-focus-ring-box-shadow);\n\n      &:disabled {\n        ", "\n      }\n\n      &:not(:disabled) {\n        &[data-pressed] {\n          ", "\n        }\n\n        &[data-selected] {\n          ", "\n        }\n\n        @media (hover: hover) {\n          &:not([data-pressed]):not([data-selected]) {\n            &[data-hovered],\n            &:hover {\n              ", "\n            }\n\n            &:active {\n              ", "\n            }\n          }\n        }\n\n        &:focus {\n          --card-focus-ring-box-shadow: ", ";\n        }\n\n        &:focus:not(:focus-visible) {\n          --card-focus-ring-box-shadow: ", ";\n        }\n      }\n    }\n\n    /* &:is(a) */\n    &[data-as='a'] {\n      cursor: pointer;\n      box-shadow: var(--card-focus-ring-box-shadow);\n\n      &[data-disabled] {\n        ", "\n      }\n\n      &:not([data-disabled]) {\n        &[data-pressed] {\n          ", "\n        }\n\n        &[data-selected] {\n          ", "\n        }\n\n        @media (hover: hover) {\n          &:not([data-pressed]):not([data-selected]) {\n            &[data-hovered],\n            &:hover {\n              ", "\n            }\n\n            &:active {\n              ", "\n            }\n          }\n        }\n\n        &:focus {\n          --card-focus-ring-box-shadow: ", ";\n        }\n\n        &:focus:not(:focus-visible) {\n          --card-focus-ring-box-shadow: ", ";\n        }\n      }\n    }\n\n    ", "\n  "])), color._dark ? "dark" : "light", _cardColorStyle(color, color, $checkered), _cardColorStyle(color, color.selectable.default.disabled, $checkered), _cardColorStyle(color, color.selectable.default.pressed, $checkered), _cardColorStyle(color, color.selectable.default.selected, $checkered), _cardColorStyle(color, color.selectable.default.hovered, $checkered), _cardColorStyle(color, color.selectable.default.pressed, $checkered), $focusRing ? focusRingStyle({
+    base: color,
     border,
-    focusRing
-  }) : void 0, $focusRing ? focusRingBorderStyle(border) : void 0, _colorVarsStyle(base, card.disabled, $checkered), _colorVarsStyle(base, card.pressed, $checkered), _colorVarsStyle(base, card.selected, $checkered), _colorVarsStyle(base, card.hovered, $checkered), _colorVarsStyle(base, card.pressed, $checkered), $focusRing ? focusRingStyle({
-    base,
+    focusRing: card.focusRing
+  }) : void 0, $focusRing ? focusRingBorderStyle(border) : void 0, _cardColorStyle(color, color.selectable.default.disabled, $checkered), _cardColorStyle(color, color.selectable.default.pressed, $checkered), _cardColorStyle(color, color.selectable.default.selected, $checkered), _cardColorStyle(color, color.selectable.default.hovered, $checkered), _cardColorStyle(color, color.selectable.default.pressed, $checkered), $focusRing ? focusRingStyle({
+    base: color,
     border,
-    focusRing
-  }) : void 0, $focusRing ? focusRingBorderStyle(border) : void 0, (_b2 = (_a2 = theme.sanity.styles) == null ? void 0 : _a2.card) == null ? void 0 : _b2.root);
+    focusRing: card.focusRing
+  }) : void 0, $focusRing ? focusRingBorderStyle(border) : void 0, (_a2 = style == null ? void 0 : style.card) == null ? void 0 : _a2.root);
 }
 const Root$t = styled__default.default(Box)(responsiveBorderStyle, responsiveRadiusStyle, responsiveShadowStyle, cardStyle);
 const Card = react.forwardRef(function Card2(props, ref) {
@@ -2685,48 +2589,45 @@ function checkboxBaseStyles() {
 }
 function inputElementStyles(props) {
   const {
-    theme
-  } = props;
-  const color = theme.sanity.color.input;
-  const {
+    color,
     input,
     radius
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   const {
     focusRing
   } = input.checkbox;
   return styled.css(_b$h || (_b$h = __template$s(["\n    position: absolute;\n    top: 0;\n    left: 0;\n    width: 100%;\n    height: 100%;\n    outline: none;\n    opacity: 0;\n    z-index: 1;\n    padding: 0;\n    margin: 0;\n\n    & + span {\n      position: relative;\n      display: block;\n      height: ", ";\n      width: ", ";\n      box-sizing: border-box;\n      box-shadow: ", ";\n      border-radius: ", ";\n      line-height: 1;\n      background-color: ", ";\n\n      & > svg {\n        display: block;\n        position: absolute;\n        opacity: 0;\n        height: 100%;\n        width: 100%;\n\n        & > path {\n          vector-effect: non-scaling-stroke;\n          stroke-width: 1.5px !important;\n        }\n      }\n    }\n\n    &:checked + span {\n      background: ", ";\n      box-shadow: ", ";\n      color: ", ";\n    }\n\n    /* focus */\n    &:not(:disabled):focus:focus-visible + span {\n      box-shadow: ", ";\n    }\n\n    /* focus when checked - uses a different offset */\n    &:not(:disabled):focus:focus-visible&:checked + span {\n      box-shadow: ", ";\n    }\n\n    &[data-error] + span {\n      background-color: ", ";\n      box-shadow: ", ";\n      color: ", ";\n    }\n    &[data-error]&:checked + span {\n      background-color: ", ";\n      color: ", ";\n    }\n    &[data-error]&:checked&:not(:disabled):focus:focus-visible + span {\n      box-shadow: ", ";\n    }\n\n    &:disabled + span {\n      background-color: ", ";\n      box-shadow: ", ";\n      color: ", ";\n    }\n    &:disabled&:checked + span {\n      background-color: ", ";\n    }\n\n    &[data-read-only] + span {\n      background-color: ", ";\n      box-shadow: ", ";\n      color: ", ";\n    }\n\n    &[data-read-only]&:checked + span {\n      background-color: ", ";\n    }\n\n    &:checked + span > svg:first-child {\n      opacity: 1;\n    }\n    &:indeterminate + span > svg:last-child {\n      opacity: 1;\n    }\n  "])), rem(input.checkbox.size), rem(input.checkbox.size), focusRingBorderStyle({
-    color: color.default.enabled.border,
+    color: color.input.default.enabled.border,
     width: input.border.width
-  }), rem(radius[2]), color.default.enabled.bg, color.default.enabled.fg, focusRingBorderStyle({
-    color: color.default.enabled.fg,
+  }), rem(radius[2]), color.input.default.enabled.bg, color.input.default.enabled.fg, focusRingBorderStyle({
+    color: color.input.default.enabled.fg,
     width: input.border.width
-  }), color.default.enabled.bg, focusRingStyle({
+  }), color.input.default.enabled.bg, focusRingStyle({
     focusRing
   }), focusRingStyle({
     focusRing: {
       width: 1,
       offset: 1
     }
-  }), color.invalid.enabled.border, focusRingBorderStyle({
+  }), color.input.invalid.enabled.border, focusRingBorderStyle({
     width: input.border.width,
-    color: color.invalid.enabled.bg2
-  }), color.default.disabled.fg, color.invalid.enabled.bg2, color.default.enabled.bg, focusRingStyle({
+    color: color.input.invalid.enabled.muted.bg
+  }), color.input.default.disabled.fg, color.input.invalid.enabled.muted.bg, color.input.default.enabled.bg, focusRingStyle({
     border: {
       width: input.border.width,
-      color: color.invalid.readOnly.bg2
+      color: color.input.invalid.readOnly.muted.bg
     },
     focusRing: {
       width: 1,
       offset: 1
     }
-  }), color.default.disabled.bg, focusRingBorderStyle({
+  }), color.input.default.disabled.bg, focusRingBorderStyle({
     width: input.border.width,
-    color: color.default.disabled.border
-  }), color.default.disabled.fg, color.default.disabled.bg2, color.default.readOnly.bg, focusRingBorderStyle({
+    color: color.input.default.disabled.border
+  }), color.input.default.disabled.fg, color.input.default.disabled.muted.bg, color.input.default.readOnly.bg, focusRingBorderStyle({
     width: input.border.width,
-    color: color.default.readOnly.border
-  }), color.default.readOnly.fg, color.default.readOnly.bg2);
+    color: color.input.default.readOnly.border
+  }), color.input.default.readOnly.fg, color.input.default.readOnly.muted.bg);
 }
 const Root$s = styled__default.default.div(checkboxBaseStyles);
 const Input$5 = styled__default.default.input(inputElementStyles);
@@ -2772,11 +2673,15 @@ var __template$r = (cooked, raw) => __freeze$r(__defProp$s(cooked, "raw", {
   value: __freeze$r(raw || cooked.slice())
 }));
 var _a$r;
-function codeSyntaxHighlightingStyle(_ref3) {
+function codeSyntaxHighlightingStyle(_ref2) {
   let {
-    theme
-  } = _ref3;
-  const color = theme.sanity.color.syntax;
+    theme: theme$1
+  } = _ref2;
+  const {
+    color: {
+      syntax: color
+    }
+  } = theme.getTheme_v2(theme$1);
   return {
     "&.atrule": {
       color: color.atrule
@@ -2925,13 +2830,10 @@ function containerBaseStyle() {
   return BASE_STYLE$1;
 }
 function responsiveContainerWidthStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     container,
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$width, val => ({
     maxWidth: val === "auto" ? "none" : rem(container[val])
   }));
@@ -2992,10 +2894,12 @@ var _a$q, _b$g, _c$8;
 function headingBaseStyle(props) {
   const {
     $accent,
-    $muted,
-    theme
+    $muted
   } = props;
-  return styled.css(_c$8 || (_c$8 = __template$q(["\n    ", "\n\n    ", "\n\n    & code {\n      font-family: ", ";\n      border-radius: 1px;\n    }\n\n    & a {\n      text-decoration: none;\n      border-radius: 1px;\n      color: var(--card-link-color);\n      outline: none;\n\n      @media (hover: hover) {\n        &:hover {\n          text-decoration: underline;\n        }\n      }\n\n      &:focus {\n        box-shadow:\n          0 0 0 1px var(--card-bg-color),\n          0 0 0 3px var(--card-focus-ring-color);\n      }\n\n      &:focus:not(:focus-visible) {\n        box-shadow: none;\n      }\n    }\n\n    & svg {\n      /* Certain popular CSS libraries changes the defaults for SVG display */\n      /* Make sure SVGs are rendered as inline elements */\n      display: inline;\n    }\n\n    & [data-sanity-icon] {\n      vertical-align: baseline;\n    }\n  "])), $accent && styled.css(_a$q || (_a$q = __template$q(["\n      color: var(--card-accent-fg-color);\n    "]))), $muted && styled.css(_b$g || (_b$g = __template$q(["\n      color: var(--card-muted-fg-color);\n    "]))), theme.sanity.fonts.code.family);
+  const {
+    font
+  } = theme.getTheme_v2(props.theme);
+  return styled.css(_c$8 || (_c$8 = __template$q(["\n    ", "\n\n    ", "\n\n    & code {\n      font-family: ", ";\n      border-radius: 1px;\n    }\n\n    & a {\n      text-decoration: none;\n      border-radius: 1px;\n      color: var(--card-link-color);\n      outline: none;\n\n      @media (hover: hover) {\n        &:hover {\n          text-decoration: underline;\n        }\n      }\n\n      &:focus {\n        box-shadow:\n          0 0 0 1px var(--card-bg-color),\n          0 0 0 3px var(--card-focus-ring-color);\n      }\n\n      &:focus:not(:focus-visible) {\n        box-shadow: none;\n      }\n    }\n\n    & svg {\n      /* Certain popular CSS libraries changes the defaults for SVG display */\n      /* Make sure SVGs are rendered as inline elements */\n      display: inline;\n    }\n\n    & [data-sanity-icon] {\n      vertical-align: baseline;\n    }\n  "])), $accent && styled.css(_a$q || (_a$q = __template$q(["\n      color: var(--card-accent-fg-color);\n    "]))), $muted && styled.css(_b$g || (_b$g = __template$q(["\n      color: var(--card-muted-fg-color);\n    "]))), font.code.family);
 }
 var __freeze$p = Object.freeze;
 var __defProp$q = Object.defineProperty;
@@ -3050,14 +2954,15 @@ function inlineBaseStyle() {
 }
 function inlineSpaceStyle(props) {
   const {
-    theme
-  } = props;
-  return _responsive(theme.sanity.media, props.$space, spaceIndex => {
-    const space = rem(theme.sanity.space[spaceIndex]);
+    media,
+    space
+  } = theme.getTheme_v2(props.theme);
+  return _responsive(media, props.$space, spaceIndex => {
+    const _space = rem(spaceIndex === 0.5 ? space[1] / 2 : space[spaceIndex]);
     return {
-      margin: "-".concat(space, " 0 0 -").concat(space),
+      margin: "-".concat(_space, " 0 0 -").concat(_space),
       "& > div": {
-        padding: "".concat(space, " 0 0 ").concat(space)
+        padding: "".concat(_space, " 0 0 ").concat(_space)
       }
     };
   });
@@ -3089,13 +2994,13 @@ var __template$o = (cooked, raw) => __freeze$o(__defProp$p(cooked, "raw", {
 }));
 var _a$o;
 function kbdStyle() {
-  return styled.css(_a$o || (_a$o = __template$o(["\n    background: var(--card-bg2-color);\n    font: inherit;\n\n    &:not([hidden]) {\n      display: inline-block;\n    }\n  "])));
+  return styled.css(_a$o || (_a$o = __template$o(["\n    --card-bg-color: var(--card-kbd-bg-color);\n    --card-border-color: var(--card-kbd-border-color);\n    --card-fg-color: var(--card-kbd-fg-color);\n\n    box-shadow: inset 0 0 0 1px var(--card-border-color);\n    background: var(--card-bg-color);\n    font: inherit;\n\n    &:not([hidden]) {\n      display: inline-block;\n    }\n  "])));
 }
 const Root$m = styled__default.default.kbd(responsiveRadiusStyle, kbdStyle);
 const KBD = react.forwardRef(function KBD2(props, ref) {
   const {
     children,
-    fontSize = 1,
+    fontSize = 0,
     padding = 1,
     radius = 2,
     ...restProps
@@ -3110,9 +3015,8 @@ const KBD = react.forwardRef(function KBD2(props, ref) {
       padding,
       children: /* @__PURE__ */jsxRuntime.jsx(Text, {
         as: "span",
-        muted: true,
         size: fontSize,
-        weight: "medium",
+        weight: "semibold",
         children
       })
     })
@@ -3178,10 +3082,10 @@ var __template$n = (cooked, raw) => __freeze$n(__defProp$o(cooked, "raw", {
   value: __freeze$n(raw || cooked.slice())
 }));
 var _a$n, _b$f, _c$7;
-const Root$l = styled__default.default.div(_ref4 => {
+const Root$l = styled__default.default.div(_ref3 => {
   let {
     $w: w
-  } = _ref4;
+  } = _ref3;
   return styled.css(_a$n || (_a$n = __template$n(["\n    position: absolute;\n    width: ", "px;\n    height: ", "px;\n\n    :empty + & {\n      display: none;\n    }\n\n    & > svg {\n      display: block;\n      line-height: 0;\n      transform-origin: ", "px ", "px;\n    }\n\n    [data-placement^='top'] > & {\n      bottom: -", "px;\n\n      & > svg {\n        transform: rotate(0);\n      }\n    }\n\n    [data-placement^='right'] > & {\n      left: -", "px;\n\n      & > svg {\n        transform: rotate(90deg);\n      }\n    }\n\n    [data-placement^='left'] > & {\n      right: -", "px;\n\n      & > svg {\n        transform: rotate(-90deg);\n      }\n    }\n\n    [data-placement^='bottom'] > & {\n      top: -", "px;\n\n      & > svg {\n        transform: rotate(180deg);\n      }\n    }\n  "])), w, w, w / 2, w / 2, w, w, w, w);
 });
 const StrokePath = styled__default.default.path(_b$f || (_b$f = __template$n(["\n  stroke: var(--card-shadow-outline-color);\n"])));
@@ -3193,8 +3097,10 @@ const Arrow = react.forwardRef(function Arrow2(props, ref) {
     radius = 0,
     ...restProps
   } = props;
-  const theme = useTheme();
-  const strokeWidth = theme.sanity.card.shadow.outline;
+  const {
+    card
+  } = useTheme_v2();
+  const strokeWidth = card.shadow.outline;
   const center = w / 2;
   const points = [{
     x: 0,
@@ -3263,6 +3169,9 @@ function BoundaryElementProvider(props) {
     children
   });
 }
+function isRecord(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
 const DEFAULT_VALUE = {
   version: 0,
   element: null
@@ -3295,10 +3204,10 @@ function findMinBreakpoints(media, width) {
   return ret;
 }
 const ElementQuery = react.forwardRef(function ElementQuery2(props, ref) {
-  const theme = useTheme();
+  const theme = useTheme_v2();
   const {
     children,
-    media = theme.sanity.media,
+    media = theme.media,
     ...restProps
   } = props;
   const forwardedRef = useForwardedRef(ref);
@@ -3740,7 +3649,7 @@ const VirtualList = react.forwardRef(function VirtualList2(props, ref) {
   } = props;
   const {
     space
-  } = useTheme().sanity;
+  } = useTheme_v2();
   const forwardedRef = useForwardedRef(ref);
   const wrapperRef = react.useRef(null);
   const [scrollTop, setScrollTop] = react.useState(0);
@@ -3933,13 +3842,13 @@ function size(options) {
 }
 function calcCurrentWidth(params) {
   const {
+    container,
     mediaIndex,
-    theme,
     width
   } = params;
   const w = width[mediaIndex];
   const currentWidth = w === void 0 ? width[width.length - 1] : w;
-  return typeof currentWidth === "number" ? theme.sanity.container[currentWidth] : void 0;
+  return typeof currentWidth === "number" ? container[currentWidth] : void 0;
 }
 function calcMaxWidth(params) {
   const {
@@ -4034,8 +3943,11 @@ const PopoverCard = react.memo(react.forwardRef(function PopoverCard2(props, ref
 }));
 PopoverCard.displayName = "PopoverCard";
 const Popover = react.memo(react.forwardRef(function Popover2(props, ref) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-  const theme = useTheme();
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const {
+    container,
+    layer
+  } = useTheme_v2();
   const boundaryElementContext = useBoundaryElement();
   const {
     __unstable_margins: margins = DEFAULT_POPOVER_MARGINS,
@@ -4063,11 +3975,11 @@ const Popover = react.memo(react.forwardRef(function Popover2(props, ref) {
     shadow: shadowProp = 3,
     tone = "inherit",
     width: widthProp = "auto",
-    zOffset: zOffsetProp = (_e = theme.sanity.layer) == null ? void 0 : _e.popover.zOffset,
+    zOffset: zOffsetProp = layer.popover.zOffset,
     updateRef,
     ...restProps
   } = props;
-  const boundarySize = (_f = useElementSize(boundaryElement)) == null ? void 0 : _f.border;
+  const boundarySize = (_e = useElementSize(boundaryElement)) == null ? void 0 : _e.border;
   const padding = useArrayProp(paddingProp);
   const radius = useArrayProp(radiusProp);
   const shadow = useArrayProp(shadowProp);
@@ -4079,8 +3991,8 @@ const Popover = react.memo(react.forwardRef(function Popover2(props, ref) {
   const mediaIndex = useMediaIndex();
   const boundaryWidth = constrainSize || preventOverflow ? boundarySize == null ? void 0 : boundarySize.width : void 0;
   const width = calcCurrentWidth({
+    container,
     mediaIndex,
-    theme,
     width: widthArrayProp
   });
   const widthRef = react.useRef(width);
@@ -4126,13 +4038,13 @@ const Popover = react.memo(react.forwardRef(function Popover2(props, ref) {
     }));
     if (constrainSize || matchReferenceWidth) {
       ret.push(size({
-        apply(_ref5) {
+        apply(_ref4) {
           let {
             availableWidth,
             availableHeight,
             elements,
             referenceWidth
-          } = _ref5;
+          } = _ref4;
           referenceWidthRef.current = referenceWidth;
           const _currentWidth = widthRef.current;
           const _maxWidth = maxWidthRef.current;
@@ -4186,9 +4098,9 @@ const Popover = react.memo(react.forwardRef(function Popover2(props, ref) {
     placement: placementProp,
     whileElementsMounted: reactDom$1.autoUpdate
   });
-  const referenceHidden = (_g = middlewareData.hide) == null ? void 0 : _g.referenceHidden;
-  const arrowX = (_h = middlewareData.arrow) == null ? void 0 : _h.x;
-  const arrowY = (_i = middlewareData.arrow) == null ? void 0 : _i.y;
+  const referenceHidden = (_f = middlewareData.hide) == null ? void 0 : _f.referenceHidden;
+  const arrowX = (_g = middlewareData.arrow) == null ? void 0 : _g.x;
+  const arrowY = (_h = middlewareData.arrow) == null ? void 0 : _h.y;
   const setArrow = react.useCallback(arrowEl => {
     arrowRef.current = arrowEl;
   }, []);
@@ -4272,32 +4184,26 @@ function radioBaseStyle() {
 }
 function inputElementStyle(props) {
   const {
-    theme
-  } = props;
-  const {
+    color,
     input
-  } = theme.sanity;
-  const {
-    focusRing
-  } = input.radio;
-  const color = theme.sanity.color.input;
+  } = theme.getTheme_v2(props.theme);
   const dist = (input.radio.size - input.radio.markSize) / 2;
-  return styled.css(_b$d || (_b$d = __template$k(["\n    appearance: none;\n    position: absolute;\n    top: 0;\n    left: 0;\n    opacity: 0;\n    height: 100%;\n    width: 100%;\n    outline: none;\n    z-index: 1;\n    padding: 0;\n    margin: 0;\n    border-radius: ", ";\n    border: none;\n\n    /* enabled */\n    & + span {\n      display: block;\n      position: relative;\n      height: ", ";\n      width: ", ";\n      border-radius: ", ";\n      background: ", ";\n      box-shadow: ", ";\n\n      &::after {\n        content: '';\n        position: absolute;\n        top: ", ";\n        left: ", ";\n        height: ", ";\n        width: ", ";\n        border-radius: ", ";\n        background: ", ";\n        opacity: 0;\n      }\n    }\n\n    /* focused */\n    &:not(:disabled):focus + span {\n      box-shadow: ", ";\n    }\n\n    &:not(:disabled):focus:not(:focus-visible) + span {\n      box-shadow: ", ";\n    }\n\n    &:checked + span::after {\n      opacity: 1;\n    }\n\n    /* customValidity */\n    &[data-error] + span {\n      background-color: ", ";\n      box-shadow: ", ";\n      &::after {\n        background: ", ";\n      }\n    }\n\n    /* read only */\n    &[data-read-only] + span {\n      box-shadow: 0 0 0 1px ", ";\n      background: ", ";\n\n      &::after {\n        background: ", ";\n      }\n    }\n\n    /* disabled */\n    &:not([data-read-only]):disabled + span {\n      box-shadow: 0 0 0 1px ", ";\n      background: ", ";\n\n      &::after {\n        background: ", ";\n      }\n    }\n  "])), rem(input.radio.size / 2), rem(input.radio.size), rem(input.radio.size), rem(input.radio.size / 2), color.default.enabled.bg, focusRingBorderStyle({
-    color: color.default.enabled.border,
+  return styled.css(_b$d || (_b$d = __template$k(["\n    appearance: none;\n    position: absolute;\n    top: 0;\n    left: 0;\n    opacity: 0;\n    height: 100%;\n    width: 100%;\n    outline: none;\n    z-index: 1;\n    padding: 0;\n    margin: 0;\n    border-radius: ", ";\n    border: none;\n\n    /* enabled */\n    & + span {\n      display: block;\n      position: relative;\n      height: ", ";\n      width: ", ";\n      border-radius: ", ";\n      background: ", ";\n      box-shadow: ", ";\n\n      &::after {\n        content: '';\n        position: absolute;\n        top: ", ";\n        left: ", ";\n        height: ", ";\n        width: ", ";\n        border-radius: ", ";\n        background: ", ";\n        opacity: 0;\n      }\n    }\n\n    /* focused */\n    &:not(:disabled):focus + span {\n      box-shadow: ", ";\n    }\n\n    &:not(:disabled):focus:not(:focus-visible) + span {\n      box-shadow: ", ";\n    }\n\n    &:checked + span::after {\n      opacity: 1;\n    }\n\n    /* customValidity */\n    &[data-error] + span {\n      background-color: ", ";\n      box-shadow: ", ";\n      &::after {\n        background: ", ";\n      }\n    }\n\n    /* read only */\n    &[data-read-only] + span {\n      box-shadow: 0 0 0 1px ", ";\n      background: ", ";\n\n      &::after {\n        background: ", ";\n      }\n    }\n\n    /* disabled */\n    &:not([data-read-only]):disabled + span {\n      box-shadow: 0 0 0 1px ", ";\n      background: ", ";\n\n      &::after {\n        background: ", ";\n      }\n    }\n  "])), rem(input.radio.size / 2), rem(input.radio.size), rem(input.radio.size), rem(input.radio.size / 2), color.input.default.enabled.bg, focusRingBorderStyle({
+    color: color.input.default.enabled.border,
     width: input.border.width
-  }), rem(dist), rem(dist), rem(input.radio.markSize), rem(input.radio.markSize), rem(input.radio.markSize / 2), color.default.enabled.fg, focusRingStyle({
+  }), rem(dist), rem(dist), rem(input.radio.markSize), rem(input.radio.markSize), rem(input.radio.markSize / 2), color.input.default.enabled.fg, focusRingStyle({
     border: {
       width: input.border.width,
-      color: color.default.enabled.border
+      color: color.input.default.enabled.border
     },
-    focusRing
+    focusRing: input.radio.focusRing
   }), focusRingBorderStyle({
-    color: color.default.enabled.border,
+    color: color.input.default.enabled.border,
     width: input.border.width
-  }), color.invalid.enabled.border, focusRingBorderStyle({
+  }), color.input.invalid.enabled.border, focusRingBorderStyle({
     width: input.border.width,
-    color: color.invalid.enabled.bg2
-  }), color.invalid.enabled.bg2, color.default.readOnly.border, color.default.readOnly.bg, color.default.readOnly.border, color.default.disabled.border, color.default.disabled.bg, color.default.disabled.border);
+    color: color.input.invalid.enabled.muted.bg
+  }), color.input.invalid.enabled.muted.bg, color.input.default.readOnly.border, color.input.default.readOnly.bg, color.input.default.readOnly.border, color.input.default.disabled.border, color.input.default.disabled.bg, color.input.default.disabled.border);
 }
 const Root$g = styled__default.default.div(radioBaseStyle);
 const Input$4 = styled__default.default.input(inputElementStyle);
@@ -4338,39 +4244,32 @@ function rootStyle() {
 }
 function inputBaseStyle(props) {
   const {
-    theme
-  } = props;
-  const font = theme.sanity.fonts.text;
-  return styled.css(_b$c || (_b$c = __template$j(["\n    -webkit-font-smoothing: antialiased;\n    appearance: none;\n    border: 0;\n    font-family: ", ";\n    color: inherit;\n    width: 100%;\n    outline: none;\n    margin: 0;\n\n    &:disabled {\n      opacity: 1;\n    }\n  "])), font.family);
+    font
+  } = theme.getTheme_v2(props.theme);
+  return styled.css(_b$c || (_b$c = __template$j(["\n    -webkit-font-smoothing: antialiased;\n    appearance: none;\n    border: 0;\n    font-family: ", ";\n    color: inherit;\n    width: 100%;\n    outline: none;\n    margin: 0;\n\n    &:disabled {\n      opacity: 1;\n    }\n  "])), font.text.family);
 }
 function inputColorStyle(props) {
   const {
-    theme
-  } = props;
-  const {
+    color,
     input
-  } = theme.sanity;
-  const {
-    focusRing
-  } = input.select;
-  const color = theme.sanity.color.input;
-  return styled.css(_c$6 || (_c$6 = __template$j(["\n    /* enabled */\n    background-color: ", ";\n    color: ", ";\n    box-shadow: ", ";\n\n    /* hovered */\n    @media (hover: hover) {\n      &:not(:disabled):hover {\n        background-color: ", ";\n        color: ", ";\n        box-shadow: ", ";\n      }\n    }\n\n    /* focused */\n    &:not(:disabled):focus {\n      box-shadow: ", ";\n    }\n\n    /* read-only */\n    &[data-read-only] {\n      background-color: ", ";\n      color: ", ";\n      box-shadow: ", ";\n    }\n\n    /* disabled */\n    &:not([data-read-only]):disabled {\n      background-color: ", ";\n      color: ", ";\n      box-shadow: ", ";\n    }\n  "])), color.default.enabled.bg, color.default.enabled.fg, focusRingBorderStyle({
-    color: color.default.enabled.border,
+  } = theme.getTheme_v2(props.theme);
+  return styled.css(_c$6 || (_c$6 = __template$j(["\n    /* enabled */\n    background-color: ", ";\n    color: ", ";\n    box-shadow: ", ";\n\n    /* hovered */\n    @media (hover: hover) {\n      &:not(:disabled):hover {\n        background-color: ", ";\n        color: ", ";\n        box-shadow: ", ";\n      }\n    }\n\n    /* focused */\n    &:not(:disabled):focus {\n      box-shadow: ", ";\n    }\n\n    /* read-only */\n    &[data-read-only] {\n      background-color: ", ";\n      color: ", ";\n      box-shadow: ", ";\n    }\n\n    /* disabled */\n    &:not([data-read-only]):disabled {\n      background-color: ", ";\n      color: ", ";\n      box-shadow: ", ";\n    }\n  "])), color.input.default.enabled.bg, color.input.default.enabled.fg, focusRingBorderStyle({
+    color: color.input.default.enabled.border,
     width: input.border.width
-  }), color.default.hovered.bg, color.default.hovered.fg, focusRingBorderStyle({
-    color: color.default.hovered.border,
+  }), color.input.default.hovered.bg, color.input.default.hovered.fg, focusRingBorderStyle({
+    color: color.input.default.hovered.border,
     width: input.border.width
   }), focusRingStyle({
     border: {
       width: input.border.width,
-      color: color.default.enabled.border
+      color: color.input.default.enabled.border
     },
-    focusRing
-  }), color.default.readOnly.bg, color.default.readOnly.fg, focusRingBorderStyle({
-    color: color.default.readOnly.border,
+    focusRing: input.select.focusRing
+  }), color.input.default.readOnly.bg, color.input.default.readOnly.fg, focusRingBorderStyle({
+    color: color.input.default.readOnly.border,
     width: input.border.width
-  }), color.default.disabled.bg, color.default.disabled.fg, focusRingBorderStyle({
-    color: color.default.disabled.border,
+  }), color.input.default.disabled.bg, color.input.default.disabled.fg, focusRingBorderStyle({
+    color: color.input.default.disabled.border,
     width: input.border.width
   }));
 }
@@ -4382,23 +4281,22 @@ function textSize(size) {
 }
 function inputTextSizeStyle(props) {
   const {
-    theme,
     $fontSize
   } = props;
   const {
-    sizes
-  } = theme.sanity.fonts.text;
-  return _responsive(theme.sanity.media, $fontSize, sizeIndex => textSize(sizes[sizeIndex] || sizes[2]));
+    font,
+    media
+  } = theme.getTheme_v2(props.theme);
+  return _responsive(media, $fontSize, sizeIndex => textSize(font.text.sizes[sizeIndex] || font.text.sizes[2]));
 }
 function inputStyle() {
   return [responsiveRadiusStyle, inputBaseStyle, inputColorStyle, inputTextSizeStyle, responsiveInputPaddingIconRightStyle];
 }
 function iconBoxStyle(props) {
   const {
-    theme
-  } = props;
-  const color = theme.sanity.color.input;
-  return styled.css(_d$5 || (_d$5 = __template$j(["\n    pointer-events: none;\n    position: absolute;\n    top: 0;\n    right: 0;\n\n    /* enabled */\n    --card-fg-color: ", ";\n\n    /* hover */\n    @media (hover: hover) {\n      select:not(disabled):not(:read-only):hover + && {\n        --card-fg-color: ", ";\n      }\n    }\n\n    /* disabled */\n    select:disabled + && {\n      --card-fg-color: ", ";\n    }\n\n    /* read-only */\n    select[data-read-only] + && {\n      --card-fg-color: ", ";\n    }\n  "])), color.default.enabled.fg, color.default.hovered.fg, color.default.disabled.fg, color.default.readOnly.fg);
+    color
+  } = theme.getTheme_v2(props.theme);
+  return styled.css(_d$5 || (_d$5 = __template$j(["\n    pointer-events: none;\n    position: absolute;\n    top: 0;\n    right: 0;\n\n    /* enabled */\n    --card-fg-color: ", ";\n\n    /* hover */\n    @media (hover: hover) {\n      select:not(disabled):not(:read-only):hover + && {\n        --card-fg-color: ", ";\n      }\n    }\n\n    /* disabled */\n    select:disabled + && {\n      --card-fg-color: ", ";\n    }\n\n    /* read-only */\n    select[data-read-only] + && {\n      --card-fg-color: ", ";\n    }\n  "])), color.input.default.enabled.fg, color.input.default.hovered.fg, color.input.default.disabled.fg, color.input.default.readOnly.fg);
 }
 const selectStyle = {
   root: rootStyle,
@@ -4458,13 +4356,10 @@ function stackBaseStyle() {
   return BASE_STYLE;
 }
 function responsiveStackSpaceStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media,
     space
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$space, spaceIndex => ({
     gridGap: rem(space[spaceIndex])
   }));
@@ -4499,36 +4394,26 @@ function switchInputStyles() {
 }
 function switchRepresentationStyles(props) {
   const {
-    theme
-  } = props;
-  const {
+    color,
     input
-  } = theme.sanity;
-  const {
-    focusRing
-  } = input.switch;
-  const color = theme.sanity.color.input;
-  return styled.css(_c$5 || (_c$5 = __template$i(["\n    --switch-bg-color: ", ";\n    --switch-fg-color: ", ";\n    --switch-box-shadow: none;\n\n    &:not([hidden]) {\n      display: block;\n    }\n    position: relative;\n    width: ", ";\n    height: ", ";\n    border-radius: ", ";\n\n    /* Make sure it\u2019s not possible to interact with the wrapper element */\n    pointer-events: none;\n\n    &:after {\n      content: '';\n      display: block;\n      position: absolute;\n      top: 0;\n      left: 0;\n      right: 0;\n      bottom: 0;\n      z-index: 1;\n      box-shadow: var(--switch-box-shadow);\n      border-radius: inherit;\n    }\n\n    /* Focus styles */\n    input:focus + && {\n      --switch-box-shadow: ", ";\n    }\n\n    input:focus:not(:focus-visible) + && {\n      --switch-box-shadow: none;\n    }\n\n    input:checked + && {\n      --switch-bg-color: ", ";\n      --switch-fg-color: ", ";\n    }\n\n    @media (hover: hover) {\n      input:not(:disabled):hover + && {\n        --switch-bg-color: ", ";\n        --switch-fg-color: ", ";\n      }\n\n      input:not(:disabled):checked:hover + && {\n        --switch-bg-color: ", ";\n        --switch-fg-color: ", ";\n      }\n    }\n\n    input:not([data-read-only]):disabled + && {\n      --switch-bg-color: ", ";\n      --switch-fg-color: ", ";\n    }\n\n    input[data-read-only]:disabled + && {\n      --switch-bg-color: ", ";\n      --switch-fg-color: ", ";\n    }\n  "])), color.default.enabled.border, color.default.enabled.bg, rem(input.switch.width), rem(input.switch.height), rem(input.switch.height / 2), focusRingStyle({
-    focusRing
-  }), color.default.enabled.fg, color.default.enabled.bg, color.default.hovered.border, color.default.hovered.bg, color.default.enabled.fg, color.default.enabled.bg, color.default.disabled.border, color.default.disabled.bg, color.default.readOnly.border, color.default.readOnly.bg);
+  } = theme.getTheme_v2(props.theme);
+  return styled.css(_c$5 || (_c$5 = __template$i(["\n    --switch-bg-color: ", ";\n    --switch-fg-color: ", ";\n    --switch-box-shadow: none;\n\n    &:not([hidden]) {\n      display: block;\n    }\n    position: relative;\n    width: ", ";\n    height: ", ";\n    border-radius: ", ";\n\n    /* Make sure it\u2019s not possible to interact with the wrapper element */\n    pointer-events: none;\n\n    &:after {\n      content: '';\n      display: block;\n      position: absolute;\n      top: 0;\n      left: 0;\n      right: 0;\n      bottom: 0;\n      z-index: 1;\n      box-shadow: var(--switch-box-shadow);\n      border-radius: inherit;\n    }\n\n    /* Focus styles */\n    input:focus + && {\n      --switch-box-shadow: ", ";\n    }\n\n    input:focus:not(:focus-visible) + && {\n      --switch-box-shadow: none;\n    }\n\n    input:checked + && {\n      --switch-bg-color: ", ";\n      --switch-fg-color: ", ";\n    }\n\n    @media (hover: hover) {\n      input:not(:disabled):hover + && {\n        --switch-bg-color: ", ";\n        --switch-fg-color: ", ";\n      }\n\n      input:not(:disabled):checked:hover + && {\n        --switch-bg-color: ", ";\n        --switch-fg-color: ", ";\n      }\n    }\n\n    input:not([data-read-only]):disabled + && {\n      --switch-bg-color: ", ";\n      --switch-fg-color: ", ";\n    }\n\n    input[data-read-only]:disabled + && {\n      --switch-bg-color: ", ";\n      --switch-fg-color: ", ";\n    }\n  "])), color.input.default.enabled.border, color.input.default.enabled.bg, rem(input.switch.width), rem(input.switch.height), rem(input.switch.height / 2), focusRingStyle({
+    focusRing: input.switch.focusRing
+  }), color.input.default.enabled.fg, color.input.default.enabled.bg, color.input.default.hovered.border, color.input.default.hovered.bg, color.input.default.enabled.fg, color.input.default.enabled.bg, color.input.default.disabled.border, color.input.default.disabled.bg, color.input.default.readOnly.border, color.input.default.readOnly.bg);
 }
 function switchTrackStyles(props) {
-  const {
-    theme
-  } = props;
   const {
     input
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return styled.css(_d$4 || (_d$4 = __template$i(["\n    &:not([hidden]) {\n      display: block;\n    }\n    background-color: var(--switch-bg-color);\n    position: absolute;\n    left: 0;\n    top: 0;\n    width: ", ";\n    height: ", ";\n    border-radius: ", ";\n  "])), rem(input.switch.width), rem(input.switch.height), rem(input.switch.height / 2));
 }
 function switchThumbStyles(props) {
   const {
-    $indeterminate,
-    theme
+    $indeterminate
   } = props;
   const {
     input
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   const trackWidth = input.switch.width;
   const trackHeight = input.switch.height;
   const trackPadding = input.switch.padding;
@@ -4822,12 +4707,12 @@ function useDelayedState(initialState) {
   }, []);
   return [state, onStateChange];
 }
-function ConditionalWrapper(_ref6) {
+function ConditionalWrapper(_ref5) {
   let {
     children,
     condition,
     wrapper
-  } = _ref6;
+  } = _ref5;
   if (!condition) {
     return children;
   }
@@ -4888,16 +4773,18 @@ var __template$f = (cooked, raw) => __freeze$f(__defProp$f(cooked, "raw", {
   value: __freeze$f(raw || cooked.slice())
 }));
 var _a$f;
-const Root$a = styled__default.default(Layer)(_a$f || (_a$f = __template$f(["\n  pointer-events: none;\n  max-width: ", "px;\n"])), _ref7 => {
+const Root$a = styled__default.default(Layer)(_a$f || (_a$f = __template$f(["\n  pointer-events: none;\n  max-width: ", "px;\n"])), _ref6 => {
   let {
     $maxWidth
-  } = _ref7;
+  } = _ref6;
   return $maxWidth;
 });
 const Tooltip = react.forwardRef(function Tooltip2(props, ref) {
-  var _a2, _b, _c, _d, _e, _f;
+  var _a2, _b, _c, _d, _e;
   const boundaryElementContext = useBoundaryElement();
-  const theme = useTheme();
+  const {
+    layer
+  } = useTheme_v2();
   const {
     arrow: arrowProp = false,
     boundaryElement = boundaryElementContext == null ? void 0 : boundaryElementContext.element,
@@ -4911,7 +4798,7 @@ const Tooltip = react.forwardRef(function Tooltip2(props, ref) {
     radius = 2,
     scheme,
     shadow = 2,
-    zOffset = (_c = theme.sanity.layer) == null ? void 0 : _c.tooltip.zOffset,
+    zOffset = layer.tooltip.zOffset,
     delay,
     animate = false,
     ...restProps
@@ -4922,7 +4809,7 @@ const Tooltip = react.forwardRef(function Tooltip2(props, ref) {
   const arrowRef = react.useRef(null);
   const rootBoundary = "viewport";
   const portal = usePortal();
-  const portalElement = typeof portalProp === "string" ? ((_d = portal.elements) == null ? void 0 : _d[portalProp]) || null : portal.element;
+  const portalElement = typeof portalProp === "string" ? ((_c = portal.elements) == null ? void 0 : _c[portalProp]) || null : portal.element;
   const tooltipWidth = react.useMemo(() => {
     const availableWidths = [...(boundaryElement ? [boundaryElement.offsetWidth] : []), (portalElement == null ? void 0 : portalElement.offsetWidth) || document.body.offsetWidth];
     return Math.min(...availableWidths) - DEFAULT_TOOLTIP_PADDING * 2;
@@ -4962,8 +4849,8 @@ const Tooltip = react.forwardRef(function Tooltip2(props, ref) {
     placement: placementProp,
     whileElementsMounted: reactDom$1.autoUpdate
   });
-  const arrowX = (_e = middlewareData.arrow) == null ? void 0 : _e.x;
-  const arrowY = (_f = middlewareData.arrow) == null ? void 0 : _f.y;
+  const arrowX = (_d = middlewareData.arrow) == null ? void 0 : _d.x;
+  const arrowY = (_e = middlewareData.arrow) == null ? void 0 : _e.y;
   const arrowStyle = react.useMemo(() => ({
     left: arrowX !== null ? arrowX : void 0,
     top: arrowY !== null ? arrowY : void 0,
@@ -5307,10 +5194,10 @@ const InnerAutocomplete = react.forwardRef(function InnerAutocomplete2(props, re
     query,
     value
   } = state;
-  const defaultRenderOption = react.useCallback(_ref8 => {
+  const defaultRenderOption = react.useCallback(_ref7 => {
     let {
       value: value2
-    } = _ref8;
+    } = _ref7;
     return /* @__PURE__ */jsxRuntime.jsx(Card, {
       "data-as": "button",
       padding: paddingProp,
@@ -5769,11 +5656,13 @@ var __template$c = (cooked, raw) => __freeze$c(__defProp$c(cooked, "raw", {
   value: __freeze$c(raw || cooked.slice())
 }));
 var _a$c, _b$7;
-function dialogStyle(_ref9) {
+function dialogStyle(_ref8) {
   let {
-    theme
-  } = _ref9;
-  const color = theme.sanity.color.base;
+    theme: theme$1
+  } = _ref8;
+  const {
+    color
+  } = theme.getTheme_v2(theme$1);
   return {
     "&:not([hidden])": {
       display: "flex"
@@ -5785,16 +5674,13 @@ function dialogStyle(_ref9) {
     alignItems: "center",
     justifyContent: "center",
     outline: "none",
-    background: color.shadow.umbra
+    background: color.backdrop
   };
 }
 function responsiveDialogPositionStyle(props) {
-  const {
-    theme
-  } = props;
   const {
     media
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return _responsive(media, props.$position, position => ({
     "&&": {
       position
@@ -5946,14 +5832,16 @@ const DialogCard = react.forwardRef(function DialogCard2(props, ref) {
   });
 });
 const Dialog = react.forwardRef(function Dialog2(props, ref) {
-  var _a2, _b2;
+  var _a2;
   const dialog = useDialog();
-  const theme = useTheme();
+  const {
+    layer
+  } = useTheme_v2();
   const {
     __unstable_autoFocus: autoFocus = true,
     __unstable_hideCloseButton: hideCloseButton = false,
-    cardRadius: cardRadiusProp = 3,
-    cardShadow = 4,
+    cardRadius: cardRadiusProp = 4,
+    cardShadow = 3,
     children,
     contentRef,
     footer,
@@ -5968,12 +5856,12 @@ const Dialog = react.forwardRef(function Dialog2(props, ref) {
     position: positionProp = dialog.position || "fixed",
     scheme,
     width: widthProp = 0,
-    zOffset: zOffsetProp = dialog.zOffset || ((_a2 = theme.sanity.layer) == null ? void 0 : _a2.dialog.zOffset),
+    zOffset: zOffsetProp = dialog.zOffset || layer.dialog.zOffset,
     animate = false,
     ...restProps
   } = props;
   const portal = usePortal();
-  const portalElement = portalProp ? ((_b2 = portal.elements) == null ? void 0 : _b2[portalProp]) || null : portal.element;
+  const portalElement = portalProp ? ((_a2 = portal.elements) == null ? void 0 : _a2[portalProp]) || null : portal.element;
   const boundaryElement = useBoundaryElement().element;
   const cardRadius = useArrayProp(cardRadiusProp);
   const padding = useArrayProp(paddingProp);
@@ -6084,7 +5972,7 @@ var __template$a = (cooked, raw) => __freeze$a(__defProp$a(cooked, "raw", {
   value: __freeze$a(raw || cooked.slice())
 }));
 var _a$a, _b$5;
-const Root$6 = styled__default.default.kbd(_a$a || (_a$a = __template$a(["\n  &:not([hidden]) {\n    display: block;\n  }\n  font: inherit;\n"])));
+const Root$6 = styled__default.default.kbd(_a$a || (_a$a = __template$a(["\n  font: inherit;\n  padding: 1px;\n\n  &:not([hidden]) {\n    display: block;\n  }\n"])));
 const Key = styled__default.default(KBD)(_b$5 || (_b$5 = __template$a(["\n  &:not([hidden]) {\n    display: block;\n  }\n"])));
 const Hotkeys = react.forwardRef(function Hotkeys2(props, ref) {
   const {
@@ -6092,7 +5980,7 @@ const Hotkeys = react.forwardRef(function Hotkeys2(props, ref) {
     keys,
     padding,
     radius,
-    space: spaceProp = 1,
+    space: spaceProp = 0.5,
     ...restProps
   } = props;
   const space = useArrayProp(spaceProp);
@@ -6562,18 +6450,16 @@ function selectableBaseStyle() {
   return styled.css(_a$7 || (_a$7 = __template$7(["\n    background-color: inherit;\n    color: inherit;\n\n    &[data-as='button'] {\n      -webkit-font-smoothing: inherit;\n      appearance: none;\n      outline: none;\n      font: inherit;\n      text-align: inherit;\n      border: 0;\n      width: -moz-available;\n      width: -webkit-fill-available;\n      width: stretch;\n    }\n\n    /* &:is(a) */\n    &[data-as='a'] {\n      text-decoration: none;\n    }\n  "])));
 }
 function selectableColorStyle(props) {
-  var _a2, _b2;
+  var _a2;
   const {
-    $tone,
-    theme
+    $tone
   } = props;
   const {
-    base,
-    muted,
-    selectable
-  } = theme.sanity.color;
-  const tone = selectable ? selectable[$tone] || selectable.default : muted[$tone] || muted.default;
-  return styled.css(_b$4 || (_b$4 = __template$7(["\n    ", "\n\n    background-color: var(--card-bg-color);\n    color: var(--card-fg-color);\n    outline: none;\n\n    /* &:is(button) */\n    &[data-as='button'] {\n      &:disabled {\n        ", "\n      }\n\n      &:not(:disabled) {\n        &[aria-pressed='true'] {\n          ", "\n        }\n\n        &[data-selected],\n        &[aria-selected='true'] > & {\n          ", "\n        }\n\n        @media (hover: hover) {\n          &:not([data-selected]) {\n            &[data-hovered],\n            &:hover {\n              ", "\n            }\n\n            &:active {\n              ", "\n            }\n          }\n        }\n      }\n    }\n\n    /* &:is(a) */\n    &[data-as='a'] {\n      &[data-disabled] {\n        ", "\n      }\n\n      &:not([data-disabled]) {\n        &[data-pressed] {\n          ", "\n        }\n\n        &[data-selected] {\n          ", "\n        }\n\n        @media (hover: hover) {\n          &:not([data-selected]) {\n            &[data-hovered],\n            &:hover {\n              ", "\n            }\n            &:active {\n              ", "\n            }\n          }\n        }\n      }\n    }\n\n    ", "\n  "])), _colorVarsStyle(base, tone.enabled), _colorVarsStyle(base, tone.disabled), _colorVarsStyle(base, tone.pressed), _colorVarsStyle(base, tone.selected), _colorVarsStyle(base, tone.hovered), _colorVarsStyle(base, tone.pressed), _colorVarsStyle(base, tone.disabled), _colorVarsStyle(base, tone.pressed), _colorVarsStyle(base, tone.selected), _colorVarsStyle(base, tone.hovered), _colorVarsStyle(base, tone.pressed), (_b2 = (_a2 = theme.sanity.styles) == null ? void 0 : _a2.card) == null ? void 0 : _b2.root);
+    color,
+    style
+  } = theme.getTheme_v2(props.theme);
+  const tone = color.selectable[$tone];
+  return styled.css(_b$4 || (_b$4 = __template$7(["\n    ", "\n\n    background-color: var(--card-bg-color);\n    color: var(--card-fg-color);\n    outline: none;\n\n    /* &:is(button) */\n    &[data-as='button'] {\n      &:disabled {\n        ", "\n      }\n\n      &:not(:disabled) {\n        &[aria-pressed='true'] {\n          ", "\n        }\n\n        &[data-selected],\n        &[aria-selected='true'] > & {\n          ", "\n        }\n\n        @media (hover: hover) {\n          &:not([data-selected]) {\n            &[data-hovered],\n            &:hover {\n              ", "\n            }\n\n            &:active {\n              ", "\n            }\n          }\n        }\n      }\n    }\n\n    /* &:is(a) */\n    &[data-as='a'] {\n      &[data-disabled] {\n        ", "\n      }\n\n      &:not([data-disabled]) {\n        &[data-pressed] {\n          ", "\n        }\n\n        &[data-selected] {\n          ", "\n        }\n\n        @media (hover: hover) {\n          &:not([data-selected]) {\n            &[data-hovered],\n            &:hover {\n              ", "\n            }\n            &:active {\n              ", "\n            }\n          }\n        }\n      }\n    }\n\n    ", "\n  "])), _cardColorStyle(color, tone.enabled), _cardColorStyle(color, tone.disabled), _cardColorStyle(color, tone.pressed), _cardColorStyle(color, tone.selected), _cardColorStyle(color, tone.hovered), _cardColorStyle(color, tone.pressed), _cardColorStyle(color, tone.disabled), _cardColorStyle(color, tone.pressed), _cardColorStyle(color, tone.selected), _cardColorStyle(color, tone.hovered), _cardColorStyle(color, tone.pressed), (_a2 = style == null ? void 0 : style.card) == null ? void 0 : _a2.root);
 }
 const Selectable = styled__default.default(Box)(responsiveRadiusStyle, selectableBaseStyle, selectableColorStyle);
 function useMenu() {
@@ -6776,6 +6662,7 @@ const MenuItem = react.forwardRef(function MenuItem2(props, forwardedRef) {
     paddingBottom,
     paddingLeft
   }), [padding, paddingX, paddingY, paddingTop, paddingRight, paddingBottom, paddingLeft]);
+  const hotkeysFontSize = useArrayProp(fontSize).map(s => s - 1);
   const setRef = react.useCallback(el => {
     ref.current = el;
     setRootElement(el);
@@ -6817,7 +6704,7 @@ const MenuItem = react.forwardRef(function MenuItem2(props, forwardedRef) {
           children: text
         })
       }), hotkeys && /* @__PURE__ */jsxRuntime.jsx(Hotkeys, {
-        fontSize,
+        fontSize: hotkeysFontSize,
         keys: hotkeys,
         style: {
           marginTop: -4,
@@ -6842,15 +6729,15 @@ var __template$6 = (cooked, raw) => __freeze$6(__defProp$6(cooked, "raw", {
 var _a$6, _b$3, _c$1, _d;
 const keyframe = styled.keyframes(_a$6 || (_a$6 = __template$6(["\n  0% {\n    background-position: 100%;\n  }\n  100% {\n    background-position: -100%;\n  }\n"])));
 const animation = styled.css(_b$3 || (_b$3 = __template$6(["\n  background-image: linear-gradient(\n    to right,\n    var(--card-skeleton-color-from),\n    var(--card-skeleton-color-to),\n    var(--card-skeleton-color-from),\n    var(--card-skeleton-color-from),\n    var(--card-skeleton-color-from)\n  );\n  background-position: 100%;\n  background-size: 200% 100%;\n  background-attachment: fixed;\n  animation-name: ", ";\n  animation-timing-function: ease-in-out;\n  animation-iteration-count: infinite;\n  animation-duration: 2000ms;\n"])), keyframe);
-const skeletonStyle = styled.css(_d || (_d = __template$6(["\n  opacity: ", ";\n  transition: opacity 200ms ease-in;\n\n  @media screen and (prefers-reduced-motion: no-preference) {\n    ", "\n  }\n\n  @media screen and (prefers-reduced-motion: reduce) {\n    background-color: var(--card-skeleton-color-from);\n  }\n"])), _ref10 => {
+const skeletonStyle = styled.css(_d || (_d = __template$6(["\n  opacity: ", ";\n  transition: opacity 200ms ease-in;\n\n  @media screen and (prefers-reduced-motion: no-preference) {\n    ", "\n  }\n\n  @media screen and (prefers-reduced-motion: reduce) {\n    background-color: var(--card-skeleton-color-from);\n  }\n"])), _ref9 => {
   let {
     $visible
-  } = _ref10;
+  } = _ref9;
   return $visible ? 1 : 0;
-}, _ref11 => {
+}, _ref10 => {
   let {
     $animated
-  } = _ref11;
+  } = _ref10;
   return $animated ? animation : styled.css(_c$1 || (_c$1 = __template$6(["\n            background-color: var(--card-skeleton-color-from);\n          "])));
 });
 const Root$4 = styled__default.default(Box)(responsiveRadiusStyle, skeletonStyle);
@@ -6881,18 +6768,18 @@ const Skeleton = react.forwardRef(function Skeleton2(props, ref) {
     ref
   });
 });
-const Root$3 = styled__default.default(Skeleton)(_ref12 => {
-  let {
+const Root$3 = styled__default.default(Skeleton)(props => {
+  const {
     $size,
-    $style,
-    theme
-  } = _ref12;
+    $style
+  } = props;
   const {
+    font,
     media
-  } = theme.sanity;
-  const font = theme.sanity.fonts[$style];
+  } = theme.getTheme_v2(props.theme);
+  const fontStyle = font[$style];
   const styles = _responsive(media, $size, sizeIndex => {
-    const fontSize = font.sizes[sizeIndex];
+    const fontSize = fontStyle.sizes[sizeIndex];
     const capHeight = fontSize.lineHeight - fontSize.ascenderHeight - fontSize.descenderHeight;
     return {
       height: capHeight
@@ -7235,12 +7122,12 @@ function ToastProvider(props) {
           paddingY,
           children: /* @__PURE__ */jsxRuntime.jsx(framerMotion.AnimatePresence, {
             initial: false,
-            children: state.map(_ref13 => {
+            children: state.map(_ref11 => {
               let {
                 dismiss,
                 id,
                 params
-              } = _ref13;
+              } = _ref11;
               return /* @__PURE__ */jsxRuntime.jsx(framerMotion.motion.div, {
                 animate: {
                   opacity: 1,
@@ -7534,26 +7421,20 @@ function treeItemRootStyle() {
   return styled.css(_a$1 || (_a$1 = __template$1(["\n    &[role='none'] > [role='treeitem'] {\n      outline: none;\n      cursor: default;\n      border-radius: 3px;\n\n      background-color: var(--card-bg-color);\n      color: var(--treeitem-fg-color);\n\n      &:focus {\n        position: relative;\n      }\n    }\n\n    &[role='treeitem'] {\n      outline: none;\n\n      & > div {\n        cursor: default;\n        border-radius: 3px;\n\n        background-color: var(--card-bg-color);\n        color: var(--treeitem-fg-color);\n      }\n\n      &:focus > div {\n        position: relative;\n      }\n    }\n  "])));
 }
 function treeItemRootColorStyle(props) {
-  const {
-    theme
-  } = props;
   const $tone = "default";
   const {
-    base,
-    muted,
-    selectable
-  } = theme.sanity.color;
-  const tone = selectable ? selectable[$tone] || selectable.default : muted[$tone] || muted.default;
-  return styled.css(_b || (_b = __template$1(['\n    /* <div role="none"><a data-ui="TreeItem__box" role="treeitem" tabIndex="0"></div> */\n    &[role=\'none\'] {\n      & > [role=\'treeitem\'] {\n        ', "\n      }\n\n      &[data-selected] > [role='treeitem'] {\n        ", "\n      }\n\n      @media (hover: hover) {\n        &:not([data-selected]) > [role='treeitem']:not(:focus):hover {\n          ", "\n        }\n\n        & > [role='treeitem']:focus {\n          ", '\n        }\n      }\n    }\n\n    /* <div role="treeitem" tabIndex="0"><div data-ui="TreeItem__box"></div> */\n    &[role=\'treeitem\'] {\n      & > [data-ui=\'TreeItem__box\'] {\n        ', "\n      }\n\n      &[data-selected] > [data-ui='TreeItem__box'] {\n        ", "\n      }\n\n      @media (hover: hover) {\n        &:not([data-selected]):not(:focus) > [data-ui='TreeItem__box']:hover {\n          ", "\n        }\n\n        &:focus > [data-ui='TreeItem__box'] {\n          ", "\n        }\n      }\n    }\n  "])), _colorVarsStyle(base, tone.enabled), _colorVarsStyle(base, tone.pressed), _colorVarsStyle(base, tone.hovered), _colorVarsStyle(base, tone.selected), _colorVarsStyle(base, tone.enabled), _colorVarsStyle(base, tone.pressed), _colorVarsStyle(base, tone.hovered), _colorVarsStyle(base, tone.selected));
+    color
+  } = theme.getTheme_v2(props.theme);
+  const tone = color.selectable[$tone];
+  return styled.css(_b || (_b = __template$1(["\n    &[role='none'] {\n      & > [role='treeitem'] {\n        ", "\n      }\n\n      &[data-selected] > [role='treeitem'] {\n        ", "\n      }\n\n      @media (hover: hover) {\n        &:not([data-selected]) > [role='treeitem']:not(:focus):hover {\n          ", "\n        }\n\n        & > [role='treeitem']:focus {\n          ", "\n        }\n      }\n    }\n\n    &[role='treeitem'] {\n      & > [data-ui='TreeItem__box'] {\n        ", "\n      }\n\n      &[data-selected] > [data-ui='TreeItem__box'] {\n        ", "\n      }\n\n      @media (hover: hover) {\n        &:not([data-selected]):not(:focus) > [data-ui='TreeItem__box']:hover {\n          ", "\n        }\n\n        &:focus > [data-ui='TreeItem__box'] {\n          ", "\n        }\n      }\n    }\n  "])), _cardColorStyle(color, tone.enabled), _cardColorStyle(color, tone.pressed), _cardColorStyle(color, tone.hovered), _cardColorStyle(color, tone.selected), _cardColorStyle(color, tone.enabled), _cardColorStyle(color, tone.pressed), _cardColorStyle(color, tone.hovered), _cardColorStyle(color, tone.selected));
 }
 function treeItemBoxStyle(props) {
   const {
-    $level,
-    theme
+    $level
   } = props;
   const {
     space
-  } = theme.sanity;
+  } = theme.getTheme_v2(props.theme);
   return styled.css(_c || (_c = __template$1(["\n    padding-left: ", ";\n\n    &[data-as='a'] {\n      text-decoration: none;\n    }\n  "])), rem(space[2] * $level));
 }
 function useTree() {
@@ -7740,22 +7621,22 @@ const TreeItem = react.memo(function TreeItem2(props) {
     })]
   });
 });
-Object.defineProperty(exports, 'COLOR_CONFIG_BASE_KEYS', {
+Object.defineProperty(exports, 'COLOR_CONFIG_BLEND_KEYS', {
   enumerable: true,
   get: function () {
-    return theme.COLOR_CONFIG_BASE_KEYS;
+    return theme.COLOR_CONFIG_BLEND_KEYS;
   }
 });
-Object.defineProperty(exports, 'COLOR_CONFIG_BASE_TONES', {
+Object.defineProperty(exports, 'COLOR_CONFIG_CARD_KEYS', {
   enumerable: true,
   get: function () {
-    return theme.COLOR_CONFIG_BASE_TONES;
+    return theme.COLOR_CONFIG_CARD_KEYS;
   }
 });
-Object.defineProperty(exports, 'COLOR_CONFIG_BLEND_KEYS', {
+Object.defineProperty(exports, 'COLOR_CONFIG_CARD_TONES', {
   enumerable: true,
   get: function () {
-    return theme.COLOR_CONFIG_BLEND_KEYS;
+    return theme.COLOR_CONFIG_CARD_TONES;
   }
 });
 Object.defineProperty(exports, 'COLOR_CONFIG_STATE_KEYS', {
@@ -7770,12 +7651,6 @@ Object.defineProperty(exports, 'COLOR_CONFIG_STATE_TONES', {
     return theme.COLOR_CONFIG_STATE_TONES;
   }
 });
-Object.defineProperty(exports, 'THEME_COLOR_BASE_TONES', {
-  enumerable: true,
-  get: function () {
-    return theme.THEME_COLOR_BASE_TONES;
-  }
-});
 Object.defineProperty(exports, 'THEME_COLOR_BLEND_MODES', {
   enumerable: true,
   get: function () {
@@ -7788,6 +7663,12 @@ Object.defineProperty(exports, 'THEME_COLOR_BUTTON_MODES', {
     return theme.THEME_COLOR_BUTTON_MODES;
   }
 });
+Object.defineProperty(exports, 'THEME_COLOR_CARD_TONES', {
+  enumerable: true,
+  get: function () {
+    return theme.THEME_COLOR_CARD_TONES;
+  }
+});
 Object.defineProperty(exports, 'THEME_COLOR_STATES', {
   enumerable: true,
   get: function () {
@@ -7953,7 +7834,7 @@ Object.defineProperty(exports, 'screen', {
 Object.defineProperty(exports, 'studioTheme', {
   enumerable: true,
   get: function () {
-    return theme.studioTheme;
+    return theme.defaultTheme;
   }
 });
 exports.Arrow = Arrow;
@@ -8063,6 +7944,7 @@ exports.usePrefersDark = usePrefersDark;
 exports.usePrefersReducedMotion = usePrefersReducedMotion;
 exports.useRootTheme = useRootTheme;
 exports.useTheme = useTheme;
+exports.useTheme_v2 = useTheme_v2;
 exports.useToast = useToast;
 exports.useTooltipDelayGroup = useTooltipDelayGroup;
 exports.useTree = useTree;