@mario_hahn/jumpy-ui 0.6.1 → 0.8.0

package/dist/index.js

@@ -11,6 +11,7 @@ import {
   JumpySpacing,
   JumpyTextStyle,
   JumpyThemeProvider,
+  JumpyThemeScopeContext,
   animationDelayValue,
   animationDurationValue,
   animationEasingValue,
@@ -27,7 +28,7 @@ import {
   textStyleValue,
   themeToCSSVariables,
   useJumpyTheme
-} from "./chunk-DFWGWSLJ.js";
+} from "./chunk-HQ4NWZ65.js";
 import {
   cn
 } from "./chunk-3DBKYKP2.js";
@@ -174,28 +175,29 @@ function getButtonVariantStyles(theme, variant, status = "regular") {
   const variantTokens = theme.actions[variant] || theme.actions.primary;
   const tokens = variantTokens[status] || variantTokens.regular;
   const elevated = variant === "primary";
+  const token = (state, slot, fallback) => variant === "primary" && status === "regular" ? `var(--jumpy-actions-primary-regular-${state}-${slot}, ${fallback})` : fallback;
   return {
-    "--jumpy-action-default-surface": tokens.default.surface,
-    "--jumpy-action-default-text": tokens.default.text,
-    "--jumpy-action-default-border": tokens.default.border,
-    "--jumpy-action-default-icon": tokens.default.icon,
-    "--jumpy-action-hover-surface": tokens.hover.surface,
-    "--jumpy-action-hover-text": tokens.hover.text,
-    "--jumpy-action-hover-icon": tokens.hover.icon,
-    "--jumpy-action-hover-border": tokens.hover.border,
-    "--jumpy-action-pressed-surface": tokens.pressed.surface,
-    "--jumpy-action-pressed-text": tokens.pressed.text,
-    "--jumpy-action-pressed-icon": tokens.pressed.icon,
-    "--jumpy-action-pressed-border": tokens.pressed.border,
-    "--jumpy-action-focus-surface": tokens.focus.surface,
-    "--jumpy-action-focus-text": tokens.focus.text,
-    "--jumpy-action-focus-icon": tokens.focus.icon,
-    "--jumpy-action-focus-border": tokens.focus.border,
-    "--jumpy-action-focus-ring": tokens.focus.focusRing,
-    "--jumpy-action-disabled-surface": tokens.disabled.surface,
-    "--jumpy-action-disabled-text": tokens.disabled.text,
-    "--jumpy-action-disabled-icon": tokens.disabled.icon,
-    "--jumpy-action-disabled-border": tokens.disabled.border,
+    "--jumpy-action-default-surface": token("default", "surface", tokens.default.surface),
+    "--jumpy-action-default-text": token("default", "text", tokens.default.text),
+    "--jumpy-action-default-border": token("default", "border", tokens.default.border),
+    "--jumpy-action-default-icon": token("default", "icon", tokens.default.icon),
+    "--jumpy-action-hover-surface": token("hover", "surface", tokens.hover.surface),
+    "--jumpy-action-hover-text": token("hover", "text", tokens.hover.text),
+    "--jumpy-action-hover-icon": token("hover", "icon", tokens.hover.icon),
+    "--jumpy-action-hover-border": token("hover", "border", tokens.hover.border),
+    "--jumpy-action-pressed-surface": token("pressed", "surface", tokens.pressed.surface),
+    "--jumpy-action-pressed-text": token("pressed", "text", tokens.pressed.text),
+    "--jumpy-action-pressed-icon": token("pressed", "icon", tokens.pressed.icon),
+    "--jumpy-action-pressed-border": token("pressed", "border", tokens.pressed.border),
+    "--jumpy-action-focus-surface": token("focus", "surface", tokens.focus.surface),
+    "--jumpy-action-focus-text": token("focus", "text", tokens.focus.text),
+    "--jumpy-action-focus-icon": token("focus", "icon", tokens.focus.icon),
+    "--jumpy-action-focus-border": token("focus", "border", tokens.focus.border),
+    "--jumpy-action-focus-ring": token("focus", "focus-ring", tokens.focus.focusRing),
+    "--jumpy-action-disabled-surface": token("disabled", "surface", tokens.disabled.surface),
+    "--jumpy-action-disabled-text": token("disabled", "text", tokens.disabled.text),
+    "--jumpy-action-disabled-icon": token("disabled", "icon", tokens.disabled.icon),
+    "--jumpy-action-disabled-border": token("disabled", "border", tokens.disabled.border),
     "--jumpy-action-hover-shadow": "none",
     "--jumpy-action-focus-shadow": elevated ? shadowValue(theme, JumpyShadowStyle.positiveSmall) : "none",
     "--jumpy-action-pressed-shadow": "none",
@@ -678,7 +680,6 @@ function JumpListItem({ as, children, className = "", selected = false, disabled
   const isDisabled = disabled || readOnly;
   const bodyMedium = textStyleValue(theme, JumpyTextStyle.bodyMedium);
   const bodySmall = textStyleValue(theme, JumpyTextStyle.bodySmall);
-  const bodyMediumEmphasized = textStyleValue(theme, JumpyTextStyle.bodyMediumEmphasized);
   const iconSize = sizeValue(theme, JumpySize.small2XS);
   const handleExpandedChange = () => {
     const nextCollapsed = !isNestedCollapsed;
@@ -748,7 +749,7 @@ function JumpListItem({ as, children, className = "", selected = false, disabled
         resolvedSelector ? /* @__PURE__ */ jsx("span", { "data-jumpy-slot": "selector", "aria-hidden": props.role === "option" || props.role === "treeitem" ? "true" : void 0, className: innerClasses.selector?.className, style: { display: "inline-flex", pointerEvents: "none", color: "var(--jumpy-list-item-icon-color, var(--jumpy-list-item-default-icon))", ...innerClasses.selector?.style || {} }, children: resolvedSelector }) : null,
         resolvedLeading ? /* @__PURE__ */ jsx("span", { "data-jumpy-slot": "leading", "aria-hidden": "true", className: innerClasses.leading?.className, style: { display: "inline-flex", width: iconSize, height: iconSize, color: "var(--jumpy-list-item-icon-color, var(--jumpy-list-item-default-icon))", ...innerClasses.leading?.style || {} }, children: resolvedLeading }) : null,
         /* @__PURE__ */ jsxs("span", { style: { display: "grid", minWidth: 0 }, children: [
-          /* @__PURE__ */ jsx("span", { "data-jumpy-slot": "label", "data-truncate": truncateTexts ? "true" : void 0, "data-text": typeof children === "string" ? children : void 0, className: innerClasses.label?.className, style: { minWidth: 0, maxWidth: "100%", overflowWrap: "anywhere", wordBreak: "break-word", fontWeight: selected ? bodyMediumEmphasized.fontWeight : bodyMedium.fontWeight, ...innerClasses.label?.style || {} }, children }),
+          /* @__PURE__ */ jsx("span", { "data-jumpy-slot": "label", "data-truncate": truncateTexts ? "true" : void 0, "data-text": typeof children === "string" ? children : void 0, className: innerClasses.label?.className, style: { minWidth: 0, maxWidth: "100%", overflowWrap: "anywhere", wordBreak: "break-word", fontWeight: bodyMedium.fontWeight, ...innerClasses.label?.style || {} }, children }),
           resolvedDescription ? /* @__PURE__ */ jsx("span", { "data-jumpy-slot": "description", className: innerClasses.description?.className, style: { color: selected ? theme.listItem.active.default.subtext : theme.listItem.inactive.default.subtext, fontSize: bodySmall.fontSize, lineHeight: bodySmall.lineHeight, ...innerClasses.description?.style || {} }, children: resolvedDescription }) : null
         ] }),
         resolvedMetadata ? /* @__PURE__ */ jsx("span", { "data-jumpy-slot": "metadata", className: innerClasses.metadata?.className, style: { color: selected ? theme.listItem.active.default.subtext : theme.listItem.inactive.default.subtext, whiteSpace: "nowrap", fontSize: bodySmall.fontSize, lineHeight: bodySmall.lineHeight, ...innerClasses.metadata?.style || {} }, children: resolvedMetadata }) : null,
@@ -1768,7 +1769,7 @@ function JumpTableCell({ as, children, selected = false, disabled = false, align
         /* @__PURE__ */ jsxs("span", { "data-jumpy-slot": "table-cell-inner", "data-align": resolvedAlign, className: innerClasses.inner?.className, style: innerClasses.inner?.style, children: [
           cellLeading ? /* @__PURE__ */ jsx("span", { "data-jumpy-slot": "table-cell-leading", className: innerClasses.leading?.className, style: innerClasses.leading?.style, children: cellLeading }) : null,
           /* @__PURE__ */ jsxs("span", { "data-jumpy-slot": "table-cell-content", className: innerClasses.content?.className, style: innerClasses.content?.style, children: [
-            /* @__PURE__ */ jsx("span", { "data-jumpy-slot": "table-cell-text", className: innerClasses.text?.className, style: tableCellTextStyle(theme, selected, innerClasses.text?.style), children }),
+            /* @__PURE__ */ jsx("span", { "data-jumpy-slot": "table-cell-text", className: innerClasses.text?.className, style: tableCellTextStyle(theme, false, innerClasses.text?.style), children }),
             cellDescription ? /* @__PURE__ */ jsx("span", { "data-jumpy-slot": "table-cell-description", className: innerClasses.description?.className, style: tableCellTextStyle(theme, false, innerClasses.description?.style), children: cellDescription }) : null
           ] }),
           cellTrailing ? /* @__PURE__ */ jsx("span", { "data-jumpy-slot": "table-cell-trailing", className: innerClasses.trailing?.className, style: innerClasses.trailing?.style, children: cellTrailing }) : null
@@ -2017,7 +2018,8 @@ function JumpExpandableGroup({ as, multiple = false, disabled = false, headingLe
 var JUMPY_POPUP_Z_INDEX = 1200;
 function JumpyPortal({ children }) {
   const theme = useJumpyTheme();
-  return /* @__PURE__ */ jsx(FloatingPortal, { children: /* @__PURE__ */ jsx("div", { "data-jumpy-theme": "true", "data-jumpy-portal": "true", style: { ...themeToCSSVariables(theme), fontFamily: theme.fontFamily.familyBase }, children }) });
+  const scope = useContext(JumpyThemeScopeContext);
+  return /* @__PURE__ */ jsx(FloatingPortal, { children: /* @__PURE__ */ jsx("div", { "data-jumpy-theme": "true", "data-jumpy-scope": scope || void 0, "data-jumpy-portal": "true", style: { ...!scope ? themeToCSSVariables(theme) : {}, fontFamily: theme.fontFamily.familyBase }, children }) });
 }
 function JumpyModalLayer({ children, onVisibleChange, style, onPointerDown, ...props }) {
   const theme = useJumpyTheme();
@@ -2500,6 +2502,7 @@ function JumpDatePicker({ label = "Date", hint, value, defaultValue = null, onCh
         "aria-haspopup": "dialog",
         readOnly,
         disabled,
+        "data-has-value": selectedTime !== null,
         value: draft,
         placeholder: props.placeholder || (Array.isArray(format) ? format[0] : format),
         autoComplete: "off",
@@ -2621,6 +2624,7 @@ function JumpTimePicker({ label = "Time", hint, value, defaultValue = null, onCh
         "aria-haspopup": "dialog",
         readOnly,
         disabled,
+        "data-has-value": selectedTime !== null,
         value: draft,
         placeholder: props.placeholder || resolvedFormat,
         autoComplete: "off",
@@ -3039,11 +3043,14 @@ function JumpLoader({ label = "Jumpy UI wird geladen", fullScreen = false, class
     /* @__PURE__ */ jsx(JumpCard, { className: cn("px-10 py-9", decorativeBackground && "relative z-10"), children: content })
   ] });
 }
-function JumpButton({ as, variant = "primary", status = "regular", className = "", isLoading = false, disabled, elevated = false, slots, leadingIcon, trailingIcon, children, ...props }) {
+function JumpButton({ as, size: size2, variant = "primary", status = "regular", className = "", isLoading = false, disabled, elevated = false, slots, leadingIcon, trailingIcon, children, ...props }) {
   const theme = useJumpyTheme();
   const variantStyles = getButtonVariantStyles(theme, variant, status);
-  const bodyMediumEmphasized = textStyleValue(theme, JumpyTextStyle.bodyMediumEmphasized);
-  const iconSize = sizeValue(theme, JumpySize.small2XS);
+  const height = sizeValue(theme, size2 ?? JumpySize.large);
+  if (!Number.isFinite(height) || height < 0) throw new Error(`Invalid JumpButton size token: ${size2}`);
+  const compact = height < sizeValue(theme, JumpySize.large);
+  const textStyle = textStyleValue(theme, compact ? JumpyTextStyle.bodySmallEmphasized : JumpyTextStyle.bodyMediumEmphasized);
+  const iconSize = sizeValue(theme, compact ? JumpySize.small3XS : JumpySize.small2XS);
   const [pressed, setPressed] = useState(false);
   const leading = slots?.leading ?? leadingIcon;
   const trailing = slots?.trailing ?? trailingIcon;
@@ -3052,6 +3059,15 @@ function JumpButton({ as, variant = "primary", status = "regular", className = "
   const isDisabled = disabled || isLoading;
   const spacing = getButtonSpacing(theme, variant, Boolean(leading), Boolean(trailing));
   const hasBorder = variant === "secondary" || variant === "tertiary";
+  if (size2 !== void 0) {
+    const border = hasBorder ? borderWidthValue(theme, JumpyBorderWidth.small) : 0;
+    const contentHeight = Math.max(textStyle.fontSize * textStyle.lineHeight, leading || trailing ? iconSize : 0);
+    spacing.paddingTop = spacing.paddingBottom = Math.max(0, (height - contentHeight - border * 2) / 2);
+    if (compact) {
+      spacing.gap = spacingValue(theme, JumpySpacing.small3XS);
+      spacing.paddingLeft = spacing.paddingRight = spacingValue(theme, variant === "borderless" ? JumpySpacing.zero : JumpySpacing.medium);
+    }
+  }
   const content = /* @__PURE__ */ jsxs("span", { style: { display: "inline-flex", flexDirection: "row", alignItems: "center", justifyContent: "center", gap: spacing.gap, whiteSpace: "nowrap" }, children: [
     leading ? /* @__PURE__ */ jsx("span", { "aria-hidden": "true", className: "inline-flex shrink-0 items-center justify-center", style: { width: iconSize, height: iconSize, lineHeight: 0, fontSize: iconSize }, children: leading }) : null,
     /* @__PURE__ */ jsx("span", { children }),
@@ -3067,6 +3083,7 @@ function JumpButton({ as, variant = "primary", status = "regular", className = "
       "data-status": status,
       "data-elevated": elevated ? "true" : "false",
       "data-loading": isLoading ? "true" : "false",
+      "data-size": size2,
       "data-pressed": pressed ? "true" : "false",
       "aria-busy": isLoading || void 0,
       "aria-disabled": !isButton && isDisabled ? true : props["aria-disabled"],
@@ -3093,7 +3110,7 @@ function JumpButton({ as, variant = "primary", status = "regular", className = "
         display: "inline-flex",
         alignItems: "center",
         justifyContent: "center",
-        minHeight: sizeValue(theme, JumpySize.large),
+        minHeight: height,
         appearance: "none",
         WebkitAppearance: "none",
         boxSizing: "border-box",
@@ -3102,11 +3119,11 @@ function JumpButton({ as, variant = "primary", status = "regular", className = "
         paddingTop: spacing.paddingTop,
         paddingBottom: spacing.paddingBottom,
         borderRadius: radiusValue(theme, JumpyRadius.small),
-        letterSpacing: bodyMediumEmphasized.letterSpacing,
+        letterSpacing: textStyle.letterSpacing,
         fontFamily: theme.fontFamily.familyBase,
-        fontSize: bodyMediumEmphasized.fontSize,
-        lineHeight: bodyMediumEmphasized.lineHeight,
-        fontWeight: bodyMediumEmphasized.fontWeight,
+        fontSize: textStyle.fontSize,
+        lineHeight: textStyle.lineHeight,
+        fontWeight: textStyle.fontWeight,
         opacity: isDisabled ? opacityValue(theme, JumpyOpacity.medium) : opacityValue(theme, JumpyOpacity.solid),
         borderWidth: hasBorder ? borderWidthValue(theme, JumpyBorderWidth.small) : 0,
         borderStyle: hasBorder ? "solid" : "none",
@@ -3382,11 +3399,11 @@ function JumpBaseInput({ label, hint, children, className = "", error = false, h
     },
     onBlur: (event) => {
       setFocused(false);
-      setHasValue(isDropdown || Boolean(String(event.target?.value ?? "").length));
+      setHasValue(childHasValue || Boolean(String(event.target?.value ?? "").length));
       originalOnBlur?.(event);
     },
     onChange: (event) => {
-      setHasValue(isDropdown || Boolean(String(event.target?.value ?? "").length));
+      setHasValue(childHasValue || Boolean(String(event.target?.value ?? "").length));
       setInputValue(String(event.target?.value ?? ""));
       originalOnChange?.(event);
     }

package/dist/theme.js

@@ -11,6 +11,7 @@ import {
   JumpySpacing,
   JumpyTextStyle,
   JumpyThemeProvider,
+  JumpyThemeScopeContext,
   animationDelayValue,
   animationDurationValue,
   animationEasingValue,
@@ -27,7 +28,7 @@ import {
   textStyleValue,
   themeToCSSVariables,
   useJumpyTheme
-} from "./chunk-DFWGWSLJ.js";
+} from "./chunk-HQ4NWZ65.js";
 export {
   JumpyAnimation,
   JumpyAnimationDelay,
@@ -40,6 +41,7 @@ export {
   JumpySpacing,
   JumpyTextStyle,
   JumpyThemeProvider,
+  JumpyThemeScopeContext,
   animationDelayValue,
   animationDurationValue,
   animationEasingValue,

package/index.d.ts

@@ -1,5 +1,5 @@
 import type { AnchorHTMLAttributes, ButtonHTMLAttributes, HTMLAttributes, InputHTMLAttributes, ReactNode, Ref, TdHTMLAttributes, TextareaHTMLAttributes, ThHTMLAttributes } from 'react'
-export type { JumpyTheme } from './theme.js'
+export type { JumpyTheme, JumpySizeToken } from './theme.js'
 type ElementTag = keyof HTMLElementTagNameMap
 type JumpResponsiveValue<T> = T | { small?: T; medium?: T; large?: T; xLarge?: T }
 type JumpGridSpacing = number | string | [row: number | string, column: number | string]
@@ -128,7 +128,7 @@ export type JumpDialogInnerPart = 'illustration' | 'body' | 'icon' | 'title' | '
 export type JumpDialogInnerClasses = Partial<Record<JumpDialogInnerPart, { className?: string; style?: import('react').CSSProperties }>>
 export declare function JumpDialog(props: HTMLAttributes<HTMLElement> & { as?: ElementTag; visible?: boolean; onVisibleChange?: (visible: boolean) => void; title?: ReactNode; description?: ReactNode; footer?: ReactNode; disableBackdropClick?: boolean; disableContentScroll?: boolean; fullScreen?: boolean; overlayProps?: HTMLAttributes<HTMLDivElement>; slots?: { illustration?: ReactNode; icon?: ReactNode; title?: ReactNode; description?: ReactNode; footer?: ReactNode }; innerClasses?: JumpDialogInnerClasses; children?: ReactNode }): ReactNode
 export declare function JumpLoader(props: { label?: string; fullScreen?: boolean; className?: string; decorativeBackground?: boolean }): ReactNode
-export declare function JumpButton(props: JumpPolymorphicButtonAttributes & { as?: ElementTag; variant?: 'primary' | 'secondary' | 'tertiary' | 'borderless'; status?: 'regular' | 'alarm'; isLoading?: boolean; elevated?: boolean; slots?: JumpButtonSlots; leadingIcon?: ReactNode; trailingIcon?: ReactNode }): ReactNode
+export declare function JumpButton(props: JumpPolymorphicButtonAttributes & { as?: ElementTag; size?: import('./theme.js').JumpySizeToken; variant?: 'primary' | 'secondary' | 'tertiary' | 'borderless'; status?: 'regular' | 'alarm'; isLoading?: boolean; elevated?: boolean; slots?: JumpButtonSlots; leadingIcon?: ReactNode; trailingIcon?: ReactNode }): ReactNode
 export declare function JumpIconButton(props: JumpPolymorphicButtonAttributes & { as?: ElementTag; variant?: 'primary' | 'secondary' | 'tertiary' | 'borderless'; status?: 'regular' | 'alarm'; alternateHover?: boolean; elevated?: boolean }): ReactNode
 export declare function JumpLinkButton(props: AnchorHTMLAttributes<HTMLAnchorElement> & { href: string; variant?: 'primary' | 'secondary' | 'tertiary' | 'borderless'; status?: 'regular' | 'alarm'; leadingIcon?: ReactNode; trailingIcon?: ReactNode }): ReactNode
 export declare const JumpInput: import('react').ForwardRefExoticComponent<InputHTMLAttributes<HTMLInputElement> & { status?: JumpInputStatus } & import('react').RefAttributes<HTMLInputElement>>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mario_hahn/jumpy-ui",
-  "version": "0.6.1",
+  "version": "0.8.0",
   "license": "MIT",
   "type": "module",
   "scripts": {

package/theme.d.ts

@@ -19,7 +19,8 @@ export type JumpyTheme = {
 }
 
 export declare const JumpySpacing: Record<string, string>
-export declare const JumpySize: Record<string, string>
+export type JumpySizeToken = 'none' | 'small5XS' | 'small4XS' | 'small3XS' | 'small2XS' | 'smallXS' | 'small' | 'medium' | 'large' | 'largeXL' | 'large2XL' | 'large3XL' | 'large4XL' | 'large5XL' | 'large6XL' | 'large7XL' | 'large8XL'
+export declare const JumpySize: { readonly [Key in JumpySizeToken]: Key }
 export declare const JumpyRadius: Record<string, string>
 export declare const JumpyOpacity: Record<string, string>
 export declare const JumpyBorderWidth: Record<string, string>
@@ -43,5 +44,5 @@ export declare function animationEasingValue(theme: Required<JumpyTheme>, token:
 export declare function shadowValue(theme: Required<JumpyTheme>, token: string): string
 export declare function textStyleValue(theme: Required<JumpyTheme>, token: string): Record<string, unknown>
 export declare function themeToCSSVariables(theme?: JumpyTheme): Record<string, string>
-export declare function JumpyThemeProvider(props: { theme?: JumpyTheme; children: ReactNode }): ReactNode
+export declare function JumpyThemeProvider(props: { theme?: JumpyTheme; tokens?: Record<`--jumpy-${string}`, string | number>; children: ReactNode }): ReactNode
 export declare function useJumpyTheme(): Required<JumpyTheme>

package/tokens/android/tokens/src/main/kotlin/com/mariohahn/jumpy/tokens/berry/Tokens.kt

@@ -408,7 +408,7 @@ object JumpyBerryTokens {
     val actionsPrimaryRegularDefaultSurface: Color = jumpyColor("#FF8F3D7A")
     val actionsPrimaryRegularDefaultText: Color = jumpyColor("#FFFFFFFF")
     val actionsPrimaryRegularDisabledBorder: Color = jumpyColor("#FFF7EEF7")
-    val actionsPrimaryRegularDisabledIcon: Color = jumpyColor("#26575B5E")
+    val actionsPrimaryRegularDisabledIcon: Color = jumpyColor("#FF6F5A6B")
     val actionsPrimaryRegularDisabledSurface: Color = jumpyColor("#FFF7EEF7")
     val actionsPrimaryRegularDisabledSurfaceAlternate: Color = jumpyColor("#FFF6F6F6")
     val actionsPrimaryRegularDisabledText: Color = jumpyColor("#FF6F5A6B")

package/tokens/android/tokens/src/main/kotlin/com/mariohahn/jumpy/tokens/berryDark/Tokens.kt

@@ -404,25 +404,25 @@ object JumpyBerryDarkTokens {
     val actionsPrimaryInfoPressedSurface: Color = jumpyColor("#FF949494")
     val actionsPrimaryInfoPressedText: Color = jumpyColor("#FFFFFFFF")
     val actionsPrimaryRegularDefaultBorder: Color = jumpyColor("#FFC86CAF")
-    val actionsPrimaryRegularDefaultIcon: Color = jumpyColor("#FF2A1022")
+    val actionsPrimaryRegularDefaultIcon: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularDefaultSurface: Color = jumpyColor("#FFD881BE")
     val actionsPrimaryRegularDefaultText: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularDisabledBorder: Color = jumpyColor("#FF2B1E2F")
-    val actionsPrimaryRegularDisabledIcon: Color = jumpyColor("#24C8B2C2")
+    val actionsPrimaryRegularDisabledIcon: Color = jumpyColor("#FFC8B2C2")
     val actionsPrimaryRegularDisabledSurface: Color = jumpyColor("#24C8B2C2")
     val actionsPrimaryRegularDisabledSurfaceAlternate: Color = jumpyColor("#FF1A1A1A")
     val actionsPrimaryRegularDisabledText: Color = jumpyColor("#FFC8B2C2")
     val actionsPrimaryRegularFocusBorder: Color = jumpyColor("#FFC86CAF")
     val actionsPrimaryRegularFocusFocusRing: Color = jumpyColor("#FFC86CAF")
-    val actionsPrimaryRegularFocusIcon: Color = jumpyColor("#FF2A1022")
+    val actionsPrimaryRegularFocusIcon: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularFocusSurface: Color = jumpyColor("#FFD881BE")
     val actionsPrimaryRegularFocusText: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularHoverBorder: Color = jumpyColor("#FFC86CAF")
-    val actionsPrimaryRegularHoverIcon: Color = jumpyColor("#FF2A1022")
+    val actionsPrimaryRegularHoverIcon: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularHoverSurface: Color = jumpyColor("#FFC86CAF")
     val actionsPrimaryRegularHoverText: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularPressedBorder: Color = jumpyColor("#FFC86CAF")
-    val actionsPrimaryRegularPressedIcon: Color = jumpyColor("#FF2A1022")
+    val actionsPrimaryRegularPressedIcon: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularPressedSurface: Color = jumpyColor("#FFEEF5DF")
     val actionsPrimaryRegularPressedText: Color = jumpyColor("#FF000000")
     val actionsPrimaryWarningDefaultBorder: Color = jumpyColor("#FF1A1C1F")

package/tokens/android/tokens/src/main/kotlin/com/mariohahn/jumpy/tokens/default/Tokens.kt

@@ -408,7 +408,7 @@ object JumpyDefaultTokens {
     val actionsPrimaryRegularDefaultSurface: Color = jumpyColor("#FF128A42")
     val actionsPrimaryRegularDefaultText: Color = jumpyColor("#FFFFFFFF")
     val actionsPrimaryRegularDisabledBorder: Color = jumpyColor("#FFF4F7F5")
-    val actionsPrimaryRegularDisabledIcon: Color = jumpyColor("#26575B5E")
+    val actionsPrimaryRegularDisabledIcon: Color = jumpyColor("#FF575B5E")
     val actionsPrimaryRegularDisabledSurface: Color = jumpyColor("#FFF4F7F5")
     val actionsPrimaryRegularDisabledSurfaceAlternate: Color = jumpyColor("#FFF6F6F6")
     val actionsPrimaryRegularDisabledText: Color = jumpyColor("#FF575B5E")

package/tokens/android/tokens/src/main/kotlin/com/mariohahn/jumpy/tokens/defaultDark/Tokens.kt

@@ -404,25 +404,25 @@ object JumpyDefaultDarkTokens {
     val actionsPrimaryInfoPressedSurface: Color = jumpyColor("#FF949494")
     val actionsPrimaryInfoPressedText: Color = jumpyColor("#FFFFFFFF")
     val actionsPrimaryRegularDefaultBorder: Color = jumpyColor("#FF6CB784")
-    val actionsPrimaryRegularDefaultIcon: Color = jumpyColor("#FF102114")
+    val actionsPrimaryRegularDefaultIcon: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularDefaultSurface: Color = jumpyColor("#FF80C596")
     val actionsPrimaryRegularDefaultText: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularDisabledBorder: Color = jumpyColor("#FF242A2F")
-    val actionsPrimaryRegularDisabledIcon: Color = jumpyColor("#29B8C0C4")
+    val actionsPrimaryRegularDisabledIcon: Color = jumpyColor("#FFB8C0C4")
     val actionsPrimaryRegularDisabledSurface: Color = jumpyColor("#29B8C0C4")
     val actionsPrimaryRegularDisabledSurfaceAlternate: Color = jumpyColor("#FF1A1A1A")
     val actionsPrimaryRegularDisabledText: Color = jumpyColor("#FFB8C0C4")
     val actionsPrimaryRegularFocusBorder: Color = jumpyColor("#FF6CB784")
     val actionsPrimaryRegularFocusFocusRing: Color = jumpyColor("#FF6CB784")
-    val actionsPrimaryRegularFocusIcon: Color = jumpyColor("#FF102114")
+    val actionsPrimaryRegularFocusIcon: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularFocusSurface: Color = jumpyColor("#FF80C596")
     val actionsPrimaryRegularFocusText: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularHoverBorder: Color = jumpyColor("#FF6CB784")
-    val actionsPrimaryRegularHoverIcon: Color = jumpyColor("#FF102114")
+    val actionsPrimaryRegularHoverIcon: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularHoverSurface: Color = jumpyColor("#FF6CB784")
     val actionsPrimaryRegularHoverText: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularPressedBorder: Color = jumpyColor("#FF6CB784")
-    val actionsPrimaryRegularPressedIcon: Color = jumpyColor("#FF102114")
+    val actionsPrimaryRegularPressedIcon: Color = jumpyColor("#FF000000")
     val actionsPrimaryRegularPressedSurface: Color = jumpyColor("#FFEEF5DF")
     val actionsPrimaryRegularPressedText: Color = jumpyColor("#FF000000")
     val actionsPrimaryWarningDefaultBorder: Color = jumpyColor("#FF1A1C1F")

package/tokens/android/tokens/src/main/kotlin/com/mariohahn/jumpy/tokens/jumpy/Tokens.kt

@@ -244,7 +244,7 @@ object JumpyJumpyTokens {
     val colorPrimary300: Color = jumpyColor("#FFEEF5DF")
     val colorPrimary400: Color = jumpyColor("#FFDDEABE")
     val colorPrimary500: Color = jumpyColor("#FFC7DC93")
-    val colorPrimary600: Color = jumpyColor("#FFFF7A2F")
+    val colorPrimary600: Color = jumpyColor("#FFFF5C00")
     val colorPrimary700: Color = jumpyColor("#FF5D7B00")
     val colorPrimary800: Color = jumpyColor("#FF556F17")
     val colorPrimary900: Color = jumpyColor("#FF394A10")
@@ -255,7 +255,7 @@ object JumpyJumpyTokens {
     val colorPrimaryExtradark: Color = jumpyColor("#FF2B380C")
     val colorPrimaryExtralight: Color = jumpyColor("#47FF5C00")
     val colorPrimaryLight: Color = jumpyColor("#FFDDEABE")
-    val colorPrimaryLightbase: Color = jumpyColor("#FFFF7A2F")
+    val colorPrimaryLightbase: Color = jumpyColor("#FFFF5C00")
     val colorPrimaryMegalight: Color = jumpyColor("#1AFF5C00")
     val colorPrimaryUltralight: Color = jumpyColor("#1AFF5C00")
     val colorSecondary100: Color = jumpyColor("#FFFFF9F4")
@@ -349,16 +349,16 @@ object JumpyJumpyTokens {
     val actionsBorderlessRegularHoverAction: Color = jumpyColor("#FF343434")
     val actionsBorderlessRegularHoverBorder: Color = jumpyColor("#00FFFFFF")
     val actionsBorderlessRegularHoverFocus: Color = jumpyColor("#00FFFFFF")
-    val actionsBorderlessRegularHoverIcon: Color = jumpyColor("#FFFF5C00")
+    val actionsBorderlessRegularHoverIcon: Color = jumpyColor("#FFE05200")
     val actionsBorderlessRegularHoverSurface: Color = jumpyColor("#1AFF5C00")
     val actionsBorderlessRegularHoverSurfaceAlternate: Color = jumpyColor("#1AFF5C00")
-    val actionsBorderlessRegularHoverText: Color = jumpyColor("#FFFF5C00")
+    val actionsBorderlessRegularHoverText: Color = jumpyColor("#FFE05200")
     val actionsBorderlessRegularPressedAction: Color = jumpyColor("#FF343434")
     val actionsBorderlessRegularPressedBorder: Color = jumpyColor("#00FFFFFF")
     val actionsBorderlessRegularPressedFocus: Color = jumpyColor("#00FFFFFF")
-    val actionsBorderlessRegularPressedIcon: Color = jumpyColor("#FFFF5C00")
+    val actionsBorderlessRegularPressedIcon: Color = jumpyColor("#FFE05200")
     val actionsBorderlessRegularPressedSurface: Color = jumpyColor("#1AFF5C00")
-    val actionsBorderlessRegularPressedText: Color = jumpyColor("#FFFF5C00")
+    val actionsBorderlessRegularPressedText: Color = jumpyColor("#FFE05200")
     val actionsPrimaryAlarmDefaultBorder: Color = jumpyColor("#FFFFFFFF")
     val actionsPrimaryAlarmDefaultIcon: Color = jumpyColor("#FFFFFFFF")
     val actionsPrimaryAlarmDefaultSurface: Color = jumpyColor("#FFDC2626")
@@ -408,22 +408,22 @@ object JumpyJumpyTokens {
     val actionsPrimaryRegularDefaultSurface: Color = jumpyColor("#FFFF5C00")
     val actionsPrimaryRegularDefaultText: Color = jumpyColor("#FFFFFFFF")
     val actionsPrimaryRegularDisabledBorder: Color = jumpyColor("#FF1A1A2E")
-    val actionsPrimaryRegularDisabledIcon: Color = jumpyColor("#B82A2A4A")
+    val actionsPrimaryRegularDisabledIcon: Color = jumpyColor("#FF9CA3AF")
     val actionsPrimaryRegularDisabledSurface: Color = jumpyColor("#FF1A1A2E")
     val actionsPrimaryRegularDisabledSurfaceAlternate: Color = jumpyColor("#FFF6F6F6")
     val actionsPrimaryRegularDisabledText: Color = jumpyColor("#FF9CA3AF")
     val actionsPrimaryRegularFocusBorder: Color = jumpyColor("#FFFF5C00")
-    val actionsPrimaryRegularFocusFocusRing: Color = jumpyColor("#FFFF5C00")
+    val actionsPrimaryRegularFocusFocusRing: Color = jumpyColor("#33FF5C00")
     val actionsPrimaryRegularFocusIcon: Color = jumpyColor("#FFFFFFFF")
     val actionsPrimaryRegularFocusSurface: Color = jumpyColor("#FFFF5C00")
     val actionsPrimaryRegularFocusText: Color = jumpyColor("#FFFFFFFF")
-    val actionsPrimaryRegularHoverBorder: Color = jumpyColor("#FFFF5C00")
+    val actionsPrimaryRegularHoverBorder: Color = jumpyColor("#FFE05200")
     val actionsPrimaryRegularHoverIcon: Color = jumpyColor("#FFFFFFFF")
     val actionsPrimaryRegularHoverSurface: Color = jumpyColor("#FFE05200")
     val actionsPrimaryRegularHoverText: Color = jumpyColor("#FFFFFFFF")
-    val actionsPrimaryRegularPressedBorder: Color = jumpyColor("#FFFF5C00")
+    val actionsPrimaryRegularPressedBorder: Color = jumpyColor("#FFE05200")
     val actionsPrimaryRegularPressedIcon: Color = jumpyColor("#FFFFFFFF")
-    val actionsPrimaryRegularPressedSurface: Color = jumpyColor("#FFFF5C00")
+    val actionsPrimaryRegularPressedSurface: Color = jumpyColor("#FFE05200")
     val actionsPrimaryRegularPressedText: Color = jumpyColor("#FFFFFFFF")
     val actionsPrimaryWarningDefaultBorder: Color = jumpyColor("#FF1A1C1F")
     val actionsPrimaryWarningDefaultIcon: Color = jumpyColor("#FF1A1C1F")
@@ -492,15 +492,15 @@ object JumpyJumpyTokens {
     val actionsSecondaryRegularFocusText: Color = jumpyColor("#FFFF5C00")
     val actionsSecondaryRegularHoverAction: Color = jumpyColor("#FF343434")
     val actionsSecondaryRegularHoverBorder: Color = jumpyColor("#FF575B5E")
-    val actionsSecondaryRegularHoverIcon: Color = jumpyColor("#FFFF5C00")
+    val actionsSecondaryRegularHoverIcon: Color = jumpyColor("#FFE05200")
     val actionsSecondaryRegularHoverSurface: Color = jumpyColor("#1AFF5C00")
     val actionsSecondaryRegularHoverSurfaceAlternate: Color = jumpyColor("#1AFF5C00")
-    val actionsSecondaryRegularHoverText: Color = jumpyColor("#FFFF5C00")
+    val actionsSecondaryRegularHoverText: Color = jumpyColor("#FFE05200")
     val actionsSecondaryRegularPressedAction: Color = jumpyColor("#FF343434")
     val actionsSecondaryRegularPressedBorder: Color = jumpyColor("#FF9CA3AF")
-    val actionsSecondaryRegularPressedIcon: Color = jumpyColor("#FFFF5C00")
+    val actionsSecondaryRegularPressedIcon: Color = jumpyColor("#FFE05200")
     val actionsSecondaryRegularPressedSurface: Color = jumpyColor("#1AFF5C00")
-    val actionsSecondaryRegularPressedText: Color = jumpyColor("#FFFF5C00")
+    val actionsSecondaryRegularPressedText: Color = jumpyColor("#FFE05200")
     val actionsTertiaryAlarmDefaultAction: Color = jumpyColor("#FFDC2626")
     val actionsTertiaryAlarmDefaultBorder: Color = jumpyColor("#00FFFFFF")
     val actionsTertiaryAlarmDefaultFocus: Color = jumpyColor("#00FFFFFF")
@@ -553,16 +553,16 @@ object JumpyJumpyTokens {
     val actionsTertiaryRegularHoverAction: Color = jumpyColor("#FF343434")
     val actionsTertiaryRegularHoverBorder: Color = jumpyColor("#00FFFFFF")
     val actionsTertiaryRegularHoverFocus: Color = jumpyColor("#00FFFFFF")
-    val actionsTertiaryRegularHoverIcon: Color = jumpyColor("#FFFF5C00")
+    val actionsTertiaryRegularHoverIcon: Color = jumpyColor("#FFE05200")
     val actionsTertiaryRegularHoverSurface: Color = jumpyColor("#1AFF5C00")
     val actionsTertiaryRegularHoverSurfaceAlternate: Color = jumpyColor("#1AFF5C00")
-    val actionsTertiaryRegularHoverText: Color = jumpyColor("#FFFF5C00")
+    val actionsTertiaryRegularHoverText: Color = jumpyColor("#FFE05200")
     val actionsTertiaryRegularPressedAction: Color = jumpyColor("#FF343434")
     val actionsTertiaryRegularPressedBorder: Color = jumpyColor("#00FFFFFF")
     val actionsTertiaryRegularPressedFocus: Color = jumpyColor("#00FFFFFF")
-    val actionsTertiaryRegularPressedIcon: Color = jumpyColor("#FFFF5C00")
+    val actionsTertiaryRegularPressedIcon: Color = jumpyColor("#FFE05200")
     val actionsTertiaryRegularPressedSurface: Color = jumpyColor("#1AFF5C00")
-    val actionsTertiaryRegularPressedText: Color = jumpyColor("#FFFF5C00")
+    val actionsTertiaryRegularPressedText: Color = jumpyColor("#FFE05200")
     val cardActiveDefaultBorder: Color = jumpyColor("#B82A2A4A")
     val cardActiveDefaultIcon: Color = jumpyColor("#FFF3F4F6")
     val cardActiveDefaultSubtext: Color = jumpyColor("#FF9CA3AF")
@@ -584,7 +584,7 @@ object JumpyJumpyTokens {
     val cardActiveFocusSubtext: Color = jumpyColor("#FF9CA3AF")
     val cardActiveFocusSurface: Color = jumpyColor("#1AFF5C00")
     val cardActiveFocusText: Color = jumpyColor("#FFF3F4F6")
-    val cardActiveHoverBorder: Color = jumpyColor("#FFFF7A2F")
+    val cardActiveHoverBorder: Color = jumpyColor("#FFFF5C00")
     val cardActiveHoverIcon: Color = jumpyColor("#FFF3F4F6")
     val cardActiveHoverSubtext: Color = jumpyColor("#FF9CA3AF")
     val cardActiveHoverSurface: Color = jumpyColor("#1AFF5C00")
@@ -615,7 +615,7 @@ object JumpyJumpyTokens {
     val cardInactiveFocusSubtext: Color = jumpyColor("#FF9CA3AF")
     val cardInactiveFocusSurface: Color = jumpyColor("#FF1A1A2E")
     val cardInactiveFocusText: Color = jumpyColor("#FFF3F4F6")
-    val cardInactiveHoverBorder: Color = jumpyColor("#FFFF7A2F")
+    val cardInactiveHoverBorder: Color = jumpyColor("#FFFF5C00")
     val cardInactiveHoverIcon: Color = jumpyColor("#FFF3F4F6")
     val cardInactiveHoverSubtext: Color = jumpyColor("#FF9CA3AF")
     val cardInactiveHoverSurface: Color = jumpyColor("#FF1A1A2E")
@@ -747,16 +747,16 @@ object JumpyJumpyTokens {
     val interactiveActiveRegularFocusSurface: Color = jumpyColor("#1AFF5C00")
     val interactiveActiveRegularFocusText: Color = jumpyColor("#FFFF5C00")
     val interactiveActiveRegularHoverBorder: Color = jumpyColor("#1AFF5C00")
-    val interactiveActiveRegularHoverIcon: Color = jumpyColor("#FFFF5C00")
+    val interactiveActiveRegularHoverIcon: Color = jumpyColor("#FFE05200")
     val interactiveActiveRegularHoverSubtext: Color = jumpyColor("#FFF3F4F6")
     val interactiveActiveRegularHoverSurface: Color = jumpyColor("#47FF5C00")
     val interactiveActiveRegularHoverSurfaceAlternate: Color = jumpyColor("#47FF5C00")
-    val interactiveActiveRegularHoverText: Color = jumpyColor("#FFFF5C00")
+    val interactiveActiveRegularHoverText: Color = jumpyColor("#FFE05200")
     val interactiveActiveRegularPressedBorder: Color = jumpyColor("#1AFF5C00")
-    val interactiveActiveRegularPressedIcon: Color = jumpyColor("#FFFF5C00")
+    val interactiveActiveRegularPressedIcon: Color = jumpyColor("#FFE05200")
     val interactiveActiveRegularPressedSubtext: Color = jumpyColor("#FFF3F4F6")
-    val interactiveActiveRegularPressedSurface: Color = jumpyColor("#FFDDEABE")
-    val interactiveActiveRegularPressedText: Color = jumpyColor("#FFFF5C00")
+    val interactiveActiveRegularPressedSurface: Color = jumpyColor("#FFE05200")
+    val interactiveActiveRegularPressedText: Color = jumpyColor("#FFE05200")
     val interactiveInactiveAlarmDefaultBorder: Color = jumpyColor("#FF9CA3AF")
     val interactiveInactiveAlarmDefaultIcon: Color = jumpyColor("#FFDC2626")
     val interactiveInactiveAlarmDefaultSubtext: Color = jumpyColor("#FF575B5E")
@@ -840,17 +840,17 @@ object JumpyJumpyTokens {
     val selectorsActiveFocusIcon: Color = jumpyColor("#FFFFFFFF")
     val selectorsActiveFocusSurface: Color = jumpyColor("#FFFF5C00")
     val selectorsActiveFocusText: Color = jumpyColor("#FFFF5C00")
-    val selectorsActiveHoverBorder: Color = jumpyColor("#FFFF7A2F")
+    val selectorsActiveHoverBorder: Color = jumpyColor("#FFE05200")
     val selectorsActiveHoverHandle: Color = jumpyColor("#FFFFFFFF")
     val selectorsActiveHoverHoverRing: Color = jumpyColor("#1AFF5C00")
     val selectorsActiveHoverIcon: Color = jumpyColor("#FFFFFFFF")
-    val selectorsActiveHoverSurface: Color = jumpyColor("#FFFF7A2F")
-    val selectorsActiveHoverText: Color = jumpyColor("#FFFF5C00")
-    val selectorsActivePressedBorder: Color = jumpyColor("#FFDDEABE")
+    val selectorsActiveHoverSurface: Color = jumpyColor("#FFE05200")
+    val selectorsActiveHoverText: Color = jumpyColor("#FFE05200")
+    val selectorsActivePressedBorder: Color = jumpyColor("#FFE05200")
     val selectorsActivePressedHandle: Color = jumpyColor("#FFFFFFFF")
     val selectorsActivePressedIcon: Color = jumpyColor("#FFFFFFFF")
-    val selectorsActivePressedSurface: Color = jumpyColor("#FFDDEABE")
-    val selectorsActivePressedText: Color = jumpyColor("#FFFF5C00")
+    val selectorsActivePressedSurface: Color = jumpyColor("#FFE05200")
+    val selectorsActivePressedText: Color = jumpyColor("#FFE05200")
     val selectorsActiveReadOnlyBorder: Color = jumpyColor("#FFE3E3E3")
     val selectorsActiveReadOnlyHandle: Color = jumpyColor("#FFE3E3E3")
     val selectorsActiveReadOnlyIcon: Color = jumpyColor("#FFFF5C00")
@@ -901,24 +901,24 @@ object JumpyJumpyTokens {
     val sliderActiveDisabledStopText: Color = jumpyColor("#B82A2A4A")
     val sliderActiveDisabledTrack: Color = jumpyColor("#FF1A1A2E")
     val sliderActiveFocusHandle: Color = jumpyColor("#FFFF5C00")
-    val sliderActiveFocusHandleFocusRing: Color = jumpyColor("#FFE05200")
+    val sliderActiveFocusHandleFocusRing: Color = jumpyColor("#FFFF5C00")
     val sliderActiveFocusHandleSurface: Color = jumpyColor("#00FFFFFF")
     val sliderActiveFocusIcon: Color = jumpyColor("#FFFF5C00")
     val sliderActiveFocusStopDot: Color = jumpyColor("#B82A2A4A")
     val sliderActiveFocusStopText: Color = jumpyColor("#FF343434")
     val sliderActiveFocusTrack: Color = jumpyColor("#FFFF5C00")
-    val sliderActiveHoverHandle: Color = jumpyColor("#FFFF5C00")
+    val sliderActiveHoverHandle: Color = jumpyColor("#FFE05200")
     val sliderActiveHoverHandleSurface: Color = jumpyColor("#1AFF5C00")
-    val sliderActiveHoverIcon: Color = jumpyColor("#FFFF5C00")
+    val sliderActiveHoverIcon: Color = jumpyColor("#FFE05200")
     val sliderActiveHoverStopDot: Color = jumpyColor("#B82A2A4A")
     val sliderActiveHoverStopText: Color = jumpyColor("#FF343434")
-    val sliderActiveHoverTrack: Color = jumpyColor("#FFFF5C00")
-    val sliderActivePressedHandle: Color = jumpyColor("#FFFF5C00")
+    val sliderActiveHoverTrack: Color = jumpyColor("#FFE05200")
+    val sliderActivePressedHandle: Color = jumpyColor("#FFE05200")
     val sliderActivePressedHandleSurface: Color = jumpyColor("#1AFF5C00")
-    val sliderActivePressedIcon: Color = jumpyColor("#FFFF5C00")
+    val sliderActivePressedIcon: Color = jumpyColor("#FFE05200")
     val sliderActivePressedStopDot: Color = jumpyColor("#B82A2A4A")
     val sliderActivePressedStopText: Color = jumpyColor("#FF343434")
-    val sliderActivePressedTrack: Color = jumpyColor("#FFFF5C00")
+    val sliderActivePressedTrack: Color = jumpyColor("#FFE05200")
     val sliderInactiveDefaultIcon: Color = jumpyColor("#FFFF5C00")
     val sliderInactiveDefaultStopDot: Color = jumpyColor("#B82A2A4A")
     val sliderInactiveDefaultStopText: Color = jumpyColor("#FF343434")
@@ -931,11 +931,11 @@ object JumpyJumpyTokens {
     val sliderInactiveFocusStopDot: Color = jumpyColor("#B82A2A4A")
     val sliderInactiveFocusStopText: Color = jumpyColor("#FF343434")
     val sliderInactiveFocusTrack: Color = jumpyColor("#FF1A1A2E")
-    val sliderInactiveHoverIcon: Color = jumpyColor("#FFFF5C00")
+    val sliderInactiveHoverIcon: Color = jumpyColor("#FFE05200")
     val sliderInactiveHoverStopDot: Color = jumpyColor("#B82A2A4A")
     val sliderInactiveHoverStopText: Color = jumpyColor("#FF343434")
     val sliderInactiveHoverTrack: Color = jumpyColor("#FF1A1A2E")
-    val sliderInactivePressedIcon: Color = jumpyColor("#FFFF5C00")
+    val sliderInactivePressedIcon: Color = jumpyColor("#FFE05200")
     val sliderInactivePressedStopDot: Color = jumpyColor("#B82A2A4A")
     val sliderInactivePressedStopText: Color = jumpyColor("#FF343434")
     val sliderInactivePressedTrack: Color = jumpyColor("#FF1A1A2E")