diff --git a/expo-app/components/ui/accordion/index.tsx b/expo-app/components/ui/accordion/index.tsx
index ca4711a7..7dbe6f8f 100644
--- a/expo-app/components/ui/accordion/index.tsx
+++ b/expo-app/components/ui/accordion/index.tsx
@@ -1,7 +1,6 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createAccordion } from '@gluestack-ui/accordion';
-import { Svg } from 'react-native-svg';
 import { View, Pressable, Text, Platform, TextProps } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
@@ -9,9 +8,9 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { H3 } from '@expo/html-elements';
 import { cssInterop } from 'nativewind';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'ACCORDION';
 /** Styles */
@@ -30,7 +29,9 @@ const accordionStyle = tva({
     },
   },
 });
+
 const accordionItemStyle = tva({
+  base: '',
   parentVariants: {
     variant: {
       filled: 'bg-background-0',
@@ -65,7 +66,7 @@ const accordionContentTextStyle = tva({
   base: 'text-typography-700 font-normal',
   parentVariants: {
     size: {
-      sm: 'text-sm ',
+      sm: 'text-sm',
       md: 'text-base',
       lg: 'text-lg',
     },
@@ -75,79 +76,13 @@ const accordionHeaderStyle = tva({
   base: 'mx-0 my-0',
 });
 const accordionContentStyle = tva({
-  base: 'px-5 mt-2 pb-5',
+  base: 'mt-4',
 });
 const accordionTriggerStyle = tva({
-  base: 'w-full py-5 px-5 flex-row justify-between items-center web:outline-none focus:outline-none data-[disabled=true]:opacity-40 data-[disabled=true]:cursor-not-allowed data-[focus-visible=true]:bg-background-50',
+  base: 'w-full flex-row justify-between items-center web:outline-none focus:outline-none data-[disabled=true]:opacity-40 data-[disabled=true]:cursor-not-allowed data-[focus-visible=true]:bg-background-50 py-3 px-4',
 });
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon & React.ComponentPropsWithoutRef<typeof Svg>
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      size,
-      stroke = 'currentColor',
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    const colorProps =
-      stroke === 'currentColor' && color !== undefined ? color : stroke;
-
-    if (AsComp) {
-      return (
-        <AsComp
-          ref={ref}
-          fill={fill}
-          {...props}
-          {...sizeProps}
-          stroke={colorProps}
-        />
-      );
-    }
-    return (
-      <Svg
-        ref={ref}
-        height={height}
-        width={width}
-        fill={fill}
-        stroke={colorProps}
-        {...props}
-      />
-    );
-  }
-);
-
-const Root =
-  Platform.OS === 'web'
-    ? withStyleContext(View, SCOPE)
-    : withStyleContextAndStates(View, SCOPE);
+const Root = withStyleContext(View, SCOPE);
 
 const Header = (
   Platform.OS === 'web' ? H3 : View
@@ -159,30 +94,20 @@ const UIAccordion = createAccordion({
   Item: View,
   Header: Header,
   Trigger: Pressable,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
   TitleText: Text,
   ContentText: Text,
   Content: View,
 });
 
-cssInterop(UIAccordion, { className: 'style' });
-cssInterop(UIAccordion.Item, { className: 'style' });
-cssInterop(UIAccordion.Header, { className: 'style' });
-cssInterop(UIAccordion.Trigger, { className: 'style' });
-cssInterop(UIAccordion.Icon, { className: 'style' });
-cssInterop(UIAccordion.TitleText, { className: 'style' });
-cssInterop(UIAccordion.Content, { className: 'style' });
-cssInterop(UIAccordion.ContentText, { className: 'style' });
-// @ts-ignore
-cssInterop(UIAccordion.Icon, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
diff --git a/expo-app/components/ui/actionsheet/index.tsx b/expo-app/components/ui/actionsheet/index.tsx
index e80735b9..0dc14763 100644
--- a/expo-app/components/ui/actionsheet/index.tsx
+++ b/expo-app/components/ui/actionsheet/index.tsx
@@ -1,7 +1,6 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { H4 } from '@expo/html-elements';
-import { Svg } from 'react-native-svg';
 import { createActionsheet } from '@gluestack-ui/actionsheet';
 import {
   Pressable,
@@ -11,13 +10,11 @@ import {
   VirtualizedList,
   FlatList,
   SectionList,
-  Platform,
   PressableProps,
 } from 'react-native';
-
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import { cssInterop } from 'nativewind';
 import {
   Motion,
@@ -25,68 +22,6 @@ import {
   createMotionAnimatedComponent,
 } from '@legendapp/motion';
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon & React.ComponentPropsWithoutRef<typeof Svg>
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      size,
-      stroke = 'currentColor',
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    const colorProps =
-      stroke === 'currentColor' && color !== undefined ? color : stroke;
-
-    if (AsComp) {
-      return (
-        <AsComp
-          ref={ref}
-          fill={fill}
-          {...props}
-          {...sizeProps}
-          stroke={colorProps}
-        />
-      );
-    }
-    return (
-      <Svg
-        ref={ref}
-        height={height}
-        width={width}
-        fill={fill}
-        stroke={colorProps}
-        {...props}
-      />
-    );
-  }
-);
-
 const ItemWrapper = React.forwardRef<
   React.ElementRef<typeof Pressable>,
   PressableProps
@@ -99,7 +34,7 @@ const AnimatedPressable = createMotionAnimatedComponent(Pressable);
 export const UIActionsheet = createActionsheet({
   Root: View,
   Content: Motion.View,
-  Item: Platform.OS === 'web' ? ItemWrapper : withStates(ItemWrapper),
+  Item: ItemWrapper,
   ItemText: Text,
   DragIndicator: View,
   IndicatorWrapper: View,
@@ -109,7 +44,7 @@ export const UIActionsheet = createActionsheet({
   FlatList: FlatList,
   SectionList: SectionList,
   SectionHeaderText: H4,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
   AnimatePresence: AnimatePresence,
 });
 
@@ -142,15 +77,15 @@ cssInterop(UIActionsheet.FlatList, {
 });
 cssInterop(UIActionsheet.SectionList, { className: 'style' });
 cssInterop(UIActionsheet.SectionHeaderText, { className: 'style' });
-cssInterop(UIActionsheet.Icon, {
+
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
diff --git a/expo-app/components/ui/alert-dialog/index.tsx b/expo-app/components/ui/alert-dialog/index.tsx
index 457db9c6..2bd63535 100644
--- a/expo-app/components/ui/alert-dialog/index.tsx
+++ b/expo-app/components/ui/alert-dialog/index.tsx
@@ -6,7 +6,7 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
+
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 import {
@@ -14,17 +14,14 @@ import {
   AnimatePresence,
   createMotionAnimatedComponent,
 } from '@legendapp/motion';
-import { View, Pressable, ScrollView, Platform } from 'react-native';
+import { View, Pressable, ScrollView } from 'react-native';
 
 const AnimatedPressable = createMotionAnimatedComponent(Pressable);
 
 const SCOPE = 'ALERT_DIALOG';
 
 const UIAccessibleAlertDialog = createAlertDialog({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(View, SCOPE),
+  Root: withStyleContext(View, SCOPE),
   Body: ScrollView,
   Content: Motion.View,
   CloseButton: Pressable,
@@ -34,17 +31,8 @@ const UIAccessibleAlertDialog = createAlertDialog({
   AnimatePresence: AnimatePresence,
 });
 
-cssInterop(UIAccessibleAlertDialog, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Content, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.CloseButton, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Header, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Footer, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Body, {
-  className: 'style',
-  contentContainerClassName: 'contentContainerStyle',
-  indicatorClassName: 'indicatorStyle',
-});
-cssInterop(UIAccessibleAlertDialog.Backdrop, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
+cssInterop(AnimatedPressable, { className: 'style' });
 
 const alertDialogStyle = tva({
   base: 'group/modal w-full h-full justify-center items-center web:pointer-events-none',
diff --git a/expo-app/components/ui/alert/index.tsx b/expo-app/components/ui/alert/index.tsx
index f98aceb9..90a2dfe9 100644
--- a/expo-app/components/ui/alert/index.tsx
+++ b/expo-app/components/ui/alert/index.tsx
@@ -6,10 +6,10 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import React, { useMemo } from 'react';
-import { Svg } from 'react-native-svg';
+import React from 'react';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'ALERT';
 
@@ -33,7 +33,7 @@ const alertStyle = tva({
 });
 
 const alertTextStyle = tva({
-  base: 'flex-1 font-normal font-body',
+  base: 'font-normal font-body',
 
   variants: {
     isTruncated: {
@@ -100,77 +100,25 @@ const alertIconStyle = tva({
       warning: 'text-warning-800',
       success: 'text-success-800',
       info: 'text-info-800',
-      muted: 'text-secondary-800',
+      muted: 'text-background-800',
     },
   },
 });
 
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
-
-const IconWrapper = React.forwardRef<
-  React.ElementRef<typeof PrimitiveIcon>,
-  IPrimitiveIcon
->(({ ...props }, ref) => {
-  return <PrimitiveIcon {...props} ref={ref} />;
-});
-
 export const UIAlert = createAlert({
   Root: withStyleContext(View, SCOPE),
   Text: Text,
-  Icon: IconWrapper,
+  Icon: UIIcon,
 });
 
-cssInterop(UIAlert, { className: 'style' });
-//@ts-ignore
-cssInterop(UIAlert.Text, { className: 'style' });
-cssInterop(IconWrapper, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
diff --git a/expo-app/components/ui/avatar/index.tsx b/expo-app/components/ui/avatar/index.tsx
index 31fcbdd1..b6863aa1 100644
--- a/expo-app/components/ui/avatar/index.tsx
+++ b/expo-app/components/ui/avatar/index.tsx
@@ -9,7 +9,6 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { cssInterop } from 'nativewind';
 const SCOPE = 'AVATAR';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
@@ -21,12 +20,6 @@ const UIAvatar = createAvatar({
   FallbackText: Text,
 });
 
-cssInterop(UIAvatar, { className: 'style' });
-cssInterop(UIAvatar.Badge, { className: 'style' });
-cssInterop(UIAvatar.Group, { className: 'style' });
-cssInterop(UIAvatar.Image, { className: 'style' });
-cssInterop(UIAvatar.FallbackText, { className: 'style' });
-
 const avatarStyle = tva({
   base: 'rounded-full justify-center items-center relative bg-primary-600 group-[.avatar-group]/avatar-group:-ml-2.5',
   variants: {
@@ -161,10 +154,11 @@ export const AvatarImage = React.forwardRef<
       className={avatarImageStyle({
         class: className,
       })}
-      // @ts-ignore
+      // @ts-expect-error
       style={
         Platform.OS === 'web'
-          ? { height: 'revert-layer', width: 'revert-layer' }
+          ? // eslint-disable-next-line react-native/no-inline-styles
+            { height: 'revert-layer', width: 'revert-layer' }
           : undefined
       }
     />
diff --git a/expo-app/components/ui/badge/index.tsx b/expo-app/components/ui/badge/index.tsx
index 42bf6016..6363a340 100644
--- a/expo-app/components/ui/badge/index.tsx
+++ b/expo-app/components/ui/badge/index.tsx
@@ -1,7 +1,7 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { Text, View } from 'react-native';
-import { Svg } from 'react-native-svg';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
@@ -42,7 +42,7 @@ const badgeTextStyle = tva({
       warning: 'text-warning-600',
       success: 'text-success-600',
       info: 'text-info-600',
-      muted: 'text-secondary-600',
+      muted: 'text-background-800',
     },
     size: {
       sm: 'text-2xs',
@@ -83,7 +83,7 @@ const badgeIconStyle = tva({
       warning: 'text-warning-600',
       success: 'text-success-600',
       info: 'text-info-600',
-      muted: 'text-secondary-600',
+      muted: 'text-background-800',
     },
     size: {
       sm: 'h-3 w-3',
@@ -93,58 +93,17 @@ const badgeIconStyle = tva({
   },
 });
 
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
-
 const ContextView = withStyleContext(View, SCOPE);
-cssInterop(ContextView, { className: 'style' });
+
 cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
+      //@ts-expect-error
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
@@ -154,7 +113,7 @@ type IBadgeProps = React.ComponentPropsWithoutRef<typeof ContextView> &
   VariantProps<typeof badgeStyle>;
 const Badge = ({
   children,
-  action = 'info',
+  action = 'muted',
   variant = 'solid',
   size = 'md',
   className,
@@ -205,14 +164,14 @@ type IBadgeIconProps = React.ComponentPropsWithoutRef<typeof PrimitiveIcon> &
   VariantProps<typeof badgeIconStyle>;
 
 const BadgeIcon = React.forwardRef<
-  React.ElementRef<typeof PrimitiveIcon>,
+  React.ElementRef<typeof UIIcon>,
   IBadgeIconProps
 >(({ className, size, ...props }, ref) => {
   const { size: parentSize, action: parentAction } = useStyleContext(SCOPE);
 
   if (typeof size === 'number') {
     return (
-      <PrimitiveIcon
+      <UIIcon
         ref={ref}
         {...props}
         className={badgeIconStyle({ class: className })}
@@ -220,11 +179,11 @@ const BadgeIcon = React.forwardRef<
       />
     );
   } else if (
-    (props.height !== undefined || props.width !== undefined) &&
+    (props?.height !== undefined || props?.width !== undefined) &&
     size === undefined
   ) {
     return (
-      <PrimitiveIcon
+      <UIIcon
         ref={ref}
         {...props}
         className={badgeIconStyle({ class: className })}
@@ -232,7 +191,7 @@ const BadgeIcon = React.forwardRef<
     );
   }
   return (
-    <PrimitiveIcon
+    <UIIcon
       className={badgeIconStyle({
         parentVariants: {
           size: parentSize,
diff --git a/expo-app/components/ui/bottomsheet/index.tsx b/expo-app/components/ui/bottomsheet/index.tsx
deleted file mode 100644
index d627f0ef..00000000
--- a/expo-app/components/ui/bottomsheet/index.tsx
+++ /dev/null
@@ -1,294 +0,0 @@
-import GorhomBottomSheet, {
-  BottomSheetBackdrop as GorhomBottomSheetBackdrop,
-  BottomSheetView as GorhomBottomSheetView,
-  BottomSheetHandle,
-  BottomSheetTextInput as GorhomBottomSheetInput,
-  BottomSheetScrollView as GorhomBottomSheetScrollView,
-  BottomSheetFlatList as GorhomBottomSheetFlatList,
-  BottomSheetSectionList as GorhomBottomSheetSectionList,
-} from '@gorhom/bottom-sheet';
-import { Platform } from 'react-native';
-import type { PressableProps, TextProps } from 'react-native';
-import { FocusScope } from '@react-native-aria/focus';
-import React, {
-  createContext,
-  useCallback,
-  useContext,
-  useMemo,
-  useRef,
-  useState,
-} from 'react';
-import { Pressable, Text } from 'react-native';
-import { cssInterop } from 'nativewind';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-
-const bottomSheetBackdropStyle = tva({
-  base: 'absolute inset-0 flex-1 touch-none select-none bg-black opacity-0',
-});
-
-const bottomSheetContentStyle = tva({
-  base: 'mt-2',
-});
-const bottomSheetTriggerStyle = tva({
-  base: '',
-});
-
-const bottomSheetIndicatorStyle = tva({
-  base: 'py-1 w-full items-center rounded-t-lg ',
-});
-
-const bottomSheetItemStyle = tva({
-  base: 'p-3 flex-row items-center rounded-sm w-full disabled:opacity-0.4 web:pointer-events-auto disabled:cursor-not-allowed hover:bg-background-50 active:bg-background-100 focus:bg-background-100 web:focus-visible:bg-background-100',
-});
-
-const BottomSheetContext = createContext<{
-  visible: boolean;
-  bottomSheetRef: React.RefObject<GorhomBottomSheet>;
-  handleClose: () => void;
-  handleOpen: () => void;
-}>({
-  visible: false,
-  bottomSheetRef: { current: null },
-  handleClose: () => {},
-  handleOpen: () => {},
-});
-
-type IBottomSheetProps = React.ComponentProps<typeof GorhomBottomSheet>;
-export const BottomSheet = ({
-  snapToIndex = 1,
-  onOpen,
-  onClose,
-  ...props
-}: {
-  snapToIndex?: number;
-  children?: React.ReactNode;
-  onOpen?: () => void;
-  onClose?: () => void;
-}) => {
-  const bottomSheetRef = useRef<GorhomBottomSheet>(null);
-
-  const [visible, setVisible] = useState(false);
-
-  const handleOpen = useCallback(() => {
-    bottomSheetRef.current?.snapToIndex(snapToIndex);
-    setVisible(true);
-    onOpen && onOpen();
-  }, [onOpen, snapToIndex]);
-
-  const handleClose = useCallback(() => {
-    bottomSheetRef.current?.close();
-    setVisible(false);
-    onClose && onClose();
-  }, [onClose]);
-
-  return (
-    <BottomSheetContext.Provider
-      value={{
-        visible,
-        bottomSheetRef,
-        handleClose,
-        handleOpen,
-      }}
-    >
-      {props.children}
-    </BottomSheetContext.Provider>
-  );
-};
-
-export const BottomSheetPortal = ({
-  snapPoints,
-  handleComponent: DragIndicator,
-  backdropComponent: BackDrop,
-  ...props
-}: Partial<IBottomSheetProps> & {
-  defaultIsOpen?: boolean;
-  snapToIndex?: number;
-  snapPoints: string[];
-}) => {
-  const { bottomSheetRef, handleClose } = useContext(BottomSheetContext);
-
-  const handleSheetChanges = useCallback(
-    (index: number) => {
-      if (index === 0 || index === -1) {
-        handleClose();
-      }
-    },
-    [handleClose]
-  );
-
-  return (
-    <GorhomBottomSheet
-      ref={bottomSheetRef}
-      snapPoints={snapPoints}
-      index={-1}
-      backdropComponent={BackDrop}
-      onChange={handleSheetChanges}
-      handleComponent={DragIndicator}
-      enablePanDownToClose={true}
-      {...props}
-    >
-      {props.children}
-    </GorhomBottomSheet>
-  );
-};
-
-export const BottomSheetTrigger = ({
-  className,
-  ...props
-}: PressableProps & { className?: string }) => {
-  const { handleOpen } = useContext(BottomSheetContext);
-  return (
-    <Pressable
-      onPress={(e) => {
-        props.onPress && props.onPress(e);
-        handleOpen();
-      }}
-      {...props}
-      className={bottomSheetTriggerStyle({
-        className: className,
-      })}
-    >
-      {props.children}
-    </Pressable>
-  );
-};
-type IBottomSheetBackdrop = React.ComponentProps<
-  typeof GorhomBottomSheetBackdrop
->;
-
-export const BottomSheetBackdrop = ({
-  disappearsOnIndex = -1,
-  appearsOnIndex = 1,
-  className,
-  ...props
-}: Partial<IBottomSheetBackdrop> & { className?: string }) => {
-  return (
-    <GorhomBottomSheetBackdrop
-      // @ts-ignore
-      className={bottomSheetBackdropStyle({
-        className: className,
-      })}
-      disappearsOnIndex={disappearsOnIndex}
-      appearsOnIndex={appearsOnIndex}
-      {...props}
-    />
-  );
-};
-
-cssInterop(GorhomBottomSheetBackdrop, { className: 'style' });
-
-type IBottomSheetDragIndicator = React.ComponentProps<typeof BottomSheetHandle>;
-
-export const BottomSheetDragIndicator = ({
-  children,
-  className,
-  ...props
-}: Partial<IBottomSheetDragIndicator> & { className?: string }) => {
-  return (
-    <BottomSheetHandle
-      {...props}
-      // @ts-ignore
-      className={bottomSheetIndicatorStyle({
-        className: className,
-      })}
-    >
-      {children}
-    </BottomSheetHandle>
-  );
-};
-
-cssInterop(BottomSheetHandle, { className: 'style' });
-
-type IBottomSheetContent = React.ComponentProps<typeof GorhomBottomSheetView>;
-
-export const BottomSheetContent = ({ ...props }: IBottomSheetContent) => {
-  const { handleClose, visible } = useContext(BottomSheetContext);
-  const keyDownHandlers = useMemo(() => {
-    return Platform.OS === 'web'
-      ? {
-          onKeyDown: (e: React.KeyboardEvent) => {
-            if (e.key === 'Escape') {
-              e.preventDefault();
-              handleClose();
-              return;
-            }
-          },
-        }
-      : {};
-  }, [handleClose]);
-
-  if (Platform.OS === 'web')
-    return (
-      <GorhomBottomSheetView
-        {...props}
-        // @ts-ignore
-        {...keyDownHandlers}
-        className={bottomSheetContentStyle({
-          className: props.className,
-        })}
-      >
-        {visible && (
-          <FocusScope contain={visible} autoFocus={true} restoreFocus={true}>
-            {props.children}
-          </FocusScope>
-        )}
-      </GorhomBottomSheetView>
-    );
-
-  return (
-    <GorhomBottomSheetView
-      {...props}
-      // @ts-ignore
-      {...keyDownHandlers}
-      className={bottomSheetContentStyle({
-        className: props.className,
-      })}
-    >
-      {props.children}
-    </GorhomBottomSheetView>
-  );
-};
-
-cssInterop(GorhomBottomSheetView, { className: 'style' });
-
-export const BottomSheetItem = ({
-  children,
-  className,
-  closeOnSelect = true,
-  ...props
-}: PressableProps & {
-  closeOnSelect?: boolean;
-}) => {
-  const { handleClose } = useContext(BottomSheetContext);
-  return (
-    <Pressable
-      {...props}
-      className={bottomSheetItemStyle({
-        className: className,
-      })}
-      onPress={(e) => {
-        if (closeOnSelect) {
-          handleClose();
-        }
-        props.onPress && props.onPress(e);
-      }}
-      role="button"
-    >
-      {children}
-    </Pressable>
-  );
-};
-
-export const BottomSheetItemText = ({ ...props }: TextProps) => {
-  return <Text {...props} />;
-};
-
-export const BottomSheetScrollView = GorhomBottomSheetScrollView;
-export const BottomSheetFlatList = GorhomBottomSheetFlatList;
-export const BottomSheetSectionList = GorhomBottomSheetSectionList;
-export const BottomSheetTextInput = GorhomBottomSheetInput;
-
-cssInterop(GorhomBottomSheetInput, { className: 'style' });
-cssInterop(GorhomBottomSheetScrollView, { className: 'style' });
-cssInterop(GorhomBottomSheetFlatList, { className: 'style' });
-cssInterop(GorhomBottomSheetSectionList, { className: 'style' });
diff --git a/expo-app/components/ui/button/index.tsx b/expo-app/components/ui/button/index.tsx
index 1cb78b36..112ca504 100644
--- a/expo-app/components/ui/button/index.tsx
+++ b/expo-app/components/ui/button/index.tsx
@@ -1,109 +1,26 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createButton } from '@gluestack-ui/button';
-import { Svg } from 'react-native-svg';
-import type { PressableProps } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-import {
-  ActivityIndicator,
-  Pressable,
-  Text,
-  View,
-  Platform,
-} from 'react-native';
+import { ActivityIndicator, Pressable, Text, View } from 'react-native';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'BUTTON';
-const ButtonWrapper = React.forwardRef<
-  React.ElementRef<typeof Pressable>,
-  PressableProps
->(({ ...props }, ref) => {
-  return <Pressable {...props} ref={ref} />;
-});
-
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-};
-const PrimitiveIcon = React.forwardRef(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      size,
-      stroke = 'currentColor',
-      as: AsComp,
-      ...props
-    }: IPrimitiveIcon,
-    ref: React.Ref<Svg>
-  ) => {
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    const colorProps =
-      stroke === 'currentColor' && color !== undefined ? color : stroke;
-
-    if (AsComp) {
-      return (
-        <AsComp
-          ref={ref}
-          fill={fill}
-          {...props}
-          {...sizeProps}
-          stroke={colorProps}
-        />
-      );
-    }
-    return (
-      <Svg
-        ref={ref}
-        height={height}
-        width={width}
-        fill={fill}
-        stroke={colorProps}
-        {...props}
-      />
-    );
-  }
-);
 
-const Root =
-  Platform.OS === 'web'
-    ? withStyleContext(ButtonWrapper, SCOPE)
-    : withStyleContextAndStates(ButtonWrapper, SCOPE);
+const Root = withStyleContext(Pressable, SCOPE);
 
 const UIButton = createButton({
   Root: Root,
   Text,
   Group: View,
   Spinner: ActivityIndicator,
-  Icon: withStates(PrimitiveIcon),
-});
-
-cssInterop(Root, { className: 'style' });
-cssInterop(UIButton.Text, { className: 'style' });
-cssInterop(UIButton.Group, { className: 'style' });
-cssInterop(UIButton.Spinner, {
-  className: { target: 'style', nativeStyleToProp: { color: true } },
+  Icon: UIIcon,
 });
 
 cssInterop(PrimitiveIcon, {
@@ -112,22 +29,21 @@ cssInterop(PrimitiveIcon, {
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
 });
 
 const buttonStyle = tva({
-  base: 'group/button rounded bg-primary-500 flex-row items-center justify-center data-[focus-visible=true]:web:outline-none data-[focus-visible=true]:web:ring-2 data-[disabled=true]:opacity-40',
+  base: 'group/button rounded bg-primary-500 flex-row items-center justify-center data-[focus-visible=true]:web:outline-none data-[focus-visible=true]:web:ring-2 data-[disabled=true]:opacity-40 gap-2',
   variants: {
     action: {
       primary:
         'bg-primary-500 data-[hover=true]:bg-primary-600 data-[active=true]:bg-primary-700 border-primary-300 data-[hover=true]:border-primary-400 data-[active=true]:border-primary-500 data-[focus-visible=true]:web:ring-indicator-info',
       secondary:
-        'bg-secondary-500 border-secondary-300 data-[hover=true]:bg-secondary-600 data-[hover=true]:border-secondary-400 data-[active=true]:bg-secondary-700 data-[active=true]:border-secondary-500 data-[focus-visible=true]:web:ring-indicator-info',
+        'bg-secondary-500 border-secondary-300 data-[hover=true]:bg-secondary-600 data-[hover=true]:border-secondary-400 data-[active=true]:bg-secondary-700 data-[active=true]:border-secondary-700 data-[focus-visible=true]:web:ring-indicator-info',
       positive:
         'bg-success-500 border-success-300 data-[hover=true]:bg-success-600 data-[hover=true]:border-success-400 data-[active=true]:bg-success-700 data-[active=true]:border-success-500 data-[focus-visible=true]:web:ring-indicator-info',
       negative:
@@ -209,7 +125,7 @@ const buttonTextStyle = tva({
       primary:
         'text-primary-600 data-[hover=true]:text-primary-600 data-[active=true]:text-primary-700',
       secondary:
-        'text-secondary-600 data-[hover=true]:text-secondary-600 data-[active=true]:text-secondary-700',
+        'text-typography-500 data-[hover=true]:text-typography-600 data-[active=true]:text-typography-700',
       positive:
         'text-success-600 data-[hover=true]:text-success-600 data-[active=true]:text-success-700',
       negative:
@@ -240,7 +156,7 @@ const buttonTextStyle = tva({
       variant: 'solid',
       action: 'secondary',
       class:
-        'text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0',
+        'text-typography-800 data-[hover=true]:text-typography-800 data-[active=true]:text-typography-800',
     },
     {
       variant: 'solid',
@@ -264,7 +180,7 @@ const buttonTextStyle = tva({
       variant: 'outline',
       action: 'secondary',
       class:
-        'text-primary-500 data-[hover=true]:text-primary-500 data-[active=true]:text-primary-500',
+        'text-typography-500 data-[hover=true]:text-primary-600 data-[active=true]:text-typography-700',
     },
     {
       variant: 'outline',
@@ -301,7 +217,7 @@ const buttonIconStyle = tva({
       primary:
         'text-primary-600 data-[hover=true]:text-primary-600 data-[active=true]:text-primary-700',
       secondary:
-        'text-secondary-600 data-[hover=true]:text-secondary-600 data-[active=true]:text-secondary-700',
+        'text-typography-500 data-[hover=true]:text-typography-600 data-[active=true]:text-typography-700',
       positive:
         'text-success-600 data-[hover=true]:text-success-600 data-[active=true]:text-success-700',
 
@@ -320,7 +236,7 @@ const buttonIconStyle = tva({
       variant: 'solid',
       action: 'secondary',
       class:
-        'text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0',
+        'text-typography-800 data-[hover=true]:text-typography-800 data-[active=true]:text-typography-800',
     },
     {
       variant: 'solid',
@@ -353,6 +269,12 @@ const buttonGroupStyle = tva({
     isAttached: {
       true: 'gap-0',
     },
+    flexDirection: {
+      'row': 'flex-row',
+      'column': 'flex-col',
+      'row-reverse': 'flex-row-reverse',
+      'column-reverse': 'flex-col-reverse',
+    },
   },
 });
 
@@ -475,15 +397,31 @@ type IButtonGroupProps = React.ComponentPropsWithoutRef<typeof UIButton.Group> &
 const ButtonGroup = React.forwardRef<
   React.ElementRef<typeof UIButton.Group>,
   IButtonGroupProps
->(({ className, space = 'md', isAttached = false, ...props }, ref) => {
-  return (
-    <UIButton.Group
-      className={buttonGroupStyle({ class: className, space, isAttached })}
-      {...props}
-      ref={ref}
-    />
-  );
-});
+>(
+  (
+    {
+      className,
+      space = 'md',
+      isAttached = false,
+      flexDirection = 'column',
+      ...props
+    },
+    ref
+  ) => {
+    return (
+      <UIButton.Group
+        className={buttonGroupStyle({
+          class: className,
+          space,
+          isAttached,
+          flexDirection,
+        })}
+        {...props}
+        ref={ref}
+      />
+    );
+  }
+);
 
 Button.displayName = 'Button';
 ButtonText.displayName = 'ButtonText';
diff --git a/expo-app/components/ui/checkbox/index.tsx b/expo-app/components/ui/checkbox/index.tsx
index aaaa8f01..4e85cace 100644
--- a/expo-app/components/ui/checkbox/index.tsx
+++ b/expo-app/components/ui/checkbox/index.tsx
@@ -1,19 +1,16 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createCheckbox } from '@gluestack-ui/checkbox';
-import { View, Pressable, Text } from 'react-native';
+import { View, Pressable, Text, Platform } from 'react-native';
 import type { TextProps, ViewProps } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { Svg } from 'react-native-svg';
+import { PrimitiveIcon, IPrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { Platform } from 'react-native';
 
 const IndicatorWrapper = React.forwardRef<
   React.ElementRef<typeof View>,
@@ -28,81 +25,34 @@ const LabelWrapper = React.forwardRef<React.ElementRef<typeof Text>, TextProps>(
   }
 );
 
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
 const IconWrapper = React.forwardRef<
   React.ElementRef<typeof PrimitiveIcon>,
   IPrimitiveIcon
 >(({ ...props }, ref) => {
-  return <PrimitiveIcon {...props} ref={ref} />;
-});
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
+  return <UIIcon {...props} ref={ref} />;
 });
 
 const SCOPE = 'CHECKBOX';
 const UICheckbox = createCheckbox({
-  // @ts-ignore
+  // @ts-expect-error
   Root:
     Platform.OS === 'web'
       ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(Pressable, SCOPE),
-  Group: Platform.OS === 'web' ? View : withStates(View),
-  Icon: Platform.OS === 'web' ? IconWrapper : withStates(IconWrapper),
-  Label: Platform.OS === 'web' ? LabelWrapper : withStates(LabelWrapper),
-  Indicator:
-    Platform.OS === 'web' ? IndicatorWrapper : withStates(IndicatorWrapper),
+      : withStyleContext(Pressable, SCOPE),
+  Group: View,
+  Icon: IconWrapper,
+  Label: LabelWrapper,
+  Indicator: IndicatorWrapper,
 });
 
-cssInterop(UICheckbox, { className: 'style' });
-cssInterop(UICheckbox.Group, { className: 'style' });
-cssInterop(LabelWrapper, { className: 'style' });
-cssInterop(IndicatorWrapper, { className: 'style' });
-cssInterop(IconWrapper, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
diff --git a/expo-app/components/ui/divider/index.tsx b/expo-app/components/ui/divider/index.tsx
index 61404a4b..e9b663a6 100644
--- a/expo-app/components/ui/divider/index.tsx
+++ b/expo-app/components/ui/divider/index.tsx
@@ -1,9 +1,7 @@
 'use client';
 import React from 'react';
-import { createDivider } from '@gluestack-ui/divider';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { View } from 'react-native';
-import { cssInterop } from 'nativewind';
+import { Platform, View } from 'react-native';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 const dividerStyle = tva({
@@ -16,21 +14,19 @@ const dividerStyle = tva({
   },
 });
 
-const UIDivider = createDivider({ Root: View });
-
-cssInterop(UIDivider, { className: 'style' });
-
-type IUIDividerProps = React.ComponentPropsWithoutRef<typeof UIDivider> &
+type IUIDividerProps = React.ComponentPropsWithoutRef<typeof View> &
   VariantProps<typeof dividerStyle>;
 
 const Divider = React.forwardRef<
-  React.ElementRef<typeof UIDivider>,
+  React.ElementRef<typeof View>,
   IUIDividerProps
 >(({ className, orientation = 'horizontal', ...props }, ref) => {
   return (
-    <UIDivider
+    <View
       ref={ref}
       {...props}
+      aria-orientation={orientation}
+      role={Platform.OS === 'web' ? 'separator' : undefined}
       className={dividerStyle({
         orientation,
         class: className,
diff --git a/expo-app/components/ui/drawer/index.tsx b/expo-app/components/ui/drawer/index.tsx
new file mode 100644
index 00000000..9172862b
--- /dev/null
+++ b/expo-app/components/ui/drawer/index.tsx
@@ -0,0 +1,336 @@
+'use client';
+import React from 'react';
+import { createModal as createDrawer } from '@gluestack-ui/modal';
+import { Pressable, View, ScrollView, Dimensions } from 'react-native';
+import {
+  Motion,
+  AnimatePresence,
+  createMotionAnimatedComponent,
+} from '@legendapp/motion';
+import { tva } from '@gluestack-ui/nativewind-utils/tva';
+import {
+  withStyleContext,
+  useStyleContext,
+} from '@gluestack-ui/nativewind-utils/withStyleContext';
+import { cssInterop } from 'nativewind';
+import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+
+const AnimatedPressable = createMotionAnimatedComponent(Pressable);
+const SCOPE = 'MODAL';
+const screenWidth = Dimensions.get('window').width;
+const screenHeight = Dimensions.get('window').height;
+const sizes: { [key: string]: number } = {
+  sm: 0.25,
+  md: 0.5,
+  lg: 0.75,
+  full: 1,
+};
+
+const UIDrawer = createDrawer({
+  Root: withStyleContext(View, SCOPE),
+  Backdrop: AnimatedPressable,
+  Content: Motion.View,
+  Body: ScrollView,
+  CloseButton: Pressable,
+  Footer: View,
+  Header: View,
+  AnimatePresence: AnimatePresence,
+});
+
+cssInterop(AnimatedPressable, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
+
+const drawerStyle = tva({
+  base: 'w-full h-full web:pointer-events-none relative',
+  variants: {
+    size: {
+      sm: '',
+      md: '',
+      lg: '',
+      full: '',
+    },
+    anchor: {
+      left: 'items-start',
+      right: 'items-end',
+      top: 'justify-start',
+      bottom: 'justify-end',
+    },
+  },
+});
+
+const drawerBackdropStyle = tva({
+  base: 'absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default',
+});
+
+const drawerContentStyle = tva({
+  base: 'bg-background-0 overflow-scroll border-outline-100 p-6 absolute',
+  parentVariants: {
+    size: {
+      sm: 'w-1/4',
+      md: 'w-1/2',
+      lg: 'w-3/4',
+      full: 'w-full',
+    },
+    anchor: {
+      left: 'h-full border-r',
+      right: 'h-full border-l',
+      top: 'w-full border-b',
+      bottom: 'w-full border-t',
+    },
+  },
+  parentCompoundVariants: [
+    {
+      anchor: 'top',
+      size: 'sm',
+      class: 'h-1/4',
+    },
+    {
+      anchor: 'top',
+      size: 'md',
+      class: 'h-1/2',
+    },
+    {
+      anchor: 'top',
+      size: 'lg',
+      class: 'h-3/4',
+    },
+    {
+      anchor: 'top',
+      size: 'full',
+      class: 'h-full',
+    },
+    {
+      anchor: 'bottom',
+      size: 'sm',
+      class: 'h-1/4',
+    },
+    {
+      anchor: 'bottom',
+      size: 'md',
+      class: 'h-1/2',
+    },
+    {
+      anchor: 'bottom',
+      size: 'lg',
+      class: 'h-3/4',
+    },
+    {
+      anchor: 'bottom',
+      size: 'full',
+      class: 'h-full',
+    },
+  ],
+});
+
+const drawerCloseButtonStyle = tva({
+  base: 'z-10 rounded data-[focus-visible=true]:web:bg-background-100 web:outline-0 cursor-pointer',
+});
+
+const drawerHeaderStyle = tva({
+  base: 'justify-between items-center flex-row',
+});
+
+const drawerBodyStyle = tva({
+  base: 'mt-4 mb-6 shrink-0',
+});
+
+const drawerFooterStyle = tva({
+  base: 'flex-row justify-end items-center',
+});
+
+type IDrawerProps = React.ComponentProps<typeof UIDrawer> &
+  VariantProps<typeof drawerStyle> & { className?: string };
+
+type IDrawerBackdropProps = React.ComponentProps<typeof UIDrawer.Backdrop> &
+  VariantProps<typeof drawerBackdropStyle> & { className?: string };
+
+type IDrawerContentProps = React.ComponentProps<typeof UIDrawer.Content> &
+  VariantProps<typeof drawerContentStyle> & { className?: string };
+
+type IDrawerHeaderProps = React.ComponentProps<typeof UIDrawer.Header> &
+  VariantProps<typeof drawerHeaderStyle> & { className?: string };
+
+type IDrawerBodyProps = React.ComponentProps<typeof UIDrawer.Body> &
+  VariantProps<typeof drawerBodyStyle> & { className?: string };
+
+type IDrawerFooterProps = React.ComponentProps<typeof UIDrawer.Footer> &
+  VariantProps<typeof drawerFooterStyle> & { className?: string };
+
+type IDrawerCloseButtonProps = React.ComponentProps<
+  typeof UIDrawer.CloseButton
+> &
+  VariantProps<typeof drawerCloseButtonStyle> & { className?: string };
+
+const Drawer = React.forwardRef<
+  React.ElementRef<typeof UIDrawer>,
+  IDrawerProps
+>(({ className, size = 'sm', anchor = 'left', ...props }, ref) => {
+  return (
+    <UIDrawer
+      ref={ref}
+      {...props}
+      pointerEvents="box-none"
+      className={drawerStyle({ size, anchor, class: className })}
+      context={{ size, anchor }}
+    />
+  );
+});
+
+const DrawerBackdrop = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Backdrop>,
+  IDrawerBackdropProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.Backdrop
+      ref={ref}
+      initial={{
+        opacity: 0,
+      }}
+      animate={{
+        opacity: 0.5,
+      }}
+      exit={{
+        opacity: 0,
+      }}
+      transition={{
+        type: 'spring',
+        damping: 18,
+        stiffness: 250,
+        opacity: {
+          type: 'timing',
+          duration: 250,
+        },
+      }}
+      {...props}
+      className={drawerBackdropStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+const DrawerContent = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Content>,
+  IDrawerContentProps
+>(({ className, ...props }, ref) => {
+  const { size: parentSize, anchor: parentAnchor } = useStyleContext(SCOPE);
+
+  const drawerHeight = screenHeight * (sizes[parentSize] || sizes.md);
+  const drawerWidth = screenWidth * (sizes[parentSize] || sizes.md);
+
+  const isHorizontal = parentAnchor === 'left' || parentAnchor === 'right';
+
+  const initialObj = isHorizontal
+    ? { x: parentAnchor === 'left' ? -drawerWidth : drawerWidth }
+    : { y: parentAnchor === 'top' ? -drawerHeight : drawerHeight };
+
+  const animateObj = isHorizontal ? { x: 0 } : { y: 0 };
+
+  const exitObj = isHorizontal
+    ? { x: parentAnchor === 'left' ? -drawerWidth : drawerWidth }
+    : { y: parentAnchor === 'top' ? -drawerHeight : drawerHeight };
+
+  const customClass = isHorizontal
+    ? `top-0 ${parentAnchor === 'left' ? 'left-0' : 'right-0'}`
+    : `left-0 ${parentAnchor === 'top' ? 'top-0' : 'bottom-0'}`;
+
+  return (
+    <UIDrawer.Content
+      ref={ref}
+      initial={initialObj}
+      animate={animateObj}
+      exit={exitObj}
+      transition={{
+        type: 'timing',
+        duration: 300,
+      }}
+      {...props}
+      className={drawerContentStyle({
+        parentVariants: {
+          size: parentSize,
+          anchor: parentAnchor,
+        },
+        class: `${className} ${customClass}`,
+      })}
+      pointerEvents="auto"
+    />
+  );
+});
+
+const DrawerHeader = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Header>,
+  IDrawerHeaderProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.Header
+      ref={ref}
+      {...props}
+      className={drawerHeaderStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+const DrawerBody = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Body>,
+  IDrawerBodyProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.Body
+      ref={ref}
+      {...props}
+      className={drawerBodyStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+const DrawerFooter = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Footer>,
+  IDrawerFooterProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.Footer
+      ref={ref}
+      {...props}
+      className={drawerFooterStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+const DrawerCloseButton = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.CloseButton>,
+  IDrawerCloseButtonProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.CloseButton
+      ref={ref}
+      {...props}
+      className={drawerCloseButtonStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+Drawer.displayName = 'Drawer';
+DrawerBackdrop.displayName = 'DrawerBackdrop';
+DrawerContent.displayName = 'DrawerContent';
+DrawerHeader.displayName = 'DrawerHeader';
+DrawerBody.displayName = 'DrawerBody';
+DrawerFooter.displayName = 'DrawerFooter';
+DrawerCloseButton.displayName = 'DrawerCloseButton';
+
+export {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerCloseButton,
+  DrawerHeader,
+  DrawerBody,
+  DrawerFooter,
+};
diff --git a/expo-app/components/ui/fab/index.tsx b/expo-app/components/ui/fab/index.tsx
index f1544824..98840f89 100644
--- a/expo-app/components/ui/fab/index.tsx
+++ b/expo-app/components/ui/fab/index.tsx
@@ -1,80 +1,32 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createFab } from '@gluestack-ui/fab';
-import { Platform, Text } from 'react-native';
-import { Pressable } from 'react-native';
-import { Svg } from 'react-native-svg';
+import { Pressable, Text } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'FAB';
+const Root = withStyleContext(Pressable, SCOPE);
 const UIFab = createFab({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(Pressable, SCOPE)
-      : withStyleContextAndStates(Pressable, SCOPE),
+  Root: Root,
   Label: Text,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
 });
 
-cssInterop(UIFab, { className: 'style' });
-cssInterop(UIFab.Label, { className: 'style' });
-cssInterop(UIFab.Icon, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
@@ -147,7 +99,7 @@ const fabLabelStyle = tva({
 });
 
 const fabIconStyle = tva({
-  base: 'text-typography-50 hover:text-typography-0 active:text-typography-0 fill-none',
+  base: 'text-typography-50 fill-none',
   variants: {
     size: {
       '2xs': 'h-3 w-3',
diff --git a/expo-app/components/ui/form-control/index.tsx b/expo-app/components/ui/form-control/index.tsx
index fcdf8cc1..895b207a 100644
--- a/expo-app/components/ui/form-control/index.tsx
+++ b/expo-app/components/ui/form-control/index.tsx
@@ -1,7 +1,6 @@
 'use client';
 import { Text, View } from 'react-native';
-import React, { useMemo } from 'react';
-import { Svg } from 'react-native-svg';
+import React from 'react';
 import { createFormControl } from '@gluestack-ui/form-control';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
@@ -10,50 +9,10 @@ import {
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'FORM_CONTROL';
 
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
-
 const formControlStyle = tva({
   base: 'flex flex-col',
   variants: {
@@ -278,7 +237,7 @@ export const UIFormControl = createFormControl({
   Root: withStyleContext(View, SCOPE),
   Error: View,
   ErrorText: Text,
-  ErrorIcon: PrimitiveIcon,
+  ErrorIcon: UIIcon,
   Label: View,
   LabelText: Text,
   LabelAstrick: FormControlLabelAstrick,
@@ -286,20 +245,12 @@ export const UIFormControl = createFormControl({
   HelperText: Text,
 });
 
-cssInterop(UIFormControl, { className: 'style' });
-cssInterop(UIFormControl.Error, { className: 'style' });
-cssInterop(UIFormControl.Error.Text, { className: 'style' });
-cssInterop(UIFormControl.Label, { className: 'style' });
-cssInterop(UIFormControl.Label.Text, { className: 'style' });
-cssInterop(UIFormControl.Helper, { className: 'style' });
-cssInterop(UIFormControl.Helper.Text, { className: 'style' });
-cssInterop(UIFormControl.Error.Icon, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
       color: true,
       stroke: true,
diff --git a/expo-app/components/ui/gluestack-ui-provider/config.js b/expo-app/components/ui/gluestack-ui-provider/config.js
deleted file mode 100644
index 5a480a63..00000000
--- a/expo-app/components/ui/gluestack-ui-provider/config.js
+++ /dev/null
@@ -1,304 +0,0 @@
-"use client";
-import { vars } from "nativewind";
-export const config = {
-  light: vars({
-    "--color-primary-0": "#B3B3B3",
-    "--color-primary-50": "#999999",
-    "--color-primary-100": "#808080",
-    "--color-primary-200": "#737373",
-    "--color-primary-300": "#666666",
-    "--color-primary-400": "#525252",
-    "--color-primary-500": "#333333",
-    "--color-primary-600": "#292929",
-    "--color-primary-700": "#1F1F1F",
-    "--color-primary-800": "#0D0D0D",
-    "--color-primary-900": "#0A0A0A",
-    "--color-primary-950": "#080808",
-    /* Secondary  */
-    "--color-secondary-0": "#FEFFFF",
-    "--color-secondary-50": "#F1F2F2",
-    "--color-secondary-100": "#E7E8E8",
-    "--color-secondary-200": "#DBDBDB",
-    "--color-secondary-300": "#AFB0B0",
-    "--color-secondary-400": "#727373",
-    "--color-secondary-500": "#5E5F5F",
-    "--color-secondary-600": "#515252",
-    "--color-secondary-700": "#3F4040",
-    "--color-secondary-800": "#272626",
-    "--color-secondary-900": "#181717",
-    "--color-secondary-950": "#0B0C0C",
-    /* Tertiary */
-    "--color-tertiary-0": "#FFFAF5",
-    "--color-tertiary-50": "#FFF2E5",
-    "--color-tertiary-100": "#FFE9D5",
-    "--color-tertiary-200": "#FED1AA",
-    "--color-tertiary-300": "#FDB474",
-    "--color-tertiary-400": "#FB9D4B",
-    "--color-tertiary-500": "#E78128",
-    "--color-tertiary-600": "#D7751F",
-    "--color-tertiary-700": "#B4621A",
-    "--color-tertiary-800": "#824917",
-    "--color-tertiary-900": "#6C3D13",
-    "--color-tertiary-950": "#543112",
-    /* Error */
-    "--color-error-0": "#FEE9E9",
-    "--color-error-50": "#FEE2E2",
-    "--color-error-100": "#FECACA",
-    "--color-error-200": "#FCA5A5",
-    "--color-error-300": "#F87171",
-    "--color-error-400": "#EF4444",
-    "--color-error-500": "#E63535",
-    "--color-error-600": "#DC2626",
-    "--color-error-700": "#B91C1C",
-    "--color-error-800": "#991B1B",
-    "--color-error-900": "#7F1D1D",
-    "--color-error-950": "#531313",
-    /* Success */
-    "--color-success-0": "#E4FFF4",
-    "--color-success-50": "#CAFFE8",
-    "--color-success-100": "#A2F1C0",
-    "--color-success-200": "#84D3A2",
-    "--color-success-300": "#66B584",
-    "--color-success-400": "#489766",
-    "--color-success-500": "#348352",
-    "--color-success-600": "#2A7948",
-    "--color-success-700": "#206F3E",
-    "--color-success-800": "#166534",
-    "--color-success-900": "#14532D",
-    "--color-success-950": "#1B3224",
-    /* Warning */
-    "--color-warning-0": "#FFFDFB",
-    "--color-warning-50": "#FFF9F5",
-    "--color-warning-100": "#FFE7D5",
-    "--color-warning-200": "#FECDAA",
-    "--color-warning-300": "#FDAD74",
-    "--color-warning-400": "#FB954B",
-    "--color-warning-500": "#E77828",
-    "--color-warning-600": "#D76C1F",
-    "--color-warning-700": "#B45A1A",
-    "--color-warning-800": "#824417",
-    "--color-warning-900": "#6C3813",
-    "--color-warning-950": "#542D12",
-    /* Info */
-    "--color-info-0": "#ECF8FE",
-    "--color-info-50": "#C7EBFC",
-    "--color-info-100": "#A2DDFA",
-    "--color-info-200": "#7CCFF8",
-    "--color-info-300": "#57C2F6",
-    "--color-info-400": "#32B4F4",
-    "--color-info-500": "#0DA6F2",
-    "--color-info-600": "#0B8DCD",
-    "--color-info-700": "#0973A8",
-    "--color-info-800": "#075A83",
-    "--color-info-900": "#05405D",
-    "--color-info-950": "#032638",
-    /* Typography */
-    "--color-typography-0": "#FEFEFF",
-    "--color-typography-50": "#F5F5F5",
-    "--color-typography-100": "#E5E5E5",
-    "--color-typography-200": "#DBDBDC",
-    "--color-typography-300": "#D4D4D4",
-    "--color-typography-400": "#A3A3A3",
-    "--color-typography-500": "#8C8C8C",
-    "--color-typography-600": "#737373",
-    "--color-typography-700": "#525252",
-    "--color-typography-800": "#404040",
-    "--color-typography-900": "#262627",
-    "--color-typography-950": "#171717",
-    /* Outline */
-    "--color-outline-0": "#FDFEFE",
-    "--color-outline-50": "#F3F3F3",
-    "--color-outline-100": "#E6E6E6",
-    "--color-outline-200": "#DDDCDB",
-    "--color-outline-300": "#D3D3D3",
-    "--color-outline-400": "#A5A3A3",
-    "--color-outline-500": "#8C8D8D",
-    "--color-outline-600": "#737474",
-    "--color-outline-700": "#535252",
-    "--color-outline-800": "#414141",
-    "--color-outline-900": "#272624",
-    "--color-outline-950": "#1A1717",
-    /* Background */
-    "--color-background-0": "#FFFFFF",
-    "--color-background-50": "#F6F6F6",
-    "--color-background-100": "#F2F1F1",
-    "--color-background-200": "#DCDBDB",
-    "--color-background-300": "#D5D4D4",
-    "--color-background-400": "#A2A3A3",
-    "--color-background-500": "#8E8E8E",
-    "--color-background-600": "#747474",
-    "--color-background-700": "#535252",
-    "--color-background-800": "#414040",
-    "--color-background-900": "#272625",
-    "--color-background-950": "#181718",
-    /* Background Special */
-    "--color-background-error": "#FEF1F1",
-    "--color-background-warning": "#FFF4EB",
-    "--color-background-success": "#EDFCF2",
-    "--color-background-muted": "#F6F6F7",
-    "--color-background-info": "#EBF8FE",
-    /* Border */
-    "--color-border-0": "#FDFEFE",
-    "--color-border-50": "#F3F3F3",
-    "--color-border-100": "#E6E6E6",
-    "--color-border-200": "#DDDCDB",
-    "--color-border-300": "#D3D3D3",
-    "--color-border-400": "#A5A3A3",
-    "--color-border-500": "#8C8D8D",
-    "--color-border-600": "#737474",
-    "--color-border-700": "#535252",
-    "--color-border-800": "#414141",
-    "--color-border-900": "#272624",
-    "--color-border-950": "#1A1717",
-  }),
-  dark: vars({
-    "--color-primary-0": "#828282",
-    "--color-primary-50": "#949494",
-    "--color-primary-100": "#9E9E9E",
-    "--color-primary-200": "#B3B3B3",
-    "--color-primary-300": "#C7C7C7",
-    "--color-primary-400": "#E6E6E6",
-    "--color-primary-500": "#F0F0F0",
-    "--color-primary-600": "#FAFAFA",
-    "--color-primary-700": "#FCFCFC",
-    "--color-primary-800": "#FDFDFD",
-    "--color-primary-900": "#FDFCFC",
-    "--color-primary-950": "#FDFCFC",
-    /* Secondary  */
-    "--color-secondary-0": "#0B0C0C",
-    "--color-secondary-50": "#181717",
-    "--color-secondary-100": "#272626",
-    "--color-secondary-200": "#3F4040",
-    "--color-secondary-300": "#515252",
-    "--color-secondary-400": "#5E5F5F",
-    "--color-secondary-500": "#727373",
-    "--color-secondary-600": "#AFB0B0",
-    "--color-secondary-700": "#DBDBDB",
-    "--color-secondary-800": "#E7E8E8",
-    "--color-secondary-900": "#F1F2F2",
-    "--color-secondary-950": "#FEFFFF",
-    /* Tertiary */
-    "--color-tertiary-0": "#543112",
-    "--color-tertiary-50": "#6C3D13",
-    "--color-tertiary-100": "#824917",
-    "--color-tertiary-200": "#B4621A",
-    "--color-tertiary-300": "#D7751F",
-    "--color-tertiary-400": "#E78128",
-    "--color-tertiary-500": "#FB9D4B",
-    "--color-tertiary-600": "#FDB474",
-    "--color-tertiary-700": "#FED1AA",
-    "--color-tertiary-800": "#FFE9D5",
-    "--color-tertiary-900": "#FFF2E5",
-    "--color-tertiary-950": "#FFFAF5",
-    /* Error */
-    "--color-error-0": "#531313",
-    "--color-error-50": "#7F1D1D",
-    "--color-error-100": "#991B1B",
-    "--color-error-200": "#B91C1C",
-    "--color-error-300": "#DC2626",
-    "--color-error-400": "#E63535",
-    "--color-error-500": "#EF4444",
-    "--color-error-600": "#F87171",
-    "--color-error-700": "#E63534",
-    "--color-error-800": "#FECACA",
-    "--color-error-900": "#FEE2E2",
-    "--color-error-950": "#FEE9E9",
-    /* Success */
-    "--color-success-0": "#1B3224",
-    "--color-success-50": "#14532D",
-    "--color-success-100": "#166534",
-    "--color-success-200": "#206F3E",
-    "--color-success-300": "#2A7948",
-    "--color-success-400": "#348352",
-    "--color-success-500": "#489766",
-    "--color-success-600": "#66B584",
-    "--color-success-700": "#84D3A2",
-    "--color-success-800": "#A2F1C0",
-    "--color-success-900": "#CAFFE8",
-    "--color-success-950": "#E4FFF4",
-    /* Warning */
-    "--color-warning-0": "#542D12",
-    "--color-warning-50": "#6C3813",
-    "--color-warning-100": "#824417",
-    "--color-warning-200": "#B45A1A",
-    "--color-warning-300": "#D76C1F",
-    "--color-warning-400": "#E77828",
-    "--color-warning-500": "#FB954B",
-    "--color-warning-600": "#FDAD74",
-    "--color-warning-700": "#FECDAA",
-    "--color-warning-800": "#FFE7D5",
-    "--color-warning-900": "#FFF9F5",
-    "--color-warning-950": "#FFFDFB",
-    /* Info */
-    "--color-info-0": "#032638",
-    "--color-info-50": "#05405D",
-    "--color-info-100": "#075A83",
-    "--color-info-200": "#0973A8",
-    "--color-info-300": "#0B8DCD",
-    "--color-info-400": "#0DA6F2",
-    "--color-info-500": "#32B4F4",
-    "--color-info-600": "#57C2F6",
-    "--color-info-700": "#7CCFF8",
-    "--color-info-800": "#A2DDFA",
-    "--color-info-900": "#C7EBFC",
-    "--color-info-950": "#ECF8FE",
-    /* Typography */
-    "--color-typography-0": "#171717",
-    "--color-typography-50": "#262627",
-    "--color-typography-100": "#404040",
-    "--color-typography-200": "#525252",
-    "--color-typography-300": "#737373",
-    "--color-typography-400": "#8C8C8C",
-    "--color-typography-500": "#A3A3A3",
-    "--color-typography-600": "#D4D4D4",
-    "--color-typography-700": "#DBDBDC",
-    "--color-typography-800": "#E5E5E5",
-    "--color-typography-900": "#F5F5F5",
-    "--color-typography-950": "#FEFEFF",
-    /* Outline */
-    "--color-outline-0": "#1A1717",
-    "--color-outline-50": "#272624",
-    "--color-outline-100": "#414141",
-    "--color-outline-200": "#535252",
-    "--color-outline-300": "#737474",
-    "--color-outline-400": "#8C8D8D",
-    "--color-outline-500": "#A5A3A3",
-    "--color-outline-600": "#D3D3D3",
-    "--color-outline-700": "#DDDCDB",
-    "--color-outline-800": "#E6E6E6",
-    "--color-outline-900": "#F3F3F3",
-    "--color-outline-950": "#FDFEFE",
-    /* Background */
-    "--color-background-0": "#121212",
-    "--color-background-50": "#272625",
-    "--color-background-100": "#414040",
-    "--color-background-200": "#535252",
-    "--color-background-300": "#747474",
-    "--color-background-400": "#8E8E8E",
-    "--color-background-500": "#A2A3A3",
-    "--color-background-600": "#D5D4D4",
-    "--color-background-700": "#DCDBDB",
-    "--color-background-800": "#F2F1F1",
-    "--color-background-900": "#F6F6F6",
-    "--color-background-950": "#FEFEFE",
-    /* Background Special */
-    "--color-background-error": "#422B2B",
-    "--color-background-warning": "#412F23",
-    "--color-background-success": "#1C2B21",
-    "--color-background-muted": "#252526",
-    "--color-background-info": "#1A282E",
-    /* Border */
-    "--color-border-0": "#1A1717",
-    "--color-border-50": "#272624",
-    "--color-border-100": "#414141",
-    "--color-border-200": "#535252",
-    "--color-border-300": "#737474",
-    "--color-border-400": "#8C8D8D",
-    "--color-border-500": "#A5A3A3",
-    "--color-border-600": "#D3D3D3",
-    "--color-border-700": "#DDDCDB",
-    "--color-border-800": "#E6E6E6",
-    "--color-border-900": "#F3F3F3",
-    "--color-border-950": "#FDFEFE",
-  }),
-};
diff --git a/expo-app/components/ui/gluestack-ui-provider/config.ts b/expo-app/components/ui/gluestack-ui-provider/config.ts
index 3b42a91a..f388cc6e 100644
--- a/expo-app/components/ui/gluestack-ui-provider/config.ts
+++ b/expo-app/components/ui/gluestack-ui-provider/config.ts
@@ -1,326 +1,309 @@
-"use client";
-import { vars } from "nativewind";
+'use client';
+import { vars } from 'nativewind';
 
 export const config = {
   light: vars({
-    "--color-primary-0": "#B3B3B3",
-    "--color-primary-50": "#999999",
-    "--color-primary-100": "#808080",
-    "--color-primary-200": "#737373",
-    "--color-primary-300": "#666666",
-    "--color-primary-400": "#525252",
-    "--color-primary-500": "#333333",
-    "--color-primary-600": "#292929",
-    "--color-primary-700": "#1F1F1F",
-    "--color-primary-800": "#0D0D0D",
-    "--color-primary-900": "#0A0A0A",
-    "--color-primary-950": "#080808",
+    '--color-primary-0': '179 179 179',
+    '--color-primary-50': '153 153 153',
+    '--color-primary-100': '128 128 128',
+    '--color-primary-200': '115 115 115',
+    '--color-primary-300': '102 102 102',
+    '--color-primary-400': '82 82 82',
+    '--color-primary-500': '51 51 51',
+    '--color-primary-600': '41 41 41',
+    '--color-primary-700': '31 31 31',
+    '--color-primary-800': '13 13 13',
+    '--color-primary-900': '10 10 10',
+    '--color-primary-950': '8 8 8',
 
     /* Secondary  */
-    "--color-secondary-0": "#FEFFFF",
-    "--color-secondary-50": "#F1F2F2",
-    "--color-secondary-100": "#E7E8E8",
-    "--color-secondary-200": "#DBDBDB",
-    "--color-secondary-300": "#AFB0B0",
-    "--color-secondary-400": "#727373",
-    "--color-secondary-500": "#5E5F5F",
-    "--color-secondary-600": "#515252",
-    "--color-secondary-700": "#3F4040",
-    "--color-secondary-800": "#272626",
-    "--color-secondary-900": "#181717",
-    "--color-secondary-950": "#0B0C0C",
+    '--color-secondary-0': '253 253 253',
+    '--color-secondary-50': '251 251 251',
+    '--color-secondary-100': '246 246 246',
+    '--color-secondary-200': '242 242 242',
+    '--color-secondary-300': '237 237 237',
+    '--color-secondary-400': '230 230 231',
+    '--color-secondary-500': '217 217 219',
+    '--color-secondary-600': '198 199 199',
+    '--color-secondary-700': '189 189 189',
+    '--color-secondary-800': '177 177 177',
+    '--color-secondary-900': '165 164 164',
+    '--color-secondary-950': '157 157 157',
 
     /* Tertiary */
-    "--color-tertiary-0": "#FFFAF5",
-    "--color-tertiary-50": "#FFF2E5",
-    "--color-tertiary-100": "#FFE9D5",
-    "--color-tertiary-200": "#FED1AA",
-    "--color-tertiary-300": "#FDB474",
-    "--color-tertiary-400": "#FB9D4B",
-    "--color-tertiary-500": "#E78128",
-    "--color-tertiary-600": "#D7751F",
-    "--color-tertiary-700": "#B4621A",
-    "--color-tertiary-800": "#824917",
-    "--color-tertiary-900": "#6C3D13",
-    "--color-tertiary-950": "#543112",
+    '--color-tertiary-0': '255 250 245',
+    '--color-tertiary-50': '255 242 229',
+    '--color-tertiary-100': '255 233 213',
+    '--color-tertiary-200': '254 209 170',
+    '--color-tertiary-300': '253 180 116',
+    '--color-tertiary-400': '251 157 75',
+    '--color-tertiary-500': '231 129 40',
+    '--color-tertiary-600': '215 117 31',
+    '--color-tertiary-700': '180 98 26',
+    '--color-tertiary-800': '130 73 23',
+    '--color-tertiary-900': '108 61 19',
+    '--color-tertiary-950': '84 49 18',
 
     /* Error */
-    "--color-error-0": "#FEE9E9",
-    "--color-error-50": "#FEE2E2",
-    "--color-error-100": "#FECACA",
-    "--color-error-200": "#FCA5A5",
-    "--color-error-300": "#F87171",
-    "--color-error-400": "#EF4444",
-    "--color-error-500": "#E63535",
-    "--color-error-600": "#DC2626",
-    "--color-error-700": "#B91C1C",
-    "--color-error-800": "#991B1B",
-    "--color-error-900": "#7F1D1D",
-    "--color-error-950": "#531313",
+    '--color-error-0': '254 233 233',
+    '--color-error-50': '254 226 226',
+    '--color-error-100': '254 202 202',
+    '--color-error-200': '252 165 165',
+    '--color-error-300': '248 113 113',
+    '--color-error-400': '239 68 68',
+    '--color-error-500': '230 53 53',
+    '--color-error-600': '220 38 38',
+    '--color-error-700': '185 28 28',
+    '--color-error-800': '153 27 27',
+    '--color-error-900': '127 29 29',
+    '--color-error-950': '83 19 19',
 
     /* Success */
-    "--color-success-0": "#E4FFF4",
-    "--color-success-50": "#CAFFE8",
-    "--color-success-100": "#A2F1C0",
-    "--color-success-200": "#84D3A2",
-    "--color-success-300": "#66B584",
-    "--color-success-400": "#489766",
-    "--color-success-500": "#348352",
-    "--color-success-600": "#2A7948",
-    "--color-success-700": "#206F3E",
-    "--color-success-800": "#166534",
-    "--color-success-900": "#14532D",
-    "--color-success-950": "#1B3224",
+    '--color-success-0': '228 255 244',
+    '--color-success-50': '202 255 232',
+    '--color-success-100': '162 241 192',
+    '--color-success-200': '132 211 162',
+    '--color-success-300': '102 181 132',
+    '--color-success-400': '72 151 102',
+    '--color-success-500': '52 131 82',
+    '--color-success-600': '42 121 72',
+    '--color-success-700': '32 111 62',
+    '--color-success-800': '22 101 52',
+    '--color-success-900': '20 83 45',
+    '--color-success-950': '27 50 36',
 
     /* Warning */
-    "--color-warning-0": "#FFFDFB",
-    "--color-warning-50": "#FFF9F5",
-    "--color-warning-100": "#FFE7D5",
-    "--color-warning-200": "#FECDAA",
-    "--color-warning-300": "#FDAD74",
-    "--color-warning-400": "#FB954B",
-    "--color-warning-500": "#E77828",
-    "--color-warning-600": "#D76C1F",
-    "--color-warning-700": "#B45A1A",
-    "--color-warning-800": "#824417",
-    "--color-warning-900": "#6C3813",
-    "--color-warning-950": "#542D12",
+    '--color-warning-0': '255 249 245',
+    '--color-warning-50': '255 244 236',
+    '--color-warning-100': '255 231 213',
+    '--color-warning-200': '254 205 170',
+    '--color-warning-300': '253 173 116',
+    '--color-warning-400': '251 149 75',
+    '--color-warning-500': '231 120 40',
+    '--color-warning-600': '215 108 31',
+    '--color-warning-700': '180 90 26',
+    '--color-warning-800': '130 68 23',
+    '--color-warning-900': '108 56 19',
+    '--color-warning-950': '84 45 18',
 
     /* Info */
-    "--color-info-0": "#ECF8FE",
-    "--color-info-50": "#C7EBFC",
-    "--color-info-100": "#A2DDFA",
-    "--color-info-200": "#7CCFF8",
-    "--color-info-300": "#57C2F6",
-    "--color-info-400": "#32B4F4",
-    "--color-info-500": "#0DA6F2",
-    "--color-info-600": "#0B8DCD",
-    "--color-info-700": "#0973A8",
-    "--color-info-800": "#075A83",
-    "--color-info-900": "#05405D",
-    "--color-info-950": "#032638",
+    '--color-info-0': '236 248 254',
+    '--color-info-50': '199 235 252',
+    '--color-info-100': '162 221 250',
+    '--color-info-200': '124 207 248',
+    '--color-info-300': '87 194 246',
+    '--color-info-400': '50 180 244',
+    '--color-info-500': '13 166 242',
+    '--color-info-600': '11 141 205',
+    '--color-info-700': '9 115 168',
+    '--color-info-800': '7 90 131',
+    '--color-info-900': '5 64 93',
+    '--color-info-950': '3 38 56',
 
     /* Typography */
-    "--color-typography-0": "#FEFEFF",
-    "--color-typography-50": "#F5F5F5",
-    "--color-typography-100": "#E5E5E5",
-    "--color-typography-200": "#DBDBDC",
-    "--color-typography-300": "#D4D4D4",
-    "--color-typography-400": "#A3A3A3",
-    "--color-typography-500": "#8C8C8C",
-    "--color-typography-600": "#737373",
-    "--color-typography-700": "#525252",
-    "--color-typography-800": "#404040",
-    "--color-typography-900": "#262627",
-    "--color-typography-950": "#171717",
+    '--color-typography-0': '254 254 255',
+    '--color-typography-50': '245 245 245',
+    '--color-typography-100': '229 229 229',
+    '--color-typography-200': '219 219 220',
+    '--color-typography-300': '212 212 212',
+    '--color-typography-400': '163 163 163',
+    '--color-typography-500': '140 140 140',
+    '--color-typography-600': '115 115 115',
+    '--color-typography-700': '82 82 82',
+    '--color-typography-800': '64 64 64',
+    '--color-typography-900': '38 38 39',
+    '--color-typography-950': '23 23 23',
 
     /* Outline */
-    "--color-outline-0": "#FDFEFE",
-    "--color-outline-50": "#F3F3F3",
-    "--color-outline-100": "#E6E6E6",
-    "--color-outline-200": "#DDDCDB",
-    "--color-outline-300": "#D3D3D3",
-    "--color-outline-400": "#A5A3A3",
-    "--color-outline-500": "#8C8D8D",
-    "--color-outline-600": "#737474",
-    "--color-outline-700": "#535252",
-    "--color-outline-800": "#414141",
-    "--color-outline-900": "#272624",
-    "--color-outline-950": "#1A1717",
+    '--color-outline-0': '253 254 254',
+    '--color-outline-50': '243 243 243',
+    '--color-outline-100': '230 230 230',
+    '--color-outline-200': '221 220 219',
+    '--color-outline-300': '211 211 211',
+    '--color-outline-400': '165 163 163',
+    '--color-outline-500': '140 141 141',
+    '--color-outline-600': '115 116 116',
+    '--color-outline-700': '83 82 82',
+    '--color-outline-800': '65 65 65',
+    '--color-outline-900': '39 38 36',
+    '--color-outline-950': '26 23 23',
+
     /* Background */
-    "--color-background-0": "#FFFFFF",
-    "--color-background-50": "#F6F6F6",
-    "--color-background-100": "#F2F1F1",
-    "--color-background-200": "#DCDBDB",
-    "--color-background-300": "#D5D4D4",
-    "--color-background-400": "#A2A3A3",
-    "--color-background-500": "#8E8E8E",
-    "--color-background-600": "#747474",
-    "--color-background-700": "#535252",
-    "--color-background-800": "#414040",
-    "--color-background-900": "#272625",
-    "--color-background-950": "#181718",
+    '--color-background-0': '255 255 255',
+    '--color-background-50': '246 246 246',
+    '--color-background-100': '242 241 241',
+    '--color-background-200': '220 219 219',
+    '--color-background-300': '213 212 212',
+    '--color-background-400': '162 163 163',
+    '--color-background-500': '142 142 142',
+    '--color-background-600': '116 116 116',
+    '--color-background-700': '83 82 82',
+    '--color-background-800': '65 64 64',
+    '--color-background-900': '39 38 37',
+    '--color-background-950': '18 18 18',
 
     /* Background Special */
-    "--color-background-error": "#FEF1F1",
-    "--color-background-warning": "#FFF4EB",
-    "--color-background-success": "#EDFCF2",
-    "--color-background-muted": "#F6F6F7",
-    "--color-background-info": "#EBF8FE",
+    '--color-background-error': '254 241 241',
+    '--color-background-warning': '255 243 234',
+    '--color-background-success': '237 252 242',
+    '--color-background-muted': '247 248 247',
+    '--color-background-info': '235 248 254',
 
-    /* Border */
-    "--color-border-0": "#FDFEFE",
-    "--color-border-50": "#F3F3F3",
-    "--color-border-100": "#E6E6E6",
-    "--color-border-200": "#DDDCDB",
-    "--color-border-300": "#D3D3D3",
-    "--color-border-400": "#A5A3A3",
-    "--color-border-500": "#8C8D8D",
-    "--color-border-600": "#737474",
-    "--color-border-700": "#535252",
-    "--color-border-800": "#414141",
-    "--color-border-900": "#272624",
-    "--color-border-950": "#1A1717",
+    /* Focus Ring Indicator  */
+    '--color-indicator-primary': '55 55 55',
+    '--color-indicator-info': '83 153 236',
+    '--color-indicator-error': '185 28 28',
   }),
   dark: vars({
-    "--color-primary-0": "#828282",
-    "--color-primary-50": "#949494",
-    "--color-primary-100": "#9E9E9E",
-    "--color-primary-200": "#B3B3B3",
-    "--color-primary-300": "#C7C7C7",
-    "--color-primary-400": "#E6E6E6",
-    "--color-primary-500": "#F0F0F0",
-    "--color-primary-600": "#FAFAFA",
-    "--color-primary-700": "#FCFCFC",
-    "--color-primary-800": "#FDFDFD",
-    "--color-primary-900": "#FDFCFC",
-    "--color-primary-950": "#FDFCFC",
+    '--color-primary-0': '166 166 166',
+    '--color-primary-50': '175 175 175',
+    '--color-primary-100': '186 186 186',
+    '--color-primary-200': '197 197 197',
+    '--color-primary-300': '212 212 212',
+    '--color-primary-400': '221 221 221',
+    '--color-primary-500': '230 230 230',
+    '--color-primary-600': '240 240 240',
+    '--color-primary-700': '250 250 250',
+    '--color-primary-800': '253 253 253',
+    '--color-primary-900': '254 249 249',
+    '--color-primary-950': '253 252 252',
 
     /* Secondary  */
-    "--color-secondary-0": "#0B0C0C",
-    "--color-secondary-50": "#181717",
-    "--color-secondary-100": "#272626",
-    "--color-secondary-200": "#3F4040",
-    "--color-secondary-300": "#515252",
-    "--color-secondary-400": "#5E5F5F",
-    "--color-secondary-500": "#727373",
-    "--color-secondary-600": "#AFB0B0",
-    "--color-secondary-700": "#DBDBDB",
-    "--color-secondary-800": "#E7E8E8",
-    "--color-secondary-900": "#F1F2F2",
-    "--color-secondary-950": "#FEFFFF",
+    '--color-secondary-0': '20 20 20',
+    '--color-secondary-50': '23 23 23',
+    '--color-secondary-100': '31 31 31',
+    '--color-secondary-200': '39 39 39',
+    '--color-secondary-300': '44 44 44',
+    '--color-secondary-400': '56 57 57',
+    '--color-secondary-500': '63 64 64',
+    '--color-secondary-600': '86 86 86',
+    '--color-secondary-700': '110 110 110',
+    '--color-secondary-800': '135 135 135',
+    '--color-secondary-900': '150 150 150',
+    '--color-secondary-950': '164 164 164',
 
     /* Tertiary */
-    "--color-tertiary-0": "#543112",
-    "--color-tertiary-50": "#6C3D13",
-    "--color-tertiary-100": "#824917",
-    "--color-tertiary-200": "#B4621A",
-    "--color-tertiary-300": "#D7751F",
-    "--color-tertiary-400": "#E78128",
-    "--color-tertiary-500": "#FB9D4B",
-    "--color-tertiary-600": "#FDB474",
-    "--color-tertiary-700": "#FED1AA",
-    "--color-tertiary-800": "#FFE9D5",
-    "--color-tertiary-900": "#FFF2E5",
-    "--color-tertiary-950": "#FFFAF5",
+    '--color-tertiary-0': '84 49 18',
+    '--color-tertiary-50': '108 61 19',
+    '--color-tertiary-100': '130 73 23',
+    '--color-tertiary-200': '180 98 26',
+    '--color-tertiary-300': '215 117 31',
+    '--color-tertiary-400': '231 129 40',
+    '--color-tertiary-500': '251 157 75',
+    '--color-tertiary-600': '253 180 116',
+    '--color-tertiary-700': '254 209 170',
+    '--color-tertiary-800': '255 233 213',
+    '--color-tertiary-900': '255 242 229',
+    '--color-tertiary-950': '255 250 245',
 
     /* Error */
-    "--color-error-0": "#531313",
-    "--color-error-50": "#7F1D1D",
-    "--color-error-100": "#991B1B",
-    "--color-error-200": "#B91C1C",
-    "--color-error-300": "#DC2626",
-    "--color-error-400": "#E63535",
-    "--color-error-500": "#EF4444",
-    "--color-error-600": "#F87171",
-    "--color-error-700": "#E63534",
-    "--color-error-800": "#FECACA",
-    "--color-error-900": "#FEE2E2",
-    "--color-error-950": "#FEE9E9",
+    '--color-error-0': '83 19 19',
+    '--color-error-50': '127 29 29',
+    '--color-error-100': '153 27 27',
+    '--color-error-200': '185 28 28',
+    '--color-error-300': '220 38 38',
+    '--color-error-400': '230 53 53',
+    '--color-error-500': '239 68 68',
+    '--color-error-600': '249 97 96',
+    '--color-error-700': '229 91 90',
+    '--color-error-800': '254 202 202',
+    '--color-error-900': '254 226 226',
+    '--color-error-950': '254 233 233',
 
     /* Success */
-    "--color-success-0": "#1B3224",
-    "--color-success-50": "#14532D",
-    "--color-success-100": "#166534",
-    "--color-success-200": "#206F3E",
-    "--color-success-300": "#2A7948",
-    "--color-success-400": "#348352",
-    "--color-success-500": "#489766",
-    "--color-success-600": "#66B584",
-    "--color-success-700": "#84D3A2",
-    "--color-success-800": "#A2F1C0",
-    "--color-success-900": "#CAFFE8",
-    "--color-success-950": "#E4FFF4",
+    '--color-success-0': '27 50 36',
+    '--color-success-50': '20 83 45',
+    '--color-success-100': '22 101 52',
+    '--color-success-200': '32 111 62',
+    '--color-success-300': '42 121 72',
+    '--color-success-400': '52 131 82',
+    '--color-success-500': '72 151 102',
+    '--color-success-600': '102 181 132',
+    '--color-success-700': '132 211 162',
+    '--color-success-800': '162 241 192',
+    '--color-success-900': '202 255 232',
+    '--color-success-950': '228 255 244',
 
     /* Warning */
-    "--color-warning-0": "#542D12",
-    "--color-warning-50": "#6C3813",
-    "--color-warning-100": "#824417",
-    "--color-warning-200": "#B45A1A",
-    "--color-warning-300": "#D76C1F",
-    "--color-warning-400": "#E77828",
-    "--color-warning-500": "#FB954B",
-    "--color-warning-600": "#FDAD74",
-    "--color-warning-700": "#FECDAA",
-    "--color-warning-800": "#FFE7D5",
-    "--color-warning-900": "#FFF9F5",
-    "--color-warning-950": "#FFFDFB",
+    '--color-warning-0': '84 45 18',
+    '--color-warning-50': '108 56 19',
+    '--color-warning-100': '130 68 23',
+    '--color-warning-200': '180 90 26',
+    '--color-warning-300': '215 108 31',
+    '--color-warning-400': '231 120 40',
+    '--color-warning-500': '251 149 75',
+    '--color-warning-600': '253 173 116',
+    '--color-warning-700': '254 205 170',
+    '--color-warning-800': '255 231 213',
+    '--color-warning-900': '255 244 237',
+    '--color-warning-950': '255 249 245',
 
     /* Info */
-    "--color-info-0": "#032638",
-    "--color-info-50": "#05405D",
-    "--color-info-100": "#075A83",
-    "--color-info-200": "#0973A8",
-    "--color-info-300": "#0B8DCD",
-    "--color-info-400": "#0DA6F2",
-    "--color-info-500": "#32B4F4",
-    "--color-info-600": "#57C2F6",
-    "--color-info-700": "#7CCFF8",
-    "--color-info-800": "#A2DDFA",
-    "--color-info-900": "#C7EBFC",
-    "--color-info-950": "#ECF8FE",
+    '--color-info-0': '3 38 56',
+    '--color-info-50': '5 64 93',
+    '--color-info-100': '7 90 131',
+    '--color-info-200': '9 115 168',
+    '--color-info-300': '11 141 205',
+    '--color-info-400': '13 166 242',
+    '--color-info-500': '50 180 244',
+    '--color-info-600': '87 194 246',
+    '--color-info-700': '124 207 248',
+    '--color-info-800': '162 221 250',
+    '--color-info-900': '199 235 252',
+    '--color-info-950': '236 248 254',
 
     /* Typography */
-    "--color-typography-0": "#171717",
-    "--color-typography-50": "#262627",
-    "--color-typography-100": "#404040",
-    "--color-typography-200": "#525252",
-    "--color-typography-300": "#737373",
-    "--color-typography-400": "#8C8C8C",
-    "--color-typography-500": "#A3A3A3",
-    "--color-typography-600": "#D4D4D4",
-    "--color-typography-700": "#DBDBDC",
-    "--color-typography-800": "#E5E5E5",
-    "--color-typography-900": "#F5F5F5",
-    "--color-typography-950": "#FEFEFF",
+    '--color-typography-0': '23 23 23',
+    '--color-typography-50': '38 38 39',
+    '--color-typography-100': '64 64 64',
+    '--color-typography-200': '82 82 82',
+    '--color-typography-300': '115 115 115',
+    '--color-typography-400': '140 140 140',
+    '--color-typography-500': '163 163 163',
+    '--color-typography-600': '212 212 212',
+    '--color-typography-700': '219 219 220',
+    '--color-typography-800': '229 229 229',
+    '--color-typography-900': '245 245 245',
+    '--color-typography-950': '254 254 255',
 
     /* Outline */
-    "--color-outline-0": "#1A1717",
-    "--color-outline-50": "#272624",
-    "--color-outline-100": "#414141",
-    "--color-outline-200": "#535252",
-    "--color-outline-300": "#737474",
-    "--color-outline-400": "#8C8D8D",
-    "--color-outline-500": "#A5A3A3",
-    "--color-outline-600": "#D3D3D3",
-    "--color-outline-700": "#DDDCDB",
-    "--color-outline-800": "#E6E6E6",
-    "--color-outline-900": "#F3F3F3",
-    "--color-outline-950": "#FDFEFE",
+    '--color-outline-0': '26 23 23',
+    '--color-outline-50': '39 38 36',
+    '--color-outline-100': '65 65 65',
+    '--color-outline-200': '83 82 82',
+    '--color-outline-300': '115 116 116',
+    '--color-outline-400': '140 141 141',
+    '--color-outline-500': '165 163 163',
+    '--color-outline-600': '211 211 211',
+    '--color-outline-700': '221 220 219',
+    '--color-outline-800': '230 230 230',
+    '--color-outline-900': '243 243 243',
+    '--color-outline-950': '253 254 254',
 
     /* Background */
-    "--color-background-0": "#121212",
-    "--color-background-50": "#272625",
-    "--color-background-100": "#414040",
-    "--color-background-200": "#535252",
-    "--color-background-300": "#747474",
-    "--color-background-400": "#8E8E8E",
-    "--color-background-500": "#A2A3A3",
-    "--color-background-600": "#D5D4D4",
-    "--color-background-700": "#DCDBDB",
-    "--color-background-800": "#F2F1F1",
-    "--color-background-900": "#F6F6F6",
-    "--color-background-950": "#FEFEFE",
+    '--color-background-0': '18 18 18',
+    '--color-background-50': '39 38 37',
+    '--color-background-100': '65 64 64',
+    '--color-background-200': '83 82 82',
+    '--color-background-300': '116 116 116',
+    '--color-background-400': '142 142 142',
+    '--color-background-500': '162 163 163',
+    '--color-background-600': '213 212 212',
+    '--color-background-700': '229 228 228',
+    '--color-background-800': '242 241 241',
+    '--color-background-900': '246 246 246',
+    '--color-background-950': '255 255 255',
 
     /* Background Special */
-    "--color-background-error": "#422B2B",
-    "--color-background-warning": "#412F23",
-    "--color-background-success": "#1C2B21",
-    "--color-background-muted": "#252526",
-    "--color-background-info": "#1A282E",
+    '--color-background-error': '66 43 43',
+    '--color-background-warning': '65 47 35',
+    '--color-background-success': '28 43 33',
+    '--color-background-muted': '51 51 51',
+    '--color-background-info': '26 40 46',
 
-    /* Border */
-    "--color-border-0": "#1A1717",
-    "--color-border-50": "#272624",
-    "--color-border-100": "#414141",
-    "--color-border-200": "#535252",
-    "--color-border-300": "#737474",
-    "--color-border-400": "#8C8D8D",
-    "--color-border-500": "#A5A3A3",
-    "--color-border-600": "#D3D3D3",
-    "--color-border-700": "#DDDCDB",
-    "--color-border-800": "#E6E6E6",
-    "--color-border-900": "#F3F3F3",
-    "--color-border-950": "#FDFEFE",
+    /* Focus Ring Indicator  */
+    '--color-indicator-primary': '247 247 247',
+    '--color-indicator-info': '161 199 245',
+    '--color-indicator-error': '232 70 69',
   }),
 };
diff --git a/expo-app/components/ui/gluestack-ui-provider/index.tsx b/expo-app/components/ui/gluestack-ui-provider/index.tsx
index 4dc2cfe6..4855e434 100644
--- a/expo-app/components/ui/gluestack-ui-provider/index.tsx
+++ b/expo-app/components/ui/gluestack-ui-provider/index.tsx
@@ -1,22 +1,42 @@
 import React from 'react';
 import { config } from './config';
-import { View } from 'react-native';
+import { ColorSchemeName, useColorScheme, View, ViewProps } from 'react-native';
 import { OverlayProvider } from '@gluestack-ui/overlay';
 import { ToastProvider } from '@gluestack-ui/toast';
+import { colorScheme as colorSchemeNW } from 'nativewind';
+
+type ModeType = 'light' | 'dark' | 'system';
+
+const getColorSchemeName = (
+  colorScheme: ColorSchemeName,
+  mode: ModeType
+): 'light' | 'dark' => {
+  if (mode === 'system') {
+    return colorScheme ?? 'light';
+  }
+  return mode;
+};
 
 export function GluestackUIProvider({
   mode = 'light',
   ...props
 }: {
-  mode?: 'light' | 'dark';
-  children?: any;
+  mode?: 'light' | 'dark' | 'system';
+  children?: React.ReactNode;
+  style?: ViewProps['style'];
 }) {
+  const colorScheme = useColorScheme();
+
+  const colorSchemeName = getColorSchemeName(colorScheme, mode);
+
+  colorSchemeNW.set(mode);
+
   return (
     <View
       style={[
-        config[mode],
+        config[colorSchemeName],
+        // eslint-disable-next-line react-native/no-inline-styles
         { flex: 1, height: '100%', width: '100%' },
-        // @ts-ignore
         props.style,
       ]}
     >
diff --git a/expo-app/components/ui/gluestack-ui-provider/index.web.tsx b/expo-app/components/ui/gluestack-ui-provider/index.web.tsx
index 086a7295..30cadaaa 100644
--- a/expo-app/components/ui/gluestack-ui-provider/index.web.tsx
+++ b/expo-app/components/ui/gluestack-ui-provider/index.web.tsx
@@ -1,36 +1,94 @@
 'use client';
-import React from 'react';
+import React, { useEffect, useLayoutEffect } from 'react';
 import { config } from './config';
 import { OverlayProvider } from '@gluestack-ui/overlay';
 import { ToastProvider } from '@gluestack-ui/toast';
 import { setFlushStyles } from '@gluestack-ui/nativewind-utils/flush';
+import { script } from './script';
+
+const variableStyleTagId = 'nativewind-style';
+const createStyle = (styleTagId: string) => {
+  const style = document.createElement('style');
+  style.id = styleTagId;
+  style.appendChild(document.createTextNode(''));
+  return style;
+};
+
+export const useSafeLayoutEffect =
+  typeof window !== 'undefined' ? useLayoutEffect : useEffect;
 
 export function GluestackUIProvider({
   mode = 'light',
   ...props
 }: {
-  mode?: 'light' | 'dark';
-  children?: any;
+  mode?: 'light' | 'dark' | 'system';
+  children?: React.ReactNode;
 }) {
-  const stringcssvars = Object.keys(config[mode]).reduce((acc, cur) => {
-    acc += `${cur}:${config[mode][cur]};`;
-    return acc;
-  }, '');
-  setFlushStyles(`:root {${stringcssvars}} `);
-
-  if (config[mode] && typeof document !== 'undefined') {
-    const element = document.documentElement;
-    if (element) {
-      const head = element.querySelector('head');
-      const style = document.createElement('style');
-      style.innerHTML = `:root {${stringcssvars}} `;
-      if (head) head.appendChild(style);
+  let cssVariablesWithMode = ``;
+  Object.keys(config).forEach((configKey) => {
+    cssVariablesWithMode +=
+      configKey === 'dark' ? `\n .dark {\n ` : `\n:root {\n`;
+    const cssVariables = Object.keys(
+      config[configKey as keyof typeof config]
+    ).reduce((acc: string, curr: string) => {
+      acc += `${curr}:${config[configKey as keyof typeof config][curr]}; `;
+      return acc;
+    }, '');
+    cssVariablesWithMode += `${cssVariables} \n}`;
+  });
+
+  setFlushStyles(cssVariablesWithMode);
+
+  const handleMediaQuery = React.useCallback((e: MediaQueryListEvent) => {
+    script(e.matches ? 'dark' : 'light');
+  }, []);
+
+  useSafeLayoutEffect(() => {
+    if (mode !== 'system') {
+      const documentElement = document.documentElement;
+      if (documentElement) {
+        documentElement.classList.add(mode);
+        documentElement.classList.remove(mode === 'light' ? 'dark' : 'light');
+        documentElement.style.colorScheme = mode;
+      }
+    }
+  }, [mode]);
+
+  useSafeLayoutEffect(() => {
+    if (mode !== 'system') return;
+    const media = window.matchMedia('(prefers-color-scheme: dark)');
+
+    media.addListener(handleMediaQuery);
+
+    return () => media.removeListener(handleMediaQuery);
+  }, [handleMediaQuery]);
+
+  useSafeLayoutEffect(() => {
+    if (typeof window !== 'undefined') {
+      const documentElement = document.documentElement;
+      if (documentElement) {
+        const head = documentElement.querySelector('head');
+        let style = head?.querySelector(`[id='${variableStyleTagId}']`);
+        if (!style) {
+          style = createStyle(variableStyleTagId);
+          style.innerHTML = cssVariablesWithMode;
+          if (head) head.appendChild(style);
+        }
+      }
     }
-  }
+  }, []);
 
   return (
-    <OverlayProvider>
-      <ToastProvider>{props.children}</ToastProvider>
-    </OverlayProvider>
+    <>
+      <script
+        suppressHydrationWarning
+        dangerouslySetInnerHTML={{
+          __html: `(${script.toString()})('${mode}')`,
+        }}
+      />
+      <OverlayProvider>
+        <ToastProvider>{props.children}</ToastProvider>
+      </OverlayProvider>
+    </>
   );
 }
diff --git a/expo-app/components/ui/gluestack-ui-provider/script.ts b/expo-app/components/ui/gluestack-ui-provider/script.ts
new file mode 100644
index 00000000..732d1363
--- /dev/null
+++ b/expo-app/components/ui/gluestack-ui-provider/script.ts
@@ -0,0 +1,19 @@
+export const script = (mode: string) => {
+  const documentElement = document.documentElement;
+
+  function getSystemColorMode() {
+    return window.matchMedia('(prefers-color-scheme: dark)').matches
+      ? 'dark'
+      : 'light';
+  }
+
+  try {
+    const isSystem = mode === 'system';
+    const theme = isSystem ? getSystemColorMode() : mode;
+    documentElement.classList.remove(theme === 'light' ? 'dark' : 'light');
+    documentElement.classList.add(theme);
+    documentElement.style.colorScheme = theme;
+  } catch (e) {
+    console.error(e);
+  }
+};
diff --git a/expo-app/components/ui/grid/index.tsx b/expo-app/components/ui/grid/index.tsx
index 7c087a7c..7e0d36b9 100644
--- a/expo-app/components/ui/grid/index.tsx
+++ b/expo-app/components/ui/grid/index.tsx
@@ -13,8 +13,9 @@ import { cssInterop } from 'nativewind';
 import {
   useBreakpointValue,
   getBreakPointValue,
-} from '@gluestack-ui/nativewind-utils/useBreakpointValue';
-const { width } = Dimensions.get('window');
+} from '@/components/ui/utils/use-break-point-value';
+
+const { width: DEVICE_WIDTH } = Dimensions.get('window');
 
 const GridContext = createContext<any>({});
 
@@ -117,6 +118,9 @@ type IGridProps = ViewProps &
     paddingRight?: number;
     paddingStart?: number;
     paddingEnd?: number;
+    borderWidth?: number;
+    borderLeftWidth?: number;
+    borderRightWidth?: number;
     _extra: {
       className: string;
     };
@@ -137,7 +141,7 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
 
         const colSpan2 = getBreakPointValue(
           generateResponsiveColSpans({ gridItemClassName }),
-          width
+          DEVICE_WIDTH
         );
         const colSpan = colSpan2 ? colSpan2 : 1;
 
@@ -182,6 +186,10 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
       };
     }, [calculatedWidth, itemsPerRow, responsiveNumColumns, props]);
 
+    const borderLeftWidth = props?.borderLeftWidth || props?.borderWidth || 0;
+    const borderRightWidth = props?.borderRightWidth || props?.borderWidth || 0;
+    const borderWidthToSubtract = borderLeftWidth + borderRightWidth;
+
     return (
       <GridContext.Provider value={contextValue}>
         <View
@@ -196,12 +204,13 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
             const paddingRightToSubtract =
               props?.paddingEnd || props?.paddingRight || props?.padding || 0;
 
-            const width =
+            const gridWidth =
               event.nativeEvent.layout.width -
               paddingLeftToSubtract -
-              paddingRightToSubtract;
+              paddingRightToSubtract -
+              borderWidthToSubtract;
 
-            setCalculatedWidth(width);
+            setCalculatedWidth(gridWidth);
           }}
           {...props}
         >
@@ -212,7 +221,6 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
   }
 );
 
-//@ts-ignore
 cssInterop(Grid, {
   className: {
     target: 'style',
@@ -226,6 +234,9 @@ cssInterop(Grid, {
       paddingRight: 'paddingRight',
       paddingStart: 'paddingStart',
       paddingEnd: 'paddingEnd',
+      borderWidth: 'borderWidth',
+      borderLeftWidth: 'borderLeftWidth',
+      borderRightWidth: 'borderRightWidth',
     },
   },
 });
@@ -271,7 +282,7 @@ const GridItem = forwardRef<React.ElementRef<typeof View>, IGridItemProps>(
           return itemsPerRow[key].includes(props?.index);
         });
 
-        const rowColsCount = itemsPerRow[row as string].length;
+        const rowColsCount = itemsPerRow[row as string]?.length;
 
         const space = columnGap || gap || 0;
 
@@ -308,9 +319,7 @@ const GridItem = forwardRef<React.ElementRef<typeof View>, IGridItemProps>(
         // @ts-expect-error
         gridItemClass={gridItemClass}
         className={gridItemStyle({
-          class:
-            className + ' ' + Platform.select({ web: gridItemClass ?? '' }) ??
-            '',
+          class: className,
         })}
         {...props}
         style={[
diff --git a/expo-app/components/ui/heading/index.tsx b/expo-app/components/ui/heading/index.tsx
index 226ab2fe..be876d41 100644
--- a/expo-app/components/ui/heading/index.tsx
+++ b/expo-app/components/ui/heading/index.tsx
@@ -1,8 +1,8 @@
 import React, { forwardRef, memo } from 'react';
 import { H1, H2, H3, H4, H5, H6 } from '@expo/html-elements';
-import { cssInterop } from 'nativewind';
 import { headingStyle } from './styles';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import { cssInterop } from 'nativewind';
 
 type IHeadingProps = VariantProps<typeof headingStyle> &
   React.ComponentPropsWithoutRef<typeof H1> & {
@@ -51,6 +51,7 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
@@ -69,6 +70,7 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
@@ -87,6 +89,7 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
@@ -105,6 +108,7 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
@@ -123,6 +127,7 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
@@ -142,6 +147,7 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
@@ -160,6 +166,7 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
diff --git a/expo-app/components/ui/icon/index.tsx b/expo-app/components/ui/icon/index.tsx
index 6adbe8c1..bb0fd52c 100644
--- a/expo-app/components/ui/icon/index.tsx
+++ b/expo-app/components/ui/icon/index.tsx
@@ -1,58 +1,21 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createIcon } from '@gluestack-ui/icon';
-import { Path, Svg } from 'react-native-svg';
+import { Path } from 'react-native-svg';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { cssInterop } from 'nativewind';
 import { VariantProps } from '@gluestack-ui/nativewind-utils';
-
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
+import { PrimitiveIcon, IPrimitiveIcon, Svg } from '@gluestack-ui/icon';
 
 export const UIIcon = createIcon({
   Root: PrimitiveIcon,
-});
+}) as React.ForwardRefExoticComponent<
+  React.ComponentPropsWithoutRef<typeof PrimitiveIcon> &
+    React.RefAttributes<React.ElementRef<typeof Svg>>
+>;
 
 const iconStyle = tva({
-  base: 'text-typography-950 fill-none',
+  base: 'text-typography-950 fill-none pointer-events-none',
   variants: {
     size: {
       '2xs': 'h-3 w-3',
@@ -72,7 +35,7 @@ cssInterop(UIIcon, {
       height: true,
       width: true,
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
@@ -118,23 +81,28 @@ export const Icon = React.forwardRef<React.ElementRef<typeof Svg>, IIConProps>(
 type ParameterTypes = Omit<Parameters<typeof createIcon>[0], 'Root'>;
 
 const createIconUI = ({ ...props }: ParameterTypes) => {
-  const UIIconCreateIcon = createIcon({ Root: Svg, ...props });
+  const UIIconCreateIcon = createIcon({
+    Root: Svg,
+    ...props,
+  }) as React.ForwardRefExoticComponent<
+    React.ComponentPropsWithoutRef<typeof PrimitiveIcon> &
+      React.RefAttributes<React.ElementRef<typeof Svg>>
+  >;
 
   return React.forwardRef<React.ElementRef<typeof Svg>>(
     (
       {
         className,
         size,
-        ...props
+        ...inComingProps
       }: VariantProps<typeof iconStyle> &
         React.ComponentPropsWithoutRef<typeof UIIconCreateIcon>,
       ref
     ) => {
       return (
         <UIIconCreateIcon
-          // @ts-ignore
           ref={ref}
-          {...props}
+          {...inComingProps}
           className={iconStyle({ size, class: className })}
         />
       );
diff --git a/expo-app/components/ui/icon/index.web.tsx b/expo-app/components/ui/icon/index.web.tsx
index 0896a283..424ed1d0 100644
--- a/expo-app/components/ui/icon/index.web.tsx
+++ b/expo-app/components/ui/icon/index.web.tsx
@@ -1,94 +1,16 @@
-import React, { useMemo } from 'react';
+'use client';
+import React from 'react';
 import { createIcon } from '@gluestack-ui/icon';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { VariantProps } from '@gluestack-ui/nativewind-utils';
-
-const accessClassName = (style: any) => {
-  const obj = style[0];
-  const keys = Object.keys(obj); //will return an array of keys
-  return obj[keys[1]];
-};
-
-const Svg = React.forwardRef<
-  React.ElementRef<'svg'>,
-  React.ComponentPropsWithoutRef<'svg'>
->(({ style, className, ...props }, ref) => {
-  const calculateClassName = useMemo(() => {
-    return className === undefined ? accessClassName(style) : className;
-  }, [className, style]);
-
-  return <svg ref={ref} {...props} className={calculateClassName} />;
-});
-
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<'svg'>,
-  React.ComponentPropsWithoutRef<'svg'> & IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      size,
-      stroke = 'currentColor',
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    const colorProps =
-      stroke === 'currentColor' && color !== undefined ? color : stroke;
-
-    if (AsComp) {
-      return (
-        <AsComp
-          ref={ref}
-          fill={fill}
-          {...props}
-          {...sizeProps}
-          stroke={colorProps}
-        />
-      );
-    }
-    return (
-      <Svg
-        ref={ref}
-        height={height}
-        width={width}
-        fill={fill}
-        stroke={colorProps}
-        {...props}
-      />
-    );
-  }
-);
+import { PrimitiveIcon, Svg } from '@gluestack-ui/icon';
 
 export const UIIcon = createIcon({
   Root: PrimitiveIcon,
 });
 
 const iconStyle = tva({
-  base: 'text-typography-950 fill-none',
+  base: 'text-typography-950 fill-none pointer-events-none',
   variants: {
     size: {
       '2xs': 'h-3 w-3',
@@ -141,9 +63,14 @@ export const Icon = React.forwardRef<
 
 type ParameterTypes = Omit<Parameters<typeof createIcon>[0], 'Root'>;
 
-const createIconUI = ({ ...props }: ParameterTypes) => {
-  const UIIcon = createIcon({ Root: Svg, ...props });
+const accessClassName = (style: any) => {
+  const styleObject = Array.isArray(style) ? style[0] : style;
+  const keys = Object.keys(styleObject);
+  return styleObject[keys[1]];
+};
 
+const createIconUI = ({ ...props }: ParameterTypes) => {
+  const NewUIIcon = createIcon({ Root: Svg, ...props });
   return React.forwardRef<
     React.ElementRef<typeof UIIcon>,
     React.ComponentPropsWithoutRef<typeof UIIcon> &
@@ -151,16 +78,18 @@ const createIconUI = ({ ...props }: ParameterTypes) => {
         height?: number | string;
         width?: number | string;
       }
-  >(({ className, size, ...props }, ref) => {
+  >(({ className, ...inComingprops }, ref) => {
+    const calculateClassName = React.useMemo(() => {
+      return className === undefined
+        ? accessClassName(inComingprops?.style)
+        : className;
+    }, [className, inComingprops?.style]);
     return (
-      <UIIcon
-        ref={ref}
-        {...props}
-        className={iconStyle({ size, class: className })}
-      />
+      <NewUIIcon ref={ref} {...inComingprops} className={calculateClassName} />
     );
   });
 };
+
 export { createIconUI as createIcon };
 
 // All Icons
diff --git a/expo-app/components/ui/image/index.tsx b/expo-app/components/ui/image/index.tsx
index 26879c42..1afc87a2 100644
--- a/expo-app/components/ui/image/index.tsx
+++ b/expo-app/components/ui/image/index.tsx
@@ -4,7 +4,6 @@ import { createImage } from '@gluestack-ui/image';
 import { Platform, Image as RNImage } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { cssInterop } from 'nativewind';
 
 const imageStyle = tva({
   base: 'max-w-full',
@@ -18,12 +17,12 @@ const imageStyle = tva({
       'xl': 'h-32 w-32',
       '2xl': 'h-64 w-64',
       'full': 'h-full w-full',
+      'none': '',
     },
   },
 });
 
 const UIImage = createImage({ Root: RNImage });
-cssInterop(UIImage, { className: 'style' });
 
 type ImageProps = VariantProps<typeof imageStyle> &
   React.ComponentProps<typeof UIImage>;
@@ -36,10 +35,11 @@ const Image = React.forwardRef<
       className={imageStyle({ size, class: className })}
       {...props}
       ref={ref}
-      //@ts-ignore
+      // @ts-expect-error
       style={
         Platform.OS === 'web'
-          ? { height: 'revert-layer', width: 'revert-layer' }
+          ? // eslint-disable-next-line react-native/no-inline-styles
+            { height: 'revert-layer', width: 'revert-layer' }
           : undefined
       }
     />
diff --git a/expo-app/components/ui/input/index.tsx b/expo-app/components/ui/input/index.tsx
index 3f2658ea..97aa1351 100644
--- a/expo-app/components/ui/input/index.tsx
+++ b/expo-app/components/ui/input/index.tsx
@@ -1,76 +1,36 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createInput } from '@gluestack-ui/input';
-import { Svg } from 'react-native-svg';
-import { View, Pressable, TextInput, Platform } from 'react-native';
+import { View, Pressable, TextInput } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-const SCOPE = 'INPUT';
-
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
-
-const InputWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->(({ ...props }, ref) => {
-  return <View {...props} ref={ref} />;
-});
+const SCOPE = 'INPUT';
 
 const UIInput = createInput({
-  // @ts-ignore
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(InputWrapper, SCOPE)
-      : withStyleContextAndStates(InputWrapper, SCOPE),
-  Icon: PrimitiveIcon,
+  Root: withStyleContext(View, SCOPE),
+  Icon: UIIcon,
   Slot: Pressable,
-  Input: Platform.OS === 'web' ? TextInput : withStates(TextInput),
+  Input: TextInput,
+});
+
+cssInterop(PrimitiveIcon, {
+  className: {
+    target: 'style',
+    nativeStyleToProp: {
+      height: true,
+      width: true,
+      fill: true,
+      color: 'classNameColor',
+      stroke: true,
+    },
+  },
 });
 
 const inputStyle = tva({
@@ -141,25 +101,6 @@ const inputFieldStyle = tva({
   },
 });
 
-cssInterop(InputWrapper, { className: 'style' });
-cssInterop(UIInput.Slot, { className: 'style' });
-cssInterop(UIInput.Input, {
-  className: { target: 'style', nativeStyleToProp: { textAlign: true } },
-});
-cssInterop(UIInput.Icon, {
-  className: {
-    target: 'style',
-    nativeStyleToProp: {
-      height: true,
-      width: true,
-      // @ts-ignore
-      fill: true,
-      color: true,
-      stroke: true,
-    },
-  },
-});
-
 type IInputProps = React.ComponentProps<typeof UIInput> &
   VariantProps<typeof inputStyle> & { className?: string };
 const Input = React.forwardRef<React.ElementRef<typeof UIInput>, IInputProps>(
diff --git a/expo-app/components/ui/link/index.tsx b/expo-app/components/ui/link/index.tsx
index 04e8d83f..a17b0b72 100644
--- a/expo-app/components/ui/link/index.tsx
+++ b/expo-app/components/ui/link/index.tsx
@@ -1,22 +1,17 @@
 'use client';
 import { createLink } from '@gluestack-ui/link';
-import { Pressable, Platform } from 'react-native';
+import { Pressable } from 'react-native';
 import { Text } from 'react-native';
 
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 import React from 'react';
 export const UILink = createLink({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(Pressable)
-      : withStyleContextAndStates(Pressable),
-  Text: Platform.OS === 'web' ? Text : withStates(Text),
+  Root: withStyleContext(Pressable),
+  Text: Text,
 });
 
 cssInterop(UILink, { className: 'style' });
diff --git a/expo-app/components/ui/menu/index.tsx b/expo-app/components/ui/menu/index.tsx
index 2eeffb62..1a3573ca 100644
--- a/expo-app/components/ui/menu/index.tsx
+++ b/expo-app/components/ui/menu/index.tsx
@@ -3,10 +3,9 @@ import React from 'react';
 import { createMenu } from '@gluestack-ui/menu';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { cssInterop } from 'nativewind';
-import { Pressable, Text, Platform, View } from 'react-native';
+import { Pressable, Text, View } from 'react-native';
 import { Motion, AnimatePresence } from '@legendapp/motion';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 
 const menuStyle = tva({
   base: 'rounded-md bg-background-0 border border-outline-100 p-1 shadow-hard-5',
@@ -115,15 +114,14 @@ const Separator = React.forwardRef(
 );
 export const UIMenu = createMenu({
   Root: Motion.View,
-  Item: Platform.OS === 'web' ? Item : withStates(Item),
+  Item: Item,
   Label: Text,
   Backdrop: BackdropPressable,
   AnimatePresence: AnimatePresence,
   Separator: Separator,
 });
 
-cssInterop(UIMenu, { className: 'style' });
-cssInterop(UIMenu.ItemLabel, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
 
 type IMenuProps = React.ComponentProps<typeof UIMenu> &
   VariantProps<typeof menuStyle> & { className?: string };
diff --git a/expo-app/components/ui/modal/index.tsx b/expo-app/components/ui/modal/index.tsx
index f19e5118..e38fef1c 100644
--- a/expo-app/components/ui/modal/index.tsx
+++ b/expo-app/components/ui/modal/index.tsx
@@ -1,7 +1,7 @@
 'use client';
 import React from 'react';
 import { createModal } from '@gluestack-ui/modal';
-import { Pressable, View, ScrollView, Platform } from 'react-native';
+import { Pressable, View, ScrollView } from 'react-native';
 import {
   Motion,
   AnimatePresence,
@@ -12,19 +12,14 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 const AnimatedPressable = createMotionAnimatedComponent(Pressable);
-
 const SCOPE = 'MODAL';
 
 const UIModal = createModal({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(View, SCOPE),
+  Root: withStyleContext(View, SCOPE),
   Backdrop: AnimatedPressable,
   Content: Motion.View,
   Body: ScrollView,
@@ -33,17 +28,9 @@ const UIModal = createModal({
   Header: View,
   AnimatePresence: AnimatePresence,
 });
-cssInterop(UIModal, { className: 'style' });
-cssInterop(UIModal.Backdrop, { className: 'style' });
-cssInterop(UIModal.Content, { className: 'style' });
-cssInterop(UIModal.CloseButton, { className: 'style' });
-cssInterop(UIModal.Header, { className: 'style' });
-cssInterop(UIModal.Body, {
-  className: 'style',
-  contentContainerClassName: 'contentContainerStyle',
-  indicatorClassName: 'indicatorStyle',
-});
-cssInterop(UIModal.Footer, { className: 'style' });
+
+cssInterop(AnimatedPressable, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
 
 const modalStyle = tva({
   base: 'group/modal w-full h-full justify-center items-center web:pointer-events-none',
@@ -76,7 +63,7 @@ const modalContentStyle = tva({
 });
 
 const modalBodyStyle = tva({
-  base: 'mt-4 mb-6',
+  base: 'mt-2 mb-6',
 });
 
 const modalCloseButtonStyle = tva({
diff --git a/expo-app/components/ui/popover/index.tsx b/expo-app/components/ui/popover/index.tsx
index 3854379e..5d53d65a 100644
--- a/expo-app/components/ui/popover/index.tsx
+++ b/expo-app/components/ui/popover/index.tsx
@@ -1,6 +1,6 @@
 'use client';
 import React from 'react';
-import { View, Pressable, Platform, ScrollView } from 'react-native';
+import { View, Pressable, ScrollView } from 'react-native';
 import {
   Motion,
   createMotionAnimatedComponent,
@@ -12,26 +12,15 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 const AnimatedPressable = createMotionAnimatedComponent(Pressable);
 const SCOPE = 'POPOVER';
-const ArrowWrapper = React.forwardRef(({ ...props }, ref) => {
-  return <Motion.View {...props} ref={ref} />;
-}) as React.ForwardRefExoticComponent<
-  React.ElementRef<typeof Motion.View> &
-    React.ComponentProps<typeof Motion.View>
->;
+
 const UIPopover = createPopover({
-  Root: (Platform.OS === 'web'
-    ? withStyleContext(View, SCOPE)
-    : withStyleContextAndStates(View, SCOPE)) as ReturnType<
-    typeof withStyleContext<typeof View>
-  >,
-  Arrow: Platform.OS === 'web' ? Motion.View : withStates(ArrowWrapper),
+  Root: withStyleContext(View, SCOPE),
+  Arrow: Motion.View,
   Backdrop: AnimatedPressable,
   Body: ScrollView,
   CloseButton: Pressable,
@@ -41,18 +30,8 @@ const UIPopover = createPopover({
   AnimatePresence: AnimatePresence,
 });
 
-cssInterop(UIPopover, { className: 'style' });
-cssInterop(ArrowWrapper, { className: 'style' });
-cssInterop(UIPopover.Content, { className: 'style' });
-cssInterop(UIPopover.Header, { className: 'style' });
-cssInterop(UIPopover.Footer, { className: 'style' });
-cssInterop(UIPopover.Body, {
-  className: 'style',
-  contentContainerClassName: 'contentContainerStyle',
-  indicatorClassName: 'indicatorStyle',
-});
-cssInterop(UIPopover.Backdrop, { className: 'style' });
-cssInterop(UIPopover.CloseButton, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
+cssInterop(AnimatedPressable, { className: 'style' });
 
 const popoverStyle = tva({
   base: 'group/popover w-full h-full justify-center items-center web:pointer-events-none',
@@ -72,29 +51,29 @@ const popoverArrowStyle = tva({
   variants: {
     placement: {
       'top left':
-        'data-[flip=false]:border-t-transparent data-[flip=false]:border-l-transparent data-[flip=true]:border-b-transparent data-[flip=true]:border-r-transparent',
+        'data-[flip=false]:border-t-0 data-[flip=false]:border-l-0 data-[flip=true]:border-b-0 data-[flip=true]:border-r-0',
       'top':
-        'data-[flip=false]:border-t-transparent data-[flip=false]:border-l-transparent data-[flip=true]:border-b-transparent data-[flip=true]:border-r-transparent',
+        'data-[flip=false]:border-t-0 data-[flip=false]:border-l-0 data-[flip=true]:border-b-0 data-[flip=true]:border-r-0',
       'top right':
-        'data-[flip=false]:border-t-transparent data-[flip=false]:border-l-transparent data-[flip=true]:border-b-transparent data-[flip=true]:border-r-transparent',
+        'data-[flip=false]:border-t-0 data-[flip=false]:border-l-0 data-[flip=true]:border-b-0 data-[flip=true]:border-r-0',
       'bottom':
-        'data-[flip=false]:border-b-transparent data-[flip=false]:border-r-transparent data-[flip=true]:border-t-transparent data-[flip=true]:border-l-transparent',
+        'data-[flip=false]:border-b-0 data-[flip=false]:border-r-0 data-[flip=true]:border-t-0 data-[flip=true]:border-l-0',
       'bottom left':
-        'data-[flip=false]:border-b-transparent data-[flip=false]:border-r-transparent data-[flip=true]:border-t-transparent data-[flip=true]:border-l-transparent',
+        'data-[flip=false]:border-b-0 data-[flip=false]:border-r-0 data-[flip=true]:border-t-0 data-[flip=true]:border-l-0',
       'bottom right':
-        'data-[flip=false]:border-b-transparent data-[flip=false]:border-r-transparent data-[flip=true]:border-t-transparent data-[flip=true]:border-l-transparent',
+        'data-[flip=false]:border-b-0 data-[flip=false]:border-r-0 data-[flip=true]:border-t-0 data-[flip=true]:border-l-0',
       'left':
-        'data-[flip=false]:border-l-transparent data-[flip=false]:border-b-transparent data-[flip=true]:border-r-transparent data-[flip=true]:border-t-transparent',
+        'data-[flip=false]:border-l-0 data-[flip=false]:border-b-0 data-[flip=true]:border-r-0 data-[flip=true]:border-t-0',
       'left top':
-        'data-[flip=false]:border-l-transparent data-[flip=false]:border-b-transparent data-[flip=true]:border-r-transparent data-[flip=true]:border-t-transparent',
+        'data-[flip=false]:border-l-0 data-[flip=false]:border-b-0 data-[flip=true]:border-r-0 data-[flip=true]:border-t-0',
       'left bottom':
-        'data-[flip=false]:border-l-transparent data-[flip=false]:border-b-transparent data-[flip=true]:border-r-transparent data-[flip=true]:border-t-transparent',
+        'data-[flip=false]:border-l-0 data-[flip=false]:border-b-0 data-[flip=true]:border-r-0 data-[flip=true]:border-t-0',
       'right':
-        'data-[flip=false]:border-r-transparent data-[flip=false]:border-t-transparent data-[flip=true]:border-l-transparent data-[flip=true]:border-b-transparent',
+        'data-[flip=false]:border-r-0 data-[flip=false]:border-t-0 data-[flip=true]:border-l-0 data-[flip=true]:border-b-0',
       'right top':
-        'data-[flip=false]:border-r-transparent data-[flip=false]:border-t-transparent data-[flip=true]:border-l-transparent data-[flip=true]:border-b-transparent',
+        'data-[flip=false]:border-r-0 data-[flip=false]:border-t-0 data-[flip=true]:border-l-0 data-[flip=true]:border-b-0',
       'right bottom':
-        'data-[flip=false]:border-r-transparent data-[flip=false]:border-t-transparent data-[flip=true]:border-l-transparent data-[flip=true]:border-b-transparent',
+        'data-[flip=false]:border-r-0 data-[flip=false]:border-t-0 data-[flip=true]:border-l-0 data-[flip=true]:border-b-0',
     },
   },
 });
@@ -167,7 +146,6 @@ const Popover = React.forwardRef<
       ref={ref}
       placement={placement}
       {...props}
-      // @ts-ignore
       className={popoverStyle({ size, class: className })}
       context={{ size, placement }}
       pointerEvents="box-none"
diff --git a/expo-app/components/ui/pressable/index.tsx b/expo-app/components/ui/pressable/index.tsx
index 9bfc0c72..e6e5e0b4 100644
--- a/expo-app/components/ui/pressable/index.tsx
+++ b/expo-app/components/ui/pressable/index.tsx
@@ -1,27 +1,20 @@
 'use client';
 import React from 'react';
 import { createPressable } from '@gluestack-ui/pressable';
-import { Pressable as RNPressable, Platform } from 'react-native';
+import { Pressable as RNPressable } from 'react-native';
 
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 const UIPressable = createPressable({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(RNPressable)
-      : withStyleContextAndStates(RNPressable),
+  Root: withStyleContext(RNPressable),
 });
 
 const pressableStyle = tva({
   base: 'data-[focus-visible=true]:outline-none data-[focus-visible=true]:ring-indicator-info data-[focus-visible=true]:ring-2 data-[disabled=true]:opacity-40',
 });
 
-cssInterop(UIPressable, { className: 'style' });
-
 type IPressableProps = Omit<
   React.ComponentProps<typeof UIPressable>,
   'context'
diff --git a/expo-app/components/ui/progress/index.tsx b/expo-app/components/ui/progress/index.tsx
index d098dfdc..c51ac3d0 100644
--- a/expo-app/components/ui/progress/index.tsx
+++ b/expo-app/components/ui/progress/index.tsx
@@ -9,6 +9,7 @@ import {
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+
 const SCOPE = 'PROGRESS';
 export const UIProgress = createProgress({
   Root: withStyleContext(View, SCOPE),
@@ -21,6 +22,10 @@ cssInterop(UIProgress.FilledTrack, { className: 'style' });
 const progressStyle = tva({
   base: 'bg-background-300 rounded-full w-full',
   variants: {
+    orientation: {
+      horizontal: 'w-full',
+      vertical: 'h-full',
+    },
     size: {
       'xs': 'h-1',
       'sm': 'h-2',
@@ -30,10 +35,48 @@ const progressStyle = tva({
       '2xl': 'h-6',
     },
   },
+  compoundVariants: [
+    {
+      orientation: 'vertical',
+      size: 'xs',
+      class: 'h-full w-1 justify-end',
+    },
+    {
+      orientation: 'vertical',
+      size: 'sm',
+      class: 'h-full w-2 justify-end',
+    },
+    {
+      orientation: 'vertical',
+      size: 'md',
+      class: 'h-full w-3 justify-end',
+    },
+    {
+      orientation: 'vertical',
+      size: 'lg',
+      class: 'h-full w-4 justify-end',
+    },
+
+    {
+      orientation: 'vertical',
+      size: 'xl',
+      class: 'h-full w-5 justify-end',
+    },
+    {
+      orientation: 'vertical',
+      size: '2xl',
+      class: 'h-full w-6 justify-end',
+    },
+  ],
 });
+
 const progressFilledTrackStyle = tva({
   base: 'bg-primary-500 rounded-full',
   parentVariants: {
+    orientation: {
+      horizontal: 'w-full',
+      vertical: 'h-full',
+    },
     size: {
       'xs': 'h-1',
       'sm': 'h-2',
@@ -43,6 +86,39 @@ const progressFilledTrackStyle = tva({
       '2xl': 'h-6',
     },
   },
+  parentCompoundVariants: [
+    {
+      orientation: 'vertical',
+      size: 'xs',
+      class: 'h-full w-1',
+    },
+    {
+      orientation: 'vertical',
+      size: 'sm',
+      class: 'h-full w-2',
+    },
+    {
+      orientation: 'vertical',
+      size: 'md',
+      class: 'h-full w-3',
+    },
+    {
+      orientation: 'vertical',
+      size: 'lg',
+      class: 'h-full w-4',
+    },
+
+    {
+      orientation: 'vertical',
+      size: 'xl',
+      class: 'h-full w-5',
+    },
+    {
+      orientation: 'vertical',
+      size: '2xl',
+      class: 'h-full w-6',
+    },
+  ],
 });
 
 type IProgressProps = VariantProps<typeof progressStyle> &
@@ -53,13 +129,14 @@ type IProgressFilledTrackProps = VariantProps<typeof progressFilledTrackStyle> &
 export const Progress = React.forwardRef<
   React.ElementRef<typeof UIProgress>,
   IProgressProps
->(({ className, size = 'md', ...props }, ref) => {
+>(({ className, size = 'md', orientation = 'horizontal', ...props }, ref) => {
   return (
     <UIProgress
       ref={ref}
       {...props}
-      className={progressStyle({ size, class: className })}
-      context={{ size }}
+      className={progressStyle({ size, orientation, class: className })}
+      context={{ size, orientation }}
+      orientation={orientation}
     />
   );
 });
@@ -68,7 +145,8 @@ export const ProgressFilledTrack = React.forwardRef<
   React.ElementRef<typeof UIProgress.FilledTrack>,
   IProgressFilledTrackProps
 >(({ className, ...props }, ref) => {
-  const { size: parentSize } = useStyleContext(SCOPE);
+  const { size: parentSize, orientation: parentOrientation } =
+    useStyleContext(SCOPE);
 
   return (
     <UIProgress.FilledTrack
@@ -76,6 +154,7 @@ export const ProgressFilledTrack = React.forwardRef<
       className={progressFilledTrackStyle({
         parentVariants: {
           size: parentSize,
+          orientation: parentOrientation,
         },
         class: className,
       })}
diff --git a/expo-app/components/ui/radio/index.tsx b/expo-app/components/ui/radio/index.tsx
index 837b0200..a32aee7d 100644
--- a/expo-app/components/ui/radio/index.tsx
+++ b/expo-app/components/ui/radio/index.tsx
@@ -1,7 +1,6 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createRadio } from '@gluestack-ui/radio';
-import { Svg } from 'react-native-svg';
 import { Pressable, View, Platform, Text } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
@@ -9,70 +8,34 @@ import {
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
-const IndicatorWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->(({ ...props }, ref) => {
-  return <View {...props} ref={ref} />;
-});
-
-const LabelWrapper = React.forwardRef<
-  React.ElementRef<typeof Text>,
-  React.ComponentProps<typeof Text>
->(({ ...props }, ref) => {
-  return <Text {...props} ref={ref} />;
-});
+const SCOPE = 'Radio';
 
-const IconWrapper = React.forwardRef<
-  React.ElementRef<typeof PrimitiveIcon>,
-  React.ComponentProps<typeof PrimitiveIcon>
->(({ ...props }, ref) => {
-  return <PrimitiveIcon {...props} ref={ref} />;
+const UIRadio = createRadio({
+  Root: (Platform.OS === 'web'
+    ? withStyleContext(View, SCOPE)
+    : withStyleContext(Pressable, SCOPE)) as ReturnType<
+    typeof withStyleContext<typeof Pressable>
+  >,
+  Group: View,
+  Icon: UIIcon,
+  Indicator: View,
+  Label: Text,
 });
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
+cssInterop(PrimitiveIcon, {
+  className: {
+    target: 'style',
+    nativeStyleToProp: {
+      height: true,
+      width: true,
+      fill: true,
+      color: 'classNameColor',
+      stroke: true,
+    },
+  },
 });
 
 const radioStyle = tva({
@@ -132,39 +95,6 @@ const radioLabelStyle = tva({
   },
 });
 
-const SCOPE = 'Radio';
-
-const UIRadio = createRadio({
-  Root: (Platform.OS === 'web'
-    ? withStyleContext(View, SCOPE)
-    : withStyleContextAndStates(Pressable, SCOPE)) as ReturnType<
-    typeof withStyleContextAndStates<typeof Pressable>
-  >,
-  Group: View,
-  Icon: Platform.OS === 'web' ? IconWrapper : withStates(IconWrapper),
-  Indicator:
-    Platform.OS === 'web' ? IndicatorWrapper : withStates(IndicatorWrapper),
-  Label: Platform.OS === 'web' ? LabelWrapper : withStates(LabelWrapper),
-});
-
-cssInterop(UIRadio, { className: 'style' });
-cssInterop(UIRadio.Group, { className: 'style' });
-cssInterop(IndicatorWrapper, { className: 'style' });
-cssInterop(LabelWrapper, { className: 'style' });
-cssInterop(IconWrapper, {
-  className: {
-    target: 'style',
-    nativeStyleToProp: {
-      height: true,
-      width: true,
-      // @ts-ignore
-      fill: true,
-      color: true,
-      stroke: true,
-    },
-  },
-});
-
 type IRadioProps = Omit<React.ComponentProps<typeof UIRadio>, 'context'> &
   VariantProps<typeof radioStyle>;
 const Radio = React.forwardRef<React.ElementRef<typeof UIRadio>, IRadioProps>(
diff --git a/expo-app/components/ui/select/index.tsx b/expo-app/components/ui/select/index.tsx
index 2c6ec85f..a81cd3e5 100644
--- a/expo-app/components/ui/select/index.tsx
+++ b/expo-app/components/ui/select/index.tsx
@@ -1,7 +1,8 @@
-import React, { useMemo } from 'react';
+'use client';
+
+import React from 'react';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { Svg } from 'react-native-svg';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import {
   withStyleContext,
   useStyleContext,
@@ -23,7 +24,7 @@ import {
   ActionsheetSectionList,
   ActionsheetSectionHeaderText,
 } from './select-actionsheet';
-import { Pressable, View, TextInput, Platform } from 'react-native';
+import { Pressable, View, TextInput } from 'react-native';
 
 const SelectTriggerWrapper = React.forwardRef<
   React.ElementRef<typeof Pressable>,
@@ -87,73 +88,12 @@ const selectInputStyle = tva({
   },
 });
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
-
 const UISelect = createSelect(
   {
     Root: View,
-    Trigger:
-      Platform.OS === 'web'
-        ? withStyleContext(SelectTriggerWrapper)
-        : withStyleContextAndStates(SelectTriggerWrapper),
+    Trigger: withStyleContext(SelectTriggerWrapper),
     Input: TextInput,
-    Icon: PrimitiveIcon,
+    Icon: UIIcon,
   },
   {
     Portal: Actionsheet,
@@ -176,8 +116,8 @@ cssInterop(UISelect.Input, {
   className: { target: 'style', nativeStyleToProp: { textAlign: true } },
 });
 cssInterop(SelectTriggerWrapper, { className: 'style' });
-//@ts-ignore
-cssInterop(UISelect.Icon, {
+
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
@@ -308,7 +248,6 @@ const SelectContent = UISelect.Content;
 const SelectDragIndicator = UISelect.DragIndicator;
 const SelectDragIndicatorWrapper = UISelect.DragIndicatorWrapper;
 const SelectItem = UISelect.Item;
-const SelectItemText = UISelect.ItemText;
 const SelectScrollView = UISelect.ScrollView;
 const SelectVirtualizedList = UISelect.VirtualizedList;
 const SelectFlatList = UISelect.FlatList;
@@ -326,7 +265,6 @@ export {
   SelectDragIndicator,
   SelectDragIndicatorWrapper,
   SelectItem,
-  SelectItemText,
   SelectScrollView,
   SelectVirtualizedList,
   SelectFlatList,
diff --git a/expo-app/components/ui/select/select-actionsheet.tsx b/expo-app/components/ui/select/select-actionsheet.tsx
index ee3f1ebf..61ab0787 100644
--- a/expo-app/components/ui/select/select-actionsheet.tsx
+++ b/expo-app/components/ui/select/select-actionsheet.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import { H4 } from '@expo/html-elements';
 import { createActionsheet } from '@gluestack-ui/actionsheet';
 import {
@@ -8,13 +10,11 @@ import {
   VirtualizedList,
   FlatList,
   SectionList,
-  Platform,
 } from 'react-native';
-
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
 import {
   Motion,
@@ -22,59 +22,14 @@ import {
   createMotionAnimatedComponent,
 } from '@legendapp/motion';
 
-import React, { useMemo } from 'react';
-import { Svg } from 'react-native-svg';
+import React from 'react';
 
 const AnimatedPressable = createMotionAnimatedComponent(Pressable);
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
-
 export const UIActionsheet = createActionsheet({
   Root: View,
   Content: withStyleContext(Motion.View),
-  Item:
-    Platform.OS === 'web'
-      ? withStyleContext(Pressable)
-      : withStyleContextAndStates(Pressable),
+  Item: withStyleContext(Pressable),
   ItemText: Text,
   DragIndicator: View,
   IndicatorWrapper: View,
@@ -84,7 +39,7 @@ export const UIActionsheet = createActionsheet({
   FlatList: FlatList,
   SectionList: SectionList,
   SectionHeaderText: H4,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
   AnimatePresence: AnimatePresence,
 });
 
@@ -117,7 +72,18 @@ cssInterop(UIActionsheet.FlatList, {
 });
 cssInterop(UIActionsheet.SectionList, { className: 'style' });
 cssInterop(UIActionsheet.SectionHeaderText, { className: 'style' });
-cssInterop(UIActionsheet.Icon, { className: 'style' });
+cssInterop(PrimitiveIcon, {
+  className: {
+    target: 'style',
+    nativeStyleToProp: {
+      height: true,
+      width: true,
+      fill: true,
+      color: 'classNameColor',
+      stroke: true,
+    },
+  },
+});
 
 const actionsheetStyle = tva({ base: 'w-full h-full web:pointer-events-none' });
 
diff --git a/expo-app/components/ui/slider/index.tsx b/expo-app/components/ui/slider/index.tsx
index 455ccd2c..77c70c6d 100644
--- a/expo-app/components/ui/slider/index.tsx
+++ b/expo-app/components/ui/slider/index.tsx
@@ -1,47 +1,30 @@
 'use client';
 import { createSlider } from '@gluestack-ui/slider';
 import { Pressable } from 'react-native';
-import { View, Platform } from 'react-native';
+import { View } from 'react-native';
 import React from 'react';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-
-const ThumbWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->((props, ref) => <View ref={ref} {...props} />);
-
-const FilledTrackWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->((props, ref) => <View ref={ref} {...props} />);
+import { cssInterop } from 'nativewind';
 
 const SCOPE = 'SLIDER';
+const Root = withStyleContext(View, SCOPE);
 export const UISlider = createSlider({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(View, SCOPE),
-  Thumb: Platform.OS === 'web' ? ThumbWrapper : withStates(View),
+  Root: Root,
+  Thumb: View,
   Track: Pressable,
-  FilledTrack: Platform.OS === 'web' ? FilledTrackWrapper : withStates(View),
+  FilledTrack: View,
   ThumbInteraction: View,
 });
 
-cssInterop(UISlider, { className: 'style' });
-cssInterop(ThumbWrapper, { className: 'style' });
 cssInterop(UISlider.Track, { className: 'style' });
-cssInterop(FilledTrackWrapper, { className: 'style' });
 
 const sliderStyle = tva({
-  base: 'justify-center items-center data-[disabled=true]:web:opacity-40 data-[disabled=true]:web:pointer-events-none',
+  base: 'justify-center items-center data-[disabled=true]:opacity-40 data-[disabled=true]:web:pointer-events-none',
   variants: {
     orientation: {
       horizontal: 'w-full',
@@ -60,7 +43,7 @@ const sliderStyle = tva({
 });
 
 const sliderThumbStyle = tva({
-  base: 'bg-primary-500 absolute rounded-full data-[focus=true]:bg-primary-600 data-[active=true]:bg-primary-600 data-[hover=true]:bg-primary-600 data-[disabled=true]:bg-primary-500 web:cursor-pointer web:active:outline-4 web:active:outline web:active:outline-primary-400 data-[focus=true]:web:outline-4 data-[focus=true]:web:outline data-[focus=true]:web:outline-primary-400 shadow-hard-1',
+  base: 'bg-primary-500 absolute rounded-full data-[focus=true]:bg-primary-600 data-[active=true]:bg-primary-600 data-[hover=true]:bg-primary-600 data-[disabled=true]:bg-primary-500 web:cursor-pointer web:data-[active=true]:outline web:data-[active=true]:outline-4 web:data-[active=true]:outline-primary-400 shadow-hard-1',
 
   parentVariants: {
     size: {
@@ -213,7 +196,6 @@ export const SliderThumb = React.forwardRef<
 
   return (
     <UISlider.Thumb
-      //@ts-ignore
       ref={ref}
       {...props}
       className={sliderThumbStyle({
@@ -269,7 +251,6 @@ export const SliderFilledTrack = React.forwardRef<
 
   return (
     <UISlider.FilledTrack
-      //@ts-ignore
       ref={ref}
       {...props}
       className={sliderFilledTrackStyle({
diff --git a/expo-app/components/ui/spinner/index.tsx b/expo-app/components/ui/spinner/index.tsx
index 8f6a7c51..19e88207 100644
--- a/expo-app/components/ui/spinner/index.tsx
+++ b/expo-app/components/ui/spinner/index.tsx
@@ -1,33 +1,41 @@
 'use client';
 import { ActivityIndicator } from 'react-native';
 import React from 'react';
-import { createSpinner } from '@gluestack-ui/spinner';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { cssInterop } from 'nativewind';
 
-const UISpinner = createSpinner({ Root: ActivityIndicator });
-
-cssInterop(UISpinner, {
+cssInterop(ActivityIndicator, {
   className: { target: 'style', nativeStyleToProp: { color: true } },
 });
 
 const spinnerStyle = tva({});
 
-type ISpinnerProps = React.ComponentProps<typeof UISpinner>;
-
 const Spinner = React.forwardRef<
-  React.ElementRef<typeof UISpinner>,
-  ISpinnerProps
->(({ className, color, ...props }, ref) => {
-  return (
-    <UISpinner
-      ref={ref}
-      {...props}
-      color={color}
-      className={spinnerStyle({ class: className })}
-    />
-  );
-});
+  React.ElementRef<typeof ActivityIndicator>,
+  React.ComponentProps<typeof ActivityIndicator>
+>(
+  (
+    {
+      className,
+      color,
+      focusable = false,
+      'aria-label': ariaLabel = 'loading',
+      ...props
+    },
+    ref
+  ) => {
+    return (
+      <ActivityIndicator
+        ref={ref}
+        focusable={focusable}
+        aria-label={ariaLabel}
+        {...props}
+        color={color}
+        className={spinnerStyle({ class: className })}
+      />
+    );
+  }
+);
 
 Spinner.displayName = 'Spinner';
 
diff --git a/expo-app/components/ui/switch/index.tsx b/expo-app/components/ui/switch/index.tsx
index 85d3e6de..c70e6668 100644
--- a/expo-app/components/ui/switch/index.tsx
+++ b/expo-app/components/ui/switch/index.tsx
@@ -1,29 +1,15 @@
 'use client';
 import React from 'react';
-import { Switch as RNSwitch, Platform } from 'react-native';
+import { Switch as RNSwitch } from 'react-native';
 import { createSwitch } from '@gluestack-ui/switch';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
-const SwitchWrapper = React.forwardRef<
-  React.ElementRef<typeof RNSwitch>,
-  React.ComponentProps<typeof RNSwitch>
->(({ ...props }, ref) => {
-  return <RNSwitch {...props} ref={ref} />;
-});
-
 const UISwitch = createSwitch({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(SwitchWrapper)
-      : withStyleContextAndStates(SwitchWrapper),
+  Root: withStyleContext(RNSwitch),
 });
 
-cssInterop(SwitchWrapper, { className: 'style' });
-
 const switchStyle = tva({
   base: 'data-[focus=true]:outline-0 data-[focus=true]:ring-2 data-[focus=true]:ring-indicator-primary web:cursor-pointer disabled:cursor-not-allowed data-[disabled=true]:opacity-40 data-[invalid=true]:border-error-700 data-[invalid=true]:rounded-xl data-[invalid=true]:border-2',
 
diff --git a/expo-app/components/ui/table/index.tsx b/expo-app/components/ui/table/index.tsx
index 9cdd0f04..10fbd675 100644
--- a/expo-app/components/ui/table/index.tsx
+++ b/expo-app/components/ui/table/index.tsx
@@ -7,6 +7,7 @@ import {
   TR as ExpoTR,
   Caption as ExpoTCaption,
 } from '@expo/html-elements';
+
 import {
   tableStyle,
   tableHeaderStyle,
@@ -19,8 +20,16 @@ import {
 } from './styles';
 import { Text, View } from 'react-native';
 
-const TableHeaderContext = createContext<any>({});
-const TableFooterContext = createContext<any>({});
+const TableHeaderContext = createContext<{
+  isHeaderRow: boolean;
+}>({
+  isHeaderRow: false,
+});
+const TableFooterContext = createContext<{
+  isFooterRow: boolean;
+}>({
+  isFooterRow: false,
+});
 
 type ITableProps = React.ComponentProps<typeof ExpoTable>;
 type ITableHeaderProps = React.ComponentProps<typeof ExpoTHead>;
@@ -39,6 +48,7 @@ const Table = React.forwardRef<React.ElementRef<typeof ExpoTable>, ITableProps>(
   ({ className, ...props }, ref) => {
     return (
       <ExpoTable
+        // @ts-expect-error
         ref={ref}
         className={tableStyle({ class: className })}
         {...props}
@@ -59,6 +69,7 @@ const TableHeader = React.forwardRef<
   return (
     <TableHeaderContext.Provider value={contextValue}>
       <ExpoTHead
+        // @ts-expect-error
         ref={ref}
         className={tableHeaderStyle({ class: className })}
         {...props}
@@ -73,6 +84,7 @@ const TableBody = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <ExpoTBody
+      // @ts-expect-error
       ref={ref}
       className={tableBodyStyle({ class: className })}
       {...props}
@@ -92,6 +104,7 @@ const TableFooter = React.forwardRef<
   return (
     <TableFooterContext.Provider value={contextValue}>
       <ExpoTFoot
+        // @ts-expect-error
         ref={ref}
         className={tableFooterStyle({ class: className })}
         {...props}
@@ -132,6 +145,7 @@ const TableRow = React.forwardRef<
 
   return (
     <ExpoTR
+      // @ts-expect-error
       ref={ref}
       className={tableRowStyleStyle({
         isHeaderRow,
@@ -172,6 +186,7 @@ const TableCaption = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <ExpoTCaption
+      // @ts-expect-error
       ref={ref}
       className={tableCaptionStyle({ class: className })}
       {...props}
diff --git a/expo-app/components/ui/table/index.web.tsx b/expo-app/components/ui/table/index.web.tsx
index a6a3a79a..e8c848f0 100644
--- a/expo-app/components/ui/table/index.web.tsx
+++ b/expo-app/components/ui/table/index.web.tsx
@@ -10,8 +10,16 @@ import {
   tableCaptionStyle,
 } from './styles';
 
-const TableHeaderContext = createContext<any>({});
-const TableFooterContext = createContext<any>({});
+const TableHeaderContext = createContext<{
+  isHeaderRow: boolean;
+}>({
+  isHeaderRow: false,
+});
+const TableFooterContext = createContext<{
+  isFooterRow: boolean;
+}>({
+  isFooterRow: false,
+});
 
 const Table = React.forwardRef(({ className, ...props }: any, ref?: any) => {
   return (
diff --git a/expo-app/components/ui/textarea/index.tsx b/expo-app/components/ui/textarea/index.tsx
index 4a5fd19f..0a9b0d90 100644
--- a/expo-app/components/ui/textarea/index.tsx
+++ b/expo-app/components/ui/textarea/index.tsx
@@ -1,36 +1,18 @@
 'use client';
 import React from 'react';
 import { createTextarea } from '@gluestack-ui/textarea';
-import { View, TextInput, Platform } from 'react-native';
+import { View, TextInput } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
-const TextareaWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->(({ ...props }, ref) => {
-  return <View {...props} ref={ref} />;
-});
-
 const SCOPE = 'TEXTAREA';
 const UITextarea = createTextarea({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(TextareaWrapper, SCOPE)
-      : withStyleContextAndStates(TextareaWrapper, SCOPE),
-  Input: Platform.OS === 'web' ? TextInput : withStates(TextInput),
-});
-
-cssInterop(TextareaWrapper, { className: 'style' });
-cssInterop(UITextarea.Input, {
-  className: { target: 'style', nativeStyleToProp: { textAlign: true } },
+  Root: withStyleContext(View, SCOPE),
+  Input: TextInput,
 });
 
 const textareaStyle = tva({
diff --git a/expo-app/components/ui/toast/index.tsx b/expo-app/components/ui/toast/index.tsx
index 21c1f668..9acc3843 100644
--- a/expo-app/components/ui/toast/index.tsx
+++ b/expo-app/components/ui/toast/index.tsx
@@ -1,7 +1,7 @@
 'use client';
 import React from 'react';
-import { createToast, createToastHook } from '@gluestack-ui/toast';
-import { Text, View, Platform } from 'react-native';
+import { createToastHook } from '@gluestack-ui/toast';
+import { AccessibilityInfo, Text, View } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { cssInterop } from 'nativewind';
 import { Motion, AnimatePresence } from '@legendapp/motion';
@@ -9,24 +9,12 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 export const useToast = createToastHook(Motion.View, AnimatePresence);
 const SCOPE = 'TOAST';
-export const UIToast = createToast({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(View, SCOPE),
-  Title: Text,
-  Description: Text,
-});
 
 cssInterop(Motion.View, { className: 'style' });
-cssInterop(UIToast, { className: 'style' });
-cssInterop(UIToast.Title, { className: 'style' });
-cssInterop(UIToast.Description, { className: 'style' });
 
 const toastStyle = tva({
   base: 'p-4 m-1 rounded-md gap-1 web:pointer-events-auto shadow-hard-5 border-outline-100',
@@ -36,7 +24,7 @@ const toastStyle = tva({
       warning: 'bg-warning-700',
       success: 'bg-success-700',
       info: 'bg-info-700',
-      muted: 'bg-secondary-700',
+      muted: 'bg-background-800',
     },
 
     variant: {
@@ -154,16 +142,17 @@ const toastDescriptionStyle = tva({
   },
 });
 
-type IToastProps = React.ComponentProps<typeof UIToast> & {
+const Root = withStyleContext(View, SCOPE);
+type IToastProps = React.ComponentProps<typeof Root> & {
   className?: string;
 } & VariantProps<typeof toastStyle>;
 
 export const Toast = React.forwardRef<
-  React.ElementRef<typeof UIToast>,
+  React.ElementRef<typeof Root>,
   IToastProps
 >(({ className, variant = 'solid', action = 'muted', ...props }, ref) => {
   return (
-    <UIToast
+    <Root
       ref={ref}
       className={toastStyle({ variant, action, class: className })}
       context={{ variant, action }}
@@ -172,20 +161,29 @@ export const Toast = React.forwardRef<
   );
 });
 
-type IToastTitleProps = React.ComponentProps<typeof UIToast.Title> & {
+type IToastTitleProps = React.ComponentProps<typeof Text> & {
   className?: string;
 } & VariantProps<typeof toastTitleStyle>;
 
 export const ToastTitle = React.forwardRef<
-  React.ElementRef<typeof UIToast.Title>,
+  React.ElementRef<typeof Text>,
   IToastTitleProps
->(({ className, size = 'md', ...props }, ref) => {
+>(({ className, size = 'md', children, ...props }, ref) => {
   const { variant: parentVariant, action: parentAction } =
     useStyleContext(SCOPE);
+  React.useEffect(() => {
+    // Issue from react-native side
+    // Hack for now, will fix this later
+    AccessibilityInfo.announceForAccessibility(children as string);
+  }, [children]);
+
   return (
-    <UIToast.Title
-      ref={ref}
+    <Text
       {...props}
+      ref={ref}
+      aria-live="assertive"
+      aria-atomic="true"
+      role="alert"
       className={toastTitleStyle({
         size,
         class: className,
@@ -194,23 +192,23 @@ export const ToastTitle = React.forwardRef<
           action: parentAction,
         },
       })}
-    />
+    >
+      {children}
+    </Text>
   );
 });
 
-type IToastDescriptionProps = React.ComponentProps<
-  typeof UIToast.Description
-> & {
+type IToastDescriptionProps = React.ComponentProps<typeof Text> & {
   className?: string;
 } & VariantProps<typeof toastDescriptionStyle>;
 
 export const ToastDescription = React.forwardRef<
-  React.ElementRef<typeof UIToast.Description>,
+  React.ElementRef<typeof Text>,
   IToastDescriptionProps
 >(({ className, size = 'md', ...props }, ref) => {
   const { variant: parentVariant } = useStyleContext(SCOPE);
   return (
-    <UIToast.Description
+    <Text
       ref={ref}
       {...props}
       className={toastDescriptionStyle({
diff --git a/expo-app/components/ui/tooltip/index.tsx b/expo-app/components/ui/tooltip/index.tsx
index 12315983..eec46228 100644
--- a/expo-app/components/ui/tooltip/index.tsx
+++ b/expo-app/components/ui/tooltip/index.tsx
@@ -1,25 +1,21 @@
 'use client';
 import React from 'react';
 import { createTooltip } from '@gluestack-ui/tooltip';
-import { View, Text, Platform } from 'react-native';
+import { View, Text } from 'react-native';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { cssInterop } from 'nativewind';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-
 import { Motion, AnimatePresence } from '@legendapp/motion';
-
+import { cssInterop } from 'nativewind';
 export const UITooltip = createTooltip({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View)
-      : withStyleContextAndStates(View),
+  Root: withStyleContext(View),
   Content: Motion.View,
   Text: Text,
   AnimatePresence: AnimatePresence,
 });
 
+cssInterop(Motion.View, { className: 'style' });
+
 const tooltipStyle = tva({
   base: 'w-full h-full web:pointer-events-none',
 });
@@ -71,10 +67,6 @@ const tooltipTextStyle = tva({
   },
 });
 
-cssInterop(UITooltip, { className: 'style' });
-cssInterop(UITooltip.Content, { className: 'style' });
-cssInterop(UITooltip.Text, { className: 'style' });
-
 type ITooltipProps = React.ComponentProps<typeof UITooltip> &
   VariantProps<typeof tooltipStyle> & { className?: string };
 type ITooltipContentProps = React.ComponentProps<typeof UITooltip.Content> &
diff --git a/expo-app/components/ui/utils/use-break-point-value.ts b/expo-app/components/ui/utils/use-break-point-value.ts
new file mode 100644
index 00000000..bc4b59a7
--- /dev/null
+++ b/expo-app/components/ui/utils/use-break-point-value.ts
@@ -0,0 +1,101 @@
+import { Dimensions, useWindowDimensions } from 'react-native';
+import { useEffect, useState } from 'react';
+
+import resolveConfig from 'tailwindcss/resolveConfig';
+import tailwindConfig from 'tailwind.config';
+
+const TailwindTheme = resolveConfig(tailwindConfig);
+const screenSize = TailwindTheme.theme.screens;
+
+type breakpoints = keyof typeof screenSize | 'default';
+
+type BreakPointValue = Partial<Record<breakpoints, any>>;
+
+const resolveScreenWidth: any = {
+  default: 0,
+};
+
+Object.entries(screenSize).forEach(([key, value]) => {
+  resolveScreenWidth[key] = parseInt(value.replace('px', ''), 10);
+});
+
+export const getBreakPointValue = (values: any, width: any) => {
+  if (typeof values !== 'object') return values;
+
+  let finalBreakPointResolvedValue: any;
+  const mediaQueriesBreakpoints: any = [
+    {
+      key: 'default',
+      breakpoint: 0,
+      isValid: true,
+    },
+  ];
+  Object.keys(resolveScreenWidth).forEach((key) => {
+    const isValid = isValidBreakpoint(resolveScreenWidth[key], width);
+
+    mediaQueriesBreakpoints.push({
+      key: key,
+      breakpoint: resolveScreenWidth[key],
+      isValid: isValid,
+    });
+  });
+
+  mediaQueriesBreakpoints.sort((a: any, b: any) => a.breakpoint - b.breakpoint);
+
+  mediaQueriesBreakpoints.forEach((breakpoint: any, index: any) => {
+    breakpoint.value = values.hasOwnProperty(breakpoint.key)
+      ? // @ts-ignore
+        values[breakpoint.key]
+      : mediaQueriesBreakpoints[index - 1]?.value ||
+        mediaQueriesBreakpoints[0]?.value;
+  });
+
+  const lastValidObject = getLastValidObject(mediaQueriesBreakpoints);
+
+  if (!lastValidObject) {
+    finalBreakPointResolvedValue = values;
+  } else {
+    finalBreakPointResolvedValue = lastValidObject?.value;
+  }
+  return finalBreakPointResolvedValue;
+};
+
+export function useBreakpointValue(values: BreakPointValue): any {
+  const { width } = useWindowDimensions();
+
+  const [currentBreakPointValue, setCurrentBreakPointValue] = useState(
+    getBreakPointValue(values, width)
+  );
+
+  useEffect(() => {
+    if (typeof values === 'object') {
+      const finalBreakPointResolvedValue = getBreakPointValue(values, width);
+      setCurrentBreakPointValue(finalBreakPointResolvedValue);
+    }
+  }, [values, width]);
+
+  if (typeof values !== 'object') return values;
+
+  return currentBreakPointValue;
+}
+
+export function isValidBreakpoint(
+  breakPointWidth: any,
+  width: any = Dimensions.get('window')?.width
+) {
+  const windowWidth = width;
+
+  if (windowWidth >= breakPointWidth) {
+    return true;
+  }
+  return false;
+}
+
+function getLastValidObject(mediaQueries: any) {
+  for (let i = mediaQueries.length - 1; i >= 0; i--) {
+    if (mediaQueries[i].isValid) {
+      return mediaQueries[i];
+    }
+  }
+  return null; // No valid object found
+}
diff --git a/expo-app/gluestack-ui.config.json b/expo-app/gluestack-ui.config.json
new file mode 100644
index 00000000..9825a95f
--- /dev/null
+++ b/expo-app/gluestack-ui.config.json
@@ -0,0 +1,10 @@
+{
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "global.css"
+  },
+  "app": {
+    "entry": "app/_layout.tsx",
+    "components": "components/ui"
+  }
+}
\ No newline at end of file
diff --git a/expo-app/metro.config.js b/expo-app/metro.config.js
index f7b261c2..c9561b1d 100644
--- a/expo-app/metro.config.js
+++ b/expo-app/metro.config.js
@@ -13,4 +13,4 @@ config.resolver.nodeModulesPaths = [path.resolve(projectRoot, "node_modules")];
 
 // module.exports = config;
 
-module.exports = withNativeWind(config, { input: "./global.css" });
+module.exports = withNativeWind(config, { input: "./global.css" });
\ No newline at end of file
diff --git a/expo-app/package.json b/expo-app/package.json
index 432b0565..14f71ffd 100644
--- a/expo-app/package.json
+++ b/expo-app/package.json
@@ -4,47 +4,46 @@
   "version": "1.0.0",
   "scripts": {
     "start": "npx expo start",
-    "android": "npx expo start --android",
-    "ios": "npx expo start --ios",
-    "web": "npx expo start --web",
-    "test": "jest --watchAll",
-    "postinstall": "patch-package"
+    "android": "DARK_MODE=media npx expo start --android",
+    "ios": "DARK_MODE=media npx expo start --ios",
+    "web": "DARK_MODE=media npx expo start --web",
+    "test": "jest --watchAll"
   },
   "jest": {
     "preset": "jest-expo"
   },
   "dependencies": {
-    "@expo/html-elements": "^0.10.1",
+    "@expo/html-elements": "0.4.2",
     "@expo/vector-icons": "^14.0.0",
-    "@gluestack-ui/accordion": "^1.0.6",
-    "@gluestack-ui/actionsheet": "^0.2.44",
-    "@gluestack-ui/alert": "^0.1.15",
-    "@gluestack-ui/alert-dialog": "^0.1.30",
-    "@gluestack-ui/avatar": "^0.1.17",
-    "@gluestack-ui/button": "^1.0.7",
-    "@gluestack-ui/checkbox": "^0.1.31",
-    "@gluestack-ui/divider": "^0.1.9",
-    "@gluestack-ui/fab": "^0.1.21",
-    "@gluestack-ui/form-control": "^0.1.18",
-    "@gluestack-ui/icon": "^0.1.22",
-    "@gluestack-ui/image": "^0.1.10",
-    "@gluestack-ui/input": "^0.1.31",
-    "@gluestack-ui/link": "^0.1.22",
-    "@gluestack-ui/menu": "^0.2.36",
-    "@gluestack-ui/modal": "^0.1.34",
-    "@gluestack-ui/nativewind-utils": "latest",
-    "@gluestack-ui/overlay": "latest",
-    "@gluestack-ui/popover": "^0.1.37",
-    "@gluestack-ui/pressable": "^0.1.16",
-    "@gluestack-ui/progress": "^0.1.16",
-    "@gluestack-ui/radio": "^0.1.32",
-    "@gluestack-ui/select": "^0.1.29",
-    "@gluestack-ui/slider": "^0.1.25",
-    "@gluestack-ui/spinner": "^0.1.14",
-    "@gluestack-ui/switch": "^0.1.22",
-    "@gluestack-ui/textarea": "^0.1.23",
-    "@gluestack-ui/toast": "^1.0.7",
-    "@gluestack-ui/tooltip": "^0.1.32",
+    "@gluestack-ui/accordion": "^1.0.8",
+    "@gluestack-ui/actionsheet": "^0.2.46",
+    "@gluestack-ui/alert": "^0.1.16",
+    "@gluestack-ui/alert-dialog": "^0.1.32",
+    "@gluestack-ui/avatar": "^0.1.18",
+    "@gluestack-ui/button": "^1.0.8",
+    "@gluestack-ui/checkbox": "^0.1.33",
+    "@gluestack-ui/divider": "^0.1.10",
+    "@gluestack-ui/fab": "^0.1.22",
+    "@gluestack-ui/form-control": "^0.1.19",
+    "@gluestack-ui/icon": "^0.1.24-alpha.0",
+    "@gluestack-ui/image": "^0.1.11",
+    "@gluestack-ui/input": "^0.1.32",
+    "@gluestack-ui/link": "^0.1.23",
+    "@gluestack-ui/menu": "^0.2.37",
+    "@gluestack-ui/modal": "^0.1.35",
+    "@gluestack-ui/nativewind-utils": "^1.0.26-alpha.2",
+    "@gluestack-ui/overlay": "^0.1.15",
+    "@gluestack-ui/popover": "^0.1.43",
+    "@gluestack-ui/pressable": "^0.1.17",
+    "@gluestack-ui/progress": "^0.1.18",
+    "@gluestack-ui/radio": "^0.1.34",
+    "@gluestack-ui/select": "^0.1.30",
+    "@gluestack-ui/slider": "^0.1.26",
+    "@gluestack-ui/spinner": "^0.1.15",
+    "@gluestack-ui/switch": "^0.1.23",
+    "@gluestack-ui/textarea": "^0.1.24",
+    "@gluestack-ui/toast": "^1.0.8",
+    "@gluestack-ui/tooltip": "^0.1.36-alpha.0",
     "@hookform/resolvers": "^3.3.4",
     "@legendapp/motion": "^2.4.0",
     "@react-navigation/native": "^6.0.2",
@@ -66,17 +65,17 @@
     "expo-updates": "~0.25.12",
     "expo-web-browser": "~13.0.3",
     "lucide-react-native": "^0.378.0",
-    "nativewind": "4.0.36",
+    "nativewind": "^4.1.23",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-hook-form": "^7.51.4",
     "react-native": "0.74.1",
-    "react-native-reanimated": "latest",
-    "react-native-safe-area-context": "4.10.1",
+    "react-native-reanimated": "^3.16.3",
+    "react-native-safe-area-context": "^4.14.0",
     "react-native-screens": "3.31.1",
-    "react-native-svg": "^15.2.0",
+    "react-native-svg": "^15.9.0",
     "react-native-web": "~0.19.6",
-    "tailwindcss": "3.4.3",
+    "tailwindcss": "^3.4.15",
     "zod": "^3.23.8"
   },
   "devDependencies": {
diff --git a/expo-app/patches/react-native-css-interop+0.0.36.patch b/expo-app/patches/react-native-css-interop+0.0.36.patch
deleted file mode 100644
index 139276de..00000000
--- a/expo-app/patches/react-native-css-interop+0.0.36.patch
+++ /dev/null
@@ -1,346 +0,0 @@
-diff --git a/node_modules/react-native-css-interop/dist/runtime/api.d.ts b/node_modules/react-native-css-interop/dist/runtime/api.d.ts
-index 05c3461..0e94bc5 100644
---- a/node_modules/react-native-css-interop/dist/runtime/api.d.ts
-+++ b/node_modules/react-native-css-interop/dist/runtime/api.d.ts
-@@ -1 +1,2 @@
- export * from "./web/api";
-+export * from "./web/interopComponentsMap";
-diff --git a/node_modules/react-native-css-interop/dist/runtime/api.js b/node_modules/react-native-css-interop/dist/runtime/api.js
-index d532aa8..340d8fd 100644
---- a/node_modules/react-native-css-interop/dist/runtime/api.js
-+++ b/node_modules/react-native-css-interop/dist/runtime/api.js
-@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
- };
- Object.defineProperty(exports, "__esModule", { value: true });
- __exportStar(require("./web/api"), exports);
-+__exportStar(require("./web/interopComponentsMap"), exports);
- //# sourceMappingURL=api.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/api.js.map b/node_modules/react-native-css-interop/dist/runtime/api.js.map
-index 7825b53..c59fa3b 100644
---- a/node_modules/react-native-css-interop/dist/runtime/api.js.map
-+++ b/node_modules/react-native-css-interop/dist/runtime/api.js.map
-@@ -1 +1 @@
--{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/runtime/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B"}
-\ No newline at end of file
-+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/runtime/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,6DAA2C"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/components.js b/node_modules/react-native-css-interop/dist/runtime/components.js
-index c4832b0..63aa94e 100644
---- a/node_modules/react-native-css-interop/dist/runtime/components.js
-+++ b/node_modules/react-native-css-interop/dist/runtime/components.js
-@@ -1,4 +1,5 @@
- "use strict";
-+"use client";
- Object.defineProperty(exports, "__esModule", { value: true });
- const react_native_1 = require("react-native");
- const api_1 = require("./api");
-diff --git a/node_modules/react-native-css-interop/dist/runtime/components.js.map b/node_modules/react-native-css-interop/dist/runtime/components.js.map
-index 0101386..9549388 100644
---- a/node_modules/react-native-css-interop/dist/runtime/components.js.map
-+++ b/node_modules/react-native-css-interop/dist/runtime/components.js.map
-@@ -1 +1 @@
--{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/runtime/components.ts"],"names":[],"mappings":";;AAAA,+CAkBsB;AAEtB,+BAA+C;AAE/C,IAAA,gBAAU,EAAC,oBAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC1C,IAAA,gBAAU,EAAC,wBAAS,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC9C,IAAA,gBAAU,EAAC,2BAAY,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACjD,IAAA,gBAAU,EAAC,qBAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC3C,IAAA,gBAAU,EAAC,mBAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACzC,IAAA,gBAAU,EAAC,iCAAkB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACvD,IAAA,gBAAU,EAAC,+BAAgB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACrD,IAAA,gBAAU,EAAC,uCAAwB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC7D,IAAA,gBAAU,EAAC,mBAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACzC,IAAA,gBAAU,EAAC,gCAAiB,EAAE;IAC5B,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;CACnE,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,wBAAS,EAAE;IACpB,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE;CAC3E,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,yBAAU,EAAE;IACrB,SAAS,EAAE,OAAO;IAClB,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,wBAAS,EAAE;IACpB,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;CACvE,CAAC,CAAC;AAEH,IAAA,gBAAU,EAAC,uBAAQ,EAAE;IACnB,SAAS,EAAE,OAAO;IAClB,4BAA4B,EAAE,0BAA0B;IACxD,4BAA4B,EAAE,0BAA0B;IACxD,sBAAsB,EAAE,oBAAoB;IAC5C,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,8BAAe,EAAE;IAC1B,SAAS,EAAE,OAAO;IAClB,cAAc,EAAE,YAAY;CAC7B,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,mCAAoB,EAAE;IAC/B,SAAS,EAAE,OAAO;IAClB,yBAAyB,EAAE,uBAAuB;CACnD,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,8BAAe,EAAE;IAC1B,SAAS,EAAE,OAAO;IAClB,4BAA4B,EAAE,0BAA0B;IACxD,4BAA4B,EAAE,0BAA0B;IACxD,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC"}
-\ No newline at end of file
-+{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/runtime/components.ts"],"names":[],"mappings":";AAAA,YAAY,CAAC;;AAEb,+CAkBsB;AAEtB,+BAA+C;AAE/C,IAAA,gBAAU,EAAC,oBAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC1C,IAAA,gBAAU,EAAC,wBAAS,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC9C,IAAA,gBAAU,EAAC,2BAAY,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACjD,IAAA,gBAAU,EAAC,qBAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC3C,IAAA,gBAAU,EAAC,mBAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACzC,IAAA,gBAAU,EAAC,iCAAkB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACvD,IAAA,gBAAU,EAAC,+BAAgB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACrD,IAAA,gBAAU,EAAC,uCAAwB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC7D,IAAA,gBAAU,EAAC,mBAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACzC,IAAA,gBAAU,EAAC,gCAAiB,EAAE;IAC5B,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;CACnE,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,wBAAS,EAAE;IACpB,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE;CAC3E,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,yBAAU,EAAE;IACrB,SAAS,EAAE,OAAO;IAClB,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,wBAAS,EAAE;IACpB,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;CACvE,CAAC,CAAC;AAEH,IAAA,gBAAU,EAAC,uBAAQ,EAAE;IACnB,SAAS,EAAE,OAAO;IAClB,4BAA4B,EAAE,0BAA0B;IACxD,4BAA4B,EAAE,0BAA0B;IACxD,sBAAsB,EAAE,oBAAoB;IAC5C,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,8BAAe,EAAE;IAC1B,SAAS,EAAE,OAAO;IAClB,cAAc,EAAE,YAAY;CAC7B,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,mCAAoB,EAAE;IAC/B,SAAS,EAAE,OAAO;IAClB,yBAAyB,EAAE,uBAAuB;CACnD,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,8BAAe,EAAE;IAC1B,SAAS,EAAE,OAAO;IAClB,4BAA4B,EAAE,0BAA0B;IACxD,4BAA4B,EAAE,0BAA0B;IACxD,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.d.ts b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.d.ts
-index 05710bd..21028f3 100644
---- a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.d.ts
-+++ b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.d.ts
-@@ -17,4 +17,8 @@ export declare function setDeep(target: Record<string, any>, paths: string[], va
- export declare function getWidth(state: PropState): number;
- export declare function getHeight(state: PropState): number;
- export declare const defaultValues: Record<string, AnimatableValue | ((effect: Effect) => AnimatableValue)>;
--export declare function calc(state: PropState, expression: RuntimeValueDescriptor[], style?: Record<string, any>): string | number | undefined;
-+export declare function calc(state: PropState, expression: RuntimeValueDescriptor, style?: Record<string, any>): {
-+    mode: string;
-+    raw: number;
-+    value: string | number;
-+} | undefined;
-diff --git a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js
-index 5f9c2b2..cec8e9a 100644
---- a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js
-+++ b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js
-@@ -23,12 +23,59 @@ function resolveValue(state, descriptor, style) {
-     }
-     switch (descriptor.name) {
-         case "var": {
--            const value = resolve(state, descriptor.arguments[0], style);
-+            let value = resolve(state, descriptor.arguments[0], style);
-             if (typeof value === "string")
--                return getVar(state, value, style);
-+                value = getVar(state, value, style);
-+            if (value === undefined && descriptor.arguments[1]) {
-+                value = resolveValue(state, descriptor.arguments[1], style);
-+            }
-+            return value;
-         }
-         case "calc": {
--            return calc(state, descriptor.arguments, style);
-+            return calc(state, descriptor.arguments, style)?.value;
-+        }
-+        case "max": {
-+            let mode;
-+            let values = [];
-+            for (const arg of descriptor.arguments) {
-+                const result = calc(state, arg, style);
-+                if (result) {
-+                    if (!mode)
-+                        mode = result?.mode;
-+                    if (result.mode === mode) {
-+                        values.push(result.raw);
-+                    }
-+                }
-+            }
-+            const max = Math.max(...values);
-+            return mode === "percentage" ? `${max}%` : max;
-+        }
-+        case "min": {
-+            let mode;
-+            let values = [];
-+            for (const arg of descriptor.arguments) {
-+                const result = calc(state, arg, style);
-+                if (result) {
-+                    if (!mode)
-+                        mode = result?.mode;
-+                    if (result.mode === mode) {
-+                        values.push(result.raw);
-+                    }
-+                }
-+            }
-+            const min = Math.min(...values);
-+            return mode === "percentage" ? `${min}%` : min;
-+        }
-+        case "clamp": {
-+            const min = calc(state, descriptor.arguments[0], style);
-+            const val = calc(state, descriptor.arguments[1], style);
-+            const max = calc(state, descriptor.arguments[2], style);
-+            if (!min || !val || !max)
-+                return;
-+            if (min.mode !== val.mode && max.mode !== val.mode)
-+                return;
-+            const value = Math.max(min.raw, Math.min(val.raw, max.raw));
-+            return val.mode === "percentage" ? `${value}%` : value;
-         }
-         case "vh": {
-             const value = resolve(state, descriptor.arguments[0], style);
-@@ -357,6 +404,9 @@ function calc(state, expression, style) {
-     const values = [];
-     const ops = [];
-     let mode;
-+    if (!Array.isArray(expression)) {
-+        expression = [expression];
-+    }
-     for (let token of expression) {
-         switch (typeof token) {
-             case "undefined":
-@@ -427,7 +477,11 @@ function calc(state, expression, style) {
-     if (!mode)
-         return;
-     const value = round(values[0]);
--    return mode === "percentage" ? `${value}%` : value;
-+    return {
-+        mode,
-+        raw: value,
-+        value: mode === "percentage" ? `${value}%` : value,
-+    };
- }
- exports.calc = calc;
- //# sourceMappingURL=resolve-value.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js.map b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js.map
-index ae1884d..a14dc2e 100644
---- a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js.map
-+++ b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js.map
-@@ -1 +1 @@
--{"version":3,"file":"resolve-value.js","sourceRoot":"","sources":["../../../src/runtime/native/resolve-value.ts"],"names":[],"mappings":"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"}
-\ No newline at end of file
-+{"version":3,"file":"resolve-value.js","sourceRoot":"","sources":["../../../src/runtime/native/resolve-value.ts"],"names":[],"mappings":"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"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/test.d.ts b/node_modules/react-native-css-interop/dist/runtime/test.d.ts
-deleted file mode 100644
-index a326c79..0000000
---- a/node_modules/react-native-css-interop/dist/runtime/test.d.ts
-+++ /dev/null
-@@ -1 +0,0 @@
--export declare const testContext: Record<string, any>;
-diff --git a/node_modules/react-native-css-interop/dist/runtime/test.js b/node_modules/react-native-css-interop/dist/runtime/test.js
-deleted file mode 100644
-index 9c6f4c8..0000000
---- a/node_modules/react-native-css-interop/dist/runtime/test.js
-+++ /dev/null
-@@ -1,7 +0,0 @@
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.testContext = void 0;
--exports.testContext = {
--    "--theme-fg": "blue",
--};
--//# sourceMappingURL=test.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/test.js.map b/node_modules/react-native-css-interop/dist/runtime/test.js.map
-deleted file mode 100644
-index 5ec3e17..0000000
---- a/node_modules/react-native-css-interop/dist/runtime/test.js.map
-+++ /dev/null
-@@ -1 +0,0 @@
--{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/runtime/test.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAwB;IAC9C,YAAY,EAAE,MAAM;CACrB,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/api.d.ts b/node_modules/react-native-css-interop/dist/runtime/web/api.d.ts
-index d38ce4a..3ec4979 100644
---- a/node_modules/react-native-css-interop/dist/runtime/web/api.d.ts
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/api.d.ts
-@@ -1,16 +1,10 @@
--/// <reference types="react" />
- import { CssInterop } from "../../types";
- export { StyleSheet } from "./stylesheet";
- export { colorScheme } from "./color-scheme";
- export { rem } from "./rem";
--export declare const interopComponents: Map<string | object, import("react").ComponentType<{}>>;
-+export { useColorScheme } from "./useColorScheme";
- export declare const cssInterop: CssInterop;
- export declare const remapProps: CssInterop;
--export declare function useColorScheme(): {
--    colorScheme: "light" | "dark" | undefined;
--    setColorScheme: (value: "light" | "dark" | "system") => void;
--    toggleColorScheme: () => void;
--};
- export declare const useUnstableNativeVariable: (name: string) => undefined;
- export declare function vars<T extends Record<`--${string}`, string | number>>(variables: T): Record<string, string>;
- export declare function useSafeAreaEnv(): {} | undefined;
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/api.js b/node_modules/react-native-css-interop/dist/runtime/web/api.js
-index 99eda40..5eb4764 100644
---- a/node_modules/react-native-css-interop/dist/runtime/web/api.js
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/api.js
-@@ -1,17 +1,19 @@
- "use strict";
-+"use client";
- Object.defineProperty(exports, "__esModule", { value: true });
--exports.useSafeAreaEnv = exports.vars = exports.useUnstableNativeVariable = exports.useColorScheme = exports.remapProps = exports.cssInterop = exports.interopComponents = exports.rem = exports.colorScheme = exports.StyleSheet = void 0;
-+exports.useSafeAreaEnv = exports.vars = exports.useUnstableNativeVariable = exports.remapProps = exports.cssInterop = exports.useColorScheme = exports.rem = exports.colorScheme = exports.StyleSheet = void 0;
- const react_1 = require("react");
- const config_1 = require("../config");
--const color_scheme_1 = require("./color-scheme");
- var stylesheet_1 = require("./stylesheet");
- Object.defineProperty(exports, "StyleSheet", { enumerable: true, get: function () { return stylesheet_1.StyleSheet; } });
--var color_scheme_2 = require("./color-scheme");
--Object.defineProperty(exports, "colorScheme", { enumerable: true, get: function () { return color_scheme_2.colorScheme; } });
-+var color_scheme_1 = require("./color-scheme");
-+Object.defineProperty(exports, "colorScheme", { enumerable: true, get: function () { return color_scheme_1.colorScheme; } });
- var rem_1 = require("./rem");
- Object.defineProperty(exports, "rem", { enumerable: true, get: function () { return rem_1.rem; } });
--exports.interopComponents = new Map();
-+const interopComponentsMap_1 = require("./interopComponentsMap");
- const ForwardRefSymbol = Symbol.for("react.forward_ref");
-+var useColorScheme_1 = require("./useColorScheme");
-+Object.defineProperty(exports, "useColorScheme", { enumerable: true, get: function () { return useColorScheme_1.useColorScheme; } });
- const cssInterop = (baseComponent, mapping) => {
-     const configs = (0, config_1.getNormalizeConfig)(mapping);
-     const interopComponent = (0, react_1.forwardRef)(function CssInteropComponent({ ...props }, ref) {
-@@ -56,23 +58,11 @@ const cssInterop = (baseComponent, mapping) => {
-         }
-     });
-     interopComponent.displayName = `CssInterop.${baseComponent.displayName ?? baseComponent.name ?? "unknown"}`;
--    exports.interopComponents.set(baseComponent, interopComponent);
-+    interopComponentsMap_1.interopComponents.set(baseComponent, interopComponent);
-     return interopComponent;
- };
- exports.cssInterop = cssInterop;
- exports.remapProps = exports.cssInterop;
--function useColorScheme() {
--    const [effect, setEffect] = (0, react_1.useState)(() => ({
--        rerun: () => setEffect((s) => ({ ...s })),
--        dependencies: new Set(),
--    }));
--    return {
--        colorScheme: color_scheme_1.colorScheme.get(effect),
--        setColorScheme: color_scheme_1.colorScheme.set,
--        toggleColorScheme: color_scheme_1.colorScheme.toggle,
--    };
--}
--exports.useColorScheme = useColorScheme;
- const useUnstableNativeVariable = (name) => {
-     if (process.env.NODE_ENV !== "production") {
-         console.log("useUnstableNativeVariable is not supported on web.");
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/api.js.map b/node_modules/react-native-css-interop/dist/runtime/web/api.js.map
-index d64992f..38a7312 100644
---- a/node_modules/react-native-css-interop/dist/runtime/web/api.js.map
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/api.js.map
-@@ -1 +1 @@
--{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/runtime/web/api.ts"],"names":[],"mappings":"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"}
-\ No newline at end of file
-+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/runtime/web/api.ts"],"names":[],"mappings":";AAAA,YAAY,CAAC;;;AACb,iCAA6D;AAE7D,sCAA+C;AAC/C,2CAA0C;AAAjC,wGAAA,UAAU,OAAA;AACnB,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,6BAA4B;AAAnB,0FAAA,GAAG,OAAA;AACZ,iEAA2D;AAC3D,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACzD,mDAAkD;AAAzC,gHAAA,cAAc,OAAA;AAChB,MAAM,UAAU,GAAe,CAAC,aAAa,EAAE,OAAO,EAAO,EAAE;IACpE,MAAM,OAAO,GAAG,IAAA,2BAAkB,EAAC,OAAO,CAAC,CAAC;IAQ5C,MAAM,gBAAgB,GAAG,IAAA,kBAAU,EAAC,SAAS,mBAAmB,CAC9D,EAAE,GAAG,KAAK,EAAuB,EACjC,GAAQ;QAER,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;YAC/B,OAAO,IAAA,qBAAa,EAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QAC7C,CAAC;QAED,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,CAAC;QAC1B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,SAAS,GAAc,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACpC,MAAM,MAAM,GAAc,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAG/C,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,EAAE,CAAC;gBACzC,SAAS,CAAC,IAAI,CAAC;oBACb,KAAK,EAAE,IAAI;oBACX,CAAC,MAAM,CAAC,EAAE,MAAM;iBACJ,CAAC,CAAC;YAClB,CAAC;YAED,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAE5B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1B,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;YAC5B,CAAC;iBAAM,IAAI,MAAM,EAAE,CAAC;gBAClB,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,CAAC;YAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;YACnC,CAAC;QACH,CAAC;QAED,IACE,UAAU,IAAI,aAAa;YAC3B,OAAO,aAAa,KAAK,UAAU;YACnC,aAAa,CAAC,QAAQ,KAAK,gBAAgB,EAC3C,CAAC;YACD,OAAO,KAAK,CAAC,UAAU,CAAC;YACxB,OAAQ,aAAqB,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QACzD,CAAC;aAAM,IACL,OAAO,aAAa,KAAK,UAAU;YACnC,CAAC,CAAC,aAAa,CAAC,SAAS,YAAY,iBAAS,CAAC,EAC/C,CAAC;YACD,OAAO,KAAK,CAAC,UAAU,CAAC;YACxB,OAAQ,aAAqB,CAAC,KAAK,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,OAAO,IAAA,qBAAa,EAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC,CAAC,CAAC;IACH,gBAAgB,CAAC,WAAW,GAAG,cAC7B,aAAa,CAAC,WAAW,IAAI,aAAa,CAAC,IAAI,IAAI,SACrD,EAAE,CAAC;IACH,wCAAiB,CAAC,GAAG,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IACvD,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AAlEW,QAAA,UAAU,cAkErB;AAGW,QAAA,UAAU,GAAG,kBAAU,CAAC;AAE9B,MAAM,yBAAyB,GAAG,CAAC,IAAY,EAAE,EAAE;IACxD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;QAC1C,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AALW,QAAA,yBAAyB,6BAKpC;AAEF,SAAgB,IAAI,CAClB,SAAY;IAEZ,MAAM,UAAU,GAA2B,EAAE,CAAC;IAE9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACrD,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,KAAK,GAAG,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC5C,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAbD,oBAaC;AAED,SAAgB,cAAc;IAC5B,OAAO,SAAS,CAAC;AACnB,CAAC;AAFD,wCAEC"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.d.ts b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.d.ts
-new file mode 100644
-index 0000000..303c043
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.d.ts
-@@ -0,0 +1,2 @@
-+/// <reference types="react" />
-+export declare const interopComponents: Map<string | object, import("react").ComponentType<{}>>;
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js
-new file mode 100644
-index 0000000..3ff844a
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js
-@@ -0,0 +1,5 @@
-+"use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
-+exports.interopComponents = void 0;
-+exports.interopComponents = new Map();
-+//# sourceMappingURL=interopComponentsMap.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js.map b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js.map
-new file mode 100644
-index 0000000..601d610
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js.map
-@@ -0,0 +1 @@
-+{"version":3,"file":"interopComponentsMap.js","sourceRoot":"","sources":["../../../src/runtime/web/interopComponentsMap.ts"],"names":[],"mappings":";;;AAEa,QAAA,iBAAiB,GAAG,IAAI,GAAG,EAGrC,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.d.ts b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.d.ts
-new file mode 100644
-index 0000000..874a890
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.d.ts
-@@ -0,0 +1,5 @@
-+export declare function useColorScheme(): {
-+    colorScheme: "light" | "dark" | undefined;
-+    setColorScheme: (value: "light" | "dark" | "system") => void;
-+    toggleColorScheme: () => void;
-+};
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js
-new file mode 100644
-index 0000000..9de6ccb
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js
-@@ -0,0 +1,18 @@
-+"use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
-+exports.useColorScheme = void 0;
-+const react_1 = require("react");
-+const color_scheme_1 = require("./color-scheme");
-+function useColorScheme() {
-+    const [effect, setEffect] = (0, react_1.useState)(() => ({
-+        rerun: () => setEffect((s) => ({ ...s })),
-+        dependencies: new Set(),
-+    }));
-+    return {
-+        colorScheme: color_scheme_1.colorScheme.get(effect),
-+        setColorScheme: color_scheme_1.colorScheme.set,
-+        toggleColorScheme: color_scheme_1.colorScheme.toggle,
-+    };
-+}
-+exports.useColorScheme = useColorScheme;
-+//# sourceMappingURL=useColorScheme.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js.map b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js.map
-new file mode 100644
-index 0000000..69f3b00
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js.map
-@@ -0,0 +1 @@
-+{"version":3,"file":"useColorScheme.js","sourceRoot":"","sources":["../../../src/runtime/web/useColorScheme.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,iDAA6C;AAE7C,SAAgB,cAAc;IAC5B,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAS,GAAG,EAAE,CAAC,CAAC;QAClD,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,YAAY,EAAE,IAAI,GAAG,EAAE;KACxB,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,WAAW,EAAE,0BAAW,CAAC,GAAG,CAAC,MAAM,CAAC;QACpC,cAAc,EAAE,0BAAW,CAAC,GAAG;QAC/B,iBAAiB,EAAE,0BAAW,CAAC,MAAM;KACtC,CAAC;AACJ,CAAC;AAXD,wCAWC"}
-\ No newline at end of file
diff --git a/expo-app/tailwind.config.js b/expo-app/tailwind.config.js
index dc70374a..a5a3b864 100644
--- a/expo-app/tailwind.config.js
+++ b/expo-app/tailwind.config.js
@@ -1,209 +1,195 @@
-const gluestackPlugin = require("@gluestack-ui/nativewind-utils/tailwind-plugin");
+const gluestackPlugin = require('@gluestack-ui/nativewind-utils/tailwind-plugin');
 
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  darkMode: "class",
+  darkMode: "media",
   content: [
     "./app/**/*.{js,jsx,ts,tsx}",
     "./components/*.{js,jsx,ts,tsx,mdx}",
     "./components/**/*.{js,jsx,ts,tsx}",
     "./screens/**/*.{js,jsx,ts,tsx}",
   ],
-  safelist: ["gap-x-2", "gap-y-6", "pl-4", "flex-wrap", "mb-12", "basis-[10%]"],
+  presets: [require('nativewind/preset')],
   theme: {
-    screens: {
-      base: "0",
-      xs: "400px",
-      sm: "480px",
-      md: "768px",
-      lg: "992px",
-      xl: "1280px",
-    },
     extend: {
       colors: {
         primary: {
-          0: "var(--color-primary-0)",
-          50: "var(--color-primary-50)",
-          100: "var(--color-primary-100)",
-          200: "var(--color-primary-200)",
-          300: "var(--color-primary-300)",
-          400: "var(--color-primary-400)",
-          500: "var(--color-primary-500)",
-          600: "var(--color-primary-600)",
-          700: "var(--color-primary-700)",
-          800: "var(--color-primary-800)",
-          900: "var(--color-primary-900)",
-          950: "var(--color-primary-950)",
+          0: 'rgb(var(--color-primary-0)/<alpha-value>)',
+          50: 'rgb(var(--color-primary-50)/<alpha-value>)',
+          100: 'rgb(var(--color-primary-100)/<alpha-value>)',
+          200: 'rgb(var(--color-primary-200)/<alpha-value>)',
+          300: 'rgb(var(--color-primary-300)/<alpha-value>)',
+          400: 'rgb(var(--color-primary-400)/<alpha-value>)',
+          500: 'rgb(var(--color-primary-500)/<alpha-value>)',
+          600: 'rgb(var(--color-primary-600)/<alpha-value>)',
+          700: 'rgb(var(--color-primary-700)/<alpha-value>)',
+          800: 'rgb(var(--color-primary-800)/<alpha-value>)',
+          900: 'rgb(var(--color-primary-900)/<alpha-value>)',
+          950: 'rgb(var(--color-primary-950)/<alpha-value>)',
         },
         secondary: {
-          0: "var(--color-secondary-0)",
-          50: "var(--color-secondary-50)",
-          100: "var(--color-secondary-100)",
-          200: "var(--color-secondary-200)",
-          300: "var(--color-secondary-300)",
-          400: "var(--color-secondary-400)",
-          500: "var(--color-secondary-500)",
-          600: "var(--color-secondary-600)",
-          700: "var(--color-secondary-700)",
-          800: "var(--color-secondary-800)",
-          900: "var(--color-secondary-900)",
-          950: "var(--color-secondary-950)",
+          0: 'rgb(var(--color-secondary-0)/<alpha-value>)',
+          50: 'rgb(var(--color-secondary-50)/<alpha-value>)',
+          100: 'rgb(var(--color-secondary-100)/<alpha-value>)',
+          200: 'rgb(var(--color-secondary-200)/<alpha-value>)',
+          300: 'rgb(var(--color-secondary-300)/<alpha-value>)',
+          400: 'rgb(var(--color-secondary-400)/<alpha-value>)',
+          500: 'rgb(var(--color-secondary-500)/<alpha-value>)',
+          600: 'rgb(var(--color-secondary-600)/<alpha-value>)',
+          700: 'rgb(var(--color-secondary-700)/<alpha-value>)',
+          800: 'rgb(var(--color-secondary-800)/<alpha-value>)',
+          900: 'rgb(var(--color-secondary-900)/<alpha-value>)',
+          950: 'rgb(var(--color-secondary-950)/<alpha-value>)',
         },
         tertiary: {
-          50: "var(--color-tertiary-50)",
-          100: "var(--color-tertiary-100)",
-          200: "var(--color-tertiary-200)",
-          300: "var(--color-tertiary-300)",
-          400: "var(--color-tertiary-400)",
-          500: "var(--color-tertiary-500)",
-          600: "var(--color-tertiary-600)",
-          700: "var(--color-tertiary-700)",
-          800: "var(--color-tertiary-800)",
-          900: "var(--color-tertiary-900)",
-          950: "var(--color-tertiary-950)",
+          50: 'rgb(var(--color-tertiary-50)/<alpha-value>)',
+          100: 'rgb(var(--color-tertiary-100)/<alpha-value>)',
+          200: 'rgb(var(--color-tertiary-200)/<alpha-value>)',
+          300: 'rgb(var(--color-tertiary-300)/<alpha-value>)',
+          400: 'rgb(var(--color-tertiary-400)/<alpha-value>)',
+          500: 'rgb(var(--color-tertiary-500)/<alpha-value>)',
+          600: 'rgb(var(--color-tertiary-600)/<alpha-value>)',
+          700: 'rgb(var(--color-tertiary-700)/<alpha-value>)',
+          800: 'rgb(var(--color-tertiary-800)/<alpha-value>)',
+          900: 'rgb(var(--color-tertiary-900)/<alpha-value>)',
+          950: 'rgb(var(--color-tertiary-950)/<alpha-value>)',
         },
         error: {
-          0: "var(--color-error-0)",
-          50: "var(--color-error-50)",
-          100: "var(--color-error-100)",
-          200: "var(--color-error-200)",
-          300: "var(--color-error-300)",
-          400: "var(--color-error-400)",
-          500: "var(--color-error-500)",
-          600: "var(--color-error-600)",
-          700: "var(--color-error-700)",
-          800: "var(--color-error-800)",
-          900: "var(--color-error-900)",
-          950: "var(--color-error-950)",
+          0: 'rgb(var(--color-error-0)/<alpha-value>)',
+          50: 'rgb(var(--color-error-50)/<alpha-value>)',
+          100: 'rgb(var(--color-error-100)/<alpha-value>)',
+          200: 'rgb(var(--color-error-200)/<alpha-value>)',
+          300: 'rgb(var(--color-error-300)/<alpha-value>)',
+          400: 'rgb(var(--color-error-400)/<alpha-value>)',
+          500: 'rgb(var(--color-error-500)/<alpha-value>)',
+          600: 'rgb(var(--color-error-600)/<alpha-value>)',
+          700: 'rgb(var(--color-error-700)/<alpha-value>)',
+          800: 'rgb(var(--color-error-800)/<alpha-value>)',
+          900: 'rgb(var(--color-error-900)/<alpha-value>)',
+          950: 'rgb(var(--color-error-950)/<alpha-value>)',
         },
         success: {
-          0: "var(--color-success-0)",
-          50: "var(--color-success-50)",
-          100: "var(--color-success-100)",
-          200: "var(--color-success-200)",
-          300: "var(--color-success-300)",
-          400: "var(--color-success-400)",
-          500: "var(--color-success-500)",
-          600: "var(--color-success-600)",
-          700: "var(--color-success-700)",
-          800: "var(--color-success-800)",
-          900: "var(--color-success-900)",
-          950: "var(--color-success-950)",
+          0: 'rgb(var(--color-success-0)/<alpha-value>)',
+          50: 'rgb(var(--color-success-50)/<alpha-value>)',
+          100: 'rgb(var(--color-success-100)/<alpha-value>)',
+          200: 'rgb(var(--color-success-200)/<alpha-value>)',
+          300: 'rgb(var(--color-success-300)/<alpha-value>)',
+          400: 'rgb(var(--color-success-400)/<alpha-value>)',
+          500: 'rgb(var(--color-success-500)/<alpha-value>)',
+          600: 'rgb(var(--color-success-600)/<alpha-value>)',
+          700: 'rgb(var(--color-success-700)/<alpha-value>)',
+          800: 'rgb(var(--color-success-800)/<alpha-value>)',
+          900: 'rgb(var(--color-success-900)/<alpha-value>)',
+          950: 'rgb(var(--color-success-950)/<alpha-value>)',
         },
         warning: {
-          0: "var(--color-warning-0)",
-          50: "var(--color-warning-50)",
-          100: "var(--color-warning-100)",
-          200: "var(--color-warning-200)",
-          300: "var(--color-warning-300)",
-          400: "var(--color-warning-400)",
-          500: "var(--color-warning-500)",
-          600: "var(--color-warning-600)",
-          700: "var(--color-warning-700)",
-          800: "var(--color-warning-800)",
-          900: "var(--color-warning-900)",
-          950: "var(--color-warning-950)",
+          0: 'rgb(var(--color-warning-0)/<alpha-value>)',
+          50: 'rgb(var(--color-warning-50)/<alpha-value>)',
+          100: 'rgb(var(--color-warning-100)/<alpha-value>)',
+          200: 'rgb(var(--color-warning-200)/<alpha-value>)',
+          300: 'rgb(var(--color-warning-300)/<alpha-value>)',
+          400: 'rgb(var(--color-warning-400)/<alpha-value>)',
+          500: 'rgb(var(--color-warning-500)/<alpha-value>)',
+          600: 'rgb(var(--color-warning-600)/<alpha-value>)',
+          700: 'rgb(var(--color-warning-700)/<alpha-value>)',
+          800: 'rgb(var(--color-warning-800)/<alpha-value>)',
+          900: 'rgb(var(--color-warning-900)/<alpha-value>)',
+          950: 'rgb(var(--color-warning-950)/<alpha-value>)',
         },
         info: {
-          0: "var(--color-info-0)",
-          50: "var(--color-info-50)",
-          100: "var(--color-info-100)",
-          200: "var(--color-info-200)",
-          300: "var(--color-info-300)",
-          400: "var(--color-info-400)",
-          500: "var(--color-info-500)",
-          600: "var(--color-info-600)",
-          700: "var(--color-info-700)",
-          800: "var(--color-info-800)",
-          900: "var(--color-info-900)",
-          950: "var(--color-info-950)",
+          0: 'rgb(var(--color-info-0)/<alpha-value>)',
+          50: 'rgb(var(--color-info-50)/<alpha-value>)',
+          100: 'rgb(var(--color-info-100)/<alpha-value>)',
+          200: 'rgb(var(--color-info-200)/<alpha-value>)',
+          300: 'rgb(var(--color-info-300)/<alpha-value>)',
+          400: 'rgb(var(--color-info-400)/<alpha-value>)',
+          500: 'rgb(var(--color-info-500)/<alpha-value>)',
+          600: 'rgb(var(--color-info-600)/<alpha-value>)',
+          700: 'rgb(var(--color-info-700)/<alpha-value>)',
+          800: 'rgb(var(--color-info-800)/<alpha-value>)',
+          900: 'rgb(var(--color-info-900)/<alpha-value>)',
+          950: 'rgb(var(--color-info-950)/<alpha-value>)',
         },
         typography: {
-          0: "var(--color-typography-0)",
-          50: "var(--color-typography-50)",
-          100: "var(--color-typography-100)",
-          200: "var(--color-typography-200)",
-          300: "var(--color-typography-300)",
-          400: "var(--color-typography-400)",
-          500: "var(--color-typography-500)",
-          600: "var(--color-typography-600)",
-          700: "var(--color-typography-700)",
-          800: "var(--color-typography-800)",
-          900: "var(--color-typography-900)",
-          950: "var(--color-typography-950)",
-          white: "#FFFFFF",
-          gray: "#D4D4D4",
-          black: "#181718",
+          0: 'rgb(var(--color-typography-0)/<alpha-value>)',
+          50: 'rgb(var(--color-typography-50)/<alpha-value>)',
+          100: 'rgb(var(--color-typography-100)/<alpha-value>)',
+          200: 'rgb(var(--color-typography-200)/<alpha-value>)',
+          300: 'rgb(var(--color-typography-300)/<alpha-value>)',
+          400: 'rgb(var(--color-typography-400)/<alpha-value>)',
+          500: 'rgb(var(--color-typography-500)/<alpha-value>)',
+          600: 'rgb(var(--color-typography-600)/<alpha-value>)',
+          700: 'rgb(var(--color-typography-700)/<alpha-value>)',
+          800: 'rgb(var(--color-typography-800)/<alpha-value>)',
+          900: 'rgb(var(--color-typography-900)/<alpha-value>)',
+          950: 'rgb(var(--color-typography-950)/<alpha-value>)',
+          white: '#FFFFFF',
+          gray: '#D4D4D4',
+          black: '#181718',
         },
         outline: {
-          0: "var(--color-outline-0)",
-          50: "var(--color-outline-50)",
-          100: "var(--color-outline-100)",
-          200: "var(--color-outline-200)",
-          300: "var(--color-outline-300)",
-          400: "var(--color-outline-400)",
-          500: "var(--color-outline-500)",
-          600: "var(--color-outline-600)",
-          700: "var(--color-outline-700)",
-          800: "var(--color-outline-800)",
-          900: "var(--color-outline-900)",
-          950: "var(--color-outline-950)",
+          0: 'rgb(var(--color-outline-0)/<alpha-value>)',
+          50: 'rgb(var(--color-outline-50)/<alpha-value>)',
+          100: 'rgb(var(--color-outline-100)/<alpha-value>)',
+          200: 'rgb(var(--color-outline-200)/<alpha-value>)',
+          300: 'rgb(var(--color-outline-300)/<alpha-value>)',
+          400: 'rgb(var(--color-outline-400)/<alpha-value>)',
+          500: 'rgb(var(--color-outline-500)/<alpha-value>)',
+          600: 'rgb(var(--color-outline-600)/<alpha-value>)',
+          700: 'rgb(var(--color-outline-700)/<alpha-value>)',
+          800: 'rgb(var(--color-outline-800)/<alpha-value>)',
+          900: 'rgb(var(--color-outline-900)/<alpha-value>)',
+          950: 'rgb(var(--color-outline-950)/<alpha-value>)',
         },
         background: {
-          0: "var(--color-background-0)",
-          50: "var(--color-background-50)",
-          100: "var(--color-background-100)",
-          200: "var(--color-background-200)",
-          300: "var(--color-background-300)",
-          400: "var(--color-background-400)",
-          500: "var(--color-background-500)",
-          600: "var(--color-background-600)",
-          700: "var(--color-background-700)",
-          800: "var(--color-background-800)",
-          900: "var(--color-background-900)",
-          950: "var(--color-background-950)",
-          error: "var(--color-background-error)",
-          warning: "var(--color-background-warning)",
-          muted: "var(--color-background-muted)",
-          success: "var(--color-background-success)",
-          info: "var(--color-background-info)",
-          light: "#FBFBFB",
-          dark: "#181719",
+          0: 'rgb(var(--color-background-0)/<alpha-value>)',
+          50: 'rgb(var(--color-background-50)/<alpha-value>)',
+          100: 'rgb(var(--color-background-100)/<alpha-value>)',
+          200: 'rgb(var(--color-background-200)/<alpha-value>)',
+          300: 'rgb(var(--color-background-300)/<alpha-value>)',
+          400: 'rgb(var(--color-background-400)/<alpha-value>)',
+          500: 'rgb(var(--color-background-500)/<alpha-value>)',
+          600: 'rgb(var(--color-background-600)/<alpha-value>)',
+          700: 'rgb(var(--color-background-700)/<alpha-value>)',
+          800: 'rgb(var(--color-background-800)/<alpha-value>)',
+          900: 'rgb(var(--color-background-900)/<alpha-value>)',
+          950: 'rgb(var(--color-background-950)/<alpha-value>)',
+          error: 'rgb(var(--color-background-error)/<alpha-value>)',
+          warning: 'rgb(var(--color-background-warning)/<alpha-value>)',
+          muted: 'rgb(var(--color-background-muted)/<alpha-value>)',
+          success: 'rgb(var(--color-background-success)/<alpha-value>)',
+          info: 'rgb(var(--color-background-info)/<alpha-value>)',
+          light: '#FBFBFB',
+          dark: '#181719',
         },
-        border: {
-          0: "var(--color-border-0)",
-          50: "var(--color-border-50)",
-          100: "var(--color-border-100)",
-          200: "var(--color-border-200)",
-          300: "var(--color-border-300)",
-          400: "var(--color-border-400)",
-          500: "var(--color-border-500)",
-          600: "var(--color-border-600)",
-          700: "var(--color-border-700)",
-          800: "var(--color-border-800)",
-          900: "var(--color-border-900)",
-          950: "var(--color-border-950)",
-          error: "var(--color-border-error)",
-          warning: "var(--color-border-warning)",
-          muted: "var(--color-border-muted)",
-          success: "var(--color-border-success)",
-          info: "var(--color-border-info)",
-          light: "#FBFBFB",
-          dark: "#181719",
+        indicator: {
+          primary: 'rgb(var(--color-indicator-primary)/<alpha-value>)',
+          info: 'rgb(var(--color-indicator-info)/<alpha-value>)',
+          error: 'rgb(var(--color-indicator-error)/<alpha-value>)',
         },
       },
       fontFamily: {
-        roboto: ["Roboto", "sans-serif"],
+        heading: undefined,
+        body: undefined,
+        mono: undefined,
+        roboto: ['Roboto', 'sans-serif'],
       },
       fontWeight: {
-        hairline: "100",
-        extraBlack: "950",
+        extrablack: '950',
       },
       fontSize: {
-        "2xs": "10px",
+        '2xs': '10px',
       },
-      border: {
-        2: "2px",
+      boxShadow: {
+        'hard-1': '-2px 2px 8px 0px rgba(38, 38, 38, 0.20)',
+        'hard-2': '0px 3px 10px 0px rgba(38, 38, 38, 0.20)',
+        'hard-3': '2px 2px 8px 0px rgba(38, 38, 38, 0.20)',
+        'hard-4': '0px -3px 10px 0px rgba(38, 38, 38, 0.20)',
+        'hard-5': '0px 2px 10px 0px rgba(38, 38, 38, 0.10)',
+        'soft-1': '0px 0px 10px rgba(38, 38, 38, 0.1)',
+        'soft-2': '0px 0px 20px rgba(38, 38, 38, 0.2)',
+        'soft-3': '0px 0px 30px rgba(38, 38, 38, 0.1)',
+        'soft-4': '0px 0px 40px rgba(38, 38, 38, 0.1)',
       },
     },
   },
diff --git a/expo-app/tsconfig.json b/expo-app/tsconfig.json
index 9b72f7f6..212543f8 100644
--- a/expo-app/tsconfig.json
+++ b/expo-app/tsconfig.json
@@ -10,6 +10,9 @@
       "@/assets/*": [
         "../../packages/shared/assets/*",
         "./assets/*"
+      ],
+      "tailwind.config": [
+        "./tailwind.config.js"
       ]
     }
   },
@@ -17,6 +20,7 @@
     "**/*.ts",
     "**/*.tsx",
     ".expo/types/**/*.ts",
-    "expo-env.d.ts"
+    "expo-env.d.ts",
+    "nativewind-env.d.ts"
   ]
 }
\ No newline at end of file
diff --git a/expo-app/yarn.lock b/expo-app/yarn.lock
index 77e74e45..b8995bd7 100644
--- a/expo-app/yarn.lock
+++ b/expo-app/yarn.lock
@@ -1082,10 +1082,10 @@
     resolve-from "^5.0.0"
     semver "^7.6.0"
 
-"@expo/html-elements@^0.10.1":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@expo/html-elements/-/html-elements-0.10.1.tgz#ec2625370cf1d4cb78efa954df45d422532d5ab6"
-  integrity sha512-3PTmtkV15D7+lykXVtvkH1jQ5Y6JE+e3zCaoMMux7z2cSLGQUNwDEUwG37gew3OEB1/E4/SEWgjvg8m7E6/e2Q==
+"@expo/html-elements@0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@expo/html-elements/-/html-elements-0.4.2.tgz#4e9f6b9250af8d0befe3242fd42704cca2421e0e"
+  integrity sha512-lNioCgdtOrCMMqzHY+PCTdyuWBTU4yMBlOzPSkS4YFIWt9bq0zexM2ZJkpybTXmowNdE3zHO93xxAmiA2yDi2w==
 
 "@expo/image-utils@^0.5.0":
   version "0.5.1"
@@ -1301,69 +1301,69 @@
   dependencies:
     tslib "^2.4.0"
 
-"@gluestack-ui/accordion@^1.0.6":
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/@gluestack-ui/accordion/-/accordion-1.0.6.tgz"
-  integrity sha512-zB+IlfjP8Ew2wAjGbeNlT8sRebUpi5dldMBHpSSt7TwurhMaEUtum7XNGoFuiTx9zM8gMRvSGTwr/e7DqHW8aA==
+"@gluestack-ui/accordion@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/accordion/-/accordion-1.0.8.tgz#29486b7ce125a880abf7d55e966f04987989e2d1"
+  integrity sha512-Hcq/mJ6zDaQuqh/2pVbJB8UbB5vyNSYmuRc5dFP5DFZredywPrkEpz2awJodaQRCMBIh8jm6NEYfndMIuRFBTA==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/accordion" "^0.0.2"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/actionsheet@^0.2.44":
-  version "0.2.44"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/actionsheet/-/actionsheet-0.2.44.tgz#3cec30acfed7d590b2d783b34d40b24eb7074a0d"
-  integrity sha512-sLw/Pq5iMNliiddX1wGao3rj+6Brb2NZg6z2jRIoe6bvZoZ2x6ggQt2QznNeu6qRg0/sw3nwJUs5ZGMHGr4VeA==
+"@gluestack-ui/actionsheet@^0.2.46":
+  version "0.2.46"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/actionsheet/-/actionsheet-0.2.46.tgz#3efb27d5aa480d5718cc762fa1bc6dfbbc35d1b1"
+  integrity sha512-zZ4t0gLtHeN6pDDBAPduqnB6ySnqKtWcQfdWQF0KSjpicxMmk22kJQEuPbPPurdZKvq2dCpzQMsJUKe1Xar7Sg==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/transitions" "^0.1.10"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/transitions" "^0.1.11"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/dialog" "^0.0.4"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/alert-dialog@^0.1.30":
-  version "0.1.30"
-  resolved "https://registry.npmjs.org/@gluestack-ui/alert-dialog/-/alert-dialog-0.1.30.tgz"
-  integrity sha512-fTcoKlZnSGiobh18xJ0RdCaX3WgybeSu5A3X62yqTtUEVodxLMC5S/ZZmZ9SZhzAnRqi4Hpu5hQxiEK40Au86Q==
+"@gluestack-ui/alert-dialog@^0.1.32":
+  version "0.1.32"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/alert-dialog/-/alert-dialog-0.1.32.tgz#d99b76a676edff2840008f03f4e3f1d2af38c330"
+  integrity sha512-+imIkN0SgEuikQKgevBw2uBUE0ypD4VygGkPGwq/t8WVLlKp/DCz3GQhsiZavkFi/fbXHNNldwOjSP4RjlYfFQ==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/dialog" "^0.0.4"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/alert@^0.1.15":
-  version "0.1.15"
-  resolved "https://registry.npmjs.org/@gluestack-ui/alert/-/alert-0.1.15.tgz"
-  integrity sha512-Jlaz8awVHznQixVfc1WmO9C1Em7DuF23N44PVOiGe2fCotOOB68ru2cGggaqGlHDzqhPRVpP5Fls+gn8CRDf0Q==
+"@gluestack-ui/alert@^0.1.16":
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/alert/-/alert-0.1.16.tgz#cede162e04c3dcb07a3da797221852bb7c127311"
+  integrity sha512-vE0litmicuKFJFp9TY3mRuZmyH/E24IdHlC0f3FZjfa+AzeOS+bZdKMRix2EYkvBGrA6uNffWUuHeXWQGMRVJQ==
 
-"@gluestack-ui/avatar@^0.1.17":
-  version "0.1.17"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/avatar/-/avatar-0.1.17.tgz#7657defaa103c72c02fd57300bc79dc93ea47b77"
-  integrity sha512-L7R3GVjYK6o+tdCiCDZXvHjPi1FKwt9XAFHGlEsQ4dX6Qe7yWEi3K+e5UBpS1ugvja7SmNS+YZwvr+nnVcmohQ==
+"@gluestack-ui/avatar@^0.1.18":
+  version "0.1.18"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/avatar/-/avatar-0.1.18.tgz#bb890a7b889060e01faf549f59a47d11c04ada1c"
+  integrity sha512-VA9XwtavYLYCWrjxHc2u9gRpV97cPRcr/6KJ4tLiMiQbiRL1b4zckiL+/F39fB6xjUOUQHl3Fjo/Yd8swa0MBg==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
 
-"@gluestack-ui/button@^1.0.7":
-  version "1.0.7"
-  resolved "https://registry.npmjs.org/@gluestack-ui/button/-/button-1.0.7.tgz"
-  integrity sha512-6hz5BPoB+iHMpDvys6AbIpeRPbnFiqyE3SnnbKPSCj8lgl3Dr9sFln41BvDmqmZ98d0usJluk50rz8pVNRZRgw==
+"@gluestack-ui/button@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/button/-/button-1.0.8.tgz#fb6c1a3e6c59561d0cd6e7d8d0f519034144c66d"
+  integrity sha512-60ZcFd0XWIwoWe35GSf5jdcgpDI4R1LcQr098SYMUoYg3cWNFrbKUIa+cdCtD7oV/crVFjrmyj+6wZpiyDtx5g==
   dependencies:
-    "@gluestack-ui/utils" "0.1.13"
+    "@gluestack-ui/utils" "0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/checkbox@^0.1.31":
-  version "0.1.31"
-  resolved "https://registry.npmjs.org/@gluestack-ui/checkbox/-/checkbox-0.1.31.tgz"
-  integrity sha512-o7mvEJoH0wGtRrlxtS/B/JWwDu91n6BQu8vej0SjfM1iAlbI1YfOYtk9Kf3ekjINGnANcXzfAVMKYSHVgzCCxQ==
+"@gluestack-ui/checkbox@^0.1.33":
+  version "0.1.33"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/checkbox/-/checkbox-0.1.33.tgz#8fc6f6e9b4fe51118abf28b66a82b4667fb7b18b"
+  integrity sha512-sTbjWiqJDzwfIzp1ZUnHV4MnR08+mlfixsBNqJHCUPrcFCvW2DMFyyRKHWdgHj3BJcfPZQH/kYljVGzJQeAetA==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.18"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-aria/visually-hidden" "^3.8.6"
     "@react-native-aria/checkbox" "^0.2.9"
     "@react-native-aria/focus" "^0.2.9"
@@ -1371,78 +1371,78 @@
     "@react-native-aria/utils" "0.2.11"
     "@react-stately/checkbox" "^3.4.2"
 
-"@gluestack-ui/divider@^0.1.9":
-  version "0.1.9"
-  resolved "https://registry.npmjs.org/@gluestack-ui/divider/-/divider-0.1.9.tgz"
-  integrity sha512-wuQDEfgZwBoxxd9AKTNKxUK5W7EZ1SiuYpEljm77yekV3vw86t6X1AIJ+zIjDaOFzlNcvWx9ZD8NRXtRkDFiHw==
+"@gluestack-ui/divider@^0.1.10":
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/divider/-/divider-0.1.10.tgz#506ec45f9b5183a0e3b293dbff7b7da19edcfda8"
+  integrity sha512-/hZx1Rmy4Pgln9AwAprAEQcxYPEHjHSNF4xCUWlK/q0peyiMT5Nagt54VnxykVn5A0b2zg5QKP0pOqOF9xeE6w==
 
-"@gluestack-ui/fab@^0.1.21":
-  version "0.1.21"
-  resolved "https://registry.npmjs.org/@gluestack-ui/fab/-/fab-0.1.21.tgz"
-  integrity sha512-hQ7YZEoGOcujLHTx08dAGmcNMFn6tOBqScdaJpPc6NW+VIPOLD0sVS2zjZBUcqB2a63vIOm1wCzs9yw+IxBilQ==
+"@gluestack-ui/fab@^0.1.22":
+  version "0.1.22"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/fab/-/fab-0.1.22.tgz#46861c5d886f5304fb8cf67033012cb4cc2d3239"
+  integrity sha512-kemsTSOFu18fL0stTAJ5O1FXcrDW2FULNpq3wJJT5aBiwHhQhvWHq1Dyzn/7kT2jSHrvNHDsTzzTcDzGIgVqmg==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/form-control@^0.1.18":
-  version "0.1.18"
-  resolved "https://registry.npmjs.org/@gluestack-ui/form-control/-/form-control-0.1.18.tgz"
-  integrity sha512-sVRdh5qZwZGddMiHTG0IHEEktO6iwgKFSoccjmK7P7U/shWt7xAdt5Hh2Rp7+2C/g02v76uFlycI+GhtbnwLGw==
+"@gluestack-ui/form-control@^0.1.19":
+  version "0.1.19"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/form-control/-/form-control-0.1.19.tgz#7a75b65f5ec89da95c30442750d6f7af71db6868"
+  integrity sha512-6YbPbi/RZrXc5DyVPbxPV17FYaBoEl1yAdSwut8iE6n+yQekjluINrh2q5ZPWF2SGmyo7VSNcL85yeU5I97xHg==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/hooks@0.1.11":
-  version "0.1.11"
-  resolved "https://registry.npmjs.org/@gluestack-ui/hooks/-/hooks-0.1.11.tgz"
-  integrity sha512-bcBsF7bTo//JD6L9ekJu0rZs83qYD/pE/Uj3ih3OYEtGU0LDoYiGkBMmDRpVMcVv8bE3TCKivnhHaT/heafInA==
+"@gluestack-ui/hooks@0.1.12":
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/hooks/-/hooks-0.1.12.tgz#4a92de73eec7b6ba6fc8e781c23417252993c95c"
+  integrity sha512-jMZS+aIPYvouRKkWUzOYFKeWyt+YFIojYFuSq8sNZTjAq72xtiKZQKxNwOgTorEDD4CAIk0bncRS0TneNSuMAA==
 
-"@gluestack-ui/icon@^0.1.22":
-  version "0.1.22"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/icon/-/icon-0.1.22.tgz#3446ec5c118dbdf1ab7d139f7cca63ada7172909"
-  integrity sha512-6E8N0OEEike0p6ITRJoEYpRlHqjRAabekEVSOk/HM/v+MJONT613TlQari5ozBHcaNLn/JhJqRxNHxNrzxd+ZQ==
+"@gluestack-ui/icon@^0.1.24-alpha.0":
+  version "0.1.24-alpha.0"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/icon/-/icon-0.1.24-alpha.0.tgz#2315eb76fe14801056bdc5f6083fe5ec8461216c"
+  integrity sha512-PHLG/BnEw4eUNLmsZ7aMHAPPMcD0GizNHE8e+88m9h0+6Qb5HJ9sQi2qnhviO2JRyDi2z2pR1XNLuOlhzkKJag==
   dependencies:
-    "@gluestack-ui/provider" "^0.1.6"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/provider" "^0.1.13"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/image@^0.1.10":
-  version "0.1.10"
-  resolved "https://registry.npmjs.org/@gluestack-ui/image/-/image-0.1.10.tgz"
-  integrity sha512-RrWfA6PPyO7qkyH4gGPEp6YFkyQ9/4DvGHpuso0oVQeRpYGKb/ciJuIUryR1X1yoKZzrJZqMrO4lT4Uf/4mlsg==
+"@gluestack-ui/image@^0.1.11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/image/-/image-0.1.11.tgz#f7e624a4cdfc227a068e28331db457f31e7e1c94"
+  integrity sha512-Zg9+vdNr6jwM71RBxROzTSyNfLFOncBVSZfJX7nJ4N/8cRsSwbYCDJqt+UYe/+I1KYIpHCAICdgsJdas/lthkw==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/input@^0.1.31":
-  version "0.1.31"
-  resolved "https://registry.npmjs.org/@gluestack-ui/input/-/input-0.1.31.tgz"
-  integrity sha512-qunHYjHbuzafJhFaUHzDT28pjC7AgTUJ0jH//w53MLXmTCBDh7kEgqLt1Fxfh3/F7AAN2rLquiOOqdX14H6TOQ==
+"@gluestack-ui/input@^0.1.32":
+  version "0.1.32"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/input/-/input-0.1.32.tgz#d4d64e43938b2cf9ee3f816fa774d08333305d28"
+  integrity sha512-RWtqpo0p37GYjwBTiMf4fpvKYe32OMa6lxFbDqPqEX1m994D9QwP7iWnDWA/9nr/Mf3eET6dMWbH4/eL4oZr8Q==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.18"
-    "@gluestack-ui/utils" "^0.1.13"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/link@^0.1.22":
-  version "0.1.22"
-  resolved "https://registry.npmjs.org/@gluestack-ui/link/-/link-0.1.22.tgz"
-  integrity sha512-eNUEhxYI9Mogpb+v+zGkZMh8caObhIlpfQKznGObCSsDHg3OmNuUqqL3MjpGVsYaqmQw9+vVR2ehxMEJiOg2xg==
+"@gluestack-ui/link@^0.1.23":
+  version "0.1.23"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/link/-/link-0.1.23.tgz#624fa5adfbb7951529a7e48003d5bca926dd8ef3"
+  integrity sha512-j/YIdlq6V+Ad8c6X1EVL4jUI/Zo/L9S6WLZYPKNArlidRxjEME7d2maIl2O20ZcRSOHvee2VAf7HHNem+Jn+AA==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/menu@^0.2.36":
-  version "0.2.36"
-  resolved "https://registry.npmjs.org/@gluestack-ui/menu/-/menu-0.2.36.tgz"
-  integrity sha512-jCwnwVreXyo4MrKyW5jJ31jIBIeTe8EGPNYIJVLcim+NDSZTmUrrypVFw7lJDRz4iNwOaKQbqfu/iVeCGvsF5A==
+"@gluestack-ui/menu@^0.2.37":
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/menu/-/menu-0.2.37.tgz#094f365d07648792e6b5081533b9592afc64ddfa"
+  integrity sha512-2XxDG4pNPygtKe6icI1SN9HdlDS3nqPd3CiJ8HSHsTywjCDHZbm6zBamK9evWiOuKArGaNtcjEtXEm6lm56CFw==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-aria/menu" "^3.14.1"
     "@react-aria/overlays" "^3.19.0"
     "@react-native-aria/focus" "^0.2.9"
@@ -1452,29 +1452,38 @@
     "@react-stately/utils" "^3.6.0"
     react-stately "^3.21.0"
 
-"@gluestack-ui/modal@^0.1.34":
-  version "0.1.34"
-  resolved "https://registry.npmjs.org/@gluestack-ui/modal/-/modal-0.1.34.tgz"
-  integrity sha512-fsweYLT/CRVTg4SJNq/Rr17SU3Xvk+IFA3hsgrNgkYoZZyvooGv2m+YHA9AEZBhNYePDjhxUqZwz7j7u3u/i8Q==
+"@gluestack-ui/modal@^0.1.35":
+  version "0.1.35"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/modal/-/modal-0.1.35.tgz#5ed5df4b999926bc13456d94a2ae4fc647b98e16"
+  integrity sha512-KfA2aJ/ZsdM5rggAAJOykVHsOZf7aYjTfDNsd5JHUC7Uo8IrQAZJBX1DEz+Y3V8dPMXEIlEFGMaVh4o29nZXcw==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/dialog" "^0.0.4"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/overlays" "^0.3.12"
 
-"@gluestack-ui/nativewind-utils@latest":
-  version "1.0.23"
-  resolved "https://registry.npmjs.org/@gluestack-ui/nativewind-utils/-/nativewind-utils-1.0.23.tgz"
-  integrity sha512-4sLc24QwhYWEpyz/ApGqwLOzkZ/tUxpWHtsnIaibgmACcS+BaEebgfGwqmSp215cFE2UlMGofFKDCrdA5UGN0A==
+"@gluestack-ui/nativewind-utils@^1.0.26-alpha.2":
+  version "1.0.26-alpha.2"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/nativewind-utils/-/nativewind-utils-1.0.26-alpha.2.tgz#c3ae0459f12e0187d985082681434d9ed7544cf4"
+  integrity sha512-YTIm6xLu/TBlnqWOE67cjcHFN7x1FE9iMPyspFD63lE8k58ZV5e9GngzS+HXQ+vfoumPMfY/Gxi5RJhIYy/tWA==
   dependencies:
     find-yarn-workspace-root "^2.0.0"
     patch-package "8.0.0"
     tailwind-variants "0.1.20"
 
-"@gluestack-ui/overlay@0.1.15", "@gluestack-ui/overlay@^0.1.12", "@gluestack-ui/overlay@^0.1.14", "@gluestack-ui/overlay@^0.1.7", "@gluestack-ui/overlay@latest":
+"@gluestack-ui/overlay@0.1.16", "@gluestack-ui/overlay@^0.1.16":
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/overlay/-/overlay-0.1.16.tgz#1902a0985c45dd829ed13892935a360be3f6fe2c"
+  integrity sha512-08QFwioMroNia33Fe1zqhHjUL/CErr2swMMcN6vNWNWad6VfwXx3dZIXJxCIL1W90Rz908pWfIGrQEYaT6VAkw==
+  dependencies:
+    "@react-native-aria/focus" "^0.2.9"
+    "@react-native-aria/interactions" "0.2.13"
+    "@react-native-aria/overlays" "^0.3.12"
+
+"@gluestack-ui/overlay@^0.1.15":
   version "0.1.15"
   resolved "https://registry.npmjs.org/@gluestack-ui/overlay/-/overlay-0.1.15.tgz"
   integrity sha512-yHInyJ/sH84X/3chun/tT+YfMIEX/680F31cMHQ5KsHRN4LwF3jOghUkS4592q3Wf32Zmqx0JwTrN8q6wOBT9A==
@@ -1483,149 +1492,149 @@
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/overlays" "^0.3.12"
 
-"@gluestack-ui/popover@^0.1.37":
-  version "0.1.37"
-  resolved "https://registry.npmjs.org/@gluestack-ui/popover/-/popover-0.1.37.tgz"
-  integrity sha512-/THremYW8mjBoDn7ZLolKTFYD4rwGjysw9nA194R3e5ZelEbkJliosugqjKPKxq9yN53sUZlCt1jsxTQ1U4AOQ==
+"@gluestack-ui/popover@^0.1.43":
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/popover/-/popover-0.1.43.tgz#7a9a4af29fecac0019cbec204a4f063c82ac5e0d"
+  integrity sha512-O+pcLWze+H/1fIzn+0Kx7rPgjOzXoUM4eVAM2f/vmqZ0g3hciT/2voNi2lV5mwwtfZOfNlWkgJZQHQ+DIkQx6g==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "0.1.15"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/dialog" "^0.0.4"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/overlays" "0.3.14"
 
-"@gluestack-ui/pressable@^0.1.16":
-  version "0.1.16"
-  resolved "https://registry.npmjs.org/@gluestack-ui/pressable/-/pressable-0.1.16.tgz"
-  integrity sha512-SGUqCCZyMgRtlDN5mO7CN0NM+NMG9S2M3BdhdjI48Jnaks1DdWxzZeaD5xlEhg+Ww/KtmGzVrlSKqPDvVyROiA==
+"@gluestack-ui/pressable@^0.1.17":
+  version "0.1.17"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/pressable/-/pressable-0.1.17.tgz#96a09dc05e3b6beba8201dd83f6c19dafc875fff"
+  integrity sha512-tmyxyNsCCzF0spHwE6CcNq6WretE/Q42EQqvSGKvqk+HHetHGYdLdnWQ2jIxvdmFYXXqBwm5VbC0C8tzbc9A0w==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/progress@^0.1.16":
-  version "0.1.16"
-  resolved "https://registry.npmjs.org/@gluestack-ui/progress/-/progress-0.1.16.tgz"
-  integrity sha512-pjNh8hOhYHTq9ko7topyB9hVpky8eO53aDIeDeaCpzG+YdMGPwYi/QngpIH15YrCLKp2ofiwfXwf+E9IvlRMMg==
+"@gluestack-ui/progress@^0.1.18":
+  version "0.1.18"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/progress/-/progress-0.1.18.tgz#9a659115b4579fee057c2d13bbc52e9e080a6958"
+  integrity sha512-WQCLdvqoiIIQnLBXG7+HDTREMbUfEy9rV7FuBMcBBqEFILuVT1W4hyuXLz/CPrUoCWZJ8OUKvLZvaWWzW8pA9Q==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
 
-"@gluestack-ui/provider@^0.1.6":
-  version "0.1.12"
-  resolved "https://registry.npmjs.org/@gluestack-ui/provider/-/provider-0.1.12.tgz"
-  integrity sha512-EvDEknx6qkrJuKC8ygdixiTvnAAji9moArREueNJdhJp8Af53UIzgWk4m4oqGlRfgrw6p1xApgE/2VTwGE5f7w==
+"@gluestack-ui/provider@^0.1.13":
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/provider/-/provider-0.1.13.tgz#4df09fa12655624688dc00fc24b58de36d72d739"
+  integrity sha512-kJaELgfowTBsJ90XIHW70LsvEg5PKdtmrjfmaU+Hea1spAPgPDh1z5gpmfVoUiZipUUdZoiUgnHbkVh5OMar4g==
   dependencies:
     "@react-native-aria/interactions" "0.2.13"
     tsconfig "7"
-    typescript "^4.9.4"
+    typescript "^5.6.3"
 
-"@gluestack-ui/radio@^0.1.32":
-  version "0.1.32"
-  resolved "https://registry.npmjs.org/@gluestack-ui/radio/-/radio-0.1.32.tgz"
-  integrity sha512-lgm925KACPnCKUK790fVFreM/+Z4WQO2J5REb2SDXlRJcnGOKhJteGuHBDPUlH6CX2cjeY7gvOBb1J+mEllQTQ==
+"@gluestack-ui/radio@^0.1.34":
+  version "0.1.34"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/radio/-/radio-0.1.34.tgz#939b18372ac6b032d563f0e54b2a730b84e3e196"
+  integrity sha512-6izkm5t+rbmPemkpIh0k9F9E3UdIFqbzKT6+WMUbmcaiHeTmWhI0njPiA0S8ge+RpKHXZmXgbiRK1TVkvu17Hw==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.18"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-aria/visually-hidden" "^3.7.0"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/radio" "^0.2.10"
     "@react-stately/radio" "^3.8.1"
 
-"@gluestack-ui/react-native-aria@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.npmjs.org/@gluestack-ui/react-native-aria/-/react-native-aria-0.1.5.tgz"
-  integrity sha512-6IaE4fcBaGMu3kSDKAoo1wE5qXcoKDX5YA14zzYzXN2d67/K9NYSjpoo/GbxDWZVl45X6Z9QLS/SBP7SmsPO+Q==
+"@gluestack-ui/react-native-aria@^0.1.6":
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/react-native-aria/-/react-native-aria-0.1.6.tgz#5b0292fe1b7794743c5ab92dd6bc35741cbffb33"
+  integrity sha512-uLsdiTacS6iBVvk/+6Vvh2AJN9u0OzTvT0FqTiM8vgtesZvSBpv1DN1o5cQR+C/7s56yujdjRXzmRarknm60Qg==
   dependencies:
-    "@react-native-aria/focus" "^0.2.7"
+    "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/select@^0.1.29":
-  version "0.1.29"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/select/-/select-0.1.29.tgz#9869573a3f74caeadac8372d942b048b51cb7eb6"
-  integrity sha512-YbcF2v2DfP1Z1VGPEUXzjC9EvDR2QDgFLCpuUbNpztZqjAFHmdIWtJtxyCg6TrjbfsSKkVuoiXZ5VFRiymfOdQ==
+"@gluestack-ui/select@^0.1.30":
+  version "0.1.30"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/select/-/select-0.1.30.tgz#96a22e4702d228feeb05e2c630e613615f5bf79a"
+  integrity sha512-P47rX2vV6cX73Xvqgj3OyQC3Iw2Hj1r2jffdV2Ch+RzYGAbK97jfLJSG/MyK8awelw8s9r0U9VYgT8eez90ehg==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.18"
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/slider@^0.1.25":
-  version "0.1.25"
-  resolved "https://registry.npmjs.org/@gluestack-ui/slider/-/slider-0.1.25.tgz"
-  integrity sha512-wqDBdj/ebhBZmYwsGic7MHtIhTsfc36bGOiiIxDjSFQCJX+8V++zQpl7HfAIn2CAZ2E0CpM5dhDxn3y71SOFkg==
+"@gluestack-ui/slider@^0.1.26":
+  version "0.1.26"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/slider/-/slider-0.1.26.tgz#09abc0152e268e202605e3a0538a792d704a7e45"
+  integrity sha512-Fe7ab1RBPilWamYHU5M5uA7GK+9PmISkliye+PToYkJRpp43mOa5llKCaViQ3aALnhI7GAawcJtbSsvUTpFEvw==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.18"
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-aria/visually-hidden" "^3.8.1"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/slider" "^0.2.11"
     "@react-stately/slider" "^3.2.4"
 
-"@gluestack-ui/spinner@^0.1.14":
-  version "0.1.14"
-  resolved "https://registry.npmjs.org/@gluestack-ui/spinner/-/spinner-0.1.14.tgz"
-  integrity sha512-6uLUvyJMhYR/sIMU/purfaYPqaKiLqnBi0n0LiWRsJNGDgENqdWVHMJpGTdWaFuCLxumZ7xnp0wG2KAdG9UyyQ==
+"@gluestack-ui/spinner@^0.1.15":
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/spinner/-/spinner-0.1.15.tgz#712276227568476f55672b7bbe0082478c0c0a65"
+  integrity sha512-jkXOGhna05HM2tcPKbA+t+vqcVRgRowwC6ES0A9kY5fcuURH1V41UFx/YWyHdSsHwmWlIoCCdWycF78UbNVdPg==
 
-"@gluestack-ui/switch@^0.1.22":
-  version "0.1.22"
-  resolved "https://registry.npmjs.org/@gluestack-ui/switch/-/switch-0.1.22.tgz"
-  integrity sha512-R5gVyKh7O5vGUvao8VWI1ZAnVhlt2TFYpoiSILydbWLnYydqNa8EQujnXAH4RvjTS6/CVu/sH7sK03uKMmPdvA==
+"@gluestack-ui/switch@^0.1.23":
+  version "0.1.23"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/switch/-/switch-0.1.23.tgz#4a1ba812a34be5a626ad6b1f55b3bc54cbabc3c8"
+  integrity sha512-Ur2EMsDyXMTUdXcvrs24InpXpqY0Mq2BhzfxdfvDWXEuPGn6+UFokIBTUE7HwHBWp07Gjqj6WGDiGnhKJMuT+w==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.18"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-stately/toggle" "^3.4.4"
 
-"@gluestack-ui/textarea@^0.1.23":
-  version "0.1.23"
-  resolved "https://registry.npmjs.org/@gluestack-ui/textarea/-/textarea-0.1.23.tgz"
-  integrity sha512-yZmCoj+0ZHkdqKMY/VTaW6AZ2EVGgaP4WOmXFnglWYsRDH+ZVUuBPYUJeqfko3WZ3gjgcS5vL+NKV98zirtyaA==
+"@gluestack-ui/textarea@^0.1.24":
+  version "0.1.24"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/textarea/-/textarea-0.1.24.tgz#bf3f6379ec49fec21e30aea2ccf79865ecee3625"
+  integrity sha512-maABWaI+Vif9S5twBVzcF1pqv43NMigYuKNM7aNZA5+Mzi3/cf3esPpYjB2VFg3r3VKLZq9JbVFkgLq9MauFxw==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.18"
-    "@gluestack-ui/utils" "^0.1.13"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/toast@^1.0.7":
-  version "1.0.7"
-  resolved "https://registry.npmjs.org/@gluestack-ui/toast/-/toast-1.0.7.tgz"
-  integrity sha512-mmeJftStDsoRHYX+CXxR8lxiCKtQhiSyIAvqvhdDWTqf8Nz9JnCCQKj1zrV2pSnC89Bt+3msfE54cATuU1JF0w==
+"@gluestack-ui/toast@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/toast/-/toast-1.0.8.tgz#af77d31fdf5fc440041c3a4e08ede4dd2b950e66"
+  integrity sha512-Lwa8YU6rvmo9JhBAiSJZZoSyuyvZMKnBHcDJc+cPTd6OYybHF4bcEAEXQRQRu86EY0SfU63trCC3hEbXaSFWCg==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.12"
-    "@gluestack-ui/transitions" "^0.1.10"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/transitions" "^0.1.11"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/tooltip@^0.1.32":
-  version "0.1.32"
-  resolved "https://registry.npmjs.org/@gluestack-ui/tooltip/-/tooltip-0.1.32.tgz"
-  integrity sha512-IsHCnmwYSMOSsIcjF2NpFU1d0lzQETuIyQkkBE8vTB1nPVTpJDvRt5mmfcmn0B/aampA6JOYT7rrGsTj7cjcFA==
+"@gluestack-ui/tooltip@^0.1.36-alpha.0":
+  version "0.1.36-alpha.0"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/tooltip/-/tooltip-0.1.36-alpha.0.tgz#ff435e8709967688814b377a49456fab014f7a8c"
+  integrity sha512-pKlbOp3n2U3AXpS3Yz7a1u2mwmE1AFeeTctsz8DfA+8LTn0d34O76dKMkJxjY84kAKfSPq3Yi4oAxgobQLoeww==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/overlays" "^0.3.12"
 
-"@gluestack-ui/transitions@^0.1.10":
-  version "0.1.10"
-  resolved "https://registry.npmjs.org/@gluestack-ui/transitions/-/transitions-0.1.10.tgz"
-  integrity sha512-oOwYAmbebAowDCDZyRdGwhK2of46b642OZQxBBkln/BX7YEvY4PhQIfup0HUCG9YA5IzlQnw0iwqREbaVNKIgA==
+"@gluestack-ui/transitions@^0.1.11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/transitions/-/transitions-0.1.11.tgz#e84a9841fabb8e67ce17cea979a1cd77b5edac56"
+  integrity sha512-GuCprzasuU8GKXm1GUmaVJ1Njiq72pQ4Ni0g+rg6kRQ7hyR0K4d0wdHRyFldHKmfLcQkM3i70rvYq/468hLKLw==
   dependencies:
-    "@gluestack-ui/overlay" "^0.1.7"
-    "@gluestack-ui/react-native-aria" "^0.1.5"
-    "@gluestack-ui/utils" "^0.1.9"
-    "@react-native-aria/focus" "^0.2.7"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/react-native-aria" "^0.1.6"
+    "@gluestack-ui/utils" "^0.1.14"
+    "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/utils@0.1.13", "@gluestack-ui/utils@^0.1.12", "@gluestack-ui/utils@^0.1.13", "@gluestack-ui/utils@^0.1.9":
-  version "0.1.13"
-  resolved "https://registry.npmjs.org/@gluestack-ui/utils/-/utils-0.1.13.tgz"
-  integrity sha512-L9+ddAn5FLtNJYut7KBGChelt+SvDW3C+6dXduZyP9DD1BoDVTRVwPVYblvbefZf2ZOdTALtHIIO3n/n1bWlbg==
+"@gluestack-ui/utils@0.1.14", "@gluestack-ui/utils@^0.1.14":
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/utils/-/utils-0.1.14.tgz#83af7f58716fe9ec7ea7dc358a791d33b8271cd7"
+  integrity sha512-dGe2LWJi8KcNmfM/Nt/WAT0I5s2F/Lud7nR/gTyksdLs9AZ8YoRkKt0s4q0ofz6ku1yEHDLa/YOuk2+APd8qNQ==
   dependencies:
     "@react-native-aria/focus" "^0.2.9"
 
@@ -2250,7 +2259,7 @@
     "@react-types/dialog" "*"
     "@react-types/shared" "*"
 
-"@react-native-aria/focus@^0.2.7", "@react-native-aria/focus@^0.2.9":
+"@react-native-aria/focus@^0.2.9":
   version "0.2.9"
   resolved "https://registry.npmjs.org/@react-native-aria/focus/-/focus-0.2.9.tgz"
   integrity sha512-zVgOIzKwnsyyurUxlZnzUKB2ekK/cmK64sQJIKKUlkJKVxd2EAFf7Sjz/NVEoMhTODN3qGRASTv9bMk/pBzzVA==
@@ -4119,6 +4128,11 @@ array-buffer-byte-length@^1.0.1:
     call-bind "^1.0.5"
     is-array-buffer "^3.0.4"
 
+array-timsort@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-timsort/-/array-timsort-1.0.3.tgz#3c9e4199e54fb2b9c3fe5976396a21614ef0d926"
+  integrity sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
@@ -4237,7 +4251,7 @@ babel-plugin-jest-hoist@^29.6.3:
 
 babel-plugin-module-resolver@^5.0.2:
   version "5.0.2"
-  resolved "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.2.tgz#cdeac5d4aaa3b08dd1ac23ddbf516660ed2d293e"
   integrity sha512-9KtaCazHee2xc0ibfqsDeamwDps6FZNo5S0Q81dUqEuFzVwPhcT4J5jOqIVvgCA3Q/wO9hKYxN/Ds3tIsp5ygg==
   dependencies:
     find-babel-config "^2.1.1"
@@ -4280,17 +4294,6 @@ babel-plugin-react-native-web@~0.19.10:
   resolved "https://registry.npmjs.org/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.19.12.tgz"
   integrity sha512-eYZ4+P6jNcB37lObWIg0pUbi7+3PKoU1Oie2j0C8UF3cXyXoR74tO2NBjI/FORb2LJyItJZEAmjU5pSaJYEL1w==
 
-babel-plugin-tester@^11.0.4:
-  version "11.0.4"
-  resolved "https://registry.npmjs.org/babel-plugin-tester/-/babel-plugin-tester-11.0.4.tgz"
-  integrity sha512-cqswtpSPo0e++rZB0l/54EG17LL25l9gLgh59yXfnmNxX+2lZTIOpx2zt4YI9QIClVXc8xf63J6yWwKkzy0jNg==
-  dependencies:
-    core-js "^3.27.2"
-    debug "^4.3.4"
-    lodash.mergewith "^4.6.2"
-    prettier "^2.8.3"
-    strip-indent "^3.0.0"
-
 babel-plugin-transform-flow-enums@^0.0.2:
   version "0.0.2"
   resolved "https://registry.npmjs.org/babel-plugin-transform-flow-enums/-/babel-plugin-transform-flow-enums-0.0.2.tgz"
@@ -4605,9 +4608,9 @@ charenc@0.0.2, charenc@~0.0.1:
   resolved "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"
   integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
 
-chokidar@^3.5.3:
+chokidar@^3.6.0:
   version "3.6.0"
-  resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
   integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
   dependencies:
     anymatch "~3.1.2"
@@ -4815,6 +4818,17 @@ commander@^9.4.1:
   resolved "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz"
   integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
 
+comment-json@^4.2.5:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-4.2.5.tgz#482e085f759c2704b60bc6f97f55b8c01bc41e70"
+  integrity sha512-bKw/r35jR3HGt5PEPm1ljsQQGyCrR8sFGNiN5L+ykDHdpO8Smxkrkla9Yi6NkQyUrb8V54PGhfMs6NrIwtxtdw==
+  dependencies:
+    array-timsort "^1.0.3"
+    core-util-is "^1.0.3"
+    esprima "^4.0.1"
+    has-own-prop "^2.0.0"
+    repeat-string "^1.6.1"
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
@@ -4882,12 +4896,7 @@ core-js-compat@^3.38.0:
   dependencies:
     browserslist "^4.23.3"
 
-core-js@^3.27.2:
-  version "3.38.1"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz"
-  integrity sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==
-
-core-util-is@~1.0.0:
+core-util-is@^1.0.3, core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
@@ -5097,6 +5106,13 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.7:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
+  dependencies:
+    ms "^2.1.3"
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
@@ -5763,7 +5779,7 @@ fast-deep-equal@^3.1.3:
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.5, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.2:
+fast-glob@^3.2.5, fast-glob@^3.2.9, fast-glob@^3.3.2:
   version "3.3.2"
   resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -6228,6 +6244,11 @@ has-flag@^4.0.0:
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-own-prop@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-own-prop/-/has-own-prop-2.0.0.tgz#f0f95d58f65804f5d218db32563bb85b8e0417af"
+  integrity sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==
+
 has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz"
@@ -7249,9 +7270,9 @@ jimp-compact@0.16.1:
   resolved "https://registry.npmjs.org/jimp-compact/-/jimp-compact-0.16.1.tgz"
   integrity sha512-dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww==
 
-jiti@^1.21.0:
+jiti@^1.21.6:
   version "1.21.6"
-  resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.6.tgz#6c7f7398dd4b3142767f9a168af2f317a428d268"
   integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==
 
 joi@^17.2.1:
@@ -7493,102 +7514,108 @@ lightningcss-darwin-arm64@1.19.0:
   resolved "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.19.0.tgz"
   integrity sha512-wIJmFtYX0rXHsXHSr4+sC5clwblEMji7HHQ4Ub1/CznVRxtCFha6JIt5JZaNf8vQrfdZnBxLLC6R8pC818jXqg==
 
-lightningcss-darwin-arm64@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.22.0.tgz"
-  integrity sha512-aH2be3nNny+It5YEVm8tBSSdRlBVWQV8m2oJ7dESiYRzyY/E/bQUe2xlw5caaMuhlM9aoTMtOH25yzMhir0qPg==
+lightningcss-darwin-arm64@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.28.2.tgz#a906fd84cb43d753cb5db9c367f8f38482e8fb03"
+  integrity sha512-/8cPSqZiusHSS+WQz0W4NuaqFjquys1x+NsdN/XOHb+idGHJSoJ7SoQTVl3DZuAgtPZwFZgRfb/vd1oi8uX6+g==
 
 lightningcss-darwin-x64@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.19.0.tgz#c867308b88859ba61a2c46c82b1ca52ff73a1bd0"
   integrity sha512-Lif1wD6P4poaw9c/4Uh2z+gmrWhw/HtXFoeZ3bEsv6Ia4tt8rOJBdkfVaUJ6VXmpKHALve+iTyP2+50xY1wKPw==
 
-lightningcss-darwin-x64@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.22.0.tgz#1c5fe3e3ab31c9f1741f6d5d650ab683bd942854"
-  integrity sha512-9KHRFA0Y6mNxRHeoQMp0YaI0R0O2kOgUlYPRjuasU4d+pI8NRhVn9bt0yX9VPs5ibWX1RbDViSPtGJvYYrfVAQ==
+lightningcss-darwin-x64@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.28.2.tgz#6c43249d4ae821416d0d78403eae56111d0c6a94"
+  integrity sha512-R7sFrXlgKjvoEG8umpVt/yutjxOL0z8KWf0bfPT3cYMOW4470xu5qSHpFdIOpRWwl3FKNMUdbKtMUjYt0h2j4g==
 
-lightningcss-freebsd-x64@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.22.0.tgz#1ee7bcb68258b2cb1425bdc7ccb632233eae639c"
-  integrity sha512-xaYL3xperGwD85rQioDb52ozF3NAJb+9wrge3jD9lxGffplu0Mn35rXMptB8Uc2N9Mw1i3Bvl7+z1evlqVl7ww==
+lightningcss-freebsd-x64@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.28.2.tgz#804bc6652c6721e94a92e7bbb5e65165376cf108"
+  integrity sha512-l2qrCT+x7crAY+lMIxtgvV10R8VurzHAoUZJaVFSlHrN8kRLTvEg9ObojIDIexqWJQvJcVVV3vfzsEynpiuvgA==
 
 lightningcss-linux-arm-gnueabihf@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.19.0.tgz#0f921dc45f2e5c3aea70fab98844ac0e5f2f81be"
   integrity sha512-P15VXY5682mTXaiDtbnLYQflc8BYb774j2R84FgDLJTN6Qp0ZjWEFyN1SPqyfTj2B2TFjRHRUvQSSZ7qN4Weig==
 
-lightningcss-linux-arm-gnueabihf@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.22.0.tgz#1c4287ec7268dcee6d9dcccb3d0810ecdcd35b74"
-  integrity sha512-epQGvXIjOuxrZpMpMnRjK54ZqzhiHhCPLtHvw2fb6NeK2kK9YtF0wqmeTBiQ1AkbWfnnXGTstYaFNiadNK+StQ==
+lightningcss-linux-arm-gnueabihf@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.28.2.tgz#c32595127b565690d854c9ff641831e4ad739ee1"
+  integrity sha512-DKMzpICBEKnL53X14rF7hFDu8KKALUJtcKdFUCW5YOlGSiwRSgVoRjM97wUm/E0NMPkzrTi/rxfvt7ruNK8meg==
 
 lightningcss-linux-arm64-gnu@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.19.0.tgz#027f9df9c7f4ffa127c37a71726245a5794d7ba2"
   integrity sha512-zwXRjWqpev8wqO0sv0M1aM1PpjHz6RVIsBcxKszIG83Befuh4yNysjgHVplF9RTU7eozGe3Ts7r6we1+Qkqsww==
 
-lightningcss-linux-arm64-gnu@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.22.0.tgz#b8e6daee4a60020a4930fc3564669868e723a10d"
-  integrity sha512-AArGtKSY4DGTA8xP8SDyNyKtpsUl1Rzq6FW4JomeyUQ4nBrR71uPChksTpj3gmWuGhZeRKLeCUI1DBid/zhChg==
+lightningcss-linux-arm64-gnu@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.28.2.tgz#85646f08c5efbfd7c94f8e5ed6392d5cf95fa42c"
+  integrity sha512-nhfjYkfymWZSxdtTNMWyhFk2ImUm0X7NAgJWFwnsYPOfmtWQEapzG/DXZTfEfMjSzERNUNJoQjPAbdqgB+sjiw==
 
 lightningcss-linux-arm64-musl@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.19.0.tgz#85ea987da868524eac6db94f8e1eaa23d0b688a3"
   integrity sha512-vSCKO7SDnZaFN9zEloKSZM5/kC5gbzUjoJQ43BvUpyTFUX7ACs/mDfl2Eq6fdz2+uWhUh7vf92c4EaaP4udEtA==
 
-lightningcss-linux-arm64-musl@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.22.0.tgz#8d863a5470ee50369f13974325f2a3326b5f77df"
-  integrity sha512-RRraNgP8hnBPhInTTUdlFm+z16C/ghbxBG51Sw00hd7HUyKmEUKRozyc5od+/N6pOrX/bIh5vIbtMXIxsos0lg==
+lightningcss-linux-arm64-musl@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.28.2.tgz#4d9bc20cf6de28c4d0c586d81c577891555ad831"
+  integrity sha512-1SPG1ZTNnphWvAv8RVOymlZ8BDtAg69Hbo7n4QxARvkFVCJAt0cgjAw1Fox0WEhf4PwnyoOBaVH0Z5YNgzt4dA==
 
 lightningcss-linux-x64-gnu@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.19.0.tgz#02bec89579ab4153dccc0def755d1fd9e3ee7f3c"
   integrity sha512-0AFQKvVzXf9byrXUq9z0anMGLdZJS+XSDqidyijI5njIwj6MdbvX2UZK/c4FfNmeRa2N/8ngTffoIuOUit5eIQ==
 
-lightningcss-linux-x64-gnu@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.22.0.tgz#4798711d1897fe19fccd039640389c5049fb03fb"
-  integrity sha512-grdrhYGRi2KrR+bsXJVI0myRADqyA7ekprGxiuK5QRNkv7kj3Yq1fERDNyzZvjisHwKUi29sYMClscbtl+/Zpw==
+lightningcss-linux-x64-gnu@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.28.2.tgz#74bd797d7157817c4e42ec45f1844a69636a9d82"
+  integrity sha512-ZhQy0FcO//INWUdo/iEdbefntTdpPVQ0XJwwtdbBuMQe+uxqZoytm9M+iqR9O5noWFaxK+nbS2iR/I80Q2Ofpg==
 
 lightningcss-linux-x64-musl@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.19.0.tgz#e36a5df8193ae961d22974635e4c100a1823bb8c"
   integrity sha512-SJoM8CLPt6ECCgSuWe+g0qo8dqQYVcPiW2s19dxkmSI5+Uu1GIRzyKA0b7QqmEXolA+oSJhQqCmJpzjY4CuZAg==
 
-lightningcss-linux-x64-musl@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.22.0.tgz#1d34f5bf428b0d2d4550627e653231d33fda90f9"
-  integrity sha512-t5f90X+iQUtIyR56oXIHMBUyQFX/zwmPt72E6Dane3P8KNGlkijTg2I75XVQS860gNoEFzV7Mm5ArRRA7u5CAQ==
+lightningcss-linux-x64-musl@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.28.2.tgz#13ce6db4c491ebbb93099d6427746ab7bff3774f"
+  integrity sha512-alb/j1NMrgQmSFyzTbN1/pvMPM+gdDw7YBuQ5VSgcFDypN3Ah0BzC2dTZbzwzaMdUVDszX6zH5MzjfVN1oGuww==
+
+lightningcss-win32-arm64-msvc@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.28.2.tgz#eaae12c4a58a545a3adf40b22ba9625e5c0ebd29"
+  integrity sha512-WnwcjcBeAt0jGdjlgbT9ANf30pF0C/QMb1XnLnH272DQU8QXh+kmpi24R55wmWBwaTtNAETZ+m35ohyeMiNt+g==
 
 lightningcss-win32-x64-msvc@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.19.0.tgz#0854dbd153035eca1396e2227c708ad43655a61c"
   integrity sha512-C+VuUTeSUOAaBZZOPT7Etn/agx/MatzJzGRkeV+zEABmPuntv1zihncsi+AyGmjkkzq3wVedEy7h0/4S84mUtg==
 
-lightningcss-win32-x64-msvc@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.22.0.tgz#2fece601ea92298f73008bdf96ed0af8132d318f"
-  integrity sha512-64HTDtOOZE9PUCZJiZZQpyqXBbdby1lnztBccnqh+NtbKxjnGzP92R2ngcgeuqMPecMNqNWxgoWgTGpC+yN5Sw==
+lightningcss-win32-x64-msvc@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.28.2.tgz#1f7c4474b2dc3dd1c12e22de32e4de23bdfa41e7"
+  integrity sha512-3piBifyT3avz22o6mDKywQC/OisH2yDK+caHWkiMsF82i3m5wDBadyCjlCQ5VNgzYkxrWZgiaxHDdd5uxsi0/A==
 
-lightningcss@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.0.tgz"
-  integrity sha512-+z0qvwRVzs4XGRXelnWRNwqsXUx8k3bSkbP8vD42kYKSk3z9OM2P3e/gagT7ei/gwh8DTS80LZOFZV6lm8Z8Fg==
+lightningcss@^1.27.0:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.28.2.tgz#cc26fad9ad64a621bd39ac6248095891cf584cce"
+  integrity sha512-ePLRrbt3fgjXI5VFZOLbvkLD5ZRuxGKm+wJ3ujCqBtL3NanDHPo/5zicR5uEKAPiIjBYF99BM4K4okvMznjkVA==
   dependencies:
     detect-libc "^1.0.3"
   optionalDependencies:
-    lightningcss-darwin-arm64 "1.22.0"
-    lightningcss-darwin-x64 "1.22.0"
-    lightningcss-freebsd-x64 "1.22.0"
-    lightningcss-linux-arm-gnueabihf "1.22.0"
-    lightningcss-linux-arm64-gnu "1.22.0"
-    lightningcss-linux-arm64-musl "1.22.0"
-    lightningcss-linux-x64-gnu "1.22.0"
-    lightningcss-linux-x64-musl "1.22.0"
-    lightningcss-win32-x64-msvc "1.22.0"
+    lightningcss-darwin-arm64 "1.28.2"
+    lightningcss-darwin-x64 "1.28.2"
+    lightningcss-freebsd-x64 "1.28.2"
+    lightningcss-linux-arm-gnueabihf "1.28.2"
+    lightningcss-linux-arm64-gnu "1.28.2"
+    lightningcss-linux-arm64-musl "1.28.2"
+    lightningcss-linux-x64-gnu "1.28.2"
+    lightningcss-linux-x64-musl "1.28.2"
+    lightningcss-win32-arm64-msvc "1.28.2"
+    lightningcss-win32-x64-msvc "1.28.2"
 
 lightningcss@~1.19.0:
   version "1.19.0"
@@ -7648,11 +7675,6 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
-lodash.mergewith@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"
-  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
-
 lodash.throttle@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"
@@ -8004,7 +8026,7 @@ metro@0.80.10, metro@^0.80.3:
     ws "^7.5.10"
     yargs "^17.6.2"
 
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.8:
   version "4.0.8"
   resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -8049,11 +8071,6 @@ mimic-fn@^2.1.0:
   resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-min-indent@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"
-  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
-
 minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1:
   version "3.1.2"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
@@ -8158,7 +8175,7 @@ ms@2.1.2:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.1.1:
+ms@2.1.3, ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -8177,12 +8194,14 @@ nanoid@^3.1.23, nanoid@^3.3.7:
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"
   integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
-nativewind@4.0.36:
-  version "4.0.36"
-  resolved "https://registry.npmjs.org/nativewind/-/nativewind-4.0.36.tgz"
-  integrity sha512-nd0Xgjzaq0ISvUAjibZXcuSvvpX1BGX2mfOGBPZpjGfHL3By6fwLGsNhrKU6mi2FF30c+kdok3e2I4k/O0UO1Q==
+nativewind@^4.1.23:
+  version "4.1.23"
+  resolved "https://registry.yarnpkg.com/nativewind/-/nativewind-4.1.23.tgz#badfa94a5cd2e12ff8971dd274d234cd843ca74e"
+  integrity sha512-oLX3suGI6ojQqWxdQezOSM5GmJ4KvMnMtmaSMN9Ggb5j7ysFt4nHxb1xs8RDjZR7BWc+bsetNJU8IQdQMHqRpg==
   dependencies:
-    react-native-css-interop "0.0.36"
+    comment-json "^4.2.5"
+    debug "^4.3.7"
+    react-native-css-interop "0.1.22"
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -8628,6 +8647,11 @@ picocolors@^1.0.0, picocolors@^1.0.1:
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz"
   integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
 
+picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
@@ -8709,22 +8733,22 @@ postcss-js@^4.0.1:
   dependencies:
     camelcase-css "^2.0.1"
 
-postcss-load-config@^4.0.1:
+postcss-load-config@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3"
   integrity sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==
   dependencies:
     lilconfig "^3.0.0"
     yaml "^2.3.4"
 
-postcss-nested@^6.0.1:
+postcss-nested@^6.2.0:
   version "6.2.0"
-  resolved "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.2.0.tgz#4c2d22ab5f20b9cb61e2c5c5915950784d068131"
   integrity sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==
   dependencies:
     postcss-selector-parser "^6.1.1"
 
-postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.1.1:
+postcss-selector-parser@^6.1.1, postcss-selector-parser@^6.1.2:
   version "6.1.2"
   resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz"
   integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
@@ -8737,7 +8761,16 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.23, postcss@~8.4.32:
+postcss@^8.4.47:
+  version "8.4.49"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
+  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
+postcss@~8.4.32:
   version "8.4.44"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.44.tgz"
   integrity sha512-Aweb9unOEpQ3ezu4Q00DPvvM2ZTUitJdNKeP/+uQgr1IBIqu574IaZoURId7BKtWMREwzKa9OgzPzezWGPWFQw==
@@ -8746,11 +8779,6 @@ postcss@^8.4.23, postcss@~8.4.32:
     picocolors "^1.0.1"
     source-map-js "^1.2.0"
 
-prettier@^2.8.3:
-  version "2.8.8"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz"
-  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
-
 pretty-bytes@5.6.0:
   version "5.6.0"
   resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"
@@ -8937,16 +8965,17 @@ react-is@^17.0.1:
   resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-react-native-css-interop@0.0.36:
-  version "0.0.36"
-  resolved "https://registry.npmjs.org/react-native-css-interop/-/react-native-css-interop-0.0.36.tgz"
-  integrity sha512-ZWoKQlq6XrI5DB4BdPk5ABvJQsX7zls1SQYWuYXOQB8u5QE0KH3OfOGAGRZPekTjgkhjqGO4Bf8G2JTSWAYMSg==
+react-native-css-interop@0.1.22:
+  version "0.1.22"
+  resolved "https://registry.yarnpkg.com/react-native-css-interop/-/react-native-css-interop-0.1.22.tgz#70cc6ca7a8f14126e123e44a19ceed74dd2a167a"
+  integrity sha512-Mu01e+H9G+fxSWvwtgWlF5MJBJC4VszTCBXopIpeR171lbeBInHb8aHqoqRPxmJpi3xIHryzqKFOJYAdk7PBxg==
   dependencies:
     "@babel/helper-module-imports" "^7.22.15"
     "@babel/traverse" "^7.23.0"
     "@babel/types" "^7.23.0"
-    babel-plugin-tester "^11.0.4"
-    lightningcss "1.22.0"
+    debug "^4.3.7"
+    lightningcss "^1.27.0"
+    semver "^7.6.3"
 
 react-native-helmet-async@2.0.4:
   version "2.0.4"
@@ -8957,10 +8986,10 @@ react-native-helmet-async@2.0.4:
     react-fast-compare "^3.2.2"
     shallowequal "^1.1.0"
 
-react-native-reanimated@latest:
-  version "3.15.1"
-  resolved "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.15.1.tgz"
-  integrity sha512-DbBeUUExtJ1x1nfE94I8qgDgWjq5ztM3IO/+XFO+agOkPeVpBs5cRnxHfJKrjqJ2MgwhJOUDmtHxo+tDsoeitg==
+react-native-reanimated@^3.16.3:
+  version "3.16.3"
+  resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.16.3.tgz#3b559dca49e9e40abcf5de834dc27fc05f856b66"
+  integrity sha512-OWlA6e1oHhytTpc7WiSZ7Tmb8OYwLKYZz29Sz6d6WAg60Hm5GuAiKIWUG7Ako7FLcYhFkA0pEQ2xPMEYUo9vlw==
   dependencies:
     "@babel/plugin-transform-arrow-functions" "^7.0.0-0"
     "@babel/plugin-transform-class-properties" "^7.0.0-0"
@@ -8974,10 +9003,10 @@ react-native-reanimated@latest:
     convert-source-map "^2.0.0"
     invariant "^2.2.4"
 
-react-native-safe-area-context@4.10.1:
-  version "4.10.1"
-  resolved "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.10.1.tgz"
-  integrity sha512-w8tCuowDorUkPoWPXmhqosovBr33YsukkwYCDERZFHAxIkx6qBadYxfeoaJ91nCQKjkNzGrK5qhoNOeSIcYSpA==
+react-native-safe-area-context@^4.14.0:
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.14.0.tgz#138f4b2e180cb7517c78bd5f4d4cf91325ba0b1a"
+  integrity sha512-/SyYpCulWQOnnXhRq6wepkhoyQMowHm1ptDyRz20s+YS/R9mbd+mK+jFyFCyXFJn8jp7vFl43VUCgspuOiEbwA==
 
 react-native-screens@3.31.1:
   version "3.31.1"
@@ -8987,10 +9016,10 @@ react-native-screens@3.31.1:
     react-freeze "^1.0.0"
     warn-once "^0.1.0"
 
-react-native-svg@^15.2.0:
-  version "15.6.0"
-  resolved "https://registry.npmjs.org/react-native-svg/-/react-native-svg-15.6.0.tgz"
-  integrity sha512-TUtR+h+yi1ODsd8FHdom1TpjfWOmnaK5pri5rnSBXnMqpzq8o2zZfonHTjPX+nS3wb/Pu2XsoARgYaHNjVWXhQ==
+react-native-svg@^15.9.0:
+  version "15.9.0"
+  resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-15.9.0.tgz#a742a63cb463502ce591fdfcf7b9e80544f0a8c2"
+  integrity sha512-pwo7hteAM0P8jNpPGQtiSd0SnbBhE8tNd94LT8AcZcbnH5AJdXBIcXU4+tWYYeGUjiNAH2E5d0T5XIfnvaz1gA==
   dependencies:
     css-select "^5.1.0"
     css-tree "^1.1.3"
@@ -9280,6 +9309,11 @@ remove-trailing-slash@^0.1.0:
   resolved "https://registry.npmjs.org/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz"
   integrity sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==
 
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
@@ -9494,7 +9528,7 @@ semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.1.3, semver@^7.3.5, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0:
+semver@^7.1.3, semver@^7.3.5, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
@@ -9691,6 +9725,11 @@ source-map-js@^1.2.0:
   resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
+source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
+
 source-map-support@0.5.13:
   version "0.5.13"
   resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz"
@@ -9936,13 +9975,6 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-indent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"
-  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
-  dependencies:
-    min-indent "^1.0.0"
-
 strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
@@ -9981,9 +10013,9 @@ sucrase@3.34.0:
     pirates "^4.0.1"
     ts-interface-checker "^0.1.9"
 
-sucrase@^3.32.0:
+sucrase@^3.35.0:
   version "3.35.0"
-  resolved "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz"
+  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263"
   integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.2"
@@ -10060,33 +10092,33 @@ tailwind-variants@0.1.20:
   dependencies:
     tailwind-merge "^1.14.0"
 
-tailwindcss@3.4.3:
-  version "3.4.3"
-  resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz"
-  integrity sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==
+tailwindcss@^3.4.15:
+  version "3.4.15"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.15.tgz#04808bf4bf1424b105047d19e7d4bfab368044a9"
+  integrity sha512-r4MeXnfBmSOuKUWmXe6h2CcyfzJCEk4F0pptO5jlnYSIViUkVmsawj80N5h2lO3gwcmSb4n3PuN+e+GC1Guylw==
   dependencies:
     "@alloc/quick-lru" "^5.2.0"
     arg "^5.0.2"
-    chokidar "^3.5.3"
+    chokidar "^3.6.0"
     didyoumean "^1.2.2"
     dlv "^1.1.3"
-    fast-glob "^3.3.0"
+    fast-glob "^3.3.2"
     glob-parent "^6.0.2"
     is-glob "^4.0.3"
-    jiti "^1.21.0"
+    jiti "^1.21.6"
     lilconfig "^2.1.0"
-    micromatch "^4.0.5"
+    micromatch "^4.0.8"
     normalize-path "^3.0.0"
     object-hash "^3.0.0"
-    picocolors "^1.0.0"
-    postcss "^8.4.23"
+    picocolors "^1.1.1"
+    postcss "^8.4.47"
     postcss-import "^15.1.0"
     postcss-js "^4.0.1"
-    postcss-load-config "^4.0.1"
-    postcss-nested "^6.0.1"
-    postcss-selector-parser "^6.0.11"
-    resolve "^1.22.2"
-    sucrase "^3.32.0"
+    postcss-load-config "^4.0.2"
+    postcss-nested "^6.2.0"
+    postcss-selector-parser "^6.1.2"
+    resolve "^1.22.8"
+    sucrase "^3.35.0"
 
 tar@^6.0.5, tar@^6.1.11:
   version "6.2.1"
@@ -10372,10 +10404,10 @@ typedarray.prototype.slice@^1.0.3:
     typed-array-buffer "^1.0.2"
     typed-array-byte-offset "^1.0.2"
 
-typescript@^4.9.4:
-  version "4.9.5"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+typescript@^5.6.3:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
+  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
 
 typescript@~5.3.3:
   version "5.3.3"
diff --git a/next/app/layout.tsx b/next/app/layout.tsx
index 1f9d0cfd..f98e8707 100644
--- a/next/app/layout.tsx
+++ b/next/app/layout.tsx
@@ -1,6 +1,6 @@
 "use client";
-
 import { Inter } from "next/font/google";
+import "@/styles/global.css";
 import StyledJsxRegistry from "./registry";
 import { GluestackUIProvider } from "@/components/ui/gluestack-ui-provider";
 
diff --git a/next/app/registry.tsx b/next/app/registry.tsx
index 470bc580..53996dce 100644
--- a/next/app/registry.tsx
+++ b/next/app/registry.tsx
@@ -1,14 +1,12 @@
-"use client";
+'use client';
 
-import "../styles/global.css";
-import React, { useRef, useState } from "react";
-import { useServerInsertedHTML } from "next/navigation";
-import { StyleRegistry, createStyleRegistry } from "styled-jsx";
-// eslint-disable-next-line @next/next/no-document-import-in-page
-import { Main } from "next/document";
-import { flush } from "@gluestack-ui/nativewind-utils/flush";
+import React, { useRef, useState } from 'react';
+import { useServerInsertedHTML } from 'next/navigation';
+import { StyleRegistry, createStyleRegistry } from 'styled-jsx';
+import { Main } from 'next/document';
 // @ts-ignore
-import { AppRegistry } from "react-native-web";
+import { AppRegistry } from 'react-native-web';
+import { flush } from '@gluestack-ui/nativewind-utils/flush';
 
 export default function StyledJsxRegistry({
   children,
@@ -21,8 +19,8 @@ export default function StyledJsxRegistry({
   const isServerInserted = useRef(false);
 
   useServerInsertedHTML(() => {
-    AppRegistry.registerComponent("Main", () => Main);
-    const { getStyleElement } = AppRegistry.getApplication("Main");
+    AppRegistry.registerComponent('Main', () => Main);
+    const { getStyleElement } = AppRegistry.getApplication('Main');
     if (!isServerInserted.current) {
       isServerInserted.current = true;
       const styles = [getStyleElement(), jsxStyleRegistry.styles(), flush()];
diff --git a/next/components/ui/accordion/index.tsx b/next/components/ui/accordion/index.tsx
index ca4711a7..7dbe6f8f 100644
--- a/next/components/ui/accordion/index.tsx
+++ b/next/components/ui/accordion/index.tsx
@@ -1,7 +1,6 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createAccordion } from '@gluestack-ui/accordion';
-import { Svg } from 'react-native-svg';
 import { View, Pressable, Text, Platform, TextProps } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
@@ -9,9 +8,9 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { H3 } from '@expo/html-elements';
 import { cssInterop } from 'nativewind';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'ACCORDION';
 /** Styles */
@@ -30,7 +29,9 @@ const accordionStyle = tva({
     },
   },
 });
+
 const accordionItemStyle = tva({
+  base: '',
   parentVariants: {
     variant: {
       filled: 'bg-background-0',
@@ -65,7 +66,7 @@ const accordionContentTextStyle = tva({
   base: 'text-typography-700 font-normal',
   parentVariants: {
     size: {
-      sm: 'text-sm ',
+      sm: 'text-sm',
       md: 'text-base',
       lg: 'text-lg',
     },
@@ -75,79 +76,13 @@ const accordionHeaderStyle = tva({
   base: 'mx-0 my-0',
 });
 const accordionContentStyle = tva({
-  base: 'px-5 mt-2 pb-5',
+  base: 'mt-4',
 });
 const accordionTriggerStyle = tva({
-  base: 'w-full py-5 px-5 flex-row justify-between items-center web:outline-none focus:outline-none data-[disabled=true]:opacity-40 data-[disabled=true]:cursor-not-allowed data-[focus-visible=true]:bg-background-50',
+  base: 'w-full flex-row justify-between items-center web:outline-none focus:outline-none data-[disabled=true]:opacity-40 data-[disabled=true]:cursor-not-allowed data-[focus-visible=true]:bg-background-50 py-3 px-4',
 });
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon & React.ComponentPropsWithoutRef<typeof Svg>
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      size,
-      stroke = 'currentColor',
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    const colorProps =
-      stroke === 'currentColor' && color !== undefined ? color : stroke;
-
-    if (AsComp) {
-      return (
-        <AsComp
-          ref={ref}
-          fill={fill}
-          {...props}
-          {...sizeProps}
-          stroke={colorProps}
-        />
-      );
-    }
-    return (
-      <Svg
-        ref={ref}
-        height={height}
-        width={width}
-        fill={fill}
-        stroke={colorProps}
-        {...props}
-      />
-    );
-  }
-);
-
-const Root =
-  Platform.OS === 'web'
-    ? withStyleContext(View, SCOPE)
-    : withStyleContextAndStates(View, SCOPE);
+const Root = withStyleContext(View, SCOPE);
 
 const Header = (
   Platform.OS === 'web' ? H3 : View
@@ -159,30 +94,20 @@ const UIAccordion = createAccordion({
   Item: View,
   Header: Header,
   Trigger: Pressable,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
   TitleText: Text,
   ContentText: Text,
   Content: View,
 });
 
-cssInterop(UIAccordion, { className: 'style' });
-cssInterop(UIAccordion.Item, { className: 'style' });
-cssInterop(UIAccordion.Header, { className: 'style' });
-cssInterop(UIAccordion.Trigger, { className: 'style' });
-cssInterop(UIAccordion.Icon, { className: 'style' });
-cssInterop(UIAccordion.TitleText, { className: 'style' });
-cssInterop(UIAccordion.Content, { className: 'style' });
-cssInterop(UIAccordion.ContentText, { className: 'style' });
-// @ts-ignore
-cssInterop(UIAccordion.Icon, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
diff --git a/next/components/ui/actionsheet/index.tsx b/next/components/ui/actionsheet/index.tsx
index e80735b9..0dc14763 100644
--- a/next/components/ui/actionsheet/index.tsx
+++ b/next/components/ui/actionsheet/index.tsx
@@ -1,7 +1,6 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { H4 } from '@expo/html-elements';
-import { Svg } from 'react-native-svg';
 import { createActionsheet } from '@gluestack-ui/actionsheet';
 import {
   Pressable,
@@ -11,13 +10,11 @@ import {
   VirtualizedList,
   FlatList,
   SectionList,
-  Platform,
   PressableProps,
 } from 'react-native';
-
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import { cssInterop } from 'nativewind';
 import {
   Motion,
@@ -25,68 +22,6 @@ import {
   createMotionAnimatedComponent,
 } from '@legendapp/motion';
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon & React.ComponentPropsWithoutRef<typeof Svg>
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      size,
-      stroke = 'currentColor',
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    const colorProps =
-      stroke === 'currentColor' && color !== undefined ? color : stroke;
-
-    if (AsComp) {
-      return (
-        <AsComp
-          ref={ref}
-          fill={fill}
-          {...props}
-          {...sizeProps}
-          stroke={colorProps}
-        />
-      );
-    }
-    return (
-      <Svg
-        ref={ref}
-        height={height}
-        width={width}
-        fill={fill}
-        stroke={colorProps}
-        {...props}
-      />
-    );
-  }
-);
-
 const ItemWrapper = React.forwardRef<
   React.ElementRef<typeof Pressable>,
   PressableProps
@@ -99,7 +34,7 @@ const AnimatedPressable = createMotionAnimatedComponent(Pressable);
 export const UIActionsheet = createActionsheet({
   Root: View,
   Content: Motion.View,
-  Item: Platform.OS === 'web' ? ItemWrapper : withStates(ItemWrapper),
+  Item: ItemWrapper,
   ItemText: Text,
   DragIndicator: View,
   IndicatorWrapper: View,
@@ -109,7 +44,7 @@ export const UIActionsheet = createActionsheet({
   FlatList: FlatList,
   SectionList: SectionList,
   SectionHeaderText: H4,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
   AnimatePresence: AnimatePresence,
 });
 
@@ -142,15 +77,15 @@ cssInterop(UIActionsheet.FlatList, {
 });
 cssInterop(UIActionsheet.SectionList, { className: 'style' });
 cssInterop(UIActionsheet.SectionHeaderText, { className: 'style' });
-cssInterop(UIActionsheet.Icon, {
+
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
diff --git a/next/components/ui/alert-dialog/index.tsx b/next/components/ui/alert-dialog/index.tsx
index 457db9c6..2bd63535 100644
--- a/next/components/ui/alert-dialog/index.tsx
+++ b/next/components/ui/alert-dialog/index.tsx
@@ -6,7 +6,7 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
+
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 import {
@@ -14,17 +14,14 @@ import {
   AnimatePresence,
   createMotionAnimatedComponent,
 } from '@legendapp/motion';
-import { View, Pressable, ScrollView, Platform } from 'react-native';
+import { View, Pressable, ScrollView } from 'react-native';
 
 const AnimatedPressable = createMotionAnimatedComponent(Pressable);
 
 const SCOPE = 'ALERT_DIALOG';
 
 const UIAccessibleAlertDialog = createAlertDialog({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(View, SCOPE),
+  Root: withStyleContext(View, SCOPE),
   Body: ScrollView,
   Content: Motion.View,
   CloseButton: Pressable,
@@ -34,17 +31,8 @@ const UIAccessibleAlertDialog = createAlertDialog({
   AnimatePresence: AnimatePresence,
 });
 
-cssInterop(UIAccessibleAlertDialog, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Content, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.CloseButton, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Header, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Footer, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Body, {
-  className: 'style',
-  contentContainerClassName: 'contentContainerStyle',
-  indicatorClassName: 'indicatorStyle',
-});
-cssInterop(UIAccessibleAlertDialog.Backdrop, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
+cssInterop(AnimatedPressable, { className: 'style' });
 
 const alertDialogStyle = tva({
   base: 'group/modal w-full h-full justify-center items-center web:pointer-events-none',
diff --git a/next/components/ui/alert/index.tsx b/next/components/ui/alert/index.tsx
index f98aceb9..90a2dfe9 100644
--- a/next/components/ui/alert/index.tsx
+++ b/next/components/ui/alert/index.tsx
@@ -6,10 +6,10 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import React, { useMemo } from 'react';
-import { Svg } from 'react-native-svg';
+import React from 'react';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'ALERT';
 
@@ -33,7 +33,7 @@ const alertStyle = tva({
 });
 
 const alertTextStyle = tva({
-  base: 'flex-1 font-normal font-body',
+  base: 'font-normal font-body',
 
   variants: {
     isTruncated: {
@@ -100,77 +100,25 @@ const alertIconStyle = tva({
       warning: 'text-warning-800',
       success: 'text-success-800',
       info: 'text-info-800',
-      muted: 'text-secondary-800',
+      muted: 'text-background-800',
     },
   },
 });
 
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
-
-const IconWrapper = React.forwardRef<
-  React.ElementRef<typeof PrimitiveIcon>,
-  IPrimitiveIcon
->(({ ...props }, ref) => {
-  return <PrimitiveIcon {...props} ref={ref} />;
-});
-
 export const UIAlert = createAlert({
   Root: withStyleContext(View, SCOPE),
   Text: Text,
-  Icon: IconWrapper,
+  Icon: UIIcon,
 });
 
-cssInterop(UIAlert, { className: 'style' });
-//@ts-ignore
-cssInterop(UIAlert.Text, { className: 'style' });
-cssInterop(IconWrapper, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
diff --git a/next/components/ui/avatar/index.tsx b/next/components/ui/avatar/index.tsx
index 31fcbdd1..b6863aa1 100644
--- a/next/components/ui/avatar/index.tsx
+++ b/next/components/ui/avatar/index.tsx
@@ -9,7 +9,6 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { cssInterop } from 'nativewind';
 const SCOPE = 'AVATAR';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
@@ -21,12 +20,6 @@ const UIAvatar = createAvatar({
   FallbackText: Text,
 });
 
-cssInterop(UIAvatar, { className: 'style' });
-cssInterop(UIAvatar.Badge, { className: 'style' });
-cssInterop(UIAvatar.Group, { className: 'style' });
-cssInterop(UIAvatar.Image, { className: 'style' });
-cssInterop(UIAvatar.FallbackText, { className: 'style' });
-
 const avatarStyle = tva({
   base: 'rounded-full justify-center items-center relative bg-primary-600 group-[.avatar-group]/avatar-group:-ml-2.5',
   variants: {
@@ -161,10 +154,11 @@ export const AvatarImage = React.forwardRef<
       className={avatarImageStyle({
         class: className,
       })}
-      // @ts-ignore
+      // @ts-expect-error
       style={
         Platform.OS === 'web'
-          ? { height: 'revert-layer', width: 'revert-layer' }
+          ? // eslint-disable-next-line react-native/no-inline-styles
+            { height: 'revert-layer', width: 'revert-layer' }
           : undefined
       }
     />
diff --git a/next/components/ui/badge/index.tsx b/next/components/ui/badge/index.tsx
index 42bf6016..6363a340 100644
--- a/next/components/ui/badge/index.tsx
+++ b/next/components/ui/badge/index.tsx
@@ -1,7 +1,7 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { Text, View } from 'react-native';
-import { Svg } from 'react-native-svg';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
@@ -42,7 +42,7 @@ const badgeTextStyle = tva({
       warning: 'text-warning-600',
       success: 'text-success-600',
       info: 'text-info-600',
-      muted: 'text-secondary-600',
+      muted: 'text-background-800',
     },
     size: {
       sm: 'text-2xs',
@@ -83,7 +83,7 @@ const badgeIconStyle = tva({
       warning: 'text-warning-600',
       success: 'text-success-600',
       info: 'text-info-600',
-      muted: 'text-secondary-600',
+      muted: 'text-background-800',
     },
     size: {
       sm: 'h-3 w-3',
@@ -93,58 +93,17 @@ const badgeIconStyle = tva({
   },
 });
 
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
-
 const ContextView = withStyleContext(View, SCOPE);
-cssInterop(ContextView, { className: 'style' });
+
 cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
+      //@ts-expect-error
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
@@ -154,7 +113,7 @@ type IBadgeProps = React.ComponentPropsWithoutRef<typeof ContextView> &
   VariantProps<typeof badgeStyle>;
 const Badge = ({
   children,
-  action = 'info',
+  action = 'muted',
   variant = 'solid',
   size = 'md',
   className,
@@ -205,14 +164,14 @@ type IBadgeIconProps = React.ComponentPropsWithoutRef<typeof PrimitiveIcon> &
   VariantProps<typeof badgeIconStyle>;
 
 const BadgeIcon = React.forwardRef<
-  React.ElementRef<typeof PrimitiveIcon>,
+  React.ElementRef<typeof UIIcon>,
   IBadgeIconProps
 >(({ className, size, ...props }, ref) => {
   const { size: parentSize, action: parentAction } = useStyleContext(SCOPE);
 
   if (typeof size === 'number') {
     return (
-      <PrimitiveIcon
+      <UIIcon
         ref={ref}
         {...props}
         className={badgeIconStyle({ class: className })}
@@ -220,11 +179,11 @@ const BadgeIcon = React.forwardRef<
       />
     );
   } else if (
-    (props.height !== undefined || props.width !== undefined) &&
+    (props?.height !== undefined || props?.width !== undefined) &&
     size === undefined
   ) {
     return (
-      <PrimitiveIcon
+      <UIIcon
         ref={ref}
         {...props}
         className={badgeIconStyle({ class: className })}
@@ -232,7 +191,7 @@ const BadgeIcon = React.forwardRef<
     );
   }
   return (
-    <PrimitiveIcon
+    <UIIcon
       className={badgeIconStyle({
         parentVariants: {
           size: parentSize,
diff --git a/next/components/ui/bottomsheet/index.tsx b/next/components/ui/bottomsheet/index.tsx
deleted file mode 100644
index d627f0ef..00000000
--- a/next/components/ui/bottomsheet/index.tsx
+++ /dev/null
@@ -1,294 +0,0 @@
-import GorhomBottomSheet, {
-  BottomSheetBackdrop as GorhomBottomSheetBackdrop,
-  BottomSheetView as GorhomBottomSheetView,
-  BottomSheetHandle,
-  BottomSheetTextInput as GorhomBottomSheetInput,
-  BottomSheetScrollView as GorhomBottomSheetScrollView,
-  BottomSheetFlatList as GorhomBottomSheetFlatList,
-  BottomSheetSectionList as GorhomBottomSheetSectionList,
-} from '@gorhom/bottom-sheet';
-import { Platform } from 'react-native';
-import type { PressableProps, TextProps } from 'react-native';
-import { FocusScope } from '@react-native-aria/focus';
-import React, {
-  createContext,
-  useCallback,
-  useContext,
-  useMemo,
-  useRef,
-  useState,
-} from 'react';
-import { Pressable, Text } from 'react-native';
-import { cssInterop } from 'nativewind';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-
-const bottomSheetBackdropStyle = tva({
-  base: 'absolute inset-0 flex-1 touch-none select-none bg-black opacity-0',
-});
-
-const bottomSheetContentStyle = tva({
-  base: 'mt-2',
-});
-const bottomSheetTriggerStyle = tva({
-  base: '',
-});
-
-const bottomSheetIndicatorStyle = tva({
-  base: 'py-1 w-full items-center rounded-t-lg ',
-});
-
-const bottomSheetItemStyle = tva({
-  base: 'p-3 flex-row items-center rounded-sm w-full disabled:opacity-0.4 web:pointer-events-auto disabled:cursor-not-allowed hover:bg-background-50 active:bg-background-100 focus:bg-background-100 web:focus-visible:bg-background-100',
-});
-
-const BottomSheetContext = createContext<{
-  visible: boolean;
-  bottomSheetRef: React.RefObject<GorhomBottomSheet>;
-  handleClose: () => void;
-  handleOpen: () => void;
-}>({
-  visible: false,
-  bottomSheetRef: { current: null },
-  handleClose: () => {},
-  handleOpen: () => {},
-});
-
-type IBottomSheetProps = React.ComponentProps<typeof GorhomBottomSheet>;
-export const BottomSheet = ({
-  snapToIndex = 1,
-  onOpen,
-  onClose,
-  ...props
-}: {
-  snapToIndex?: number;
-  children?: React.ReactNode;
-  onOpen?: () => void;
-  onClose?: () => void;
-}) => {
-  const bottomSheetRef = useRef<GorhomBottomSheet>(null);
-
-  const [visible, setVisible] = useState(false);
-
-  const handleOpen = useCallback(() => {
-    bottomSheetRef.current?.snapToIndex(snapToIndex);
-    setVisible(true);
-    onOpen && onOpen();
-  }, [onOpen, snapToIndex]);
-
-  const handleClose = useCallback(() => {
-    bottomSheetRef.current?.close();
-    setVisible(false);
-    onClose && onClose();
-  }, [onClose]);
-
-  return (
-    <BottomSheetContext.Provider
-      value={{
-        visible,
-        bottomSheetRef,
-        handleClose,
-        handleOpen,
-      }}
-    >
-      {props.children}
-    </BottomSheetContext.Provider>
-  );
-};
-
-export const BottomSheetPortal = ({
-  snapPoints,
-  handleComponent: DragIndicator,
-  backdropComponent: BackDrop,
-  ...props
-}: Partial<IBottomSheetProps> & {
-  defaultIsOpen?: boolean;
-  snapToIndex?: number;
-  snapPoints: string[];
-}) => {
-  const { bottomSheetRef, handleClose } = useContext(BottomSheetContext);
-
-  const handleSheetChanges = useCallback(
-    (index: number) => {
-      if (index === 0 || index === -1) {
-        handleClose();
-      }
-    },
-    [handleClose]
-  );
-
-  return (
-    <GorhomBottomSheet
-      ref={bottomSheetRef}
-      snapPoints={snapPoints}
-      index={-1}
-      backdropComponent={BackDrop}
-      onChange={handleSheetChanges}
-      handleComponent={DragIndicator}
-      enablePanDownToClose={true}
-      {...props}
-    >
-      {props.children}
-    </GorhomBottomSheet>
-  );
-};
-
-export const BottomSheetTrigger = ({
-  className,
-  ...props
-}: PressableProps & { className?: string }) => {
-  const { handleOpen } = useContext(BottomSheetContext);
-  return (
-    <Pressable
-      onPress={(e) => {
-        props.onPress && props.onPress(e);
-        handleOpen();
-      }}
-      {...props}
-      className={bottomSheetTriggerStyle({
-        className: className,
-      })}
-    >
-      {props.children}
-    </Pressable>
-  );
-};
-type IBottomSheetBackdrop = React.ComponentProps<
-  typeof GorhomBottomSheetBackdrop
->;
-
-export const BottomSheetBackdrop = ({
-  disappearsOnIndex = -1,
-  appearsOnIndex = 1,
-  className,
-  ...props
-}: Partial<IBottomSheetBackdrop> & { className?: string }) => {
-  return (
-    <GorhomBottomSheetBackdrop
-      // @ts-ignore
-      className={bottomSheetBackdropStyle({
-        className: className,
-      })}
-      disappearsOnIndex={disappearsOnIndex}
-      appearsOnIndex={appearsOnIndex}
-      {...props}
-    />
-  );
-};
-
-cssInterop(GorhomBottomSheetBackdrop, { className: 'style' });
-
-type IBottomSheetDragIndicator = React.ComponentProps<typeof BottomSheetHandle>;
-
-export const BottomSheetDragIndicator = ({
-  children,
-  className,
-  ...props
-}: Partial<IBottomSheetDragIndicator> & { className?: string }) => {
-  return (
-    <BottomSheetHandle
-      {...props}
-      // @ts-ignore
-      className={bottomSheetIndicatorStyle({
-        className: className,
-      })}
-    >
-      {children}
-    </BottomSheetHandle>
-  );
-};
-
-cssInterop(BottomSheetHandle, { className: 'style' });
-
-type IBottomSheetContent = React.ComponentProps<typeof GorhomBottomSheetView>;
-
-export const BottomSheetContent = ({ ...props }: IBottomSheetContent) => {
-  const { handleClose, visible } = useContext(BottomSheetContext);
-  const keyDownHandlers = useMemo(() => {
-    return Platform.OS === 'web'
-      ? {
-          onKeyDown: (e: React.KeyboardEvent) => {
-            if (e.key === 'Escape') {
-              e.preventDefault();
-              handleClose();
-              return;
-            }
-          },
-        }
-      : {};
-  }, [handleClose]);
-
-  if (Platform.OS === 'web')
-    return (
-      <GorhomBottomSheetView
-        {...props}
-        // @ts-ignore
-        {...keyDownHandlers}
-        className={bottomSheetContentStyle({
-          className: props.className,
-        })}
-      >
-        {visible && (
-          <FocusScope contain={visible} autoFocus={true} restoreFocus={true}>
-            {props.children}
-          </FocusScope>
-        )}
-      </GorhomBottomSheetView>
-    );
-
-  return (
-    <GorhomBottomSheetView
-      {...props}
-      // @ts-ignore
-      {...keyDownHandlers}
-      className={bottomSheetContentStyle({
-        className: props.className,
-      })}
-    >
-      {props.children}
-    </GorhomBottomSheetView>
-  );
-};
-
-cssInterop(GorhomBottomSheetView, { className: 'style' });
-
-export const BottomSheetItem = ({
-  children,
-  className,
-  closeOnSelect = true,
-  ...props
-}: PressableProps & {
-  closeOnSelect?: boolean;
-}) => {
-  const { handleClose } = useContext(BottomSheetContext);
-  return (
-    <Pressable
-      {...props}
-      className={bottomSheetItemStyle({
-        className: className,
-      })}
-      onPress={(e) => {
-        if (closeOnSelect) {
-          handleClose();
-        }
-        props.onPress && props.onPress(e);
-      }}
-      role="button"
-    >
-      {children}
-    </Pressable>
-  );
-};
-
-export const BottomSheetItemText = ({ ...props }: TextProps) => {
-  return <Text {...props} />;
-};
-
-export const BottomSheetScrollView = GorhomBottomSheetScrollView;
-export const BottomSheetFlatList = GorhomBottomSheetFlatList;
-export const BottomSheetSectionList = GorhomBottomSheetSectionList;
-export const BottomSheetTextInput = GorhomBottomSheetInput;
-
-cssInterop(GorhomBottomSheetInput, { className: 'style' });
-cssInterop(GorhomBottomSheetScrollView, { className: 'style' });
-cssInterop(GorhomBottomSheetFlatList, { className: 'style' });
-cssInterop(GorhomBottomSheetSectionList, { className: 'style' });
diff --git a/next/components/ui/button/index.tsx b/next/components/ui/button/index.tsx
index 8000ba10..7d7802ee 100644
--- a/next/components/ui/button/index.tsx
+++ b/next/components/ui/button/index.tsx
@@ -1,257 +1,296 @@
-'use client';
-import React, { useMemo } from 'react';
-import { createButton } from '@gluestack-ui/button';
-import { Svg } from 'react-native-svg';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
+"use client";
+import React from "react";
+import { createButton } from "@gluestack-ui/button";
+import { tva } from "@gluestack-ui/nativewind-utils/tva";
 import {
   withStyleContext,
   useStyleContext,
-} from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+} from "@gluestack-ui/nativewind-utils/withStyleContext";
+import { cssInterop } from "nativewind";
+import { ActivityIndicator, Pressable, Text, View } from "react-native";
+import type { VariantProps } from "@gluestack-ui/nativewind-utils";
+import { PrimitiveIcon, UIIcon } from "@gluestack-ui/icon";
 
-import {
-  ActivityIndicator,
-  Pressable,
-  Text,
-  View,
-  Platform,
-} from 'react-native';
-
-const PrimitiveIcon = React.forwardRef(
-  (
-    { height, width, fill = 'none', color, size, as: AsComp, ...props }: any,
-    ref?: any
-  ) => {
-    const sizeProps = useMemo(() => {
-      return size ? { size } : { height, width };
-    }, [size, height, width]);
-
-    if (AsComp) {
-      return (
-        <AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps} />
-      );
-    }
-    return (
-      <Svg
-        ref={ref}
-        height={height}
-        width={width}
-        fill={fill}
-        color={color}
-        {...props}
-      />
-    );
-  }
-);
+const SCOPE = "BUTTON";
 
-const SCOPE = 'BUTTON';
-const Root =
-  Platform.OS === 'web'
-    ? withStyleContext(Pressable, SCOPE)
-    : withStyleContextAndStates(Pressable, SCOPE);
+const Root = withStyleContext(Pressable, SCOPE);
 
 const UIButton = createButton({
   Root: Root,
   Text,
   Group: View,
   Spinner: ActivityIndicator,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
 });
 
-cssInterop(UIButton, { className: 'style' });
-cssInterop(UIButton.Text, { className: 'style' });
-cssInterop(UIButton.Group, { className: 'style' });
-cssInterop(UIButton.Spinner, { className: 'style' });
-cssInterop(UIButton.Icon, {
+cssInterop(PrimitiveIcon, {
   className: {
-    target: 'style',
+    target: "style",
     nativeStyleToProp: {
-      height: 'height',
-      width: 'width',
-      //@ts-ignore
-      fill: 'fill',
-      color: 'color',
+      height: true,
+      width: true,
+      fill: true,
+      color: "classNameColor",
+      stroke: true,
     },
   },
 });
 
 const buttonStyle = tva({
-  base: 'group/button rounded bg-primary-500 flex-row items-center justify-center data-[focus-visible=true]:web:outline-none data-[focus-visible=true]:web:ring-2 data-[disabled=true]:opacity-40',
+  base: "group/button rounded bg-primary-500 flex-row items-center justify-center data-[focus-visible=true]:web:outline-none data-[focus-visible=true]:web:ring-2 data-[disabled=true]:opacity-40 gap-2",
   variants: {
     action: {
       primary:
-        'bg-primary-500 hover:bg-primary-600 active:bg-primary-700  border-primary-300 hover:border-primary-400 active:border-primary-500 data-[focus-visible=true]:web:ring-primary-300',
+        "bg-primary-500 data-[hover=true]:bg-primary-600 data-[active=true]:bg-primary-700 border-primary-300 data-[hover=true]:border-primary-400 data-[active=true]:border-primary-500 data-[focus-visible=true]:web:ring-indicator-info",
       secondary:
-        'bg-secondary-500 border-secondary-300 hover:bg-secondary-600 hover:border-secondary-400 active:bg-secondary-700 active:border-secondary-500 data-[focus-visible=true]:web:ring-secondary-300',
+        "bg-secondary-500 border-secondary-300 data-[hover=true]:bg-secondary-600 data-[hover=true]:border-secondary-400 data-[active=true]:bg-secondary-700 data-[active=true]:border-secondary-700 data-[focus-visible=true]:web:ring-indicator-info",
       positive:
-        'bg-success-500 border-success-300 hover:bg-success-600 hover:border-success-400 active:bg-success-700 active:border-success-500 data-[focus-visible=true]:web:ring-success-300',
+        "bg-success-500 border-success-300 data-[hover=true]:bg-success-600 data-[hover=true]:border-success-400 data-[active=true]:bg-success-700 data-[active=true]:border-success-500 data-[focus-visible=true]:web:ring-indicator-info",
       negative:
-        'bg-error-500 border-error-300 hover:bg-error-600 hover:border-error-400 active:bg-error-700 active:border-error-500 data-[focus-visible=true]:web:ring-error-300',
-      default: 'bg-transparent hover:bg-background-50 active:bg-transparent',
+        "bg-error-500 border-error-300 data-[hover=true]:bg-error-600 data-[hover=true]:border-error-400 data-[active=true]:bg-error-700 data-[active=true]:border-error-500 data-[focus-visible=true]:web:ring-indicator-info",
+      default:
+        "bg-transparent data-[hover=true]:bg-background-50 data-[active=true]:bg-transparent",
     },
     variant: {
-      link: 'px-0',
+      link: "px-0",
       outline:
-        'bg-transparent border hover:bg-background-50 active:bg-transparent',
-      solid: '',
+        "bg-transparent border data-[hover=true]:bg-background-50 data-[active=true]:bg-transparent",
+      solid: "",
     },
 
     size: {
-      xs: 'px-3.5 h-8',
-      sm: 'px-4 h-9',
-      md: 'px-5 h-10',
-      lg: 'px-6 h-11',
+      xs: "px-3.5 h-8",
+      sm: "px-4 h-9",
+      md: "px-5 h-10",
+      lg: "px-6 h-11",
+      xl: "px-7 h-12",
     },
   },
   compoundVariants: [
     {
-      action: 'primary',
-      variant: 'link',
-      class: 'px-0 bg-transparent hover:bg-transparent active:bg-transparent',
+      action: "primary",
+      variant: "link",
+      class:
+        "px-0 bg-transparent data-[hover=true]:bg-transparent data-[active=true]:bg-transparent",
     },
     {
-      action: 'secondary',
-      variant: 'link',
-      class: 'px-0 bg-transparent hover:bg-transparent active:bg-transparent',
+      action: "secondary",
+      variant: "link",
+      class:
+        "px-0 bg-transparent data-[hover=true]:bg-transparent data-[active=true]:bg-transparent",
     },
     {
-      action: 'positive',
-      variant: 'link',
-      class: 'px-0 bg-transparent hover:bg-transparent active:bg-transparent',
+      action: "positive",
+      variant: "link",
+      class:
+        "px-0 bg-transparent data-[hover=true]:bg-transparent data-[active=true]:bg-transparent",
     },
     {
-      action: 'negative',
-      variant: 'link',
-      class: 'px-0 bg-transparent hover:bg-transparent active:bg-transparent',
+      action: "negative",
+      variant: "link",
+      class:
+        "px-0 bg-transparent data-[hover=true]:bg-transparent data-[active=true]:bg-transparent",
     },
     {
-      action: 'primary',
-      variant: 'outline',
-      class: 'bg-transparent hover:bg-background-50 active:bg-transparent',
+      action: "primary",
+      variant: "outline",
+      class:
+        "bg-transparent data-[hover=true]:bg-background-50 data-[active=true]:bg-transparent",
     },
     {
-      action: 'secondary',
-      variant: 'outline',
-      class: 'bg-transparent hover:bg-background-50 active:bg-transparent',
+      action: "secondary",
+      variant: "outline",
+      class:
+        "bg-transparent data-[hover=true]:bg-background-50 data-[active=true]:bg-transparent",
     },
     {
-      action: 'positive',
-      variant: 'outline',
-      class: 'bg-transparent hover:bg-background-50 active:bg-transparent',
+      action: "positive",
+      variant: "outline",
+      class:
+        "bg-transparent data-[hover=true]:bg-background-50 data-[active=true]:bg-transparent",
     },
     {
-      action: 'negative',
-      variant: 'outline',
-      class: 'bg-transparent hover:bg-background-50 active:bg-transparent',
+      action: "negative",
+      variant: "outline",
+      class:
+        "bg-transparent data-[hover=true]:bg-background-50 data-[active=true]:bg-transparent",
     },
   ],
 });
 
 const buttonTextStyle = tva({
-  base: 'text-typography-0 font-semibold web:select-none',
+  base: "text-typography-0 font-semibold web:select-none",
   parentVariants: {
     action: {
       primary:
-        'text-primary-600 group-hover/button:text-primary-600 group-active/button:text-primary-700',
+        "text-primary-600 data-[hover=true]:text-primary-600 data-[active=true]:text-primary-700",
       secondary:
-        'text-secondary-600 group-hover/button:text-secondary-600 group-active/button:text-secondary-700',
+        "text-typography-500 data-[hover=true]:text-typography-600 data-[active=true]:text-typography-700",
       positive:
-        'text-success-600 group-hover/button:text-success-600 group-active/button:text-success-700',
+        "text-success-600 data-[hover=true]:text-success-600 data-[active=true]:text-success-700",
       negative:
-        'text-error-600 group-hover/button:text-error-600 group-active/button:text-error-700',
+        "text-error-600 data-[hover=true]:text-error-600 data-[active=true]:text-error-700",
     },
     variant: {
-      link: 'group-hover/button:underline group-active/button:underline',
-      outline: '',
+      link: "data-[hover=true]:underline data-[active=true]:underline",
+      outline: "",
       solid:
-        'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
     },
     size: {
-      xs: 'text-xs',
-      sm: 'text-sm',
-      md: 'text-base',
-      lg: 'text-lg',
+      xs: "text-xs",
+      sm: "text-sm",
+      md: "text-base",
+      lg: "text-lg",
+      xl: "text-xl",
     },
   },
   parentCompoundVariants: [
     {
-      variant: 'solid',
-      action: 'primary',
+      variant: "solid",
+      action: "primary",
+      class:
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
+    },
+    {
+      variant: "solid",
+      action: "secondary",
       class:
-        'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
+        "text-typography-800 data-[hover=true]:text-typography-800 data-[active=true]:text-typography-800",
     },
     {
-      variant: 'solid',
-      action: 'secondary',
+      variant: "solid",
+      action: "positive",
       class:
-        'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
     },
     {
-      variant: 'solid',
-      action: 'positive',
+      variant: "solid",
+      action: "negative",
       class:
-        'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
     },
     {
-      variant: 'solid',
-      action: 'negative',
+      variant: "outline",
+      action: "primary",
       class:
-        'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
+        "text-primary-500 data-[hover=true]:text-primary-500 data-[active=true]:text-primary-500",
+    },
+    {
+      variant: "outline",
+      action: "secondary",
+      class:
+        "text-typography-500 data-[hover=true]:text-primary-600 data-[active=true]:text-typography-700",
+    },
+    {
+      variant: "outline",
+      action: "positive",
+      class:
+        "text-primary-500 data-[hover=true]:text-primary-500 data-[active=true]:text-primary-500",
+    },
+    {
+      variant: "outline",
+      action: "negative",
+      class:
+        "text-primary-500 data-[hover=true]:text-primary-500 data-[active=true]:text-primary-500",
     },
   ],
 });
 
 const buttonIconStyle = tva({
+  base: "fill-none",
   parentVariants: {
     variant: {
-      link: 'group-hover/button:underline group-active/button:underline',
-      outline: '',
-      solid: '',
+      link: "data-[hover=true]:underline data-[active=true]:underline",
+      outline: "",
+      solid:
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
     },
     size: {
-      '2xs': 'h-3 w-3',
-      'xs': 'h-3.5 w-3.5',
-      'sm': 'h-4 w-4',
-      'md': 'h-[18px] w-[18px]',
-      'lg': 'h-5 w-5',
-      'xl': 'h-6 w-6',
+      xs: "h-3.5 w-3.5",
+      sm: "h-4 w-4",
+      md: "h-[18px] w-[18px]",
+      lg: "h-[18px] w-[18px]",
+      xl: "h-5 w-5",
+    },
+    action: {
+      primary:
+        "text-primary-600 data-[hover=true]:text-primary-600 data-[active=true]:text-primary-700",
+      secondary:
+        "text-typography-500 data-[hover=true]:text-typography-600 data-[active=true]:text-typography-700",
+      positive:
+        "text-success-600 data-[hover=true]:text-success-600 data-[active=true]:text-success-700",
+
+      negative:
+        "text-error-600 data-[hover=true]:text-error-600 data-[active=true]:text-error-700",
     },
   },
+  parentCompoundVariants: [
+    {
+      variant: "solid",
+      action: "primary",
+      class:
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
+    },
+    {
+      variant: "solid",
+      action: "secondary",
+      class:
+        "text-typography-800 data-[hover=true]:text-typography-800 data-[active=true]:text-typography-800",
+    },
+    {
+      variant: "solid",
+      action: "positive",
+      class:
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
+    },
+    {
+      variant: "solid",
+      action: "negative",
+      class:
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
+    },
+  ],
 });
 
 const buttonGroupStyle = tva({
-  base: '',
+  base: "",
   variants: {
     space: {
-      'xs': 'gap-1',
-      'sm': 'gap-2',
-      'md': 'gap-3',
-      'lg': 'gap-4',
-      'xl': 'gap-5',
-      '2xl': 'gap-6',
-      '3xl': 'gap-7',
-      '4xl': 'gap-8',
+      xs: "gap-1",
+      sm: "gap-2",
+      md: "gap-3",
+      lg: "gap-4",
+      xl: "gap-5",
+      "2xl": "gap-6",
+      "3xl": "gap-7",
+      "4xl": "gap-8",
     },
     isAttached: {
-      true: 'gap-0',
+      true: "gap-0",
+    },
+    flexDirection: {
+      row: "flex-row",
+      column: "flex-col",
+      "row-reverse": "flex-row-reverse",
+      "column-reverse": "flex-col-reverse",
     },
   },
 });
 
-type IButtonProps = Omit<React.ComponentProps<typeof UIButton>, 'context'> &
-  VariantProps<typeof buttonStyle>;
-const Button = React.forwardRef(
+type IButtonProps = Omit<
+  React.ComponentPropsWithoutRef<typeof UIButton>,
+  "context"
+> &
+  VariantProps<typeof buttonStyle> & { className?: string };
+
+const Button = React.forwardRef<
+  React.ElementRef<typeof UIButton>,
+  IButtonProps
+>(
   (
-    {
-      className,
-      variant = 'solid',
-      size = 'md',
-      action = 'primary',
-      ...props
-    }: { className?: string } & IButtonProps,
-    ref?: any
+    { className, variant = "solid", size = "md", action = "primary", ...props },
+    ref
   ) => {
     return (
       <UIButton
@@ -264,147 +303,121 @@ const Button = React.forwardRef(
   }
 );
 
-type IButtonTextProps = React.ComponentProps<typeof UIButton.Text> &
-  VariantProps<typeof buttonTextStyle>;
-const ButtonText = React.forwardRef(
-  (
-    {
-      className,
-      variant,
-      size,
-      action,
-      ...props
-    }: { className?: string } & IButtonTextProps,
-    ref?: any
-  ) => {
-    const {
-      variant: parentVariant,
-      size: parentSize,
-      action: parentAction,
-    } = useStyleContext(SCOPE);
+type IButtonTextProps = React.ComponentPropsWithoutRef<typeof UIButton.Text> &
+  VariantProps<typeof buttonTextStyle> & { className?: string };
 
-    return (
-      <UIButton.Text
-        ref={ref}
-        {...props}
-        // @ts-ignore
-        className={buttonTextStyle({
-          parentVariants: {
-            variant: parentVariant,
-            size: parentSize,
-            action: parentAction,
-          },
-          variant,
-          size,
-          action,
-          class: className,
-        })}
-      />
-    );
-  }
-);
+const ButtonText = React.forwardRef<
+  React.ElementRef<typeof UIButton.Text>,
+  IButtonTextProps
+>(({ className, variant, size, action, ...props }, ref) => {
+  const {
+    variant: parentVariant,
+    size: parentSize,
+    action: parentAction,
+  } = useStyleContext(SCOPE);
+
+  return (
+    <UIButton.Text
+      ref={ref}
+      {...props}
+      className={buttonTextStyle({
+        parentVariants: {
+          variant: parentVariant,
+          size: parentSize,
+          action: parentAction,
+        },
+        variant,
+        size,
+        action,
+        class: className,
+      })}
+    />
+  );
+});
 
 const ButtonSpinner = UIButton.Spinner;
 
-interface DefaultColors {
-  primary: string;
-  secondary: string;
-  positive: string;
-  negative: string;
-}
-const defaultColors: DefaultColors = {
-  primary: '#292929',
-  secondary: '#515252',
-  positive: '#2A7948',
-  negative: '#DC2626',
-};
-type IButtonIcon = React.ComponentProps<typeof UIButton.Icon> &
-  VariantProps<typeof buttonIconStyle>;
-const ButtonIcon = React.forwardRef(
-  (
-    {
-      className,
-      size,
-      ...props
-    }: IButtonIcon & {
-      className?: any;
-      fill?: string;
-      color?: string;
-      as?: any;
-    },
-    ref?: any
-  ) => {
-    const {
-      variant: parentVariant,
-      size: parentSize,
-      action: parentAction,
-    } = useStyleContext(SCOPE);
+type IButtonIcon = React.ComponentPropsWithoutRef<typeof UIButton.Icon> &
+  VariantProps<typeof buttonIconStyle> & {
+    className?: string | undefined;
+    as?: React.ElementType;
+    height?: number;
+    width?: number;
+  };
 
-    let localColor;
-    if (parentVariant !== 'solid') {
-      localColor = defaultColors[parentAction as keyof DefaultColors];
-    } else {
-      localColor = 'gray';
-    }
-    const { color = localColor } = props;
+const ButtonIcon = React.forwardRef<
+  React.ElementRef<typeof UIButton.Icon>,
+  IButtonIcon
+>(({ className, size, ...props }, ref) => {
+  const {
+    variant: parentVariant,
+    size: parentSize,
+    action: parentAction,
+  } = useStyleContext(SCOPE);
 
-    if (typeof size === 'number') {
-      return (
-        <UIButton.Icon
-          ref={ref}
-          {...props}
-          color={color}
-          className={buttonIconStyle({ class: className })}
-          size={size}
-        />
-      );
-    } else if (
-      (props.height !== undefined || props.width !== undefined) &&
-      size === undefined
-    ) {
-      return (
-        <UIButton.Icon
-          ref={ref}
-          {...props}
-          color={color}
-          className={buttonIconStyle({ class: className })}
-        />
-      );
-    }
+  if (typeof size === "number") {
     return (
       <UIButton.Icon
+        ref={ref}
         {...props}
-        //@ts-ignore
-        className={buttonIconStyle({
-          parentVariants: {
-            size: parentSize,
-            variant: parentVariant,
-          },
-          size,
-          class: className,
-        })}
-        color={color}
+        className={buttonIconStyle({ class: className })}
+        size={size}
+      />
+    );
+  } else if (
+    (props?.height !== undefined || props?.width !== undefined) &&
+    size === undefined
+  ) {
+    return (
+      <UIButton.Icon
         ref={ref}
+        {...props}
+        className={buttonIconStyle({ class: className })}
       />
     );
   }
-);
+  return (
+    <UIButton.Icon
+      {...props}
+      className={buttonIconStyle({
+        parentVariants: {
+          size: parentSize,
+          variant: parentVariant,
+          action: parentAction,
+        },
+        size,
+        class: className,
+      })}
+      ref={ref}
+    />
+  );
+});
 
-type IButtonGroupProps = React.ComponentProps<typeof UIButton.Group> &
+type IButtonGroupProps = React.ComponentPropsWithoutRef<typeof UIButton.Group> &
   VariantProps<typeof buttonGroupStyle>;
-const ButtonGroup = React.forwardRef(
+
+const ButtonGroup = React.forwardRef<
+  React.ElementRef<typeof UIButton.Group>,
+  IButtonGroupProps
+>(
   (
     {
       className,
-      space = 'md',
+      space = "md",
       isAttached = false,
+      flexDirection = "column",
       ...props
-    }: { className?: string } & IButtonGroupProps,
-    ref?: any
+    },
+    ref
   ) => {
     return (
       <UIButton.Group
-        className={buttonGroupStyle({ class: className, space, isAttached })}
+        className={buttonGroupStyle({
+          class: className,
+          space,
+          isAttached,
+          flexDirection,
+        })}
         {...props}
         ref={ref}
       />
@@ -412,10 +425,10 @@ const ButtonGroup = React.forwardRef(
   }
 );
 
-Button.displayName = 'Button';
-ButtonText.displayName = 'ButtonText';
-ButtonSpinner.displayName = 'ButtonSpinner';
-ButtonIcon.displayName = 'ButtonIcon';
-ButtonGroup.displayName = 'ButtonGroup';
+Button.displayName = "Button";
+ButtonText.displayName = "ButtonText";
+ButtonSpinner.displayName = "ButtonSpinner";
+ButtonIcon.displayName = "ButtonIcon";
+ButtonGroup.displayName = "ButtonGroup";
 
 export { Button, ButtonText, ButtonSpinner, ButtonIcon, ButtonGroup };
diff --git a/next/components/ui/checkbox/index.tsx b/next/components/ui/checkbox/index.tsx
index aaaa8f01..4e85cace 100644
--- a/next/components/ui/checkbox/index.tsx
+++ b/next/components/ui/checkbox/index.tsx
@@ -1,19 +1,16 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createCheckbox } from '@gluestack-ui/checkbox';
-import { View, Pressable, Text } from 'react-native';
+import { View, Pressable, Text, Platform } from 'react-native';
 import type { TextProps, ViewProps } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { Svg } from 'react-native-svg';
+import { PrimitiveIcon, IPrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { Platform } from 'react-native';
 
 const IndicatorWrapper = React.forwardRef<
   React.ElementRef<typeof View>,
@@ -28,81 +25,34 @@ const LabelWrapper = React.forwardRef<React.ElementRef<typeof Text>, TextProps>(
   }
 );
 
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
 const IconWrapper = React.forwardRef<
   React.ElementRef<typeof PrimitiveIcon>,
   IPrimitiveIcon
 >(({ ...props }, ref) => {
-  return <PrimitiveIcon {...props} ref={ref} />;
-});
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
+  return <UIIcon {...props} ref={ref} />;
 });
 
 const SCOPE = 'CHECKBOX';
 const UICheckbox = createCheckbox({
-  // @ts-ignore
+  // @ts-expect-error
   Root:
     Platform.OS === 'web'
       ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(Pressable, SCOPE),
-  Group: Platform.OS === 'web' ? View : withStates(View),
-  Icon: Platform.OS === 'web' ? IconWrapper : withStates(IconWrapper),
-  Label: Platform.OS === 'web' ? LabelWrapper : withStates(LabelWrapper),
-  Indicator:
-    Platform.OS === 'web' ? IndicatorWrapper : withStates(IndicatorWrapper),
+      : withStyleContext(Pressable, SCOPE),
+  Group: View,
+  Icon: IconWrapper,
+  Label: LabelWrapper,
+  Indicator: IndicatorWrapper,
 });
 
-cssInterop(UICheckbox, { className: 'style' });
-cssInterop(UICheckbox.Group, { className: 'style' });
-cssInterop(LabelWrapper, { className: 'style' });
-cssInterop(IndicatorWrapper, { className: 'style' });
-cssInterop(IconWrapper, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
diff --git a/next/components/ui/divider/index.tsx b/next/components/ui/divider/index.tsx
index 61404a4b..e9b663a6 100644
--- a/next/components/ui/divider/index.tsx
+++ b/next/components/ui/divider/index.tsx
@@ -1,9 +1,7 @@
 'use client';
 import React from 'react';
-import { createDivider } from '@gluestack-ui/divider';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { View } from 'react-native';
-import { cssInterop } from 'nativewind';
+import { Platform, View } from 'react-native';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 const dividerStyle = tva({
@@ -16,21 +14,19 @@ const dividerStyle = tva({
   },
 });
 
-const UIDivider = createDivider({ Root: View });
-
-cssInterop(UIDivider, { className: 'style' });
-
-type IUIDividerProps = React.ComponentPropsWithoutRef<typeof UIDivider> &
+type IUIDividerProps = React.ComponentPropsWithoutRef<typeof View> &
   VariantProps<typeof dividerStyle>;
 
 const Divider = React.forwardRef<
-  React.ElementRef<typeof UIDivider>,
+  React.ElementRef<typeof View>,
   IUIDividerProps
 >(({ className, orientation = 'horizontal', ...props }, ref) => {
   return (
-    <UIDivider
+    <View
       ref={ref}
       {...props}
+      aria-orientation={orientation}
+      role={Platform.OS === 'web' ? 'separator' : undefined}
       className={dividerStyle({
         orientation,
         class: className,
diff --git a/next/components/ui/drawer/index.tsx b/next/components/ui/drawer/index.tsx
new file mode 100644
index 00000000..9172862b
--- /dev/null
+++ b/next/components/ui/drawer/index.tsx
@@ -0,0 +1,336 @@
+'use client';
+import React from 'react';
+import { createModal as createDrawer } from '@gluestack-ui/modal';
+import { Pressable, View, ScrollView, Dimensions } from 'react-native';
+import {
+  Motion,
+  AnimatePresence,
+  createMotionAnimatedComponent,
+} from '@legendapp/motion';
+import { tva } from '@gluestack-ui/nativewind-utils/tva';
+import {
+  withStyleContext,
+  useStyleContext,
+} from '@gluestack-ui/nativewind-utils/withStyleContext';
+import { cssInterop } from 'nativewind';
+import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+
+const AnimatedPressable = createMotionAnimatedComponent(Pressable);
+const SCOPE = 'MODAL';
+const screenWidth = Dimensions.get('window').width;
+const screenHeight = Dimensions.get('window').height;
+const sizes: { [key: string]: number } = {
+  sm: 0.25,
+  md: 0.5,
+  lg: 0.75,
+  full: 1,
+};
+
+const UIDrawer = createDrawer({
+  Root: withStyleContext(View, SCOPE),
+  Backdrop: AnimatedPressable,
+  Content: Motion.View,
+  Body: ScrollView,
+  CloseButton: Pressable,
+  Footer: View,
+  Header: View,
+  AnimatePresence: AnimatePresence,
+});
+
+cssInterop(AnimatedPressable, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
+
+const drawerStyle = tva({
+  base: 'w-full h-full web:pointer-events-none relative',
+  variants: {
+    size: {
+      sm: '',
+      md: '',
+      lg: '',
+      full: '',
+    },
+    anchor: {
+      left: 'items-start',
+      right: 'items-end',
+      top: 'justify-start',
+      bottom: 'justify-end',
+    },
+  },
+});
+
+const drawerBackdropStyle = tva({
+  base: 'absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default',
+});
+
+const drawerContentStyle = tva({
+  base: 'bg-background-0 overflow-scroll border-outline-100 p-6 absolute',
+  parentVariants: {
+    size: {
+      sm: 'w-1/4',
+      md: 'w-1/2',
+      lg: 'w-3/4',
+      full: 'w-full',
+    },
+    anchor: {
+      left: 'h-full border-r',
+      right: 'h-full border-l',
+      top: 'w-full border-b',
+      bottom: 'w-full border-t',
+    },
+  },
+  parentCompoundVariants: [
+    {
+      anchor: 'top',
+      size: 'sm',
+      class: 'h-1/4',
+    },
+    {
+      anchor: 'top',
+      size: 'md',
+      class: 'h-1/2',
+    },
+    {
+      anchor: 'top',
+      size: 'lg',
+      class: 'h-3/4',
+    },
+    {
+      anchor: 'top',
+      size: 'full',
+      class: 'h-full',
+    },
+    {
+      anchor: 'bottom',
+      size: 'sm',
+      class: 'h-1/4',
+    },
+    {
+      anchor: 'bottom',
+      size: 'md',
+      class: 'h-1/2',
+    },
+    {
+      anchor: 'bottom',
+      size: 'lg',
+      class: 'h-3/4',
+    },
+    {
+      anchor: 'bottom',
+      size: 'full',
+      class: 'h-full',
+    },
+  ],
+});
+
+const drawerCloseButtonStyle = tva({
+  base: 'z-10 rounded data-[focus-visible=true]:web:bg-background-100 web:outline-0 cursor-pointer',
+});
+
+const drawerHeaderStyle = tva({
+  base: 'justify-between items-center flex-row',
+});
+
+const drawerBodyStyle = tva({
+  base: 'mt-4 mb-6 shrink-0',
+});
+
+const drawerFooterStyle = tva({
+  base: 'flex-row justify-end items-center',
+});
+
+type IDrawerProps = React.ComponentProps<typeof UIDrawer> &
+  VariantProps<typeof drawerStyle> & { className?: string };
+
+type IDrawerBackdropProps = React.ComponentProps<typeof UIDrawer.Backdrop> &
+  VariantProps<typeof drawerBackdropStyle> & { className?: string };
+
+type IDrawerContentProps = React.ComponentProps<typeof UIDrawer.Content> &
+  VariantProps<typeof drawerContentStyle> & { className?: string };
+
+type IDrawerHeaderProps = React.ComponentProps<typeof UIDrawer.Header> &
+  VariantProps<typeof drawerHeaderStyle> & { className?: string };
+
+type IDrawerBodyProps = React.ComponentProps<typeof UIDrawer.Body> &
+  VariantProps<typeof drawerBodyStyle> & { className?: string };
+
+type IDrawerFooterProps = React.ComponentProps<typeof UIDrawer.Footer> &
+  VariantProps<typeof drawerFooterStyle> & { className?: string };
+
+type IDrawerCloseButtonProps = React.ComponentProps<
+  typeof UIDrawer.CloseButton
+> &
+  VariantProps<typeof drawerCloseButtonStyle> & { className?: string };
+
+const Drawer = React.forwardRef<
+  React.ElementRef<typeof UIDrawer>,
+  IDrawerProps
+>(({ className, size = 'sm', anchor = 'left', ...props }, ref) => {
+  return (
+    <UIDrawer
+      ref={ref}
+      {...props}
+      pointerEvents="box-none"
+      className={drawerStyle({ size, anchor, class: className })}
+      context={{ size, anchor }}
+    />
+  );
+});
+
+const DrawerBackdrop = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Backdrop>,
+  IDrawerBackdropProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.Backdrop
+      ref={ref}
+      initial={{
+        opacity: 0,
+      }}
+      animate={{
+        opacity: 0.5,
+      }}
+      exit={{
+        opacity: 0,
+      }}
+      transition={{
+        type: 'spring',
+        damping: 18,
+        stiffness: 250,
+        opacity: {
+          type: 'timing',
+          duration: 250,
+        },
+      }}
+      {...props}
+      className={drawerBackdropStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+const DrawerContent = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Content>,
+  IDrawerContentProps
+>(({ className, ...props }, ref) => {
+  const { size: parentSize, anchor: parentAnchor } = useStyleContext(SCOPE);
+
+  const drawerHeight = screenHeight * (sizes[parentSize] || sizes.md);
+  const drawerWidth = screenWidth * (sizes[parentSize] || sizes.md);
+
+  const isHorizontal = parentAnchor === 'left' || parentAnchor === 'right';
+
+  const initialObj = isHorizontal
+    ? { x: parentAnchor === 'left' ? -drawerWidth : drawerWidth }
+    : { y: parentAnchor === 'top' ? -drawerHeight : drawerHeight };
+
+  const animateObj = isHorizontal ? { x: 0 } : { y: 0 };
+
+  const exitObj = isHorizontal
+    ? { x: parentAnchor === 'left' ? -drawerWidth : drawerWidth }
+    : { y: parentAnchor === 'top' ? -drawerHeight : drawerHeight };
+
+  const customClass = isHorizontal
+    ? `top-0 ${parentAnchor === 'left' ? 'left-0' : 'right-0'}`
+    : `left-0 ${parentAnchor === 'top' ? 'top-0' : 'bottom-0'}`;
+
+  return (
+    <UIDrawer.Content
+      ref={ref}
+      initial={initialObj}
+      animate={animateObj}
+      exit={exitObj}
+      transition={{
+        type: 'timing',
+        duration: 300,
+      }}
+      {...props}
+      className={drawerContentStyle({
+        parentVariants: {
+          size: parentSize,
+          anchor: parentAnchor,
+        },
+        class: `${className} ${customClass}`,
+      })}
+      pointerEvents="auto"
+    />
+  );
+});
+
+const DrawerHeader = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Header>,
+  IDrawerHeaderProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.Header
+      ref={ref}
+      {...props}
+      className={drawerHeaderStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+const DrawerBody = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Body>,
+  IDrawerBodyProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.Body
+      ref={ref}
+      {...props}
+      className={drawerBodyStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+const DrawerFooter = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Footer>,
+  IDrawerFooterProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.Footer
+      ref={ref}
+      {...props}
+      className={drawerFooterStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+const DrawerCloseButton = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.CloseButton>,
+  IDrawerCloseButtonProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.CloseButton
+      ref={ref}
+      {...props}
+      className={drawerCloseButtonStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+Drawer.displayName = 'Drawer';
+DrawerBackdrop.displayName = 'DrawerBackdrop';
+DrawerContent.displayName = 'DrawerContent';
+DrawerHeader.displayName = 'DrawerHeader';
+DrawerBody.displayName = 'DrawerBody';
+DrawerFooter.displayName = 'DrawerFooter';
+DrawerCloseButton.displayName = 'DrawerCloseButton';
+
+export {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerCloseButton,
+  DrawerHeader,
+  DrawerBody,
+  DrawerFooter,
+};
diff --git a/next/components/ui/fab/index.tsx b/next/components/ui/fab/index.tsx
index f1544824..98840f89 100644
--- a/next/components/ui/fab/index.tsx
+++ b/next/components/ui/fab/index.tsx
@@ -1,80 +1,32 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createFab } from '@gluestack-ui/fab';
-import { Platform, Text } from 'react-native';
-import { Pressable } from 'react-native';
-import { Svg } from 'react-native-svg';
+import { Pressable, Text } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'FAB';
+const Root = withStyleContext(Pressable, SCOPE);
 const UIFab = createFab({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(Pressable, SCOPE)
-      : withStyleContextAndStates(Pressable, SCOPE),
+  Root: Root,
   Label: Text,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
 });
 
-cssInterop(UIFab, { className: 'style' });
-cssInterop(UIFab.Label, { className: 'style' });
-cssInterop(UIFab.Icon, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
@@ -147,7 +99,7 @@ const fabLabelStyle = tva({
 });
 
 const fabIconStyle = tva({
-  base: 'text-typography-50 hover:text-typography-0 active:text-typography-0 fill-none',
+  base: 'text-typography-50 fill-none',
   variants: {
     size: {
       '2xs': 'h-3 w-3',
diff --git a/next/components/ui/form-control/index.tsx b/next/components/ui/form-control/index.tsx
index fcdf8cc1..895b207a 100644
--- a/next/components/ui/form-control/index.tsx
+++ b/next/components/ui/form-control/index.tsx
@@ -1,7 +1,6 @@
 'use client';
 import { Text, View } from 'react-native';
-import React, { useMemo } from 'react';
-import { Svg } from 'react-native-svg';
+import React from 'react';
 import { createFormControl } from '@gluestack-ui/form-control';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
@@ -10,50 +9,10 @@ import {
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'FORM_CONTROL';
 
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
-
 const formControlStyle = tva({
   base: 'flex flex-col',
   variants: {
@@ -278,7 +237,7 @@ export const UIFormControl = createFormControl({
   Root: withStyleContext(View, SCOPE),
   Error: View,
   ErrorText: Text,
-  ErrorIcon: PrimitiveIcon,
+  ErrorIcon: UIIcon,
   Label: View,
   LabelText: Text,
   LabelAstrick: FormControlLabelAstrick,
@@ -286,20 +245,12 @@ export const UIFormControl = createFormControl({
   HelperText: Text,
 });
 
-cssInterop(UIFormControl, { className: 'style' });
-cssInterop(UIFormControl.Error, { className: 'style' });
-cssInterop(UIFormControl.Error.Text, { className: 'style' });
-cssInterop(UIFormControl.Label, { className: 'style' });
-cssInterop(UIFormControl.Label.Text, { className: 'style' });
-cssInterop(UIFormControl.Helper, { className: 'style' });
-cssInterop(UIFormControl.Helper.Text, { className: 'style' });
-cssInterop(UIFormControl.Error.Icon, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
       color: true,
       stroke: true,
diff --git a/next/components/ui/gluestack-ui-provider/config.js b/next/components/ui/gluestack-ui-provider/config.js
deleted file mode 100644
index 0a06501d..00000000
--- a/next/components/ui/gluestack-ui-provider/config.js
+++ /dev/null
@@ -1,304 +0,0 @@
-"use client";
-import { vars } from "nativewind";
-export const config = {
-    light: vars({
-        "--color-primary-0": "#B3B3B3",
-        "--color-primary-50": "#999999",
-        "--color-primary-100": "#808080",
-        "--color-primary-200": "#737373",
-        "--color-primary-300": "#666666",
-        "--color-primary-400": "#525252",
-        "--color-primary-500": "#333333",
-        "--color-primary-600": "#292929",
-        "--color-primary-700": "#1F1F1F",
-        "--color-primary-800": "#0D0D0D",
-        "--color-primary-900": "#0A0A0A",
-        "--color-primary-950": "#080808",
-        /* Secondary  */
-        "--color-secondary-0": "#FEFFFF",
-        "--color-secondary-50": "#F1F2F2",
-        "--color-secondary-100": "#E7E8E8",
-        "--color-secondary-200": "#DBDBDB",
-        "--color-secondary-300": "#AFB0B0",
-        "--color-secondary-400": "#727373",
-        "--color-secondary-500": "#5E5F5F",
-        "--color-secondary-600": "#515252",
-        "--color-secondary-700": "#3F4040",
-        "--color-secondary-800": "#272626",
-        "--color-secondary-900": "#181717",
-        "--color-secondary-950": "#0B0C0C",
-        /* Tertiary */
-        "--color-tertiary-0": "#FFFAF5",
-        "--color-tertiary-50": "#FFF2E5",
-        "--color-tertiary-100": "#FFE9D5",
-        "--color-tertiary-200": "#FED1AA",
-        "--color-tertiary-300": "#FDB474",
-        "--color-tertiary-400": "#FB9D4B",
-        "--color-tertiary-500": "#E78128",
-        "--color-tertiary-600": "#D7751F",
-        "--color-tertiary-700": "#B4621A",
-        "--color-tertiary-800": "#824917",
-        "--color-tertiary-900": "#6C3D13",
-        "--color-tertiary-950": "#543112",
-        /* Error */
-        "--color-error-0": "#FEE9E9",
-        "--color-error-50": "#FEE2E2",
-        "--color-error-100": "#FECACA",
-        "--color-error-200": "#FCA5A5",
-        "--color-error-300": "#F87171",
-        "--color-error-400": "#EF4444",
-        "--color-error-500": "#E63535",
-        "--color-error-600": "#DC2626",
-        "--color-error-700": "#B91C1C",
-        "--color-error-800": "#991B1B",
-        "--color-error-900": "#7F1D1D",
-        "--color-error-950": "#531313",
-        /* Success */
-        "--color-success-0": "#E4FFF4",
-        "--color-success-50": "#CAFFE8",
-        "--color-success-100": "#A2F1C0",
-        "--color-success-200": "#84D3A2",
-        "--color-success-300": "#66B584",
-        "--color-success-400": "#489766",
-        "--color-success-500": "#348352",
-        "--color-success-600": "#2A7948",
-        "--color-success-700": "#206F3E",
-        "--color-success-800": "#166534",
-        "--color-success-900": "#14532D",
-        "--color-success-950": "#1B3224",
-        /* Warning */
-        "--color-warning-0": "#FFFDFB",
-        "--color-warning-50": "#FFF9F5",
-        "--color-warning-100": "#FFE7D5",
-        "--color-warning-200": "#FECDAA",
-        "--color-warning-300": "#FDAD74",
-        "--color-warning-400": "#FB954B",
-        "--color-warning-500": "#E77828",
-        "--color-warning-600": "#D76C1F",
-        "--color-warning-700": "#B45A1A",
-        "--color-warning-800": "#824417",
-        "--color-warning-900": "#6C3813",
-        "--color-warning-950": "#542D12",
-        /* Info */
-        "--color-info-0": "#ECF8FE",
-        "--color-info-50": "#C7EBFC",
-        "--color-info-100": "#A2DDFA",
-        "--color-info-200": "#7CCFF8",
-        "--color-info-300": "#57C2F6",
-        "--color-info-400": "#32B4F4",
-        "--color-info-500": "#0DA6F2",
-        "--color-info-600": "#0B8DCD",
-        "--color-info-700": "#0973A8",
-        "--color-info-800": "#075A83",
-        "--color-info-900": "#05405D",
-        "--color-info-950": "#032638",
-        /* Typography */
-        "--color-typography-0": "#FEFEFF",
-        "--color-typography-50": "#F5F5F5",
-        "--color-typography-100": "#E5E5E5",
-        "--color-typography-200": "#DBDBDC",
-        "--color-typography-300": "#D4D4D4",
-        "--color-typography-400": "#A3A3A3",
-        "--color-typography-500": "#8C8C8C",
-        "--color-typography-600": "#737373",
-        "--color-typography-700": "#525252",
-        "--color-typography-800": "#404040",
-        "--color-typography-900": "#262627",
-        "--color-typography-950": "#171717",
-        /* Outline */
-        "--color-outline-0": "#FDFEFE",
-        "--color-outline-50": "#F3F3F3",
-        "--color-outline-100": "#E6E6E6",
-        "--color-outline-200": "#DDDCDB",
-        "--color-outline-300": "#D3D3D3",
-        "--color-outline-400": "#A5A3A3",
-        "--color-outline-500": "#8C8D8D",
-        "--color-outline-600": "#737474",
-        "--color-outline-700": "#535252",
-        "--color-outline-800": "#414141",
-        "--color-outline-900": "#272624",
-        "--color-outline-950": "#1A1717",
-        /* Background */
-        "--color-background-0": "#FFFFFF",
-        "--color-background-50": "#F6F6F6",
-        "--color-background-100": "#F2F1F1",
-        "--color-background-200": "#DCDBDB",
-        "--color-background-300": "#D5D4D4",
-        "--color-background-400": "#A2A3A3",
-        "--color-background-500": "#8E8E8E",
-        "--color-background-600": "#747474",
-        "--color-background-700": "#535252",
-        "--color-background-800": "#414040",
-        "--color-background-900": "#272625",
-        "--color-background-950": "#181718",
-        /* Background Special */
-        "--color-background-error": "#FEF1F1",
-        "--color-background-warning": "#FFF4EB",
-        "--color-background-success": "#EDFCF2",
-        "--color-background-muted": "#F6F6F7",
-        "--color-background-info": "#EBF8FE",
-        /* Border */
-        "--color-border-0": "#FDFEFE",
-        "--color-border-50": "#F3F3F3",
-        "--color-border-100": "#E6E6E6",
-        "--color-border-200": "#DDDCDB",
-        "--color-border-300": "#D3D3D3",
-        "--color-border-400": "#A5A3A3",
-        "--color-border-500": "#8C8D8D",
-        "--color-border-600": "#737474",
-        "--color-border-700": "#535252",
-        "--color-border-800": "#414141",
-        "--color-border-900": "#272624",
-        "--color-border-950": "#1A1717",
-    }),
-    dark: vars({
-        "--color-primary-0": "#828282",
-        "--color-primary-50": "#949494",
-        "--color-primary-100": "#9E9E9E",
-        "--color-primary-200": "#B3B3B3",
-        "--color-primary-300": "#C7C7C7",
-        "--color-primary-400": "#E6E6E6",
-        "--color-primary-500": "#F0F0F0",
-        "--color-primary-600": "#FAFAFA",
-        "--color-primary-700": "#FCFCFC",
-        "--color-primary-800": "#FDFDFD",
-        "--color-primary-900": "#FDFCFC",
-        "--color-primary-950": "#FDFCFC",
-        /* Secondary  */
-        "--color-secondary-0": "#0B0C0C",
-        "--color-secondary-50": "#181717",
-        "--color-secondary-100": "#272626",
-        "--color-secondary-200": "#3F4040",
-        "--color-secondary-300": "#515252",
-        "--color-secondary-400": "#5E5F5F",
-        "--color-secondary-500": "#727373",
-        "--color-secondary-600": "#AFB0B0",
-        "--color-secondary-700": "#DBDBDB",
-        "--color-secondary-800": "#E7E8E8",
-        "--color-secondary-900": "#F1F2F2",
-        "--color-secondary-950": "#FEFFFF",
-        /* Tertiary */
-        "--color-tertiary-0": "#543112",
-        "--color-tertiary-50": "#6C3D13",
-        "--color-tertiary-100": "#824917",
-        "--color-tertiary-200": "#B4621A",
-        "--color-tertiary-300": "#D7751F",
-        "--color-tertiary-400": "#E78128",
-        "--color-tertiary-500": "#FB9D4B",
-        "--color-tertiary-600": "#FDB474",
-        "--color-tertiary-700": "#FED1AA",
-        "--color-tertiary-800": "#FFE9D5",
-        "--color-tertiary-900": "#FFF2E5",
-        "--color-tertiary-950": "#FFFAF5",
-        /* Error */
-        "--color-error-0": "#531313",
-        "--color-error-50": "#7F1D1D",
-        "--color-error-100": "#991B1B",
-        "--color-error-200": "#B91C1C",
-        "--color-error-300": "#DC2626",
-        "--color-error-400": "#E63535",
-        "--color-error-500": "#EF4444",
-        "--color-error-600": "#F87171",
-        "--color-error-700": "#E63534",
-        "--color-error-800": "#FECACA",
-        "--color-error-900": "#FEE2E2",
-        "--color-error-950": "#FEE9E9",
-        /* Success */
-        "--color-success-0": "#1B3224",
-        "--color-success-50": "#14532D",
-        "--color-success-100": "#166534",
-        "--color-success-200": "#206F3E",
-        "--color-success-300": "#2A7948",
-        "--color-success-400": "#348352",
-        "--color-success-500": "#489766",
-        "--color-success-600": "#66B584",
-        "--color-success-700": "#84D3A2",
-        "--color-success-800": "#A2F1C0",
-        "--color-success-900": "#CAFFE8",
-        "--color-success-950": "#E4FFF4",
-        /* Warning */
-        "--color-warning-0": "#542D12",
-        "--color-warning-50": "#6C3813",
-        "--color-warning-100": "#824417",
-        "--color-warning-200": "#B45A1A",
-        "--color-warning-300": "#D76C1F",
-        "--color-warning-400": "#E77828",
-        "--color-warning-500": "#FB954B",
-        "--color-warning-600": "#FDAD74",
-        "--color-warning-700": "#FECDAA",
-        "--color-warning-800": "#FFE7D5",
-        "--color-warning-900": "#FFF9F5",
-        "--color-warning-950": "#FFFDFB",
-        /* Info */
-        "--color-info-0": "#032638",
-        "--color-info-50": "#05405D",
-        "--color-info-100": "#075A83",
-        "--color-info-200": "#0973A8",
-        "--color-info-300": "#0B8DCD",
-        "--color-info-400": "#0DA6F2",
-        "--color-info-500": "#32B4F4",
-        "--color-info-600": "#57C2F6",
-        "--color-info-700": "#7CCFF8",
-        "--color-info-800": "#A2DDFA",
-        "--color-info-900": "#C7EBFC",
-        "--color-info-950": "#ECF8FE",
-        /* Typography */
-        "--color-typography-0": "#171717",
-        "--color-typography-50": "#262627",
-        "--color-typography-100": "#404040",
-        "--color-typography-200": "#525252",
-        "--color-typography-300": "#737373",
-        "--color-typography-400": "#8C8C8C",
-        "--color-typography-500": "#A3A3A3",
-        "--color-typography-600": "#D4D4D4",
-        "--color-typography-700": "#DBDBDC",
-        "--color-typography-800": "#E5E5E5",
-        "--color-typography-900": "#F5F5F5",
-        "--color-typography-950": "#FEFEFF",
-        /* Outline */
-        "--color-outline-0": "#1A1717",
-        "--color-outline-50": "#272624",
-        "--color-outline-100": "#414141",
-        "--color-outline-200": "#535252",
-        "--color-outline-300": "#737474",
-        "--color-outline-400": "#8C8D8D",
-        "--color-outline-500": "#A5A3A3",
-        "--color-outline-600": "#D3D3D3",
-        "--color-outline-700": "#DDDCDB",
-        "--color-outline-800": "#E6E6E6",
-        "--color-outline-900": "#F3F3F3",
-        "--color-outline-950": "#FDFEFE",
-        /* Background */
-        "--color-background-0": "#121212",
-        "--color-background-50": "#272625",
-        "--color-background-100": "#414040",
-        "--color-background-200": "#535252",
-        "--color-background-300": "#747474",
-        "--color-background-400": "#8E8E8E",
-        "--color-background-500": "#A2A3A3",
-        "--color-background-600": "#D5D4D4",
-        "--color-background-700": "#DCDBDB",
-        "--color-background-800": "#F2F1F1",
-        "--color-background-900": "#F6F6F6",
-        "--color-background-950": "#FEFEFE",
-        /* Background Special */
-        "--color-background-error": "#422B2B",
-        "--color-background-warning": "#412F23",
-        "--color-background-success": "#1C2B21",
-        "--color-background-muted": "#252526",
-        "--color-background-info": "#1A282E",
-        /* Border */
-        "--color-border-0": "#1A1717",
-        "--color-border-50": "#272624",
-        "--color-border-100": "#414141",
-        "--color-border-200": "#535252",
-        "--color-border-300": "#737474",
-        "--color-border-400": "#8C8D8D",
-        "--color-border-500": "#A5A3A3",
-        "--color-border-600": "#D3D3D3",
-        "--color-border-700": "#DDDCDB",
-        "--color-border-800": "#E6E6E6",
-        "--color-border-900": "#F3F3F3",
-        "--color-border-950": "#FDFEFE",
-    }),
-};
diff --git a/next/components/ui/gluestack-ui-provider/config.ts b/next/components/ui/gluestack-ui-provider/config.ts
index 3b42a91a..f388cc6e 100644
--- a/next/components/ui/gluestack-ui-provider/config.ts
+++ b/next/components/ui/gluestack-ui-provider/config.ts
@@ -1,326 +1,309 @@
-"use client";
-import { vars } from "nativewind";
+'use client';
+import { vars } from 'nativewind';
 
 export const config = {
   light: vars({
-    "--color-primary-0": "#B3B3B3",
-    "--color-primary-50": "#999999",
-    "--color-primary-100": "#808080",
-    "--color-primary-200": "#737373",
-    "--color-primary-300": "#666666",
-    "--color-primary-400": "#525252",
-    "--color-primary-500": "#333333",
-    "--color-primary-600": "#292929",
-    "--color-primary-700": "#1F1F1F",
-    "--color-primary-800": "#0D0D0D",
-    "--color-primary-900": "#0A0A0A",
-    "--color-primary-950": "#080808",
+    '--color-primary-0': '179 179 179',
+    '--color-primary-50': '153 153 153',
+    '--color-primary-100': '128 128 128',
+    '--color-primary-200': '115 115 115',
+    '--color-primary-300': '102 102 102',
+    '--color-primary-400': '82 82 82',
+    '--color-primary-500': '51 51 51',
+    '--color-primary-600': '41 41 41',
+    '--color-primary-700': '31 31 31',
+    '--color-primary-800': '13 13 13',
+    '--color-primary-900': '10 10 10',
+    '--color-primary-950': '8 8 8',
 
     /* Secondary  */
-    "--color-secondary-0": "#FEFFFF",
-    "--color-secondary-50": "#F1F2F2",
-    "--color-secondary-100": "#E7E8E8",
-    "--color-secondary-200": "#DBDBDB",
-    "--color-secondary-300": "#AFB0B0",
-    "--color-secondary-400": "#727373",
-    "--color-secondary-500": "#5E5F5F",
-    "--color-secondary-600": "#515252",
-    "--color-secondary-700": "#3F4040",
-    "--color-secondary-800": "#272626",
-    "--color-secondary-900": "#181717",
-    "--color-secondary-950": "#0B0C0C",
+    '--color-secondary-0': '253 253 253',
+    '--color-secondary-50': '251 251 251',
+    '--color-secondary-100': '246 246 246',
+    '--color-secondary-200': '242 242 242',
+    '--color-secondary-300': '237 237 237',
+    '--color-secondary-400': '230 230 231',
+    '--color-secondary-500': '217 217 219',
+    '--color-secondary-600': '198 199 199',
+    '--color-secondary-700': '189 189 189',
+    '--color-secondary-800': '177 177 177',
+    '--color-secondary-900': '165 164 164',
+    '--color-secondary-950': '157 157 157',
 
     /* Tertiary */
-    "--color-tertiary-0": "#FFFAF5",
-    "--color-tertiary-50": "#FFF2E5",
-    "--color-tertiary-100": "#FFE9D5",
-    "--color-tertiary-200": "#FED1AA",
-    "--color-tertiary-300": "#FDB474",
-    "--color-tertiary-400": "#FB9D4B",
-    "--color-tertiary-500": "#E78128",
-    "--color-tertiary-600": "#D7751F",
-    "--color-tertiary-700": "#B4621A",
-    "--color-tertiary-800": "#824917",
-    "--color-tertiary-900": "#6C3D13",
-    "--color-tertiary-950": "#543112",
+    '--color-tertiary-0': '255 250 245',
+    '--color-tertiary-50': '255 242 229',
+    '--color-tertiary-100': '255 233 213',
+    '--color-tertiary-200': '254 209 170',
+    '--color-tertiary-300': '253 180 116',
+    '--color-tertiary-400': '251 157 75',
+    '--color-tertiary-500': '231 129 40',
+    '--color-tertiary-600': '215 117 31',
+    '--color-tertiary-700': '180 98 26',
+    '--color-tertiary-800': '130 73 23',
+    '--color-tertiary-900': '108 61 19',
+    '--color-tertiary-950': '84 49 18',
 
     /* Error */
-    "--color-error-0": "#FEE9E9",
-    "--color-error-50": "#FEE2E2",
-    "--color-error-100": "#FECACA",
-    "--color-error-200": "#FCA5A5",
-    "--color-error-300": "#F87171",
-    "--color-error-400": "#EF4444",
-    "--color-error-500": "#E63535",
-    "--color-error-600": "#DC2626",
-    "--color-error-700": "#B91C1C",
-    "--color-error-800": "#991B1B",
-    "--color-error-900": "#7F1D1D",
-    "--color-error-950": "#531313",
+    '--color-error-0': '254 233 233',
+    '--color-error-50': '254 226 226',
+    '--color-error-100': '254 202 202',
+    '--color-error-200': '252 165 165',
+    '--color-error-300': '248 113 113',
+    '--color-error-400': '239 68 68',
+    '--color-error-500': '230 53 53',
+    '--color-error-600': '220 38 38',
+    '--color-error-700': '185 28 28',
+    '--color-error-800': '153 27 27',
+    '--color-error-900': '127 29 29',
+    '--color-error-950': '83 19 19',
 
     /* Success */
-    "--color-success-0": "#E4FFF4",
-    "--color-success-50": "#CAFFE8",
-    "--color-success-100": "#A2F1C0",
-    "--color-success-200": "#84D3A2",
-    "--color-success-300": "#66B584",
-    "--color-success-400": "#489766",
-    "--color-success-500": "#348352",
-    "--color-success-600": "#2A7948",
-    "--color-success-700": "#206F3E",
-    "--color-success-800": "#166534",
-    "--color-success-900": "#14532D",
-    "--color-success-950": "#1B3224",
+    '--color-success-0': '228 255 244',
+    '--color-success-50': '202 255 232',
+    '--color-success-100': '162 241 192',
+    '--color-success-200': '132 211 162',
+    '--color-success-300': '102 181 132',
+    '--color-success-400': '72 151 102',
+    '--color-success-500': '52 131 82',
+    '--color-success-600': '42 121 72',
+    '--color-success-700': '32 111 62',
+    '--color-success-800': '22 101 52',
+    '--color-success-900': '20 83 45',
+    '--color-success-950': '27 50 36',
 
     /* Warning */
-    "--color-warning-0": "#FFFDFB",
-    "--color-warning-50": "#FFF9F5",
-    "--color-warning-100": "#FFE7D5",
-    "--color-warning-200": "#FECDAA",
-    "--color-warning-300": "#FDAD74",
-    "--color-warning-400": "#FB954B",
-    "--color-warning-500": "#E77828",
-    "--color-warning-600": "#D76C1F",
-    "--color-warning-700": "#B45A1A",
-    "--color-warning-800": "#824417",
-    "--color-warning-900": "#6C3813",
-    "--color-warning-950": "#542D12",
+    '--color-warning-0': '255 249 245',
+    '--color-warning-50': '255 244 236',
+    '--color-warning-100': '255 231 213',
+    '--color-warning-200': '254 205 170',
+    '--color-warning-300': '253 173 116',
+    '--color-warning-400': '251 149 75',
+    '--color-warning-500': '231 120 40',
+    '--color-warning-600': '215 108 31',
+    '--color-warning-700': '180 90 26',
+    '--color-warning-800': '130 68 23',
+    '--color-warning-900': '108 56 19',
+    '--color-warning-950': '84 45 18',
 
     /* Info */
-    "--color-info-0": "#ECF8FE",
-    "--color-info-50": "#C7EBFC",
-    "--color-info-100": "#A2DDFA",
-    "--color-info-200": "#7CCFF8",
-    "--color-info-300": "#57C2F6",
-    "--color-info-400": "#32B4F4",
-    "--color-info-500": "#0DA6F2",
-    "--color-info-600": "#0B8DCD",
-    "--color-info-700": "#0973A8",
-    "--color-info-800": "#075A83",
-    "--color-info-900": "#05405D",
-    "--color-info-950": "#032638",
+    '--color-info-0': '236 248 254',
+    '--color-info-50': '199 235 252',
+    '--color-info-100': '162 221 250',
+    '--color-info-200': '124 207 248',
+    '--color-info-300': '87 194 246',
+    '--color-info-400': '50 180 244',
+    '--color-info-500': '13 166 242',
+    '--color-info-600': '11 141 205',
+    '--color-info-700': '9 115 168',
+    '--color-info-800': '7 90 131',
+    '--color-info-900': '5 64 93',
+    '--color-info-950': '3 38 56',
 
     /* Typography */
-    "--color-typography-0": "#FEFEFF",
-    "--color-typography-50": "#F5F5F5",
-    "--color-typography-100": "#E5E5E5",
-    "--color-typography-200": "#DBDBDC",
-    "--color-typography-300": "#D4D4D4",
-    "--color-typography-400": "#A3A3A3",
-    "--color-typography-500": "#8C8C8C",
-    "--color-typography-600": "#737373",
-    "--color-typography-700": "#525252",
-    "--color-typography-800": "#404040",
-    "--color-typography-900": "#262627",
-    "--color-typography-950": "#171717",
+    '--color-typography-0': '254 254 255',
+    '--color-typography-50': '245 245 245',
+    '--color-typography-100': '229 229 229',
+    '--color-typography-200': '219 219 220',
+    '--color-typography-300': '212 212 212',
+    '--color-typography-400': '163 163 163',
+    '--color-typography-500': '140 140 140',
+    '--color-typography-600': '115 115 115',
+    '--color-typography-700': '82 82 82',
+    '--color-typography-800': '64 64 64',
+    '--color-typography-900': '38 38 39',
+    '--color-typography-950': '23 23 23',
 
     /* Outline */
-    "--color-outline-0": "#FDFEFE",
-    "--color-outline-50": "#F3F3F3",
-    "--color-outline-100": "#E6E6E6",
-    "--color-outline-200": "#DDDCDB",
-    "--color-outline-300": "#D3D3D3",
-    "--color-outline-400": "#A5A3A3",
-    "--color-outline-500": "#8C8D8D",
-    "--color-outline-600": "#737474",
-    "--color-outline-700": "#535252",
-    "--color-outline-800": "#414141",
-    "--color-outline-900": "#272624",
-    "--color-outline-950": "#1A1717",
+    '--color-outline-0': '253 254 254',
+    '--color-outline-50': '243 243 243',
+    '--color-outline-100': '230 230 230',
+    '--color-outline-200': '221 220 219',
+    '--color-outline-300': '211 211 211',
+    '--color-outline-400': '165 163 163',
+    '--color-outline-500': '140 141 141',
+    '--color-outline-600': '115 116 116',
+    '--color-outline-700': '83 82 82',
+    '--color-outline-800': '65 65 65',
+    '--color-outline-900': '39 38 36',
+    '--color-outline-950': '26 23 23',
+
     /* Background */
-    "--color-background-0": "#FFFFFF",
-    "--color-background-50": "#F6F6F6",
-    "--color-background-100": "#F2F1F1",
-    "--color-background-200": "#DCDBDB",
-    "--color-background-300": "#D5D4D4",
-    "--color-background-400": "#A2A3A3",
-    "--color-background-500": "#8E8E8E",
-    "--color-background-600": "#747474",
-    "--color-background-700": "#535252",
-    "--color-background-800": "#414040",
-    "--color-background-900": "#272625",
-    "--color-background-950": "#181718",
+    '--color-background-0': '255 255 255',
+    '--color-background-50': '246 246 246',
+    '--color-background-100': '242 241 241',
+    '--color-background-200': '220 219 219',
+    '--color-background-300': '213 212 212',
+    '--color-background-400': '162 163 163',
+    '--color-background-500': '142 142 142',
+    '--color-background-600': '116 116 116',
+    '--color-background-700': '83 82 82',
+    '--color-background-800': '65 64 64',
+    '--color-background-900': '39 38 37',
+    '--color-background-950': '18 18 18',
 
     /* Background Special */
-    "--color-background-error": "#FEF1F1",
-    "--color-background-warning": "#FFF4EB",
-    "--color-background-success": "#EDFCF2",
-    "--color-background-muted": "#F6F6F7",
-    "--color-background-info": "#EBF8FE",
+    '--color-background-error': '254 241 241',
+    '--color-background-warning': '255 243 234',
+    '--color-background-success': '237 252 242',
+    '--color-background-muted': '247 248 247',
+    '--color-background-info': '235 248 254',
 
-    /* Border */
-    "--color-border-0": "#FDFEFE",
-    "--color-border-50": "#F3F3F3",
-    "--color-border-100": "#E6E6E6",
-    "--color-border-200": "#DDDCDB",
-    "--color-border-300": "#D3D3D3",
-    "--color-border-400": "#A5A3A3",
-    "--color-border-500": "#8C8D8D",
-    "--color-border-600": "#737474",
-    "--color-border-700": "#535252",
-    "--color-border-800": "#414141",
-    "--color-border-900": "#272624",
-    "--color-border-950": "#1A1717",
+    /* Focus Ring Indicator  */
+    '--color-indicator-primary': '55 55 55',
+    '--color-indicator-info': '83 153 236',
+    '--color-indicator-error': '185 28 28',
   }),
   dark: vars({
-    "--color-primary-0": "#828282",
-    "--color-primary-50": "#949494",
-    "--color-primary-100": "#9E9E9E",
-    "--color-primary-200": "#B3B3B3",
-    "--color-primary-300": "#C7C7C7",
-    "--color-primary-400": "#E6E6E6",
-    "--color-primary-500": "#F0F0F0",
-    "--color-primary-600": "#FAFAFA",
-    "--color-primary-700": "#FCFCFC",
-    "--color-primary-800": "#FDFDFD",
-    "--color-primary-900": "#FDFCFC",
-    "--color-primary-950": "#FDFCFC",
+    '--color-primary-0': '166 166 166',
+    '--color-primary-50': '175 175 175',
+    '--color-primary-100': '186 186 186',
+    '--color-primary-200': '197 197 197',
+    '--color-primary-300': '212 212 212',
+    '--color-primary-400': '221 221 221',
+    '--color-primary-500': '230 230 230',
+    '--color-primary-600': '240 240 240',
+    '--color-primary-700': '250 250 250',
+    '--color-primary-800': '253 253 253',
+    '--color-primary-900': '254 249 249',
+    '--color-primary-950': '253 252 252',
 
     /* Secondary  */
-    "--color-secondary-0": "#0B0C0C",
-    "--color-secondary-50": "#181717",
-    "--color-secondary-100": "#272626",
-    "--color-secondary-200": "#3F4040",
-    "--color-secondary-300": "#515252",
-    "--color-secondary-400": "#5E5F5F",
-    "--color-secondary-500": "#727373",
-    "--color-secondary-600": "#AFB0B0",
-    "--color-secondary-700": "#DBDBDB",
-    "--color-secondary-800": "#E7E8E8",
-    "--color-secondary-900": "#F1F2F2",
-    "--color-secondary-950": "#FEFFFF",
+    '--color-secondary-0': '20 20 20',
+    '--color-secondary-50': '23 23 23',
+    '--color-secondary-100': '31 31 31',
+    '--color-secondary-200': '39 39 39',
+    '--color-secondary-300': '44 44 44',
+    '--color-secondary-400': '56 57 57',
+    '--color-secondary-500': '63 64 64',
+    '--color-secondary-600': '86 86 86',
+    '--color-secondary-700': '110 110 110',
+    '--color-secondary-800': '135 135 135',
+    '--color-secondary-900': '150 150 150',
+    '--color-secondary-950': '164 164 164',
 
     /* Tertiary */
-    "--color-tertiary-0": "#543112",
-    "--color-tertiary-50": "#6C3D13",
-    "--color-tertiary-100": "#824917",
-    "--color-tertiary-200": "#B4621A",
-    "--color-tertiary-300": "#D7751F",
-    "--color-tertiary-400": "#E78128",
-    "--color-tertiary-500": "#FB9D4B",
-    "--color-tertiary-600": "#FDB474",
-    "--color-tertiary-700": "#FED1AA",
-    "--color-tertiary-800": "#FFE9D5",
-    "--color-tertiary-900": "#FFF2E5",
-    "--color-tertiary-950": "#FFFAF5",
+    '--color-tertiary-0': '84 49 18',
+    '--color-tertiary-50': '108 61 19',
+    '--color-tertiary-100': '130 73 23',
+    '--color-tertiary-200': '180 98 26',
+    '--color-tertiary-300': '215 117 31',
+    '--color-tertiary-400': '231 129 40',
+    '--color-tertiary-500': '251 157 75',
+    '--color-tertiary-600': '253 180 116',
+    '--color-tertiary-700': '254 209 170',
+    '--color-tertiary-800': '255 233 213',
+    '--color-tertiary-900': '255 242 229',
+    '--color-tertiary-950': '255 250 245',
 
     /* Error */
-    "--color-error-0": "#531313",
-    "--color-error-50": "#7F1D1D",
-    "--color-error-100": "#991B1B",
-    "--color-error-200": "#B91C1C",
-    "--color-error-300": "#DC2626",
-    "--color-error-400": "#E63535",
-    "--color-error-500": "#EF4444",
-    "--color-error-600": "#F87171",
-    "--color-error-700": "#E63534",
-    "--color-error-800": "#FECACA",
-    "--color-error-900": "#FEE2E2",
-    "--color-error-950": "#FEE9E9",
+    '--color-error-0': '83 19 19',
+    '--color-error-50': '127 29 29',
+    '--color-error-100': '153 27 27',
+    '--color-error-200': '185 28 28',
+    '--color-error-300': '220 38 38',
+    '--color-error-400': '230 53 53',
+    '--color-error-500': '239 68 68',
+    '--color-error-600': '249 97 96',
+    '--color-error-700': '229 91 90',
+    '--color-error-800': '254 202 202',
+    '--color-error-900': '254 226 226',
+    '--color-error-950': '254 233 233',
 
     /* Success */
-    "--color-success-0": "#1B3224",
-    "--color-success-50": "#14532D",
-    "--color-success-100": "#166534",
-    "--color-success-200": "#206F3E",
-    "--color-success-300": "#2A7948",
-    "--color-success-400": "#348352",
-    "--color-success-500": "#489766",
-    "--color-success-600": "#66B584",
-    "--color-success-700": "#84D3A2",
-    "--color-success-800": "#A2F1C0",
-    "--color-success-900": "#CAFFE8",
-    "--color-success-950": "#E4FFF4",
+    '--color-success-0': '27 50 36',
+    '--color-success-50': '20 83 45',
+    '--color-success-100': '22 101 52',
+    '--color-success-200': '32 111 62',
+    '--color-success-300': '42 121 72',
+    '--color-success-400': '52 131 82',
+    '--color-success-500': '72 151 102',
+    '--color-success-600': '102 181 132',
+    '--color-success-700': '132 211 162',
+    '--color-success-800': '162 241 192',
+    '--color-success-900': '202 255 232',
+    '--color-success-950': '228 255 244',
 
     /* Warning */
-    "--color-warning-0": "#542D12",
-    "--color-warning-50": "#6C3813",
-    "--color-warning-100": "#824417",
-    "--color-warning-200": "#B45A1A",
-    "--color-warning-300": "#D76C1F",
-    "--color-warning-400": "#E77828",
-    "--color-warning-500": "#FB954B",
-    "--color-warning-600": "#FDAD74",
-    "--color-warning-700": "#FECDAA",
-    "--color-warning-800": "#FFE7D5",
-    "--color-warning-900": "#FFF9F5",
-    "--color-warning-950": "#FFFDFB",
+    '--color-warning-0': '84 45 18',
+    '--color-warning-50': '108 56 19',
+    '--color-warning-100': '130 68 23',
+    '--color-warning-200': '180 90 26',
+    '--color-warning-300': '215 108 31',
+    '--color-warning-400': '231 120 40',
+    '--color-warning-500': '251 149 75',
+    '--color-warning-600': '253 173 116',
+    '--color-warning-700': '254 205 170',
+    '--color-warning-800': '255 231 213',
+    '--color-warning-900': '255 244 237',
+    '--color-warning-950': '255 249 245',
 
     /* Info */
-    "--color-info-0": "#032638",
-    "--color-info-50": "#05405D",
-    "--color-info-100": "#075A83",
-    "--color-info-200": "#0973A8",
-    "--color-info-300": "#0B8DCD",
-    "--color-info-400": "#0DA6F2",
-    "--color-info-500": "#32B4F4",
-    "--color-info-600": "#57C2F6",
-    "--color-info-700": "#7CCFF8",
-    "--color-info-800": "#A2DDFA",
-    "--color-info-900": "#C7EBFC",
-    "--color-info-950": "#ECF8FE",
+    '--color-info-0': '3 38 56',
+    '--color-info-50': '5 64 93',
+    '--color-info-100': '7 90 131',
+    '--color-info-200': '9 115 168',
+    '--color-info-300': '11 141 205',
+    '--color-info-400': '13 166 242',
+    '--color-info-500': '50 180 244',
+    '--color-info-600': '87 194 246',
+    '--color-info-700': '124 207 248',
+    '--color-info-800': '162 221 250',
+    '--color-info-900': '199 235 252',
+    '--color-info-950': '236 248 254',
 
     /* Typography */
-    "--color-typography-0": "#171717",
-    "--color-typography-50": "#262627",
-    "--color-typography-100": "#404040",
-    "--color-typography-200": "#525252",
-    "--color-typography-300": "#737373",
-    "--color-typography-400": "#8C8C8C",
-    "--color-typography-500": "#A3A3A3",
-    "--color-typography-600": "#D4D4D4",
-    "--color-typography-700": "#DBDBDC",
-    "--color-typography-800": "#E5E5E5",
-    "--color-typography-900": "#F5F5F5",
-    "--color-typography-950": "#FEFEFF",
+    '--color-typography-0': '23 23 23',
+    '--color-typography-50': '38 38 39',
+    '--color-typography-100': '64 64 64',
+    '--color-typography-200': '82 82 82',
+    '--color-typography-300': '115 115 115',
+    '--color-typography-400': '140 140 140',
+    '--color-typography-500': '163 163 163',
+    '--color-typography-600': '212 212 212',
+    '--color-typography-700': '219 219 220',
+    '--color-typography-800': '229 229 229',
+    '--color-typography-900': '245 245 245',
+    '--color-typography-950': '254 254 255',
 
     /* Outline */
-    "--color-outline-0": "#1A1717",
-    "--color-outline-50": "#272624",
-    "--color-outline-100": "#414141",
-    "--color-outline-200": "#535252",
-    "--color-outline-300": "#737474",
-    "--color-outline-400": "#8C8D8D",
-    "--color-outline-500": "#A5A3A3",
-    "--color-outline-600": "#D3D3D3",
-    "--color-outline-700": "#DDDCDB",
-    "--color-outline-800": "#E6E6E6",
-    "--color-outline-900": "#F3F3F3",
-    "--color-outline-950": "#FDFEFE",
+    '--color-outline-0': '26 23 23',
+    '--color-outline-50': '39 38 36',
+    '--color-outline-100': '65 65 65',
+    '--color-outline-200': '83 82 82',
+    '--color-outline-300': '115 116 116',
+    '--color-outline-400': '140 141 141',
+    '--color-outline-500': '165 163 163',
+    '--color-outline-600': '211 211 211',
+    '--color-outline-700': '221 220 219',
+    '--color-outline-800': '230 230 230',
+    '--color-outline-900': '243 243 243',
+    '--color-outline-950': '253 254 254',
 
     /* Background */
-    "--color-background-0": "#121212",
-    "--color-background-50": "#272625",
-    "--color-background-100": "#414040",
-    "--color-background-200": "#535252",
-    "--color-background-300": "#747474",
-    "--color-background-400": "#8E8E8E",
-    "--color-background-500": "#A2A3A3",
-    "--color-background-600": "#D5D4D4",
-    "--color-background-700": "#DCDBDB",
-    "--color-background-800": "#F2F1F1",
-    "--color-background-900": "#F6F6F6",
-    "--color-background-950": "#FEFEFE",
+    '--color-background-0': '18 18 18',
+    '--color-background-50': '39 38 37',
+    '--color-background-100': '65 64 64',
+    '--color-background-200': '83 82 82',
+    '--color-background-300': '116 116 116',
+    '--color-background-400': '142 142 142',
+    '--color-background-500': '162 163 163',
+    '--color-background-600': '213 212 212',
+    '--color-background-700': '229 228 228',
+    '--color-background-800': '242 241 241',
+    '--color-background-900': '246 246 246',
+    '--color-background-950': '255 255 255',
 
     /* Background Special */
-    "--color-background-error": "#422B2B",
-    "--color-background-warning": "#412F23",
-    "--color-background-success": "#1C2B21",
-    "--color-background-muted": "#252526",
-    "--color-background-info": "#1A282E",
+    '--color-background-error': '66 43 43',
+    '--color-background-warning': '65 47 35',
+    '--color-background-success': '28 43 33',
+    '--color-background-muted': '51 51 51',
+    '--color-background-info': '26 40 46',
 
-    /* Border */
-    "--color-border-0": "#1A1717",
-    "--color-border-50": "#272624",
-    "--color-border-100": "#414141",
-    "--color-border-200": "#535252",
-    "--color-border-300": "#737474",
-    "--color-border-400": "#8C8D8D",
-    "--color-border-500": "#A5A3A3",
-    "--color-border-600": "#D3D3D3",
-    "--color-border-700": "#DDDCDB",
-    "--color-border-800": "#E6E6E6",
-    "--color-border-900": "#F3F3F3",
-    "--color-border-950": "#FDFEFE",
+    /* Focus Ring Indicator  */
+    '--color-indicator-primary': '247 247 247',
+    '--color-indicator-info': '161 199 245',
+    '--color-indicator-error': '232 70 69',
   }),
 };
diff --git a/next/components/ui/gluestack-ui-provider/index.tsx b/next/components/ui/gluestack-ui-provider/index.tsx
index 4dc2cfe6..4855e434 100644
--- a/next/components/ui/gluestack-ui-provider/index.tsx
+++ b/next/components/ui/gluestack-ui-provider/index.tsx
@@ -1,22 +1,42 @@
 import React from 'react';
 import { config } from './config';
-import { View } from 'react-native';
+import { ColorSchemeName, useColorScheme, View, ViewProps } from 'react-native';
 import { OverlayProvider } from '@gluestack-ui/overlay';
 import { ToastProvider } from '@gluestack-ui/toast';
+import { colorScheme as colorSchemeNW } from 'nativewind';
+
+type ModeType = 'light' | 'dark' | 'system';
+
+const getColorSchemeName = (
+  colorScheme: ColorSchemeName,
+  mode: ModeType
+): 'light' | 'dark' => {
+  if (mode === 'system') {
+    return colorScheme ?? 'light';
+  }
+  return mode;
+};
 
 export function GluestackUIProvider({
   mode = 'light',
   ...props
 }: {
-  mode?: 'light' | 'dark';
-  children?: any;
+  mode?: 'light' | 'dark' | 'system';
+  children?: React.ReactNode;
+  style?: ViewProps['style'];
 }) {
+  const colorScheme = useColorScheme();
+
+  const colorSchemeName = getColorSchemeName(colorScheme, mode);
+
+  colorSchemeNW.set(mode);
+
   return (
     <View
       style={[
-        config[mode],
+        config[colorSchemeName],
+        // eslint-disable-next-line react-native/no-inline-styles
         { flex: 1, height: '100%', width: '100%' },
-        // @ts-ignore
         props.style,
       ]}
     >
diff --git a/next/components/ui/gluestack-ui-provider/index.web.tsx b/next/components/ui/gluestack-ui-provider/index.web.tsx
index 086a7295..30cadaaa 100644
--- a/next/components/ui/gluestack-ui-provider/index.web.tsx
+++ b/next/components/ui/gluestack-ui-provider/index.web.tsx
@@ -1,36 +1,94 @@
 'use client';
-import React from 'react';
+import React, { useEffect, useLayoutEffect } from 'react';
 import { config } from './config';
 import { OverlayProvider } from '@gluestack-ui/overlay';
 import { ToastProvider } from '@gluestack-ui/toast';
 import { setFlushStyles } from '@gluestack-ui/nativewind-utils/flush';
+import { script } from './script';
+
+const variableStyleTagId = 'nativewind-style';
+const createStyle = (styleTagId: string) => {
+  const style = document.createElement('style');
+  style.id = styleTagId;
+  style.appendChild(document.createTextNode(''));
+  return style;
+};
+
+export const useSafeLayoutEffect =
+  typeof window !== 'undefined' ? useLayoutEffect : useEffect;
 
 export function GluestackUIProvider({
   mode = 'light',
   ...props
 }: {
-  mode?: 'light' | 'dark';
-  children?: any;
+  mode?: 'light' | 'dark' | 'system';
+  children?: React.ReactNode;
 }) {
-  const stringcssvars = Object.keys(config[mode]).reduce((acc, cur) => {
-    acc += `${cur}:${config[mode][cur]};`;
-    return acc;
-  }, '');
-  setFlushStyles(`:root {${stringcssvars}} `);
-
-  if (config[mode] && typeof document !== 'undefined') {
-    const element = document.documentElement;
-    if (element) {
-      const head = element.querySelector('head');
-      const style = document.createElement('style');
-      style.innerHTML = `:root {${stringcssvars}} `;
-      if (head) head.appendChild(style);
+  let cssVariablesWithMode = ``;
+  Object.keys(config).forEach((configKey) => {
+    cssVariablesWithMode +=
+      configKey === 'dark' ? `\n .dark {\n ` : `\n:root {\n`;
+    const cssVariables = Object.keys(
+      config[configKey as keyof typeof config]
+    ).reduce((acc: string, curr: string) => {
+      acc += `${curr}:${config[configKey as keyof typeof config][curr]}; `;
+      return acc;
+    }, '');
+    cssVariablesWithMode += `${cssVariables} \n}`;
+  });
+
+  setFlushStyles(cssVariablesWithMode);
+
+  const handleMediaQuery = React.useCallback((e: MediaQueryListEvent) => {
+    script(e.matches ? 'dark' : 'light');
+  }, []);
+
+  useSafeLayoutEffect(() => {
+    if (mode !== 'system') {
+      const documentElement = document.documentElement;
+      if (documentElement) {
+        documentElement.classList.add(mode);
+        documentElement.classList.remove(mode === 'light' ? 'dark' : 'light');
+        documentElement.style.colorScheme = mode;
+      }
+    }
+  }, [mode]);
+
+  useSafeLayoutEffect(() => {
+    if (mode !== 'system') return;
+    const media = window.matchMedia('(prefers-color-scheme: dark)');
+
+    media.addListener(handleMediaQuery);
+
+    return () => media.removeListener(handleMediaQuery);
+  }, [handleMediaQuery]);
+
+  useSafeLayoutEffect(() => {
+    if (typeof window !== 'undefined') {
+      const documentElement = document.documentElement;
+      if (documentElement) {
+        const head = documentElement.querySelector('head');
+        let style = head?.querySelector(`[id='${variableStyleTagId}']`);
+        if (!style) {
+          style = createStyle(variableStyleTagId);
+          style.innerHTML = cssVariablesWithMode;
+          if (head) head.appendChild(style);
+        }
+      }
     }
-  }
+  }, []);
 
   return (
-    <OverlayProvider>
-      <ToastProvider>{props.children}</ToastProvider>
-    </OverlayProvider>
+    <>
+      <script
+        suppressHydrationWarning
+        dangerouslySetInnerHTML={{
+          __html: `(${script.toString()})('${mode}')`,
+        }}
+      />
+      <OverlayProvider>
+        <ToastProvider>{props.children}</ToastProvider>
+      </OverlayProvider>
+    </>
   );
 }
diff --git a/next/components/ui/gluestack-ui-provider/script.ts b/next/components/ui/gluestack-ui-provider/script.ts
new file mode 100644
index 00000000..732d1363
--- /dev/null
+++ b/next/components/ui/gluestack-ui-provider/script.ts
@@ -0,0 +1,19 @@
+export const script = (mode: string) => {
+  const documentElement = document.documentElement;
+
+  function getSystemColorMode() {
+    return window.matchMedia('(prefers-color-scheme: dark)').matches
+      ? 'dark'
+      : 'light';
+  }
+
+  try {
+    const isSystem = mode === 'system';
+    const theme = isSystem ? getSystemColorMode() : mode;
+    documentElement.classList.remove(theme === 'light' ? 'dark' : 'light');
+    documentElement.classList.add(theme);
+    documentElement.style.colorScheme = theme;
+  } catch (e) {
+    console.error(e);
+  }
+};
diff --git a/next/components/ui/grid/index.tsx b/next/components/ui/grid/index.tsx
index 0e0b4d65..7e0d36b9 100644
--- a/next/components/ui/grid/index.tsx
+++ b/next/components/ui/grid/index.tsx
@@ -5,16 +5,17 @@ import React, {
   useContext,
   useMemo,
   forwardRef,
-} from "react";
-import type { VariantProps } from "@gluestack-ui/nativewind-utils";
-import { View, Dimensions, Platform, ViewProps } from "react-native";
-import { gridStyle, gridItemStyle } from "./styles";
-import { cssInterop } from "nativewind";
+} from 'react';
+import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import { View, Dimensions, Platform, ViewProps } from 'react-native';
+import { gridStyle, gridItemStyle } from './styles';
+import { cssInterop } from 'nativewind';
 import {
   useBreakpointValue,
   getBreakPointValue,
-} from "@gluestack-ui/nativewind-utils/useBreakpointValue";
-const { width } = Dimensions.get("window");
+} from '@/components/ui/utils/use-break-point-value';
+
+const { width: DEVICE_WIDTH } = Dimensions.get('window');
 
 const GridContext = createContext<any>({});
 
@@ -69,7 +70,7 @@ function generateResponsiveNumColumns({ gridClass }: { gridClass: string }) {
   numColumns.forEach((classname) => {
     const match = classname.match(regex);
     if (match) {
-      const prefix = match[1] || "default";
+      const prefix = match[1] || 'default';
       const value = parseInt(match[2], 10);
       result[prefix] = value;
     }
@@ -97,7 +98,7 @@ function generateResponsiveColSpans({
   colSpan.forEach((classname: any) => {
     const match = classname.match(regex);
     if (match) {
-      const prefix = match[1] || "default";
+      const prefix = match[1] || 'default';
       const value = parseInt(match[2], 10);
       result[prefix] = value;
     }
@@ -111,12 +112,15 @@ type IGridProps = ViewProps &
     gap?: number;
     rowGap?: number;
     columnGap?: number;
-    flexDirection?: "row" | "column" | "row-reverse" | "column-reverse";
+    flexDirection?: 'row' | 'column' | 'row-reverse' | 'column-reverse';
     padding?: number;
     paddingLeft?: number;
     paddingRight?: number;
     paddingStart?: number;
     paddingEnd?: number;
+    borderWidth?: number;
+    borderLeftWidth?: number;
+    borderRightWidth?: number;
     _extra: {
       className: string;
     };
@@ -137,7 +141,7 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
 
         const colSpan2 = getBreakPointValue(
           generateResponsiveColSpans({ gridItemClassName }),
-          width
+          DEVICE_WIDTH
         );
         const colSpan = colSpan2 ? colSpan2 : 1;
 
@@ -168,7 +172,7 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
     });
 
     const gridClassMerged = `${Platform.select({
-      web: gridClass ?? "",
+      web: gridClass ?? '',
     })}`;
 
     const contextValue = useMemo(() => {
@@ -176,18 +180,22 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
         calculatedWidth,
         numColumns: responsiveNumColumns,
         itemsPerRow,
-        flexDirection: props?.flexDirection || "row",
+        flexDirection: props?.flexDirection || 'row',
         gap: props?.gap || 0,
         columnGap: props?.columnGap || 0,
       };
     }, [calculatedWidth, itemsPerRow, responsiveNumColumns, props]);
 
+    const borderLeftWidth = props?.borderLeftWidth || props?.borderWidth || 0;
+    const borderRightWidth = props?.borderRightWidth || props?.borderWidth || 0;
+    const borderWidthToSubtract = borderLeftWidth + borderRightWidth;
+
     return (
       <GridContext.Provider value={contextValue}>
         <View
           ref={ref}
           className={gridStyle({
-            class: className + " " + gridClassMerged,
+            class: className + ' ' + gridClassMerged,
           })}
           onLayout={(event: any) => {
             const paddingLeftToSubtract =
@@ -196,12 +204,13 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
             const paddingRightToSubtract =
               props?.paddingEnd || props?.paddingRight || props?.padding || 0;
 
-            const width =
+            const gridWidth =
               event.nativeEvent.layout.width -
               paddingLeftToSubtract -
-              paddingRightToSubtract;
+              paddingRightToSubtract -
+              borderWidthToSubtract;
 
-            setCalculatedWidth(width);
+            setCalculatedWidth(gridWidth);
           }}
           {...props}
         >
@@ -212,20 +221,22 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
   }
 );
 
-//@ts-ignore
 cssInterop(Grid, {
   className: {
-    target: "style",
+    target: 'style',
     nativeStyleToProp: {
-      gap: "gap",
-      rowGap: "rowGap",
-      columnGap: "columnGap",
-      flexDirection: "flexDirection",
-      padding: "padding",
-      paddingLeft: "paddingLeft",
-      paddingRight: "paddingRight",
-      paddingStart: "paddingStart",
-      paddingEnd: "paddingEnd",
+      gap: 'gap',
+      rowGap: 'rowGap',
+      columnGap: 'columnGap',
+      flexDirection: 'flexDirection',
+      padding: 'padding',
+      paddingLeft: 'paddingLeft',
+      paddingRight: 'paddingRight',
+      paddingStart: 'paddingStart',
+      paddingEnd: 'paddingEnd',
+      borderWidth: 'borderWidth',
+      borderLeftWidth: 'borderLeftWidth',
+      borderRightWidth: 'borderRightWidth',
     },
   },
 });
@@ -242,7 +253,7 @@ const GridItem = forwardRef<React.ElementRef<typeof View>, IGridItemProps>(
   ({ className, _extra, ...props }, ref) => {
     const [flexBasisValue, setFlexBasisValue] = useState<
       number | string | null
-    >("auto");
+    >('auto');
 
     const {
       calculatedWidth,
@@ -261,7 +272,7 @@ const GridItem = forwardRef<React.ElementRef<typeof View>, IGridItemProps>(
 
     useEffect(() => {
       if (
-        !flexDirection?.includes("column") &&
+        !flexDirection?.includes('column') &&
         calculatedWidth &&
         numColumns > 0 &&
         responsiveColSpan > 0
@@ -271,7 +282,7 @@ const GridItem = forwardRef<React.ElementRef<typeof View>, IGridItemProps>(
           return itemsPerRow[key].includes(props?.index);
         });
 
-        const rowColsCount = itemsPerRow[row as string].length;
+        const rowColsCount = itemsPerRow[row as string]?.length;
 
         const space = columnGap || gap || 0;
 
@@ -288,7 +299,7 @@ const GridItem = forwardRef<React.ElementRef<typeof View>, IGridItemProps>(
               calculatedWidth) *
               100,
             100
-          ) + "%";
+          ) + '%';
 
         setFlexBasisValue(flexBasisVal);
       }
@@ -308,9 +319,7 @@ const GridItem = forwardRef<React.ElementRef<typeof View>, IGridItemProps>(
         // @ts-expect-error
         gridItemClass={gridItemClass}
         className={gridItemStyle({
-          class:
-            className + " " + Platform.select({ web: gridItemClass ?? "" }) ??
-            "",
+          class: className,
         })}
         {...props}
         style={[
@@ -324,7 +333,7 @@ const GridItem = forwardRef<React.ElementRef<typeof View>, IGridItemProps>(
   }
 );
 
-Grid.displayName = "Grid";
-GridItem.displayName = "GridItem";
+Grid.displayName = 'Grid';
+GridItem.displayName = 'GridItem';
 
 export { Grid, GridItem };
diff --git a/next/components/ui/heading/index.tsx b/next/components/ui/heading/index.tsx
index 226ab2fe..c617f9bc 100644
--- a/next/components/ui/heading/index.tsx
+++ b/next/components/ui/heading/index.tsx
@@ -1,20 +1,20 @@
-import React, { forwardRef, memo } from 'react';
-import { H1, H2, H3, H4, H5, H6 } from '@expo/html-elements';
-import { cssInterop } from 'nativewind';
-import { headingStyle } from './styles';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import React, { forwardRef, memo } from "react";
+import { H1, H2, H3, H4, H5, H6 } from "@expo/html-elements";
+import { headingStyle } from "./styles";
+import type { VariantProps } from "@gluestack-ui/nativewind-utils";
+import { cssInterop } from "nativewind";
 
 type IHeadingProps = VariantProps<typeof headingStyle> &
   React.ComponentPropsWithoutRef<typeof H1> & {
     as?: React.ElementType;
   };
 
-cssInterop(H1, { className: 'style' });
-cssInterop(H2, { className: 'style' });
-cssInterop(H3, { className: 'style' });
-cssInterop(H4, { className: 'style' });
-cssInterop(H5, { className: 'style' });
-cssInterop(H6, { className: 'style' });
+cssInterop(H1, { className: "style" });
+cssInterop(H2, { className: "style" });
+cssInterop(H3, { className: "style" });
+cssInterop(H4, { className: "style" });
+cssInterop(H5, { className: "style" });
+cssInterop(H6, { className: "style" });
 
 const MappedHeading = memo(
   forwardRef<React.ElementRef<typeof H1>, IHeadingProps>(
@@ -34,9 +34,9 @@ const MappedHeading = memo(
       ref
     ) => {
       switch (size) {
-        case '5xl':
-        case '4xl':
-        case '3xl':
+        case "5xl":
+        case "4xl":
+        case "3xl":
           return (
             <H1
               className={headingStyle({
@@ -51,10 +51,11 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
-        case '2xl':
+        case "2xl":
           return (
             <H2
               className={headingStyle({
@@ -69,10 +70,11 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
-        case 'xl':
+        case "xl":
           return (
             <H3
               className={headingStyle({
@@ -87,10 +89,11 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
-        case 'lg':
+        case "lg":
           return (
             <H4
               className={headingStyle({
@@ -105,10 +108,11 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
-        case 'md':
+        case "md":
           return (
             <H5
               className={headingStyle({
@@ -123,11 +127,12 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
-        case 'sm':
-        case 'xs':
+        case "sm":
+        case "xs":
           return (
             <H6
               className={headingStyle({
@@ -142,6 +147,7 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
@@ -160,6 +166,7 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
@@ -170,7 +177,7 @@ const MappedHeading = memo(
 
 const Heading = memo(
   forwardRef<React.ElementRef<typeof H1>, IHeadingProps>(
-    ({ className, size = 'lg', as: AsComp, ...props }, ref) => {
+    ({ className, size = "lg", as: AsComp, ...props }, ref) => {
       const {
         isTruncated,
         bold,
@@ -207,6 +214,6 @@ const Heading = memo(
   )
 );
 
-Heading.displayName = 'Heading';
+Heading.displayName = "Heading";
 
 export { Heading };
diff --git a/next/components/ui/icon/index.tsx b/next/components/ui/icon/index.tsx
index 662a0055..bb0fd52c 100644
--- a/next/components/ui/icon/index.tsx
+++ b/next/components/ui/icon/index.tsx
@@ -1,75 +1,21 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createIcon } from '@gluestack-ui/icon';
-import { Path, Svg } from 'react-native-svg';
+import { Path } from 'react-native-svg';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { cssInterop } from 'nativewind';
 import { VariantProps } from '@gluestack-ui/nativewind-utils';
-
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
+import { PrimitiveIcon, IPrimitiveIcon, Svg } from '@gluestack-ui/icon';
 
 export const UIIcon = createIcon({
   Root: PrimitiveIcon,
-});
+}) as React.ForwardRefExoticComponent<
+  React.ComponentPropsWithoutRef<typeof PrimitiveIcon> &
+    React.RefAttributes<React.ElementRef<typeof Svg>>
+>;
 
 const iconStyle = tva({
-  base: 'text-typography-950 fill-none',
+  base: 'text-typography-950 fill-none pointer-events-none',
   variants: {
     size: {
       '2xs': 'h-3 w-3',
@@ -82,7 +28,6 @@ const iconStyle = tva({
   },
 });
 
-// @ts-ignore
 cssInterop(UIIcon, {
   className: {
     target: 'style',
@@ -90,7 +35,7 @@ cssInterop(UIIcon, {
       height: true,
       width: true,
       fill: true,
-      color: true,
+      color: 'classNameColor',
       stroke: true,
     },
   },
@@ -136,23 +81,28 @@ export const Icon = React.forwardRef<React.ElementRef<typeof Svg>, IIConProps>(
 type ParameterTypes = Omit<Parameters<typeof createIcon>[0], 'Root'>;
 
 const createIconUI = ({ ...props }: ParameterTypes) => {
-  const UIIconCreateIcon = createIcon({ Root: Svg, ...props });
+  const UIIconCreateIcon = createIcon({
+    Root: Svg,
+    ...props,
+  }) as React.ForwardRefExoticComponent<
+    React.ComponentPropsWithoutRef<typeof PrimitiveIcon> &
+      React.RefAttributes<React.ElementRef<typeof Svg>>
+  >;
 
   return React.forwardRef<React.ElementRef<typeof Svg>>(
     (
       {
         className,
         size,
-        ...props
+        ...inComingProps
       }: VariantProps<typeof iconStyle> &
         React.ComponentPropsWithoutRef<typeof UIIconCreateIcon>,
       ref
     ) => {
       return (
         <UIIconCreateIcon
-          // @ts-ignore
           ref={ref}
-          {...props}
+          {...inComingProps}
           className={iconStyle({ size, class: className })}
         />
       );
diff --git a/next/components/ui/icon/index.web.tsx b/next/components/ui/icon/index.web.tsx
index d296a4f8..424ed1d0 100644
--- a/next/components/ui/icon/index.web.tsx
+++ b/next/components/ui/icon/index.web.tsx
@@ -1,89 +1,16 @@
-import React, { useMemo } from 'react';
+'use client';
+import React from 'react';
 import { createIcon } from '@gluestack-ui/icon';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { VariantProps } from '@gluestack-ui/nativewind-utils';
-
-const accessClassName = (style: any) => {
-  const obj = style[0];
-  const keys = Object.keys(obj); //will return an array of keys
-  return obj[keys[1]];
-};
-
-const Svg = React.forwardRef<
-  React.ElementRef<'svg'>,
-  React.ComponentPropsWithoutRef<'svg'>
->(({ style, className, ...props }, ref) => {
-  const calculateClassName = useMemo(() => {
-    return className === undefined ? accessClassName(style) : className;
-  }, [className, style]);
-
-  return <svg ref={ref} {...props} className={calculateClassName} />;
-});
-
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
+import { PrimitiveIcon, Svg } from '@gluestack-ui/icon';
 
 export const UIIcon = createIcon({
   Root: PrimitiveIcon,
 });
 
 const iconStyle = tva({
-  base: 'text-typography-950 fill-none',
+  base: 'text-typography-950 fill-none pointer-events-none',
   variants: {
     size: {
       '2xs': 'h-3 w-3',
@@ -136,9 +63,14 @@ export const Icon = React.forwardRef<
 
 type ParameterTypes = Omit<Parameters<typeof createIcon>[0], 'Root'>;
 
-const createIconUI = ({ ...props }: ParameterTypes) => {
-  const UIIcon = createIcon({ Root: Svg, ...props });
+const accessClassName = (style: any) => {
+  const styleObject = Array.isArray(style) ? style[0] : style;
+  const keys = Object.keys(styleObject);
+  return styleObject[keys[1]];
+};
 
+const createIconUI = ({ ...props }: ParameterTypes) => {
+  const NewUIIcon = createIcon({ Root: Svg, ...props });
   return React.forwardRef<
     React.ElementRef<typeof UIIcon>,
     React.ComponentPropsWithoutRef<typeof UIIcon> &
@@ -146,16 +78,18 @@ const createIconUI = ({ ...props }: ParameterTypes) => {
         height?: number | string;
         width?: number | string;
       }
-  >(({ className, size, ...props }, ref) => {
+  >(({ className, ...inComingprops }, ref) => {
+    const calculateClassName = React.useMemo(() => {
+      return className === undefined
+        ? accessClassName(inComingprops?.style)
+        : className;
+    }, [className, inComingprops?.style]);
     return (
-      <UIIcon
-        ref={ref}
-        {...props}
-        className={iconStyle({ size, class: className })}
-      />
+      <NewUIIcon ref={ref} {...inComingprops} className={calculateClassName} />
     );
   });
 };
+
 export { createIconUI as createIcon };
 
 // All Icons
diff --git a/next/components/ui/image/index.tsx b/next/components/ui/image/index.tsx
index 26879c42..1afc87a2 100644
--- a/next/components/ui/image/index.tsx
+++ b/next/components/ui/image/index.tsx
@@ -4,7 +4,6 @@ import { createImage } from '@gluestack-ui/image';
 import { Platform, Image as RNImage } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { cssInterop } from 'nativewind';
 
 const imageStyle = tva({
   base: 'max-w-full',
@@ -18,12 +17,12 @@ const imageStyle = tva({
       'xl': 'h-32 w-32',
       '2xl': 'h-64 w-64',
       'full': 'h-full w-full',
+      'none': '',
     },
   },
 });
 
 const UIImage = createImage({ Root: RNImage });
-cssInterop(UIImage, { className: 'style' });
 
 type ImageProps = VariantProps<typeof imageStyle> &
   React.ComponentProps<typeof UIImage>;
@@ -36,10 +35,11 @@ const Image = React.forwardRef<
       className={imageStyle({ size, class: className })}
       {...props}
       ref={ref}
-      //@ts-ignore
+      // @ts-expect-error
       style={
         Platform.OS === 'web'
-          ? { height: 'revert-layer', width: 'revert-layer' }
+          ? // eslint-disable-next-line react-native/no-inline-styles
+            { height: 'revert-layer', width: 'revert-layer' }
           : undefined
       }
     />
diff --git a/next/components/ui/input/index.tsx b/next/components/ui/input/index.tsx
index 3f2658ea..97aa1351 100644
--- a/next/components/ui/input/index.tsx
+++ b/next/components/ui/input/index.tsx
@@ -1,76 +1,36 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createInput } from '@gluestack-ui/input';
-import { Svg } from 'react-native-svg';
-import { View, Pressable, TextInput, Platform } from 'react-native';
+import { View, Pressable, TextInput } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-const SCOPE = 'INPUT';
-
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
-
-const InputWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->(({ ...props }, ref) => {
-  return <View {...props} ref={ref} />;
-});
+const SCOPE = 'INPUT';
 
 const UIInput = createInput({
-  // @ts-ignore
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(InputWrapper, SCOPE)
-      : withStyleContextAndStates(InputWrapper, SCOPE),
-  Icon: PrimitiveIcon,
+  Root: withStyleContext(View, SCOPE),
+  Icon: UIIcon,
   Slot: Pressable,
-  Input: Platform.OS === 'web' ? TextInput : withStates(TextInput),
+  Input: TextInput,
+});
+
+cssInterop(PrimitiveIcon, {
+  className: {
+    target: 'style',
+    nativeStyleToProp: {
+      height: true,
+      width: true,
+      fill: true,
+      color: 'classNameColor',
+      stroke: true,
+    },
+  },
 });
 
 const inputStyle = tva({
@@ -141,25 +101,6 @@ const inputFieldStyle = tva({
   },
 });
 
-cssInterop(InputWrapper, { className: 'style' });
-cssInterop(UIInput.Slot, { className: 'style' });
-cssInterop(UIInput.Input, {
-  className: { target: 'style', nativeStyleToProp: { textAlign: true } },
-});
-cssInterop(UIInput.Icon, {
-  className: {
-    target: 'style',
-    nativeStyleToProp: {
-      height: true,
-      width: true,
-      // @ts-ignore
-      fill: true,
-      color: true,
-      stroke: true,
-    },
-  },
-});
-
 type IInputProps = React.ComponentProps<typeof UIInput> &
   VariantProps<typeof inputStyle> & { className?: string };
 const Input = React.forwardRef<React.ElementRef<typeof UIInput>, IInputProps>(
diff --git a/next/components/ui/link/index.tsx b/next/components/ui/link/index.tsx
index 04e8d83f..a17b0b72 100644
--- a/next/components/ui/link/index.tsx
+++ b/next/components/ui/link/index.tsx
@@ -1,22 +1,17 @@
 'use client';
 import { createLink } from '@gluestack-ui/link';
-import { Pressable, Platform } from 'react-native';
+import { Pressable } from 'react-native';
 import { Text } from 'react-native';
 
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 import React from 'react';
 export const UILink = createLink({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(Pressable)
-      : withStyleContextAndStates(Pressable),
-  Text: Platform.OS === 'web' ? Text : withStates(Text),
+  Root: withStyleContext(Pressable),
+  Text: Text,
 });
 
 cssInterop(UILink, { className: 'style' });
diff --git a/next/components/ui/menu/index.tsx b/next/components/ui/menu/index.tsx
index 2eeffb62..1a3573ca 100644
--- a/next/components/ui/menu/index.tsx
+++ b/next/components/ui/menu/index.tsx
@@ -3,10 +3,9 @@ import React from 'react';
 import { createMenu } from '@gluestack-ui/menu';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { cssInterop } from 'nativewind';
-import { Pressable, Text, Platform, View } from 'react-native';
+import { Pressable, Text, View } from 'react-native';
 import { Motion, AnimatePresence } from '@legendapp/motion';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 
 const menuStyle = tva({
   base: 'rounded-md bg-background-0 border border-outline-100 p-1 shadow-hard-5',
@@ -115,15 +114,14 @@ const Separator = React.forwardRef(
 );
 export const UIMenu = createMenu({
   Root: Motion.View,
-  Item: Platform.OS === 'web' ? Item : withStates(Item),
+  Item: Item,
   Label: Text,
   Backdrop: BackdropPressable,
   AnimatePresence: AnimatePresence,
   Separator: Separator,
 });
 
-cssInterop(UIMenu, { className: 'style' });
-cssInterop(UIMenu.ItemLabel, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
 
 type IMenuProps = React.ComponentProps<typeof UIMenu> &
   VariantProps<typeof menuStyle> & { className?: string };
diff --git a/next/components/ui/modal/index.tsx b/next/components/ui/modal/index.tsx
index f19e5118..e38fef1c 100644
--- a/next/components/ui/modal/index.tsx
+++ b/next/components/ui/modal/index.tsx
@@ -1,7 +1,7 @@
 'use client';
 import React from 'react';
 import { createModal } from '@gluestack-ui/modal';
-import { Pressable, View, ScrollView, Platform } from 'react-native';
+import { Pressable, View, ScrollView } from 'react-native';
 import {
   Motion,
   AnimatePresence,
@@ -12,19 +12,14 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 const AnimatedPressable = createMotionAnimatedComponent(Pressable);
-
 const SCOPE = 'MODAL';
 
 const UIModal = createModal({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(View, SCOPE),
+  Root: withStyleContext(View, SCOPE),
   Backdrop: AnimatedPressable,
   Content: Motion.View,
   Body: ScrollView,
@@ -33,17 +28,9 @@ const UIModal = createModal({
   Header: View,
   AnimatePresence: AnimatePresence,
 });
-cssInterop(UIModal, { className: 'style' });
-cssInterop(UIModal.Backdrop, { className: 'style' });
-cssInterop(UIModal.Content, { className: 'style' });
-cssInterop(UIModal.CloseButton, { className: 'style' });
-cssInterop(UIModal.Header, { className: 'style' });
-cssInterop(UIModal.Body, {
-  className: 'style',
-  contentContainerClassName: 'contentContainerStyle',
-  indicatorClassName: 'indicatorStyle',
-});
-cssInterop(UIModal.Footer, { className: 'style' });
+
+cssInterop(AnimatedPressable, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
 
 const modalStyle = tva({
   base: 'group/modal w-full h-full justify-center items-center web:pointer-events-none',
@@ -76,7 +63,7 @@ const modalContentStyle = tva({
 });
 
 const modalBodyStyle = tva({
-  base: 'mt-4 mb-6',
+  base: 'mt-2 mb-6',
 });
 
 const modalCloseButtonStyle = tva({
diff --git a/next/components/ui/popover/index.tsx b/next/components/ui/popover/index.tsx
index 3854379e..5d53d65a 100644
--- a/next/components/ui/popover/index.tsx
+++ b/next/components/ui/popover/index.tsx
@@ -1,6 +1,6 @@
 'use client';
 import React from 'react';
-import { View, Pressable, Platform, ScrollView } from 'react-native';
+import { View, Pressable, ScrollView } from 'react-native';
 import {
   Motion,
   createMotionAnimatedComponent,
@@ -12,26 +12,15 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 const AnimatedPressable = createMotionAnimatedComponent(Pressable);
 const SCOPE = 'POPOVER';
-const ArrowWrapper = React.forwardRef(({ ...props }, ref) => {
-  return <Motion.View {...props} ref={ref} />;
-}) as React.ForwardRefExoticComponent<
-  React.ElementRef<typeof Motion.View> &
-    React.ComponentProps<typeof Motion.View>
->;
+
 const UIPopover = createPopover({
-  Root: (Platform.OS === 'web'
-    ? withStyleContext(View, SCOPE)
-    : withStyleContextAndStates(View, SCOPE)) as ReturnType<
-    typeof withStyleContext<typeof View>
-  >,
-  Arrow: Platform.OS === 'web' ? Motion.View : withStates(ArrowWrapper),
+  Root: withStyleContext(View, SCOPE),
+  Arrow: Motion.View,
   Backdrop: AnimatedPressable,
   Body: ScrollView,
   CloseButton: Pressable,
@@ -41,18 +30,8 @@ const UIPopover = createPopover({
   AnimatePresence: AnimatePresence,
 });
 
-cssInterop(UIPopover, { className: 'style' });
-cssInterop(ArrowWrapper, { className: 'style' });
-cssInterop(UIPopover.Content, { className: 'style' });
-cssInterop(UIPopover.Header, { className: 'style' });
-cssInterop(UIPopover.Footer, { className: 'style' });
-cssInterop(UIPopover.Body, {
-  className: 'style',
-  contentContainerClassName: 'contentContainerStyle',
-  indicatorClassName: 'indicatorStyle',
-});
-cssInterop(UIPopover.Backdrop, { className: 'style' });
-cssInterop(UIPopover.CloseButton, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
+cssInterop(AnimatedPressable, { className: 'style' });
 
 const popoverStyle = tva({
   base: 'group/popover w-full h-full justify-center items-center web:pointer-events-none',
@@ -72,29 +51,29 @@ const popoverArrowStyle = tva({
   variants: {
     placement: {
       'top left':
-        'data-[flip=false]:border-t-transparent data-[flip=false]:border-l-transparent data-[flip=true]:border-b-transparent data-[flip=true]:border-r-transparent',
+        'data-[flip=false]:border-t-0 data-[flip=false]:border-l-0 data-[flip=true]:border-b-0 data-[flip=true]:border-r-0',
       'top':
-        'data-[flip=false]:border-t-transparent data-[flip=false]:border-l-transparent data-[flip=true]:border-b-transparent data-[flip=true]:border-r-transparent',
+        'data-[flip=false]:border-t-0 data-[flip=false]:border-l-0 data-[flip=true]:border-b-0 data-[flip=true]:border-r-0',
       'top right':
-        'data-[flip=false]:border-t-transparent data-[flip=false]:border-l-transparent data-[flip=true]:border-b-transparent data-[flip=true]:border-r-transparent',
+        'data-[flip=false]:border-t-0 data-[flip=false]:border-l-0 data-[flip=true]:border-b-0 data-[flip=true]:border-r-0',
       'bottom':
-        'data-[flip=false]:border-b-transparent data-[flip=false]:border-r-transparent data-[flip=true]:border-t-transparent data-[flip=true]:border-l-transparent',
+        'data-[flip=false]:border-b-0 data-[flip=false]:border-r-0 data-[flip=true]:border-t-0 data-[flip=true]:border-l-0',
       'bottom left':
-        'data-[flip=false]:border-b-transparent data-[flip=false]:border-r-transparent data-[flip=true]:border-t-transparent data-[flip=true]:border-l-transparent',
+        'data-[flip=false]:border-b-0 data-[flip=false]:border-r-0 data-[flip=true]:border-t-0 data-[flip=true]:border-l-0',
       'bottom right':
-        'data-[flip=false]:border-b-transparent data-[flip=false]:border-r-transparent data-[flip=true]:border-t-transparent data-[flip=true]:border-l-transparent',
+        'data-[flip=false]:border-b-0 data-[flip=false]:border-r-0 data-[flip=true]:border-t-0 data-[flip=true]:border-l-0',
       'left':
-        'data-[flip=false]:border-l-transparent data-[flip=false]:border-b-transparent data-[flip=true]:border-r-transparent data-[flip=true]:border-t-transparent',
+        'data-[flip=false]:border-l-0 data-[flip=false]:border-b-0 data-[flip=true]:border-r-0 data-[flip=true]:border-t-0',
       'left top':
-        'data-[flip=false]:border-l-transparent data-[flip=false]:border-b-transparent data-[flip=true]:border-r-transparent data-[flip=true]:border-t-transparent',
+        'data-[flip=false]:border-l-0 data-[flip=false]:border-b-0 data-[flip=true]:border-r-0 data-[flip=true]:border-t-0',
       'left bottom':
-        'data-[flip=false]:border-l-transparent data-[flip=false]:border-b-transparent data-[flip=true]:border-r-transparent data-[flip=true]:border-t-transparent',
+        'data-[flip=false]:border-l-0 data-[flip=false]:border-b-0 data-[flip=true]:border-r-0 data-[flip=true]:border-t-0',
       'right':
-        'data-[flip=false]:border-r-transparent data-[flip=false]:border-t-transparent data-[flip=true]:border-l-transparent data-[flip=true]:border-b-transparent',
+        'data-[flip=false]:border-r-0 data-[flip=false]:border-t-0 data-[flip=true]:border-l-0 data-[flip=true]:border-b-0',
       'right top':
-        'data-[flip=false]:border-r-transparent data-[flip=false]:border-t-transparent data-[flip=true]:border-l-transparent data-[flip=true]:border-b-transparent',
+        'data-[flip=false]:border-r-0 data-[flip=false]:border-t-0 data-[flip=true]:border-l-0 data-[flip=true]:border-b-0',
       'right bottom':
-        'data-[flip=false]:border-r-transparent data-[flip=false]:border-t-transparent data-[flip=true]:border-l-transparent data-[flip=true]:border-b-transparent',
+        'data-[flip=false]:border-r-0 data-[flip=false]:border-t-0 data-[flip=true]:border-l-0 data-[flip=true]:border-b-0',
     },
   },
 });
@@ -167,7 +146,6 @@ const Popover = React.forwardRef<
       ref={ref}
       placement={placement}
       {...props}
-      // @ts-ignore
       className={popoverStyle({ size, class: className })}
       context={{ size, placement }}
       pointerEvents="box-none"
diff --git a/next/components/ui/pressable/index.tsx b/next/components/ui/pressable/index.tsx
index 9bfc0c72..e6e5e0b4 100644
--- a/next/components/ui/pressable/index.tsx
+++ b/next/components/ui/pressable/index.tsx
@@ -1,27 +1,20 @@
 'use client';
 import React from 'react';
 import { createPressable } from '@gluestack-ui/pressable';
-import { Pressable as RNPressable, Platform } from 'react-native';
+import { Pressable as RNPressable } from 'react-native';
 
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 const UIPressable = createPressable({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(RNPressable)
-      : withStyleContextAndStates(RNPressable),
+  Root: withStyleContext(RNPressable),
 });
 
 const pressableStyle = tva({
   base: 'data-[focus-visible=true]:outline-none data-[focus-visible=true]:ring-indicator-info data-[focus-visible=true]:ring-2 data-[disabled=true]:opacity-40',
 });
 
-cssInterop(UIPressable, { className: 'style' });
-
 type IPressableProps = Omit<
   React.ComponentProps<typeof UIPressable>,
   'context'
diff --git a/next/components/ui/progress/index.tsx b/next/components/ui/progress/index.tsx
index d098dfdc..c51ac3d0 100644
--- a/next/components/ui/progress/index.tsx
+++ b/next/components/ui/progress/index.tsx
@@ -9,6 +9,7 @@ import {
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+
 const SCOPE = 'PROGRESS';
 export const UIProgress = createProgress({
   Root: withStyleContext(View, SCOPE),
@@ -21,6 +22,10 @@ cssInterop(UIProgress.FilledTrack, { className: 'style' });
 const progressStyle = tva({
   base: 'bg-background-300 rounded-full w-full',
   variants: {
+    orientation: {
+      horizontal: 'w-full',
+      vertical: 'h-full',
+    },
     size: {
       'xs': 'h-1',
       'sm': 'h-2',
@@ -30,10 +35,48 @@ const progressStyle = tva({
       '2xl': 'h-6',
     },
   },
+  compoundVariants: [
+    {
+      orientation: 'vertical',
+      size: 'xs',
+      class: 'h-full w-1 justify-end',
+    },
+    {
+      orientation: 'vertical',
+      size: 'sm',
+      class: 'h-full w-2 justify-end',
+    },
+    {
+      orientation: 'vertical',
+      size: 'md',
+      class: 'h-full w-3 justify-end',
+    },
+    {
+      orientation: 'vertical',
+      size: 'lg',
+      class: 'h-full w-4 justify-end',
+    },
+
+    {
+      orientation: 'vertical',
+      size: 'xl',
+      class: 'h-full w-5 justify-end',
+    },
+    {
+      orientation: 'vertical',
+      size: '2xl',
+      class: 'h-full w-6 justify-end',
+    },
+  ],
 });
+
 const progressFilledTrackStyle = tva({
   base: 'bg-primary-500 rounded-full',
   parentVariants: {
+    orientation: {
+      horizontal: 'w-full',
+      vertical: 'h-full',
+    },
     size: {
       'xs': 'h-1',
       'sm': 'h-2',
@@ -43,6 +86,39 @@ const progressFilledTrackStyle = tva({
       '2xl': 'h-6',
     },
   },
+  parentCompoundVariants: [
+    {
+      orientation: 'vertical',
+      size: 'xs',
+      class: 'h-full w-1',
+    },
+    {
+      orientation: 'vertical',
+      size: 'sm',
+      class: 'h-full w-2',
+    },
+    {
+      orientation: 'vertical',
+      size: 'md',
+      class: 'h-full w-3',
+    },
+    {
+      orientation: 'vertical',
+      size: 'lg',
+      class: 'h-full w-4',
+    },
+
+    {
+      orientation: 'vertical',
+      size: 'xl',
+      class: 'h-full w-5',
+    },
+    {
+      orientation: 'vertical',
+      size: '2xl',
+      class: 'h-full w-6',
+    },
+  ],
 });
 
 type IProgressProps = VariantProps<typeof progressStyle> &
@@ -53,13 +129,14 @@ type IProgressFilledTrackProps = VariantProps<typeof progressFilledTrackStyle> &
 export const Progress = React.forwardRef<
   React.ElementRef<typeof UIProgress>,
   IProgressProps
->(({ className, size = 'md', ...props }, ref) => {
+>(({ className, size = 'md', orientation = 'horizontal', ...props }, ref) => {
   return (
     <UIProgress
       ref={ref}
       {...props}
-      className={progressStyle({ size, class: className })}
-      context={{ size }}
+      className={progressStyle({ size, orientation, class: className })}
+      context={{ size, orientation }}
+      orientation={orientation}
     />
   );
 });
@@ -68,7 +145,8 @@ export const ProgressFilledTrack = React.forwardRef<
   React.ElementRef<typeof UIProgress.FilledTrack>,
   IProgressFilledTrackProps
 >(({ className, ...props }, ref) => {
-  const { size: parentSize } = useStyleContext(SCOPE);
+  const { size: parentSize, orientation: parentOrientation } =
+    useStyleContext(SCOPE);
 
   return (
     <UIProgress.FilledTrack
@@ -76,6 +154,7 @@ export const ProgressFilledTrack = React.forwardRef<
       className={progressFilledTrackStyle({
         parentVariants: {
           size: parentSize,
+          orientation: parentOrientation,
         },
         class: className,
       })}
diff --git a/next/components/ui/radio/index.tsx b/next/components/ui/radio/index.tsx
index 837b0200..a32aee7d 100644
--- a/next/components/ui/radio/index.tsx
+++ b/next/components/ui/radio/index.tsx
@@ -1,7 +1,6 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createRadio } from '@gluestack-ui/radio';
-import { Svg } from 'react-native-svg';
 import { Pressable, View, Platform, Text } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
@@ -9,70 +8,34 @@ import {
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
-const IndicatorWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->(({ ...props }, ref) => {
-  return <View {...props} ref={ref} />;
-});
-
-const LabelWrapper = React.forwardRef<
-  React.ElementRef<typeof Text>,
-  React.ComponentProps<typeof Text>
->(({ ...props }, ref) => {
-  return <Text {...props} ref={ref} />;
-});
+const SCOPE = 'Radio';
 
-const IconWrapper = React.forwardRef<
-  React.ElementRef<typeof PrimitiveIcon>,
-  React.ComponentProps<typeof PrimitiveIcon>
->(({ ...props }, ref) => {
-  return <PrimitiveIcon {...props} ref={ref} />;
+const UIRadio = createRadio({
+  Root: (Platform.OS === 'web'
+    ? withStyleContext(View, SCOPE)
+    : withStyleContext(Pressable, SCOPE)) as ReturnType<
+    typeof withStyleContext<typeof Pressable>
+  >,
+  Group: View,
+  Icon: UIIcon,
+  Indicator: View,
+  Label: Text,
 });
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
+cssInterop(PrimitiveIcon, {
+  className: {
+    target: 'style',
+    nativeStyleToProp: {
+      height: true,
+      width: true,
+      fill: true,
+      color: 'classNameColor',
+      stroke: true,
+    },
+  },
 });
 
 const radioStyle = tva({
@@ -132,39 +95,6 @@ const radioLabelStyle = tva({
   },
 });
 
-const SCOPE = 'Radio';
-
-const UIRadio = createRadio({
-  Root: (Platform.OS === 'web'
-    ? withStyleContext(View, SCOPE)
-    : withStyleContextAndStates(Pressable, SCOPE)) as ReturnType<
-    typeof withStyleContextAndStates<typeof Pressable>
-  >,
-  Group: View,
-  Icon: Platform.OS === 'web' ? IconWrapper : withStates(IconWrapper),
-  Indicator:
-    Platform.OS === 'web' ? IndicatorWrapper : withStates(IndicatorWrapper),
-  Label: Platform.OS === 'web' ? LabelWrapper : withStates(LabelWrapper),
-});
-
-cssInterop(UIRadio, { className: 'style' });
-cssInterop(UIRadio.Group, { className: 'style' });
-cssInterop(IndicatorWrapper, { className: 'style' });
-cssInterop(LabelWrapper, { className: 'style' });
-cssInterop(IconWrapper, {
-  className: {
-    target: 'style',
-    nativeStyleToProp: {
-      height: true,
-      width: true,
-      // @ts-ignore
-      fill: true,
-      color: true,
-      stroke: true,
-    },
-  },
-});
-
 type IRadioProps = Omit<React.ComponentProps<typeof UIRadio>, 'context'> &
   VariantProps<typeof radioStyle>;
 const Radio = React.forwardRef<React.ElementRef<typeof UIRadio>, IRadioProps>(
diff --git a/next/components/ui/select/index.tsx b/next/components/ui/select/index.tsx
index 2c6ec85f..a81cd3e5 100644
--- a/next/components/ui/select/index.tsx
+++ b/next/components/ui/select/index.tsx
@@ -1,7 +1,8 @@
-import React, { useMemo } from 'react';
+'use client';
+
+import React from 'react';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { Svg } from 'react-native-svg';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import {
   withStyleContext,
   useStyleContext,
@@ -23,7 +24,7 @@ import {
   ActionsheetSectionList,
   ActionsheetSectionHeaderText,
 } from './select-actionsheet';
-import { Pressable, View, TextInput, Platform } from 'react-native';
+import { Pressable, View, TextInput } from 'react-native';
 
 const SelectTriggerWrapper = React.forwardRef<
   React.ElementRef<typeof Pressable>,
@@ -87,73 +88,12 @@ const selectInputStyle = tva({
   },
 });
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
-
 const UISelect = createSelect(
   {
     Root: View,
-    Trigger:
-      Platform.OS === 'web'
-        ? withStyleContext(SelectTriggerWrapper)
-        : withStyleContextAndStates(SelectTriggerWrapper),
+    Trigger: withStyleContext(SelectTriggerWrapper),
     Input: TextInput,
-    Icon: PrimitiveIcon,
+    Icon: UIIcon,
   },
   {
     Portal: Actionsheet,
@@ -176,8 +116,8 @@ cssInterop(UISelect.Input, {
   className: { target: 'style', nativeStyleToProp: { textAlign: true } },
 });
 cssInterop(SelectTriggerWrapper, { className: 'style' });
-//@ts-ignore
-cssInterop(UISelect.Icon, {
+
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
@@ -308,7 +248,6 @@ const SelectContent = UISelect.Content;
 const SelectDragIndicator = UISelect.DragIndicator;
 const SelectDragIndicatorWrapper = UISelect.DragIndicatorWrapper;
 const SelectItem = UISelect.Item;
-const SelectItemText = UISelect.ItemText;
 const SelectScrollView = UISelect.ScrollView;
 const SelectVirtualizedList = UISelect.VirtualizedList;
 const SelectFlatList = UISelect.FlatList;
@@ -326,7 +265,6 @@ export {
   SelectDragIndicator,
   SelectDragIndicatorWrapper,
   SelectItem,
-  SelectItemText,
   SelectScrollView,
   SelectVirtualizedList,
   SelectFlatList,
diff --git a/next/components/ui/select/select-actionsheet.tsx b/next/components/ui/select/select-actionsheet.tsx
index ee3f1ebf..61ab0787 100644
--- a/next/components/ui/select/select-actionsheet.tsx
+++ b/next/components/ui/select/select-actionsheet.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import { H4 } from '@expo/html-elements';
 import { createActionsheet } from '@gluestack-ui/actionsheet';
 import {
@@ -8,13 +10,11 @@ import {
   VirtualizedList,
   FlatList,
   SectionList,
-  Platform,
 } from 'react-native';
-
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
 import {
   Motion,
@@ -22,59 +22,14 @@ import {
   createMotionAnimatedComponent,
 } from '@legendapp/motion';
 
-import React, { useMemo } from 'react';
-import { Svg } from 'react-native-svg';
+import React from 'react';
 
 const AnimatedPressable = createMotionAnimatedComponent(Pressable);
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
-
 export const UIActionsheet = createActionsheet({
   Root: View,
   Content: withStyleContext(Motion.View),
-  Item:
-    Platform.OS === 'web'
-      ? withStyleContext(Pressable)
-      : withStyleContextAndStates(Pressable),
+  Item: withStyleContext(Pressable),
   ItemText: Text,
   DragIndicator: View,
   IndicatorWrapper: View,
@@ -84,7 +39,7 @@ export const UIActionsheet = createActionsheet({
   FlatList: FlatList,
   SectionList: SectionList,
   SectionHeaderText: H4,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
   AnimatePresence: AnimatePresence,
 });
 
@@ -117,7 +72,18 @@ cssInterop(UIActionsheet.FlatList, {
 });
 cssInterop(UIActionsheet.SectionList, { className: 'style' });
 cssInterop(UIActionsheet.SectionHeaderText, { className: 'style' });
-cssInterop(UIActionsheet.Icon, { className: 'style' });
+cssInterop(PrimitiveIcon, {
+  className: {
+    target: 'style',
+    nativeStyleToProp: {
+      height: true,
+      width: true,
+      fill: true,
+      color: 'classNameColor',
+      stroke: true,
+    },
+  },
+});
 
 const actionsheetStyle = tva({ base: 'w-full h-full web:pointer-events-none' });
 
diff --git a/next/components/ui/slider/index.tsx b/next/components/ui/slider/index.tsx
index 455ccd2c..77c70c6d 100644
--- a/next/components/ui/slider/index.tsx
+++ b/next/components/ui/slider/index.tsx
@@ -1,47 +1,30 @@
 'use client';
 import { createSlider } from '@gluestack-ui/slider';
 import { Pressable } from 'react-native';
-import { View, Platform } from 'react-native';
+import { View } from 'react-native';
 import React from 'react';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-
-const ThumbWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->((props, ref) => <View ref={ref} {...props} />);
-
-const FilledTrackWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->((props, ref) => <View ref={ref} {...props} />);
+import { cssInterop } from 'nativewind';
 
 const SCOPE = 'SLIDER';
+const Root = withStyleContext(View, SCOPE);
 export const UISlider = createSlider({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(View, SCOPE),
-  Thumb: Platform.OS === 'web' ? ThumbWrapper : withStates(View),
+  Root: Root,
+  Thumb: View,
   Track: Pressable,
-  FilledTrack: Platform.OS === 'web' ? FilledTrackWrapper : withStates(View),
+  FilledTrack: View,
   ThumbInteraction: View,
 });
 
-cssInterop(UISlider, { className: 'style' });
-cssInterop(ThumbWrapper, { className: 'style' });
 cssInterop(UISlider.Track, { className: 'style' });
-cssInterop(FilledTrackWrapper, { className: 'style' });
 
 const sliderStyle = tva({
-  base: 'justify-center items-center data-[disabled=true]:web:opacity-40 data-[disabled=true]:web:pointer-events-none',
+  base: 'justify-center items-center data-[disabled=true]:opacity-40 data-[disabled=true]:web:pointer-events-none',
   variants: {
     orientation: {
       horizontal: 'w-full',
@@ -60,7 +43,7 @@ const sliderStyle = tva({
 });
 
 const sliderThumbStyle = tva({
-  base: 'bg-primary-500 absolute rounded-full data-[focus=true]:bg-primary-600 data-[active=true]:bg-primary-600 data-[hover=true]:bg-primary-600 data-[disabled=true]:bg-primary-500 web:cursor-pointer web:active:outline-4 web:active:outline web:active:outline-primary-400 data-[focus=true]:web:outline-4 data-[focus=true]:web:outline data-[focus=true]:web:outline-primary-400 shadow-hard-1',
+  base: 'bg-primary-500 absolute rounded-full data-[focus=true]:bg-primary-600 data-[active=true]:bg-primary-600 data-[hover=true]:bg-primary-600 data-[disabled=true]:bg-primary-500 web:cursor-pointer web:data-[active=true]:outline web:data-[active=true]:outline-4 web:data-[active=true]:outline-primary-400 shadow-hard-1',
 
   parentVariants: {
     size: {
@@ -213,7 +196,6 @@ export const SliderThumb = React.forwardRef<
 
   return (
     <UISlider.Thumb
-      //@ts-ignore
       ref={ref}
       {...props}
       className={sliderThumbStyle({
@@ -269,7 +251,6 @@ export const SliderFilledTrack = React.forwardRef<
 
   return (
     <UISlider.FilledTrack
-      //@ts-ignore
       ref={ref}
       {...props}
       className={sliderFilledTrackStyle({
diff --git a/next/components/ui/spinner/index.tsx b/next/components/ui/spinner/index.tsx
index 8f6a7c51..19e88207 100644
--- a/next/components/ui/spinner/index.tsx
+++ b/next/components/ui/spinner/index.tsx
@@ -1,33 +1,41 @@
 'use client';
 import { ActivityIndicator } from 'react-native';
 import React from 'react';
-import { createSpinner } from '@gluestack-ui/spinner';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { cssInterop } from 'nativewind';
 
-const UISpinner = createSpinner({ Root: ActivityIndicator });
-
-cssInterop(UISpinner, {
+cssInterop(ActivityIndicator, {
   className: { target: 'style', nativeStyleToProp: { color: true } },
 });
 
 const spinnerStyle = tva({});
 
-type ISpinnerProps = React.ComponentProps<typeof UISpinner>;
-
 const Spinner = React.forwardRef<
-  React.ElementRef<typeof UISpinner>,
-  ISpinnerProps
->(({ className, color, ...props }, ref) => {
-  return (
-    <UISpinner
-      ref={ref}
-      {...props}
-      color={color}
-      className={spinnerStyle({ class: className })}
-    />
-  );
-});
+  React.ElementRef<typeof ActivityIndicator>,
+  React.ComponentProps<typeof ActivityIndicator>
+>(
+  (
+    {
+      className,
+      color,
+      focusable = false,
+      'aria-label': ariaLabel = 'loading',
+      ...props
+    },
+    ref
+  ) => {
+    return (
+      <ActivityIndicator
+        ref={ref}
+        focusable={focusable}
+        aria-label={ariaLabel}
+        {...props}
+        color={color}
+        className={spinnerStyle({ class: className })}
+      />
+    );
+  }
+);
 
 Spinner.displayName = 'Spinner';
 
diff --git a/next/components/ui/switch/index.tsx b/next/components/ui/switch/index.tsx
index 85d3e6de..c70e6668 100644
--- a/next/components/ui/switch/index.tsx
+++ b/next/components/ui/switch/index.tsx
@@ -1,29 +1,15 @@
 'use client';
 import React from 'react';
-import { Switch as RNSwitch, Platform } from 'react-native';
+import { Switch as RNSwitch } from 'react-native';
 import { createSwitch } from '@gluestack-ui/switch';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
-const SwitchWrapper = React.forwardRef<
-  React.ElementRef<typeof RNSwitch>,
-  React.ComponentProps<typeof RNSwitch>
->(({ ...props }, ref) => {
-  return <RNSwitch {...props} ref={ref} />;
-});
-
 const UISwitch = createSwitch({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(SwitchWrapper)
-      : withStyleContextAndStates(SwitchWrapper),
+  Root: withStyleContext(RNSwitch),
 });
 
-cssInterop(SwitchWrapper, { className: 'style' });
-
 const switchStyle = tva({
   base: 'data-[focus=true]:outline-0 data-[focus=true]:ring-2 data-[focus=true]:ring-indicator-primary web:cursor-pointer disabled:cursor-not-allowed data-[disabled=true]:opacity-40 data-[invalid=true]:border-error-700 data-[invalid=true]:rounded-xl data-[invalid=true]:border-2',
 
diff --git a/next/components/ui/table/index.tsx b/next/components/ui/table/index.tsx
index 9cdd0f04..10fbd675 100644
--- a/next/components/ui/table/index.tsx
+++ b/next/components/ui/table/index.tsx
@@ -7,6 +7,7 @@ import {
   TR as ExpoTR,
   Caption as ExpoTCaption,
 } from '@expo/html-elements';
+
 import {
   tableStyle,
   tableHeaderStyle,
@@ -19,8 +20,16 @@ import {
 } from './styles';
 import { Text, View } from 'react-native';
 
-const TableHeaderContext = createContext<any>({});
-const TableFooterContext = createContext<any>({});
+const TableHeaderContext = createContext<{
+  isHeaderRow: boolean;
+}>({
+  isHeaderRow: false,
+});
+const TableFooterContext = createContext<{
+  isFooterRow: boolean;
+}>({
+  isFooterRow: false,
+});
 
 type ITableProps = React.ComponentProps<typeof ExpoTable>;
 type ITableHeaderProps = React.ComponentProps<typeof ExpoTHead>;
@@ -39,6 +48,7 @@ const Table = React.forwardRef<React.ElementRef<typeof ExpoTable>, ITableProps>(
   ({ className, ...props }, ref) => {
     return (
       <ExpoTable
+        // @ts-expect-error
         ref={ref}
         className={tableStyle({ class: className })}
         {...props}
@@ -59,6 +69,7 @@ const TableHeader = React.forwardRef<
   return (
     <TableHeaderContext.Provider value={contextValue}>
       <ExpoTHead
+        // @ts-expect-error
         ref={ref}
         className={tableHeaderStyle({ class: className })}
         {...props}
@@ -73,6 +84,7 @@ const TableBody = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <ExpoTBody
+      // @ts-expect-error
       ref={ref}
       className={tableBodyStyle({ class: className })}
       {...props}
@@ -92,6 +104,7 @@ const TableFooter = React.forwardRef<
   return (
     <TableFooterContext.Provider value={contextValue}>
       <ExpoTFoot
+        // @ts-expect-error
         ref={ref}
         className={tableFooterStyle({ class: className })}
         {...props}
@@ -132,6 +145,7 @@ const TableRow = React.forwardRef<
 
   return (
     <ExpoTR
+      // @ts-expect-error
       ref={ref}
       className={tableRowStyleStyle({
         isHeaderRow,
@@ -172,6 +186,7 @@ const TableCaption = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <ExpoTCaption
+      // @ts-expect-error
       ref={ref}
       className={tableCaptionStyle({ class: className })}
       {...props}
diff --git a/next/components/ui/table/index.web.tsx b/next/components/ui/table/index.web.tsx
index a6a3a79a..e8c848f0 100644
--- a/next/components/ui/table/index.web.tsx
+++ b/next/components/ui/table/index.web.tsx
@@ -10,8 +10,16 @@ import {
   tableCaptionStyle,
 } from './styles';
 
-const TableHeaderContext = createContext<any>({});
-const TableFooterContext = createContext<any>({});
+const TableHeaderContext = createContext<{
+  isHeaderRow: boolean;
+}>({
+  isHeaderRow: false,
+});
+const TableFooterContext = createContext<{
+  isFooterRow: boolean;
+}>({
+  isFooterRow: false,
+});
 
 const Table = React.forwardRef(({ className, ...props }: any, ref?: any) => {
   return (
diff --git a/next/components/ui/textarea/index.tsx b/next/components/ui/textarea/index.tsx
index 4a5fd19f..0a9b0d90 100644
--- a/next/components/ui/textarea/index.tsx
+++ b/next/components/ui/textarea/index.tsx
@@ -1,36 +1,18 @@
 'use client';
 import React from 'react';
 import { createTextarea } from '@gluestack-ui/textarea';
-import { View, TextInput, Platform } from 'react-native';
+import { View, TextInput } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
-const TextareaWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->(({ ...props }, ref) => {
-  return <View {...props} ref={ref} />;
-});
-
 const SCOPE = 'TEXTAREA';
 const UITextarea = createTextarea({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(TextareaWrapper, SCOPE)
-      : withStyleContextAndStates(TextareaWrapper, SCOPE),
-  Input: Platform.OS === 'web' ? TextInput : withStates(TextInput),
-});
-
-cssInterop(TextareaWrapper, { className: 'style' });
-cssInterop(UITextarea.Input, {
-  className: { target: 'style', nativeStyleToProp: { textAlign: true } },
+  Root: withStyleContext(View, SCOPE),
+  Input: TextInput,
 });
 
 const textareaStyle = tva({
diff --git a/next/components/ui/toast/index.tsx b/next/components/ui/toast/index.tsx
index 21c1f668..9acc3843 100644
--- a/next/components/ui/toast/index.tsx
+++ b/next/components/ui/toast/index.tsx
@@ -1,7 +1,7 @@
 'use client';
 import React from 'react';
-import { createToast, createToastHook } from '@gluestack-ui/toast';
-import { Text, View, Platform } from 'react-native';
+import { createToastHook } from '@gluestack-ui/toast';
+import { AccessibilityInfo, Text, View } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { cssInterop } from 'nativewind';
 import { Motion, AnimatePresence } from '@legendapp/motion';
@@ -9,24 +9,12 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 export const useToast = createToastHook(Motion.View, AnimatePresence);
 const SCOPE = 'TOAST';
-export const UIToast = createToast({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(View, SCOPE),
-  Title: Text,
-  Description: Text,
-});
 
 cssInterop(Motion.View, { className: 'style' });
-cssInterop(UIToast, { className: 'style' });
-cssInterop(UIToast.Title, { className: 'style' });
-cssInterop(UIToast.Description, { className: 'style' });
 
 const toastStyle = tva({
   base: 'p-4 m-1 rounded-md gap-1 web:pointer-events-auto shadow-hard-5 border-outline-100',
@@ -36,7 +24,7 @@ const toastStyle = tva({
       warning: 'bg-warning-700',
       success: 'bg-success-700',
       info: 'bg-info-700',
-      muted: 'bg-secondary-700',
+      muted: 'bg-background-800',
     },
 
     variant: {
@@ -154,16 +142,17 @@ const toastDescriptionStyle = tva({
   },
 });
 
-type IToastProps = React.ComponentProps<typeof UIToast> & {
+const Root = withStyleContext(View, SCOPE);
+type IToastProps = React.ComponentProps<typeof Root> & {
   className?: string;
 } & VariantProps<typeof toastStyle>;
 
 export const Toast = React.forwardRef<
-  React.ElementRef<typeof UIToast>,
+  React.ElementRef<typeof Root>,
   IToastProps
 >(({ className, variant = 'solid', action = 'muted', ...props }, ref) => {
   return (
-    <UIToast
+    <Root
       ref={ref}
       className={toastStyle({ variant, action, class: className })}
       context={{ variant, action }}
@@ -172,20 +161,29 @@ export const Toast = React.forwardRef<
   );
 });
 
-type IToastTitleProps = React.ComponentProps<typeof UIToast.Title> & {
+type IToastTitleProps = React.ComponentProps<typeof Text> & {
   className?: string;
 } & VariantProps<typeof toastTitleStyle>;
 
 export const ToastTitle = React.forwardRef<
-  React.ElementRef<typeof UIToast.Title>,
+  React.ElementRef<typeof Text>,
   IToastTitleProps
->(({ className, size = 'md', ...props }, ref) => {
+>(({ className, size = 'md', children, ...props }, ref) => {
   const { variant: parentVariant, action: parentAction } =
     useStyleContext(SCOPE);
+  React.useEffect(() => {
+    // Issue from react-native side
+    // Hack for now, will fix this later
+    AccessibilityInfo.announceForAccessibility(children as string);
+  }, [children]);
+
   return (
-    <UIToast.Title
-      ref={ref}
+    <Text
       {...props}
+      ref={ref}
+      aria-live="assertive"
+      aria-atomic="true"
+      role="alert"
       className={toastTitleStyle({
         size,
         class: className,
@@ -194,23 +192,23 @@ export const ToastTitle = React.forwardRef<
           action: parentAction,
         },
       })}
-    />
+    >
+      {children}
+    </Text>
   );
 });
 
-type IToastDescriptionProps = React.ComponentProps<
-  typeof UIToast.Description
-> & {
+type IToastDescriptionProps = React.ComponentProps<typeof Text> & {
   className?: string;
 } & VariantProps<typeof toastDescriptionStyle>;
 
 export const ToastDescription = React.forwardRef<
-  React.ElementRef<typeof UIToast.Description>,
+  React.ElementRef<typeof Text>,
   IToastDescriptionProps
 >(({ className, size = 'md', ...props }, ref) => {
   const { variant: parentVariant } = useStyleContext(SCOPE);
   return (
-    <UIToast.Description
+    <Text
       ref={ref}
       {...props}
       className={toastDescriptionStyle({
diff --git a/next/components/ui/tooltip/index.tsx b/next/components/ui/tooltip/index.tsx
index 12315983..eec46228 100644
--- a/next/components/ui/tooltip/index.tsx
+++ b/next/components/ui/tooltip/index.tsx
@@ -1,25 +1,21 @@
 'use client';
 import React from 'react';
 import { createTooltip } from '@gluestack-ui/tooltip';
-import { View, Text, Platform } from 'react-native';
+import { View, Text } from 'react-native';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { cssInterop } from 'nativewind';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-
 import { Motion, AnimatePresence } from '@legendapp/motion';
-
+import { cssInterop } from 'nativewind';
 export const UITooltip = createTooltip({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View)
-      : withStyleContextAndStates(View),
+  Root: withStyleContext(View),
   Content: Motion.View,
   Text: Text,
   AnimatePresence: AnimatePresence,
 });
 
+cssInterop(Motion.View, { className: 'style' });
+
 const tooltipStyle = tva({
   base: 'w-full h-full web:pointer-events-none',
 });
@@ -71,10 +67,6 @@ const tooltipTextStyle = tva({
   },
 });
 
-cssInterop(UITooltip, { className: 'style' });
-cssInterop(UITooltip.Content, { className: 'style' });
-cssInterop(UITooltip.Text, { className: 'style' });
-
 type ITooltipProps = React.ComponentProps<typeof UITooltip> &
   VariantProps<typeof tooltipStyle> & { className?: string };
 type ITooltipContentProps = React.ComponentProps<typeof UITooltip.Content> &
diff --git a/next/components/ui/utils/use-break-point-value.ts b/next/components/ui/utils/use-break-point-value.ts
new file mode 100644
index 00000000..bc4b59a7
--- /dev/null
+++ b/next/components/ui/utils/use-break-point-value.ts
@@ -0,0 +1,101 @@
+import { Dimensions, useWindowDimensions } from 'react-native';
+import { useEffect, useState } from 'react';
+
+import resolveConfig from 'tailwindcss/resolveConfig';
+import tailwindConfig from 'tailwind.config';
+
+const TailwindTheme = resolveConfig(tailwindConfig);
+const screenSize = TailwindTheme.theme.screens;
+
+type breakpoints = keyof typeof screenSize | 'default';
+
+type BreakPointValue = Partial<Record<breakpoints, any>>;
+
+const resolveScreenWidth: any = {
+  default: 0,
+};
+
+Object.entries(screenSize).forEach(([key, value]) => {
+  resolveScreenWidth[key] = parseInt(value.replace('px', ''), 10);
+});
+
+export const getBreakPointValue = (values: any, width: any) => {
+  if (typeof values !== 'object') return values;
+
+  let finalBreakPointResolvedValue: any;
+  const mediaQueriesBreakpoints: any = [
+    {
+      key: 'default',
+      breakpoint: 0,
+      isValid: true,
+    },
+  ];
+  Object.keys(resolveScreenWidth).forEach((key) => {
+    const isValid = isValidBreakpoint(resolveScreenWidth[key], width);
+
+    mediaQueriesBreakpoints.push({
+      key: key,
+      breakpoint: resolveScreenWidth[key],
+      isValid: isValid,
+    });
+  });
+
+  mediaQueriesBreakpoints.sort((a: any, b: any) => a.breakpoint - b.breakpoint);
+
+  mediaQueriesBreakpoints.forEach((breakpoint: any, index: any) => {
+    breakpoint.value = values.hasOwnProperty(breakpoint.key)
+      ? // @ts-ignore
+        values[breakpoint.key]
+      : mediaQueriesBreakpoints[index - 1]?.value ||
+        mediaQueriesBreakpoints[0]?.value;
+  });
+
+  const lastValidObject = getLastValidObject(mediaQueriesBreakpoints);
+
+  if (!lastValidObject) {
+    finalBreakPointResolvedValue = values;
+  } else {
+    finalBreakPointResolvedValue = lastValidObject?.value;
+  }
+  return finalBreakPointResolvedValue;
+};
+
+export function useBreakpointValue(values: BreakPointValue): any {
+  const { width } = useWindowDimensions();
+
+  const [currentBreakPointValue, setCurrentBreakPointValue] = useState(
+    getBreakPointValue(values, width)
+  );
+
+  useEffect(() => {
+    if (typeof values === 'object') {
+      const finalBreakPointResolvedValue = getBreakPointValue(values, width);
+      setCurrentBreakPointValue(finalBreakPointResolvedValue);
+    }
+  }, [values, width]);
+
+  if (typeof values !== 'object') return values;
+
+  return currentBreakPointValue;
+}
+
+export function isValidBreakpoint(
+  breakPointWidth: any,
+  width: any = Dimensions.get('window')?.width
+) {
+  const windowWidth = width;
+
+  if (windowWidth >= breakPointWidth) {
+    return true;
+  }
+  return false;
+}
+
+function getLastValidObject(mediaQueries: any) {
+  for (let i = mediaQueries.length - 1; i >= 0; i--) {
+    if (mediaQueries[i].isValid) {
+      return mediaQueries[i];
+    }
+  }
+  return null; // No valid object found
+}
diff --git a/next/gluestack-ui.config.json b/next/gluestack-ui.config.json
new file mode 100644
index 00000000..ea017727
--- /dev/null
+++ b/next/gluestack-ui.config.json
@@ -0,0 +1,10 @@
+{
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "styles/global.css"
+  },
+  "app": {
+    "entry": "app/layout.tsx",
+    "components": "components/ui"
+  }
+}
\ No newline at end of file
diff --git a/next/next.config.js b/next/next.config.js
index f9ea023b..bfd28b0a 100644
--- a/next/next.config.js
+++ b/next/next.config.js
@@ -1,37 +1,39 @@
 /** @type {import('next').NextConfig} */
+const { withGluestackUI } = require('@gluestack/ui-next-adapter');
 const { DefinePlugin } = require("webpack");
 
-module.exports = {
-  reactStrictMode: true,
-  transpilePackages: [
-    "@gluestack-ui/nativewind-utils",
-    "nativewind",
-    "react-native-css-interop",
-  ],
-  webpack: (config) => {
-    config.resolve.alias = {
-      ...(config.resolve.alias || {}),
-      // Transform all direct `react-native` imports to `react-native-web`
-      "react-native$": "react-native-web",
-    };
-    config.resolve.alias["@unitools/router"] = "@unitools/router-next";
-    config.resolve.alias["@unitools/image"] = "@unitools/image-next";
-    config.resolve.alias["@unitools/link"] = "@unitools/link-next";
-    config.resolve.extensions = [
-      ".web.js",
-      ".web.jsx",
-      ".web.ts",
-      ".web.tsx",
-      ...config.resolve.extensions,
-    ];
+const nextConfig = {
+    reactStrictMode: true,
+    transpilePackages: [
+        "@gluestack-ui/nativewind-utils",
+        "nativewind",
+        "react-native-css-interop",
+    ],
+    webpack: (config) => {
+        config.resolve.alias = {
+            ...(config.resolve.alias || {}),
+            // Transform all direct `react-native` imports to `react-native-web`
+            "react-native$": "react-native-web",
+        };
+        config.resolve.alias["@unitools/router"] = "@unitools/router-next";
+        config.resolve.alias["@unitools/image"] = "@unitools/image-next";
+        config.resolve.alias["@unitools/link"] = "@unitools/link-next";
+        config.resolve.extensions = [
+            ".web.js",
+            ".web.jsx",
+            ".web.ts",
+            ".web.tsx",
+            ...config.resolve.extensions,
+        ];
 
-    config.plugins.push(
-      new DefinePlugin({
-        __DEV__: JSON.stringify(process.env.NODE_ENV !== "production"),
-      })
-    );
+        config.plugins.push(
+            new DefinePlugin({
+                __DEV__: JSON.stringify(process.env.NODE_ENV !== "production"),
+            })
+        );
 
-    return config;
-  },
-  typescript: { ignoreBuildErrors: true },
+        return config;
+    },
+    typescript: { ignoreBuildErrors: true },
 };
+module.exports = withGluestackUI(nextConfig);
diff --git a/next/package.json b/next/package.json
index 9d50244e..780a5f7c 100644
--- a/next/package.json
+++ b/next/package.json
@@ -11,36 +11,36 @@
   },
   "dependencies": {
     "@expo/html-elements": "0.4.2",
-    "@gluestack-ui/accordion": "^1.0.4",
-    "@gluestack-ui/actionsheet": "^0.2.44",
-    "@gluestack-ui/alert": "^0.1.14",
-    "@gluestack-ui/alert-dialog": "^0.1.28",
-    "@gluestack-ui/avatar": "^0.1.17",
-    "@gluestack-ui/button": "^1.0.4",
-    "@gluestack-ui/checkbox": "^0.1.28",
-    "@gluestack-ui/divider": "^0.1.8",
-    "@gluestack-ui/fab": "^0.1.20",
-    "@gluestack-ui/form-control": "^0.1.17",
-    "@gluestack-ui/icon": "^0.1.21",
-    "@gluestack-ui/image": "^0.1.9",
-    "@gluestack-ui/input": "^0.1.29",
-    "@gluestack-ui/link": "^0.1.20",
-    "@gluestack-ui/menu": "^0.2.33",
-    "@gluestack-ui/modal": "^0.1.32",
-    "@gluestack-ui/nativewind-utils": "^1.0.23",
-    "@gluestack-ui/overlay": "latest",
-    "@gluestack-ui/popover": "^0.1.34",
-    "@gluestack-ui/pressable": "^0.1.16",
-    "@gluestack-ui/progress": "^0.1.14",
-    "@gluestack-ui/radio": "^0.1.29",
-    "@gluestack-ui/select": "^0.1.29",
-    "@gluestack-ui/slider": "^0.1.23",
-    "@gluestack-ui/spinner": "^0.1.14",
-    "@gluestack-ui/switch": "^0.1.21",
-    "@gluestack-ui/textarea": "^0.1.21",
-    "@gluestack-ui/toast": "^1.0.4",
-    "@gluestack-ui/tooltip": "^0.1.30",
-    "@gluestack/ui-next-adapter": "latest",
+    "@gluestack-ui/accordion": "^1.0.8",
+    "@gluestack-ui/actionsheet": "^0.2.46",
+    "@gluestack-ui/alert": "^0.1.16",
+    "@gluestack-ui/alert-dialog": "^0.1.32",
+    "@gluestack-ui/avatar": "^0.1.18",
+    "@gluestack-ui/button": "^1.0.8",
+    "@gluestack-ui/checkbox": "^0.1.33",
+    "@gluestack-ui/divider": "^0.1.10",
+    "@gluestack-ui/fab": "^0.1.22",
+    "@gluestack-ui/form-control": "^0.1.19",
+    "@gluestack-ui/icon": "^0.1.24-alpha.0",
+    "@gluestack-ui/image": "^0.1.11",
+    "@gluestack-ui/input": "^0.1.32",
+    "@gluestack-ui/link": "^0.1.23",
+    "@gluestack-ui/menu": "^0.2.37",
+    "@gluestack-ui/modal": "^0.1.35",
+    "@gluestack-ui/nativewind-utils": "^1.0.26-alpha.2",
+    "@gluestack-ui/overlay": "^0.1.16",
+    "@gluestack-ui/popover": "^0.1.43",
+    "@gluestack-ui/pressable": "^0.1.17",
+    "@gluestack-ui/progress": "^0.1.18",
+    "@gluestack-ui/radio": "^0.1.34",
+    "@gluestack-ui/select": "^0.1.30",
+    "@gluestack-ui/slider": "^0.1.26",
+    "@gluestack-ui/spinner": "^0.1.15",
+    "@gluestack-ui/switch": "^0.1.23",
+    "@gluestack-ui/textarea": "^0.1.24",
+    "@gluestack-ui/toast": "^1.0.8",
+    "@gluestack-ui/tooltip": "^0.1.36-alpha.0",
+    "@gluestack/ui-next-adapter": "^2.1.12",
     "@hookform/resolvers": "^3.3.4",
     "@legendapp/motion": "^2.4.0",
     "@unitools/image": "^0.0.4",
@@ -50,26 +50,28 @@
     "@unitools/navigation": "^0.0.1-alpha.0",
     "@unitools/router": "^0.0.4",
     "@unitools/router-next": "^0.0.1",
-    "autoprefixer": "latest",
+    "autoprefixer": "^10.4.20",
     "expo-image": "^1.12.9",
     "lucide-react-native": "^0.378.0",
-    "nativewind": "4.0.36",
+    "nativewind": "^4.1.23",
     "next": "^14.0.4",
-    "postcss": "latest",
+    "postcss": "^8.4.49",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.51.4",
+    "react-native-css-interop": "^0.1.22",
     "react-native-reanimated": "latest",
-    "react-native-svg": "^15.2.0",
-    "react-native-web": "latest",
-    "tailwindcss": "3.4.3",
+    "react-native-safe-area-context": "^4.14.0",
+    "react-native-svg": "15.2.0",
+    "react-native-web": "^0.19.13",
+    "tailwindcss": "^3.4.15",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@types/node": "^20.10.6",
     "@types/react": "^18.2.46",
     "@types/react-dom": "^18.2.18",
-    "@types/react-native": "^0.73.0",
+    "@types/react-native": "0.72.8",
     "babel-plugin-react-native-web": "^0.19.10",
     "eslint": "^8.56.0",
     "eslint-config-next": "14.0.4",
diff --git a/next/patches/react-native-css-interop+0.0.36.patch b/next/patches/react-native-css-interop+0.0.36.patch
deleted file mode 100644
index 139276de..00000000
--- a/next/patches/react-native-css-interop+0.0.36.patch
+++ /dev/null
@@ -1,346 +0,0 @@
-diff --git a/node_modules/react-native-css-interop/dist/runtime/api.d.ts b/node_modules/react-native-css-interop/dist/runtime/api.d.ts
-index 05c3461..0e94bc5 100644
---- a/node_modules/react-native-css-interop/dist/runtime/api.d.ts
-+++ b/node_modules/react-native-css-interop/dist/runtime/api.d.ts
-@@ -1 +1,2 @@
- export * from "./web/api";
-+export * from "./web/interopComponentsMap";
-diff --git a/node_modules/react-native-css-interop/dist/runtime/api.js b/node_modules/react-native-css-interop/dist/runtime/api.js
-index d532aa8..340d8fd 100644
---- a/node_modules/react-native-css-interop/dist/runtime/api.js
-+++ b/node_modules/react-native-css-interop/dist/runtime/api.js
-@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
- };
- Object.defineProperty(exports, "__esModule", { value: true });
- __exportStar(require("./web/api"), exports);
-+__exportStar(require("./web/interopComponentsMap"), exports);
- //# sourceMappingURL=api.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/api.js.map b/node_modules/react-native-css-interop/dist/runtime/api.js.map
-index 7825b53..c59fa3b 100644
---- a/node_modules/react-native-css-interop/dist/runtime/api.js.map
-+++ b/node_modules/react-native-css-interop/dist/runtime/api.js.map
-@@ -1 +1 @@
--{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/runtime/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B"}
-\ No newline at end of file
-+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/runtime/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,6DAA2C"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/components.js b/node_modules/react-native-css-interop/dist/runtime/components.js
-index c4832b0..63aa94e 100644
---- a/node_modules/react-native-css-interop/dist/runtime/components.js
-+++ b/node_modules/react-native-css-interop/dist/runtime/components.js
-@@ -1,4 +1,5 @@
- "use strict";
-+"use client";
- Object.defineProperty(exports, "__esModule", { value: true });
- const react_native_1 = require("react-native");
- const api_1 = require("./api");
-diff --git a/node_modules/react-native-css-interop/dist/runtime/components.js.map b/node_modules/react-native-css-interop/dist/runtime/components.js.map
-index 0101386..9549388 100644
---- a/node_modules/react-native-css-interop/dist/runtime/components.js.map
-+++ b/node_modules/react-native-css-interop/dist/runtime/components.js.map
-@@ -1 +1 @@
--{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/runtime/components.ts"],"names":[],"mappings":";;AAAA,+CAkBsB;AAEtB,+BAA+C;AAE/C,IAAA,gBAAU,EAAC,oBAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC1C,IAAA,gBAAU,EAAC,wBAAS,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC9C,IAAA,gBAAU,EAAC,2BAAY,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACjD,IAAA,gBAAU,EAAC,qBAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC3C,IAAA,gBAAU,EAAC,mBAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACzC,IAAA,gBAAU,EAAC,iCAAkB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACvD,IAAA,gBAAU,EAAC,+BAAgB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACrD,IAAA,gBAAU,EAAC,uCAAwB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC7D,IAAA,gBAAU,EAAC,mBAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACzC,IAAA,gBAAU,EAAC,gCAAiB,EAAE;IAC5B,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;CACnE,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,wBAAS,EAAE;IACpB,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE;CAC3E,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,yBAAU,EAAE;IACrB,SAAS,EAAE,OAAO;IAClB,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,wBAAS,EAAE;IACpB,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;CACvE,CAAC,CAAC;AAEH,IAAA,gBAAU,EAAC,uBAAQ,EAAE;IACnB,SAAS,EAAE,OAAO;IAClB,4BAA4B,EAAE,0BAA0B;IACxD,4BAA4B,EAAE,0BAA0B;IACxD,sBAAsB,EAAE,oBAAoB;IAC5C,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,8BAAe,EAAE;IAC1B,SAAS,EAAE,OAAO;IAClB,cAAc,EAAE,YAAY;CAC7B,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,mCAAoB,EAAE;IAC/B,SAAS,EAAE,OAAO;IAClB,yBAAyB,EAAE,uBAAuB;CACnD,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,8BAAe,EAAE;IAC1B,SAAS,EAAE,OAAO;IAClB,4BAA4B,EAAE,0BAA0B;IACxD,4BAA4B,EAAE,0BAA0B;IACxD,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC"}
-\ No newline at end of file
-+{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/runtime/components.ts"],"names":[],"mappings":";AAAA,YAAY,CAAC;;AAEb,+CAkBsB;AAEtB,+BAA+C;AAE/C,IAAA,gBAAU,EAAC,oBAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC1C,IAAA,gBAAU,EAAC,wBAAS,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC9C,IAAA,gBAAU,EAAC,2BAAY,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACjD,IAAA,gBAAU,EAAC,qBAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC3C,IAAA,gBAAU,EAAC,mBAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACzC,IAAA,gBAAU,EAAC,iCAAkB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACvD,IAAA,gBAAU,EAAC,+BAAgB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACrD,IAAA,gBAAU,EAAC,uCAAwB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC7D,IAAA,gBAAU,EAAC,mBAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACzC,IAAA,gBAAU,EAAC,gCAAiB,EAAE;IAC5B,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;CACnE,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,wBAAS,EAAE;IACpB,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE;CAC3E,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,yBAAU,EAAE;IACrB,SAAS,EAAE,OAAO;IAClB,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,wBAAS,EAAE;IACpB,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;CACvE,CAAC,CAAC;AAEH,IAAA,gBAAU,EAAC,uBAAQ,EAAE;IACnB,SAAS,EAAE,OAAO;IAClB,4BAA4B,EAAE,0BAA0B;IACxD,4BAA4B,EAAE,0BAA0B;IACxD,sBAAsB,EAAE,oBAAoB;IAC5C,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,8BAAe,EAAE;IAC1B,SAAS,EAAE,OAAO;IAClB,cAAc,EAAE,YAAY;CAC7B,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,mCAAoB,EAAE;IAC/B,SAAS,EAAE,OAAO;IAClB,yBAAyB,EAAE,uBAAuB;CACnD,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,8BAAe,EAAE;IAC1B,SAAS,EAAE,OAAO;IAClB,4BAA4B,EAAE,0BAA0B;IACxD,4BAA4B,EAAE,0BAA0B;IACxD,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.d.ts b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.d.ts
-index 05710bd..21028f3 100644
---- a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.d.ts
-+++ b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.d.ts
-@@ -17,4 +17,8 @@ export declare function setDeep(target: Record<string, any>, paths: string[], va
- export declare function getWidth(state: PropState): number;
- export declare function getHeight(state: PropState): number;
- export declare const defaultValues: Record<string, AnimatableValue | ((effect: Effect) => AnimatableValue)>;
--export declare function calc(state: PropState, expression: RuntimeValueDescriptor[], style?: Record<string, any>): string | number | undefined;
-+export declare function calc(state: PropState, expression: RuntimeValueDescriptor, style?: Record<string, any>): {
-+    mode: string;
-+    raw: number;
-+    value: string | number;
-+} | undefined;
-diff --git a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js
-index 5f9c2b2..cec8e9a 100644
---- a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js
-+++ b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js
-@@ -23,12 +23,59 @@ function resolveValue(state, descriptor, style) {
-     }
-     switch (descriptor.name) {
-         case "var": {
--            const value = resolve(state, descriptor.arguments[0], style);
-+            let value = resolve(state, descriptor.arguments[0], style);
-             if (typeof value === "string")
--                return getVar(state, value, style);
-+                value = getVar(state, value, style);
-+            if (value === undefined && descriptor.arguments[1]) {
-+                value = resolveValue(state, descriptor.arguments[1], style);
-+            }
-+            return value;
-         }
-         case "calc": {
--            return calc(state, descriptor.arguments, style);
-+            return calc(state, descriptor.arguments, style)?.value;
-+        }
-+        case "max": {
-+            let mode;
-+            let values = [];
-+            for (const arg of descriptor.arguments) {
-+                const result = calc(state, arg, style);
-+                if (result) {
-+                    if (!mode)
-+                        mode = result?.mode;
-+                    if (result.mode === mode) {
-+                        values.push(result.raw);
-+                    }
-+                }
-+            }
-+            const max = Math.max(...values);
-+            return mode === "percentage" ? `${max}%` : max;
-+        }
-+        case "min": {
-+            let mode;
-+            let values = [];
-+            for (const arg of descriptor.arguments) {
-+                const result = calc(state, arg, style);
-+                if (result) {
-+                    if (!mode)
-+                        mode = result?.mode;
-+                    if (result.mode === mode) {
-+                        values.push(result.raw);
-+                    }
-+                }
-+            }
-+            const min = Math.min(...values);
-+            return mode === "percentage" ? `${min}%` : min;
-+        }
-+        case "clamp": {
-+            const min = calc(state, descriptor.arguments[0], style);
-+            const val = calc(state, descriptor.arguments[1], style);
-+            const max = calc(state, descriptor.arguments[2], style);
-+            if (!min || !val || !max)
-+                return;
-+            if (min.mode !== val.mode && max.mode !== val.mode)
-+                return;
-+            const value = Math.max(min.raw, Math.min(val.raw, max.raw));
-+            return val.mode === "percentage" ? `${value}%` : value;
-         }
-         case "vh": {
-             const value = resolve(state, descriptor.arguments[0], style);
-@@ -357,6 +404,9 @@ function calc(state, expression, style) {
-     const values = [];
-     const ops = [];
-     let mode;
-+    if (!Array.isArray(expression)) {
-+        expression = [expression];
-+    }
-     for (let token of expression) {
-         switch (typeof token) {
-             case "undefined":
-@@ -427,7 +477,11 @@ function calc(state, expression, style) {
-     if (!mode)
-         return;
-     const value = round(values[0]);
--    return mode === "percentage" ? `${value}%` : value;
-+    return {
-+        mode,
-+        raw: value,
-+        value: mode === "percentage" ? `${value}%` : value,
-+    };
- }
- exports.calc = calc;
- //# sourceMappingURL=resolve-value.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js.map b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js.map
-index ae1884d..a14dc2e 100644
---- a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js.map
-+++ b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js.map
-@@ -1 +1 @@
--{"version":3,"file":"resolve-value.js","sourceRoot":"","sources":["../../../src/runtime/native/resolve-value.ts"],"names":[],"mappings":"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"}
-\ No newline at end of file
-+{"version":3,"file":"resolve-value.js","sourceRoot":"","sources":["../../../src/runtime/native/resolve-value.ts"],"names":[],"mappings":"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"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/test.d.ts b/node_modules/react-native-css-interop/dist/runtime/test.d.ts
-deleted file mode 100644
-index a326c79..0000000
---- a/node_modules/react-native-css-interop/dist/runtime/test.d.ts
-+++ /dev/null
-@@ -1 +0,0 @@
--export declare const testContext: Record<string, any>;
-diff --git a/node_modules/react-native-css-interop/dist/runtime/test.js b/node_modules/react-native-css-interop/dist/runtime/test.js
-deleted file mode 100644
-index 9c6f4c8..0000000
---- a/node_modules/react-native-css-interop/dist/runtime/test.js
-+++ /dev/null
-@@ -1,7 +0,0 @@
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.testContext = void 0;
--exports.testContext = {
--    "--theme-fg": "blue",
--};
--//# sourceMappingURL=test.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/test.js.map b/node_modules/react-native-css-interop/dist/runtime/test.js.map
-deleted file mode 100644
-index 5ec3e17..0000000
---- a/node_modules/react-native-css-interop/dist/runtime/test.js.map
-+++ /dev/null
-@@ -1 +0,0 @@
--{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/runtime/test.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAwB;IAC9C,YAAY,EAAE,MAAM;CACrB,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/api.d.ts b/node_modules/react-native-css-interop/dist/runtime/web/api.d.ts
-index d38ce4a..3ec4979 100644
---- a/node_modules/react-native-css-interop/dist/runtime/web/api.d.ts
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/api.d.ts
-@@ -1,16 +1,10 @@
--/// <reference types="react" />
- import { CssInterop } from "../../types";
- export { StyleSheet } from "./stylesheet";
- export { colorScheme } from "./color-scheme";
- export { rem } from "./rem";
--export declare const interopComponents: Map<string | object, import("react").ComponentType<{}>>;
-+export { useColorScheme } from "./useColorScheme";
- export declare const cssInterop: CssInterop;
- export declare const remapProps: CssInterop;
--export declare function useColorScheme(): {
--    colorScheme: "light" | "dark" | undefined;
--    setColorScheme: (value: "light" | "dark" | "system") => void;
--    toggleColorScheme: () => void;
--};
- export declare const useUnstableNativeVariable: (name: string) => undefined;
- export declare function vars<T extends Record<`--${string}`, string | number>>(variables: T): Record<string, string>;
- export declare function useSafeAreaEnv(): {} | undefined;
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/api.js b/node_modules/react-native-css-interop/dist/runtime/web/api.js
-index 99eda40..5eb4764 100644
---- a/node_modules/react-native-css-interop/dist/runtime/web/api.js
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/api.js
-@@ -1,17 +1,19 @@
- "use strict";
-+"use client";
- Object.defineProperty(exports, "__esModule", { value: true });
--exports.useSafeAreaEnv = exports.vars = exports.useUnstableNativeVariable = exports.useColorScheme = exports.remapProps = exports.cssInterop = exports.interopComponents = exports.rem = exports.colorScheme = exports.StyleSheet = void 0;
-+exports.useSafeAreaEnv = exports.vars = exports.useUnstableNativeVariable = exports.remapProps = exports.cssInterop = exports.useColorScheme = exports.rem = exports.colorScheme = exports.StyleSheet = void 0;
- const react_1 = require("react");
- const config_1 = require("../config");
--const color_scheme_1 = require("./color-scheme");
- var stylesheet_1 = require("./stylesheet");
- Object.defineProperty(exports, "StyleSheet", { enumerable: true, get: function () { return stylesheet_1.StyleSheet; } });
--var color_scheme_2 = require("./color-scheme");
--Object.defineProperty(exports, "colorScheme", { enumerable: true, get: function () { return color_scheme_2.colorScheme; } });
-+var color_scheme_1 = require("./color-scheme");
-+Object.defineProperty(exports, "colorScheme", { enumerable: true, get: function () { return color_scheme_1.colorScheme; } });
- var rem_1 = require("./rem");
- Object.defineProperty(exports, "rem", { enumerable: true, get: function () { return rem_1.rem; } });
--exports.interopComponents = new Map();
-+const interopComponentsMap_1 = require("./interopComponentsMap");
- const ForwardRefSymbol = Symbol.for("react.forward_ref");
-+var useColorScheme_1 = require("./useColorScheme");
-+Object.defineProperty(exports, "useColorScheme", { enumerable: true, get: function () { return useColorScheme_1.useColorScheme; } });
- const cssInterop = (baseComponent, mapping) => {
-     const configs = (0, config_1.getNormalizeConfig)(mapping);
-     const interopComponent = (0, react_1.forwardRef)(function CssInteropComponent({ ...props }, ref) {
-@@ -56,23 +58,11 @@ const cssInterop = (baseComponent, mapping) => {
-         }
-     });
-     interopComponent.displayName = `CssInterop.${baseComponent.displayName ?? baseComponent.name ?? "unknown"}`;
--    exports.interopComponents.set(baseComponent, interopComponent);
-+    interopComponentsMap_1.interopComponents.set(baseComponent, interopComponent);
-     return interopComponent;
- };
- exports.cssInterop = cssInterop;
- exports.remapProps = exports.cssInterop;
--function useColorScheme() {
--    const [effect, setEffect] = (0, react_1.useState)(() => ({
--        rerun: () => setEffect((s) => ({ ...s })),
--        dependencies: new Set(),
--    }));
--    return {
--        colorScheme: color_scheme_1.colorScheme.get(effect),
--        setColorScheme: color_scheme_1.colorScheme.set,
--        toggleColorScheme: color_scheme_1.colorScheme.toggle,
--    };
--}
--exports.useColorScheme = useColorScheme;
- const useUnstableNativeVariable = (name) => {
-     if (process.env.NODE_ENV !== "production") {
-         console.log("useUnstableNativeVariable is not supported on web.");
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/api.js.map b/node_modules/react-native-css-interop/dist/runtime/web/api.js.map
-index d64992f..38a7312 100644
---- a/node_modules/react-native-css-interop/dist/runtime/web/api.js.map
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/api.js.map
-@@ -1 +1 @@
--{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/runtime/web/api.ts"],"names":[],"mappings":"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"}
-\ No newline at end of file
-+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/runtime/web/api.ts"],"names":[],"mappings":"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"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.d.ts b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.d.ts
-new file mode 100644
-index 0000000..303c043
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.d.ts
-@@ -0,0 +1,2 @@
-+/// <reference types="react" />
-+export declare const interopComponents: Map<string | object, import("react").ComponentType<{}>>;
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js
-new file mode 100644
-index 0000000..3ff844a
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js
-@@ -0,0 +1,5 @@
-+"use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
-+exports.interopComponents = void 0;
-+exports.interopComponents = new Map();
-+//# sourceMappingURL=interopComponentsMap.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js.map b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js.map
-new file mode 100644
-index 0000000..601d610
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js.map
-@@ -0,0 +1 @@
-+{"version":3,"file":"interopComponentsMap.js","sourceRoot":"","sources":["../../../src/runtime/web/interopComponentsMap.ts"],"names":[],"mappings":";;;AAEa,QAAA,iBAAiB,GAAG,IAAI,GAAG,EAGrC,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.d.ts b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.d.ts
-new file mode 100644
-index 0000000..874a890
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.d.ts
-@@ -0,0 +1,5 @@
-+export declare function useColorScheme(): {
-+    colorScheme: "light" | "dark" | undefined;
-+    setColorScheme: (value: "light" | "dark" | "system") => void;
-+    toggleColorScheme: () => void;
-+};
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js
-new file mode 100644
-index 0000000..9de6ccb
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js
-@@ -0,0 +1,18 @@
-+"use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
-+exports.useColorScheme = void 0;
-+const react_1 = require("react");
-+const color_scheme_1 = require("./color-scheme");
-+function useColorScheme() {
-+    const [effect, setEffect] = (0, react_1.useState)(() => ({
-+        rerun: () => setEffect((s) => ({ ...s })),
-+        dependencies: new Set(),
-+    }));
-+    return {
-+        colorScheme: color_scheme_1.colorScheme.get(effect),
-+        setColorScheme: color_scheme_1.colorScheme.set,
-+        toggleColorScheme: color_scheme_1.colorScheme.toggle,
-+    };
-+}
-+exports.useColorScheme = useColorScheme;
-+//# sourceMappingURL=useColorScheme.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js.map b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js.map
-new file mode 100644
-index 0000000..69f3b00
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js.map
-@@ -0,0 +1 @@
-+{"version":3,"file":"useColorScheme.js","sourceRoot":"","sources":["../../../src/runtime/web/useColorScheme.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,iDAA6C;AAE7C,SAAgB,cAAc;IAC5B,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAS,GAAG,EAAE,CAAC,CAAC;QAClD,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,YAAY,EAAE,IAAI,GAAG,EAAE;KACxB,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,WAAW,EAAE,0BAAW,CAAC,GAAG,CAAC,MAAM,CAAC;QACpC,cAAc,EAAE,0BAAW,CAAC,GAAG;QAC/B,iBAAiB,EAAE,0BAAW,CAAC,MAAM;KACtC,CAAC;AACJ,CAAC;AAXD,wCAWC"}
-\ No newline at end of file
diff --git a/next/tailwind.config.js b/next/tailwind.config.js
index bd0708de..94b8198f 100644
--- a/next/tailwind.config.js
+++ b/next/tailwind.config.js
@@ -1,212 +1,195 @@
-const gluestackPlugin = require("@gluestack-ui/nativewind-utils/tailwind-plugin");
+const gluestackPlugin = require('@gluestack-ui/nativewind-utils/tailwind-plugin');
 
 /** @type {import('tailwindcss').Config} */
 module.exports = {
   darkMode: "class",
-  content: [
-    "./app/**/*.{js,jsx,ts,tsx}",
-    "./app/*.{js,jsx,ts,tsx}",
-    "./components/**/*.{js,jsx,ts,tsx}",
-    "./screens/**/*.{js,jsx,ts,tsx}",
-  ],
-  safelist: ["gap-x-2", "gap-y-6", "pl-4", "flex-wrap", "mb-12", "basis-[10%]"],
+  content: ["app/**/*.{tsx,jsx,ts,js}", "components/**/*.{tsx,jsx,ts,js}"],
+  presets: [require('nativewind/preset')],
   important: "html",
+
   theme: {
-    screens: {
-      base: "0",
-      xs: "400px",
-      sm: "480px",
-      md: "768px",
-      lg: "992px",
-      xl: "1280px",
-    },
     extend: {
       colors: {
         primary: {
-          0: "var(--color-primary-0)",
-          50: "var(--color-primary-50)",
-          100: "var(--color-primary-100)",
-          200: "var(--color-primary-200)",
-          300: "var(--color-primary-300)",
-          400: "var(--color-primary-400)",
-          500: "var(--color-primary-500)",
-          600: "var(--color-primary-600)",
-          700: "var(--color-primary-700)",
-          800: "var(--color-primary-800)",
-          900: "var(--color-primary-900)",
-          950: "var(--color-primary-950)",
+          0: 'rgb(var(--color-primary-0)/<alpha-value>)',
+          50: 'rgb(var(--color-primary-50)/<alpha-value>)',
+          100: 'rgb(var(--color-primary-100)/<alpha-value>)',
+          200: 'rgb(var(--color-primary-200)/<alpha-value>)',
+          300: 'rgb(var(--color-primary-300)/<alpha-value>)',
+          400: 'rgb(var(--color-primary-400)/<alpha-value>)',
+          500: 'rgb(var(--color-primary-500)/<alpha-value>)',
+          600: 'rgb(var(--color-primary-600)/<alpha-value>)',
+          700: 'rgb(var(--color-primary-700)/<alpha-value>)',
+          800: 'rgb(var(--color-primary-800)/<alpha-value>)',
+          900: 'rgb(var(--color-primary-900)/<alpha-value>)',
+          950: 'rgb(var(--color-primary-950)/<alpha-value>)',
         },
         secondary: {
-          0: "var(--color-secondary-0)",
-          50: "var(--color-secondary-50)",
-          100: "var(--color-secondary-100)",
-          200: "var(--color-secondary-200)",
-          300: "var(--color-secondary-300)",
-          400: "var(--color-secondary-400)",
-          500: "var(--color-secondary-500)",
-          600: "var(--color-secondary-600)",
-          700: "var(--color-secondary-700)",
-          800: "var(--color-secondary-800)",
-          900: "var(--color-secondary-900)",
-          950: "var(--color-secondary-950)",
+          0: 'rgb(var(--color-secondary-0)/<alpha-value>)',
+          50: 'rgb(var(--color-secondary-50)/<alpha-value>)',
+          100: 'rgb(var(--color-secondary-100)/<alpha-value>)',
+          200: 'rgb(var(--color-secondary-200)/<alpha-value>)',
+          300: 'rgb(var(--color-secondary-300)/<alpha-value>)',
+          400: 'rgb(var(--color-secondary-400)/<alpha-value>)',
+          500: 'rgb(var(--color-secondary-500)/<alpha-value>)',
+          600: 'rgb(var(--color-secondary-600)/<alpha-value>)',
+          700: 'rgb(var(--color-secondary-700)/<alpha-value>)',
+          800: 'rgb(var(--color-secondary-800)/<alpha-value>)',
+          900: 'rgb(var(--color-secondary-900)/<alpha-value>)',
+          950: 'rgb(var(--color-secondary-950)/<alpha-value>)',
         },
         tertiary: {
-          50: "var(--color-tertiary-50)",
-          100: "var(--color-tertiary-100)",
-          200: "var(--color-tertiary-200)",
-          300: "var(--color-tertiary-300)",
-          400: "var(--color-tertiary-400)",
-          500: "var(--color-tertiary-500)",
-          600: "var(--color-tertiary-600)",
-          700: "var(--color-tertiary-700)",
-          800: "var(--color-tertiary-800)",
-          900: "var(--color-tertiary-900)",
-          950: "var(--color-tertiary-950)",
+          50: 'rgb(var(--color-tertiary-50)/<alpha-value>)',
+          100: 'rgb(var(--color-tertiary-100)/<alpha-value>)',
+          200: 'rgb(var(--color-tertiary-200)/<alpha-value>)',
+          300: 'rgb(var(--color-tertiary-300)/<alpha-value>)',
+          400: 'rgb(var(--color-tertiary-400)/<alpha-value>)',
+          500: 'rgb(var(--color-tertiary-500)/<alpha-value>)',
+          600: 'rgb(var(--color-tertiary-600)/<alpha-value>)',
+          700: 'rgb(var(--color-tertiary-700)/<alpha-value>)',
+          800: 'rgb(var(--color-tertiary-800)/<alpha-value>)',
+          900: 'rgb(var(--color-tertiary-900)/<alpha-value>)',
+          950: 'rgb(var(--color-tertiary-950)/<alpha-value>)',
         },
         error: {
-          0: "var(--color-error-0)",
-          50: "var(--color-error-50)",
-          100: "var(--color-error-100)",
-          200: "var(--color-error-200)",
-          300: "var(--color-error-300)",
-          400: "var(--color-error-400)",
-          500: "var(--color-error-500)",
-          600: "var(--color-error-600)",
-          700: "var(--color-error-700)",
-          800: "var(--color-error-800)",
-          900: "var(--color-error-900)",
-          950: "var(--color-error-950)",
+          0: 'rgb(var(--color-error-0)/<alpha-value>)',
+          50: 'rgb(var(--color-error-50)/<alpha-value>)',
+          100: 'rgb(var(--color-error-100)/<alpha-value>)',
+          200: 'rgb(var(--color-error-200)/<alpha-value>)',
+          300: 'rgb(var(--color-error-300)/<alpha-value>)',
+          400: 'rgb(var(--color-error-400)/<alpha-value>)',
+          500: 'rgb(var(--color-error-500)/<alpha-value>)',
+          600: 'rgb(var(--color-error-600)/<alpha-value>)',
+          700: 'rgb(var(--color-error-700)/<alpha-value>)',
+          800: 'rgb(var(--color-error-800)/<alpha-value>)',
+          900: 'rgb(var(--color-error-900)/<alpha-value>)',
+          950: 'rgb(var(--color-error-950)/<alpha-value>)',
         },
         success: {
-          0: "var(--color-success-0)",
-          50: "var(--color-success-50)",
-          100: "var(--color-success-100)",
-          200: "var(--color-success-200)",
-          300: "var(--color-success-300)",
-          400: "var(--color-success-400)",
-          500: "var(--color-success-500)",
-          600: "var(--color-success-600)",
-          700: "var(--color-success-700)",
-          800: "var(--color-success-800)",
-          900: "var(--color-success-900)",
-          950: "var(--color-success-950)",
+          0: 'rgb(var(--color-success-0)/<alpha-value>)',
+          50: 'rgb(var(--color-success-50)/<alpha-value>)',
+          100: 'rgb(var(--color-success-100)/<alpha-value>)',
+          200: 'rgb(var(--color-success-200)/<alpha-value>)',
+          300: 'rgb(var(--color-success-300)/<alpha-value>)',
+          400: 'rgb(var(--color-success-400)/<alpha-value>)',
+          500: 'rgb(var(--color-success-500)/<alpha-value>)',
+          600: 'rgb(var(--color-success-600)/<alpha-value>)',
+          700: 'rgb(var(--color-success-700)/<alpha-value>)',
+          800: 'rgb(var(--color-success-800)/<alpha-value>)',
+          900: 'rgb(var(--color-success-900)/<alpha-value>)',
+          950: 'rgb(var(--color-success-950)/<alpha-value>)',
         },
         warning: {
-          0: "var(--color-warning-0)",
-          50: "var(--color-warning-50)",
-          100: "var(--color-warning-100)",
-          200: "var(--color-warning-200)",
-          300: "var(--color-warning-300)",
-          400: "var(--color-warning-400)",
-          500: "var(--color-warning-500)",
-          600: "var(--color-warning-600)",
-          700: "var(--color-warning-700)",
-          800: "var(--color-warning-800)",
-          900: "var(--color-warning-900)",
-          950: "var(--color-warning-950)",
+          0: 'rgb(var(--color-warning-0)/<alpha-value>)',
+          50: 'rgb(var(--color-warning-50)/<alpha-value>)',
+          100: 'rgb(var(--color-warning-100)/<alpha-value>)',
+          200: 'rgb(var(--color-warning-200)/<alpha-value>)',
+          300: 'rgb(var(--color-warning-300)/<alpha-value>)',
+          400: 'rgb(var(--color-warning-400)/<alpha-value>)',
+          500: 'rgb(var(--color-warning-500)/<alpha-value>)',
+          600: 'rgb(var(--color-warning-600)/<alpha-value>)',
+          700: 'rgb(var(--color-warning-700)/<alpha-value>)',
+          800: 'rgb(var(--color-warning-800)/<alpha-value>)',
+          900: 'rgb(var(--color-warning-900)/<alpha-value>)',
+          950: 'rgb(var(--color-warning-950)/<alpha-value>)',
         },
         info: {
-          0: "var(--color-info-0)",
-          50: "var(--color-info-50)",
-          100: "var(--color-info-100)",
-          200: "var(--color-info-200)",
-          300: "var(--color-info-300)",
-          400: "var(--color-info-400)",
-          500: "var(--color-info-500)",
-          600: "var(--color-info-600)",
-          700: "var(--color-info-700)",
-          800: "var(--color-info-800)",
-          900: "var(--color-info-900)",
-          950: "var(--color-info-950)",
+          0: 'rgb(var(--color-info-0)/<alpha-value>)',
+          50: 'rgb(var(--color-info-50)/<alpha-value>)',
+          100: 'rgb(var(--color-info-100)/<alpha-value>)',
+          200: 'rgb(var(--color-info-200)/<alpha-value>)',
+          300: 'rgb(var(--color-info-300)/<alpha-value>)',
+          400: 'rgb(var(--color-info-400)/<alpha-value>)',
+          500: 'rgb(var(--color-info-500)/<alpha-value>)',
+          600: 'rgb(var(--color-info-600)/<alpha-value>)',
+          700: 'rgb(var(--color-info-700)/<alpha-value>)',
+          800: 'rgb(var(--color-info-800)/<alpha-value>)',
+          900: 'rgb(var(--color-info-900)/<alpha-value>)',
+          950: 'rgb(var(--color-info-950)/<alpha-value>)',
         },
         typography: {
-          0: "var(--color-typography-0)",
-          50: "var(--color-typography-50)",
-          100: "var(--color-typography-100)",
-          200: "var(--color-typography-200)",
-          300: "var(--color-typography-300)",
-          400: "var(--color-typography-400)",
-          500: "var(--color-typography-500)",
-          600: "var(--color-typography-600)",
-          700: "var(--color-typography-700)",
-          800: "var(--color-typography-800)",
-          900: "var(--color-typography-900)",
-          950: "var(--color-typography-950)",
-          white: "#FFFFFF",
-          gray: "#D4D4D4",
-          black: "#181718",
+          0: 'rgb(var(--color-typography-0)/<alpha-value>)',
+          50: 'rgb(var(--color-typography-50)/<alpha-value>)',
+          100: 'rgb(var(--color-typography-100)/<alpha-value>)',
+          200: 'rgb(var(--color-typography-200)/<alpha-value>)',
+          300: 'rgb(var(--color-typography-300)/<alpha-value>)',
+          400: 'rgb(var(--color-typography-400)/<alpha-value>)',
+          500: 'rgb(var(--color-typography-500)/<alpha-value>)',
+          600: 'rgb(var(--color-typography-600)/<alpha-value>)',
+          700: 'rgb(var(--color-typography-700)/<alpha-value>)',
+          800: 'rgb(var(--color-typography-800)/<alpha-value>)',
+          900: 'rgb(var(--color-typography-900)/<alpha-value>)',
+          950: 'rgb(var(--color-typography-950)/<alpha-value>)',
+          white: '#FFFFFF',
+          gray: '#D4D4D4',
+          black: '#181718',
         },
         outline: {
-          0: "var(--color-outline-0)",
-          50: "var(--color-outline-50)",
-          100: "var(--color-outline-100)",
-          200: "var(--color-outline-200)",
-          300: "var(--color-outline-300)",
-          400: "var(--color-outline-400)",
-          500: "var(--color-outline-500)",
-          600: "var(--color-outline-600)",
-          700: "var(--color-outline-700)",
-          800: "var(--color-outline-800)",
-          900: "var(--color-outline-900)",
-          950: "var(--color-outline-950)",
+          0: 'rgb(var(--color-outline-0)/<alpha-value>)',
+          50: 'rgb(var(--color-outline-50)/<alpha-value>)',
+          100: 'rgb(var(--color-outline-100)/<alpha-value>)',
+          200: 'rgb(var(--color-outline-200)/<alpha-value>)',
+          300: 'rgb(var(--color-outline-300)/<alpha-value>)',
+          400: 'rgb(var(--color-outline-400)/<alpha-value>)',
+          500: 'rgb(var(--color-outline-500)/<alpha-value>)',
+          600: 'rgb(var(--color-outline-600)/<alpha-value>)',
+          700: 'rgb(var(--color-outline-700)/<alpha-value>)',
+          800: 'rgb(var(--color-outline-800)/<alpha-value>)',
+          900: 'rgb(var(--color-outline-900)/<alpha-value>)',
+          950: 'rgb(var(--color-outline-950)/<alpha-value>)',
         },
         background: {
-          0: "var(--color-background-0)",
-          50: "var(--color-background-50)",
-          100: "var(--color-background-100)",
-          200: "var(--color-background-200)",
-          300: "var(--color-background-300)",
-          400: "var(--color-background-400)",
-          500: "var(--color-background-500)",
-          600: "var(--color-background-600)",
-          700: "var(--color-background-700)",
-          800: "var(--color-background-800)",
-          900: "var(--color-background-900)",
-          950: "var(--color-background-950)",
-          error: "var(--color-background-error)",
-          warning: "var(--color-background-warning)",
-          muted: "var(--color-background-muted)",
-          success: "var(--color-background-success)",
-          info: "var(--color-background-info)",
-          light: "#FBFBFB",
-          dark: "#181719",
+          0: 'rgb(var(--color-background-0)/<alpha-value>)',
+          50: 'rgb(var(--color-background-50)/<alpha-value>)',
+          100: 'rgb(var(--color-background-100)/<alpha-value>)',
+          200: 'rgb(var(--color-background-200)/<alpha-value>)',
+          300: 'rgb(var(--color-background-300)/<alpha-value>)',
+          400: 'rgb(var(--color-background-400)/<alpha-value>)',
+          500: 'rgb(var(--color-background-500)/<alpha-value>)',
+          600: 'rgb(var(--color-background-600)/<alpha-value>)',
+          700: 'rgb(var(--color-background-700)/<alpha-value>)',
+          800: 'rgb(var(--color-background-800)/<alpha-value>)',
+          900: 'rgb(var(--color-background-900)/<alpha-value>)',
+          950: 'rgb(var(--color-background-950)/<alpha-value>)',
+          error: 'rgb(var(--color-background-error)/<alpha-value>)',
+          warning: 'rgb(var(--color-background-warning)/<alpha-value>)',
+          muted: 'rgb(var(--color-background-muted)/<alpha-value>)',
+          success: 'rgb(var(--color-background-success)/<alpha-value>)',
+          info: 'rgb(var(--color-background-info)/<alpha-value>)',
+          light: '#FBFBFB',
+          dark: '#181719',
         },
-        border: {
-          0: "var(--color-border-0)",
-          50: "var(--color-border-50)",
-          100: "var(--color-border-100)",
-          200: "var(--color-border-200)",
-          300: "var(--color-border-300)",
-          400: "var(--color-border-400)",
-          500: "var(--color-border-500)",
-          600: "var(--color-border-600)",
-          700: "var(--color-border-700)",
-          800: "var(--color-border-800)",
-          900: "var(--color-border-900)",
-          950: "var(--color-border-950)",
-          error: "var(--color-border-error)",
-          warning: "var(--color-border-warning)",
-          muted: "var(--color-border-muted)",
-          success: "var(--color-border-success)",
-          info: "var(--color-border-info)",
-          light: "#FBFBFB",
-          dark: "#181719",
+        indicator: {
+          primary: 'rgb(var(--color-indicator-primary)/<alpha-value>)',
+          info: 'rgb(var(--color-indicator-info)/<alpha-value>)',
+          error: 'rgb(var(--color-indicator-error)/<alpha-value>)',
         },
       },
       fontFamily: {
-        roboto: ["Roboto", "sans-serif"],
+        heading: undefined,
+        body: undefined,
+        mono: undefined,
+        roboto: ['Roboto', 'sans-serif'],
       },
       fontWeight: {
-        hairline: "100",
-        extraBlack: "950",
+        extrablack: '950',
       },
       fontSize: {
-        "2xs": "10px",
+        '2xs': '10px',
       },
-      border: {
-        2: "2px",
+      boxShadow: {
+        'hard-1': '-2px 2px 8px 0px rgba(38, 38, 38, 0.20)',
+        'hard-2': '0px 3px 10px 0px rgba(38, 38, 38, 0.20)',
+        'hard-3': '2px 2px 8px 0px rgba(38, 38, 38, 0.20)',
+        'hard-4': '0px -3px 10px 0px rgba(38, 38, 38, 0.20)',
+        'hard-5': '0px 2px 10px 0px rgba(38, 38, 38, 0.10)',
+        'soft-1': '0px 0px 10px rgba(38, 38, 38, 0.1)',
+        'soft-2': '0px 0px 20px rgba(38, 38, 38, 0.2)',
+        'soft-3': '0px 0px 30px rgba(38, 38, 38, 0.1)',
+        'soft-4': '0px 0px 40px rgba(38, 38, 38, 0.1)',
       },
     },
   },
-  plugins: [gluestackPlugin],
+
+  plugins: [gluestackPlugin]
 };
diff --git a/next/tsconfig.json b/next/tsconfig.json
index dec51e7b..b521de7c 100644
--- a/next/tsconfig.json
+++ b/next/tsconfig.json
@@ -29,6 +29,9 @@
       ],
       "@/*": [
         "./*"
+      ],
+      "tailwind.config": [
+        "./tailwind.config.js"
       ]
     },
     "jsxImportSource": "nativewind"
diff --git a/next/yarn.lock b/next/yarn.lock
index a6b909b8..2ef93317 100644
--- a/next/yarn.lock
+++ b/next/yarn.lock
@@ -15,7 +15,7 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.24.6":
+"@babel/code-frame@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.6.tgz#ab88da19344445c3d8889af2216606d3329f3ef2"
   integrity sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==
@@ -23,12 +23,12 @@
     "@babel/highlight" "^7.24.6"
     picocolors "^1.0.0"
 
-"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.24.6":
+"@babel/compat-data@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.6.tgz#b3600217688cabb26e25f8e467019e66d71b7ae2"
   integrity sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ==
 
-"@babel/core@^7.13.16", "@babel/core@^7.20.0", "@babel/core@^7.23.0":
+"@babel/core@^7.23.0":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.6.tgz#8650e0e4b03589ebe886c4e4a60398db0a7ec787"
   integrity sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ==
@@ -49,7 +49,7 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.20.0", "@babel/generator@^7.24.6":
+"@babel/generator@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.6.tgz#dfac82a228582a9d30c959fe50ad28951d4737a7"
   integrity sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==
@@ -66,7 +66,7 @@
   dependencies:
     "@babel/types" "^7.24.6"
 
-"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.6":
+"@babel/helper-compilation-targets@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.6.tgz#4a51d681f7680043d38e212715e2a7b1ad29cb51"
   integrity sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg==
@@ -77,7 +77,7 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.6":
+"@babel/helper-create-class-features-plugin@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.6.tgz#c50b86fa1c4ca9b7a890dc21884f097b6c4b5286"
   integrity sha512-djsosdPJVZE6Vsw3kk7IPRWethP94WHGOhQTc67SNXE0ZzMhHgALw8iGmYS0TD1bbMM0VDROy43od7/hN6WYcA==
@@ -92,27 +92,7 @@
     "@babel/helper-split-export-declaration" "^7.24.6"
     semver "^6.3.1"
 
-"@babel/helper-create-regexp-features-plugin@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.6.tgz#47d382dec0d49e74ca1b6f7f3b81f5968022a3c8"
-  integrity sha512-C875lFBIWWwyv6MHZUG9HmRrlTDgOsLWZfYR0nW69gaKJNe0/Mpxx5r0EID2ZdHQkdUmQo2t0uNckTL08/1BgA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.6"
-    regexpu-core "^5.3.1"
-    semver "^6.3.1"
-
-"@babel/helper-define-polyfill-provider@^0.6.1", "@babel/helper-define-polyfill-provider@^0.6.2":
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d"
-  integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.22.6"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-
-"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.24.6":
+"@babel/helper-environment-visitor@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.6.tgz#ac7ad5517821641550f6698dd5468f8cef78620d"
   integrity sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==
@@ -164,20 +144,11 @@
   dependencies:
     "@babel/types" "^7.24.6"
 
-"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.6", "@babel/helper-plugin-utils@^7.8.0":
+"@babel/helper-plugin-utils@^7.24.6", "@babel/helper-plugin-utils@^7.8.0":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.6.tgz#fa02a32410a15a6e8f8185bcbf608f10528d2a24"
   integrity sha512-MZG/JcWfxybKwsA9N9PmtF2lOSFSEMVCpIRrbxccZFLJPrJciJdG/UhSh5W96GEteJI2ARqm5UAHxISwRDLSNg==
 
-"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.6.tgz#c96ceb9846e877d806ce82a1521230ea7e0fc354"
-  integrity sha512-1Qursq9ArRZPAMOZf/nuzVW8HgJLkTB9y9LfP4lW2MVp4e9WkLJDovfKBxoDcCk6VuzIxyqWHyBoaCtSRP10yg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.6"
-    "@babel/helper-environment-visitor" "^7.24.6"
-    "@babel/helper-wrap-function" "^7.24.6"
-
 "@babel/helper-replace-supers@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.6.tgz#3ea87405a2986a49ab052d10e540fe036d747c71"
@@ -194,7 +165,7 @@
   dependencies:
     "@babel/types" "^7.24.6"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.24.6":
+"@babel/helper-skip-transparent-expression-wrappers@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.6.tgz#c47e9b33b7ea50d1073e125ebc26661717cb7040"
   integrity sha512-jhbbkK3IUKc4T43WadP96a27oYti9gEf1LdyGSP2rHGH77kwLwfhO7TgwnWvxxQVmke0ImmCSS47vcuxEMGD3Q==
@@ -223,15 +194,6 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.6.tgz#59d8e81c40b7d9109ab7e74457393442177f460a"
   integrity sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==
 
-"@babel/helper-wrap-function@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.24.6.tgz#c27af1006e310683fdc76b668a0a1f6003e36217"
-  integrity sha512-f1JLrlw/jbiNfxvdrfBgio/gRBk3yTAEJWirpAkiJG2Hb22E7cEYKHWo0dFPTv/niPovzIdPdEDetrv6tC6gPQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.24.6"
-    "@babel/template" "^7.24.6"
-    "@babel/types" "^7.24.6"
-
 "@babel/helpers@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.6.tgz#cd124245299e494bd4e00edda0e4ea3545c2c176"
@@ -250,111 +212,12 @@
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/parser@^7.13.16", "@babel/parser@^7.20.0", "@babel/parser@^7.23.0", "@babel/parser@^7.24.6":
+"@babel/parser@^7.23.0", "@babel/parser@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.6.tgz#5e030f440c3c6c78d195528c3b688b101a365328"
   integrity sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==
 
-"@babel/plugin-proposal-async-generator-functions@^7.0.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
-  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.18.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
-  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-proposal-export-default-from@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.24.6.tgz#ad7567fdf43cecc00f5314cedd1db60fdee99c6a"
-  integrity sha512-qPPDbYs9j5IArMFqYi85QxatHURSzRyskKpIbjrVoVglDuGdhu1s7UTCmXvP/qR2aHa3EdJ8X3iZvQAHjmdHUw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
-    "@babel/plugin-syntax-export-default-from" "^7.24.6"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.18.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
-  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
-  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-proposal-numeric-separator@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
-  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-object-rest-spread@^7.20.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
-  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
-  dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.20.7"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
-  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.20.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
-  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-syntax-async-generators@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
-  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-dynamic-import@^7.8.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
-  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-export-default-from@^7.0.0", "@babel/plugin-syntax-export-default-from@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.24.6.tgz#aaf9ed2300ad6f942d0ee3742634e6e895b6011f"
-  integrity sha512-Nzl7kZ4tjOM2LJpejBMPwZs7OJfc26++2HsMQuSrw6gxpqXGtZZ3Rj4Zt4Qm7vulMZL2gHIGGc2stnlQnHQCqA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
-
-"@babel/plugin-syntax-flow@^7.12.1", "@babel/plugin-syntax-flow@^7.18.0", "@babel/plugin-syntax-flow@^7.24.6":
+"@babel/plugin-syntax-flow@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.6.tgz#1102a710771326b8e2f0c85ac2aecb6f52eb601e"
   integrity sha512-gNkksSdV8RbsCoHF9sjVYrHfYACMl/8U32UfUhJ9+84/ASXw8dlx+eHyyF0m6ncQJ9IBSxfuCkB36GJqYdXTOA==
@@ -368,55 +231,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.6"
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
-  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.0.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
-  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
-  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
-  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-chaining@^7.0.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-private-property-in-object@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
-  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
 "@babel/plugin-syntax-typescript@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.6.tgz#769daf2982d60308bc83d8936eaecb7582463c87"
@@ -424,29 +252,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.6"
 
-"@babel/plugin-transform-arrow-functions@^7.0.0", "@babel/plugin-transform-arrow-functions@^7.0.0-0":
+"@babel/plugin-transform-arrow-functions@^7.0.0-0":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.6.tgz#93607d1ef5b81c70af174aff3532d57216367492"
   integrity sha512-jSSSDt4ZidNMggcLx8SaKsbGNEfIl0PHx/4mFEulorE7bpYLbN0d3pDW3eJ7Y5Z3yPhy3L3NaPCYyTUY7TuugQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.6"
 
-"@babel/plugin-transform-async-to-generator@^7.20.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.6.tgz#eb11434b11d73d8c0cf9f71a6f4f1e6ba441df35"
-  integrity sha512-NTBA2SioI3OsHeIn6sQmhvXleSl9T70YY/hostQLveWs0ic+qvbA3fa0kwAwQ0OA/XGaAerNZRQGJyRfhbJK4g==
-  dependencies:
-    "@babel/helper-module-imports" "^7.24.6"
-    "@babel/helper-plugin-utils" "^7.24.6"
-    "@babel/helper-remap-async-to-generator" "^7.24.6"
-
-"@babel/plugin-transform-block-scoping@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.6.tgz#a03ec8a4591c2b43cf7798bc633e698293fda179"
-  integrity sha512-S/t1Xh4ehW7sGA7c1j/hiOBLnEYCp/c2sEG4ZkL8kI1xX9tW2pqJTCHKtdhe/jHKt8nG0pFCrDHUXd4DvjHS9w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
-
 "@babel/plugin-transform-class-properties@^7.22.5":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.6.tgz#d9f394e97e88ef905d5a1e5e7a16238621b7982e"
@@ -455,36 +267,7 @@
     "@babel/helper-create-class-features-plugin" "^7.24.6"
     "@babel/helper-plugin-utils" "^7.24.6"
 
-"@babel/plugin-transform-classes@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.6.tgz#0cc198c02720d4eeb091004843477659c6b37977"
-  integrity sha512-+fN+NO2gh8JtRmDSOB6gaCVo36ha8kfCW1nMq2Gc0DABln0VcHN4PrALDvF5/diLzIRKptC7z/d7Lp64zk92Fg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.6"
-    "@babel/helper-compilation-targets" "^7.24.6"
-    "@babel/helper-environment-visitor" "^7.24.6"
-    "@babel/helper-function-name" "^7.24.6"
-    "@babel/helper-plugin-utils" "^7.24.6"
-    "@babel/helper-replace-supers" "^7.24.6"
-    "@babel/helper-split-export-declaration" "^7.24.6"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.6.tgz#7a1765c01cdfe59c320d2d0f37a4dc4aecd14df1"
-  integrity sha512-cRzPobcfRP0ZtuIEkA8QzghoUpSB3X3qSH5W2+FzG+VjWbJXExtx0nbRqwumdBN1x/ot2SlTNQLfBCnPdzp6kg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
-    "@babel/template" "^7.24.6"
-
-"@babel/plugin-transform-destructuring@^7.20.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.6.tgz#bdd1a6c90ffb2bfd13b6007b13316eeafc97cb53"
-  integrity sha512-YLW6AE5LQpk5npNXL7i/O+U9CE4XsBCuRPgyjl1EICZYKmcitV+ayuuUGMJm2lC1WWjXYszeTnIxF/dq/GhIZQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
-
-"@babel/plugin-transform-flow-strip-types@^7.20.0", "@babel/plugin-transform-flow-strip-types@^7.24.6":
+"@babel/plugin-transform-flow-strip-types@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.6.tgz#dfd9d1c90e74335bc68d82f41ad9224960a4de84"
   integrity sha512-1l8b24NoCpaQ13Vi6FtLG1nv6kNoi8PWvQb1AYO7GHZDpFfBYc3lbXArx1lP2KRt8b4pej1eWc/zrRmsQTfOdQ==
@@ -492,23 +275,7 @@
     "@babel/helper-plugin-utils" "^7.24.6"
     "@babel/plugin-syntax-flow" "^7.24.6"
 
-"@babel/plugin-transform-function-name@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.6.tgz#60d1de3f6fd816a3e3bf9538578a64527e1b9c97"
-  integrity sha512-sOajCu6V0P1KPljWHKiDq6ymgqB+vfo3isUS4McqW1DZtvSVU2v/wuMhmRmkg3sFoq6GMaUUf8W4WtoSLkOV/Q==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.24.6"
-    "@babel/helper-function-name" "^7.24.6"
-    "@babel/helper-plugin-utils" "^7.24.6"
-
-"@babel/plugin-transform-literals@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.6.tgz#7f44f2871d7a4456030b0540858046f0b7bc6b18"
-  integrity sha512-f2wHfR2HF6yMj+y+/y07+SLqnOSwRp8KYLpQKOzS58XLVlULhXbiYcygfXQxJlMbhII9+yXDwOUFLf60/TL5tw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
-
-"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.23.0", "@babel/plugin-transform-modules-commonjs@^7.24.6":
+"@babel/plugin-transform-modules-commonjs@^7.23.0", "@babel/plugin-transform-modules-commonjs@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.6.tgz#1b8269902f25bd91ca6427230d4735ddd1e1283e"
   integrity sha512-JEV8l3MHdmmdb7S7Cmx6rbNEjRCgTQMZxllveHO0mx6uiclB0NflCawlQQ6+o5ZrwjUBYPzHm2XoK4wqGVUFuw==
@@ -517,14 +284,6 @@
     "@babel/helper-plugin-utils" "^7.24.6"
     "@babel/helper-simple-access" "^7.24.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.6.tgz#352ee2861ab8705320029f80238cf26a92ba65d5"
-  integrity sha512-6DneiCiu91wm3YiNIGDWZsl6GfTTbspuj/toTEqLh9d4cx50UIzSdg+T96p8DuT7aJOBRhFyaE9ZvTHkXrXr6Q==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.24.6"
-    "@babel/helper-plugin-utils" "^7.24.6"
-
 "@babel/plugin-transform-nullish-coalescing-operator@^7.0.0-0", "@babel/plugin-transform-nullish-coalescing-operator@^7.22.11":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.6.tgz#12b83b3cdfd1cd2066350e36e4fb912ab194545e"
@@ -542,13 +301,6 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.20.7":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.6.tgz#7aee86dfedd2fc0136fecbe6f7649fc02d86ab22"
-  integrity sha512-ST7guE8vLV+vI70wmAxuZpIKzVjvFX9Qs8bl5w6tN/6gOypPWUmMQL2p7LJz5E63vEGrDhAiYetniJFyBH1RkA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
-
 "@babel/plugin-transform-private-methods@^7.22.5":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.6.tgz#258e1f859a52ff7b30ad556598224c192defcda7"
@@ -557,82 +309,13 @@
     "@babel/helper-create-class-features-plugin" "^7.24.6"
     "@babel/helper-plugin-utils" "^7.24.6"
 
-"@babel/plugin-transform-private-property-in-object@^7.22.11":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.6.tgz#59ff09a099f62213112cf348e96b6b11957d1f28"
-  integrity sha512-Qu/ypFxCY5NkAnEhCF86Mvg3NSabKsh/TPpBVswEdkGl7+FbsYHy1ziRqJpwGH4thBdQHh8zx+z7vMYmcJ7iaQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.6"
-    "@babel/helper-create-class-features-plugin" "^7.24.6"
-    "@babel/helper-plugin-utils" "^7.24.6"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
-"@babel/plugin-transform-react-display-name@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.6.tgz#2a10c732c2c87a8f06e4413fb4a14e76e6c67a99"
-  integrity sha512-/3iiEEHDsJuj9QU09gbyWGSUxDboFcD7Nj6dnHIlboWSodxXAoaY/zlNMHeYAC0WsERMqgO9a7UaM77CsYgWcg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
-
-"@babel/plugin-transform-react-jsx-self@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.6.tgz#4fa4870d594d6840d724d2006d0f98b19be6f502"
-  integrity sha512-FfZfHXtQ5jYPQsCRyLpOv2GeLIIJhs8aydpNh39vRDjhD411XcfWDni5i7OjP/Rs8GAtTn7sWFFELJSHqkIxYg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
-
-"@babel/plugin-transform-react-jsx-source@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.6.tgz#4e1503f24ca5fccb1fc7f20c57426899d5ce5c1f"
-  integrity sha512-BQTBCXmFRreU3oTUXcGKuPOfXAGb1liNY4AvvFKsOBAJ89RKcTsIrSsnMYkj59fNa66OFKnSa4AJZfy5Y4B9WA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
-
-"@babel/plugin-transform-react-jsx@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.6.tgz#4ca3660ca663d20095455571615d6263986cdfe4"
-  integrity sha512-pCtPHhpRZHfwdA5G1Gpk5mIzMA99hv0R8S/Ket50Rw+S+8hkt3wBWqdqHaPw0CuUYxdshUgsPiLQ5fAs4ASMhw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.6"
-    "@babel/helper-module-imports" "^7.24.6"
-    "@babel/helper-plugin-utils" "^7.24.6"
-    "@babel/plugin-syntax-jsx" "^7.24.6"
-    "@babel/types" "^7.24.6"
-
-"@babel/plugin-transform-runtime@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.6.tgz#1e3256246004c3724b8e07c7cb25e35913c4e373"
-  integrity sha512-W3gQydMb0SY99y/2lV0Okx2xg/8KzmZLQsLaiCmwNRl1kKomz14VurEm+2TossUb+sRvBCnGe+wx8KtIgDtBbQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.24.6"
-    "@babel/helper-plugin-utils" "^7.24.6"
-    babel-plugin-polyfill-corejs2 "^0.4.10"
-    babel-plugin-polyfill-corejs3 "^0.10.1"
-    babel-plugin-polyfill-regenerator "^0.6.1"
-    semver "^6.3.1"
-
-"@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.0.0-0":
+"@babel/plugin-transform-shorthand-properties@^7.0.0-0":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.6.tgz#ef734ebccc428d2174c7bb36015d0800faf5381e"
   integrity sha512-xnEUvHSMr9eOWS5Al2YPfc32ten7CXdH7Zwyyk7IqITg4nX61oHj+GxpNvl+y5JHjfN3KXE2IV55wAWowBYMVw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.6"
 
-"@babel/plugin-transform-spread@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.6.tgz#a56cecbd8617675531d1b79f5b755b7613aa0822"
-  integrity sha512-h/2j7oIUDjS+ULsIrNZ6/TKG97FgmEk1PXryk/HQq6op4XUUUwif2f69fJrzK0wza2zjCS1xhXmouACaWV5uPA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6"
-
-"@babel/plugin-transform-sticky-regex@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.6.tgz#1a78127731fea87d954bed193840986a38f04327"
-  integrity sha512-fN8OcTLfGmYv7FnDrsjodYBo1DhPL3Pze/9mIIE2MGCT1KgADYIOD7rEglpLHZj8PZlC/JFX5WcD+85FLAQusw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
-
 "@babel/plugin-transform-template-literals@^7.0.0-0":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.6.tgz#aaf2ae157acd0e5c9265dba8ac0a439f8d2a6303"
@@ -640,7 +323,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.6"
 
-"@babel/plugin-transform-typescript@^7.24.6", "@babel/plugin-transform-typescript@^7.5.0":
+"@babel/plugin-transform-typescript@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.6.tgz#339c6127a783c32e28a5b591e6c666f899b57db0"
   integrity sha512-H0i+hDLmaYYSt6KU9cZE0gb3Cbssa/oxWis7PX4ofQzbvsfix9Lbh8SRk7LCPDlLWJHUiFeHU0qRRpF/4Zv7mQ==
@@ -650,15 +333,7 @@
     "@babel/helper-plugin-utils" "^7.24.6"
     "@babel/plugin-syntax-typescript" "^7.24.6"
 
-"@babel/plugin-transform-unicode-regex@^7.0.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.6.tgz#2001e7d87ed709eea145e0b65fb5f93c3c0e225b"
-  integrity sha512-pssN6ExsvxaKU638qcWb81RrvvgZom3jDgU/r5xFZ7TONkZGFf4MhI2ltMb8OcQWhHyxgIavEU+hgqtbKOmsPA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.24.6"
-    "@babel/helper-plugin-utils" "^7.24.6"
-
-"@babel/preset-flow@^7.13.13", "@babel/preset-flow@^7.22.15":
+"@babel/preset-flow@^7.22.15":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.24.6.tgz#df09ee46558577bea49bc71d597604c03c9bf7a6"
   integrity sha512-huoe0T1Qs9fQhMWbmqE/NHUeZbqmHDsN6n/jYvPcUUHfuKiPV32C9i8tDhMbQ1DEKTjbBP7Rjm3nSLwlB2X05g==
@@ -667,7 +342,7 @@
     "@babel/helper-validator-option" "^7.24.6"
     "@babel/plugin-transform-flow-strip-types" "^7.24.6"
 
-"@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.7", "@babel/preset-typescript@^7.23.0":
+"@babel/preset-typescript@^7.16.7", "@babel/preset-typescript@^7.23.0":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.24.6.tgz#27057470fb981c31338bdb897fc3d9aa0cb7dab2"
   integrity sha512-U10aHPDnokCFRXgyT/MaIRTivUu2K/mu0vJlwRS9LxJmJet+PFQNKpggPyFCUtC6zWSBPjvxjnpNkAn3Uw2m5w==
@@ -678,7 +353,7 @@
     "@babel/plugin-transform-modules-commonjs" "^7.24.6"
     "@babel/plugin-transform-typescript" "^7.24.6"
 
-"@babel/register@^7.13.16", "@babel/register@^7.22.15":
+"@babel/register@^7.22.15":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.24.6.tgz#59e21dcc79e1d04eed5377633b0f88029a6bef9e"
   integrity sha512-WSuFCc2wCqMeXkz/i3yfAAsxwWflEgbVkZzivgAmXl/MxrXeoYFZOOPllbC8R8WTF7u61wSRQtDVZ1879cdu6w==
@@ -689,19 +364,14 @@
     pirates "^4.0.6"
     source-map-support "^0.5.16"
 
-"@babel/regjsgen@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
-  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
-
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.18.6", "@babel/runtime@^7.23.2", "@babel/runtime@^7.6.2", "@babel/runtime@^7.8.7":
+"@babel/runtime@^7.18.6", "@babel/runtime@^7.23.2", "@babel/runtime@^7.6.2", "@babel/runtime@^7.8.7":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.6.tgz#5b76eb89ad45e2e4a0a8db54c456251469a3358e"
   integrity sha512-Ja18XcETdEl5mzzACGd+DKgaGJzPTCow7EglgwTmHdwokzDFYh/MHua6lU6DV/hjF2IaOJ4oX2nqnjG7RElKOw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.0.0", "@babel/template@^7.24.6":
+"@babel/template@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.6.tgz#048c347b2787a6072b24c723664c8d02b67a44f9"
   integrity sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==
@@ -710,7 +380,7 @@
     "@babel/parser" "^7.24.6"
     "@babel/types" "^7.24.6"
 
-"@babel/traverse@^7.20.0", "@babel/traverse@^7.23.0", "@babel/traverse@^7.24.6":
+"@babel/traverse@^7.23.0", "@babel/traverse@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.6.tgz#0941ec50cdeaeacad0911eb67ae227a4f8424edc"
   integrity sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==
@@ -726,7 +396,7 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.20.0", "@babel/types@^7.23.0", "@babel/types@^7.24.6":
+"@babel/types@^7.23.0", "@babel/types@^7.24.6":
   version "7.24.6"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.6.tgz#ba4e1f59870c10dc2fa95a274ac4feec23b21912"
   integrity sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==
@@ -811,69 +481,69 @@
   dependencies:
     tslib "^2.4.0"
 
-"@gluestack-ui/accordion@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/accordion/-/accordion-1.0.4.tgz#cb1f2a61da033f23df3f83d483e03079c3f8c8f0"
-  integrity sha512-zcoOo0spRUG11mVZk6wgsE22LRq8btYnxrxkrBFekmmE51sU7ccoe0XxwvFfEubRPNlD8VjZyuDYIL452Ha/Xw==
+"@gluestack-ui/accordion@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/accordion/-/accordion-1.0.8.tgz#29486b7ce125a880abf7d55e966f04987989e2d1"
+  integrity sha512-Hcq/mJ6zDaQuqh/2pVbJB8UbB5vyNSYmuRc5dFP5DFZredywPrkEpz2awJodaQRCMBIh8jm6NEYfndMIuRFBTA==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/accordion" "^0.0.2"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/actionsheet@^0.2.44":
-  version "0.2.44"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/actionsheet/-/actionsheet-0.2.44.tgz#3cec30acfed7d590b2d783b34d40b24eb7074a0d"
-  integrity sha512-sLw/Pq5iMNliiddX1wGao3rj+6Brb2NZg6z2jRIoe6bvZoZ2x6ggQt2QznNeu6qRg0/sw3nwJUs5ZGMHGr4VeA==
+"@gluestack-ui/actionsheet@^0.2.46":
+  version "0.2.46"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/actionsheet/-/actionsheet-0.2.46.tgz#3efb27d5aa480d5718cc762fa1bc6dfbbc35d1b1"
+  integrity sha512-zZ4t0gLtHeN6pDDBAPduqnB6ySnqKtWcQfdWQF0KSjpicxMmk22kJQEuPbPPurdZKvq2dCpzQMsJUKe1Xar7Sg==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/transitions" "^0.1.10"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/transitions" "^0.1.11"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/dialog" "^0.0.4"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/alert-dialog@^0.1.28":
-  version "0.1.28"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/alert-dialog/-/alert-dialog-0.1.28.tgz#c0a37546d23e43bc12e25c8aca4b884fb207e33e"
-  integrity sha512-B1WdDjVmSA3/pz9qvlV9iVQIMSPj7DxN5vGznr6xFo9nJE4C30JidYBwK9VgGFo4qIibRkuzGVNzaZSCGOj4Hg==
+"@gluestack-ui/alert-dialog@^0.1.32":
+  version "0.1.32"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/alert-dialog/-/alert-dialog-0.1.32.tgz#d99b76a676edff2840008f03f4e3f1d2af38c330"
+  integrity sha512-+imIkN0SgEuikQKgevBw2uBUE0ypD4VygGkPGwq/t8WVLlKp/DCz3GQhsiZavkFi/fbXHNNldwOjSP4RjlYfFQ==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/dialog" "^0.0.4"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/alert@^0.1.14":
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/alert/-/alert-0.1.14.tgz#a92e042e5a7fa3013f11265f014e761d7ab74817"
-  integrity sha512-eBQTfZrktiTria3/2mWpnEjptvjlVv1Vn3fDs6RBJCqA7k/c5RTfipyawixejRcg5zT+PoWwR11hvnEPv3UDng==
+"@gluestack-ui/alert@^0.1.16":
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/alert/-/alert-0.1.16.tgz#cede162e04c3dcb07a3da797221852bb7c127311"
+  integrity sha512-vE0litmicuKFJFp9TY3mRuZmyH/E24IdHlC0f3FZjfa+AzeOS+bZdKMRix2EYkvBGrA6uNffWUuHeXWQGMRVJQ==
 
-"@gluestack-ui/avatar@^0.1.17":
-  version "0.1.17"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/avatar/-/avatar-0.1.17.tgz#7657defaa103c72c02fd57300bc79dc93ea47b77"
-  integrity sha512-L7R3GVjYK6o+tdCiCDZXvHjPi1FKwt9XAFHGlEsQ4dX6Qe7yWEi3K+e5UBpS1ugvja7SmNS+YZwvr+nnVcmohQ==
+"@gluestack-ui/avatar@^0.1.18":
+  version "0.1.18"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/avatar/-/avatar-0.1.18.tgz#bb890a7b889060e01faf549f59a47d11c04ada1c"
+  integrity sha512-VA9XwtavYLYCWrjxHc2u9gRpV97cPRcr/6KJ4tLiMiQbiRL1b4zckiL+/F39fB6xjUOUQHl3Fjo/Yd8swa0MBg==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
 
-"@gluestack-ui/button@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/button/-/button-1.0.4.tgz#565341ac0dfb199ca392bc878505daedc505d4f7"
-  integrity sha512-azM1D2qRcMs4gnIe8BkbBImIGCTjAAsUbh4vPHEz7sRXCS8wnOfg038EMcni+g8lmHTFb4nOSqAhuTdjRFprDg==
+"@gluestack-ui/button@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/button/-/button-1.0.8.tgz#fb6c1a3e6c59561d0cd6e7d8d0f519034144c66d"
+  integrity sha512-60ZcFd0XWIwoWe35GSf5jdcgpDI4R1LcQr098SYMUoYg3cWNFrbKUIa+cdCtD7oV/crVFjrmyj+6wZpiyDtx5g==
   dependencies:
-    "@gluestack-ui/utils" "0.1.12"
+    "@gluestack-ui/utils" "0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/checkbox@^0.1.28":
-  version "0.1.28"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/checkbox/-/checkbox-0.1.28.tgz#e28028d8b789114b70483dfae826226ab6ef3660"
-  integrity sha512-V+FAt1dQro0Pqt4wA7w4Av5kR5lr7O8haqybDwxVjog0Pbp58s237XqbWz/bPx8mvbrU3O0tCdHKsYqdBqZ06g==
+"@gluestack-ui/checkbox@^0.1.33":
+  version "0.1.33"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/checkbox/-/checkbox-0.1.33.tgz#8fc6f6e9b4fe51118abf28b66a82b4667fb7b18b"
+  integrity sha512-sTbjWiqJDzwfIzp1ZUnHV4MnR08+mlfixsBNqJHCUPrcFCvW2DMFyyRKHWdgHj3BJcfPZQH/kYljVGzJQeAetA==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.17"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-aria/visually-hidden" "^3.8.6"
     "@react-native-aria/checkbox" "^0.2.9"
     "@react-native-aria/focus" "^0.2.9"
@@ -881,86 +551,79 @@
     "@react-native-aria/utils" "0.2.11"
     "@react-stately/checkbox" "^3.4.2"
 
-"@gluestack-ui/divider@^0.1.8":
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/divider/-/divider-0.1.8.tgz#114584279aebc8bf6b718d039c521330051d8e44"
-  integrity sha512-l+OQ1XD5qI20ghxKbpi+pqntRtd0mtkmhfXYLODbjt2eec3U9kpV1xawXpfN/TFd45WWZTpEQ616sOQqFLo3RA==
+"@gluestack-ui/divider@^0.1.10":
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/divider/-/divider-0.1.10.tgz#506ec45f9b5183a0e3b293dbff7b7da19edcfda8"
+  integrity sha512-/hZx1Rmy4Pgln9AwAprAEQcxYPEHjHSNF4xCUWlK/q0peyiMT5Nagt54VnxykVn5A0b2zg5QKP0pOqOF9xeE6w==
 
-"@gluestack-ui/fab@^0.1.20":
-  version "0.1.20"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/fab/-/fab-0.1.20.tgz#ea7a9eb7d5512db1b08494d38236e36b24570761"
-  integrity sha512-N1vqn/6hOP1pzvcrKWHgsfhfLGF/wctbjqQQNc/z7Dzy8IbigA84vqD2p/xfp3d7KKDeE7BOPYFGvYNctuSPsg==
+"@gluestack-ui/fab@^0.1.22":
+  version "0.1.22"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/fab/-/fab-0.1.22.tgz#46861c5d886f5304fb8cf67033012cb4cc2d3239"
+  integrity sha512-kemsTSOFu18fL0stTAJ5O1FXcrDW2FULNpq3wJJT5aBiwHhQhvWHq1Dyzn/7kT2jSHrvNHDsTzzTcDzGIgVqmg==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/form-control@^0.1.16", "@gluestack-ui/form-control@^0.1.17":
-  version "0.1.17"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/form-control/-/form-control-0.1.17.tgz#f3f4f83a38b2533c1fbbfed5e60cf4a946104601"
-  integrity sha512-ctmbce3Tf/rpZyXSleOI2aUrOZEa/t7ubaB61F9Y0CauoaELMHrfSr4UZ5y4GC7z7pwvLXtMEpzEWvDQ9Af9Bg==
+"@gluestack-ui/form-control@^0.1.19":
+  version "0.1.19"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/form-control/-/form-control-0.1.19.tgz#7a75b65f5ec89da95c30442750d6f7af71db6868"
+  integrity sha512-6YbPbi/RZrXc5DyVPbxPV17FYaBoEl1yAdSwut8iE6n+yQekjluINrh2q5ZPWF2SGmyo7VSNcL85yeU5I97xHg==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/form-control@^0.1.18":
-  version "0.1.18"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/form-control/-/form-control-0.1.18.tgz#68246259a805a15def61a174a29cf7bc15524f73"
-  integrity sha512-sVRdh5qZwZGddMiHTG0IHEEktO6iwgKFSoccjmK7P7U/shWt7xAdt5Hh2Rp7+2C/g02v76uFlycI+GhtbnwLGw==
-  dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
-    "@react-native-aria/focus" "^0.2.9"
-
-"@gluestack-ui/hooks@0.1.11":
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/hooks/-/hooks-0.1.11.tgz#6b925d1dc4ac853cc24b0702e62b73224e375b7c"
-  integrity sha512-bcBsF7bTo//JD6L9ekJu0rZs83qYD/pE/Uj3ih3OYEtGU0LDoYiGkBMmDRpVMcVv8bE3TCKivnhHaT/heafInA==
+"@gluestack-ui/hooks@0.1.12":
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/hooks/-/hooks-0.1.12.tgz#4a92de73eec7b6ba6fc8e781c23417252993c95c"
+  integrity sha512-jMZS+aIPYvouRKkWUzOYFKeWyt+YFIojYFuSq8sNZTjAq72xtiKZQKxNwOgTorEDD4CAIk0bncRS0TneNSuMAA==
 
-"@gluestack-ui/icon@^0.1.21":
-  version "0.1.21"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/icon/-/icon-0.1.21.tgz#b2d2fd787d85de4e906352bce8630e9625e6d9cd"
-  integrity sha512-QZsx/MUS9AVjMka1mOcDPH6NDvPHQpp/nYEBD8M8pqj6C3SPtLbNAQJNWewy7WQTAsUdJblk6mUayq7LDrkQtA==
+"@gluestack-ui/icon@^0.1.24-alpha.0":
+  version "0.1.24-alpha.0"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/icon/-/icon-0.1.24-alpha.0.tgz#2315eb76fe14801056bdc5f6083fe5ec8461216c"
+  integrity sha512-PHLG/BnEw4eUNLmsZ7aMHAPPMcD0GizNHE8e+88m9h0+6Qb5HJ9sQi2qnhviO2JRyDi2z2pR1XNLuOlhzkKJag==
   dependencies:
-    "@gluestack-ui/provider" "^0.1.6"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/provider" "^0.1.13"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/image@^0.1.9":
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/image/-/image-0.1.9.tgz#cbab6569c10108d7bd60cff96d923ed308ac5845"
-  integrity sha512-Qalp99NrOz/AQM95fYhrKtO7+6s5vtgd8OkxGkdlU+HMiI0m6cDbQRG5jSE5M+RmWJLajfCmKYlNIg2rIj68HA==
+"@gluestack-ui/image@^0.1.11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/image/-/image-0.1.11.tgz#f7e624a4cdfc227a068e28331db457f31e7e1c94"
+  integrity sha512-Zg9+vdNr6jwM71RBxROzTSyNfLFOncBVSZfJX7nJ4N/8cRsSwbYCDJqt+UYe/+I1KYIpHCAICdgsJdas/lthkw==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/input@^0.1.29":
-  version "0.1.29"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/input/-/input-0.1.29.tgz#b4d884015ee3c9f94798fa9c4542f296c999e096"
-  integrity sha512-nrgE9NKL1qMleHhxZ7a0aS/A04b5U+ZliapQYoBV4t1TjJIyqpJcXIxQnXWp/JwHoWogJc+yZXAJnwcPK+bbeg==
+"@gluestack-ui/input@^0.1.32":
+  version "0.1.32"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/input/-/input-0.1.32.tgz#d4d64e43938b2cf9ee3f816fa774d08333305d28"
+  integrity sha512-RWtqpo0p37GYjwBTiMf4fpvKYe32OMa6lxFbDqPqEX1m994D9QwP7iWnDWA/9nr/Mf3eET6dMWbH4/eL4oZr8Q==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.17"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/link@^0.1.20":
-  version "0.1.20"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/link/-/link-0.1.20.tgz#983842b822093c3025642b33ce456a51f47cf49b"
-  integrity sha512-htYxFh2n1yJAq8JUGNMzOY4RV3F3+yD6QHCt5JpOo3ZBIyOZUMrLzPIaFmDPNRwb2sbzCFYZhK5Qk6v7IsWxPQ==
+"@gluestack-ui/link@^0.1.23":
+  version "0.1.23"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/link/-/link-0.1.23.tgz#624fa5adfbb7951529a7e48003d5bca926dd8ef3"
+  integrity sha512-j/YIdlq6V+Ad8c6X1EVL4jUI/Zo/L9S6WLZYPKNArlidRxjEME7d2maIl2O20ZcRSOHvee2VAf7HHNem+Jn+AA==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/menu@^0.2.33":
-  version "0.2.33"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/menu/-/menu-0.2.33.tgz#25d2cebf867a97cd893810523256b1c892c83a93"
-  integrity sha512-jHGxqHrSCK0zji9kCY4VIXW5vEVCnQbeTQr7BEbvlSzhnA+ISoqQB/KX4GKGHkZEC60YwQJ8nYoqMeyPFvHt1A==
+"@gluestack-ui/menu@^0.2.37":
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/menu/-/menu-0.2.37.tgz#094f365d07648792e6b5081533b9592afc64ddfa"
+  integrity sha512-2XxDG4pNPygtKe6icI1SN9HdlDS3nqPd3CiJ8HSHsTywjCDHZbm6zBamK9evWiOuKArGaNtcjEtXEm6lm56CFw==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
+    "@react-aria/menu" "^3.14.1"
     "@react-aria/overlays" "^3.19.0"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
@@ -969,184 +632,184 @@
     "@react-stately/utils" "^3.6.0"
     react-stately "^3.21.0"
 
-"@gluestack-ui/modal@^0.1.32":
-  version "0.1.32"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/modal/-/modal-0.1.32.tgz#f7d79d94349e4063aeafa55698313b9ed88941b5"
-  integrity sha512-nqAxbw6hdbHgt4sQR/JCRcwpr4avI4CD1E03Xu+nbfo86qeFi8LgzgSRkoxFQ3pDb0Mej6L/QdZ3RKMpcBPwRg==
+"@gluestack-ui/modal@^0.1.35":
+  version "0.1.35"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/modal/-/modal-0.1.35.tgz#5ed5df4b999926bc13456d94a2ae4fc647b98e16"
+  integrity sha512-KfA2aJ/ZsdM5rggAAJOykVHsOZf7aYjTfDNsd5JHUC7Uo8IrQAZJBX1DEz+Y3V8dPMXEIlEFGMaVh4o29nZXcw==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/dialog" "^0.0.4"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/overlays" "^0.3.12"
 
-"@gluestack-ui/nativewind-utils@^1.0.23":
-  version "1.0.23"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/nativewind-utils/-/nativewind-utils-1.0.23.tgz#80561faec07f23de3905216d8fe2cbd1b548536a"
-  integrity sha512-4sLc24QwhYWEpyz/ApGqwLOzkZ/tUxpWHtsnIaibgmACcS+BaEebgfGwqmSp215cFE2UlMGofFKDCrdA5UGN0A==
+"@gluestack-ui/nativewind-utils@^1.0.26-alpha.2":
+  version "1.0.26-alpha.2"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/nativewind-utils/-/nativewind-utils-1.0.26-alpha.2.tgz#c3ae0459f12e0187d985082681434d9ed7544cf4"
+  integrity sha512-YTIm6xLu/TBlnqWOE67cjcHFN7x1FE9iMPyspFD63lE8k58ZV5e9GngzS+HXQ+vfoumPMfY/Gxi5RJhIYy/tWA==
   dependencies:
     find-yarn-workspace-root "^2.0.0"
     patch-package "8.0.0"
     tailwind-variants "0.1.20"
 
-"@gluestack-ui/overlay@^0.1.12", "@gluestack-ui/overlay@^0.1.14", "@gluestack-ui/overlay@^0.1.7", "@gluestack-ui/overlay@latest":
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/overlay/-/overlay-0.1.14.tgz#2889f7a4f1234b1716d280e81da01eac4b5f356c"
-  integrity sha512-luLb6HRjF51PLfJC1RoEmdcC75WFN9x2jyMh9hTw2UPCzPKi7H0sTLgzyQwyJd57pH06otlJSzzVBxT7VV9QXw==
+"@gluestack-ui/overlay@0.1.16", "@gluestack-ui/overlay@^0.1.16":
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/overlay/-/overlay-0.1.16.tgz#1902a0985c45dd829ed13892935a360be3f6fe2c"
+  integrity sha512-08QFwioMroNia33Fe1zqhHjUL/CErr2swMMcN6vNWNWad6VfwXx3dZIXJxCIL1W90Rz908pWfIGrQEYaT6VAkw==
   dependencies:
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/overlays" "^0.3.12"
 
-"@gluestack-ui/popover@^0.1.34":
-  version "0.1.34"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/popover/-/popover-0.1.34.tgz#b91f4087c69af027c20f5a1659e91f0b54b33da5"
-  integrity sha512-Fr+VB+OWDsF55weCav2f2mtJG3b7xIIo1MC+4xWI4OmpuhGDJ4ixWic57mhtliRnHiJT+3Iyb6hJ2veT6u424Q==
+"@gluestack-ui/popover@^0.1.43":
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/popover/-/popover-0.1.43.tgz#7a9a4af29fecac0019cbec204a4f063c82ac5e0d"
+  integrity sha512-O+pcLWze+H/1fIzn+0Kx7rPgjOzXoUM4eVAM2f/vmqZ0g3hciT/2voNi2lV5mwwtfZOfNlWkgJZQHQ+DIkQx6g==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/dialog" "^0.0.4"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
-    "@react-native-aria/overlays" "^0.3.12"
+    "@react-native-aria/overlays" "0.3.14"
 
-"@gluestack-ui/pressable@^0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/pressable/-/pressable-0.1.16.tgz#b204b17a1f26c20a9cc8ba2c0af132bc91697fc0"
-  integrity sha512-SGUqCCZyMgRtlDN5mO7CN0NM+NMG9S2M3BdhdjI48Jnaks1DdWxzZeaD5xlEhg+Ww/KtmGzVrlSKqPDvVyROiA==
+"@gluestack-ui/pressable@^0.1.17":
+  version "0.1.17"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/pressable/-/pressable-0.1.17.tgz#96a09dc05e3b6beba8201dd83f6c19dafc875fff"
+  integrity sha512-tmyxyNsCCzF0spHwE6CcNq6WretE/Q42EQqvSGKvqk+HHetHGYdLdnWQ2jIxvdmFYXXqBwm5VbC0C8tzbc9A0w==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/progress@^0.1.14":
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/progress/-/progress-0.1.14.tgz#4092596c2ace6edcad28f3896800a3f18eb1a4c7"
-  integrity sha512-06ZiHV5JfCOvy+LVgTf91xoNrqVxHXsLJW5J2RphnAV2BsuPfE9Us99nt2NcEYkqK+gSN1rTk4yGZ7RA64DS9g==
+"@gluestack-ui/progress@^0.1.18":
+  version "0.1.18"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/progress/-/progress-0.1.18.tgz#9a659115b4579fee057c2d13bbc52e9e080a6958"
+  integrity sha512-WQCLdvqoiIIQnLBXG7+HDTREMbUfEy9rV7FuBMcBBqEFILuVT1W4hyuXLz/CPrUoCWZJ8OUKvLZvaWWzW8pA9Q==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
 
-"@gluestack-ui/provider@^0.1.6":
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/provider/-/provider-0.1.12.tgz#9694c23c7a50cb9567b9433602b66f483ee4dc0e"
-  integrity sha512-EvDEknx6qkrJuKC8ygdixiTvnAAji9moArREueNJdhJp8Af53UIzgWk4m4oqGlRfgrw6p1xApgE/2VTwGE5f7w==
+"@gluestack-ui/provider@^0.1.13":
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/provider/-/provider-0.1.13.tgz#4df09fa12655624688dc00fc24b58de36d72d739"
+  integrity sha512-kJaELgfowTBsJ90XIHW70LsvEg5PKdtmrjfmaU+Hea1spAPgPDh1z5gpmfVoUiZipUUdZoiUgnHbkVh5OMar4g==
   dependencies:
     "@react-native-aria/interactions" "0.2.13"
     tsconfig "7"
-    typescript "^4.9.4"
+    typescript "^5.6.3"
 
-"@gluestack-ui/radio@^0.1.29":
-  version "0.1.29"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/radio/-/radio-0.1.29.tgz#e31f3faab25ba2902bf08d0dffe47c9ce1d2827b"
-  integrity sha512-npPrKKLN5vMRYxL3nKBGLCMPz1azfD6Mb30Mwk2GHEaN3ib13BmpMKvXr4DyDkQUeicnGGLE/secZQG3iQPpkg==
+"@gluestack-ui/radio@^0.1.34":
+  version "0.1.34"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/radio/-/radio-0.1.34.tgz#939b18372ac6b032d563f0e54b2a730b84e3e196"
+  integrity sha512-6izkm5t+rbmPemkpIh0k9F9E3UdIFqbzKT6+WMUbmcaiHeTmWhI0njPiA0S8ge+RpKHXZmXgbiRK1TVkvu17Hw==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.17"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-aria/visually-hidden" "^3.7.0"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/radio" "^0.2.10"
     "@react-stately/radio" "^3.8.1"
 
-"@gluestack-ui/react-native-aria@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/react-native-aria/-/react-native-aria-0.1.5.tgz#604b6ca22364841d644f6b2911f8f5b776a7cea9"
-  integrity sha512-6IaE4fcBaGMu3kSDKAoo1wE5qXcoKDX5YA14zzYzXN2d67/K9NYSjpoo/GbxDWZVl45X6Z9QLS/SBP7SmsPO+Q==
+"@gluestack-ui/react-native-aria@^0.1.6":
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/react-native-aria/-/react-native-aria-0.1.6.tgz#5b0292fe1b7794743c5ab92dd6bc35741cbffb33"
+  integrity sha512-uLsdiTacS6iBVvk/+6Vvh2AJN9u0OzTvT0FqTiM8vgtesZvSBpv1DN1o5cQR+C/7s56yujdjRXzmRarknm60Qg==
   dependencies:
-    "@react-native-aria/focus" "^0.2.7"
+    "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/select@^0.1.29":
-  version "0.1.29"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/select/-/select-0.1.29.tgz#9869573a3f74caeadac8372d942b048b51cb7eb6"
-  integrity sha512-YbcF2v2DfP1Z1VGPEUXzjC9EvDR2QDgFLCpuUbNpztZqjAFHmdIWtJtxyCg6TrjbfsSKkVuoiXZ5VFRiymfOdQ==
+"@gluestack-ui/select@^0.1.30":
+  version "0.1.30"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/select/-/select-0.1.30.tgz#96a22e4702d228feeb05e2c630e613615f5bf79a"
+  integrity sha512-P47rX2vV6cX73Xvqgj3OyQC3Iw2Hj1r2jffdV2Ch+RzYGAbK97jfLJSG/MyK8awelw8s9r0U9VYgT8eez90ehg==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.18"
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/slider@^0.1.23":
-  version "0.1.23"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/slider/-/slider-0.1.23.tgz#a70417fb597aabeae0d7e3918237195c91280e22"
-  integrity sha512-8lIK03uFJwGaaoFdpnJ0mnCi/jK3y98HphbK34AwDpMFCHbjrG80jNz5YsoX7qTHgDQKwuADlHr7jprC9PM4gA==
+"@gluestack-ui/slider@^0.1.26":
+  version "0.1.26"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/slider/-/slider-0.1.26.tgz#09abc0152e268e202605e3a0538a792d704a7e45"
+  integrity sha512-Fe7ab1RBPilWamYHU5M5uA7GK+9PmISkliye+PToYkJRpp43mOa5llKCaViQ3aALnhI7GAawcJtbSsvUTpFEvw==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.16"
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-aria/visually-hidden" "^3.8.1"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/slider" "^0.2.11"
     "@react-stately/slider" "^3.2.4"
 
-"@gluestack-ui/spinner@^0.1.14":
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/spinner/-/spinner-0.1.14.tgz#b0afb1e310b409b343d6f59f9127642a97ce224b"
-  integrity sha512-6uLUvyJMhYR/sIMU/purfaYPqaKiLqnBi0n0LiWRsJNGDgENqdWVHMJpGTdWaFuCLxumZ7xnp0wG2KAdG9UyyQ==
+"@gluestack-ui/spinner@^0.1.15":
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/spinner/-/spinner-0.1.15.tgz#712276227568476f55672b7bbe0082478c0c0a65"
+  integrity sha512-jkXOGhna05HM2tcPKbA+t+vqcVRgRowwC6ES0A9kY5fcuURH1V41UFx/YWyHdSsHwmWlIoCCdWycF78UbNVdPg==
 
-"@gluestack-ui/switch@^0.1.21":
-  version "0.1.21"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/switch/-/switch-0.1.21.tgz#3d498ac175782ec6e93427c6f3c427adfc5e63a0"
-  integrity sha512-mtntQcMWDMPgmEvBuan/svi3yt1ENiYsC+XvgKTIG5IFT8kZP6sgRZu12Jfu5vf8/fAfpe+nMqIgCgDzJ1xFbQ==
+"@gluestack-ui/switch@^0.1.23":
+  version "0.1.23"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/switch/-/switch-0.1.23.tgz#4a1ba812a34be5a626ad6b1f55b3bc54cbabc3c8"
+  integrity sha512-Ur2EMsDyXMTUdXcvrs24InpXpqY0Mq2BhzfxdfvDWXEuPGn6+UFokIBTUE7HwHBWp07Gjqj6WGDiGnhKJMuT+w==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.16"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-stately/toggle" "^3.4.4"
 
-"@gluestack-ui/textarea@^0.1.21":
-  version "0.1.21"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/textarea/-/textarea-0.1.21.tgz#af438e71a5d1eb613ca0a2662d5077e3c475e5c5"
-  integrity sha512-Ykzf03oPIErXVf4+9MuCtehc/q2IvU5OxW1Uhr1J/DQSHshcviUhWzYnNbXvDR+wluqojGRALynqzOfXFj2ONw==
+"@gluestack-ui/textarea@^0.1.24":
+  version "0.1.24"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/textarea/-/textarea-0.1.24.tgz#bf3f6379ec49fec21e30aea2ccf79865ecee3625"
+  integrity sha512-maABWaI+Vif9S5twBVzcF1pqv43NMigYuKNM7aNZA5+Mzi3/cf3esPpYjB2VFg3r3VKLZq9JbVFkgLq9MauFxw==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.17"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/toast@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/toast/-/toast-1.0.4.tgz#b4e33b60d0ded2438b598d03a25d6ac5427308da"
-  integrity sha512-GVEESsSl567OR/0JlVTuivK6G1EgfEC7N+CAuH6lx+s87qXcOMXeFAgltp6Mxl8g0g5hTPLWrDts2qQLzqwFOA==
+"@gluestack-ui/toast@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/toast/-/toast-1.0.8.tgz#af77d31fdf5fc440041c3a4e08ede4dd2b950e66"
+  integrity sha512-Lwa8YU6rvmo9JhBAiSJZZoSyuyvZMKnBHcDJc+cPTd6OYybHF4bcEAEXQRQRu86EY0SfU63trCC3hEbXaSFWCg==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.12"
-    "@gluestack-ui/transitions" "^0.1.10"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/transitions" "^0.1.11"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/tooltip@^0.1.30":
-  version "0.1.30"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/tooltip/-/tooltip-0.1.30.tgz#15f5ef1202e21fd02df2cc999b258be68a09d13d"
-  integrity sha512-Z3HModlriqqnC7Jgk0s5aPwEamHfrMF11TKn3d/LyTMUQj9ZxoAD9IWT0rRvPU2/VXlydJHXbG0smnD6xVlHtA==
+"@gluestack-ui/tooltip@^0.1.36-alpha.0":
+  version "0.1.36-alpha.0"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/tooltip/-/tooltip-0.1.36-alpha.0.tgz#ff435e8709967688814b377a49456fab014f7a8c"
+  integrity sha512-pKlbOp3n2U3AXpS3Yz7a1u2mwmE1AFeeTctsz8DfA+8LTn0d34O76dKMkJxjY84kAKfSPq3Yi4oAxgobQLoeww==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/overlays" "^0.3.12"
 
-"@gluestack-ui/transitions@^0.1.10":
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/transitions/-/transitions-0.1.10.tgz#53e563dc0030bac020437ec3493e1bcda5373bab"
-  integrity sha512-oOwYAmbebAowDCDZyRdGwhK2of46b642OZQxBBkln/BX7YEvY4PhQIfup0HUCG9YA5IzlQnw0iwqREbaVNKIgA==
+"@gluestack-ui/transitions@^0.1.11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/transitions/-/transitions-0.1.11.tgz#e84a9841fabb8e67ce17cea979a1cd77b5edac56"
+  integrity sha512-GuCprzasuU8GKXm1GUmaVJ1Njiq72pQ4Ni0g+rg6kRQ7hyR0K4d0wdHRyFldHKmfLcQkM3i70rvYq/468hLKLw==
   dependencies:
-    "@gluestack-ui/overlay" "^0.1.7"
-    "@gluestack-ui/react-native-aria" "^0.1.5"
-    "@gluestack-ui/utils" "^0.1.9"
-    "@react-native-aria/focus" "^0.2.7"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/react-native-aria" "^0.1.6"
+    "@gluestack-ui/utils" "^0.1.14"
+    "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/utils@0.1.12", "@gluestack-ui/utils@^0.1.12", "@gluestack-ui/utils@^0.1.9":
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/utils/-/utils-0.1.12.tgz#0bb3400c9315fb6c0fd1bc697b20d80f82cd3899"
-  integrity sha512-OhOkljhr7foCUJP//8LwMN3EX4/pniFWmQpk1yDJMQL9DaTJbP7s3HsnTM7UzH2kp9DR1Utoz9Y9WscH3ajLpQ==
+"@gluestack-ui/utils@0.1.14", "@gluestack-ui/utils@^0.1.14":
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/utils/-/utils-0.1.14.tgz#83af7f58716fe9ec7ea7dc358a791d33b8271cd7"
+  integrity sha512-dGe2LWJi8KcNmfM/Nt/WAT0I5s2F/Lud7nR/gTyksdLs9AZ8YoRkKt0s4q0ofz6ku1yEHDLa/YOuk2+APd8qNQ==
   dependencies:
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack/ui-next-adapter@latest":
+"@gluestack/ui-next-adapter@^2.1.12":
   version "2.1.12"
   resolved "https://registry.yarnpkg.com/@gluestack/ui-next-adapter/-/ui-next-adapter-2.1.12.tgz#715f03b6767199f7668049b5d74c3e1b713245c4"
   integrity sha512-0NhiqNUHtYPOkJpCADI1BovY8bT1ahEVAt/udycwfIkMKcXjlFY6bFSDYtx4xri7qh5yPp6xS6Yt/OBvVobzmg==
@@ -1157,18 +820,6 @@
     next-compose-plugins "^2.2.1"
     next-transpile-modules "^10.0.0"
 
-"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
-  integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
-
-"@hapi/topo@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
-  integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
-  dependencies:
-    "@hapi/hoek" "^9.0.0"
-
 "@hookform/resolvers@^3.3.4":
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-3.9.0.tgz#cf540ac21c6c0cd24a40cf53d8e6d64391fb753d"
@@ -1200,6 +851,13 @@
   dependencies:
     "@swc/helpers" "^0.5.0"
 
+"@internationalized/date@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@internationalized/date/-/date-3.6.0.tgz#b30d43030bfed1855f20c9503606926d75bfdf64"
+  integrity sha512-+z6ti+CcJnRlLHok/emGEsWQhe7kfSmEW+/6qCzvKY67YPh7YOBfvc7+/+NXq+zJlbArg30tYpqLjNgcAYv2YQ==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
 "@internationalized/message@^3.1.4":
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/@internationalized/message/-/message-3.1.4.tgz#4da041155829ffb57c9563fa7c99e2b94c8a5766"
@@ -1208,6 +866,14 @@
     "@swc/helpers" "^0.5.0"
     intl-messageformat "^10.1.0"
 
+"@internationalized/message@^3.1.6":
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/@internationalized/message/-/message-3.1.6.tgz#e5a832788a17214bfb3e5bbf5f0e23ed2f568ad7"
+  integrity sha512-JxbK3iAcTIeNr1p0WIFg/wQJjIzJt9l/2KNY/48vXV7GRGZSv3zMxJsce008fZclk2cDC8y0Ig3odceHO7EfNQ==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+    intl-messageformat "^10.1.0"
+
 "@internationalized/number@^3.5.3":
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/@internationalized/number/-/number-3.5.3.tgz#9fa060c1c4809f23fb3d38dd3f3d1ae4c87e95a8"
@@ -1215,6 +881,13 @@
   dependencies:
     "@swc/helpers" "^0.5.0"
 
+"@internationalized/number@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@internationalized/number/-/number-3.6.0.tgz#dc6ba20c41b25eb605f1d5cac7d8668e9022c224"
+  integrity sha512-PtrRcJVy7nw++wn4W2OuePQQfTqDzfusSuY1QTtui4wa7r+rGVtR75pO8CyKvHvzyQYi3Q1uO5sY0AsB4e65Bw==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
 "@internationalized/string@^3.2.3":
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/@internationalized/string/-/string-3.2.3.tgz#b0a8379e779a69e7874979714e27f2ae86761d3c"
@@ -1222,6 +895,13 @@
   dependencies:
     "@swc/helpers" "^0.5.0"
 
+"@internationalized/string@^3.2.5":
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/@internationalized/string/-/string-3.2.5.tgz#2f387b256e79596a2e62ddd5e15c619fe241189c"
+  integrity sha512-rKs71Zvl2OKOHM+mzAFMIyqR5hI1d1O6BBkMK2/lkfg3fkmVh9Eeg0awcA8W2WqYqDOv6a86DIOlFpggwLtbuw==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -1234,70 +914,6 @@
     wrap-ansi "^8.1.0"
     wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
 
-"@isaacs/ttlcache@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@isaacs/ttlcache/-/ttlcache-1.4.1.tgz#21fb23db34e9b6220c6ba023a0118a2dd3461ea2"
-  integrity sha512-RQgQ4uQ+pLbqXfOmieB91ejmLwvSgv9nLx6sT6sD83s7umBypgg+OIBOBbEUiJXrfpnp9j0mRhYYdzp9uqq3lA==
-
-"@jest/create-cache-key-function@^29.6.3":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-29.7.0.tgz#793be38148fab78e65f40ae30c36785f4ad859f0"
-  integrity sha512-4QqS3LY5PBmTRHj9sAg1HLoPzqAI0uOX6wI/TRqHIcOxlFidy6YEmCQJk6FSZjNLGCeubDMfmkWL+qaLKhSGQA==
-  dependencies:
-    "@jest/types" "^29.6.3"
-
-"@jest/environment@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
-  integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==
-  dependencies:
-    "@jest/fake-timers" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    "@types/node" "*"
-    jest-mock "^29.7.0"
-
-"@jest/fake-timers@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565"
-  integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==
-  dependencies:
-    "@jest/types" "^29.6.3"
-    "@sinonjs/fake-timers" "^10.0.2"
-    "@types/node" "*"
-    jest-message-util "^29.7.0"
-    jest-mock "^29.7.0"
-    jest-util "^29.7.0"
-
-"@jest/schemas@^29.6.3":
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
-  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
-  dependencies:
-    "@sinclair/typebox" "^0.27.8"
-
-"@jest/types@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
-  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
-
-"@jest/types@^29.6.3":
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
-  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
-  dependencies:
-    "@jest/schemas" "^29.6.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^17.0.8"
-    chalk "^4.0.0"
-
 "@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
@@ -1317,14 +933,6 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
   integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
-"@jridgewell/source-map@^0.3.3":
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a"
-  integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.25"
-
 "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
   version "1.4.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
@@ -1519,6 +1127,17 @@
     "@swc/helpers" "^0.5.0"
     clsx "^2.0.0"
 
+"@react-aria/focus@^3.19.0":
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/focus/-/focus-3.19.0.tgz#82b9a5b83f023b943a7970df3d059f49d61df05d"
+  integrity sha512-hPF9EXoUQeQl1Y21/rbV2H4FdUR2v+4/I0/vB+8U3bT1CJ+1AFj1hc/rqx2DqEwDlEwOHN+E4+mRahQmlybq0A==
+  dependencies:
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+    clsx "^2.0.0"
+
 "@react-aria/form@^3.0.5":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@react-aria/form/-/form-3.0.5.tgz#abaf6ac005dc3f98760ac74fdb6524ad189399d6"
@@ -1544,6 +1163,20 @@
     "@react-types/shared" "^3.23.1"
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/i18n@^3.12.4":
+  version "3.12.4"
+  resolved "https://registry.yarnpkg.com/@react-aria/i18n/-/i18n-3.12.4.tgz#4520ce48a1b6ebe4aa470d72eba300e65de01814"
+  integrity sha512-j9+UL3q0Ls8MhXV9gtnKlyozq4aM95YywXqnmJtzT1rYeBx7w28hooqrWkCYLfqr4OIryv1KUnPiCSLwC2OC7w==
+  dependencies:
+    "@internationalized/date" "^3.6.0"
+    "@internationalized/message" "^3.1.6"
+    "@internationalized/number" "^3.6.0"
+    "@internationalized/string" "^3.2.5"
+    "@react-aria/ssr" "^3.9.7"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-aria/interactions@^3.21.3", "@react-aria/interactions@^3.3.2":
   version "3.21.3"
   resolved "https://registry.yarnpkg.com/@react-aria/interactions/-/interactions-3.21.3.tgz#a2a3e354a8b894bed7a46e1143453f397f2538d7"
@@ -1554,6 +1187,16 @@
     "@react-types/shared" "^3.23.1"
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/interactions@^3.22.5":
+  version "3.22.5"
+  resolved "https://registry.yarnpkg.com/@react-aria/interactions/-/interactions-3.22.5.tgz#9cd8c93b8b6988f1d315d3efb450119d1432bbb8"
+  integrity sha512-kMwiAD9E0TQp+XNnOs13yVJghiy8ET8L0cbkeuTgNI96sOAp/63EJ1FSrDf17iD8sdjt41LafwX/dKXW9nCcLQ==
+  dependencies:
+    "@react-aria/ssr" "^3.9.7"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-aria/label@^3.1.1", "@react-aria/label@^3.7.8":
   version "3.7.8"
   resolved "https://registry.yarnpkg.com/@react-aria/label/-/label-3.7.8.tgz#69f1c184836b04445fcedce78db9fd939a0570ea"
@@ -1582,6 +1225,26 @@
     "@react-types/shared" "^3.23.1"
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/menu@^3.14.1":
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/menu/-/menu-3.16.0.tgz#119e562806e9f8a39fd468ab790d788905c6df83"
+  integrity sha512-TNk+Vd3TbpBPUxEloAdHRTaRxf9JBK7YmkHYiq0Yj5Lc22KS0E2eTyhpPM9xJvEWN2TlC5TEvNfdyui2kYWFFQ==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/overlays" "^3.24.0"
+    "@react-aria/selection" "^3.21.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/menu" "^3.9.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-stately/tree" "^3.8.6"
+    "@react-types/button" "^3.10.1"
+    "@react-types/menu" "^3.9.13"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-aria/overlays@^3.19.0", "@react-aria/overlays@^3.22.1", "@react-aria/overlays@^3.7.0":
   version "3.22.1"
   resolved "https://registry.yarnpkg.com/@react-aria/overlays/-/overlays-3.22.1.tgz#7a01673317fa6517bb91b0b7504e303facdc9ccb"
@@ -1599,6 +1262,23 @@
     "@react-types/shared" "^3.23.1"
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/overlays@^3.24.0":
+  version "3.24.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/overlays/-/overlays-3.24.0.tgz#7f97cd12506961abfab3ae653822cea05d1cacd3"
+  integrity sha512-0kAXBsMNTc/a3M07tK9Cdt/ea8CxTAEJ223g8YgqImlmoBBYAL7dl5G01IOj67TM64uWPTmZrOklBchHWgEm3A==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/ssr" "^3.9.7"
+    "@react-aria/utils" "^3.26.0"
+    "@react-aria/visually-hidden" "^3.8.18"
+    "@react-stately/overlays" "^3.6.12"
+    "@react-types/button" "^3.10.1"
+    "@react-types/overlays" "^3.8.11"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-aria/radio@^3.1.2":
   version "3.10.4"
   resolved "https://registry.yarnpkg.com/@react-aria/radio/-/radio-3.10.4.tgz#e1b54fa7a9ee3912a5fe170fc752000eef836c06"
@@ -1628,6 +1308,19 @@
     "@react-types/shared" "^3.23.1"
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/selection@^3.21.0":
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/selection/-/selection-3.21.0.tgz#c5660e73a38db5e3e1cdc722e408b4489f5f589a"
+  integrity sha512-52JJ6hlPcM+gt0VV3DBmz6Kj1YAJr13TfutrKfGWcK36LvNCBm1j0N+TDqbdnlp8Nue6w0+5FIwZq44XPYiBGg==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-aria/slider@^3.0.1":
   version "3.7.8"
   resolved "https://registry.yarnpkg.com/@react-aria/slider/-/slider-3.7.8.tgz#6f2109527e0ebfaa1aaf46fce2460549d5550e1b"
@@ -1650,6 +1343,13 @@
   dependencies:
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/ssr@^3.9.7":
+  version "3.9.7"
+  resolved "https://registry.yarnpkg.com/@react-aria/ssr/-/ssr-3.9.7.tgz#d89d129f7bbc5148657e6c952ac31c9353183770"
+  integrity sha512-GQygZaGlmYjmYM+tiNBA5C6acmiDWF52Nqd40bBp0Znk4M4hP+LTmI0lpI1BuKMw45T8RIhrAsICIfKwZvi2Gg==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
 "@react-aria/toggle@^3.1.1":
   version "3.10.4"
   resolved "https://registry.yarnpkg.com/@react-aria/toggle/-/toggle-3.10.4.tgz#a3673ead72c389381c6217b5bed7269300351a8e"
@@ -1673,6 +1373,17 @@
     "@swc/helpers" "^0.5.0"
     clsx "^2.0.0"
 
+"@react-aria/utils@^3.26.0":
+  version "3.26.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/utils/-/utils-3.26.0.tgz#833cbfa33e75d15835b757791b3f754432d2f948"
+  integrity sha512-LkZouGSjjQ0rEqo4XJosS4L3YC/zzQkfRM3KoqK6fUOmUJ9t0jQ09WjiF+uOoG9u+p30AVg3TrZRUWmoTS+koQ==
+  dependencies:
+    "@react-aria/ssr" "^3.9.7"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+    clsx "^2.0.0"
+
 "@react-aria/visually-hidden@^3.7.0", "@react-aria/visually-hidden@^3.8.1", "@react-aria/visually-hidden@^3.8.12", "@react-aria/visually-hidden@^3.8.6":
   version "3.8.12"
   resolved "https://registry.yarnpkg.com/@react-aria/visually-hidden/-/visually-hidden-3.8.12.tgz#89388b4773b8fbea4b5f9682e807510c14218c93"
@@ -1683,6 +1394,16 @@
     "@react-types/shared" "^3.23.1"
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/visually-hidden@^3.8.18":
+  version "3.8.18"
+  resolved "https://registry.yarnpkg.com/@react-aria/visually-hidden/-/visually-hidden-3.8.18.tgz#13c168736944cbe19cd8917ec33a4e6f5f694119"
+  integrity sha512-l/0igp+uub/salP35SsNWq5mGmg3G5F5QMS1gDZ8p28n7CgjvzyiGhJbbca7Oxvaw1HRFzVl9ev+89I7moNnFQ==
+  dependencies:
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-native-aria/accordion@^0.0.2":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@react-native-aria/accordion/-/accordion-0.0.2.tgz#28e57f5c3690b2b33f36acd6aff7d91a75fbf384"
@@ -1709,7 +1430,7 @@
     "@react-types/dialog" "*"
     "@react-types/shared" "*"
 
-"@react-native-aria/focus@^0.2.7", "@react-native-aria/focus@^0.2.9":
+"@react-native-aria/focus@^0.2.9":
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/@react-native-aria/focus/-/focus-0.2.9.tgz#bdfa84f9711843df771877ac436ee3b4f8878b74"
   integrity sha512-zVgOIzKwnsyyurUxlZnzUKB2ekK/cmK64sQJIKKUlkJKVxd2EAFf7Sjz/NVEoMhTODN3qGRASTv9bMk/pBzzVA==
@@ -1742,6 +1463,18 @@
     "@react-stately/tree" "^3.1.2"
     "@react-types/menu" "^3.1.1"
 
+"@react-native-aria/overlays@0.3.14":
+  version "0.3.14"
+  resolved "https://registry.yarnpkg.com/@react-native-aria/overlays/-/overlays-0.3.14.tgz#3992f656704d67bbe9d5c28862e6fac841f263ae"
+  integrity sha512-a8MIB2aBw5yitNB0szNqKQlm4ngOozHGVmXTbslejGIX2+3YQUg8e7J4ouT7ZgK2iIr2gIB3YrstHDM6mvKVmw==
+  dependencies:
+    "@react-aria/interactions" "^3.3.2"
+    "@react-aria/overlays" "^3.7.0"
+    "@react-native-aria/utils" "0.2.11"
+    "@react-stately/overlays" "^3.1.1"
+    "@react-types/overlays" "^3.4.0"
+    dom-helpers "^5.0.0"
+
 "@react-native-aria/overlays@^0.3.12":
   version "0.3.12"
   resolved "https://registry.yarnpkg.com/@react-native-aria/overlays/-/overlays-0.3.12.tgz#224cc8a096a16fb6ee8ffe15d6a4290c7447db84"
@@ -1799,306 +1532,20 @@
     "@react-aria/ssr" "^3.0.1"
     "@react-aria/utils" "^3.3.0"
 
-"@react-native-community/cli-clean@13.6.6":
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-13.6.6.tgz#87c7ad8746c38dab0fe7b3c6ff89d44351d5d943"
-  integrity sha512-cBwJTwl0NyeA4nyMxbhkWZhxtILYkbU3TW3k8AXLg+iGphe0zikYMGB3T+haTvTc6alTyEFwPbimk9bGIqkjAQ==
-  dependencies:
-    "@react-native-community/cli-tools" "13.6.6"
-    chalk "^4.1.2"
-    execa "^5.0.0"
-    fast-glob "^3.3.2"
-
-"@react-native-community/cli-config@13.6.6":
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-config/-/cli-config-13.6.6.tgz#69f590694b3a079c74f781baab3b762db74f5dbd"
-  integrity sha512-mbG425zCKr8JZhv/j11382arezwS/70juWMsn8j2lmrGTrP1cUdW0MF15CCIFtJsqyK3Qs+FTmqttRpq81QfSg==
-  dependencies:
-    "@react-native-community/cli-tools" "13.6.6"
-    chalk "^4.1.2"
-    cosmiconfig "^5.1.0"
-    deepmerge "^4.3.0"
-    fast-glob "^3.3.2"
-    joi "^17.2.1"
-
-"@react-native-community/cli-debugger-ui@13.6.6":
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-13.6.6.tgz#ac021ebd795b0fd66fb52a8987d1d41c5a4b8cb3"
-  integrity sha512-Vv9u6eS4vKSDAvdhA0OiQHoA7y39fiPIgJ6biT32tN4avHDtxlc6TWZGiqv7g98SBvDWvoVAmdPLcRf3kU+c8g==
-  dependencies:
-    serve-static "^1.13.1"
-
-"@react-native-community/cli-doctor@13.6.6":
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-13.6.6.tgz#ac0febff05601d9b86af3e03460e1a6b0a1d33a5"
-  integrity sha512-TWZb5g6EmQe2Ua2TEWNmyaEayvlWH4GmdD9ZC+p8EpKFpB1NpDGMK6sXbpb42TDvwZg5s4TDRplK0PBEA/SVDg==
-  dependencies:
-    "@react-native-community/cli-config" "13.6.6"
-    "@react-native-community/cli-platform-android" "13.6.6"
-    "@react-native-community/cli-platform-apple" "13.6.6"
-    "@react-native-community/cli-platform-ios" "13.6.6"
-    "@react-native-community/cli-tools" "13.6.6"
-    chalk "^4.1.2"
-    command-exists "^1.2.8"
-    deepmerge "^4.3.0"
-    envinfo "^7.10.0"
-    execa "^5.0.0"
-    hermes-profile-transformer "^0.0.6"
-    node-stream-zip "^1.9.1"
-    ora "^5.4.1"
-    semver "^7.5.2"
-    strip-ansi "^5.2.0"
-    wcwidth "^1.0.1"
-    yaml "^2.2.1"
-
-"@react-native-community/cli-hermes@13.6.6":
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-13.6.6.tgz#590f55f151fec23b55498228f92d100a0e71d474"
-  integrity sha512-La5Ie+NGaRl3klei6WxKoOxmCUSGGxpOk6vU5pEGf0/O7ky+Ay0io+zXYUZqlNMi/cGpO7ZUijakBYOB/uyuFg==
-  dependencies:
-    "@react-native-community/cli-platform-android" "13.6.6"
-    "@react-native-community/cli-tools" "13.6.6"
-    chalk "^4.1.2"
-    hermes-profile-transformer "^0.0.6"
-
-"@react-native-community/cli-platform-android@13.6.6":
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-13.6.6.tgz#9e3863cb092709021f11848890bff0fc16fc1609"
-  integrity sha512-/tMwkBeNxh84syiSwNlYtmUz/Ppc+HfKtdopL/5RB+fd3SV1/5/NPNjMlyLNgFKnpxvKCInQ7dnl6jGHJjeHjg==
-  dependencies:
-    "@react-native-community/cli-tools" "13.6.6"
-    chalk "^4.1.2"
-    execa "^5.0.0"
-    fast-glob "^3.3.2"
-    fast-xml-parser "^4.2.4"
-    logkitty "^0.7.1"
-
-"@react-native-community/cli-platform-apple@13.6.6":
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-apple/-/cli-platform-apple-13.6.6.tgz#d445fd6ed02c5ae2f43f9c45501e04fee53a2790"
-  integrity sha512-bOmSSwoqNNT3AmCRZXEMYKz1Jf1l2F86Nhs7qBcXdY/sGiJ+Flng564LOqvdAlVLTbkgz47KjNKCS2pP4Jg0Mg==
-  dependencies:
-    "@react-native-community/cli-tools" "13.6.6"
-    chalk "^4.1.2"
-    execa "^5.0.0"
-    fast-glob "^3.3.2"
-    fast-xml-parser "^4.0.12"
-    ora "^5.4.1"
-
-"@react-native-community/cli-platform-ios@13.6.6":
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-13.6.6.tgz#0cd700f36483ca37dda7ec044377f8a926b1df1f"
-  integrity sha512-vjDnRwhlSN5ryqKTas6/DPkxuouuyFBAqAROH4FR1cspTbn6v78JTZKDmtQy9JMMo7N5vZj1kASU5vbFep9IOQ==
-  dependencies:
-    "@react-native-community/cli-platform-apple" "13.6.6"
-
-"@react-native-community/cli-server-api@13.6.6":
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-13.6.6.tgz#467993006ef82361cdf7a9817999d5a09e85ca6a"
-  integrity sha512-ZtCXxoFlM7oDv3iZ3wsrT3SamhtUJuIkX2WePLPlN5bcbq7zimbPm2lHyicNJtpcGQ5ymsgpUWPCNZsWQhXBqQ==
-  dependencies:
-    "@react-native-community/cli-debugger-ui" "13.6.6"
-    "@react-native-community/cli-tools" "13.6.6"
-    compression "^1.7.1"
-    connect "^3.6.5"
-    errorhandler "^1.5.1"
-    nocache "^3.0.1"
-    pretty-format "^26.6.2"
-    serve-static "^1.13.1"
-    ws "^6.2.2"
-
-"@react-native-community/cli-tools@13.6.6":
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-13.6.6.tgz#55c40cbabafbfc56cfb95a4d5fbf73ef60ec3cbc"
-  integrity sha512-ptOnn4AJczY5njvbdK91k4hcYazDnGtEPrqIwEI+k/CTBHNdb27Rsm2OZ7ye6f7otLBqF8gj/hK6QzJs8CEMgw==
-  dependencies:
-    appdirsjs "^1.2.4"
-    chalk "^4.1.2"
-    execa "^5.0.0"
-    find-up "^5.0.0"
-    mime "^2.4.1"
-    node-fetch "^2.6.0"
-    open "^6.2.0"
-    ora "^5.4.1"
-    semver "^7.5.2"
-    shell-quote "^1.7.3"
-    sudo-prompt "^9.0.0"
-
-"@react-native-community/cli-types@13.6.6":
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-types/-/cli-types-13.6.6.tgz#b45af119d61888fea1074a7c32ddb093e3f119a9"
-  integrity sha512-733iaYzlmvNK7XYbnWlMjdE+2k0hlTBJW071af/xb6Bs+hbJqBP9c03FZuYH2hFFwDDntwj05bkri/P7VgSxug==
-  dependencies:
-    joi "^17.2.1"
-
-"@react-native-community/cli@13.6.6":
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-13.6.6.tgz#b929c8668e88344c03a46a3e635cb382dba16773"
-  integrity sha512-IqclB7VQ84ye8Fcs89HOpOscY4284VZg2pojHNl8H0Lzd4DadXJWQoxC7zWm8v2f8eyeX2kdhxp2ETD5tceIgA==
-  dependencies:
-    "@react-native-community/cli-clean" "13.6.6"
-    "@react-native-community/cli-config" "13.6.6"
-    "@react-native-community/cli-debugger-ui" "13.6.6"
-    "@react-native-community/cli-doctor" "13.6.6"
-    "@react-native-community/cli-hermes" "13.6.6"
-    "@react-native-community/cli-server-api" "13.6.6"
-    "@react-native-community/cli-tools" "13.6.6"
-    "@react-native-community/cli-types" "13.6.6"
-    chalk "^4.1.2"
-    commander "^9.4.1"
-    deepmerge "^4.3.0"
-    execa "^5.0.0"
-    find-up "^4.1.0"
-    fs-extra "^8.1.0"
-    graceful-fs "^4.1.3"
-    prompts "^2.4.2"
-    semver "^7.5.2"
-
-"@react-native/assets-registry@0.74.83", "@react-native/assets-registry@~0.74.83":
+"@react-native/assets-registry@~0.74.83":
   version "0.74.83"
   resolved "https://registry.yarnpkg.com/@react-native/assets-registry/-/assets-registry-0.74.83.tgz#c1815dc10f9e1075e0d03b4c8a9619145969522e"
   integrity sha512-2vkLMVnp+YTZYTNSDIBZojSsjz8sl5PscP3j4GcV6idD8V978SZfwFlk8K0ti0BzRs11mzL0Pj17km597S/eTQ==
 
-"@react-native/babel-plugin-codegen@0.74.83":
-  version "0.74.83"
-  resolved "https://registry.yarnpkg.com/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.74.83.tgz#971f9cfec980dd05598d81964c05a26c6166f9fb"
-  integrity sha512-+S0st3t4Ro00bi9gjT1jnK8qTFOU+CwmziA7U9odKyWrCoRJrgmrvogq/Dr1YXlpFxexiGIupGut1VHxr+fxJA==
-  dependencies:
-    "@react-native/codegen" "0.74.83"
-
-"@react-native/babel-preset@0.74.83":
-  version "0.74.83"
-  resolved "https://registry.yarnpkg.com/@react-native/babel-preset/-/babel-preset-0.74.83.tgz#9828457779b4ce0219078652327ce3203115cdf9"
-  integrity sha512-KJuu3XyVh3qgyUer+rEqh9a/JoUxsDOzkJNfRpDyXiAyjDRoVch60X/Xa/NcEQ93iCVHAWs0yQ+XGNGIBCYE6g==
-  dependencies:
-    "@babel/core" "^7.20.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.0.0"
-    "@babel/plugin-proposal-class-properties" "^7.18.0"
-    "@babel/plugin-proposal-export-default-from" "^7.0.0"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.0"
-    "@babel/plugin-proposal-numeric-separator" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.20.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.20.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-export-default-from" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.18.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.0.0"
-    "@babel/plugin-transform-arrow-functions" "^7.0.0"
-    "@babel/plugin-transform-async-to-generator" "^7.20.0"
-    "@babel/plugin-transform-block-scoping" "^7.0.0"
-    "@babel/plugin-transform-classes" "^7.0.0"
-    "@babel/plugin-transform-computed-properties" "^7.0.0"
-    "@babel/plugin-transform-destructuring" "^7.20.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.20.0"
-    "@babel/plugin-transform-function-name" "^7.0.0"
-    "@babel/plugin-transform-literals" "^7.0.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.0.0"
-    "@babel/plugin-transform-parameters" "^7.0.0"
-    "@babel/plugin-transform-private-methods" "^7.22.5"
-    "@babel/plugin-transform-private-property-in-object" "^7.22.11"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
-    "@babel/plugin-transform-runtime" "^7.0.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
-    "@babel/plugin-transform-spread" "^7.0.0"
-    "@babel/plugin-transform-sticky-regex" "^7.0.0"
-    "@babel/plugin-transform-typescript" "^7.5.0"
-    "@babel/plugin-transform-unicode-regex" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    "@react-native/babel-plugin-codegen" "0.74.83"
-    babel-plugin-transform-flow-enums "^0.0.2"
-    react-refresh "^0.14.0"
-
-"@react-native/codegen@0.74.83":
-  version "0.74.83"
-  resolved "https://registry.yarnpkg.com/@react-native/codegen/-/codegen-0.74.83.tgz#7c56a82fe7603f0867f0d80ff29db3757b71be55"
-  integrity sha512-GgvgHS3Aa2J8/mp1uC/zU8HuTh8ZT5jz7a4mVMWPw7+rGyv70Ba8uOVBq6UH2Q08o617IATYc+0HfyzAfm4n0w==
-  dependencies:
-    "@babel/parser" "^7.20.0"
-    glob "^7.1.1"
-    hermes-parser "0.19.1"
-    invariant "^2.2.4"
-    jscodeshift "^0.14.0"
-    mkdirp "^0.5.1"
-    nullthrows "^1.1.1"
-
-"@react-native/community-cli-plugin@0.74.83":
-  version "0.74.83"
-  resolved "https://registry.yarnpkg.com/@react-native/community-cli-plugin/-/community-cli-plugin-0.74.83.tgz#58808a58a5288895627548338731e72ebb5b507c"
-  integrity sha512-7GAFjFOg1mFSj8bnFNQS4u8u7+QtrEeflUIDVZGEfBZQ3wMNI5ycBzbBGycsZYiq00Xvoc6eKFC7kvIaqeJpUQ==
-  dependencies:
-    "@react-native-community/cli-server-api" "13.6.6"
-    "@react-native-community/cli-tools" "13.6.6"
-    "@react-native/dev-middleware" "0.74.83"
-    "@react-native/metro-babel-transformer" "0.74.83"
-    chalk "^4.0.0"
-    execa "^5.1.1"
-    metro "^0.80.3"
-    metro-config "^0.80.3"
-    metro-core "^0.80.3"
-    node-fetch "^2.2.0"
-    querystring "^0.2.1"
-    readline "^1.3.0"
-
-"@react-native/debugger-frontend@0.74.83":
-  version "0.74.83"
-  resolved "https://registry.yarnpkg.com/@react-native/debugger-frontend/-/debugger-frontend-0.74.83.tgz#48050afa4e086438073b95f041c0cc84fe3f20de"
-  integrity sha512-RGQlVUegBRxAUF9c1ss1ssaHZh6CO+7awgtI9sDeU0PzDZY/40ImoPD5m0o0SI6nXoVzbPtcMGzU+VO590pRfA==
-
-"@react-native/dev-middleware@0.74.83":
-  version "0.74.83"
-  resolved "https://registry.yarnpkg.com/@react-native/dev-middleware/-/dev-middleware-0.74.83.tgz#9d09cfdb763e8ef81c003b0f99ae4ed1a3539639"
-  integrity sha512-UH8iriqnf7N4Hpi20D7M2FdvSANwTVStwFCSD7VMU9agJX88Yk0D1T6Meh2RMhUu4kY2bv8sTkNRm7LmxvZqgA==
-  dependencies:
-    "@isaacs/ttlcache" "^1.4.1"
-    "@react-native/debugger-frontend" "0.74.83"
-    "@rnx-kit/chromium-edge-launcher" "^1.0.0"
-    chrome-launcher "^0.15.2"
-    connect "^3.6.5"
-    debug "^2.2.0"
-    node-fetch "^2.2.0"
-    nullthrows "^1.1.1"
-    open "^7.0.3"
-    selfsigned "^2.4.1"
-    serve-static "^1.13.1"
-    temp-dir "^2.0.0"
-    ws "^6.2.2"
-
-"@react-native/gradle-plugin@0.74.83":
-  version "0.74.83"
-  resolved "https://registry.yarnpkg.com/@react-native/gradle-plugin/-/gradle-plugin-0.74.83.tgz#4ac60a6d6295d5b920173cbf184ee32e53690810"
-  integrity sha512-Pw2BWVyOHoBuJVKxGVYF6/GSZRf6+v1Ygc+ULGz5t20N8qzRWPa2fRZWqoxsN7TkNLPsECYY8gooOl7okOcPAQ==
-
-"@react-native/js-polyfills@0.74.83":
-  version "0.74.83"
-  resolved "https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.74.83.tgz#0e189ce3ab0efecd00223f3bfc53663ce08ba013"
-  integrity sha512-/t74n8r6wFhw4JEoOj3bN71N1NDLqaawB75uKAsSjeCwIR9AfCxlzZG0etsXtOexkY9KMeZIQ7YwRPqUdNXuqw==
-
-"@react-native/metro-babel-transformer@0.74.83":
-  version "0.74.83"
-  resolved "https://registry.yarnpkg.com/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.74.83.tgz#ba87c3cf041f4c0d2b991231af1a6b4a216e9b5d"
-  integrity sha512-hGdx5N8diu8y+GW/ED39vTZa9Jx1di2ZZ0aapbhH4egN1agIAusj5jXTccfNBwwWF93aJ5oVbRzfteZgjbutKg==
-  dependencies:
-    "@babel/core" "^7.20.0"
-    "@react-native/babel-preset" "0.74.83"
-    hermes-parser "0.19.1"
-    nullthrows "^1.1.1"
-
-"@react-native/normalize-colors@0.74.83", "@react-native/normalize-colors@^0.74.1":
+"@react-native/normalize-colors@^0.74.1":
   version "0.74.83"
   resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.74.83.tgz#86ef925bacf219d74df115bcfb615f62d8142e85"
   integrity sha512-jhCY95gRDE44qYawWVvhTjTplW1g+JtKTKM3f8xYT1dJtJ8QWv+gqEtKcfmOHfDkSDaMKG0AGBaDTSK8GXLH8Q==
 
-"@react-native/virtualized-lists@0.74.83":
-  version "0.74.83"
-  resolved "https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.74.83.tgz#5595d6aefd9679d1295c56a1d1653b1fb261bd62"
-  integrity sha512-rmaLeE34rj7py4FxTod7iMTC7BAsm+HrGA8WxYmEJeyTV7WSaxAkosKoYBz8038mOiwnG9VwA/7FrB6bEQvn1A==
+"@react-native/virtualized-lists@^0.72.4":
+  version "0.72.8"
+  resolved "https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.72.8.tgz#a2c6a91ea0f1d40eb5a122fb063daedb92ed1dc3"
+  integrity sha512-J3Q4Bkuo99k7mu+jPS9gSUSgq+lLRSI/+ahXNwV92XgJ/8UgOTxu2LPwhJnBk/sQKxq7E8WkZBnBiozukQMqrw==
   dependencies:
     invariant "^2.2.4"
     nullthrows "^1.1.1"
@@ -2133,6 +1580,14 @@
     "@react-types/shared" "^3.23.1"
     "@swc/helpers" "^0.5.0"
 
+"@react-stately/collections@^3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/collections/-/collections-3.12.0.tgz#6240d3517d0d86f7d9eb4997108fb432d569e8d7"
+  integrity sha512-MfR9hwCxe5oXv4qrLUnjidwM50U35EFmInUeFf8i9mskYwWlRYS0O1/9PZ0oF1M0cKambaRHKEy98jczgb9ycA==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-stately/combobox@^3.8.4":
   version "3.8.4"
   resolved "https://registry.yarnpkg.com/@react-stately/combobox/-/combobox-3.8.4.tgz#6540ec4d53af210e6f3a769ba3f2615a55380984"
@@ -2226,6 +1681,16 @@
     "@react-types/shared" "^3.23.1"
     "@swc/helpers" "^0.5.0"
 
+"@react-stately/menu@^3.9.0":
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/menu/-/menu-3.9.0.tgz#b1e55996405f4e43ff844cbd325df9842914efe4"
+  integrity sha512-++sm0fzZeUs9GvtRbj5RwrP+KL9KPANp9f4SvtI3s+MP+Y/X3X7LNNePeeccGeyikB5fzMsuyvd82bRRW9IhDQ==
+  dependencies:
+    "@react-stately/overlays" "^3.6.12"
+    "@react-types/menu" "^3.9.13"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-stately/numberfield@^3.9.3":
   version "3.9.3"
   resolved "https://registry.yarnpkg.com/@react-stately/numberfield/-/numberfield-3.9.3.tgz#b61429835b949aa6ad5e2fb6e6699ee78ce7bcd5"
@@ -2246,6 +1711,15 @@
     "@react-types/overlays" "^3.8.7"
     "@swc/helpers" "^0.5.0"
 
+"@react-stately/overlays@^3.6.12":
+  version "3.6.12"
+  resolved "https://registry.yarnpkg.com/@react-stately/overlays/-/overlays-3.6.12.tgz#beb594a0e140dbd7957bfa181006854f91480bea"
+  integrity sha512-QinvZhwZgj8obUyPIcyURSCjTZlqZYRRCS60TF8jH8ZpT0tEAuDb3wvhhSXuYA3Xo9EHLwvLjEf3tQKKdAQArw==
+  dependencies:
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/overlays" "^3.8.11"
+    "@swc/helpers" "^0.5.0"
+
 "@react-stately/radio@^3.10.4", "@react-stately/radio@^3.2.1", "@react-stately/radio@^3.8.1":
   version "3.10.4"
   resolved "https://registry.yarnpkg.com/@react-stately/radio/-/radio-3.10.4.tgz#499ef1e781a47b5ac89b3af571fc61054327f55b"
@@ -2288,6 +1762,16 @@
     "@react-types/shared" "^3.23.1"
     "@swc/helpers" "^0.5.0"
 
+"@react-stately/selection@^3.18.0":
+  version "3.18.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/selection/-/selection-3.18.0.tgz#eb723dc26eafd9b016c55056fb550bdde8b4f87b"
+  integrity sha512-6EaNNP3exxBhW2LkcRR4a3pg+3oDguZlBSqIVVR7lyahv/D8xXHRC4dX+m0mgGHJpsgjs7664Xx6c8v193TFxg==
+  dependencies:
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-stately/slider@^3.0.1", "@react-stately/slider@^3.2.4", "@react-stately/slider@^3.5.4":
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/@react-stately/slider/-/slider-3.5.4.tgz#f8c1b5133769380348fa1e8a7a513ebbd88a8355"
@@ -2352,6 +1836,17 @@
     "@react-types/shared" "^3.23.1"
     "@swc/helpers" "^0.5.0"
 
+"@react-stately/tree@^3.8.6":
+  version "3.8.6"
+  resolved "https://registry.yarnpkg.com/@react-stately/tree/-/tree-3.8.6.tgz#85dc33c5d5b9a455ffc0b474300957e511db1ea4"
+  integrity sha512-lblUaxf1uAuIz5jm6PYtcJ+rXNNVkqyFWTIMx6g6gW/mYvm8GNx1G/0MLZE7E6CuDGaO9dkLSY2bB1uqyKHidA==
+  dependencies:
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-stately/utils@^3.10.1", "@react-stately/utils@^3.6.0":
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.10.1.tgz#dc8685b4994bef0dc10c37b024074be8afbfba62"
@@ -2359,6 +1854,20 @@
   dependencies:
     "@swc/helpers" "^0.5.0"
 
+"@react-stately/utils@^3.10.5":
+  version "3.10.5"
+  resolved "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.10.5.tgz#47bb91cd5afd1bafe39353614e5e281b818ebccc"
+  integrity sha512-iMQSGcpaecghDIh3mZEpZfoFH3ExBwTtuBEcvZ2XnGzCgQjeYXcMdIUwAfVQLXFTdHUHGF6Gu6/dFrYsCzySBQ==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
+"@react-types/button@^3.10.1":
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/@react-types/button/-/button-3.10.1.tgz#fc7ada2e83bc661b31c1473a82ec86dc11de057c"
+  integrity sha512-XTtap8o04+4QjPNAshFWOOAusUTxQlBjU2ai0BTVLShQEjHhRVDBIWsI2B2FKJ4KXT6AZ25llaxhNrreWGonmA==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
 "@react-types/button@^3.9.4":
   version "3.9.4"
   resolved "https://registry.yarnpkg.com/@react-types/button/-/button-3.9.4.tgz#ec10452e870660d31db1994f6fe4abfe0c800814"
@@ -2421,6 +1930,14 @@
     "@react-types/overlays" "^3.8.7"
     "@react-types/shared" "^3.23.1"
 
+"@react-types/menu@^3.9.13":
+  version "3.9.13"
+  resolved "https://registry.yarnpkg.com/@react-types/menu/-/menu-3.9.13.tgz#a666c2233cbdb495202586df86a798601788f74d"
+  integrity sha512-7SuX6E2tDsqQ+HQdSvIda1ji/+ujmR86dtS9CUu5yWX91P25ufRjZ72EvLRqClWNQsj1Xl4+2zBDLWlceznAjw==
+  dependencies:
+    "@react-types/overlays" "^3.8.11"
+    "@react-types/shared" "^3.26.0"
+
 "@react-types/numberfield@^3.8.3":
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/@react-types/numberfield/-/numberfield-3.8.3.tgz#85f8c4eceea22b437232250596fbaebfc7318e04"
@@ -2435,6 +1952,13 @@
   dependencies:
     "@react-types/shared" "^3.23.1"
 
+"@react-types/overlays@^3.8.11":
+  version "3.8.11"
+  resolved "https://registry.yarnpkg.com/@react-types/overlays/-/overlays-3.8.11.tgz#313964703b2a23572138120b619d35da33445dfd"
+  integrity sha512-aw7T0rwVI3EuyG5AOaEIk8j7dZJQ9m34XAztXJVZ/W2+4pDDkLDbJ/EAPnuo2xGYRGhowuNDn4tDju01eHYi+w==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
 "@react-types/radio@^3.1.1", "@react-types/radio@^3.8.1":
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/@react-types/radio/-/radio-3.8.1.tgz#f12ddd21d88fa278baa8ddc237b778c70b67669f"
@@ -2462,6 +1986,11 @@
   resolved "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.23.1.tgz#2f23c81d819d0ef376df3cd4c944be4d6bce84c3"
   integrity sha512-5d+3HbFDxGZjhbMBeFHRQhexMFt4pUce3okyRtUVKbbedQFUrtXSBg9VszgF2RTeQDKDkMCIQDtz5ccP/Lk1gw==
 
+"@react-types/shared@^3.26.0":
+  version "3.26.0"
+  resolved "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.26.0.tgz#21a8b579f0097ee78de18e3e580421ced89e4c8c"
+  integrity sha512-6FuPqvhmjjlpEDLTiYx29IJCbCNWPlsyO+ZUmCUXzhUv2ttShOXfw8CmeHWHftT/b2KweAWuzqSlfeXPR76jpw==
+
 "@react-types/slider@^3.7.3":
   version "3.7.3"
   resolved "https://registry.yarnpkg.com/@react-types/slider/-/slider-3.7.3.tgz#d6de0626c6977dd10faea2dba656193106ffbdb8"
@@ -2499,59 +2028,11 @@
     "@react-types/overlays" "^3.8.7"
     "@react-types/shared" "^3.23.1"
 
-"@rnx-kit/chromium-edge-launcher@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@rnx-kit/chromium-edge-launcher/-/chromium-edge-launcher-1.0.0.tgz#c0df8ea00a902c7a417cd9655aab06de398b939c"
-  integrity sha512-lzD84av1ZQhYUS+jsGqJiCMaJO2dn9u+RTT9n9q6D3SaKVwWqv+7AoRKqBu19bkwyE+iFRl1ymr40QS90jVFYg==
-  dependencies:
-    "@types/node" "^18.0.0"
-    escape-string-regexp "^4.0.0"
-    is-wsl "^2.2.0"
-    lighthouse-logger "^1.0.0"
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@rushstack/eslint-patch@^1.3.3":
   version "1.10.3"
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.3.tgz#391d528054f758f81e53210f1a1eebcf1a8b1d20"
   integrity sha512-qC/xYId4NMebE6w/V33Fh9gWxLgURiNYgVNObbJl2LZv0GUUItCcCqC5axQSwRaAgaxl2mELq1rMzlswaQ0Zxg==
 
-"@sideway/address@^4.1.5":
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5"
-  integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==
-  dependencies:
-    "@hapi/hoek" "^9.0.0"
-
-"@sideway/formula@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
-  integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
-
-"@sideway/pinpoint@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
-  integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
-
-"@sinclair/typebox@^0.27.8":
-  version "0.27.8"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
-  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
-
-"@sinonjs/commons@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd"
-  integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==
-  dependencies:
-    type-detect "4.0.8"
-
-"@sinonjs/fake-timers@^10.0.2":
-  version "10.3.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66"
-  integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==
-  dependencies:
-    "@sinonjs/commons" "^3.0.0"
-
 "@swc/counter@^0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9"
@@ -2579,51 +2060,18 @@
   dependencies:
     tslib "^2.4.0"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
-  integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
-
-"@types/istanbul-lib-report@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf"
-  integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-
-"@types/istanbul-reports@^3.0.0":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
-  integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
-  dependencies:
-    "@types/istanbul-lib-report" "*"
-
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/node-forge@^1.3.0":
-  version "1.3.11"
-  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da"
-  integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/node@*", "@types/node@^20.10.6":
+"@types/node@^20.10.6":
   version "20.12.12"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050"
   integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==
   dependencies:
     undici-types "~5.26.4"
 
-"@types/node@^18.0.0":
-  version "18.19.33"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.33.tgz#98cd286a1b8a5e11aa06623210240bcc28e95c48"
-  integrity sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A==
-  dependencies:
-    undici-types "~5.26.4"
-
 "@types/prop-types@*":
   version "15.7.12"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6"
@@ -2636,12 +2084,13 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-native@^0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.73.0.tgz#b316be230745779814caa533360262140b0f5984"
-  integrity sha512-6ZRPQrYM72qYKGWidEttRe6M5DZBEV5F+MHMHqd4TTYx0tfkcdrUFGdef6CCxY0jXU7wldvd/zA/b0A/kTeJmA==
+"@types/react-native@0.72.8":
+  version "0.72.8"
+  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.72.8.tgz#eb6238fab289f5f132f7ccf138bdfe6f21ed93e1"
+  integrity sha512-St6xA7+EoHN5mEYfdWnfYt0e8u6k2FR0P9s2arYgakQGFgU1f9FlPrIEcj0X24pLCF5c5i3WVuLCUdiCYHmOoA==
   dependencies:
-    react-native "*"
+    "@react-native/virtualized-lists" "^0.72.4"
+    "@types/react" "*"
 
 "@types/react@*", "@types/react@^18.2.46":
   version "18.3.3"
@@ -2651,11 +2100,6 @@
     "@types/prop-types" "*"
     csstype "^3.0.2"
 
-"@types/stack-utils@^2.0.0":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
-  integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
-
 "@types/strip-bom@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2"
@@ -2666,25 +2110,6 @@
   resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1"
   integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==
 
-"@types/yargs-parser@*":
-  version "21.0.3"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
-  integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
-
-"@types/yargs@^15.0.0":
-  version "15.0.19"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.19.tgz#328fb89e46109ecbdb70c295d96ff2f46dfd01b9"
-  integrity sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==
-  dependencies:
-    "@types/yargs-parser" "*"
-
-"@types/yargs@^17.0.8":
-  version "17.0.32"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229"
-  integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==
-  dependencies:
-    "@types/yargs-parser" "*"
-
 "@typescript-eslint/parser@^5.4.2 || ^6.0.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b"
@@ -2776,27 +2201,12 @@
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
-abort-controller@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
-  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
-  dependencies:
-    event-target-shim "^5.0.0"
-
-accepts@^1.3.7, accepts@~1.3.5, accepts@~1.3.7:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
-  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
-  dependencies:
-    mime-types "~2.1.34"
-    negotiator "0.6.3"
-
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.8.2, acorn@^8.9.0:
+acorn@^8.9.0:
   version "8.11.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
@@ -2811,26 +2221,7 @@ ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-anser@^1.4.9:
-  version "1.4.10"
-  resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.10.tgz#befa3eddf282684bd03b63dcda3927aef8c2e35b"
-  integrity sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww==
-
-ansi-fragments@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-fragments/-/ansi-fragments-0.2.1.tgz#24409c56c4cc37817c3d7caa99d8969e2de5a05e"
-  integrity sha512-DykbNHxuXQwUDRv5ibc2b0x7uw7wmwOGLBUd5RmaQ5z8Lhx19vwvKV+FAsM5rEA6dEcHxX+/Ad5s9eF2k2bB+w==
-  dependencies:
-    colorette "^1.0.7"
-    slice-ansi "^2.0.0"
-    strip-ansi "^5.0.0"
-
-ansi-regex@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
-  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
-
-ansi-regex@^5.0.0, ansi-regex@^5.0.1:
+ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -2840,7 +2231,7 @@ ansi-regex@^6.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
   integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -2854,11 +2245,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
-  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
-
 ansi-styles@^6.1.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
@@ -2869,7 +2255,7 @@ any-promise@^1.0.0:
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
   integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
 
-anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
@@ -2877,23 +2263,11 @@ anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-appdirsjs@^1.2.4:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/appdirsjs/-/appdirsjs-1.2.7.tgz#50b4b7948a26ba6090d4aede2ae2dc2b051be3b3"
-  integrity sha512-Quji6+8kLBC3NnBeo14nPDq0+2jUs5s3/xEye+udFHumHhRk4M7aAMXp/PBJqkKYGuuyR9M/6Dq7d2AViiGmhw==
-
 arg@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
   integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -2926,6 +2300,11 @@ array-includes@^3.1.6, array-includes@^3.1.7, array-includes@^3.1.8:
     get-intrinsic "^1.2.4"
     is-string "^1.0.7"
 
+array-timsort@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-timsort/-/array-timsort-1.0.3.tgz#3c9e4199e54fb2b9c3fe5976396a21614ef0d926"
+  integrity sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -3010,7 +2389,7 @@ arraybuffer.prototype.slice@^1.0.3:
     is-array-buffer "^3.0.4"
     is-shared-array-buffer "^1.0.2"
 
-asap@~2.0.3, asap@~2.0.6:
+asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
@@ -3020,13 +2399,6 @@ ast-types-flow@^0.0.8:
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.8.tgz#0a85e1c92695769ac13a428bb653e7538bea27d6"
   integrity sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==
 
-ast-types@0.15.2:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.15.2.tgz#39ae4809393c4b16df751ee563411423e85fb49d"
-  integrity sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==
-  dependencies:
-    tslib "^2.0.1"
-
 ast-types@^0.16.1:
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.16.1.tgz#7a9da1617c9081bc121faafe91711b4c8bb81da2"
@@ -3034,31 +2406,21 @@ ast-types@^0.16.1:
   dependencies:
     tslib "^2.0.1"
 
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-autoprefixer@latest:
-  version "10.4.19"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.19.tgz#ad25a856e82ee9d7898c59583c1afeb3fa65f89f"
-  integrity sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==
+autoprefixer@^10.4.20:
+  version "10.4.20"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.20.tgz#5caec14d43976ef42e32dcb4bd62878e96be5b3b"
+  integrity sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==
   dependencies:
-    browserslist "^4.23.0"
-    caniuse-lite "^1.0.30001599"
+    browserslist "^4.23.3"
+    caniuse-lite "^1.0.30001646"
     fraction.js "^4.3.7"
     normalize-range "^0.1.2"
-    picocolors "^1.0.0"
+    picocolors "^1.0.1"
     postcss-value-parser "^4.2.0"
 
 available-typed-arrays@^1.0.7:
@@ -3085,77 +2447,21 @@ babel-core@^7.0.0-bridge.0:
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
   integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
 
-babel-plugin-polyfill-corejs2@^0.4.10:
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33"
-  integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==
-  dependencies:
-    "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.6.2"
-    semver "^6.3.1"
-
-babel-plugin-polyfill-corejs3@^0.10.1:
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz#789ac82405ad664c20476d0233b485281deb9c77"
-  integrity sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.6.1"
-    core-js-compat "^3.36.1"
-
-babel-plugin-polyfill-regenerator@^0.6.1:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e"
-  integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.6.2"
-
 babel-plugin-react-native-web@^0.19.10:
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.19.12.tgz#90481ee72b515020b06cb644abe1e8a16590bd86"
   integrity sha512-eYZ4+P6jNcB37lObWIg0pUbi7+3PKoU1Oie2j0C8UF3cXyXoR74tO2NBjI/FORb2LJyItJZEAmjU5pSaJYEL1w==
 
-babel-plugin-tester@^11.0.4:
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-tester/-/babel-plugin-tester-11.0.4.tgz#4a661c5f08a63c344d46247f1256a7ef5175b405"
-  integrity sha512-cqswtpSPo0e++rZB0l/54EG17LL25l9gLgh59yXfnmNxX+2lZTIOpx2zt4YI9QIClVXc8xf63J6yWwKkzy0jNg==
-  dependencies:
-    core-js "^3.27.2"
-    debug "^4.3.4"
-    lodash.mergewith "^4.6.2"
-    prettier "^2.8.3"
-    strip-indent "^3.0.0"
-
-babel-plugin-transform-flow-enums@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-enums/-/babel-plugin-transform-flow-enums-0.0.2.tgz#d1d0cc9bdc799c850ca110d0ddc9f21b9ec3ef25"
-  integrity sha512-g4aaCrDDOsWjbm0PUUeVnkcVd6AKJsVc/MbnPhEotEpkeJQP6b8nzewohQi7+QS8UyPehOhGWn0nOwjvWpmMvQ==
-  dependencies:
-    "@babel/plugin-syntax-flow" "^7.12.1"
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.3.1, base64-js@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
 binary-extensions@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
   integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
-bl@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
-  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-
 boolbase@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -3183,7 +2489,7 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.22.2, browserslist@^4.23.0:
+browserslist@^4.22.2:
   version "4.23.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
   integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
@@ -3193,26 +2499,21 @@ browserslist@^4.22.2, browserslist@^4.23.0:
     node-releases "^2.0.14"
     update-browserslist-db "^1.0.13"
 
-bser@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
-  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+browserslist@^4.23.3:
+  version "4.24.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580"
+  integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
   dependencies:
-    node-int64 "^0.4.0"
+    caniuse-lite "^1.0.30001669"
+    electron-to-chromium "^1.5.41"
+    node-releases "^2.0.18"
+    update-browserslist-db "^1.1.1"
 
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
 busboy@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
@@ -3220,40 +2521,16 @@ busboy@1.6.0:
   dependencies:
     streamsearch "^1.1.0"
 
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
-
 call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
   integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
-  dependencies:
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
-    set-function-length "^1.2.1"
-
-caller-callsite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  integrity sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==
-  dependencies:
-    callsites "^2.0.0"
-
-caller-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  integrity sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==
-  dependencies:
-    caller-callsite "^2.0.0"
-
-callsites@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-  integrity sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
 
 callsites@^3.0.0:
   version "3.1.0"
@@ -3265,21 +2542,16 @@ camelcase-css@^2.0.1:
   resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
   integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
 
-camelcase@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-camelcase@^6.2.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
-  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
-
-caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001599:
+caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001587:
   version "1.0.30001624"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001624.tgz#0ec4c8fa7a46e5b785477c70b38a56d0b10058eb"
   integrity sha512-0dWnQG87UevOCPYaOR49CBcLBwoZLpws+k6W37nLjWUhumP1Isusj0p2u+3KhjNloRWK9OKMgjBBzPujQHw4nA==
 
+caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001669:
+  version "1.0.30001684"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz#0eca437bab7d5f03452ff0ef9de8299be6b08e16"
+  integrity sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==
+
 chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -3289,7 +2561,7 @@ chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3297,7 +2569,7 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chokidar@^3.5.3:
+chokidar@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
   integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -3312,61 +2584,16 @@ chokidar@^3.5.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chrome-launcher@^0.15.2:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.15.2.tgz#4e6404e32200095fdce7f6a1e1004f9bd36fa5da"
-  integrity sha512-zdLEwNo3aUVzIhKhTtXfxhdvZhUghrnmkvcAq2NoDd+LeOHKf03H5jwZ8T/STsAlzyALkBVK552iaG1fGf1xVQ==
-  dependencies:
-    "@types/node" "*"
-    escape-string-regexp "^4.0.0"
-    is-wsl "^2.2.0"
-    lighthouse-logger "^1.0.0"
-
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
-ci-info@^3.2.0, ci-info@^3.7.0:
+ci-info@^3.7.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
-cli-spinners@^2.5.0:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
-  integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
-
 client-only@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1"
   integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
 
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
-cliui@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
-  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.1"
-    wrap-ansi "^7.0.0"
-
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -3376,11 +2603,6 @@ clone-deep@^4.0.1:
     kind-of "^6.0.2"
     shallow-clone "^3.0.0"
 
-clone@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
-
 clsx@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
@@ -3410,103 +2632,42 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colorette@^1.0.7:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
-  integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
-
-command-exists@^1.2.8:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69"
-  integrity sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==
-
-commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
 commander@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@^9.4.1:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
-  integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
+comment-json@^4.2.5:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-4.2.5.tgz#482e085f759c2704b60bc6f97f55b8c01bc41e70"
+  integrity sha512-bKw/r35jR3HGt5PEPm1ljsQQGyCrR8sFGNiN5L+ykDHdpO8Smxkrkla9Yi6NkQyUrb8V54PGhfMs6NrIwtxtdw==
+  dependencies:
+    array-timsort "^1.0.3"
+    core-util-is "^1.0.3"
+    esprima "^4.0.1"
+    has-own-prop "^2.0.0"
+    repeat-string "^1.6.1"
 
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
-compressible@~2.0.16:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
-  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
-  dependencies:
-    mime-db ">= 1.43.0 < 2"
-
-compression@^1.7.1:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
-    debug "2.6.9"
-    on-headers "~1.0.2"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-connect@^3.6.5:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
-  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
-  dependencies:
-    debug "2.6.9"
-    finalhandler "1.1.2"
-    parseurl "~1.3.3"
-    utils-merge "1.0.1"
-
 convert-source-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-core-js-compat@^3.36.1:
-  version "3.37.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.1.tgz#c844310c7852f4bdf49b8d339730b97e17ff09ee"
-  integrity sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==
-  dependencies:
-    browserslist "^4.23.0"
-
-core-js@^3.27.2:
-  version "3.37.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.1.tgz#d21751ddb756518ac5a00e4d66499df981a62db9"
-  integrity sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==
-
-core-util-is@~1.0.0:
+core-util-is@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cosmiconfig@^5.0.5, cosmiconfig@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
-  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
-  dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.13.1"
-    parse-json "^4.0.0"
-
 cross-fetch@^3.1.5:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82"
@@ -3596,18 +2757,6 @@ data-view-byte-offset@^1.0.0:
     es-errors "^1.3.0"
     is-data-view "^1.0.1"
 
-dayjs@^1.8.15:
-  version "1.11.11"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e"
-  integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==
-
-debug@2.6.9, debug@^2.2.0, debug@^2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
 debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -3615,35 +2764,25 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
+debug@^4.3.7:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
+  dependencies:
+    ms "^2.1.3"
 
 deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^4.3.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
-  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
-
-defaults@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
-  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
-  dependencies:
-    clone "^1.0.2"
-
 define-data-property@^1.0.1, define-data-property@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
@@ -3662,26 +2801,11 @@ define-properties@^1.2.0, define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-denodeify@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631"
-  integrity sha512-KNTihKNmQENUZeKu5fzfpzRqR5S2VMp4gl9RFHiWzj9DfvYQPMJ6XHKNaQxaGCXwPk6y9yme3aUoaiAe+KX+vg==
-
-depd@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
 dequal@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
 
-destroy@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
-  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
-
 detect-libc@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
@@ -3761,16 +2885,16 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
-
 electron-to-chromium@^1.4.668:
   version "1.4.783"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.783.tgz#933887165b8b6025a81663d2d97cf4b85cde27b2"
   integrity sha512-bT0jEz/Xz1fahQpbZ1D7LgmPYZ3iHVY39NcWWro1+hA2IvjiPeaXtfSqrQ+nXjApMvQRE2ASt1itSLRrebHMRQ==
 
+electron-to-chromium@^1.5.41:
+  version "1.5.64"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.64.tgz#ac8c4c89075d35a1514b620f47dfe48a71ec3697"
+  integrity sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -3781,11 +2905,6 @@ emoji-regex@^9.2.2:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
-
 enhanced-resolve@^5.10.0, enhanced-resolve@^5.12.0:
   version "5.16.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz#e8bc63d51b826d6f1cbc0a150ecb5a8b0c62e567"
@@ -3799,33 +2918,6 @@ entities@^4.2.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
-envinfo@^7.10.0:
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.13.0.tgz#81fbb81e5da35d74e814941aeab7c325a606fb31"
-  integrity sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-error-stack-parser@^2.0.6:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
-  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
-  dependencies:
-    stackframe "^1.3.4"
-
-errorhandler@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.1.tgz#b9ba5d17cf90744cd1e851357a6e75bf806a9a91"
-  integrity sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==
-  dependencies:
-    accepts "~1.3.7"
-    escape-html "~1.0.3"
-
 es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
   version "1.23.3"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
@@ -3942,26 +3034,21 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-escalade@^3.1.1, escalade@^3.1.2:
+escalade@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
   integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
 
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
+escalade@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
-escape-string-regexp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
-  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
-
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
@@ -4151,7 +3238,7 @@ espree@^9.6.0, espree@^9.6.1:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.4.1"
 
-esprima@^4.0.0, esprima@~4.0.0:
+esprima@^4.0.1, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -4180,31 +3267,6 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
-
-event-target-shim@^5.0.0, event-target-shim@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
-  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
-
-execa@^5.0.0, execa@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
-
 expo-image@^1.12.9:
   version "1.12.9"
   resolved "https://registry.yarnpkg.com/expo-image/-/expo-image-1.12.9.tgz#b6354ab1dcff65df596399a538e6985c44aacc0b"
@@ -4217,7 +3279,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1, fast-glob@^3.3.2:
+fast-glob@^3.2.9, fast-glob@^3.3.1, fast-glob@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -4243,13 +3305,6 @@ fast-loops@^1.1.3:
   resolved "https://registry.yarnpkg.com/fast-loops/-/fast-loops-1.1.3.tgz#ce96adb86d07e7bf9b4822ab9c6fac9964981f75"
   integrity sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g==
 
-fast-xml-parser@^4.0.12, fast-xml-parser@^4.2.4:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.4.0.tgz#341cc98de71e9ba9e651a67f41f1752d1441a501"
-  integrity sha512-kLY3jFlwIYwBNDojclKsNAC12sfD6NwW74QB2CoNGPvtVxjliYehVunB3HYyNi+n4Tt1dAcgwYvmKF/Z18flqg==
-  dependencies:
-    strnum "^1.0.5"
-
 fastq@^1.6.0:
   version "1.17.1"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
@@ -4257,13 +3312,6 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-fb-watchman@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
-  integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
-  dependencies:
-    bser "2.1.1"
-
 fbjs-css-vars@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8"
@@ -4296,19 +3344,6 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    statuses "~1.5.0"
-    unpipe "~1.0.0"
-
 find-cache-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
@@ -4325,14 +3360,6 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
 find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
@@ -4362,11 +3389,6 @@ flatted@^3.2.9:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-flow-enums-runtime@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/flow-enums-runtime/-/flow-enums-runtime-0.0.6.tgz#5bb0cd1b0a3e471330f4d109039b7eba5cb3e787"
-  integrity sha512-3PYnM29RFXwvAN6Pc/scUfkI7RwhQ/xqyLUyPNlXUp9S40zI8nup9tUSrTLSVnWGBN38FNiGWbwZOB6uR4OGdw==
-
 flow-parser@0.*:
   version "0.236.0"
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.236.0.tgz#8e8e6c59ff7e8d196c0ed215b3919320a1c6e332"
@@ -4392,11 +3414,6 @@ fraction.js@^4.3.7:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-fresh@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
-
 fs-extra@^11.1.0:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
@@ -4406,15 +3423,6 @@ fs-extra@^11.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@^9.0.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
@@ -4430,7 +3438,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^2.3.2, fsevents@~2.3.2:
+fsevents@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -4460,11 +3468,6 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
 get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
@@ -4476,11 +3479,6 @@ get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@
     has-symbols "^1.0.3"
     hasown "^2.0.0"
 
-get-stream@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
-  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
-
 get-symbol-description@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5"
@@ -4539,7 +3537,7 @@ glob@^10.3.10:
     minipass "^7.1.2"
     path-scurry "^1.11.1"
 
-glob@^7.1.1, glob@^7.1.3:
+glob@^7.1.3:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4590,7 +3588,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -4615,6 +3613,11 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-own-prop@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-own-prop/-/has-own-prop-2.0.0.tgz#f0f95d58f65804f5d218db32563bb85b8e0417af"
+  integrity sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==
+
 has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
@@ -4646,83 +3649,16 @@ hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
   dependencies:
     function-bind "^1.1.2"
 
-hermes-estree@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.19.1.tgz#d5924f5fac2bf0532547ae9f506d6db8f3c96392"
-  integrity sha512-daLGV3Q2MKk8w4evNMKwS8zBE/rcpA800nu1Q5kM08IKijoSnPe9Uo1iIxzPKRkn95IxxsgBMPeYHt3VG4ej2g==
-
-hermes-estree@0.20.1:
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.20.1.tgz#0b9a544cf883a779a8e1444b915fa365bef7f72d"
-  integrity sha512-SQpZK4BzR48kuOg0v4pb3EAGNclzIlqMj3Opu/mu7bbAoFw6oig6cEt/RAi0zTFW/iW6Iz9X9ggGuZTAZ/yZHg==
-
-hermes-parser@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.19.1.tgz#1044348097165b7c93dc198a80b04ed5130d6b1a"
-  integrity sha512-Vp+bXzxYJWrpEuJ/vXxUsLnt0+y4q9zyi4zUlkLqD8FKv4LjIfOvP69R/9Lty3dCyKh0E2BU7Eypqr63/rKT/A==
-  dependencies:
-    hermes-estree "0.19.1"
-
-hermes-parser@0.20.1:
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.20.1.tgz#ad10597b99f718b91e283f81cbe636c50c3cff92"
-  integrity sha512-BL5P83cwCogI8D7rrDCgsFY0tdYUtmFP9XaXtl2IQjC+2Xo+4okjfXintlTxcIwl4qeGddEl28Z11kbVIw0aNA==
-  dependencies:
-    hermes-estree "0.20.1"
-
-hermes-profile-transformer@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/hermes-profile-transformer/-/hermes-profile-transformer-0.0.6.tgz#bd0f5ecceda80dd0ddaae443469ab26fb38fc27b"
-  integrity sha512-cnN7bQUm65UWOy6cbGcCcZ3rpwW8Q/j4OP5aWRhEry4Z2t2aR1cjrbp0BS+KiBN0smvP1caBgAuxutvyvJILzQ==
-  dependencies:
-    source-map "^0.7.3"
-
-http-errors@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
-  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
-  dependencies:
-    depd "2.0.0"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    toidentifier "1.0.1"
-
-human-signals@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
-  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-
 hyphenate-style-name@^1.0.3:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.5.tgz#70b68605ee601b7142362239a0236159a8b2dc33"
   integrity sha512-fedL7PRwmeVkgyhu9hLeTBaI6wcGk7JGJswdaRsa5aUbkXI1kr1xZwTPBtaYPpwf56878iDek6VbVnuWMebJmw==
 
-ieee754@^1.1.13:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
 ignore@^5.2.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
   integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
 
-image-size@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.1.1.tgz#ddd67d4dc340e52ac29ce5f546a09f4e29e840ac"
-  integrity sha512-541xKlUw6jr/6gGuk92F+mYM5zaFAc5ahphvkqvNe2bQ6gVBkd6bfrmVJ2t4KDAfikAYZyIqTnktX3i6/aQDrQ==
-  dependencies:
-    queue "6.0.2"
-
-import-fresh@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
-  integrity sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==
-  dependencies:
-    caller-path "^2.0.0"
-    resolve-from "^3.0.0"
-
 import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -4744,7 +3680,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+inherits@2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4791,11 +3727,6 @@ is-array-buffer@^3.0.4:
     call-bind "^1.0.2"
     get-intrinsic "^1.2.1"
 
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
-
 is-async-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646"
@@ -4851,11 +3782,6 @@ is-date-object@^1.0.1, is-date-object@^1.0.5:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==
-
 is-docker@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
@@ -4873,11 +3799,6 @@ is-finalizationregistry@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
-
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -4897,11 +3818,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-interactive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
-  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
-
 is-map@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
@@ -4956,11 +3872,6 @@ is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3:
   dependencies:
     call-bind "^1.0.7"
 
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
@@ -4982,11 +3893,6 @@ is-typed-array@^1.1.13:
   dependencies:
     which-typed-array "^1.1.14"
 
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
-
 is-weakmap@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
@@ -5007,12 +3913,7 @@ is-weakset@^2.0.3:
     call-bind "^1.0.7"
     get-intrinsic "^1.2.4"
 
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==
-
-is-wsl@^2.1.1, is-wsl@^2.2.0:
+is-wsl@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
   integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
@@ -5024,11 +3925,6 @@ isarray@^2.0.5:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -5059,110 +3955,16 @@ jackspeak@^3.1.2:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
-jest-environment-node@^29.6.3:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376"
-  integrity sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==
-  dependencies:
-    "@jest/environment" "^29.7.0"
-    "@jest/fake-timers" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    "@types/node" "*"
-    jest-mock "^29.7.0"
-    jest-util "^29.7.0"
-
-jest-get-type@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
-  integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
-
-jest-message-util@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
-  integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^29.6.3"
-    "@types/stack-utils" "^2.0.0"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    micromatch "^4.0.4"
-    pretty-format "^29.7.0"
-    slash "^3.0.0"
-    stack-utils "^2.0.3"
-
-jest-mock@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347"
-  integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==
-  dependencies:
-    "@jest/types" "^29.6.3"
-    "@types/node" "*"
-    jest-util "^29.7.0"
-
-jest-util@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
-  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
-  dependencies:
-    "@jest/types" "^29.6.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    graceful-fs "^4.2.9"
-    picomatch "^2.2.3"
-
-jest-validate@^29.6.3:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c"
-  integrity sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==
-  dependencies:
-    "@jest/types" "^29.6.3"
-    camelcase "^6.2.0"
-    chalk "^4.0.0"
-    jest-get-type "^29.6.3"
-    leven "^3.1.0"
-    pretty-format "^29.7.0"
-
-jest-worker@^29.6.3:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a"
-  integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==
-  dependencies:
-    "@types/node" "*"
-    jest-util "^29.7.0"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
-jiti@^1.21.0:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d"
-  integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==
-
-joi@^17.2.1:
-  version "17.13.1"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.1.tgz#9c7b53dc3b44dd9ae200255cc3b398874918a6ca"
-  integrity sha512-vaBlIKCyo4FCUtCm7Eu4QZd/q02bWcxfUO6YSXAZOWF6gzcLBeba8kwotUdYJjDLW8Cz8RywsSOqiNJZW0mNvg==
-  dependencies:
-    "@hapi/hoek" "^9.3.0"
-    "@hapi/topo" "^5.1.0"
-    "@sideway/address" "^4.1.5"
-    "@sideway/formula" "^3.0.1"
-    "@sideway/pinpoint" "^2.0.0"
+jiti@^1.21.6:
+  version "1.21.6"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.6.tgz#6c7f7398dd4b3142767f9a168af2f317a428d268"
+  integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -5170,16 +3972,6 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsc-android@^250231.0.0:
-  version "250231.0.0"
-  resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-250231.0.0.tgz#91720f8df382a108872fa4b3f558f33ba5e95262"
-  integrity sha512-rS46PvsjYmdmuz1OAWXY/1kCYG7pnf1TBqeTiOJr1iDz7s5DLxxC9n/ZMknLDxzYzNVfI7R95MH10emSSG1Wuw==
-
-jsc-safe-url@^0.2.2:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/jsc-safe-url/-/jsc-safe-url-0.2.4.tgz#141c14fbb43791e88d5dc64e85a374575a83477a"
-  integrity sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q==
-
 jscodeshift@0.15.2:
   version "0.15.2"
   resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.15.2.tgz#145563860360b4819a558c75c545f39683e5a0be"
@@ -5206,51 +3998,16 @@ jscodeshift@0.15.2:
     temp "^0.8.4"
     write-file-atomic "^2.3.0"
 
-jscodeshift@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.14.0.tgz#7542e6715d6d2e8bde0b4e883f0ccea358b46881"
-  integrity sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==
-  dependencies:
-    "@babel/core" "^7.13.16"
-    "@babel/parser" "^7.13.16"
-    "@babel/plugin-proposal-class-properties" "^7.13.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8"
-    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
-    "@babel/plugin-transform-modules-commonjs" "^7.13.8"
-    "@babel/preset-flow" "^7.13.13"
-    "@babel/preset-typescript" "^7.13.0"
-    "@babel/register" "^7.13.16"
-    babel-core "^7.0.0-bridge.0"
-    chalk "^4.1.2"
-    flow-parser "0.*"
-    graceful-fs "^4.2.4"
-    micromatch "^4.0.4"
-    neo-async "^2.5.0"
-    node-dir "^0.1.17"
-    recast "^0.21.0"
-    temp "^0.8.4"
-    write-file-atomic "^2.3.0"
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
-
 json-buffer@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-json-parse-better-errors@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -5283,13 +4040,6 @@ json5@^2.2.3:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -5333,11 +4083,6 @@ klaw-sync@^6.0.0:
   dependencies:
     graceful-fs "^4.1.11"
 
-kleur@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
-
 language-subtag-registry@^0.3.20:
   version "0.3.23"
   resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz#23529e04d9e3b74679d70142df3fd2eb6ec572e7"
@@ -5350,11 +4095,6 @@ language-tags@^1.0.9:
   dependencies:
     language-subtag-registry "^0.3.20"
 
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
-  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -5363,75 +4103,73 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-lighthouse-logger@^1.0.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/lighthouse-logger/-/lighthouse-logger-1.4.2.tgz#aef90f9e97cd81db367c7634292ee22079280aaa"
-  integrity sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g==
-  dependencies:
-    debug "^2.6.9"
-    marky "^1.2.2"
-
-lightningcss-darwin-arm64@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.22.0.tgz#28e189ce15290b3d0ab43704fc33e8e6366e6df4"
-  integrity sha512-aH2be3nNny+It5YEVm8tBSSdRlBVWQV8m2oJ7dESiYRzyY/E/bQUe2xlw5caaMuhlM9aoTMtOH25yzMhir0qPg==
-
-lightningcss-darwin-x64@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.22.0.tgz#1c5fe3e3ab31c9f1741f6d5d650ab683bd942854"
-  integrity sha512-9KHRFA0Y6mNxRHeoQMp0YaI0R0O2kOgUlYPRjuasU4d+pI8NRhVn9bt0yX9VPs5ibWX1RbDViSPtGJvYYrfVAQ==
-
-lightningcss-freebsd-x64@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.22.0.tgz#1ee7bcb68258b2cb1425bdc7ccb632233eae639c"
-  integrity sha512-xaYL3xperGwD85rQioDb52ozF3NAJb+9wrge3jD9lxGffplu0Mn35rXMptB8Uc2N9Mw1i3Bvl7+z1evlqVl7ww==
-
-lightningcss-linux-arm-gnueabihf@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.22.0.tgz#1c4287ec7268dcee6d9dcccb3d0810ecdcd35b74"
-  integrity sha512-epQGvXIjOuxrZpMpMnRjK54ZqzhiHhCPLtHvw2fb6NeK2kK9YtF0wqmeTBiQ1AkbWfnnXGTstYaFNiadNK+StQ==
-
-lightningcss-linux-arm64-gnu@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.22.0.tgz#b8e6daee4a60020a4930fc3564669868e723a10d"
-  integrity sha512-AArGtKSY4DGTA8xP8SDyNyKtpsUl1Rzq6FW4JomeyUQ4nBrR71uPChksTpj3gmWuGhZeRKLeCUI1DBid/zhChg==
-
-lightningcss-linux-arm64-musl@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.22.0.tgz#8d863a5470ee50369f13974325f2a3326b5f77df"
-  integrity sha512-RRraNgP8hnBPhInTTUdlFm+z16C/ghbxBG51Sw00hd7HUyKmEUKRozyc5od+/N6pOrX/bIh5vIbtMXIxsos0lg==
-
-lightningcss-linux-x64-gnu@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.22.0.tgz#4798711d1897fe19fccd039640389c5049fb03fb"
-  integrity sha512-grdrhYGRi2KrR+bsXJVI0myRADqyA7ekprGxiuK5QRNkv7kj3Yq1fERDNyzZvjisHwKUi29sYMClscbtl+/Zpw==
-
-lightningcss-linux-x64-musl@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.22.0.tgz#1d34f5bf428b0d2d4550627e653231d33fda90f9"
-  integrity sha512-t5f90X+iQUtIyR56oXIHMBUyQFX/zwmPt72E6Dane3P8KNGlkijTg2I75XVQS860gNoEFzV7Mm5ArRRA7u5CAQ==
-
-lightningcss-win32-x64-msvc@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.22.0.tgz#2fece601ea92298f73008bdf96ed0af8132d318f"
-  integrity sha512-64HTDtOOZE9PUCZJiZZQpyqXBbdby1lnztBccnqh+NtbKxjnGzP92R2ngcgeuqMPecMNqNWxgoWgTGpC+yN5Sw==
-
-lightningcss@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.22.0.tgz#76c9a17925e660741858e88b774172cb1923bb4a"
-  integrity sha512-+z0qvwRVzs4XGRXelnWRNwqsXUx8k3bSkbP8vD42kYKSk3z9OM2P3e/gagT7ei/gwh8DTS80LZOFZV6lm8Z8Fg==
+lightningcss-darwin-arm64@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.28.2.tgz#a906fd84cb43d753cb5db9c367f8f38482e8fb03"
+  integrity sha512-/8cPSqZiusHSS+WQz0W4NuaqFjquys1x+NsdN/XOHb+idGHJSoJ7SoQTVl3DZuAgtPZwFZgRfb/vd1oi8uX6+g==
+
+lightningcss-darwin-x64@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.28.2.tgz#6c43249d4ae821416d0d78403eae56111d0c6a94"
+  integrity sha512-R7sFrXlgKjvoEG8umpVt/yutjxOL0z8KWf0bfPT3cYMOW4470xu5qSHpFdIOpRWwl3FKNMUdbKtMUjYt0h2j4g==
+
+lightningcss-freebsd-x64@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.28.2.tgz#804bc6652c6721e94a92e7bbb5e65165376cf108"
+  integrity sha512-l2qrCT+x7crAY+lMIxtgvV10R8VurzHAoUZJaVFSlHrN8kRLTvEg9ObojIDIexqWJQvJcVVV3vfzsEynpiuvgA==
+
+lightningcss-linux-arm-gnueabihf@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.28.2.tgz#c32595127b565690d854c9ff641831e4ad739ee1"
+  integrity sha512-DKMzpICBEKnL53X14rF7hFDu8KKALUJtcKdFUCW5YOlGSiwRSgVoRjM97wUm/E0NMPkzrTi/rxfvt7ruNK8meg==
+
+lightningcss-linux-arm64-gnu@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.28.2.tgz#85646f08c5efbfd7c94f8e5ed6392d5cf95fa42c"
+  integrity sha512-nhfjYkfymWZSxdtTNMWyhFk2ImUm0X7NAgJWFwnsYPOfmtWQEapzG/DXZTfEfMjSzERNUNJoQjPAbdqgB+sjiw==
+
+lightningcss-linux-arm64-musl@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.28.2.tgz#4d9bc20cf6de28c4d0c586d81c577891555ad831"
+  integrity sha512-1SPG1ZTNnphWvAv8RVOymlZ8BDtAg69Hbo7n4QxARvkFVCJAt0cgjAw1Fox0WEhf4PwnyoOBaVH0Z5YNgzt4dA==
+
+lightningcss-linux-x64-gnu@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.28.2.tgz#74bd797d7157817c4e42ec45f1844a69636a9d82"
+  integrity sha512-ZhQy0FcO//INWUdo/iEdbefntTdpPVQ0XJwwtdbBuMQe+uxqZoytm9M+iqR9O5noWFaxK+nbS2iR/I80Q2Ofpg==
+
+lightningcss-linux-x64-musl@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.28.2.tgz#13ce6db4c491ebbb93099d6427746ab7bff3774f"
+  integrity sha512-alb/j1NMrgQmSFyzTbN1/pvMPM+gdDw7YBuQ5VSgcFDypN3Ah0BzC2dTZbzwzaMdUVDszX6zH5MzjfVN1oGuww==
+
+lightningcss-win32-arm64-msvc@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.28.2.tgz#eaae12c4a58a545a3adf40b22ba9625e5c0ebd29"
+  integrity sha512-WnwcjcBeAt0jGdjlgbT9ANf30pF0C/QMb1XnLnH272DQU8QXh+kmpi24R55wmWBwaTtNAETZ+m35ohyeMiNt+g==
+
+lightningcss-win32-x64-msvc@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.28.2.tgz#1f7c4474b2dc3dd1c12e22de32e4de23bdfa41e7"
+  integrity sha512-3piBifyT3avz22o6mDKywQC/OisH2yDK+caHWkiMsF82i3m5wDBadyCjlCQ5VNgzYkxrWZgiaxHDdd5uxsi0/A==
+
+lightningcss@^1.27.0:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.28.2.tgz#cc26fad9ad64a621bd39ac6248095891cf584cce"
+  integrity sha512-ePLRrbt3fgjXI5VFZOLbvkLD5ZRuxGKm+wJ3ujCqBtL3NanDHPo/5zicR5uEKAPiIjBYF99BM4K4okvMznjkVA==
   dependencies:
     detect-libc "^1.0.3"
   optionalDependencies:
-    lightningcss-darwin-arm64 "1.22.0"
-    lightningcss-darwin-x64 "1.22.0"
-    lightningcss-freebsd-x64 "1.22.0"
-    lightningcss-linux-arm-gnueabihf "1.22.0"
-    lightningcss-linux-arm64-gnu "1.22.0"
-    lightningcss-linux-arm64-musl "1.22.0"
-    lightningcss-linux-x64-gnu "1.22.0"
-    lightningcss-linux-x64-musl "1.22.0"
-    lightningcss-win32-x64-msvc "1.22.0"
+    lightningcss-darwin-arm64 "1.28.2"
+    lightningcss-darwin-x64 "1.28.2"
+    lightningcss-freebsd-x64 "1.28.2"
+    lightningcss-linux-arm-gnueabihf "1.28.2"
+    lightningcss-linux-arm64-gnu "1.28.2"
+    lightningcss-linux-arm64-musl "1.28.2"
+    lightningcss-linux-x64-gnu "1.28.2"
+    lightningcss-linux-x64-musl "1.28.2"
+    lightningcss-win32-arm64-msvc "1.28.2"
+    lightningcss-win32-x64-msvc "1.28.2"
 
 lilconfig@^2.1.0:
   version "2.1.0"
@@ -5456,13 +4194,6 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
 locate-path@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
@@ -5470,43 +4201,11 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
-
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.mergewith@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
-  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
-
-lodash.throttle@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
-  integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
-
-log-symbols@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
-  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
-  dependencies:
-    chalk "^4.1.0"
-    is-unicode-supported "^0.1.0"
-
-logkitty@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/logkitty/-/logkitty-0.7.1.tgz#8e8d62f4085a826e8d38987722570234e33c6aa7"
-  integrity sha512-/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ==
-  dependencies:
-    ansi-fragments "^0.2.1"
-    dayjs "^1.8.15"
-    yargs "^15.1.0"
-
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -5539,266 +4238,36 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-makeerror@1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
-  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
-  dependencies:
-    tmpl "1.0.5"
-
-marky@^1.2.2:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/marky/-/marky-1.2.5.tgz#55796b688cbd72390d2d399eaaf1832c9413e3c0"
-  integrity sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==
-
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
-memoize-one@^5.0.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
-  integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
-
 memoize-one@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045"
   integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==
 
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
 merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-metro-babel-transformer@0.80.9:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.80.9.tgz#7051ba377b7d2140abd23f4846bbbb1e81fea99b"
-  integrity sha512-d76BSm64KZam1nifRZlNJmtwIgAeZhZG3fi3K+EmPOlrR8rDtBxQHDSN3fSGeNB9CirdTyabTMQCkCup6BXFSQ==
-  dependencies:
-    "@babel/core" "^7.20.0"
-    hermes-parser "0.20.1"
-    nullthrows "^1.1.1"
-
-metro-cache-key@0.80.9:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.80.9.tgz#a04cbb0a7828509bb10dde9789ef761c0c60bc3d"
-  integrity sha512-hRcYGhEiWIdM87hU0fBlcGr+tHDEAT+7LYNCW89p5JhErFt/QaAkVx4fb5bW3YtXGv5BTV7AspWPERoIb99CXg==
-
-metro-cache@0.80.9:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.80.9.tgz#b914318a90dbcd51b4c27836184519c441ba5123"
-  integrity sha512-ujEdSI43QwI+Dj2xuNax8LMo8UgKuXJEdxJkzGPU6iIx42nYa1byQ+aADv/iPh5sh5a//h5FopraW5voXSgm2w==
-  dependencies:
-    metro-core "0.80.9"
-    rimraf "^3.0.2"
-
-metro-config@0.80.9, metro-config@^0.80.3:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.80.9.tgz#4eb6948b0ddc7c38d9d4ba8ddf22a67ca1c2bc06"
-  integrity sha512-28wW7CqS3eJrunRGnsibWldqgwRP9ywBEf7kg+uzUHkSFJNKPM1K3UNSngHmH0EZjomizqQA2Zi6/y6VdZMolg==
-  dependencies:
-    connect "^3.6.5"
-    cosmiconfig "^5.0.5"
-    jest-validate "^29.6.3"
-    metro "0.80.9"
-    metro-cache "0.80.9"
-    metro-core "0.80.9"
-    metro-runtime "0.80.9"
-
-metro-core@0.80.9, metro-core@^0.80.3:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.80.9.tgz#3af21d0b09d71ec9c0840f028bffb36bc3619727"
-  integrity sha512-tbltWQn+XTdULkGdzHIxlxk4SdnKxttvQQV3wpqqFbHDteR4gwCyTR2RyYJvxgU7HELfHtrVbqgqAdlPByUSbg==
-  dependencies:
-    lodash.throttle "^4.1.1"
-    metro-resolver "0.80.9"
-
-metro-file-map@0.80.9:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-file-map/-/metro-file-map-0.80.9.tgz#ed8783f6e35dfc005794344c2a9fcd6e914885aa"
-  integrity sha512-sBUjVtQMHagItJH/wGU9sn3k2u0nrCl0CdR4SFMO1tksXLKbkigyQx4cbpcyPVOAmGTVuy3jyvBlELaGCAhplQ==
-  dependencies:
-    anymatch "^3.0.3"
-    debug "^2.2.0"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.4"
-    invariant "^2.2.4"
-    jest-worker "^29.6.3"
-    micromatch "^4.0.4"
-    node-abort-controller "^3.1.1"
-    nullthrows "^1.1.1"
-    walker "^1.0.7"
-  optionalDependencies:
-    fsevents "^2.3.2"
-
-metro-minify-terser@0.80.9:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-minify-terser/-/metro-minify-terser-0.80.9.tgz#2b7798cba2bd4bd69cc5ce05a45bf66291542f83"
-  integrity sha512-FEeCeFbkvvPuhjixZ1FYrXtO0araTpV6UbcnGgDUpH7s7eR5FG/PiJz3TsuuPP/HwCK19cZtQydcA2QrCw446A==
-  dependencies:
-    terser "^5.15.0"
-
-metro-resolver@0.80.9:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.80.9.tgz#bae9120a0553e0cb59da6429e83a7e97465cc1a8"
-  integrity sha512-wAPIjkN59BQN6gocVsAvvpZ1+LQkkqUaswlT++cJafE/e54GoVkMNCmrR4BsgQHr9DknZ5Um/nKueeN7kaEz9w==
-
-metro-runtime@0.80.9, metro-runtime@^0.80.3:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.80.9.tgz#665312bd4e4d38fea921b3153d6ab47846eb4f08"
-  integrity sha512-8PTVIgrVcyU+X/rVCy/9yxNlvXsBCk5JwwkbAm/Dm+Abo6NBGtNjWF0M1Xo/NWCb4phamNWcD7cHdR91HhbJvg==
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-
-metro-source-map@0.80.9, metro-source-map@^0.80.3:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.80.9.tgz#df8f673137548f37ab9f9dcfa771b354a452cfab"
-  integrity sha512-RMn+XS4VTJIwMPOUSj61xlxgBvPeY4G6s5uIn6kt6HB6A/k9ekhr65UkkDD7WzHYs3a9o869qU8tvOZvqeQzgw==
-  dependencies:
-    "@babel/traverse" "^7.20.0"
-    "@babel/types" "^7.20.0"
-    invariant "^2.2.4"
-    metro-symbolicate "0.80.9"
-    nullthrows "^1.1.1"
-    ob1 "0.80.9"
-    source-map "^0.5.6"
-    vlq "^1.0.0"
-
-metro-symbolicate@0.80.9:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.80.9.tgz#8d1d19d26ebb36b9d13dbd29814fdd71d6009db7"
-  integrity sha512-Ykae12rdqSs98hg41RKEToojuIW85wNdmSe/eHUgMkzbvCFNVgcC0w3dKZEhSsqQOXapXRlLtHkaHLil0UD/EA==
-  dependencies:
-    invariant "^2.2.4"
-    metro-source-map "0.80.9"
-    nullthrows "^1.1.1"
-    source-map "^0.5.6"
-    through2 "^2.0.1"
-    vlq "^1.0.0"
-
-metro-transform-plugins@0.80.9:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.80.9.tgz#473a2c0a9e48043210547abe61cdeedb77725422"
-  integrity sha512-UlDk/uc8UdfLNJhPbF3tvwajyuuygBcyp+yBuS/q0z3QSuN/EbLllY3rK8OTD9n4h00qZ/qgxGv/lMFJkwP4vg==
-  dependencies:
-    "@babel/core" "^7.20.0"
-    "@babel/generator" "^7.20.0"
-    "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.20.0"
-    nullthrows "^1.1.1"
-
-metro-transform-worker@0.80.9:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.80.9.tgz#f1d8ef4f77228bb7e1d20d3c06934166e8ee3b28"
-  integrity sha512-c/IrzMUVnI0hSVVit4TXzt3A1GiUltGVlzCmLJWxNrBGHGrJhvgePj38+GXl1Xf4Fd4vx6qLUkKMQ3ux73bFLQ==
-  dependencies:
-    "@babel/core" "^7.20.0"
-    "@babel/generator" "^7.20.0"
-    "@babel/parser" "^7.20.0"
-    "@babel/types" "^7.20.0"
-    metro "0.80.9"
-    metro-babel-transformer "0.80.9"
-    metro-cache "0.80.9"
-    metro-cache-key "0.80.9"
-    metro-minify-terser "0.80.9"
-    metro-source-map "0.80.9"
-    metro-transform-plugins "0.80.9"
-    nullthrows "^1.1.1"
-
-metro@0.80.9, metro@^0.80.3:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/metro/-/metro-0.80.9.tgz#de3c2011df62036520d51d040d2dde0d015aecb6"
-  integrity sha512-Bc57Xf3GO2Xe4UWQsBj/oW6YfLPABEu8jfDVDiNmJvoQW4CO34oDPuYKe4KlXzXhcuNsqOtSxpbjCRRVjhhREg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/core" "^7.20.0"
-    "@babel/generator" "^7.20.0"
-    "@babel/parser" "^7.20.0"
-    "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.20.0"
-    "@babel/types" "^7.20.0"
-    accepts "^1.3.7"
-    chalk "^4.0.0"
-    ci-info "^2.0.0"
-    connect "^3.6.5"
-    debug "^2.2.0"
-    denodeify "^1.2.1"
-    error-stack-parser "^2.0.6"
-    graceful-fs "^4.2.4"
-    hermes-parser "0.20.1"
-    image-size "^1.0.2"
-    invariant "^2.2.4"
-    jest-worker "^29.6.3"
-    jsc-safe-url "^0.2.2"
-    lodash.throttle "^4.1.1"
-    metro-babel-transformer "0.80.9"
-    metro-cache "0.80.9"
-    metro-cache-key "0.80.9"
-    metro-config "0.80.9"
-    metro-core "0.80.9"
-    metro-file-map "0.80.9"
-    metro-resolver "0.80.9"
-    metro-runtime "0.80.9"
-    metro-source-map "0.80.9"
-    metro-symbolicate "0.80.9"
-    metro-transform-plugins "0.80.9"
-    metro-transform-worker "0.80.9"
-    mime-types "^2.1.27"
-    node-fetch "^2.2.0"
-    nullthrows "^1.1.1"
-    rimraf "^3.0.2"
-    serialize-error "^2.1.0"
-    source-map "^0.5.6"
-    strip-ansi "^6.0.0"
-    throat "^5.0.0"
-    ws "^7.5.1"
-    yargs "^17.6.2"
-
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
   integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
   dependencies:
     braces "^3.0.3"
-    picomatch "^2.3.1"
-
-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.27, mime-types@~2.1.34:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
-mime@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mime@^2.4.1:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
-  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
-
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+    picomatch "^2.3.1"
 
-min-indent@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
-  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
+micromatch@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
+  dependencies:
+    braces "^3.0.3"
+    picomatch "^2.3.1"
 
 minimatch@9.0.3:
   version "9.0.3"
@@ -5831,29 +4300,12 @@ minimist@^1.2.0, minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
-mkdirp@^0.5.1:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
-  dependencies:
-    minimist "^1.2.6"
-
-mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.1.1:
+ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -5872,23 +4324,20 @@ nanoid@^3.3.6, nanoid@^3.3.7:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
   integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
-nativewind@4.0.36:
-  version "4.0.36"
-  resolved "https://registry.yarnpkg.com/nativewind/-/nativewind-4.0.36.tgz#25a79d37cd89575f92d6095749a1620195459b30"
-  integrity sha512-nd0Xgjzaq0ISvUAjibZXcuSvvpX1BGX2mfOGBPZpjGfHL3By6fwLGsNhrKU6mi2FF30c+kdok3e2I4k/O0UO1Q==
+nativewind@^4.1.23:
+  version "4.1.23"
+  resolved "https://registry.yarnpkg.com/nativewind/-/nativewind-4.1.23.tgz#badfa94a5cd2e12ff8971dd274d234cd843ca74e"
+  integrity sha512-oLX3suGI6ojQqWxdQezOSM5GmJ4KvMnMtmaSMN9Ggb5j7ysFt4nHxb1xs8RDjZR7BWc+bsetNJU8IQdQMHqRpg==
   dependencies:
-    react-native-css-interop "0.0.36"
+    comment-json "^4.2.5"
+    debug "^4.3.7"
+    react-native-css-interop "0.1.22"
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-negotiator@0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
 neo-async@^2.5.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
@@ -5952,16 +4401,6 @@ next@^14.0.4:
     "@next/swc-win32-ia32-msvc" "14.2.3"
     "@next/swc-win32-x64-msvc" "14.2.3"
 
-nocache@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/nocache/-/nocache-3.0.4.tgz#5b37a56ec6e09fc7d401dceaed2eab40c8bfdf79"
-  integrity sha512-WDD0bdg9mbq6F4mRxEYcPWwfA1vxd0mrvKOyxI7Xj/atfRHVeutzuWByG//jfm4uPzp0y4Kj051EORCBSQMycw==
-
-node-abort-controller@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
-  integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==
-
 node-dir@^0.1.17:
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
@@ -5969,32 +4408,22 @@ node-dir@^0.1.17:
   dependencies:
     minimatch "^3.0.2"
 
-node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.12:
+node-fetch@^2.6.12:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
   integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-forge@^1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
-  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
-
-node-int64@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
-  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
-
 node-releases@^2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
   integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
-node-stream-zip@^1.9.1:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.15.0.tgz#158adb88ed8004c6c49a396b50a6a5de3bca33ea"
-  integrity sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw==
+node-releases@^2.0.18:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
@@ -6006,13 +4435,6 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
-npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
 nth-check@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
@@ -6025,11 +4447,6 @@ nullthrows@^1.1.1:
   resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
   integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
 
-ob1@0.80.9:
-  version "0.80.9"
-  resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.80.9.tgz#4ae3edd807536097674ff943509089f5d4e0649f"
-  integrity sha512-v9yOxowkZbxWhKOaaTyLjIm1aLy4ebMNcSn4NYJKOAI/Qv+SkfEfszpLr2GIxsccmb2Y2HA9qtsqiIJ80ucpVA==
-
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -6106,25 +4523,6 @@ object.values@^1.1.6, object.values@^1.1.7, object.values@^1.2.0:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-on-finished@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
-  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
-  dependencies:
-    ee-first "1.1.1"
-
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
-  dependencies:
-    ee-first "1.1.1"
-
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
-
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -6132,21 +4530,7 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.0, onetime@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-open@^6.2.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
-  integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
-  dependencies:
-    is-wsl "^1.1.0"
-
-open@^7.0.3, open@^7.4.2:
+open@^7.4.2:
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
   integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
@@ -6166,27 +4550,12 @@ optionator@^0.9.3:
     type-check "^0.4.0"
     word-wrap "^1.2.5"
 
-ora@^5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
-  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
-  dependencies:
-    bl "^4.1.0"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-spinners "^2.5.0"
-    is-interactive "^1.0.0"
-    is-unicode-supported "^0.1.0"
-    log-symbols "^4.1.0"
-    strip-ansi "^6.0.0"
-    wcwidth "^1.0.1"
-
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
-p-limit@^2.0.0, p-limit@^2.2.0:
+p-limit@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@@ -6207,13 +4576,6 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
 p-locate@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
@@ -6233,19 +4595,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
-parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
 patch-package@8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.0.tgz#d191e2f1b6e06a4624a0116bcb88edd6714ede61"
@@ -6282,7 +4631,7 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-key@^3.0.0, path-key@^3.1.0:
+path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
@@ -6310,7 +4659,12 @@ picocolors@^1.0.0, picocolors@^1.0.1:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
   integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
+picocolors@^1.1.0, picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -6358,7 +4712,7 @@ postcss-js@^4.0.1:
   dependencies:
     camelcase-css "^2.0.1"
 
-postcss-load-config@^4.0.1:
+postcss-load-config@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3"
   integrity sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==
@@ -6366,17 +4720,17 @@ postcss-load-config@^4.0.1:
     lilconfig "^3.0.0"
     yaml "^2.3.4"
 
-postcss-nested@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c"
-  integrity sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==
+postcss-nested@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.2.0.tgz#4c2d22ab5f20b9cb61e2c5c5915950784d068131"
+  integrity sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==
   dependencies:
-    postcss-selector-parser "^6.0.11"
+    postcss-selector-parser "^6.1.1"
 
-postcss-selector-parser@^6.0.11:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz#49694cb4e7c649299fea510a29fa6577104bcf53"
-  integrity sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==
+postcss-selector-parser@^6.1.1, postcss-selector-parser@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
+  integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -6395,49 +4749,20 @@ postcss@8.4.31:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.4.23, postcss@latest:
-  version "8.4.38"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
-  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
+postcss@^8.4.47, postcss@^8.4.49:
+  version "8.4.49"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
+  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
   dependencies:
     nanoid "^3.3.7"
-    picocolors "^1.0.0"
-    source-map-js "^1.2.0"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prettier@^2.8.3:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
-  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
-
-pretty-format@^26.5.2, pretty-format@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
-  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^17.0.1"
-
-pretty-format@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
-  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
-  dependencies:
-    "@jest/schemas" "^29.6.3"
-    ansi-styles "^5.0.0"
-    react-is "^18.0.0"
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -6445,21 +4770,6 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-promise@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-8.3.0.tgz#8cb333d1edeb61ef23869fbb8a4ea0279ab60e0a"
-  integrity sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==
-  dependencies:
-    asap "~2.0.6"
-
-prompts@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
-  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
 prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
@@ -6474,36 +4784,11 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-querystring@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
-  integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-queue@6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65"
-  integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==
-  dependencies:
-    inherits "~2.0.3"
-
-range-parser@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-
-react-devtools-core@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-5.2.0.tgz#072ecd2d84d3653817cc11e4b16f60a3c2b705f9"
-  integrity sha512-vZK+/gvxxsieAoAyYaiRIVFxlajb7KXhgBDV7OsoMzaAE+IqGpoxusBjIgq5ibqA2IloKu0p9n7tE68z1xs18A==
-  dependencies:
-    shell-quote "^1.6.1"
-    ws "^7"
-
 react-dom@^18.2.0:
   version "18.3.1"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
@@ -6517,31 +4802,22 @@ react-hook-form@^7.51.4:
   resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.53.0.tgz#3cf70951bf41fa95207b34486203ebefbd3a05ab"
   integrity sha512-M1n3HhqCww6S2hxLxciEXy2oISPnAzxY7gvwVPrtlczTM/1dDadXgUxDpHMrMTblDOcm/AXtXxHwZ3jpg1mqKQ==
 
-"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
-  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
-
 react-is@^16.13.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^17.0.1:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
-  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
-
-react-native-css-interop@0.0.36:
-  version "0.0.36"
-  resolved "https://registry.yarnpkg.com/react-native-css-interop/-/react-native-css-interop-0.0.36.tgz#ff87c9ab5cab72c4b24f0f6eed60ca95c31f0dc2"
-  integrity sha512-ZWoKQlq6XrI5DB4BdPk5ABvJQsX7zls1SQYWuYXOQB8u5QE0KH3OfOGAGRZPekTjgkhjqGO4Bf8G2JTSWAYMSg==
+react-native-css-interop@0.1.22, react-native-css-interop@^0.1.22:
+  version "0.1.22"
+  resolved "https://registry.yarnpkg.com/react-native-css-interop/-/react-native-css-interop-0.1.22.tgz#70cc6ca7a8f14126e123e44a19ceed74dd2a167a"
+  integrity sha512-Mu01e+H9G+fxSWvwtgWlF5MJBJC4VszTCBXopIpeR171lbeBInHb8aHqoqRPxmJpi3xIHryzqKFOJYAdk7PBxg==
   dependencies:
     "@babel/helper-module-imports" "^7.22.15"
     "@babel/traverse" "^7.23.0"
     "@babel/types" "^7.23.0"
-    babel-plugin-tester "^11.0.4"
-    lightningcss "1.22.0"
+    debug "^4.3.7"
+    lightningcss "^1.27.0"
+    semver "^7.6.3"
 
 react-native-reanimated@latest:
   version "3.11.0"
@@ -6557,18 +4833,23 @@ react-native-reanimated@latest:
     convert-source-map "^2.0.0"
     invariant "^2.2.4"
 
-react-native-svg@^15.2.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-15.3.0.tgz#e24b833fe330714c99f1dd894bb0da52ad859a4c"
-  integrity sha512-mBHu/fdlzUbpGX8SZFxgbKvK/sgqLfDLP8uh8G7Us+zJgdjO8OSEeqHQs+kPRdQmdLJQiqPJX2WXgCl7ToTWqw==
+react-native-safe-area-context@^4.14.0:
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.14.0.tgz#138f4b2e180cb7517c78bd5f4d4cf91325ba0b1a"
+  integrity sha512-/SyYpCulWQOnnXhRq6wepkhoyQMowHm1ptDyRz20s+YS/R9mbd+mK+jFyFCyXFJn8jp7vFl43VUCgspuOiEbwA==
+
+react-native-svg@15.2.0:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-15.2.0.tgz#9561a6b3bd6b44689f437ba13182afee33bd5557"
+  integrity sha512-R0E6IhcJfVLsL0lRmnUSm72QO+mTqcAOM5Jb8FVGxJqX3NfJMlMP0YyvcajZiaRR8CqQUpEoqrY25eyZb006kw==
   dependencies:
     css-select "^5.1.0"
     css-tree "^1.1.3"
 
-react-native-web@latest:
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/react-native-web/-/react-native-web-0.19.12.tgz#30d1fd70bdff7886f43c0c2698629d830fade6bc"
-  integrity sha512-o2T0oztoVDQjztt4YksO9S1XRjoH/AqcSvifgWLrPJgGVbMWsfhILgl6lfUdEamVZzZSVV/2gqDVMAk/qq7mZw==
+react-native-web@^0.19.13:
+  version "0.19.13"
+  resolved "https://registry.yarnpkg.com/react-native-web/-/react-native-web-0.19.13.tgz#2d84849bf0251ec0e3a8072fda7f9a7c29375331"
+  integrity sha512-etv3bN8rJglrRCp/uL4p7l8QvUNUC++QwDbdZ8CB7BvZiMvsxfFIRM1j04vxNldG3uo2puRd6OSWR3ibtmc29A==
   dependencies:
     "@babel/runtime" "^7.18.6"
     "@react-native/normalize-colors" "^0.74.1"
@@ -6579,62 +4860,6 @@ react-native-web@latest:
     postcss-value-parser "^4.2.0"
     styleq "^0.1.3"
 
-react-native@*:
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.74.1.tgz#8f5f59636242eb1b90ff675d9fcc7f5b8b1c9913"
-  integrity sha512-0H2XpmghwOtfPpM2LKqHIN7gxy+7G/r1hwJHKLV6uoyXGC/gCojRtoo5NqyKrWpFC8cqyT6wTYCLuG7CxEKilg==
-  dependencies:
-    "@jest/create-cache-key-function" "^29.6.3"
-    "@react-native-community/cli" "13.6.6"
-    "@react-native-community/cli-platform-android" "13.6.6"
-    "@react-native-community/cli-platform-ios" "13.6.6"
-    "@react-native/assets-registry" "0.74.83"
-    "@react-native/codegen" "0.74.83"
-    "@react-native/community-cli-plugin" "0.74.83"
-    "@react-native/gradle-plugin" "0.74.83"
-    "@react-native/js-polyfills" "0.74.83"
-    "@react-native/normalize-colors" "0.74.83"
-    "@react-native/virtualized-lists" "0.74.83"
-    abort-controller "^3.0.0"
-    anser "^1.4.9"
-    ansi-regex "^5.0.0"
-    base64-js "^1.5.1"
-    chalk "^4.0.0"
-    event-target-shim "^5.0.1"
-    flow-enums-runtime "^0.0.6"
-    invariant "^2.2.4"
-    jest-environment-node "^29.6.3"
-    jsc-android "^250231.0.0"
-    memoize-one "^5.0.0"
-    metro-runtime "^0.80.3"
-    metro-source-map "^0.80.3"
-    mkdirp "^0.5.1"
-    nullthrows "^1.1.1"
-    pretty-format "^26.5.2"
-    promise "^8.3.0"
-    react-devtools-core "^5.0.0"
-    react-refresh "^0.14.0"
-    react-shallow-renderer "^16.15.0"
-    regenerator-runtime "^0.13.2"
-    scheduler "0.24.0-canary-efb381bbf-20230505"
-    stacktrace-parser "^0.1.10"
-    whatwg-fetch "^3.0.0"
-    ws "^6.2.2"
-    yargs "^17.6.2"
-
-react-refresh@^0.14.0:
-  version "0.14.2"
-  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9"
-  integrity sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==
-
-react-shallow-renderer@^16.15.0:
-  version "16.15.0"
-  resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457"
-  integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==
-  dependencies:
-    object-assign "^4.1.1"
-    react-is "^16.12.0 || ^17.0.0 || ^18.0.0"
-
 react-stately@^3.21.0:
   version "3.31.1"
   resolved "https://registry.yarnpkg.com/react-stately/-/react-stately-3.31.1.tgz#8cc160adfe6e15034be0a68cd5ab8281b53dcfb9"
@@ -6678,28 +4903,6 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
-readable-stream@^3.4.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@~2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
-  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -6707,21 +4910,6 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-readline@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/readline/-/readline-1.3.0.tgz#c580d77ef2cfc8752b132498060dc9793a7ac01c"
-  integrity sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==
-
-recast@^0.21.0:
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.21.5.tgz#e8cd22bb51bcd6130e54f87955d33a2b2e57b495"
-  integrity sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==
-  dependencies:
-    ast-types "0.15.2"
-    esprima "~4.0.0"
-    source-map "~0.6.1"
-    tslib "^2.0.1"
-
 recast@^0.23.3:
   version "0.23.7"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.7.tgz#1e08f164e10402b075c904a2b01022b3da039c72"
@@ -6746,23 +4934,6 @@ reflect.getprototypeof@^1.0.4:
     globalthis "^1.0.3"
     which-builtin-type "^1.1.3"
 
-regenerate-unicode-properties@^10.1.0:
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480"
-  integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==
-  dependencies:
-    regenerate "^1.4.2"
-
-regenerate@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
-  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
-
-regenerator-runtime@^0.13.2:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
-  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
-
 regenerator-runtime@^0.14.0:
   version "0.14.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
@@ -6778,39 +4949,10 @@ regexp.prototype.flags@^1.5.2:
     es-errors "^1.3.0"
     set-function-name "^2.0.1"
 
-regexpu-core@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
-  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
-  dependencies:
-    "@babel/regjsgen" "^0.8.0"
-    regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.1.0"
-    regjsparser "^0.9.1"
-    unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.1.0"
-
-regjsparser@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
-  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
-  dependencies:
-    jsesc "~0.5.0"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
 resolve-from@^4.0.0:
   version "4.0.0"
@@ -6822,7 +4964,7 @@ resolve-pkg-maps@^1.0.0:
   resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f"
   integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
 
-resolve@^1.1.7, resolve@^1.14.2, resolve@^1.22.2, resolve@^1.22.4:
+resolve@^1.1.7, resolve@^1.22.4, resolve@^1.22.8:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -6840,14 +4982,6 @@ resolve@^2.0.0-next.5:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -6891,16 +5025,6 @@ safe-array-concat@^1.1.2:
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
 safe-regex-test@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
@@ -6910,13 +5034,6 @@ safe-regex-test@^1.0.3:
     es-errors "^1.3.0"
     is-regex "^1.1.4"
 
-scheduler@0.24.0-canary-efb381bbf-20230505:
-  version "0.24.0-canary-efb381bbf-20230505"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.24.0-canary-efb381bbf-20230505.tgz#5dddc60e29f91cd7f8b983d7ce4a99c2202d178f"
-  integrity sha512-ABvovCDe/k9IluqSh4/ISoq8tIJnW8euVAWYt5j/bg6dRnqwQwiGO1F/V4AyK96NGF/FB04FhOUDuWj8IKfABA==
-  dependencies:
-    loose-envify "^1.1.0"
-
 scheduler@^0.23.2:
   version "0.23.2"
   resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
@@ -6924,14 +5041,6 @@ scheduler@^0.23.2:
   dependencies:
     loose-envify "^1.1.0"
 
-selfsigned@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0"
-  integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==
-  dependencies:
-    "@types/node-forge" "^1.3.0"
-    node-forge "^1"
-
 semver@^5.6.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
@@ -6942,54 +5051,15 @@ semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.5.2, semver@^7.5.4:
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
-  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
-
-semver@^7.5.3:
+semver@^7.5.3, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
-send@0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
-  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
-  dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
-    range-parser "~1.2.1"
-    statuses "2.0.1"
-
-serialize-error@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a"
-  integrity sha512-ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw==
-
-serve-static@^1.13.1:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
-  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.18.0"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
+semver@^7.5.4:
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
+  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
 
 set-function-length@^1.2.1:
   version "1.2.2"
@@ -7018,11 +5088,6 @@ setimmediate@^1.0.5:
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
 
-setprototypeof@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
-  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
-
 shallow-clone@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
@@ -7042,11 +5107,6 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.6.1, shell-quote@^1.7.3:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
-  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
-
 side-channel@^1.0.4, side-channel@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
@@ -7057,7 +5117,7 @@ side-channel@^1.0.4, side-channel@^1.0.6:
     get-intrinsic "^1.2.4"
     object-inspect "^1.13.1"
 
-signal-exit@^3.0.2, signal-exit@^3.0.3:
+signal-exit@^3.0.2:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -7067,11 +5127,6 @@ signal-exit@^4.0.1:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
-sisteransi@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
-  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
-
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
@@ -7082,21 +5137,17 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
-  dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
-
-source-map-js@^1.0.2, source-map-js@^1.2.0:
+source-map-js@^1.0.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
-source-map-support@^0.5.16, source-map-support@~0.5.20:
+source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
+
+source-map-support@^0.5.16:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -7104,61 +5155,17 @@ source-map-support@^0.5.16, source-map-support@~0.5.20:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
-
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
-  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
-stack-utils@^2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
-  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
-  dependencies:
-    escape-string-regexp "^2.0.0"
-
-stackframe@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
-  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
-
-stacktrace-parser@^0.1.10:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz#29fb0cae4e0d0b85155879402857a1639eb6051a"
-  integrity sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==
-  dependencies:
-    type-fest "^0.7.1"
-
-statuses@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
-  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
-
-statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
-
 streamsearch@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
   integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
   name string-width-cjs
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -7223,20 +5230,6 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
 "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   name strip-ansi-cjs
   version "6.0.1"
@@ -7245,13 +5238,6 @@ string_decoder@~1.1.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-ansi@^5.0.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -7264,18 +5250,6 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
-strip-indent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
-  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
-  dependencies:
-    min-indent "^1.0.0"
-
 strip-json-comments@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -7286,11 +5260,6 @@ strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-strnum@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db"
-  integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==
-
 styled-jsx@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.1.tgz#839a1c3aaacc4e735fed0781b8619ea5d0009d1f"
@@ -7303,7 +5272,7 @@ styleq@^0.1.3:
   resolved "https://registry.yarnpkg.com/styleq/-/styleq-0.1.3.tgz#8efb2892debd51ce7b31dc09c227ad920decab71"
   integrity sha512-3ZUifmCDCQanjeej1f6kyl/BeP/Vae5EYkQ9iJfUm/QwZvlgnZzyflqAsAWYURdtea8Vkvswu2GrC57h3qffcA==
 
-sucrase@^3.32.0:
+sucrase@^3.35.0:
   version "3.35.0"
   resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263"
   integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==
@@ -7316,11 +5285,6 @@ sucrase@^3.32.0:
     pirates "^4.0.1"
     ts-interface-checker "^0.1.9"
 
-sudo-prompt@^9.0.0:
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.2.1.tgz#77efb84309c9ca489527a4e749f287e6bdd52afd"
-  integrity sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw==
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -7335,13 +5299,6 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
@@ -7359,44 +5316,39 @@ tailwind-variants@0.1.20:
   dependencies:
     tailwind-merge "^1.14.0"
 
-tailwindcss@3.4.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.3.tgz#be48f5283df77dfced705451319a5dffb8621519"
-  integrity sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==
+tailwindcss@^3.4.15:
+  version "3.4.15"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.15.tgz#04808bf4bf1424b105047d19e7d4bfab368044a9"
+  integrity sha512-r4MeXnfBmSOuKUWmXe6h2CcyfzJCEk4F0pptO5jlnYSIViUkVmsawj80N5h2lO3gwcmSb4n3PuN+e+GC1Guylw==
   dependencies:
     "@alloc/quick-lru" "^5.2.0"
     arg "^5.0.2"
-    chokidar "^3.5.3"
+    chokidar "^3.6.0"
     didyoumean "^1.2.2"
     dlv "^1.1.3"
-    fast-glob "^3.3.0"
+    fast-glob "^3.3.2"
     glob-parent "^6.0.2"
     is-glob "^4.0.3"
-    jiti "^1.21.0"
+    jiti "^1.21.6"
     lilconfig "^2.1.0"
-    micromatch "^4.0.5"
+    micromatch "^4.0.8"
     normalize-path "^3.0.0"
     object-hash "^3.0.0"
-    picocolors "^1.0.0"
-    postcss "^8.4.23"
+    picocolors "^1.1.1"
+    postcss "^8.4.47"
     postcss-import "^15.1.0"
     postcss-js "^4.0.1"
-    postcss-load-config "^4.0.1"
-    postcss-nested "^6.0.1"
-    postcss-selector-parser "^6.0.11"
-    resolve "^1.22.2"
-    sucrase "^3.32.0"
+    postcss-load-config "^4.0.2"
+    postcss-nested "^6.2.0"
+    postcss-selector-parser "^6.1.2"
+    resolve "^1.22.8"
+    sucrase "^3.35.0"
 
 tapable@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-temp-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e"
-  integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==
-
 temp@^0.8.4:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.4.tgz#8c97a33a4770072e0a05f919396c7665a7dd59f2"
@@ -7404,16 +5356,6 @@ temp@^0.8.4:
   dependencies:
     rimraf "~2.6.2"
 
-terser@^5.15.0:
-  version "5.31.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.0.tgz#06eef86f17007dbad4593f11a574c7f5eb02c6a1"
-  integrity sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==
-  dependencies:
-    "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.8.2"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
-
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -7433,19 +5375,6 @@ thenify-all@^1.0.0:
   dependencies:
     any-promise "^1.0.0"
 
-throat@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
-  integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
-
-through2@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
 tiny-invariant@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
@@ -7458,11 +5387,6 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmpl@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
-  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -7475,11 +5399,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-toidentifier@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
-  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
-
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -7527,21 +5446,11 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-detect@4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
-
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48"
-  integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==
-
 typed-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3"
@@ -7586,16 +5495,16 @@ typed-array-length@^1.0.6:
     is-typed-array "^1.1.13"
     possible-typed-array-names "^1.0.0"
 
-typescript@^4.9.4:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
-
 typescript@^5.3.3:
   version "5.4.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
   integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
 
+typescript@^5.6.3:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
+  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
+
 ua-parser-js@^1.0.35:
   version "1.0.37"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.37.tgz#b5dc7b163a5c1f0c510b08446aed4da92c46373f"
@@ -7616,44 +5525,11 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-unicode-canonical-property-names-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
-  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
-
-unicode-match-property-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
-  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
-  dependencies:
-    unicode-canonical-property-names-ecmascript "^2.0.0"
-    unicode-property-aliases-ecmascript "^2.0.0"
-
-unicode-match-property-value-ecmascript@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
-  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
-
-unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
-  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
-
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
 universalify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
   integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
-unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
-
 update-browserslist-db@^1.0.13:
   version "1.0.16"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz#f6d489ed90fb2f07d67784eb3f53d7891f736356"
@@ -7662,6 +5538,14 @@ update-browserslist-db@^1.0.13:
     escalade "^3.1.2"
     picocolors "^1.0.1"
 
+update-browserslist-db@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5"
+  integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==
+  dependencies:
+    escalade "^3.2.0"
+    picocolors "^1.1.0"
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -7669,33 +5553,11 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
-
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
-
-vlq@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.1.tgz#c003f6e7c0b4c1edd623fd6ee50bbc0d6a1de468"
-  integrity sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w==
-
-walker@^1.0.7:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
-  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
-  dependencies:
-    makeerror "1.0.12"
-
 watchpack@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
@@ -7704,23 +5566,11 @@ watchpack@2.4.0:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
-wcwidth@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
-  dependencies:
-    defaults "^1.0.3"
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
-whatwg-fetch@^3.0.0:
-  version "3.6.20"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz#580ce6d791facec91d37c72890995a0b48d31c70"
-  integrity sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==
-
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -7768,11 +5618,6 @@ which-collection@^1.0.1:
     is-weakmap "^2.0.2"
     is-weakset "^2.0.3"
 
-which-module@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
-  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
-
 which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.9:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
@@ -7796,8 +5641,7 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
-  name wrap-ansi-cjs
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -7806,15 +5650,6 @@ word-wrap@^1.2.5:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
@@ -7838,90 +5673,20 @@ write-file-atomic@^2.3.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-ws@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
-  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
-  dependencies:
-    async-limiter "~1.0.0"
-
-ws@^7, ws@^7.5.1:
-  version "7.5.9"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
-
-xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
-y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yaml@^2.2.1, yaml@^2.3.4:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.2.tgz#7a2b30f2243a5fc299e1f14ca58d475ed4bc5362"
-  integrity sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==
-
 yaml@^2.2.2:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.5.0.tgz#c6165a721cf8000e91c36490a41d7be25176cf5d"
   integrity sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==
 
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
-yargs@^15.1.0:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
-
-yargs@^17.6.2:
-  version "17.7.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
-  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
+yaml@^2.3.4:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.2.tgz#7a2b30f2243a5fc299e1f14ca58d475ed4bc5362"
+  integrity sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==
 
 yocto-queue@^0.1.0:
   version "0.1.0"
diff --git a/universal/apps/expo-app/gluestack-ui.config.json b/universal/apps/expo-app/gluestack-ui.config.json
new file mode 100644
index 00000000..9825a95f
--- /dev/null
+++ b/universal/apps/expo-app/gluestack-ui.config.json
@@ -0,0 +1,10 @@
+{
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "global.css"
+  },
+  "app": {
+    "entry": "app/_layout.tsx",
+    "components": "components/ui"
+  }
+}
\ No newline at end of file
diff --git a/universal/apps/expo-app/metro.config.js b/universal/apps/expo-app/metro.config.js
index d2865509..a924e0eb 100644
--- a/universal/apps/expo-app/metro.config.js
+++ b/universal/apps/expo-app/metro.config.js
@@ -21,4 +21,4 @@ config.resolver.nodeModulesPaths = [
 
 // module.exports = config;
 
-module.exports = withNativeWind(config, { input: "./global.css" });
+module.exports = withNativeWind(config, { input: "./global.css" });
\ No newline at end of file
diff --git a/universal/apps/expo-app/package.json b/universal/apps/expo-app/package.json
index f112ae23..c0853b50 100644
--- a/universal/apps/expo-app/package.json
+++ b/universal/apps/expo-app/package.json
@@ -4,9 +4,9 @@
   "version": "1.0.0",
   "scripts": {
     "start": "EXPO_USE_METRO_WORKSPACE_ROOT=1 npx expo start",
-    "android": "EXPO_USE_METRO_WORKSPACE_ROOT=1 npx expo start --android",
-    "ios": "EXPO_USE_METRO_WORKSPACE_ROOT=1 npx expo start --ios",
-    "web": "EXPO_USE_METRO_WORKSPACE_ROOT=1 npx expo start --web",
+    "android": "DARK_MODE=media EXPO_USE_METRO_WORKSPACE_ROOT=1 npx expo start --android",
+    "ios": "DARK_MODE=media EXPO_USE_METRO_WORKSPACE_ROOT=1 npx expo start --ios",
+    "web": "DARK_MODE=media EXPO_USE_METRO_WORKSPACE_ROOT=1 npx expo start --web",
     "test": "jest --watchAll"
   },
   "jest": {
@@ -18,6 +18,7 @@
     "@unitools/image-expo": "^0.0.5",
     "@unitools/link-expo": "^0.0.1",
     "@unitools/router-expo": "^0.0.1",
+    "babel-plugin-module-resolver": "^5.0.2",
     "expo": "~51.0.6",
     "expo-font": "~12.0.5",
     "expo-image": "~1.12.9",
@@ -28,6 +29,7 @@
     "expo-system-ui": "~3.0.4",
     "expo-updates": "~0.25.12",
     "expo-web-browser": "~13.0.3",
+    "nativewind": "^4.1.23",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-native": "0.74.1",
@@ -42,6 +44,7 @@
     "babel-plugin-module-resolver": "^5.0.2",
     "jest": "^29.2.1",
     "jest-expo": "~51.0.1",
+    "jscodeshift": "0.15.2",
     "react-test-renderer": "18.2.0",
     "typescript": "~5.3.3"
   },
diff --git a/universal/apps/expo-app/tailwind.config.js b/universal/apps/expo-app/tailwind.config.js
index 8c8f3a27..b167c3cd 100644
--- a/universal/apps/expo-app/tailwind.config.js
+++ b/universal/apps/expo-app/tailwind.config.js
@@ -1,6 +1,8 @@
+const gluestackPlugin = require('@gluestack-ui/nativewind-utils/tailwind-plugin');
+
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  darkMode: "class",
+  darkMode: "media",
   content: [
     "./app/**/*.{js,jsx,ts,tsx}",
     "./components/*.{js,jsx,ts,tsx,mdx}",
@@ -19,206 +21,189 @@ module.exports = {
         /bg-(primary|secondary|tertiary|error|success|warning|muted|info|typography|outline|background)-(0|50|100|200|300|400|500|600|700|800|900|950|light|dark|white|gray|black)/,
     },
   ],
-  presets: [require("nativewind/preset")],
+  presets: [require('nativewind/preset')],
   theme: {
-    screens: {
-      base: "0",
-      xs: "400px",
-      sm: "480px",
-      md: "768px",
-      lg: "992px",
-      xl: "1280px",
-    },
     extend: {
       colors: {
         primary: {
-          0: "var(--color-primary-0)",
-          50: "var(--color-primary-50)",
-          100: "var(--color-primary-100)",
-          200: "var(--color-primary-200)",
-          300: "var(--color-primary-300)",
-          400: "var(--color-primary-400)",
-          500: "var(--color-primary-500)",
-          600: "var(--color-primary-600)",
-          700: "var(--color-primary-700)",
-          800: "var(--color-primary-800)",
-          900: "var(--color-primary-900)",
-          950: "var(--color-primary-950)",
+          0: 'rgb(var(--color-primary-0)/<alpha-value>)',
+          50: 'rgb(var(--color-primary-50)/<alpha-value>)',
+          100: 'rgb(var(--color-primary-100)/<alpha-value>)',
+          200: 'rgb(var(--color-primary-200)/<alpha-value>)',
+          300: 'rgb(var(--color-primary-300)/<alpha-value>)',
+          400: 'rgb(var(--color-primary-400)/<alpha-value>)',
+          500: 'rgb(var(--color-primary-500)/<alpha-value>)',
+          600: 'rgb(var(--color-primary-600)/<alpha-value>)',
+          700: 'rgb(var(--color-primary-700)/<alpha-value>)',
+          800: 'rgb(var(--color-primary-800)/<alpha-value>)',
+          900: 'rgb(var(--color-primary-900)/<alpha-value>)',
+          950: 'rgb(var(--color-primary-950)/<alpha-value>)',
         },
         secondary: {
-          0: "var(--color-secondary-0)",
-          50: "var(--color-secondary-50)",
-          100: "var(--color-secondary-100)",
-          200: "var(--color-secondary-200)",
-          300: "var(--color-secondary-300)",
-          400: "var(--color-secondary-400)",
-          500: "var(--color-secondary-500)",
-          600: "var(--color-secondary-600)",
-          700: "var(--color-secondary-700)",
-          800: "var(--color-secondary-800)",
-          900: "var(--color-secondary-900)",
-          950: "var(--color-secondary-950)",
+          0: 'rgb(var(--color-secondary-0)/<alpha-value>)',
+          50: 'rgb(var(--color-secondary-50)/<alpha-value>)',
+          100: 'rgb(var(--color-secondary-100)/<alpha-value>)',
+          200: 'rgb(var(--color-secondary-200)/<alpha-value>)',
+          300: 'rgb(var(--color-secondary-300)/<alpha-value>)',
+          400: 'rgb(var(--color-secondary-400)/<alpha-value>)',
+          500: 'rgb(var(--color-secondary-500)/<alpha-value>)',
+          600: 'rgb(var(--color-secondary-600)/<alpha-value>)',
+          700: 'rgb(var(--color-secondary-700)/<alpha-value>)',
+          800: 'rgb(var(--color-secondary-800)/<alpha-value>)',
+          900: 'rgb(var(--color-secondary-900)/<alpha-value>)',
+          950: 'rgb(var(--color-secondary-950)/<alpha-value>)',
         },
         tertiary: {
-          50: "var(--color-tertiary-50)",
-          100: "var(--color-tertiary-100)",
-          200: "var(--color-tertiary-200)",
-          300: "var(--color-tertiary-300)",
-          400: "var(--color-tertiary-400)",
-          500: "var(--color-tertiary-500)",
-          600: "var(--color-tertiary-600)",
-          700: "var(--color-tertiary-700)",
-          800: "var(--color-tertiary-800)",
-          900: "var(--color-tertiary-900)",
-          950: "var(--color-tertiary-950)",
+          50: 'rgb(var(--color-tertiary-50)/<alpha-value>)',
+          100: 'rgb(var(--color-tertiary-100)/<alpha-value>)',
+          200: 'rgb(var(--color-tertiary-200)/<alpha-value>)',
+          300: 'rgb(var(--color-tertiary-300)/<alpha-value>)',
+          400: 'rgb(var(--color-tertiary-400)/<alpha-value>)',
+          500: 'rgb(var(--color-tertiary-500)/<alpha-value>)',
+          600: 'rgb(var(--color-tertiary-600)/<alpha-value>)',
+          700: 'rgb(var(--color-tertiary-700)/<alpha-value>)',
+          800: 'rgb(var(--color-tertiary-800)/<alpha-value>)',
+          900: 'rgb(var(--color-tertiary-900)/<alpha-value>)',
+          950: 'rgb(var(--color-tertiary-950)/<alpha-value>)',
         },
         error: {
-          0: "var(--color-error-0)",
-          50: "var(--color-error-50)",
-          100: "var(--color-error-100)",
-          200: "var(--color-error-200)",
-          300: "var(--color-error-300)",
-          400: "var(--color-error-400)",
-          500: "var(--color-error-500)",
-          600: "var(--color-error-600)",
-          700: "var(--color-error-700)",
-          800: "var(--color-error-800)",
-          900: "var(--color-error-900)",
-          950: "var(--color-error-950)",
+          0: 'rgb(var(--color-error-0)/<alpha-value>)',
+          50: 'rgb(var(--color-error-50)/<alpha-value>)',
+          100: 'rgb(var(--color-error-100)/<alpha-value>)',
+          200: 'rgb(var(--color-error-200)/<alpha-value>)',
+          300: 'rgb(var(--color-error-300)/<alpha-value>)',
+          400: 'rgb(var(--color-error-400)/<alpha-value>)',
+          500: 'rgb(var(--color-error-500)/<alpha-value>)',
+          600: 'rgb(var(--color-error-600)/<alpha-value>)',
+          700: 'rgb(var(--color-error-700)/<alpha-value>)',
+          800: 'rgb(var(--color-error-800)/<alpha-value>)',
+          900: 'rgb(var(--color-error-900)/<alpha-value>)',
+          950: 'rgb(var(--color-error-950)/<alpha-value>)',
         },
         success: {
-          0: "var(--color-success-0)",
-          50: "var(--color-success-50)",
-          100: "var(--color-success-100)",
-          200: "var(--color-success-200)",
-          300: "var(--color-success-300)",
-          400: "var(--color-success-400)",
-          500: "var(--color-success-500)",
-          600: "var(--color-success-600)",
-          700: "var(--color-success-700)",
-          800: "var(--color-success-800)",
-          900: "var(--color-success-900)",
-          950: "var(--color-success-950)",
+          0: 'rgb(var(--color-success-0)/<alpha-value>)',
+          50: 'rgb(var(--color-success-50)/<alpha-value>)',
+          100: 'rgb(var(--color-success-100)/<alpha-value>)',
+          200: 'rgb(var(--color-success-200)/<alpha-value>)',
+          300: 'rgb(var(--color-success-300)/<alpha-value>)',
+          400: 'rgb(var(--color-success-400)/<alpha-value>)',
+          500: 'rgb(var(--color-success-500)/<alpha-value>)',
+          600: 'rgb(var(--color-success-600)/<alpha-value>)',
+          700: 'rgb(var(--color-success-700)/<alpha-value>)',
+          800: 'rgb(var(--color-success-800)/<alpha-value>)',
+          900: 'rgb(var(--color-success-900)/<alpha-value>)',
+          950: 'rgb(var(--color-success-950)/<alpha-value>)',
         },
         warning: {
-          0: "var(--color-warning-0)",
-          50: "var(--color-warning-50)",
-          100: "var(--color-warning-100)",
-          200: "var(--color-warning-200)",
-          300: "var(--color-warning-300)",
-          400: "var(--color-warning-400)",
-          500: "var(--color-warning-500)",
-          600: "var(--color-warning-600)",
-          700: "var(--color-warning-700)",
-          800: "var(--color-warning-800)",
-          900: "var(--color-warning-900)",
-          950: "var(--color-warning-950)",
+          0: 'rgb(var(--color-warning-0)/<alpha-value>)',
+          50: 'rgb(var(--color-warning-50)/<alpha-value>)',
+          100: 'rgb(var(--color-warning-100)/<alpha-value>)',
+          200: 'rgb(var(--color-warning-200)/<alpha-value>)',
+          300: 'rgb(var(--color-warning-300)/<alpha-value>)',
+          400: 'rgb(var(--color-warning-400)/<alpha-value>)',
+          500: 'rgb(var(--color-warning-500)/<alpha-value>)',
+          600: 'rgb(var(--color-warning-600)/<alpha-value>)',
+          700: 'rgb(var(--color-warning-700)/<alpha-value>)',
+          800: 'rgb(var(--color-warning-800)/<alpha-value>)',
+          900: 'rgb(var(--color-warning-900)/<alpha-value>)',
+          950: 'rgb(var(--color-warning-950)/<alpha-value>)',
         },
         info: {
-          0: "var(--color-info-0)",
-          50: "var(--color-info-50)",
-          100: "var(--color-info-100)",
-          200: "var(--color-info-200)",
-          300: "var(--color-info-300)",
-          400: "var(--color-info-400)",
-          500: "var(--color-info-500)",
-          600: "var(--color-info-600)",
-          700: "var(--color-info-700)",
-          800: "var(--color-info-800)",
-          900: "var(--color-info-900)",
-          950: "var(--color-info-950)",
+          0: 'rgb(var(--color-info-0)/<alpha-value>)',
+          50: 'rgb(var(--color-info-50)/<alpha-value>)',
+          100: 'rgb(var(--color-info-100)/<alpha-value>)',
+          200: 'rgb(var(--color-info-200)/<alpha-value>)',
+          300: 'rgb(var(--color-info-300)/<alpha-value>)',
+          400: 'rgb(var(--color-info-400)/<alpha-value>)',
+          500: 'rgb(var(--color-info-500)/<alpha-value>)',
+          600: 'rgb(var(--color-info-600)/<alpha-value>)',
+          700: 'rgb(var(--color-info-700)/<alpha-value>)',
+          800: 'rgb(var(--color-info-800)/<alpha-value>)',
+          900: 'rgb(var(--color-info-900)/<alpha-value>)',
+          950: 'rgb(var(--color-info-950)/<alpha-value>)',
         },
         typography: {
-          0: "var(--color-typography-0)",
-          50: "var(--color-typography-50)",
-          100: "var(--color-typography-100)",
-          200: "var(--color-typography-200)",
-          300: "var(--color-typography-300)",
-          400: "var(--color-typography-400)",
-          500: "var(--color-typography-500)",
-          600: "var(--color-typography-600)",
-          700: "var(--color-typography-700)",
-          800: "var(--color-typography-800)",
-          900: "var(--color-typography-900)",
-          950: "var(--color-typography-950)",
-          white: "#FFFFFF",
-          gray: "#D4D4D4",
-          black: "#181718",
+          0: 'rgb(var(--color-typography-0)/<alpha-value>)',
+          50: 'rgb(var(--color-typography-50)/<alpha-value>)',
+          100: 'rgb(var(--color-typography-100)/<alpha-value>)',
+          200: 'rgb(var(--color-typography-200)/<alpha-value>)',
+          300: 'rgb(var(--color-typography-300)/<alpha-value>)',
+          400: 'rgb(var(--color-typography-400)/<alpha-value>)',
+          500: 'rgb(var(--color-typography-500)/<alpha-value>)',
+          600: 'rgb(var(--color-typography-600)/<alpha-value>)',
+          700: 'rgb(var(--color-typography-700)/<alpha-value>)',
+          800: 'rgb(var(--color-typography-800)/<alpha-value>)',
+          900: 'rgb(var(--color-typography-900)/<alpha-value>)',
+          950: 'rgb(var(--color-typography-950)/<alpha-value>)',
+          white: '#FFFFFF',
+          gray: '#D4D4D4',
+          black: '#181718',
         },
         outline: {
-          0: "var(--color-outline-0)",
-          50: "var(--color-outline-50)",
-          100: "var(--color-outline-100)",
-          200: "var(--color-outline-200)",
-          300: "var(--color-outline-300)",
-          400: "var(--color-outline-400)",
-          500: "var(--color-outline-500)",
-          600: "var(--color-outline-600)",
-          700: "var(--color-outline-700)",
-          800: "var(--color-outline-800)",
-          900: "var(--color-outline-900)",
-          950: "var(--color-outline-950)",
+          0: 'rgb(var(--color-outline-0)/<alpha-value>)',
+          50: 'rgb(var(--color-outline-50)/<alpha-value>)',
+          100: 'rgb(var(--color-outline-100)/<alpha-value>)',
+          200: 'rgb(var(--color-outline-200)/<alpha-value>)',
+          300: 'rgb(var(--color-outline-300)/<alpha-value>)',
+          400: 'rgb(var(--color-outline-400)/<alpha-value>)',
+          500: 'rgb(var(--color-outline-500)/<alpha-value>)',
+          600: 'rgb(var(--color-outline-600)/<alpha-value>)',
+          700: 'rgb(var(--color-outline-700)/<alpha-value>)',
+          800: 'rgb(var(--color-outline-800)/<alpha-value>)',
+          900: 'rgb(var(--color-outline-900)/<alpha-value>)',
+          950: 'rgb(var(--color-outline-950)/<alpha-value>)',
         },
         background: {
-          0: "var(--color-background-0)",
-          50: "var(--color-background-50)",
-          100: "var(--color-background-100)",
-          200: "var(--color-background-200)",
-          300: "var(--color-background-300)",
-          400: "var(--color-background-400)",
-          500: "var(--color-background-500)",
-          600: "var(--color-background-600)",
-          700: "var(--color-background-700)",
-          800: "var(--color-background-800)",
-          900: "var(--color-background-900)",
-          950: "var(--color-background-950)",
-          error: "var(--color-background-error)",
-          warning: "var(--color-background-warning)",
-          muted: "var(--color-background-muted)",
-          success: "var(--color-background-success)",
-          info: "var(--color-background-info)",
-          light: "#FBFBFB",
-          dark: "#181719",
+          0: 'rgb(var(--color-background-0)/<alpha-value>)',
+          50: 'rgb(var(--color-background-50)/<alpha-value>)',
+          100: 'rgb(var(--color-background-100)/<alpha-value>)',
+          200: 'rgb(var(--color-background-200)/<alpha-value>)',
+          300: 'rgb(var(--color-background-300)/<alpha-value>)',
+          400: 'rgb(var(--color-background-400)/<alpha-value>)',
+          500: 'rgb(var(--color-background-500)/<alpha-value>)',
+          600: 'rgb(var(--color-background-600)/<alpha-value>)',
+          700: 'rgb(var(--color-background-700)/<alpha-value>)',
+          800: 'rgb(var(--color-background-800)/<alpha-value>)',
+          900: 'rgb(var(--color-background-900)/<alpha-value>)',
+          950: 'rgb(var(--color-background-950)/<alpha-value>)',
+          error: 'rgb(var(--color-background-error)/<alpha-value>)',
+          warning: 'rgb(var(--color-background-warning)/<alpha-value>)',
+          muted: 'rgb(var(--color-background-muted)/<alpha-value>)',
+          success: 'rgb(var(--color-background-success)/<alpha-value>)',
+          info: 'rgb(var(--color-background-info)/<alpha-value>)',
+          light: '#FBFBFB',
+          dark: '#181719',
         },
-        border: {
-          0: "var(--color-border-0)",
-          50: "var(--color-border-50)",
-          100: "var(--color-border-100)",
-          200: "var(--color-border-200)",
-          300: "var(--color-border-300)",
-          400: "var(--color-border-400)",
-          500: "var(--color-border-500)",
-          600: "var(--color-border-600)",
-          700: "var(--color-border-700)",
-          800: "var(--color-border-800)",
-          900: "var(--color-border-900)",
-          950: "var(--color-border-950)",
-          error: "var(--color-border-error)",
-          warning: "var(--color-border-warning)",
-          muted: "var(--color-border-muted)",
-          success: "var(--color-border-success)",
-          info: "var(--color-border-info)",
-          light: "#FBFBFB",
-          dark: "#181719",
+        indicator: {
+          primary: 'rgb(var(--color-indicator-primary)/<alpha-value>)',
+          info: 'rgb(var(--color-indicator-info)/<alpha-value>)',
+          error: 'rgb(var(--color-indicator-error)/<alpha-value>)',
         },
       },
       fontFamily: {
         heading: undefined,
         body: undefined,
         mono: undefined,
-        roboto: ["Roboto", "sans-serif"],
+        roboto: ['Roboto', 'sans-serif'],
       },
       fontWeight: {
-        hairline: "100",
-        extraBlack: "950",
+        extrablack: '950',
       },
       fontSize: {
-        "2xs": "10px",
+        '2xs': '10px',
       },
-      border: {
-        2: "2px",
+      boxShadow: {
+        'hard-1': '-2px 2px 8px 0px rgba(38, 38, 38, 0.20)',
+        'hard-2': '0px 3px 10px 0px rgba(38, 38, 38, 0.20)',
+        'hard-3': '2px 2px 8px 0px rgba(38, 38, 38, 0.20)',
+        'hard-4': '0px -3px 10px 0px rgba(38, 38, 38, 0.20)',
+        'hard-5': '0px 2px 10px 0px rgba(38, 38, 38, 0.10)',
+        'soft-1': '0px 0px 10px rgba(38, 38, 38, 0.1)',
+        'soft-2': '0px 0px 20px rgba(38, 38, 38, 0.2)',
+        'soft-3': '0px 0px 30px rgba(38, 38, 38, 0.1)',
+        'soft-4': '0px 0px 40px rgba(38, 38, 38, 0.1)',
       },
     },
-    plugins: [],
   },
+  plugins: [gluestackPlugin],
 };
diff --git a/universal/apps/expo-app/tsconfig.json b/universal/apps/expo-app/tsconfig.json
index d6ec83e9..212543f8 100644
--- a/universal/apps/expo-app/tsconfig.json
+++ b/universal/apps/expo-app/tsconfig.json
@@ -4,9 +4,23 @@
     "strict": true,
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./*"],
-      "@/assets/*": ["../../packages/shared/assets/*", "./assets/*"]
+      "@/*": [
+        "./*"
+      ],
+      "@/assets/*": [
+        "../../packages/shared/assets/*",
+        "./assets/*"
+      ],
+      "tailwind.config": [
+        "./tailwind.config.js"
+      ]
     }
   },
-  "include": ["**/*.ts", "**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts"]
-}
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    ".expo/types/**/*.ts",
+    "expo-env.d.ts",
+    "nativewind-env.d.ts"
+  ]
+}
\ No newline at end of file
diff --git a/universal/apps/next/app/layout.tsx b/universal/apps/next/app/layout.tsx
index 1f9d0cfd..07e83418 100644
--- a/universal/apps/next/app/layout.tsx
+++ b/universal/apps/next/app/layout.tsx
@@ -1,10 +1,11 @@
 "use client";
-
 import { Inter } from "next/font/google";
 import StyledJsxRegistry from "./registry";
 import { GluestackUIProvider } from "@/components/ui/gluestack-ui-provider";
+import "@/styles/global.css";
 
 const inter = Inter({ subsets: ["latin"] });
+
 export default function RootLayout({
   children,
 }: Readonly<{
diff --git a/universal/apps/next/app/registry.tsx b/universal/apps/next/app/registry.tsx
index 470bc580..9b574bc6 100644
--- a/universal/apps/next/app/registry.tsx
+++ b/universal/apps/next/app/registry.tsx
@@ -1,14 +1,11 @@
-"use client";
-
-import "../styles/global.css";
-import React, { useRef, useState } from "react";
-import { useServerInsertedHTML } from "next/navigation";
-import { StyleRegistry, createStyleRegistry } from "styled-jsx";
-// eslint-disable-next-line @next/next/no-document-import-in-page
-import { Main } from "next/document";
-import { flush } from "@gluestack-ui/nativewind-utils/flush";
+'use client';
+import React, { useRef, useState } from 'react';
+import { useServerInsertedHTML } from 'next/navigation';
+import { StyleRegistry, createStyleRegistry } from 'styled-jsx';
+import { Main } from 'next/document';
 // @ts-ignore
-import { AppRegistry } from "react-native-web";
+import { AppRegistry } from 'react-native-web';
+import { flush } from '@gluestack-ui/nativewind-utils/flush';
 
 export default function StyledJsxRegistry({
   children,
@@ -21,8 +18,8 @@ export default function StyledJsxRegistry({
   const isServerInserted = useRef(false);
 
   useServerInsertedHTML(() => {
-    AppRegistry.registerComponent("Main", () => Main);
-    const { getStyleElement } = AppRegistry.getApplication("Main");
+    AppRegistry.registerComponent('Main', () => Main);
+    const { getStyleElement } = AppRegistry.getApplication('Main');
     if (!isServerInserted.current) {
       isServerInserted.current = true;
       const styles = [getStyleElement(), jsxStyleRegistry.styles(), flush()];
diff --git a/universal/apps/next/gluestack-ui.config.json b/universal/apps/next/gluestack-ui.config.json
new file mode 100644
index 00000000..ea017727
--- /dev/null
+++ b/universal/apps/next/gluestack-ui.config.json
@@ -0,0 +1,10 @@
+{
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "styles/global.css"
+  },
+  "app": {
+    "entry": "app/layout.tsx",
+    "components": "components/ui"
+  }
+}
\ No newline at end of file
diff --git a/universal/apps/next/next.config.js b/universal/apps/next/next.config.js
index f9ea023b..c6c7f5f2 100644
--- a/universal/apps/next/next.config.js
+++ b/universal/apps/next/next.config.js
@@ -1,37 +1,39 @@
 /** @type {import('next').NextConfig} */
+const { withGluestackUI } = require('@gluestack/ui-next-adapter');
 const { DefinePlugin } = require("webpack");
 
-module.exports = {
-  reactStrictMode: true,
-  transpilePackages: [
-    "@gluestack-ui/nativewind-utils",
-    "nativewind",
-    "react-native-css-interop",
-  ],
-  webpack: (config) => {
-    config.resolve.alias = {
-      ...(config.resolve.alias || {}),
-      // Transform all direct `react-native` imports to `react-native-web`
-      "react-native$": "react-native-web",
-    };
-    config.resolve.alias["@unitools/router"] = "@unitools/router-next";
-    config.resolve.alias["@unitools/image"] = "@unitools/image-next";
-    config.resolve.alias["@unitools/link"] = "@unitools/link-next";
-    config.resolve.extensions = [
-      ".web.js",
-      ".web.jsx",
-      ".web.ts",
-      ".web.tsx",
-      ...config.resolve.extensions,
-    ];
+const nextConfig = {
+    reactStrictMode: true,
+    transpilePackages: [
+        // "@gluestack-ui/nativewind-utils",
+        "nativewind",
+        "react-native-css-interop",
+    ],
+    // webpack: (config) => {
+    //     config.resolve.alias = {
+    //         ...(config.resolve.alias || {}),
+    //         // Transform all direct `react-native` imports to `react-native-web`
+    //         "react-native$": "react-native-web",
+    //     };
+    //     config.resolve.alias["@unitools/router"] = "@unitools/router-next";
+    //     config.resolve.alias["@unitools/image"] = "@unitools/image-next";
+    //     config.resolve.alias["@unitools/link"] = "@unitools/link-next";
+    //     config.resolve.extensions = [
+    //         ".web.js",
+    //         ".web.jsx",
+    //         ".web.ts",
+    //         ".web.tsx",
+    //         ...config.resolve.extensions,
+    //     ];
 
-    config.plugins.push(
-      new DefinePlugin({
-        __DEV__: JSON.stringify(process.env.NODE_ENV !== "production"),
-      })
-    );
+    //     config.plugins.push(
+    //         new DefinePlugin({
+    //             __DEV__: JSON.stringify(process.env.NODE_ENV !== "production"),
+    //         })
+    //     );
 
-    return config;
-  },
-  typescript: { ignoreBuildErrors: true },
+    //     return config;
+    // },
+    // typescript: { ignoreBuildErrors: true },
 };
+module.exports = withGluestackUI(nextConfig);
diff --git a/universal/apps/next/package.json b/universal/apps/next/package.json
index 535ee093..c01e7de3 100644
--- a/universal/apps/next/package.json
+++ b/universal/apps/next/package.json
@@ -10,21 +10,24 @@
   },
   "dependencies": {
     "@/components": "*",
-    "@gluestack-ui/nativewind-utils": "latest",
-    "@gluestack-ui/overlay": "latest",
-    "@gluestack-ui/toast": "latest",
+    "@gluestack-ui/nativewind-utils": "^1.0.26-alpha.2",
+    "@gluestack-ui/overlay": "^0.1.16",
+    "@gluestack-ui/toast": "^1.0.8",
     "@gluestack/ui-next-adapter": "latest",
     "@unitools/image-next": "^0.0.6",
     "@unitools/link-next": "^0.0.1",
     "@unitools/router-next": "^0.0.1",
-    "autoprefixer": "latest",
-    "nativewind": "4.0.36",
+    "autoprefixer": "^10.4.20",
+    "nativewind": "^4.1.23",
     "next": "^14.0.4",
-    "postcss": "latest",
+    "postcss": "^8.4.49",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-native-web": "latest",
-    "tailwindcss": "3.4.3"
+    "react-native-css-interop": "^0.1.22",
+    "react-native-reanimated": "^3.16.3",
+    "react-native-safe-area-context": "^4.14.0",
+    "react-native-web": "^0.19.13",
+    "tailwindcss": "^3.4.15"
   },
   "devDependencies": {
     "@types/node": "^20.10.6",
diff --git a/universal/apps/next/tailwind.config.js b/universal/apps/next/tailwind.config.js
index 3bc10a6f..160f06cf 100644
--- a/universal/apps/next/tailwind.config.js
+++ b/universal/apps/next/tailwind.config.js
@@ -1,3 +1,5 @@
+const gluestackPlugin = require('@gluestack-ui/nativewind-utils/tailwind-plugin');
+
 /** @type {import('tailwindcss').Config} */
 module.exports = {
   darkMode: "class",
@@ -19,7 +21,7 @@ module.exports = {
         /bg-(primary|secondary|tertiary|error|success|warning|muted|info|typography|outline|background)-(0|50|100|200|300|400|500|600|700|800|900|950|light|dark|white|gray|black)/,
     },
   ],
-  presets: [require("nativewind/preset")],
+  presets: [require('nativewind/preset')],
   important: "html",
   theme: {
     screens: {
@@ -33,193 +35,185 @@ module.exports = {
     extend: {
       colors: {
         primary: {
-          0: "var(--color-primary-0)",
-          50: "var(--color-primary-50)",
-          100: "var(--color-primary-100)",
-          200: "var(--color-primary-200)",
-          300: "var(--color-primary-300)",
-          400: "var(--color-primary-400)",
-          500: "var(--color-primary-500)",
-          600: "var(--color-primary-600)",
-          700: "var(--color-primary-700)",
-          800: "var(--color-primary-800)",
-          900: "var(--color-primary-900)",
-          950: "var(--color-primary-950)",
+          0: 'rgb(var(--color-primary-0)/<alpha-value>)',
+          50: 'rgb(var(--color-primary-50)/<alpha-value>)',
+          100: 'rgb(var(--color-primary-100)/<alpha-value>)',
+          200: 'rgb(var(--color-primary-200)/<alpha-value>)',
+          300: 'rgb(var(--color-primary-300)/<alpha-value>)',
+          400: 'rgb(var(--color-primary-400)/<alpha-value>)',
+          500: 'rgb(var(--color-primary-500)/<alpha-value>)',
+          600: 'rgb(var(--color-primary-600)/<alpha-value>)',
+          700: 'rgb(var(--color-primary-700)/<alpha-value>)',
+          800: 'rgb(var(--color-primary-800)/<alpha-value>)',
+          900: 'rgb(var(--color-primary-900)/<alpha-value>)',
+          950: 'rgb(var(--color-primary-950)/<alpha-value>)',
         },
         secondary: {
-          0: "var(--color-secondary-0)",
-          50: "var(--color-secondary-50)",
-          100: "var(--color-secondary-100)",
-          200: "var(--color-secondary-200)",
-          300: "var(--color-secondary-300)",
-          400: "var(--color-secondary-400)",
-          500: "var(--color-secondary-500)",
-          600: "var(--color-secondary-600)",
-          700: "var(--color-secondary-700)",
-          800: "var(--color-secondary-800)",
-          900: "var(--color-secondary-900)",
-          950: "var(--color-secondary-950)",
+          0: 'rgb(var(--color-secondary-0)/<alpha-value>)',
+          50: 'rgb(var(--color-secondary-50)/<alpha-value>)',
+          100: 'rgb(var(--color-secondary-100)/<alpha-value>)',
+          200: 'rgb(var(--color-secondary-200)/<alpha-value>)',
+          300: 'rgb(var(--color-secondary-300)/<alpha-value>)',
+          400: 'rgb(var(--color-secondary-400)/<alpha-value>)',
+          500: 'rgb(var(--color-secondary-500)/<alpha-value>)',
+          600: 'rgb(var(--color-secondary-600)/<alpha-value>)',
+          700: 'rgb(var(--color-secondary-700)/<alpha-value>)',
+          800: 'rgb(var(--color-secondary-800)/<alpha-value>)',
+          900: 'rgb(var(--color-secondary-900)/<alpha-value>)',
+          950: 'rgb(var(--color-secondary-950)/<alpha-value>)',
         },
         tertiary: {
-          50: "var(--color-tertiary-50)",
-          100: "var(--color-tertiary-100)",
-          200: "var(--color-tertiary-200)",
-          300: "var(--color-tertiary-300)",
-          400: "var(--color-tertiary-400)",
-          500: "var(--color-tertiary-500)",
-          600: "var(--color-tertiary-600)",
-          700: "var(--color-tertiary-700)",
-          800: "var(--color-tertiary-800)",
-          900: "var(--color-tertiary-900)",
-          950: "var(--color-tertiary-950)",
+          50: 'rgb(var(--color-tertiary-50)/<alpha-value>)',
+          100: 'rgb(var(--color-tertiary-100)/<alpha-value>)',
+          200: 'rgb(var(--color-tertiary-200)/<alpha-value>)',
+          300: 'rgb(var(--color-tertiary-300)/<alpha-value>)',
+          400: 'rgb(var(--color-tertiary-400)/<alpha-value>)',
+          500: 'rgb(var(--color-tertiary-500)/<alpha-value>)',
+          600: 'rgb(var(--color-tertiary-600)/<alpha-value>)',
+          700: 'rgb(var(--color-tertiary-700)/<alpha-value>)',
+          800: 'rgb(var(--color-tertiary-800)/<alpha-value>)',
+          900: 'rgb(var(--color-tertiary-900)/<alpha-value>)',
+          950: 'rgb(var(--color-tertiary-950)/<alpha-value>)',
         },
         error: {
-          0: "var(--color-error-0)",
-          50: "var(--color-error-50)",
-          100: "var(--color-error-100)",
-          200: "var(--color-error-200)",
-          300: "var(--color-error-300)",
-          400: "var(--color-error-400)",
-          500: "var(--color-error-500)",
-          600: "var(--color-error-600)",
-          700: "var(--color-error-700)",
-          800: "var(--color-error-800)",
-          900: "var(--color-error-900)",
-          950: "var(--color-error-950)",
+          0: 'rgb(var(--color-error-0)/<alpha-value>)',
+          50: 'rgb(var(--color-error-50)/<alpha-value>)',
+          100: 'rgb(var(--color-error-100)/<alpha-value>)',
+          200: 'rgb(var(--color-error-200)/<alpha-value>)',
+          300: 'rgb(var(--color-error-300)/<alpha-value>)',
+          400: 'rgb(var(--color-error-400)/<alpha-value>)',
+          500: 'rgb(var(--color-error-500)/<alpha-value>)',
+          600: 'rgb(var(--color-error-600)/<alpha-value>)',
+          700: 'rgb(var(--color-error-700)/<alpha-value>)',
+          800: 'rgb(var(--color-error-800)/<alpha-value>)',
+          900: 'rgb(var(--color-error-900)/<alpha-value>)',
+          950: 'rgb(var(--color-error-950)/<alpha-value>)',
         },
         success: {
-          0: "var(--color-success-0)",
-          50: "var(--color-success-50)",
-          100: "var(--color-success-100)",
-          200: "var(--color-success-200)",
-          300: "var(--color-success-300)",
-          400: "var(--color-success-400)",
-          500: "var(--color-success-500)",
-          600: "var(--color-success-600)",
-          700: "var(--color-success-700)",
-          800: "var(--color-success-800)",
-          900: "var(--color-success-900)",
-          950: "var(--color-success-950)",
+          0: 'rgb(var(--color-success-0)/<alpha-value>)',
+          50: 'rgb(var(--color-success-50)/<alpha-value>)',
+          100: 'rgb(var(--color-success-100)/<alpha-value>)',
+          200: 'rgb(var(--color-success-200)/<alpha-value>)',
+          300: 'rgb(var(--color-success-300)/<alpha-value>)',
+          400: 'rgb(var(--color-success-400)/<alpha-value>)',
+          500: 'rgb(var(--color-success-500)/<alpha-value>)',
+          600: 'rgb(var(--color-success-600)/<alpha-value>)',
+          700: 'rgb(var(--color-success-700)/<alpha-value>)',
+          800: 'rgb(var(--color-success-800)/<alpha-value>)',
+          900: 'rgb(var(--color-success-900)/<alpha-value>)',
+          950: 'rgb(var(--color-success-950)/<alpha-value>)',
         },
         warning: {
-          0: "var(--color-warning-0)",
-          50: "var(--color-warning-50)",
-          100: "var(--color-warning-100)",
-          200: "var(--color-warning-200)",
-          300: "var(--color-warning-300)",
-          400: "var(--color-warning-400)",
-          500: "var(--color-warning-500)",
-          600: "var(--color-warning-600)",
-          700: "var(--color-warning-700)",
-          800: "var(--color-warning-800)",
-          900: "var(--color-warning-900)",
-          950: "var(--color-warning-950)",
+          0: 'rgb(var(--color-warning-0)/<alpha-value>)',
+          50: 'rgb(var(--color-warning-50)/<alpha-value>)',
+          100: 'rgb(var(--color-warning-100)/<alpha-value>)',
+          200: 'rgb(var(--color-warning-200)/<alpha-value>)',
+          300: 'rgb(var(--color-warning-300)/<alpha-value>)',
+          400: 'rgb(var(--color-warning-400)/<alpha-value>)',
+          500: 'rgb(var(--color-warning-500)/<alpha-value>)',
+          600: 'rgb(var(--color-warning-600)/<alpha-value>)',
+          700: 'rgb(var(--color-warning-700)/<alpha-value>)',
+          800: 'rgb(var(--color-warning-800)/<alpha-value>)',
+          900: 'rgb(var(--color-warning-900)/<alpha-value>)',
+          950: 'rgb(var(--color-warning-950)/<alpha-value>)',
         },
         info: {
-          0: "var(--color-info-0)",
-          50: "var(--color-info-50)",
-          100: "var(--color-info-100)",
-          200: "var(--color-info-200)",
-          300: "var(--color-info-300)",
-          400: "var(--color-info-400)",
-          500: "var(--color-info-500)",
-          600: "var(--color-info-600)",
-          700: "var(--color-info-700)",
-          800: "var(--color-info-800)",
-          900: "var(--color-info-900)",
-          950: "var(--color-info-950)",
+          0: 'rgb(var(--color-info-0)/<alpha-value>)',
+          50: 'rgb(var(--color-info-50)/<alpha-value>)',
+          100: 'rgb(var(--color-info-100)/<alpha-value>)',
+          200: 'rgb(var(--color-info-200)/<alpha-value>)',
+          300: 'rgb(var(--color-info-300)/<alpha-value>)',
+          400: 'rgb(var(--color-info-400)/<alpha-value>)',
+          500: 'rgb(var(--color-info-500)/<alpha-value>)',
+          600: 'rgb(var(--color-info-600)/<alpha-value>)',
+          700: 'rgb(var(--color-info-700)/<alpha-value>)',
+          800: 'rgb(var(--color-info-800)/<alpha-value>)',
+          900: 'rgb(var(--color-info-900)/<alpha-value>)',
+          950: 'rgb(var(--color-info-950)/<alpha-value>)',
         },
         typography: {
-          0: "var(--color-typography-0)",
-          50: "var(--color-typography-50)",
-          100: "var(--color-typography-100)",
-          200: "var(--color-typography-200)",
-          300: "var(--color-typography-300)",
-          400: "var(--color-typography-400)",
-          500: "var(--color-typography-500)",
-          600: "var(--color-typography-600)",
-          700: "var(--color-typography-700)",
-          800: "var(--color-typography-800)",
-          900: "var(--color-typography-900)",
-          950: "var(--color-typography-950)",
-          white: "#FFFFFF",
-          gray: "#D4D4D4",
-          black: "#181718",
+          0: 'rgb(var(--color-typography-0)/<alpha-value>)',
+          50: 'rgb(var(--color-typography-50)/<alpha-value>)',
+          100: 'rgb(var(--color-typography-100)/<alpha-value>)',
+          200: 'rgb(var(--color-typography-200)/<alpha-value>)',
+          300: 'rgb(var(--color-typography-300)/<alpha-value>)',
+          400: 'rgb(var(--color-typography-400)/<alpha-value>)',
+          500: 'rgb(var(--color-typography-500)/<alpha-value>)',
+          600: 'rgb(var(--color-typography-600)/<alpha-value>)',
+          700: 'rgb(var(--color-typography-700)/<alpha-value>)',
+          800: 'rgb(var(--color-typography-800)/<alpha-value>)',
+          900: 'rgb(var(--color-typography-900)/<alpha-value>)',
+          950: 'rgb(var(--color-typography-950)/<alpha-value>)',
+          white: '#FFFFFF',
+          gray: '#D4D4D4',
+          black: '#181718',
         },
         outline: {
-          0: "var(--color-outline-0)",
-          50: "var(--color-outline-50)",
-          100: "var(--color-outline-100)",
-          200: "var(--color-outline-200)",
-          300: "var(--color-outline-300)",
-          400: "var(--color-outline-400)",
-          500: "var(--color-outline-500)",
-          600: "var(--color-outline-600)",
-          700: "var(--color-outline-700)",
-          800: "var(--color-outline-800)",
-          900: "var(--color-outline-900)",
-          950: "var(--color-outline-950)",
+          0: 'rgb(var(--color-outline-0)/<alpha-value>)',
+          50: 'rgb(var(--color-outline-50)/<alpha-value>)',
+          100: 'rgb(var(--color-outline-100)/<alpha-value>)',
+          200: 'rgb(var(--color-outline-200)/<alpha-value>)',
+          300: 'rgb(var(--color-outline-300)/<alpha-value>)',
+          400: 'rgb(var(--color-outline-400)/<alpha-value>)',
+          500: 'rgb(var(--color-outline-500)/<alpha-value>)',
+          600: 'rgb(var(--color-outline-600)/<alpha-value>)',
+          700: 'rgb(var(--color-outline-700)/<alpha-value>)',
+          800: 'rgb(var(--color-outline-800)/<alpha-value>)',
+          900: 'rgb(var(--color-outline-900)/<alpha-value>)',
+          950: 'rgb(var(--color-outline-950)/<alpha-value>)',
         },
         background: {
-          0: "var(--color-background-0)",
-          50: "var(--color-background-50)",
-          100: "var(--color-background-100)",
-          200: "var(--color-background-200)",
-          300: "var(--color-background-300)",
-          400: "var(--color-background-400)",
-          500: "var(--color-background-500)",
-          600: "var(--color-background-600)",
-          700: "var(--color-background-700)",
-          800: "var(--color-background-800)",
-          900: "var(--color-background-900)",
-          950: "var(--color-background-950)",
-          error: "var(--color-background-error)",
-          warning: "var(--color-background-warning)",
-          muted: "var(--color-background-muted)",
-          success: "var(--color-background-success)",
-          info: "var(--color-background-info)",
-          light: "#FBFBFB",
-          dark: "#181719",
+          0: 'rgb(var(--color-background-0)/<alpha-value>)',
+          50: 'rgb(var(--color-background-50)/<alpha-value>)',
+          100: 'rgb(var(--color-background-100)/<alpha-value>)',
+          200: 'rgb(var(--color-background-200)/<alpha-value>)',
+          300: 'rgb(var(--color-background-300)/<alpha-value>)',
+          400: 'rgb(var(--color-background-400)/<alpha-value>)',
+          500: 'rgb(var(--color-background-500)/<alpha-value>)',
+          600: 'rgb(var(--color-background-600)/<alpha-value>)',
+          700: 'rgb(var(--color-background-700)/<alpha-value>)',
+          800: 'rgb(var(--color-background-800)/<alpha-value>)',
+          900: 'rgb(var(--color-background-900)/<alpha-value>)',
+          950: 'rgb(var(--color-background-950)/<alpha-value>)',
+          error: 'rgb(var(--color-background-error)/<alpha-value>)',
+          warning: 'rgb(var(--color-background-warning)/<alpha-value>)',
+          muted: 'rgb(var(--color-background-muted)/<alpha-value>)',
+          success: 'rgb(var(--color-background-success)/<alpha-value>)',
+          info: 'rgb(var(--color-background-info)/<alpha-value>)',
+          light: '#FBFBFB',
+          dark: '#181719',
         },
-        border: {
-          0: "var(--color-border-0)",
-          50: "var(--color-border-50)",
-          100: "var(--color-border-100)",
-          200: "var(--color-border-200)",
-          300: "var(--color-border-300)",
-          400: "var(--color-border-400)",
-          500: "var(--color-border-500)",
-          600: "var(--color-border-600)",
-          700: "var(--color-border-700)",
-          800: "var(--color-border-800)",
-          900: "var(--color-border-900)",
-          950: "var(--color-border-950)",
-          error: "var(--color-border-error)",
-          warning: "var(--color-border-warning)",
-          muted: "var(--color-border-muted)",
-          success: "var(--color-border-success)",
-          info: "var(--color-border-info)",
-          light: "#FBFBFB",
-          dark: "#181719",
+        indicator: {
+          primary: 'rgb(var(--color-indicator-primary)/<alpha-value>)',
+          info: 'rgb(var(--color-indicator-info)/<alpha-value>)',
+          error: 'rgb(var(--color-indicator-error)/<alpha-value>)',
         },
       },
       fontFamily: {
         heading: undefined,
         body: undefined,
         mono: undefined,
-        roboto: ["Roboto", "sans-serif"],
+        roboto: ['Roboto', 'sans-serif'],
       },
       fontWeight: {
-        hairline: "100",
-        extraBlack: "950",
+        extrablack: '950',
       },
       fontSize: {
-        "2xs": "10px",
+        '2xs': '10px',
       },
-      border: {
-        2: "2px",
+      boxShadow: {
+        'hard-1': '-2px 2px 8px 0px rgba(38, 38, 38, 0.20)',
+        'hard-2': '0px 3px 10px 0px rgba(38, 38, 38, 0.20)',
+        'hard-3': '2px 2px 8px 0px rgba(38, 38, 38, 0.20)',
+        'hard-4': '0px -3px 10px 0px rgba(38, 38, 38, 0.20)',
+        'hard-5': '0px 2px 10px 0px rgba(38, 38, 38, 0.10)',
+        'soft-1': '0px 0px 10px rgba(38, 38, 38, 0.1)',
+        'soft-2': '0px 0px 20px rgba(38, 38, 38, 0.2)',
+        'soft-3': '0px 0px 30px rgba(38, 38, 38, 0.1)',
+        'soft-4': '0px 0px 40px rgba(38, 38, 38, 0.1)',
       },
     },
-    plugins: [],
   },
+
+  plugins: [gluestackPlugin]
 };
diff --git a/universal/package.json b/universal/package.json
index dc526339..ff3c5f7e 100644
--- a/universal/package.json
+++ b/universal/package.json
@@ -11,7 +11,6 @@
     "run:expo": "cd apps/expo-app && yarn start",
     "run:next": "cd apps/next && yarn dev",
     "format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\" --ignore-path .gitignore",
-    "postinstall": "patch-package",
     "eject": "npx @gluestack-ui/universal-cli@latest eject"
   },
   "devDependencies": {
diff --git a/universal/packages/components/gluestack-ui.config.json b/universal/packages/components/gluestack-ui.config.json
new file mode 100644
index 00000000..e8796f45
--- /dev/null
+++ b/universal/packages/components/gluestack-ui.config.json
@@ -0,0 +1,5 @@
+{
+  "app": {
+    "components": "components/ui"
+  }
+}
\ No newline at end of file
diff --git a/universal/packages/components/package.json b/universal/packages/components/package.json
index 3c9db7fa..42da8c1b 100644
--- a/universal/packages/components/package.json
+++ b/universal/packages/components/package.json
@@ -7,7 +7,8 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc -w",
-    "clean": "rm -rf dist"
+    "clean": "rm -rf dist",
+    "postinstall": "patch-package"
   },
   "devDependencies": {
     "@types/react": "^18.2.46",
@@ -21,42 +22,43 @@
     "react-native": "^0.73.1"
   },
   "dependencies": {
-    "@expo/html-elements": "latest",
-    "@gluestack-ui/accordion": "latest",
-    "@gluestack-ui/actionsheet": "latest",
-    "@gluestack-ui/alert": "latest",
-    "@gluestack-ui/alert-dialog": "latest",
-    "@gluestack-ui/avatar": "^0.1.16",
-    "@gluestack-ui/button": "latest",
-    "@gluestack-ui/checkbox": "latest",
-    "@gluestack-ui/divider": "latest",
-    "@gluestack-ui/fab": "latest",
-    "@gluestack-ui/form-control": "latest",
-    "@gluestack-ui/icon": "latest",
-    "@gluestack-ui/image": "latest",
-    "@gluestack-ui/input": "latest",
-    "@gluestack-ui/link": "latest",
-    "@gluestack-ui/menu": "latest",
-    "@gluestack-ui/modal": "latest",
-    "@gluestack-ui/nativewind-utils": "latest",
-    "@gluestack-ui/overlay": "latest",
-    "@gluestack-ui/popover": "latest",
-    "@gluestack-ui/pressable": "latest",
-    "@gluestack-ui/progress": "latest",
-    "@gluestack-ui/radio": "latest",
-    "@gluestack-ui/select": "latest",
-    "@gluestack-ui/slider": "latest",
-    "@gluestack-ui/spinner": "latest",
-    "@gluestack-ui/switch": "latest",
-    "@gluestack-ui/textarea": "latest",
-    "@gluestack-ui/toast": "latest",
-    "@gluestack-ui/tooltip": "latest",
-    "@legendapp/motion": "latest",
+    "@expo/html-elements": "0.4.2",
+    "@gluestack-ui/accordion": "^1.0.8",
+    "@gluestack-ui/actionsheet": "^0.2.46",
+    "@gluestack-ui/alert": "^0.1.16",
+    "@gluestack-ui/alert-dialog": "^0.1.32",
+    "@gluestack-ui/avatar": "^0.1.18",
+    "@gluestack-ui/button": "^1.0.8",
+    "@gluestack-ui/checkbox": "^0.1.33",
+    "@gluestack-ui/divider": "^0.1.10",
+    "@gluestack-ui/fab": "^0.1.22",
+    "@gluestack-ui/form-control": "^0.1.19",
+    "@gluestack-ui/icon": "^0.1.24-alpha.0",
+    "@gluestack-ui/image": "^0.1.11",
+    "@gluestack-ui/input": "^0.1.32",
+    "@gluestack-ui/link": "^0.1.23",
+    "@gluestack-ui/menu": "^0.2.37",
+    "@gluestack-ui/modal": "^0.1.35",
+    "@gluestack-ui/nativewind-utils": "^1.0.26-alpha.2",
+    "@gluestack-ui/overlay": "^0.1.15",
+    "@gluestack-ui/popover": "^0.1.43",
+    "@gluestack-ui/pressable": "^0.1.17",
+    "@gluestack-ui/progress": "^0.1.18",
+    "@gluestack-ui/radio": "^0.1.34",
+    "@gluestack-ui/select": "^0.1.30",
+    "@gluestack-ui/slider": "^0.1.26",
+    "@gluestack-ui/spinner": "^0.1.15",
+    "@gluestack-ui/switch": "^0.1.23",
+    "@gluestack-ui/textarea": "^0.1.24",
+    "@gluestack-ui/toast": "^1.0.8",
+    "@gluestack-ui/tooltip": "^0.1.36-alpha.0",
+    "@legendapp/motion": "^2.4.0",
     "@unitools/image": "^0.0.4",
     "expo-image": "^1.12.9",
-    "nativewind": "4.0.36",
-    "react-native-reanimated": "latest",
-    "react-native-svg": "^15.2.0",
-    "tailwindcss": "3.4.3"
+    "nativewind": "^4.1.23",
+    "react-native-safe-area-context": "^4.14.0",
+    "react-native-reanimated": "^3.16.3",
+    "react-native-svg": "15.2.0",
+    "tailwindcss": "^3.4.15"
   }
 }
diff --git a/universal/packages/components/ui/accordion/index.d.ts b/universal/packages/components/ui/accordion/index.d.ts
deleted file mode 100644
index 2da90a07..00000000
--- a/universal/packages/components/ui/accordion/index.d.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import React from 'react';
-import { View, Text } from 'react-native';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-/** Components */
-declare const Accordion: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown> & React.RefAttributes<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>> & import("@gluestack-ui/accordion/lib/typescript/types").IAccordionProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    variant: {
-        filled: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-} | ({
-    variant: {
-        filled: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-} & {
-    variant: {
-        filled: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "w-full", import("tailwind-variants/dist/config").TVConfig<{
-    variant: {
-        filled: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, {
-    variant: {
-        filled: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}>, {
-    variant: {
-        filled: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    variant: {
-        filled: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "w-full", import("tailwind-variants/dist/config").TVConfig<{
-    variant: {
-        filled: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, {
-    variant: {
-        filled: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AccordionItem: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ViewProps & React.RefAttributes<import("react-native").ViewProps> & import("@gluestack-ui/accordion/lib/typescript/types").IAccordionItemProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    variant: {
-        filled: string;
-        unfilled: string;
-    };
-}, undefined, undefined, import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, undefined, import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AccordionContent: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ViewProps & React.RefAttributes<import("react-native").ViewProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "px-5 mt-2 pb-5", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "px-5 mt-2 pb-5", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AccordionContentText: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").TextProps & React.RefAttributes<import("react-native").TextProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "text-typography-700 font-normal", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "text-typography-700 font-normal", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AccordionIcon: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, "", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & Omit<any, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<any, "ref"> & React.RefAttributes<unknown>> & {
-    as?: any;
-} & {
-    className?: any;
-    fill?: string | undefined;
-    as?: any;
-    color?: string | undefined;
-}, "ref"> & React.RefAttributes<unknown>>;
-declare const AccordionHeader: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & Omit<import("react-native").TextProps & React.ClassAttributes<typeof Text>, "style"> & import("@expo/html-elements/build/primitives/Text").WebTextProps & React.RefAttributes<import("@expo/html-elements/build/primitives/Text").TextProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "mx-0 my-0", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "mx-0 my-0", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AccordionTrigger: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & Omit<import("react-native").PressableProps & React.RefAttributes<View>, "children"> & import("@gluestack-ui/accordion/lib/typescript/types").IAccordionTriggerProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full py-5 px-5 flex-row justify-between items-center web:outline-none focus:outline-none data-[disabled=true]:opacity-40 data-[disabled=true]:cursor-not-allowed data-[focus-visible=true]:bg-background-50", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full py-5 px-5 flex-row justify-between items-center web:outline-none focus:outline-none data-[disabled=true]:opacity-40 data-[disabled=true]:cursor-not-allowed data-[focus-visible=true]:bg-background-50", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AccordionTitleText: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").TextProps & React.RefAttributes<import("react-native").TextProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "text-typography-900 font-bold flex-1 text-left", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "text-typography-900 font-bold flex-1 text-left", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Accordion, AccordionItem, AccordionHeader, AccordionTrigger, AccordionTitleText, AccordionContentText, AccordionIcon, AccordionContent, };
diff --git a/universal/packages/components/ui/accordion/index.jsx b/universal/packages/components/ui/accordion/index.jsx
deleted file mode 100644
index 9ce6cd65..00000000
--- a/universal/packages/components/ui/accordion/index.jsx
+++ /dev/null
@@ -1,185 +0,0 @@
-"use client";
-import React, { useMemo } from "react";
-import { createAccordion } from "@gluestack-ui/accordion";
-import { Svg } from "react-native-svg";
-import { View, Pressable, Text, Platform } from "react-native";
-import { tva } from "@gluestack-ui/nativewind-utils/tva";
-import { withStyleContext, useStyleContext, } from "@gluestack-ui/nativewind-utils/withStyleContext";
-import { withStyleContextAndStates } from "@gluestack-ui/nativewind-utils/withStyleContextAndStates";
-import { H3 } from "@expo/html-elements";
-import { cssInterop } from "nativewind";
-const SCOPE = "ACCORDION";
-/** Styles */
-const accordionStyle = tva({
-    base: "w-full",
-    variants: {
-        variant: {
-            filled: "bg-white",
-        },
-        size: {
-            sm: "",
-            md: "",
-            lg: "",
-        },
-    },
-});
-const accordionItemStyle = tva({
-    parentVariants: {
-        variant: {
-            filled: "bg-background-0",
-            unfilled: "bg-transparent",
-        },
-    },
-});
-const accordionTitleTextStyle = tva({
-    base: "text-typography-900 font-bold flex-1 text-left",
-    parentVariants: {
-        size: {
-            sm: "text-sm",
-            md: "text-base",
-            lg: "text-lg",
-        },
-    },
-});
-const accordionIconStyle = tva({
-    base: "",
-    parentVariants: {
-        size: {
-            "2xs": "h-3 w-3",
-            xs: "h-3.5 w-3.5",
-            sm: "h-4 w-4",
-            md: "h-[18px] w-[18px]",
-            lg: "h-5 w-5",
-            xl: "h-6 w-6",
-        },
-    },
-});
-const accordionContentTextStyle = tva({
-    base: "text-typography-700 font-normal",
-    parentVariants: {
-        size: {
-            sm: "text-sm ",
-            md: "text-base",
-            lg: "text-lg",
-        },
-    },
-});
-const accordionHeaderStyle = tva({
-    base: "mx-0 my-0",
-});
-const accordionContentStyle = tva({
-    base: "px-5 mt-2 pb-5",
-});
-const accordionTriggerStyle = tva({
-    base: "w-full py-5 px-5 flex-row justify-between items-center web:outline-none focus:outline-none data-[disabled=true]:opacity-40 data-[disabled=true]:cursor-not-allowed data-[focus-visible=true]:bg-background-50",
-});
-const PrimitiveIcon = React.forwardRef(({ height, width, fill = "none", color, size, as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} color={color} {...props}/>);
-});
-const Root = Platform.OS === "web"
-    ? withStyleContext(View, SCOPE)
-    : withStyleContextAndStates(View, SCOPE);
-const Header = Platform.OS === "web" ? H3 : View;
-/** Creator */
-const UIAccordion = createAccordion({
-    Root: Root,
-    Item: View,
-    //@ts-ignore
-    Header: Header,
-    Trigger: Pressable,
-    Icon: PrimitiveIcon,
-    TitleText: Text,
-    ContentText: Text,
-    Content: View,
-});
-cssInterop(UIAccordion, { className: "style" });
-cssInterop(UIAccordion.Item, { className: "style" });
-cssInterop(UIAccordion.Header, { className: "style" });
-cssInterop(UIAccordion.Trigger, { className: "style" });
-cssInterop(UIAccordion.Icon, { className: "style" });
-cssInterop(UIAccordion.TitleText, { className: "style" });
-cssInterop(UIAccordion.Content, { className: "style" });
-cssInterop(UIAccordion.ContentText, { className: "style" });
-// @ts-ignore
-cssInterop(UIAccordion.Icon, {
-    className: {
-        target: "style",
-        nativeStyleToProp: {
-            height: "height",
-            width: "width",
-            //@ts-ignore
-            fill: "fill",
-            color: "color",
-        },
-    },
-});
-/** Components */
-const Accordion = React.forwardRef(({ className, variant = "filled", size = "md", ...props }, ref) => {
-    return (<UIAccordion ref={ref} {...props} className={accordionStyle({ variant, class: className })} context={{ variant, size }}/>);
-});
-const AccordionItem = React.forwardRef(({ className, ...props }, ref) => {
-    const { variant } = useStyleContext(SCOPE);
-    return (<UIAccordion.Item ref={ref} {...props} className={accordionItemStyle({
-            parentVariants: { variant },
-            class: className,
-        })}/>);
-});
-const AccordionContent = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIAccordion.Content ref={ref} {...props} className={accordionContentStyle({
-            class: className,
-        })}/>);
-});
-const AccordionContentText = React.forwardRef(({ className, ...props }, ref) => {
-    const { size } = useStyleContext(SCOPE);
-    return (<UIAccordion.ContentText ref={ref} {...props} className={accordionContentTextStyle({
-            parentVariants: { size },
-            class: className,
-        })}/>);
-});
-const AccordionIcon = React.forwardRef(({ size, className, color = "gray", ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    if (typeof size === "number") {
-        return (<UIAccordion.Icon ref={ref} {...props} color={color} className={accordionIconStyle({ class: className })} size={size}/>);
-    }
-    else if ((props.height !== undefined || props.width !== undefined) &&
-        size === undefined) {
-        return (<UIAccordion.Icon ref={ref} {...props} color={color} className={accordionIconStyle({ class: className })}/>);
-    }
-    return (<UIAccordion.Icon ref={ref} color={color} {...props} className={accordionIconStyle({
-            size,
-            class: className,
-            parentVariants: { size: parentSize },
-        })}/>);
-});
-const AccordionHeader = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIAccordion.Header ref={ref} {...props} className={accordionHeaderStyle({
-            class: className,
-        })}/>);
-});
-const AccordionTrigger = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIAccordion.Trigger ref={ref} {...props} className={accordionTriggerStyle({
-            class: className,
-        })}/>);
-});
-const AccordionTitleText = React.forwardRef(({ className, ...props }, ref) => {
-    const { size } = useStyleContext(SCOPE);
-    return (<UIAccordion.TitleText ref={ref} {...props} className={accordionTitleTextStyle({
-            parentVariants: { size },
-            class: className,
-        })}/>);
-});
-Accordion.displayName = "Accordion";
-AccordionItem.displayName = "AccordionItem";
-AccordionHeader.displayName = "AccordionHeader";
-AccordionTrigger.displayName = "AccordionTrigger";
-AccordionTitleText.displayName = "AccordionTitleText";
-AccordionContentText.displayName = "AccordionContentText";
-AccordionIcon.displayName = "AccordionIcon";
-AccordionContent.displayName = "AccordionContent";
-export { Accordion, AccordionItem, AccordionHeader, AccordionTrigger, AccordionTitleText, AccordionContentText, AccordionIcon, AccordionContent, };
diff --git a/universal/packages/components/ui/accordion/index.tsx b/universal/packages/components/ui/accordion/index.tsx
index ca8d35fb..7dbe6f8f 100644
--- a/universal/packages/components/ui/accordion/index.tsx
+++ b/universal/packages/components/ui/accordion/index.tsx
@@ -1,7 +1,6 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createAccordion } from '@gluestack-ui/accordion';
-import { Svg } from 'react-native-svg';
 import { View, Pressable, Text, Platform, TextProps } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
@@ -9,9 +8,9 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { H3 } from '@expo/html-elements';
 import { cssInterop } from 'nativewind';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'ACCORDION';
 /** Styles */
@@ -30,7 +29,9 @@ const accordionStyle = tva({
     },
   },
 });
+
 const accordionItemStyle = tva({
+  base: '',
   parentVariants: {
     variant: {
       filled: 'bg-background-0',
@@ -65,7 +66,7 @@ const accordionContentTextStyle = tva({
   base: 'text-typography-700 font-normal',
   parentVariants: {
     size: {
-      sm: 'text-sm ',
+      sm: 'text-sm',
       md: 'text-base',
       lg: 'text-lg',
     },
@@ -75,74 +76,13 @@ const accordionHeaderStyle = tva({
   base: 'mx-0 my-0',
 });
 const accordionContentStyle = tva({
-  base: 'px-5 mt-2 pb-5',
+  base: 'mt-4',
 });
 const accordionTriggerStyle = tva({
-  base: 'w-full py-5 px-5 flex-row justify-between items-center web:outline-none focus:outline-none data-[disabled=true]:opacity-40 data-[disabled=true]:cursor-not-allowed data-[focus-visible=true]:bg-background-50',
+  base: 'w-full flex-row justify-between items-center web:outline-none focus:outline-none data-[disabled=true]:opacity-40 data-[disabled=true]:cursor-not-allowed data-[focus-visible=true]:bg-background-50 py-3 px-4',
 });
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
-
-const Root =
-  Platform.OS === 'web'
-    ? withStyleContext(View, SCOPE)
-    : withStyleContextAndStates(View, SCOPE);
+const Root = withStyleContext(View, SCOPE);
 
 const Header = (
   Platform.OS === 'web' ? H3 : View
@@ -154,23 +94,13 @@ const UIAccordion = createAccordion({
   Item: View,
   Header: Header,
   Trigger: Pressable,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
   TitleText: Text,
   ContentText: Text,
   Content: View,
 });
 
-cssInterop(UIAccordion, { className: 'style' });
-cssInterop(UIAccordion.Item, { className: 'style' });
-cssInterop(UIAccordion.Header, { className: 'style' });
-cssInterop(UIAccordion.Trigger, { className: 'style' });
-//@ts-ignore
-cssInterop(UIAccordion.Icon, { className: 'style' });
-cssInterop(UIAccordion.TitleText, { className: 'style' });
-cssInterop(UIAccordion.Content, { className: 'style' });
-cssInterop(UIAccordion.ContentText, { className: 'style' });
-// @ts-ignore
-cssInterop(UIAccordion.Icon, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
diff --git a/universal/packages/components/ui/actionsheet/index.d.ts b/universal/packages/components/ui/actionsheet/index.d.ts
deleted file mode 100644
index bb30cc5b..00000000
--- a/universal/packages/components/ui/actionsheet/index.d.ts
+++ /dev/null
@@ -1,741 +0,0 @@
-import React from 'react';
-import { View } from 'react-native';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-export declare const UIActionsheet: import("@gluestack-ui/actionsheet/lib/typescript/types").IActionsheetComponentType<import("react-native").ViewProps, import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown>, Omit<import("react-native").PressableProps & React.RefAttributes<View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>, import("react-native").TextProps, import("react-native").ViewProps, import("react-native").ViewProps, Omit<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>, import("react-native").ScrollViewProps, import("react-native").VirtualizedListProps<unknown>, import("react-native").FlatListProps<unknown>, import("react-native").SectionListProps<unknown, unknown>, import("@expo/html-elements/build/primitives/Text").TextProps, Omit<any, "ref"> & React.RefAttributes<unknown>>;
-declare const actionsheetStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-full web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-full web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetItemStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full flex-row items-center p-3 rounded-sm disabled:opacity-40 disabled:web:pointer-events-auto disabled:web:cursor-not-allowed hover:bg-background-50 active:bg-background-100 focus:bg-background-100 web:focus-visible:bg-background-100", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full flex-row items-center p-3 rounded-sm disabled:opacity-40 disabled:web:pointer-events-auto disabled:web:cursor-not-allowed hover:bg-background-50 active:bg-background-100 focus:bg-background-100 web:focus-visible:bg-background-100", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetItemTextStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-typography-700 font-normal font-body tracking-md text-left mx-2", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, undefined, "text-typography-700 font-normal font-body tracking-md text-left mx-2", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}>, unknown, unknown, undefined>>;
-declare const actionsheetDragIndicatorStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-16 h-1 bg-background-400 rounded-full", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-16 h-1 bg-background-400 rounded-full", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetDragIndicatorWrapperStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full py-1 items-center", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full py-1 items-center", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetScrollViewStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetVirtualizedListStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetFlatListStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetSectionListStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetSectionHeaderTextStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "leading-5 font-bold font-heading my-0 text-typography-500 p-3 uppercase", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "leading-5 font-bold font-heading my-0 text-typography-500 p-3 uppercase", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>;
-type IActionsheetProps = VariantProps<typeof actionsheetStyle> & React.ComponentProps<typeof UIActionsheet>;
-type IActionsheetItemProps = VariantProps<typeof actionsheetItemStyle> & React.ComponentProps<typeof UIActionsheet.Item>;
-type IActionsheetItemTextProps = VariantProps<typeof actionsheetItemTextStyle> & React.ComponentProps<typeof UIActionsheet.ItemText>;
-type IActionsheetDragIndicatorProps = VariantProps<typeof actionsheetDragIndicatorStyle> & React.ComponentProps<typeof UIActionsheet.DragIndicator>;
-type IActionsheetDragIndicatorWrapperProps = VariantProps<typeof actionsheetDragIndicatorWrapperStyle> & React.ComponentProps<typeof UIActionsheet.DragIndicatorWrapper>;
-type IActionsheetScrollViewProps = VariantProps<typeof actionsheetScrollViewStyle> & React.ComponentProps<typeof UIActionsheet.ScrollView>;
-type IActionsheetVirtualizedListProps = VariantProps<typeof actionsheetVirtualizedListStyle> & React.ComponentProps<typeof UIActionsheet.VirtualizedList>;
-type IActionsheetFlatListProps = VariantProps<typeof actionsheetFlatListStyle> & React.ComponentProps<typeof UIActionsheet.FlatList>;
-type IActionsheetSectionListProps = VariantProps<typeof actionsheetSectionListStyle> & React.ComponentProps<typeof UIActionsheet.SectionList>;
-type IActionsheetSectionHeaderTextProps = VariantProps<typeof actionsheetSectionHeaderTextStyle> & React.ComponentProps<typeof UIActionsheet.SectionHeaderText>;
-declare const Actionsheet: React.ForwardRefExoticComponent<Omit<IActionsheetProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetContent: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "items-center rounded-tl-3xl rounded-tr-3xl p-2 bg-background-0 web:pointer-events-auto web:select-none shadow-lg", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "items-center rounded-tl-3xl rounded-tr-3xl p-2 bg-background-0 web:pointer-events-auto web:select-none shadow-lg", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & Omit<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>> & import("@gluestack-ui/actionsheet/lib/typescript/types").InterfaceActionsheetContentProps & {
-    className?: string | undefined;
-}, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetItem: React.ForwardRefExoticComponent<Omit<IActionsheetItemProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetItemText: React.ForwardRefExoticComponent<Omit<IActionsheetItemTextProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetDragIndicator: React.ForwardRefExoticComponent<Omit<IActionsheetDragIndicatorProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetDragIndicatorWrapper: React.ForwardRefExoticComponent<Omit<IActionsheetDragIndicatorWrapperProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetBackdrop: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default web:pointer-events-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default web:pointer-events-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown>> & import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown> & {
-    className?: string | undefined;
-}, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetScrollView: React.ForwardRefExoticComponent<Omit<IActionsheetScrollViewProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetVirtualizedList: React.ForwardRefExoticComponent<Omit<IActionsheetVirtualizedListProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetFlatList: React.ForwardRefExoticComponent<Omit<IActionsheetFlatListProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetSectionList: React.ForwardRefExoticComponent<Omit<IActionsheetSectionListProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetSectionHeaderText: React.ForwardRefExoticComponent<Omit<IActionsheetSectionHeaderTextProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetIcon: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-} | ({
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-} & {
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}>, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, "", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}>, unknown, unknown, undefined>>> & React.RefAttributes<Omit<any, "ref"> & React.RefAttributes<unknown>> & Omit<any, "ref"> & React.RefAttributes<unknown> & {
-    as?: any;
-    fill?: string | undefined;
-    color?: string | undefined;
-    className?: any;
-}, "ref"> & React.RefAttributes<unknown>>;
-export { Actionsheet, ActionsheetContent, ActionsheetItem, ActionsheetItemText, ActionsheetDragIndicator, ActionsheetDragIndicatorWrapper, ActionsheetBackdrop, ActionsheetScrollView, ActionsheetVirtualizedList, ActionsheetFlatList, ActionsheetSectionList, ActionsheetSectionHeaderText, ActionsheetIcon, };
diff --git a/universal/packages/components/ui/actionsheet/index.jsx b/universal/packages/components/ui/actionsheet/index.jsx
deleted file mode 100644
index 09970425..00000000
--- a/universal/packages/components/ui/actionsheet/index.jsx
+++ /dev/null
@@ -1,270 +0,0 @@
-'use client';
-import React, { useMemo } from 'react';
-import { H4 } from '@expo/html-elements';
-import { Svg } from 'react-native-svg';
-import { createActionsheet } from '@gluestack-ui/actionsheet';
-import { Pressable, View, Text, ScrollView, VirtualizedList, FlatList, SectionList, Platform, } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
-import { Motion, AnimatePresence, createMotionAnimatedComponent, } from '@legendapp/motion';
-const PrimitiveIcon = React.forwardRef(({ height, width, fill = 'none', color = 'gray', size, as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} color={color} {...props}/>);
-});
-const AnimatedPressable = createMotionAnimatedComponent(Pressable);
-export const UIActionsheet = createActionsheet({
-    Root: View,
-    Content: withStyleContext(Motion.View),
-    Item: Platform.OS === 'web'
-        ? withStyleContext(Pressable)
-        : withStyleContextAndStates(Pressable),
-    ItemText: Text,
-    DragIndicator: View,
-    IndicatorWrapper: View,
-    Backdrop: AnimatedPressable,
-    ScrollView: ScrollView,
-    VirtualizedList: VirtualizedList,
-    FlatList: FlatList,
-    SectionList: SectionList,
-    SectionHeaderText: H4,
-    Icon: PrimitiveIcon,
-    AnimatePresence: AnimatePresence,
-});
-cssInterop(UIActionsheet, { className: 'style' });
-cssInterop(UIActionsheet.Content, { className: 'style' });
-cssInterop(UIActionsheet.Item, { className: 'style' });
-cssInterop(UIActionsheet.ItemText, { className: 'style' });
-cssInterop(UIActionsheet.DragIndicator, { className: 'style' });
-cssInterop(UIActionsheet.DragIndicatorWrapper, { className: 'style' });
-cssInterop(UIActionsheet.Backdrop, { className: 'style' });
-cssInterop(UIActionsheet.ScrollView, { className: 'style' });
-cssInterop(UIActionsheet.VirtualizedList, { className: 'style' });
-cssInterop(UIActionsheet.FlatList, { className: 'style' });
-cssInterop(UIActionsheet.SectionList, { className: 'style' });
-cssInterop(UIActionsheet.SectionHeaderText, { className: 'style' });
-cssInterop(UIActionsheet.Icon, {
-    className: {
-        target: 'style',
-        nativeStyleToProp: {
-            height: 'height',
-            width: 'width',
-            //@ts-ignore
-            fill: 'fill',
-            color: 'color',
-        },
-    },
-});
-const actionsheetStyle = tva({ base: 'w-full h-full web:pointer-events-none' });
-const actionsheetContentStyle = tva({
-    base: 'items-center rounded-tl-3xl rounded-tr-3xl p-2 bg-background-0 web:pointer-events-auto web:select-none shadow-lg',
-});
-const actionsheetItemStyle = tva({
-    base: 'w-full flex-row items-center p-3 rounded-sm disabled:opacity-40 disabled:web:pointer-events-auto disabled:web:cursor-not-allowed hover:bg-background-50 active:bg-background-100 focus:bg-background-100 web:focus-visible:bg-background-100',
-});
-const actionsheetItemTextStyle = tva({
-    base: 'text-typography-700 font-normal font-body tracking-md text-left mx-2',
-    variants: {
-        isTruncated: {
-            true: '',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-md',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-    },
-    defaultVariants: {
-        size: 'md',
-    },
-});
-const actionsheetDragIndicatorStyle = tva({
-    base: 'w-16 h-1 bg-background-400 rounded-full',
-});
-const actionsheetDragIndicatorWrapperStyle = tva({
-    base: 'w-full py-1 items-center',
-});
-const actionsheetBackdropStyle = tva({
-    base: 'absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default web:pointer-events-auto',
-});
-const actionsheetScrollViewStyle = tva({
-    base: 'w-full h-auto',
-});
-const actionsheetVirtualizedListStyle = tva({
-    base: 'w-full h-auto',
-});
-const actionsheetFlatListStyle = tva({
-    base: 'w-full h-auto',
-});
-const actionsheetSectionListStyle = tva({
-    base: 'w-full h-auto',
-});
-const actionsheetSectionHeaderTextStyle = tva({
-    base: 'leading-5 font-bold font-heading my-0 text-typography-500 p-3 uppercase',
-    variants: {
-        isTruncated: {
-            true: '',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '5xl': 'text-5xl',
-            '4xl': 'text-4xl',
-            '3xl': 'text-3xl',
-            '2xl': 'text-2xl',
-            'xl': 'text-xl',
-            'lg': 'text-lg',
-            'md': 'text-md',
-            'sm': 'text-sm',
-            'xs': 'text-xs',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow500',
-        },
-    },
-    defaultVariants: {
-        size: 'xs',
-    },
-});
-const actionsheetIconStyle = tva({
-    base: '',
-    variants: {
-        size: {
-            '2xs': 'h-3 w-3',
-            'xs': 'h-3.5 w-3.5',
-            'sm': 'h-4 w-4',
-            'md': 'w-[18px] h-[18px]',
-            'lg': 'h-5 w-5',
-            'xl': 'h-6 w-6',
-        },
-    },
-});
-const Actionsheet = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet className={actionsheetStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetContent = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.Content className={actionsheetContentStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetItem = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.Item className={actionsheetItemStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetItemText = React.forwardRef(({ isTruncated, bold, underline, strikeThrough, size, className, ...props }, ref) => {
-    return (<UIActionsheet.ItemText className={actionsheetItemTextStyle({
-            class: className,
-            isTruncated,
-            bold,
-            underline,
-            strikeThrough,
-            size,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetDragIndicator = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.DragIndicator className={actionsheetDragIndicatorStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetDragIndicatorWrapper = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.DragIndicatorWrapper className={actionsheetDragIndicatorWrapperStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetBackdrop = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.Backdrop initial={{
-            opacity: 0,
-        }} animate={{
-            opacity: 0.5,
-        }} exit={{
-            opacity: 0,
-        }} {...props} className={actionsheetBackdropStyle({
-            class: className,
-        })} ref={ref}/>);
-});
-const ActionsheetScrollView = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.ScrollView className={actionsheetScrollViewStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetVirtualizedList = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.VirtualizedList className={actionsheetVirtualizedListStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetFlatList = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.FlatList className={actionsheetFlatListStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetSectionList = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.SectionList className={actionsheetSectionListStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetSectionHeaderText = React.forwardRef(({ className, isTruncated, bold, underline, strikeThrough, size, sub, italic, highlight, ...props }, ref) => {
-    return (<UIActionsheet.SectionHeaderText className={actionsheetSectionHeaderTextStyle({
-            class: className,
-            isTruncated,
-            bold,
-            underline,
-            strikeThrough,
-            size,
-            sub,
-            italic,
-            highlight,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetIcon = React.forwardRef(({ className, size = 'sm', color = 'gray', ...props }, ref) => {
-    if (typeof size === 'number') {
-        return (<UIActionsheet.Icon ref={ref} {...props} color={color} className={actionsheetIconStyle({ class: className })} size={size}/>);
-    }
-    else if ((props.height !== undefined || props.width !== undefined) &&
-        size === undefined) {
-        return (<UIActionsheet.Icon ref={ref} {...props} color={color} className={actionsheetIconStyle({ class: className })}/>);
-    }
-    return (<UIActionsheet.Icon className={actionsheetIconStyle({
-            class: className,
-            size,
-        })} color={color} ref={ref} {...props}/>);
-});
-export { Actionsheet, ActionsheetContent, ActionsheetItem, ActionsheetItemText, ActionsheetDragIndicator, ActionsheetDragIndicatorWrapper, ActionsheetBackdrop, ActionsheetScrollView, ActionsheetVirtualizedList, ActionsheetFlatList, ActionsheetSectionList, ActionsheetSectionHeaderText, ActionsheetIcon, };
diff --git a/universal/packages/components/ui/actionsheet/index.tsx b/universal/packages/components/ui/actionsheet/index.tsx
index ad40846e..0dc14763 100644
--- a/universal/packages/components/ui/actionsheet/index.tsx
+++ b/universal/packages/components/ui/actionsheet/index.tsx
@@ -1,7 +1,6 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { H4 } from '@expo/html-elements';
-import { Svg } from 'react-native-svg';
 import { createActionsheet } from '@gluestack-ui/actionsheet';
 import {
   Pressable,
@@ -11,13 +10,11 @@ import {
   VirtualizedList,
   FlatList,
   SectionList,
-  Platform,
   PressableProps,
 } from 'react-native';
-
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import { cssInterop } from 'nativewind';
 import {
   Motion,
@@ -25,63 +22,6 @@ import {
   createMotionAnimatedComponent,
 } from '@legendapp/motion';
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
-
 const ItemWrapper = React.forwardRef<
   React.ElementRef<typeof Pressable>,
   PressableProps
@@ -94,7 +34,7 @@ const AnimatedPressable = createMotionAnimatedComponent(Pressable);
 export const UIActionsheet = createActionsheet({
   Root: View,
   Content: Motion.View,
-  Item: Platform.OS === 'web' ? ItemWrapper : withStates(ItemWrapper),
+  Item: ItemWrapper,
   ItemText: Text,
   DragIndicator: View,
   IndicatorWrapper: View,
@@ -104,7 +44,7 @@ export const UIActionsheet = createActionsheet({
   FlatList: FlatList,
   SectionList: SectionList,
   SectionHeaderText: H4,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
   AnimatePresence: AnimatePresence,
 });
 
@@ -137,8 +77,8 @@ cssInterop(UIActionsheet.FlatList, {
 });
 cssInterop(UIActionsheet.SectionList, { className: 'style' });
 cssInterop(UIActionsheet.SectionHeaderText, { className: 'style' });
-// @ts-ignore
-cssInterop(UIActionsheet.Icon, {
+
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
diff --git a/universal/packages/components/ui/alert-dialog/index.d.ts b/universal/packages/components/ui/alert-dialog/index.d.ts
deleted file mode 100644
index 715f3458..00000000
--- a/universal/packages/components/ui/alert-dialog/index.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { View } from 'react-native';
-declare const AlertDialog: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>> & import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown> & import("@gluestack-ui/alert-dialog/lib/typescript/types").InterfaceAlertDialogProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}, undefined, "group/modal w-full h-full justify-center items-center web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "group/modal w-full h-full justify-center items-center web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AlertDialogContent: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown>> & import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}, undefined, "bg-background-50 rounded-lg overflow-hidden ", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "bg-background-50 rounded-lg overflow-hidden ", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AlertDialogCloseButton: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").PressableProps & React.RefAttributes<View>> & import("react-native").PressableProps & React.RefAttributes<View> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "group/alert-dialog-close-button z-10 rounded-sm p-2 data-[focus-visible=true]:bg-background-100 web:cursor-pointer outline-0", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "group/alert-dialog-close-button z-10 rounded-sm p-2 data-[focus-visible=true]:bg-background-100 web:cursor-pointer outline-0", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AlertDialogHeader: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "p-4 justify-between items-center flex-row", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "p-4 justify-between items-center flex-row", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AlertDialogFooter: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "p-4 flex-row justify-end items-center flex-wrap", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "p-4 flex-row justify-end items-center flex-wrap", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AlertDialogBody: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").ScrollViewProps> & import("react-native").ScrollViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "px-4 py-2", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "px-4 py-2", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AlertDialogBackdrop: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown>> & import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { AlertDialog, AlertDialogContent, AlertDialogCloseButton, AlertDialogHeader, AlertDialogFooter, AlertDialogBody, AlertDialogBackdrop, };
diff --git a/universal/packages/components/ui/alert-dialog/index.jsx b/universal/packages/components/ui/alert-dialog/index.jsx
deleted file mode 100644
index 34b00b51..00000000
--- a/universal/packages/components/ui/alert-dialog/index.jsx
+++ /dev/null
@@ -1,145 +0,0 @@
-'use client';
-import React from 'react';
-import { createAlertDialog } from '@gluestack-ui/alert-dialog';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-import { Motion, AnimatePresence, createMotionAnimatedComponent, } from '@legendapp/motion';
-import { View, Pressable, ScrollView, Platform } from 'react-native';
-const AnimatedPressable = createMotionAnimatedComponent(Pressable);
-const SCOPE = 'ALERT_DIALOG';
-const UIAccessibleAlertDialog = createAlertDialog({
-    // @ts-ignore
-    Root: Platform.OS === 'web'
-        ? withStyleContext(View, SCOPE)
-        : withStyleContextAndStates(View, SCOPE),
-    Body: ScrollView,
-    Content: Motion.View,
-    CloseButton: Pressable,
-    Header: View,
-    Footer: View,
-    Backdrop: AnimatedPressable,
-    AnimatePresence: AnimatePresence, //TODO: Add support for this
-});
-cssInterop(UIAccessibleAlertDialog, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Content, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.CloseButton, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Header, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Footer, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Body, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Backdrop, { className: 'style' });
-const alertDialogStyle = tva({
-    base: 'group/modal w-full h-full justify-center items-center web:pointer-events-none',
-    parentVariants: {
-        size: {
-            xs: '',
-            sm: '',
-            md: '',
-            lg: '',
-            full: '',
-        },
-    },
-});
-const alertDialogContentStyle = tva({
-    base: 'bg-background-50 rounded-lg overflow-hidden ',
-    parentVariants: {
-        size: {
-            xs: 'w-[60%] max-w-[360px]',
-            sm: 'w-[70%] max-w-[420px]',
-            md: 'w-[80%] max-w-[510px]',
-            lg: 'w-[90%] max-w-[640px]',
-            full: 'w-full',
-        },
-    },
-});
-const alertDialogCloseButtonStyle = tva({
-    base: 'group/alert-dialog-close-button z-10 rounded-sm p-2 data-[focus-visible=true]:bg-background-100 web:cursor-pointer outline-0',
-});
-const alertDialogHeaderStyle = tva({
-    base: 'p-4 justify-between items-center flex-row',
-});
-const alertDialogFooterStyle = tva({
-    base: 'p-4 flex-row justify-end items-center flex-wrap',
-});
-const alertDialogBodyStyle = tva({ base: 'px-4 py-2' });
-const alertDialogBackdropStyle = tva({
-    base: 'absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default',
-});
-const AlertDialog = React.forwardRef(({ className, size = 'md', ...props }, ref) => {
-    return (<UIAccessibleAlertDialog ref={ref} {...props} className={alertDialogStyle({ class: className })} context={{ size }} pointerEvents="box-none"/>);
-});
-const AlertDialogContent = React.forwardRef(({ className, size, ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UIAccessibleAlertDialog.Content pointerEvents="auto" ref={ref} initial={{
-            scale: 0.9,
-            opacity: 0,
-        }} animate={{
-            scale: 1,
-            opacity: 1,
-        }} exit={{
-            scale: 0.9,
-            opacity: 0,
-        }} transition={{
-            type: 'spring',
-            damping: 18,
-            stiffness: 250,
-            opacity: {
-                type: 'timing',
-                duration: 250,
-            },
-        }} {...props} className={alertDialogContentStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            size,
-            class: className,
-        })}/>);
-});
-const AlertDialogCloseButton = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIAccessibleAlertDialog.CloseButton ref={ref} {...props} className={alertDialogCloseButtonStyle({
-            class: className,
-        })}/>);
-});
-const AlertDialogHeader = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIAccessibleAlertDialog.Header ref={ref} {...props} className={alertDialogHeaderStyle({
-            class: className,
-        })}/>);
-});
-const AlertDialogFooter = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIAccessibleAlertDialog.Footer ref={ref} {...props} className={alertDialogFooterStyle({
-            class: className,
-        })}/>);
-});
-const AlertDialogBody = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIAccessibleAlertDialog.Body ref={ref} {...props} className={alertDialogBodyStyle({
-            class: className,
-        })}/>);
-});
-const AlertDialogBackdrop = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIAccessibleAlertDialog.Backdrop ref={ref} initial={{
-            opacity: 0,
-        }} animate={{
-            opacity: 0.5,
-        }} exit={{
-            opacity: 0,
-        }} transition={{
-            type: 'spring',
-            damping: 18,
-            stiffness: 250,
-            opacity: {
-                type: 'timing',
-                duration: 250,
-            },
-        }} {...props} className={alertDialogBackdropStyle({
-            class: className,
-        })}/>);
-});
-AlertDialog.displayName = 'AlertDialog';
-AlertDialogContent.displayName = 'AlertDialogContent';
-AlertDialogCloseButton.displayName = 'AlertDialogCloseButton';
-AlertDialogHeader.displayName = 'AlertDialogHeader';
-AlertDialogFooter.displayName = 'AlertDialogFooter';
-AlertDialogBody.displayName = 'AlertDialogBody';
-AlertDialogBackdrop.displayName = 'AlertDialogBackdrop';
-export { AlertDialog, AlertDialogContent, AlertDialogCloseButton, AlertDialogHeader, AlertDialogFooter, AlertDialogBody, AlertDialogBackdrop, };
diff --git a/universal/packages/components/ui/alert-dialog/index.tsx b/universal/packages/components/ui/alert-dialog/index.tsx
index 457db9c6..2bd63535 100644
--- a/universal/packages/components/ui/alert-dialog/index.tsx
+++ b/universal/packages/components/ui/alert-dialog/index.tsx
@@ -6,7 +6,7 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
+
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 import {
@@ -14,17 +14,14 @@ import {
   AnimatePresence,
   createMotionAnimatedComponent,
 } from '@legendapp/motion';
-import { View, Pressable, ScrollView, Platform } from 'react-native';
+import { View, Pressable, ScrollView } from 'react-native';
 
 const AnimatedPressable = createMotionAnimatedComponent(Pressable);
 
 const SCOPE = 'ALERT_DIALOG';
 
 const UIAccessibleAlertDialog = createAlertDialog({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(View, SCOPE),
+  Root: withStyleContext(View, SCOPE),
   Body: ScrollView,
   Content: Motion.View,
   CloseButton: Pressable,
@@ -34,17 +31,8 @@ const UIAccessibleAlertDialog = createAlertDialog({
   AnimatePresence: AnimatePresence,
 });
 
-cssInterop(UIAccessibleAlertDialog, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Content, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.CloseButton, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Header, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Footer, { className: 'style' });
-cssInterop(UIAccessibleAlertDialog.Body, {
-  className: 'style',
-  contentContainerClassName: 'contentContainerStyle',
-  indicatorClassName: 'indicatorStyle',
-});
-cssInterop(UIAccessibleAlertDialog.Backdrop, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
+cssInterop(AnimatedPressable, { className: 'style' });
 
 const alertDialogStyle = tva({
   base: 'group/modal w-full h-full justify-center items-center web:pointer-events-none',
diff --git a/universal/packages/components/ui/alert/index.d.ts b/universal/packages/components/ui/alert/index.d.ts
deleted file mode 100644
index 01450b04..00000000
--- a/universal/packages/components/ui/alert/index.d.ts
+++ /dev/null
@@ -1,585 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-export declare const UIAlert: import("@gluestack-ui/alert/lib/typescript/types").IAlertComponentType<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>, import("react-native").TextProps, Omit<any, "ref"> & React.RefAttributes<unknown>>;
-declare const Alert: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & Omit<React.RefAttributes<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>> & import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown> & import("@gluestack-ui/alert/lib/typescript/types").InterfaceAlertProps, "context"> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-        accent: string;
-    };
-} | ({
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-        accent: string;
-    };
-} & {
-    action: {
-        error: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        warning: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        success: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        info: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        muted: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    variant: {
-        solid: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        outline: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        accent: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "items-center p-3 rounded flex-row", import("tailwind-variants/dist/config").TVConfig<{
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-        accent: string;
-    };
-}, {
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-        accent: string;
-    };
-}>, {
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-        accent: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-        accent: string;
-    };
-}, undefined, "items-center p-3 rounded flex-row", import("tailwind-variants/dist/config").TVConfig<{
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-        accent: string;
-    };
-}, {
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-        accent: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AlertText: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").TextProps> & import("react-native").TextProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-typography-700 flex-1 font-normal font-body", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "text-typography-700 flex-1 font-normal font-body", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const AlertIcon: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-    color?: string | undefined;
-} & React.RefAttributes<Omit<any, "ref"> & React.RefAttributes<unknown>> & Omit<any, "ref"> & React.RefAttributes<unknown> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-} | ({
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-} & {
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {};
-        xs: import("tailwind-merge").ClassNameValue | {};
-        sm: import("tailwind-merge").ClassNameValue | {};
-        md: import("tailwind-merge").ClassNameValue | {};
-        lg: import("tailwind-merge").ClassNameValue | {};
-        xl: import("tailwind-merge").ClassNameValue | {};
-    };
-}), undefined, undefined, import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}>, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, undefined, import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Alert, AlertText, AlertIcon };
diff --git a/universal/packages/components/ui/alert/index.jsx b/universal/packages/components/ui/alert/index.jsx
deleted file mode 100644
index 500e7e73..00000000
--- a/universal/packages/components/ui/alert/index.jsx
+++ /dev/null
@@ -1,154 +0,0 @@
-'use client';
-import { createAlert } from '@gluestack-ui/alert';
-import { View, Text } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import React, { useMemo } from 'react';
-import { Svg } from 'react-native-svg';
-import { cssInterop } from 'nativewind';
-const SCOPE = 'ALERT';
-const alertStyle = tva({
-    base: 'items-center p-3 rounded flex-row',
-    variants: {
-        action: {
-            error: 'bg-background-error border-error-300 ',
-            warning: 'bg-background-warning border-warning-300',
-            success: 'bg-background-success border-success-300',
-            info: 'bg-background-info border-info-300',
-            muted: 'bg-background-muted border-muted-300',
-        },
-        variant: {
-            solid: '',
-            outline: 'border bg-transparent',
-            accent: 'border-l-4',
-        },
-    },
-    defaultVariants: {
-        variant: 'solid',
-        action: 'info',
-    },
-});
-const alertTextStyle = tva({
-    base: 'text-typography-700 flex-1 font-normal font-body',
-    variants: {
-        isTruncated: {
-            true: 'web:truncate',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-md',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow-500',
-        },
-    },
-});
-const alertIconStyle = tva({
-    variants: {
-        size: {
-            '2xs': 'h-3 w-3',
-            'xs': 'h-3.5 w-3.5',
-            'sm': 'h-4 w-4',
-            'md': 'h-[18px] w-[18px]',
-            'lg': 'h-5 w-5',
-            'xl': 'h-6 w-6',
-        },
-    },
-});
-const PrimitiveIcon = React.forwardRef(({ height, width, fill = 'none', color, size, as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} color={color} {...props}/>);
-});
-export const UIAlert = createAlert({
-    Root: withStyleContext(View, SCOPE),
-    Text: Text,
-    Icon: PrimitiveIcon,
-});
-cssInterop(UIAlert, { className: 'style' });
-//@ts-ignore
-cssInterop(UIAlert.Text, { className: 'style' });
-cssInterop(UIAlert.Icon, {
-    className: {
-        target: 'style',
-        nativeStyleToProp: {
-            height: 'height',
-            width: 'width',
-            //@ts-ignore
-            fill: 'fill',
-            color: 'color',
-        },
-    },
-});
-const Alert = React.forwardRef(({ className, variant = 'solid', action = 'info', ...props }, ref) => {
-    return (<UIAlert className={alertStyle({ action, variant, class: className })} context={{ variant, action }} ref={ref} {...props}/>);
-});
-const AlertText = React.forwardRef(({ className, isTruncated, bold, underline, strikeThrough, size = 'md', sub, italic, highlight, ...props }, ref) => {
-    return (<UIAlert.Text 
-    // @ts-ignore
-    className={alertTextStyle({
-            isTruncated,
-            bold,
-            underline,
-            strikeThrough,
-            size,
-            sub,
-            italic,
-            highlight,
-            class: className,
-        })} {...props} ref={ref}/>);
-});
-const defaultColors = {
-    info: '#0DA6F2',
-    success: '#38A169',
-    error: '#D32F2F',
-    warning: '#FFC107',
-    muted: '#999999',
-};
-const AlertIcon = React.forwardRef(({ className, size = 'md', ...props }, ref) => {
-    const { action: parentAction } = useStyleContext(SCOPE);
-    const { color = defaultColors[parentAction] } = props;
-    if (typeof size === 'number') {
-        return (<UIAlert.Icon ref={ref} {...props} color={color} className={alertIconStyle({ class: className })} size={size}/>);
-    }
-    else if ((props.height !== undefined || props.width !== undefined) &&
-        size === undefined) {
-        return (<UIAlert.Icon ref={ref} {...props} color={color} className={alertIconStyle({ class: className })}/>);
-    }
-    return (<UIAlert.Icon className={alertIconStyle({
-            size,
-            class: className,
-        })} color={color} {...props} ref={ref}/>);
-});
-Alert.displayName = 'Alert';
-AlertText.displayName = 'AlertText';
-AlertIcon.displayName = 'AlertIcon';
-export { Alert, AlertText, AlertIcon };
diff --git a/universal/packages/components/ui/alert/index.tsx b/universal/packages/components/ui/alert/index.tsx
index cd1d6041..90a2dfe9 100644
--- a/universal/packages/components/ui/alert/index.tsx
+++ b/universal/packages/components/ui/alert/index.tsx
@@ -6,10 +6,10 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import React, { useMemo } from 'react';
-import { Svg } from 'react-native-svg';
+import React from 'react';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'ALERT';
 
@@ -33,7 +33,7 @@ const alertStyle = tva({
 });
 
 const alertTextStyle = tva({
-  base: 'flex-1 font-normal font-body',
+  base: 'font-normal font-body',
 
   variants: {
     isTruncated: {
@@ -100,92 +100,23 @@ const alertIconStyle = tva({
       warning: 'text-warning-800',
       success: 'text-success-800',
       info: 'text-info-800',
-      muted: 'text-secondary-800',
+      muted: 'text-background-800',
     },
   },
 });
 
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
-
-const IconWrapper = React.forwardRef<
-  React.ElementRef<typeof PrimitiveIcon>,
-  IPrimitiveIcon
->(({ ...props }, ref) => {
-  return <PrimitiveIcon {...props} ref={ref} />;
-});
-
 export const UIAlert = createAlert({
   Root: withStyleContext(View, SCOPE),
   Text: Text,
-  Icon: IconWrapper,
+  Icon: UIIcon,
 });
 
-cssInterop(UIAlert, { className: 'style' });
-//@ts-ignore
-cssInterop(UIAlert.Text, { className: 'style' });
-//@ts-ignore
-cssInterop(IconWrapper, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      //@ts-ignore
       fill: true,
       color: 'classNameColor',
       stroke: true,
diff --git a/universal/packages/components/ui/avatar/index.d.ts b/universal/packages/components/ui/avatar/index.d.ts
deleted file mode 100644
index d6b6ff19..00000000
--- a/universal/packages/components/ui/avatar/index.d.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-export declare const Avatar: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & Omit<import("@gluestack-ui/avatar/lib/typescript/types").InterfaceAvatarProps & import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown> & React.RefAttributes<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>>, "context"> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-} | ({
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-} & {
-    size: {
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "rounded-full justify-center items-center relative bg-primary-600 group-[.avatar-group]/avatar-group:-ml-2.5", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}, {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}>, {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}, undefined, "rounded-full justify-center items-center relative bg-primary-600 group-[.avatar-group]/avatar-group:-ml-2.5", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}, {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export declare const AvatarBadge: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ViewProps & React.RefAttributes<import("react-native").ViewProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}, undefined, "w-5 h-5 bg-success-500 rounded-full absolute right-0 bottom-0 border-white border-2", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-5 h-5 bg-success-500 rounded-full absolute right-0 bottom-0 border-white border-2", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export declare const AvatarFallbackText: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").TextProps & React.RefAttributes<import("react-native").TextProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}, undefined, "text-typography-0 font-semibold overflow-hidden text-transform:uppercase web:cursor-default", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "text-typography-0 font-semibold overflow-hidden text-transform:uppercase web:cursor-default", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export declare const AvatarImage: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ImageProps & React.RefAttributes<import("react-native").ImageProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "h-full w-full rounded-full absolute", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "h-full w-full rounded-full absolute", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export declare const AvatarGroup: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ViewProps & React.RefAttributes<import("react-native").ViewProps> & import("@gluestack-ui/avatar/lib/typescript/types").IAvatarGroupProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "group/avatar-group flex-row-reverse relative avatar-group", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "group/avatar-group flex-row-reverse relative avatar-group", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
diff --git a/universal/packages/components/ui/avatar/index.jsx b/universal/packages/components/ui/avatar/index.jsx
deleted file mode 100644
index fffa7bd6..00000000
--- a/universal/packages/components/ui/avatar/index.jsx
+++ /dev/null
@@ -1,101 +0,0 @@
-"use client";
-import React from "react";
-import { createAvatar } from "@gluestack-ui/avatar";
-import { View, Text } from "react-native";
-import Image from "@unitools/image";
-import { tva } from "@gluestack-ui/nativewind-utils/tva";
-import { withStyleContext, useStyleContext, } from "@gluestack-ui/nativewind-utils/withStyleContext";
-import { cssInterop } from "@gluestack-ui/nativewind-utils/cssInterop";
-const SCOPE = "AVATAR";
-const UIAvatar = createAvatar({
-    Root: withStyleContext(View, SCOPE),
-    Badge: View,
-    Group: View,
-    Image: Image,
-    FallbackText: Text,
-});
-cssInterop(UIAvatar, { className: "style" });
-cssInterop(UIAvatar.Badge, { className: "style" });
-cssInterop(UIAvatar.Group, { className: "style" });
-cssInterop(UIAvatar.Image, 
-//@ts-ignore
-Image.displayName === "NextImage" ? {} : { className: "style" });
-cssInterop(UIAvatar.FallbackText, { className: "style" });
-const avatarStyle = tva({
-    base: "rounded-full justify-center items-center relative bg-primary-600 group-[.avatar-group]/avatar-group:-ml-2.5",
-    variants: {
-        size: {
-            xs: "w-6 h-6",
-            sm: "w-8 h-8",
-            md: "w-12 h-12",
-            lg: "w-16 h-16",
-            xl: "w-24 h-24",
-            "2xl": "w-32 h-32",
-        },
-    },
-});
-const avatarFallbackTextStyle = tva({
-    base: "text-typography-0 font-semibold overflow-hidden text-transform:uppercase web:cursor-default",
-    parentVariants: {
-        size: {
-            xs: "text-2xs",
-            sm: "text-xs",
-            md: "text-base",
-            lg: "text-xl",
-            xl: "text-3xl",
-            "2xl": "text-5xl",
-        },
-    },
-});
-const avatarGroupStyle = tva({
-    base: "group/avatar-group flex-row-reverse relative avatar-group",
-});
-const avatarBadgeStyle = tva({
-    base: "w-5 h-5 bg-success-500 rounded-full absolute right-0 bottom-0 border-white border-2",
-    parentVariants: {
-        size: {
-            xs: "w-2 h-2",
-            sm: "w-2 h-2",
-            md: "w-3 h-3",
-            lg: "w-4 h-4",
-            xl: "w-6 h-6",
-            "2xl": "w-8 h-8",
-        },
-    },
-});
-const avatarImageStyle = tva({
-    base: "!h-full !w-full rounded-full absolute",
-});
-export const Avatar = React.forwardRef(({ className, size = "md", ...props }, ref) => {
-    return (<UIAvatar ref={ref} {...props} className={avatarStyle({ size, class: className })} context={{ size }}/>);
-});
-export const AvatarBadge = React.forwardRef(({ className, size, ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UIAvatar.Badge ref={ref} {...props} className={avatarBadgeStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            size,
-            class: className,
-        })}/>);
-});
-export const AvatarFallbackText = React.forwardRef(({ className, size, ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UIAvatar.FallbackText ref={ref} {...props} className={avatarFallbackTextStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            size,
-            class: className,
-        })}/>);
-});
-export const AvatarImage = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIAvatar.Image ref={ref} {...props} className={avatarImageStyle({
-            class: className,
-        })}/>);
-});
-export const AvatarGroup = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIAvatar.Group ref={ref} {...props} className={avatarGroupStyle({
-            class: className,
-        })}/>);
-});
diff --git a/universal/packages/components/ui/avatar/index.tsx b/universal/packages/components/ui/avatar/index.tsx
index 31fcbdd1..b6863aa1 100644
--- a/universal/packages/components/ui/avatar/index.tsx
+++ b/universal/packages/components/ui/avatar/index.tsx
@@ -9,7 +9,6 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { cssInterop } from 'nativewind';
 const SCOPE = 'AVATAR';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
@@ -21,12 +20,6 @@ const UIAvatar = createAvatar({
   FallbackText: Text,
 });
 
-cssInterop(UIAvatar, { className: 'style' });
-cssInterop(UIAvatar.Badge, { className: 'style' });
-cssInterop(UIAvatar.Group, { className: 'style' });
-cssInterop(UIAvatar.Image, { className: 'style' });
-cssInterop(UIAvatar.FallbackText, { className: 'style' });
-
 const avatarStyle = tva({
   base: 'rounded-full justify-center items-center relative bg-primary-600 group-[.avatar-group]/avatar-group:-ml-2.5',
   variants: {
@@ -161,10 +154,11 @@ export const AvatarImage = React.forwardRef<
       className={avatarImageStyle({
         class: className,
       })}
-      // @ts-ignore
+      // @ts-expect-error
       style={
         Platform.OS === 'web'
-          ? { height: 'revert-layer', width: 'revert-layer' }
+          ? // eslint-disable-next-line react-native/no-inline-styles
+            { height: 'revert-layer', width: 'revert-layer' }
           : undefined
       }
     />
diff --git a/universal/packages/components/ui/badge/index.d.ts b/universal/packages/components/ui/badge/index.d.ts
deleted file mode 100644
index ff781cda..00000000
--- a/universal/packages/components/ui/badge/index.d.ts
+++ /dev/null
@@ -1,716 +0,0 @@
-import React from 'react';
-import { Text } from 'react-native';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const badgeStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-} | ({
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-} & {
-    action: {
-        error: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        warning: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        success: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        info: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        muted: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    variant: {
-        solid: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        outline: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "flex-row items-center rounded-sm data-[disabled=true]:opacity-50 px-2 py-1", import("tailwind-variants/dist/config").TVConfig<{
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, {
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}>, {
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "flex-row items-center rounded-sm data-[disabled=true]:opacity-50 px-2 py-1", import("tailwind-variants/dist/config").TVConfig<{
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, {
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    variant: {
-        solid: string;
-        outline: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}>, unknown, unknown, undefined>>;
-declare const badgeTextStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    action: {
-        error: string;
-        warning: string;
-        success: string;
-        info: string;
-        muted: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "text-typography-700 font-body font-normal tracking-normal uppercase", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "text-typography-700 font-body font-normal tracking-normal uppercase", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>;
-declare const ContextView: React.ForwardRefExoticComponent<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>>;
-type IBadgeProps = React.ComponentProps<typeof ContextView> & VariantProps<typeof badgeStyle>;
-declare const Badge: {
-    ({ children, action, variant, size, className, ...props }: {
-        className?: string | undefined;
-    } & import("react-native").ViewProps & {
-        context?: any;
-    } & React.RefAttributes<unknown> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        action: {
-            error: string;
-            warning: string;
-            success: string;
-            info: string;
-            muted: string;
-        };
-        variant: {
-            solid: string;
-            outline: string;
-        };
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    } | ({
-        action: {
-            error: string;
-            warning: string;
-            success: string;
-            info: string;
-            muted: string;
-        };
-        variant: {
-            solid: string;
-            outline: string;
-        };
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    } & {
-        action: {
-            error: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            warning: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            success: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            info: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            muted: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        variant: {
-            solid: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            outline: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        size: {
-            sm: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            md: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            lg: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-    }), undefined, "flex-row items-center rounded-sm data-[disabled=true]:opacity-50 px-2 py-1", import("tailwind-variants/dist/config").TVConfig<{
-        action: {
-            error: string;
-            warning: string;
-            success: string;
-            info: string;
-            muted: string;
-        };
-        variant: {
-            solid: string;
-            outline: string;
-        };
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }, {
-        action: {
-            error: string;
-            warning: string;
-            success: string;
-            info: string;
-            muted: string;
-        };
-        variant: {
-            solid: string;
-            outline: string;
-        };
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }>, {
-        action: {
-            error: string;
-            warning: string;
-            success: string;
-            info: string;
-            muted: string;
-        };
-        variant: {
-            solid: string;
-            outline: string;
-        };
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        action: {
-            error: string;
-            warning: string;
-            success: string;
-            info: string;
-            muted: string;
-        };
-        variant: {
-            solid: string;
-            outline: string;
-        };
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }, undefined, "flex-row items-center rounded-sm data-[disabled=true]:opacity-50 px-2 py-1", import("tailwind-variants/dist/config").TVConfig<{
-        action: {
-            error: string;
-            warning: string;
-            success: string;
-            info: string;
-            muted: string;
-        };
-        variant: {
-            solid: string;
-            outline: string;
-        };
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }, {
-        action: {
-            error: string;
-            warning: string;
-            success: string;
-            info: string;
-            muted: string;
-        };
-        variant: {
-            solid: string;
-            outline: string;
-        };
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }>, unknown, unknown, undefined>>>): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-type IBadgeTextProps = React.ComponentProps<typeof Text> & VariantProps<typeof badgeTextStyle>;
-declare const BadgeText: {
-    ({ children, className, size, ...props }: {
-        className?: string | undefined;
-    } & import("react-native").TextProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    } & {
-        action: {
-            error: string;
-            warning: string;
-            success: string;
-            info: string;
-            muted: string;
-        };
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }, undefined, "text-typography-700 font-body font-normal tracking-normal uppercase", import("tailwind-variants/dist/config").TVConfig<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, {
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }>, {
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, undefined, "text-typography-700 font-body font-normal tracking-normal uppercase", import("tailwind-variants/dist/config").TVConfig<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, {
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }>, unknown, unknown, undefined>>>): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-declare const BadgeIcon: React.ForwardRefExoticComponent<{
-    className?: string | undefined;
-    color?: string | undefined;
-    as?: any;
-} & import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, undefined, import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, undefined, import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<unknown>>;
-export { Badge, BadgeIcon, BadgeText };
diff --git a/universal/packages/components/ui/badge/index.jsx b/universal/packages/components/ui/badge/index.jsx
deleted file mode 100644
index 03011068..00000000
--- a/universal/packages/components/ui/badge/index.jsx
+++ /dev/null
@@ -1,152 +0,0 @@
-'use client';
-import React, { useMemo } from 'react';
-import { Text, View } from 'react-native';
-import { Svg } from 'react-native-svg';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { cssInterop } from 'nativewind';
-const SCOPE = 'BADGE';
-const badgeStyle = tva({
-    base: 'flex-row items-center rounded-sm data-[disabled=true]:opacity-50 px-2 py-1',
-    variants: {
-        action: {
-            error: 'bg-background-error border-error-300',
-            warning: 'bg-background-warning border-warning-300',
-            success: 'bg-background-success border-success-300',
-            info: 'bg-background-info border-info-300',
-            muted: 'bg-background-muted border-secondary-300',
-        },
-        variant: {
-            solid: '',
-            outline: 'border',
-        },
-        size: {
-            sm: '',
-            md: '',
-            lg: '',
-        },
-    },
-});
-const badgeTextStyle = tva({
-    base: 'text-typography-700 font-body font-normal tracking-normal uppercase',
-    parentVariants: {
-        action: {
-            error: 'text-error-600',
-            warning: 'text-warning-600',
-            success: 'text-success-600',
-            info: 'text-info-600',
-            muted: 'text-secondary-600',
-        },
-        size: {
-            sm: 'text-2xs',
-            md: 'text-xs',
-            lg: 'text-sm',
-        },
-    },
-    variants: {
-        isTruncated: {
-            true: 'web:truncate',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow-500',
-        },
-    },
-});
-const badgeIconStyle = tva({
-    parentVariants: {
-        size: {
-            sm: 'h-3 w-3',
-            md: 'h-3.5 w-3.5',
-            lg: 'h-4 w-4',
-        },
-    },
-});
-const PrimitiveIcon = React.forwardRef(({ height, width, fill = 'none', color, size, as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} color={color} {...props}/>);
-});
-const ContextView = withStyleContext(View, SCOPE);
-cssInterop(ContextView, { className: 'style' });
-cssInterop(PrimitiveIcon, {
-    className: {
-        target: 'style',
-        nativeStyleToProp: {
-            height: 'height',
-            width: 'width',
-            //@ts-ignore
-            fill: 'fill',
-            color: 'color',
-        },
-    },
-});
-const Badge = ({ children, action = 'info', variant = 'solid', size = 'md', className, ...props }) => {
-    return (<ContextView className={badgeStyle({ action, variant, class: className })} {...props} context={{
-            action,
-            variant,
-            size,
-        }}>
-      {children}
-    </ContextView>);
-};
-const BadgeText = ({ children, className, size, ...props }) => {
-    const { size: parentSize, action: parentAction } = useStyleContext(SCOPE);
-    return (<Text className={badgeTextStyle({
-            parentVariants: {
-                size: parentSize,
-                action: parentAction,
-            },
-            size,
-            class: className,
-        })} {...props}>
-      {children}
-    </Text>);
-};
-const defaultColors = {
-    info: '#0B8DCD',
-    success: '#2A7948',
-    error: '#DC2626',
-    warning: '#D76C1F',
-    muted: '#515252',
-};
-const BadgeIcon = React.forwardRef(({ className, size, ...props }, ref) => {
-    const { size: parentSize, action: parentAction } = useStyleContext(SCOPE);
-    const { color = defaultColors[parentAction] } = props;
-    if (typeof size === 'number') {
-        return (<PrimitiveIcon ref={ref} {...props} color={color} className={badgeIconStyle({ class: className })} size={size}/>);
-    }
-    else if ((props?.height !== undefined || props?.width !== undefined) &&
-        size === undefined) {
-        return (<PrimitiveIcon ref={ref} {...props} color={color} className={badgeIconStyle({ class: className })}/>);
-    }
-    return (<PrimitiveIcon className={badgeIconStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            size,
-            class: className,
-        })} {...props} color={color} ref={ref}/>);
-});
-Badge.displayName = 'Badge';
-BadgeText.displayName = 'BadgeText';
-BadgeIcon.displayName = 'BadgeIcon';
-export { Badge, BadgeIcon, BadgeText };
diff --git a/universal/packages/components/ui/badge/index.tsx b/universal/packages/components/ui/badge/index.tsx
index 0130802f..6363a340 100644
--- a/universal/packages/components/ui/badge/index.tsx
+++ b/universal/packages/components/ui/badge/index.tsx
@@ -1,7 +1,7 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { Text, View } from 'react-native';
-import { Svg } from 'react-native-svg';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
@@ -42,7 +42,7 @@ const badgeTextStyle = tva({
       warning: 'text-warning-600',
       success: 'text-success-600',
       info: 'text-info-600',
-      muted: 'text-secondary-600',
+      muted: 'text-background-800',
     },
     size: {
       sm: 'text-2xs',
@@ -83,7 +83,7 @@ const badgeIconStyle = tva({
       warning: 'text-warning-600',
       success: 'text-success-600',
       info: 'text-info-600',
-      muted: 'text-secondary-600',
+      muted: 'text-background-800',
     },
     size: {
       sm: 'h-3 w-3',
@@ -93,74 +93,15 @@ const badgeIconStyle = tva({
   },
 });
 
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
-
 const ContextView = withStyleContext(View, SCOPE);
-cssInterop(ContextView, { className: 'style' });
-//@ts-ignore
+
 cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      //@ts-ignore
+      //@ts-expect-error
       fill: true,
       color: 'classNameColor',
       stroke: true,
@@ -172,7 +113,7 @@ type IBadgeProps = React.ComponentPropsWithoutRef<typeof ContextView> &
   VariantProps<typeof badgeStyle>;
 const Badge = ({
   children,
-  action = 'info',
+  action = 'muted',
   variant = 'solid',
   size = 'md',
   className,
@@ -223,14 +164,14 @@ type IBadgeIconProps = React.ComponentPropsWithoutRef<typeof PrimitiveIcon> &
   VariantProps<typeof badgeIconStyle>;
 
 const BadgeIcon = React.forwardRef<
-  React.ElementRef<typeof PrimitiveIcon>,
+  React.ElementRef<typeof UIIcon>,
   IBadgeIconProps
 >(({ className, size, ...props }, ref) => {
   const { size: parentSize, action: parentAction } = useStyleContext(SCOPE);
 
   if (typeof size === 'number') {
     return (
-      <PrimitiveIcon
+      <UIIcon
         ref={ref}
         {...props}
         className={badgeIconStyle({ class: className })}
@@ -238,11 +179,11 @@ const BadgeIcon = React.forwardRef<
       />
     );
   } else if (
-    (props.height !== undefined || props.width !== undefined) &&
+    (props?.height !== undefined || props?.width !== undefined) &&
     size === undefined
   ) {
     return (
-      <PrimitiveIcon
+      <UIIcon
         ref={ref}
         {...props}
         className={badgeIconStyle({ class: className })}
@@ -250,7 +191,7 @@ const BadgeIcon = React.forwardRef<
     );
   }
   return (
-    <PrimitiveIcon
+    <UIIcon
       className={badgeIconStyle({
         parentVariants: {
           size: parentSize,
diff --git a/universal/packages/components/ui/bottomsheet/index.tsx b/universal/packages/components/ui/bottomsheet/index.tsx
deleted file mode 100644
index d627f0ef..00000000
--- a/universal/packages/components/ui/bottomsheet/index.tsx
+++ /dev/null
@@ -1,294 +0,0 @@
-import GorhomBottomSheet, {
-  BottomSheetBackdrop as GorhomBottomSheetBackdrop,
-  BottomSheetView as GorhomBottomSheetView,
-  BottomSheetHandle,
-  BottomSheetTextInput as GorhomBottomSheetInput,
-  BottomSheetScrollView as GorhomBottomSheetScrollView,
-  BottomSheetFlatList as GorhomBottomSheetFlatList,
-  BottomSheetSectionList as GorhomBottomSheetSectionList,
-} from '@gorhom/bottom-sheet';
-import { Platform } from 'react-native';
-import type { PressableProps, TextProps } from 'react-native';
-import { FocusScope } from '@react-native-aria/focus';
-import React, {
-  createContext,
-  useCallback,
-  useContext,
-  useMemo,
-  useRef,
-  useState,
-} from 'react';
-import { Pressable, Text } from 'react-native';
-import { cssInterop } from 'nativewind';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-
-const bottomSheetBackdropStyle = tva({
-  base: 'absolute inset-0 flex-1 touch-none select-none bg-black opacity-0',
-});
-
-const bottomSheetContentStyle = tva({
-  base: 'mt-2',
-});
-const bottomSheetTriggerStyle = tva({
-  base: '',
-});
-
-const bottomSheetIndicatorStyle = tva({
-  base: 'py-1 w-full items-center rounded-t-lg ',
-});
-
-const bottomSheetItemStyle = tva({
-  base: 'p-3 flex-row items-center rounded-sm w-full disabled:opacity-0.4 web:pointer-events-auto disabled:cursor-not-allowed hover:bg-background-50 active:bg-background-100 focus:bg-background-100 web:focus-visible:bg-background-100',
-});
-
-const BottomSheetContext = createContext<{
-  visible: boolean;
-  bottomSheetRef: React.RefObject<GorhomBottomSheet>;
-  handleClose: () => void;
-  handleOpen: () => void;
-}>({
-  visible: false,
-  bottomSheetRef: { current: null },
-  handleClose: () => {},
-  handleOpen: () => {},
-});
-
-type IBottomSheetProps = React.ComponentProps<typeof GorhomBottomSheet>;
-export const BottomSheet = ({
-  snapToIndex = 1,
-  onOpen,
-  onClose,
-  ...props
-}: {
-  snapToIndex?: number;
-  children?: React.ReactNode;
-  onOpen?: () => void;
-  onClose?: () => void;
-}) => {
-  const bottomSheetRef = useRef<GorhomBottomSheet>(null);
-
-  const [visible, setVisible] = useState(false);
-
-  const handleOpen = useCallback(() => {
-    bottomSheetRef.current?.snapToIndex(snapToIndex);
-    setVisible(true);
-    onOpen && onOpen();
-  }, [onOpen, snapToIndex]);
-
-  const handleClose = useCallback(() => {
-    bottomSheetRef.current?.close();
-    setVisible(false);
-    onClose && onClose();
-  }, [onClose]);
-
-  return (
-    <BottomSheetContext.Provider
-      value={{
-        visible,
-        bottomSheetRef,
-        handleClose,
-        handleOpen,
-      }}
-    >
-      {props.children}
-    </BottomSheetContext.Provider>
-  );
-};
-
-export const BottomSheetPortal = ({
-  snapPoints,
-  handleComponent: DragIndicator,
-  backdropComponent: BackDrop,
-  ...props
-}: Partial<IBottomSheetProps> & {
-  defaultIsOpen?: boolean;
-  snapToIndex?: number;
-  snapPoints: string[];
-}) => {
-  const { bottomSheetRef, handleClose } = useContext(BottomSheetContext);
-
-  const handleSheetChanges = useCallback(
-    (index: number) => {
-      if (index === 0 || index === -1) {
-        handleClose();
-      }
-    },
-    [handleClose]
-  );
-
-  return (
-    <GorhomBottomSheet
-      ref={bottomSheetRef}
-      snapPoints={snapPoints}
-      index={-1}
-      backdropComponent={BackDrop}
-      onChange={handleSheetChanges}
-      handleComponent={DragIndicator}
-      enablePanDownToClose={true}
-      {...props}
-    >
-      {props.children}
-    </GorhomBottomSheet>
-  );
-};
-
-export const BottomSheetTrigger = ({
-  className,
-  ...props
-}: PressableProps & { className?: string }) => {
-  const { handleOpen } = useContext(BottomSheetContext);
-  return (
-    <Pressable
-      onPress={(e) => {
-        props.onPress && props.onPress(e);
-        handleOpen();
-      }}
-      {...props}
-      className={bottomSheetTriggerStyle({
-        className: className,
-      })}
-    >
-      {props.children}
-    </Pressable>
-  );
-};
-type IBottomSheetBackdrop = React.ComponentProps<
-  typeof GorhomBottomSheetBackdrop
->;
-
-export const BottomSheetBackdrop = ({
-  disappearsOnIndex = -1,
-  appearsOnIndex = 1,
-  className,
-  ...props
-}: Partial<IBottomSheetBackdrop> & { className?: string }) => {
-  return (
-    <GorhomBottomSheetBackdrop
-      // @ts-ignore
-      className={bottomSheetBackdropStyle({
-        className: className,
-      })}
-      disappearsOnIndex={disappearsOnIndex}
-      appearsOnIndex={appearsOnIndex}
-      {...props}
-    />
-  );
-};
-
-cssInterop(GorhomBottomSheetBackdrop, { className: 'style' });
-
-type IBottomSheetDragIndicator = React.ComponentProps<typeof BottomSheetHandle>;
-
-export const BottomSheetDragIndicator = ({
-  children,
-  className,
-  ...props
-}: Partial<IBottomSheetDragIndicator> & { className?: string }) => {
-  return (
-    <BottomSheetHandle
-      {...props}
-      // @ts-ignore
-      className={bottomSheetIndicatorStyle({
-        className: className,
-      })}
-    >
-      {children}
-    </BottomSheetHandle>
-  );
-};
-
-cssInterop(BottomSheetHandle, { className: 'style' });
-
-type IBottomSheetContent = React.ComponentProps<typeof GorhomBottomSheetView>;
-
-export const BottomSheetContent = ({ ...props }: IBottomSheetContent) => {
-  const { handleClose, visible } = useContext(BottomSheetContext);
-  const keyDownHandlers = useMemo(() => {
-    return Platform.OS === 'web'
-      ? {
-          onKeyDown: (e: React.KeyboardEvent) => {
-            if (e.key === 'Escape') {
-              e.preventDefault();
-              handleClose();
-              return;
-            }
-          },
-        }
-      : {};
-  }, [handleClose]);
-
-  if (Platform.OS === 'web')
-    return (
-      <GorhomBottomSheetView
-        {...props}
-        // @ts-ignore
-        {...keyDownHandlers}
-        className={bottomSheetContentStyle({
-          className: props.className,
-        })}
-      >
-        {visible && (
-          <FocusScope contain={visible} autoFocus={true} restoreFocus={true}>
-            {props.children}
-          </FocusScope>
-        )}
-      </GorhomBottomSheetView>
-    );
-
-  return (
-    <GorhomBottomSheetView
-      {...props}
-      // @ts-ignore
-      {...keyDownHandlers}
-      className={bottomSheetContentStyle({
-        className: props.className,
-      })}
-    >
-      {props.children}
-    </GorhomBottomSheetView>
-  );
-};
-
-cssInterop(GorhomBottomSheetView, { className: 'style' });
-
-export const BottomSheetItem = ({
-  children,
-  className,
-  closeOnSelect = true,
-  ...props
-}: PressableProps & {
-  closeOnSelect?: boolean;
-}) => {
-  const { handleClose } = useContext(BottomSheetContext);
-  return (
-    <Pressable
-      {...props}
-      className={bottomSheetItemStyle({
-        className: className,
-      })}
-      onPress={(e) => {
-        if (closeOnSelect) {
-          handleClose();
-        }
-        props.onPress && props.onPress(e);
-      }}
-      role="button"
-    >
-      {children}
-    </Pressable>
-  );
-};
-
-export const BottomSheetItemText = ({ ...props }: TextProps) => {
-  return <Text {...props} />;
-};
-
-export const BottomSheetScrollView = GorhomBottomSheetScrollView;
-export const BottomSheetFlatList = GorhomBottomSheetFlatList;
-export const BottomSheetSectionList = GorhomBottomSheetSectionList;
-export const BottomSheetTextInput = GorhomBottomSheetInput;
-
-cssInterop(GorhomBottomSheetInput, { className: 'style' });
-cssInterop(GorhomBottomSheetScrollView, { className: 'style' });
-cssInterop(GorhomBottomSheetFlatList, { className: 'style' });
-cssInterop(GorhomBottomSheetSectionList, { className: 'style' });
diff --git a/universal/packages/components/ui/box/index.d.ts b/universal/packages/components/ui/box/index.d.ts
deleted file mode 100644
index b7b41848..00000000
--- a/universal/packages/components/ui/box/index.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const Box: React.ForwardRefExoticComponent<import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "" | "flex flex-col relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "" | "flex flex-col relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<unknown>>;
-export { Box };
diff --git a/universal/packages/components/ui/box/index.jsx b/universal/packages/components/ui/box/index.jsx
deleted file mode 100644
index 84d89185..00000000
--- a/universal/packages/components/ui/box/index.jsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-import { View } from 'react-native';
-import { boxStyle } from './styles';
-const Box = React.forwardRef(({ className, ...props }, ref) => {
-    return (<View ref={ref} {...props} className={boxStyle({ class: className })}/>);
-});
-Box.displayName = 'Box';
-export { Box };
diff --git a/universal/packages/components/ui/box/index.web.d.ts b/universal/packages/components/ui/box/index.web.d.ts
deleted file mode 100644
index 20d836a5..00000000
--- a/universal/packages/components/ui/box/index.web.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import React from 'react';
-declare const Box: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export { Box };
diff --git a/universal/packages/components/ui/box/index.web.jsx b/universal/packages/components/ui/box/index.web.jsx
deleted file mode 100644
index 4e1f0a52..00000000
--- a/universal/packages/components/ui/box/index.web.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react';
-import { boxStyle } from './styles';
-const Box = React.forwardRef(({ className, ...props }, ref) => {
-    return (<div ref={ref} className={boxStyle({ class: className })} {...props}/>);
-});
-Box.displayName = 'Box';
-export { Box };
diff --git a/universal/packages/components/ui/box/styles.d.ts b/universal/packages/components/ui/box/styles.d.ts
deleted file mode 100644
index 25f0e7bc..00000000
--- a/universal/packages/components/ui/box/styles.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare const boxStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "" | "flex flex-col relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "" | "flex flex-col relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
diff --git a/universal/packages/components/ui/box/styles.jsx b/universal/packages/components/ui/box/styles.jsx
deleted file mode 100644
index 6ea8672a..00000000
--- a/universal/packages/components/ui/box/styles.jsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { isWeb } from '@gluestack-ui/nativewind-utils/IsWeb';
-const baseStyle = isWeb
-    ? 'flex flex-col relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none'
-    : '';
-export const boxStyle = tva({
-    base: baseStyle,
-});
diff --git a/universal/packages/components/ui/button/index.d.ts b/universal/packages/components/ui/button/index.d.ts
deleted file mode 100644
index 34fe48c4..00000000
--- a/universal/packages/components/ui/button/index.d.ts
+++ /dev/null
@@ -1,395 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { View } from 'react-native';
-declare const Button: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & Omit<React.RefAttributes<Omit<import("react-native").PressableProps & React.RefAttributes<View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>> & Omit<import("react-native").PressableProps & React.RefAttributes<View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown> & import("@gluestack-ui/button/lib/typescript/types").InterfaceButtonProps, "context"> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    action: {
-        primary: string;
-        secondary: string;
-        positive: string;
-        negative: string;
-        default: string;
-    };
-    variant: {
-        link: string;
-        outline: string;
-        solid: string;
-    };
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-    };
-} | ({
-    action: {
-        primary: string;
-        secondary: string;
-        positive: string;
-        negative: string;
-        default: string;
-    };
-    variant: {
-        link: string;
-        outline: string;
-        solid: string;
-    };
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-    };
-} & {
-    action: {
-        primary: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        secondary: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        positive: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        negative: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        default: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    variant: {
-        link: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        outline: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        solid: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "group/button rounded bg-primary-500 flex-row items-center justify-center data-[focus-visible=true]:web:outline-none data-[focus-visible=true]:web:ring-2 data-[disabled=true]:opacity-40", import("tailwind-variants/dist/config").TVConfig<{
-    action: {
-        primary: string;
-        secondary: string;
-        positive: string;
-        negative: string;
-        default: string;
-    };
-    variant: {
-        link: string;
-        outline: string;
-        solid: string;
-    };
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, {
-    action: {
-        primary: string;
-        secondary: string;
-        positive: string;
-        negative: string;
-        default: string;
-    };
-    variant: {
-        link: string;
-        outline: string;
-        solid: string;
-    };
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}>, {
-    action: {
-        primary: string;
-        secondary: string;
-        positive: string;
-        negative: string;
-        default: string;
-    };
-    variant: {
-        link: string;
-        outline: string;
-        solid: string;
-    };
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    action: {
-        primary: string;
-        secondary: string;
-        positive: string;
-        negative: string;
-        default: string;
-    };
-    variant: {
-        link: string;
-        outline: string;
-        solid: string;
-    };
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "group/button rounded bg-primary-500 flex-row items-center justify-center data-[focus-visible=true]:web:outline-none data-[focus-visible=true]:web:ring-2 data-[disabled=true]:opacity-40", import("tailwind-variants/dist/config").TVConfig<{
-    action: {
-        primary: string;
-        secondary: string;
-        positive: string;
-        negative: string;
-        default: string;
-    };
-    variant: {
-        link: string;
-        outline: string;
-        solid: string;
-    };
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, {
-    action: {
-        primary: string;
-        secondary: string;
-        positive: string;
-        negative: string;
-        default: string;
-    };
-    variant: {
-        link: string;
-        outline: string;
-        solid: string;
-    };
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const ButtonText: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").TextProps> & import("react-native").TextProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    action: {
-        primary: string;
-        secondary: string;
-        positive: string;
-        negative: string;
-    };
-    variant: {
-        link: string;
-        outline: string;
-        solid: string;
-    };
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "text-typography-0 font-semibold web:select-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "text-typography-0 font-semibold web:select-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const ButtonSpinner: React.ForwardRefExoticComponent<import("react-native").ActivityIndicatorProps & React.RefAttributes<import("react-native").ActivityIndicatorProps>>;
-declare const ButtonIcon: React.ForwardRefExoticComponent<Omit<React.RefAttributes<Omit<any, "ref"> & React.RefAttributes<unknown>> & Omit<any, "ref"> & React.RefAttributes<unknown> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    variant: {
-        link: string;
-        outline: string;
-        solid: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, undefined, import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, undefined, import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & {
-    className?: any;
-    fill?: string | undefined;
-    color?: string | undefined;
-    as?: any;
-}, "ref"> & React.RefAttributes<unknown>>;
-declare const ButtonGroup: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps & import("@gluestack-ui/button/lib/typescript/types").IButtonGroupProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    isAttached: {
-        true: string;
-    };
-} | ({
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    isAttached: {
-        true: string;
-    };
-} & {
-    space: {
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    isAttached: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "", import("tailwind-variants/dist/config").TVConfig<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    isAttached: {
-        true: string;
-    };
-}, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    isAttached: {
-        true: string;
-    };
-}>, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    isAttached: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    isAttached: {
-        true: string;
-    };
-}, undefined, "", import("tailwind-variants/dist/config").TVConfig<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    isAttached: {
-        true: string;
-    };
-}, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    isAttached: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Button, ButtonText, ButtonSpinner, ButtonIcon, ButtonGroup };
diff --git a/universal/packages/components/ui/button/index.jsx b/universal/packages/components/ui/button/index.jsx
deleted file mode 100644
index 2ea73994..00000000
--- a/universal/packages/components/ui/button/index.jsx
+++ /dev/null
@@ -1,252 +0,0 @@
-'use client';
-import React, { useMemo } from 'react';
-import { createButton } from '@gluestack-ui/button';
-import { Svg } from 'react-native-svg';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
-import { ActivityIndicator, Pressable, Text, View, Platform, } from 'react-native';
-const PrimitiveIcon = React.forwardRef(({ height, width, fill = 'none', color, size, as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} color={color} {...props}/>);
-});
-const SCOPE = 'BUTTON';
-const Root = Platform.OS === 'web'
-    ? withStyleContext(Pressable, SCOPE)
-    : withStyleContextAndStates(Pressable, SCOPE);
-const UIButton = createButton({
-    Root: Root,
-    Text,
-    Group: View,
-    Spinner: ActivityIndicator,
-    Icon: PrimitiveIcon,
-});
-cssInterop(UIButton, { className: 'style' });
-cssInterop(UIButton.Text, { className: 'style' });
-cssInterop(UIButton.Group, { className: 'style' });
-cssInterop(UIButton.Spinner, { className: 'style' });
-cssInterop(UIButton.Icon, {
-    className: {
-        target: 'style',
-        nativeStyleToProp: {
-            height: 'height',
-            width: 'width',
-            //@ts-ignore
-            fill: 'fill',
-            color: 'color',
-        },
-    },
-});
-const buttonStyle = tva({
-    base: 'group/button rounded bg-primary-500 flex-row items-center justify-center data-[focus-visible=true]:web:outline-none data-[focus-visible=true]:web:ring-2 data-[disabled=true]:opacity-40',
-    variants: {
-        action: {
-            primary: 'bg-primary-500 hover:bg-primary-600 active:bg-primary-700  border-primary-300 hover:border-primary-400 active:border-primary-500 data-[focus-visible=true]:web:ring-primary-300',
-            secondary: 'bg-secondary-500 border-secondary-300 hover:bg-secondary-600 hover:border-secondary-400 active:bg-secondary-700 active:border-secondary-500 data-[focus-visible=true]:web:ring-secondary-300',
-            positive: 'bg-success-500 border-success-300 hover:bg-success-600 hover:border-success-400 active:bg-success-700 active:border-success-500 data-[focus-visible=true]:web:ring-success-300',
-            negative: 'bg-error-500 border-error-300 hover:bg-error-600 hover:border-error-400 active:bg-error-700 active:border-error-500 data-[focus-visible=true]:web:ring-error-300',
-            default: 'bg-transparent hover:bg-background-50 active:bg-transparent',
-        },
-        variant: {
-            link: 'px-0',
-            outline: 'bg-transparent border hover:bg-background-50 active:bg-transparent',
-            solid: '',
-        },
-        size: {
-            xs: 'px-3.5 h-8',
-            sm: 'px-4 h-9',
-            md: 'px-5 h-10',
-            lg: 'px-6 h-11',
-        },
-    },
-    compoundVariants: [
-        {
-            action: 'primary',
-            variant: 'link',
-            class: 'px-0 bg-transparent hover:bg-transparent active:bg-transparent',
-        },
-        {
-            action: 'secondary',
-            variant: 'link',
-            class: 'px-0 bg-transparent hover:bg-transparent active:bg-transparent',
-        },
-        {
-            action: 'positive',
-            variant: 'link',
-            class: 'px-0 bg-transparent hover:bg-transparent active:bg-transparent',
-        },
-        {
-            action: 'negative',
-            variant: 'link',
-            class: 'px-0 bg-transparent hover:bg-transparent active:bg-transparent',
-        },
-        {
-            action: 'primary',
-            variant: 'outline',
-            class: 'bg-transparent hover:bg-background-50 active:bg-transparent',
-        },
-        {
-            action: 'secondary',
-            variant: 'outline',
-            class: 'bg-transparent hover:bg-background-50 active:bg-transparent',
-        },
-        {
-            action: 'positive',
-            variant: 'outline',
-            class: 'bg-transparent hover:bg-background-50 active:bg-transparent',
-        },
-        {
-            action: 'negative',
-            variant: 'outline',
-            class: 'bg-transparent hover:bg-background-50 active:bg-transparent',
-        },
-    ],
-});
-const buttonTextStyle = tva({
-    base: 'text-typography-0 font-semibold web:select-none',
-    parentVariants: {
-        action: {
-            primary: 'text-primary-600 group-hover/button:text-primary-600 group-active/button:text-primary-700',
-            secondary: 'text-secondary-600 group-hover/button:text-secondary-600 group-active/button:text-secondary-700',
-            positive: 'text-success-600 group-hover/button:text-success-600 group-active/button:text-success-700',
-            negative: 'text-error-600 group-hover/button:text-error-600 group-active/button:text-error-700',
-        },
-        variant: {
-            link: 'group-hover/button:underline group-active/button:underline',
-            outline: '',
-            solid: 'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
-        },
-        size: {
-            xs: 'text-xs',
-            sm: 'text-sm',
-            md: 'text-base',
-            lg: 'text-lg',
-        },
-    },
-    parentCompoundVariants: [
-        {
-            variant: 'solid',
-            action: 'primary',
-            class: 'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
-        },
-        {
-            variant: 'solid',
-            action: 'secondary',
-            class: 'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
-        },
-        {
-            variant: 'solid',
-            action: 'positive',
-            class: 'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
-        },
-        {
-            variant: 'solid',
-            action: 'negative',
-            class: 'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
-        },
-    ],
-});
-const buttonIconStyle = tva({
-    parentVariants: {
-        variant: {
-            link: 'group-hover/button:underline group-active/button:underline',
-            outline: '',
-            solid: '',
-        },
-        size: {
-            '2xs': 'h-3 w-3',
-            'xs': 'h-3.5 w-3.5',
-            'sm': 'h-4 w-4',
-            'md': 'h-[18px] w-[18px]',
-            'lg': 'h-5 w-5',
-            'xl': 'h-6 w-6',
-        },
-    },
-});
-const buttonGroupStyle = tva({
-    base: '',
-    variants: {
-        space: {
-            'xs': 'gap-1',
-            'sm': 'gap-2',
-            'md': 'gap-3',
-            'lg': 'gap-4',
-            'xl': 'gap-5',
-            '2xl': 'gap-6',
-            '3xl': 'gap-7',
-            '4xl': 'gap-8',
-        },
-        isAttached: {
-            true: 'gap-0',
-        },
-    },
-});
-const Button = React.forwardRef(({ className, variant = 'solid', size = 'md', action = 'primary', ...props }, ref) => {
-    return (<UIButton ref={ref} {...props} className={buttonStyle({ variant, size, action, class: className })} context={{ variant, size, action }}/>);
-});
-const ButtonText = React.forwardRef(({ className, variant, size, action, ...props }, ref) => {
-    const { variant: parentVariant, size: parentSize, action: parentAction, } = useStyleContext(SCOPE);
-    return (<UIButton.Text ref={ref} {...props} 
-    // @ts-ignore
-    className={buttonTextStyle({
-            parentVariants: {
-                variant: parentVariant,
-                size: parentSize,
-                action: parentAction,
-            },
-            variant,
-            size,
-            action,
-            class: className,
-        })}/>);
-});
-const ButtonSpinner = UIButton.Spinner;
-const defaultColors = {
-    primary: '#292929',
-    secondary: '#515252',
-    positive: '#2A7948',
-    negative: '#DC2626',
-};
-const ButtonIcon = React.forwardRef(({ className, size, ...props }, ref) => {
-    const { variant: parentVariant, size: parentSize, action: parentAction, } = useStyleContext(SCOPE);
-    let localColor;
-    if (parentVariant !== 'solid') {
-        localColor = defaultColors[parentAction];
-    }
-    else {
-        localColor = 'gray';
-    }
-    const { color = localColor } = props;
-    if (typeof size === 'number') {
-        return (<UIButton.Icon ref={ref} {...props} color={color} className={buttonIconStyle({ class: className })} size={size}/>);
-    }
-    else if ((props.height !== undefined || props.width !== undefined) &&
-        size === undefined) {
-        return (<UIButton.Icon ref={ref} {...props} color={color} className={buttonIconStyle({ class: className })}/>);
-    }
-    return (<UIButton.Icon {...props} 
-    //@ts-ignore
-    className={buttonIconStyle({
-            parentVariants: {
-                size: parentSize,
-                variant: parentVariant,
-            },
-            size,
-            class: className,
-        })} color={color} ref={ref}/>);
-});
-const ButtonGroup = React.forwardRef(({ className, space = 'md', isAttached = false, ...props }, ref) => {
-    return (<UIButton.Group className={buttonGroupStyle({ class: className, space, isAttached })} {...props} ref={ref}/>);
-});
-Button.displayName = 'Button';
-ButtonText.displayName = 'ButtonText';
-ButtonSpinner.displayName = 'ButtonSpinner';
-ButtonIcon.displayName = 'ButtonIcon';
-ButtonGroup.displayName = 'ButtonGroup';
-export { Button, ButtonText, ButtonSpinner, ButtonIcon, ButtonGroup };
diff --git a/universal/packages/components/ui/button/index.tsx b/universal/packages/components/ui/button/index.tsx
index 8000ba10..7d7802ee 100644
--- a/universal/packages/components/ui/button/index.tsx
+++ b/universal/packages/components/ui/button/index.tsx
@@ -1,257 +1,296 @@
-'use client';
-import React, { useMemo } from 'react';
-import { createButton } from '@gluestack-ui/button';
-import { Svg } from 'react-native-svg';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
+"use client";
+import React from "react";
+import { createButton } from "@gluestack-ui/button";
+import { tva } from "@gluestack-ui/nativewind-utils/tva";
 import {
   withStyleContext,
   useStyleContext,
-} from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+} from "@gluestack-ui/nativewind-utils/withStyleContext";
+import { cssInterop } from "nativewind";
+import { ActivityIndicator, Pressable, Text, View } from "react-native";
+import type { VariantProps } from "@gluestack-ui/nativewind-utils";
+import { PrimitiveIcon, UIIcon } from "@gluestack-ui/icon";
 
-import {
-  ActivityIndicator,
-  Pressable,
-  Text,
-  View,
-  Platform,
-} from 'react-native';
-
-const PrimitiveIcon = React.forwardRef(
-  (
-    { height, width, fill = 'none', color, size, as: AsComp, ...props }: any,
-    ref?: any
-  ) => {
-    const sizeProps = useMemo(() => {
-      return size ? { size } : { height, width };
-    }, [size, height, width]);
-
-    if (AsComp) {
-      return (
-        <AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps} />
-      );
-    }
-    return (
-      <Svg
-        ref={ref}
-        height={height}
-        width={width}
-        fill={fill}
-        color={color}
-        {...props}
-      />
-    );
-  }
-);
+const SCOPE = "BUTTON";
 
-const SCOPE = 'BUTTON';
-const Root =
-  Platform.OS === 'web'
-    ? withStyleContext(Pressable, SCOPE)
-    : withStyleContextAndStates(Pressable, SCOPE);
+const Root = withStyleContext(Pressable, SCOPE);
 
 const UIButton = createButton({
   Root: Root,
   Text,
   Group: View,
   Spinner: ActivityIndicator,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
 });
 
-cssInterop(UIButton, { className: 'style' });
-cssInterop(UIButton.Text, { className: 'style' });
-cssInterop(UIButton.Group, { className: 'style' });
-cssInterop(UIButton.Spinner, { className: 'style' });
-cssInterop(UIButton.Icon, {
+cssInterop(PrimitiveIcon, {
   className: {
-    target: 'style',
+    target: "style",
     nativeStyleToProp: {
-      height: 'height',
-      width: 'width',
-      //@ts-ignore
-      fill: 'fill',
-      color: 'color',
+      height: true,
+      width: true,
+      fill: true,
+      color: "classNameColor",
+      stroke: true,
     },
   },
 });
 
 const buttonStyle = tva({
-  base: 'group/button rounded bg-primary-500 flex-row items-center justify-center data-[focus-visible=true]:web:outline-none data-[focus-visible=true]:web:ring-2 data-[disabled=true]:opacity-40',
+  base: "group/button rounded bg-primary-500 flex-row items-center justify-center data-[focus-visible=true]:web:outline-none data-[focus-visible=true]:web:ring-2 data-[disabled=true]:opacity-40 gap-2",
   variants: {
     action: {
       primary:
-        'bg-primary-500 hover:bg-primary-600 active:bg-primary-700  border-primary-300 hover:border-primary-400 active:border-primary-500 data-[focus-visible=true]:web:ring-primary-300',
+        "bg-primary-500 data-[hover=true]:bg-primary-600 data-[active=true]:bg-primary-700 border-primary-300 data-[hover=true]:border-primary-400 data-[active=true]:border-primary-500 data-[focus-visible=true]:web:ring-indicator-info",
       secondary:
-        'bg-secondary-500 border-secondary-300 hover:bg-secondary-600 hover:border-secondary-400 active:bg-secondary-700 active:border-secondary-500 data-[focus-visible=true]:web:ring-secondary-300',
+        "bg-secondary-500 border-secondary-300 data-[hover=true]:bg-secondary-600 data-[hover=true]:border-secondary-400 data-[active=true]:bg-secondary-700 data-[active=true]:border-secondary-700 data-[focus-visible=true]:web:ring-indicator-info",
       positive:
-        'bg-success-500 border-success-300 hover:bg-success-600 hover:border-success-400 active:bg-success-700 active:border-success-500 data-[focus-visible=true]:web:ring-success-300',
+        "bg-success-500 border-success-300 data-[hover=true]:bg-success-600 data-[hover=true]:border-success-400 data-[active=true]:bg-success-700 data-[active=true]:border-success-500 data-[focus-visible=true]:web:ring-indicator-info",
       negative:
-        'bg-error-500 border-error-300 hover:bg-error-600 hover:border-error-400 active:bg-error-700 active:border-error-500 data-[focus-visible=true]:web:ring-error-300',
-      default: 'bg-transparent hover:bg-background-50 active:bg-transparent',
+        "bg-error-500 border-error-300 data-[hover=true]:bg-error-600 data-[hover=true]:border-error-400 data-[active=true]:bg-error-700 data-[active=true]:border-error-500 data-[focus-visible=true]:web:ring-indicator-info",
+      default:
+        "bg-transparent data-[hover=true]:bg-background-50 data-[active=true]:bg-transparent",
     },
     variant: {
-      link: 'px-0',
+      link: "px-0",
       outline:
-        'bg-transparent border hover:bg-background-50 active:bg-transparent',
-      solid: '',
+        "bg-transparent border data-[hover=true]:bg-background-50 data-[active=true]:bg-transparent",
+      solid: "",
     },
 
     size: {
-      xs: 'px-3.5 h-8',
-      sm: 'px-4 h-9',
-      md: 'px-5 h-10',
-      lg: 'px-6 h-11',
+      xs: "px-3.5 h-8",
+      sm: "px-4 h-9",
+      md: "px-5 h-10",
+      lg: "px-6 h-11",
+      xl: "px-7 h-12",
     },
   },
   compoundVariants: [
     {
-      action: 'primary',
-      variant: 'link',
-      class: 'px-0 bg-transparent hover:bg-transparent active:bg-transparent',
+      action: "primary",
+      variant: "link",
+      class:
+        "px-0 bg-transparent data-[hover=true]:bg-transparent data-[active=true]:bg-transparent",
     },
     {
-      action: 'secondary',
-      variant: 'link',
-      class: 'px-0 bg-transparent hover:bg-transparent active:bg-transparent',
+      action: "secondary",
+      variant: "link",
+      class:
+        "px-0 bg-transparent data-[hover=true]:bg-transparent data-[active=true]:bg-transparent",
     },
     {
-      action: 'positive',
-      variant: 'link',
-      class: 'px-0 bg-transparent hover:bg-transparent active:bg-transparent',
+      action: "positive",
+      variant: "link",
+      class:
+        "px-0 bg-transparent data-[hover=true]:bg-transparent data-[active=true]:bg-transparent",
     },
     {
-      action: 'negative',
-      variant: 'link',
-      class: 'px-0 bg-transparent hover:bg-transparent active:bg-transparent',
+      action: "negative",
+      variant: "link",
+      class:
+        "px-0 bg-transparent data-[hover=true]:bg-transparent data-[active=true]:bg-transparent",
     },
     {
-      action: 'primary',
-      variant: 'outline',
-      class: 'bg-transparent hover:bg-background-50 active:bg-transparent',
+      action: "primary",
+      variant: "outline",
+      class:
+        "bg-transparent data-[hover=true]:bg-background-50 data-[active=true]:bg-transparent",
     },
     {
-      action: 'secondary',
-      variant: 'outline',
-      class: 'bg-transparent hover:bg-background-50 active:bg-transparent',
+      action: "secondary",
+      variant: "outline",
+      class:
+        "bg-transparent data-[hover=true]:bg-background-50 data-[active=true]:bg-transparent",
     },
     {
-      action: 'positive',
-      variant: 'outline',
-      class: 'bg-transparent hover:bg-background-50 active:bg-transparent',
+      action: "positive",
+      variant: "outline",
+      class:
+        "bg-transparent data-[hover=true]:bg-background-50 data-[active=true]:bg-transparent",
     },
     {
-      action: 'negative',
-      variant: 'outline',
-      class: 'bg-transparent hover:bg-background-50 active:bg-transparent',
+      action: "negative",
+      variant: "outline",
+      class:
+        "bg-transparent data-[hover=true]:bg-background-50 data-[active=true]:bg-transparent",
     },
   ],
 });
 
 const buttonTextStyle = tva({
-  base: 'text-typography-0 font-semibold web:select-none',
+  base: "text-typography-0 font-semibold web:select-none",
   parentVariants: {
     action: {
       primary:
-        'text-primary-600 group-hover/button:text-primary-600 group-active/button:text-primary-700',
+        "text-primary-600 data-[hover=true]:text-primary-600 data-[active=true]:text-primary-700",
       secondary:
-        'text-secondary-600 group-hover/button:text-secondary-600 group-active/button:text-secondary-700',
+        "text-typography-500 data-[hover=true]:text-typography-600 data-[active=true]:text-typography-700",
       positive:
-        'text-success-600 group-hover/button:text-success-600 group-active/button:text-success-700',
+        "text-success-600 data-[hover=true]:text-success-600 data-[active=true]:text-success-700",
       negative:
-        'text-error-600 group-hover/button:text-error-600 group-active/button:text-error-700',
+        "text-error-600 data-[hover=true]:text-error-600 data-[active=true]:text-error-700",
     },
     variant: {
-      link: 'group-hover/button:underline group-active/button:underline',
-      outline: '',
+      link: "data-[hover=true]:underline data-[active=true]:underline",
+      outline: "",
       solid:
-        'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
     },
     size: {
-      xs: 'text-xs',
-      sm: 'text-sm',
-      md: 'text-base',
-      lg: 'text-lg',
+      xs: "text-xs",
+      sm: "text-sm",
+      md: "text-base",
+      lg: "text-lg",
+      xl: "text-xl",
     },
   },
   parentCompoundVariants: [
     {
-      variant: 'solid',
-      action: 'primary',
+      variant: "solid",
+      action: "primary",
+      class:
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
+    },
+    {
+      variant: "solid",
+      action: "secondary",
       class:
-        'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
+        "text-typography-800 data-[hover=true]:text-typography-800 data-[active=true]:text-typography-800",
     },
     {
-      variant: 'solid',
-      action: 'secondary',
+      variant: "solid",
+      action: "positive",
       class:
-        'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
     },
     {
-      variant: 'solid',
-      action: 'positive',
+      variant: "solid",
+      action: "negative",
       class:
-        'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
     },
     {
-      variant: 'solid',
-      action: 'negative',
+      variant: "outline",
+      action: "primary",
       class:
-        'text-typography-0 group-hover/button:text-typography-0 group-active/button:text-typography-0',
+        "text-primary-500 data-[hover=true]:text-primary-500 data-[active=true]:text-primary-500",
+    },
+    {
+      variant: "outline",
+      action: "secondary",
+      class:
+        "text-typography-500 data-[hover=true]:text-primary-600 data-[active=true]:text-typography-700",
+    },
+    {
+      variant: "outline",
+      action: "positive",
+      class:
+        "text-primary-500 data-[hover=true]:text-primary-500 data-[active=true]:text-primary-500",
+    },
+    {
+      variant: "outline",
+      action: "negative",
+      class:
+        "text-primary-500 data-[hover=true]:text-primary-500 data-[active=true]:text-primary-500",
     },
   ],
 });
 
 const buttonIconStyle = tva({
+  base: "fill-none",
   parentVariants: {
     variant: {
-      link: 'group-hover/button:underline group-active/button:underline',
-      outline: '',
-      solid: '',
+      link: "data-[hover=true]:underline data-[active=true]:underline",
+      outline: "",
+      solid:
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
     },
     size: {
-      '2xs': 'h-3 w-3',
-      'xs': 'h-3.5 w-3.5',
-      'sm': 'h-4 w-4',
-      'md': 'h-[18px] w-[18px]',
-      'lg': 'h-5 w-5',
-      'xl': 'h-6 w-6',
+      xs: "h-3.5 w-3.5",
+      sm: "h-4 w-4",
+      md: "h-[18px] w-[18px]",
+      lg: "h-[18px] w-[18px]",
+      xl: "h-5 w-5",
+    },
+    action: {
+      primary:
+        "text-primary-600 data-[hover=true]:text-primary-600 data-[active=true]:text-primary-700",
+      secondary:
+        "text-typography-500 data-[hover=true]:text-typography-600 data-[active=true]:text-typography-700",
+      positive:
+        "text-success-600 data-[hover=true]:text-success-600 data-[active=true]:text-success-700",
+
+      negative:
+        "text-error-600 data-[hover=true]:text-error-600 data-[active=true]:text-error-700",
     },
   },
+  parentCompoundVariants: [
+    {
+      variant: "solid",
+      action: "primary",
+      class:
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
+    },
+    {
+      variant: "solid",
+      action: "secondary",
+      class:
+        "text-typography-800 data-[hover=true]:text-typography-800 data-[active=true]:text-typography-800",
+    },
+    {
+      variant: "solid",
+      action: "positive",
+      class:
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
+    },
+    {
+      variant: "solid",
+      action: "negative",
+      class:
+        "text-typography-0 data-[hover=true]:text-typography-0 data-[active=true]:text-typography-0",
+    },
+  ],
 });
 
 const buttonGroupStyle = tva({
-  base: '',
+  base: "",
   variants: {
     space: {
-      'xs': 'gap-1',
-      'sm': 'gap-2',
-      'md': 'gap-3',
-      'lg': 'gap-4',
-      'xl': 'gap-5',
-      '2xl': 'gap-6',
-      '3xl': 'gap-7',
-      '4xl': 'gap-8',
+      xs: "gap-1",
+      sm: "gap-2",
+      md: "gap-3",
+      lg: "gap-4",
+      xl: "gap-5",
+      "2xl": "gap-6",
+      "3xl": "gap-7",
+      "4xl": "gap-8",
     },
     isAttached: {
-      true: 'gap-0',
+      true: "gap-0",
+    },
+    flexDirection: {
+      row: "flex-row",
+      column: "flex-col",
+      "row-reverse": "flex-row-reverse",
+      "column-reverse": "flex-col-reverse",
     },
   },
 });
 
-type IButtonProps = Omit<React.ComponentProps<typeof UIButton>, 'context'> &
-  VariantProps<typeof buttonStyle>;
-const Button = React.forwardRef(
+type IButtonProps = Omit<
+  React.ComponentPropsWithoutRef<typeof UIButton>,
+  "context"
+> &
+  VariantProps<typeof buttonStyle> & { className?: string };
+
+const Button = React.forwardRef<
+  React.ElementRef<typeof UIButton>,
+  IButtonProps
+>(
   (
-    {
-      className,
-      variant = 'solid',
-      size = 'md',
-      action = 'primary',
-      ...props
-    }: { className?: string } & IButtonProps,
-    ref?: any
+    { className, variant = "solid", size = "md", action = "primary", ...props },
+    ref
   ) => {
     return (
       <UIButton
@@ -264,147 +303,121 @@ const Button = React.forwardRef(
   }
 );
 
-type IButtonTextProps = React.ComponentProps<typeof UIButton.Text> &
-  VariantProps<typeof buttonTextStyle>;
-const ButtonText = React.forwardRef(
-  (
-    {
-      className,
-      variant,
-      size,
-      action,
-      ...props
-    }: { className?: string } & IButtonTextProps,
-    ref?: any
-  ) => {
-    const {
-      variant: parentVariant,
-      size: parentSize,
-      action: parentAction,
-    } = useStyleContext(SCOPE);
+type IButtonTextProps = React.ComponentPropsWithoutRef<typeof UIButton.Text> &
+  VariantProps<typeof buttonTextStyle> & { className?: string };
 
-    return (
-      <UIButton.Text
-        ref={ref}
-        {...props}
-        // @ts-ignore
-        className={buttonTextStyle({
-          parentVariants: {
-            variant: parentVariant,
-            size: parentSize,
-            action: parentAction,
-          },
-          variant,
-          size,
-          action,
-          class: className,
-        })}
-      />
-    );
-  }
-);
+const ButtonText = React.forwardRef<
+  React.ElementRef<typeof UIButton.Text>,
+  IButtonTextProps
+>(({ className, variant, size, action, ...props }, ref) => {
+  const {
+    variant: parentVariant,
+    size: parentSize,
+    action: parentAction,
+  } = useStyleContext(SCOPE);
+
+  return (
+    <UIButton.Text
+      ref={ref}
+      {...props}
+      className={buttonTextStyle({
+        parentVariants: {
+          variant: parentVariant,
+          size: parentSize,
+          action: parentAction,
+        },
+        variant,
+        size,
+        action,
+        class: className,
+      })}
+    />
+  );
+});
 
 const ButtonSpinner = UIButton.Spinner;
 
-interface DefaultColors {
-  primary: string;
-  secondary: string;
-  positive: string;
-  negative: string;
-}
-const defaultColors: DefaultColors = {
-  primary: '#292929',
-  secondary: '#515252',
-  positive: '#2A7948',
-  negative: '#DC2626',
-};
-type IButtonIcon = React.ComponentProps<typeof UIButton.Icon> &
-  VariantProps<typeof buttonIconStyle>;
-const ButtonIcon = React.forwardRef(
-  (
-    {
-      className,
-      size,
-      ...props
-    }: IButtonIcon & {
-      className?: any;
-      fill?: string;
-      color?: string;
-      as?: any;
-    },
-    ref?: any
-  ) => {
-    const {
-      variant: parentVariant,
-      size: parentSize,
-      action: parentAction,
-    } = useStyleContext(SCOPE);
+type IButtonIcon = React.ComponentPropsWithoutRef<typeof UIButton.Icon> &
+  VariantProps<typeof buttonIconStyle> & {
+    className?: string | undefined;
+    as?: React.ElementType;
+    height?: number;
+    width?: number;
+  };
 
-    let localColor;
-    if (parentVariant !== 'solid') {
-      localColor = defaultColors[parentAction as keyof DefaultColors];
-    } else {
-      localColor = 'gray';
-    }
-    const { color = localColor } = props;
+const ButtonIcon = React.forwardRef<
+  React.ElementRef<typeof UIButton.Icon>,
+  IButtonIcon
+>(({ className, size, ...props }, ref) => {
+  const {
+    variant: parentVariant,
+    size: parentSize,
+    action: parentAction,
+  } = useStyleContext(SCOPE);
 
-    if (typeof size === 'number') {
-      return (
-        <UIButton.Icon
-          ref={ref}
-          {...props}
-          color={color}
-          className={buttonIconStyle({ class: className })}
-          size={size}
-        />
-      );
-    } else if (
-      (props.height !== undefined || props.width !== undefined) &&
-      size === undefined
-    ) {
-      return (
-        <UIButton.Icon
-          ref={ref}
-          {...props}
-          color={color}
-          className={buttonIconStyle({ class: className })}
-        />
-      );
-    }
+  if (typeof size === "number") {
     return (
       <UIButton.Icon
+        ref={ref}
         {...props}
-        //@ts-ignore
-        className={buttonIconStyle({
-          parentVariants: {
-            size: parentSize,
-            variant: parentVariant,
-          },
-          size,
-          class: className,
-        })}
-        color={color}
+        className={buttonIconStyle({ class: className })}
+        size={size}
+      />
+    );
+  } else if (
+    (props?.height !== undefined || props?.width !== undefined) &&
+    size === undefined
+  ) {
+    return (
+      <UIButton.Icon
         ref={ref}
+        {...props}
+        className={buttonIconStyle({ class: className })}
       />
     );
   }
-);
+  return (
+    <UIButton.Icon
+      {...props}
+      className={buttonIconStyle({
+        parentVariants: {
+          size: parentSize,
+          variant: parentVariant,
+          action: parentAction,
+        },
+        size,
+        class: className,
+      })}
+      ref={ref}
+    />
+  );
+});
 
-type IButtonGroupProps = React.ComponentProps<typeof UIButton.Group> &
+type IButtonGroupProps = React.ComponentPropsWithoutRef<typeof UIButton.Group> &
   VariantProps<typeof buttonGroupStyle>;
-const ButtonGroup = React.forwardRef(
+
+const ButtonGroup = React.forwardRef<
+  React.ElementRef<typeof UIButton.Group>,
+  IButtonGroupProps
+>(
   (
     {
       className,
-      space = 'md',
+      space = "md",
       isAttached = false,
+      flexDirection = "column",
       ...props
-    }: { className?: string } & IButtonGroupProps,
-    ref?: any
+    },
+    ref
   ) => {
     return (
       <UIButton.Group
-        className={buttonGroupStyle({ class: className, space, isAttached })}
+        className={buttonGroupStyle({
+          class: className,
+          space,
+          isAttached,
+          flexDirection,
+        })}
         {...props}
         ref={ref}
       />
@@ -412,10 +425,10 @@ const ButtonGroup = React.forwardRef(
   }
 );
 
-Button.displayName = 'Button';
-ButtonText.displayName = 'ButtonText';
-ButtonSpinner.displayName = 'ButtonSpinner';
-ButtonIcon.displayName = 'ButtonIcon';
-ButtonGroup.displayName = 'ButtonGroup';
+Button.displayName = "Button";
+ButtonText.displayName = "ButtonText";
+ButtonSpinner.displayName = "ButtonSpinner";
+ButtonIcon.displayName = "ButtonIcon";
+ButtonGroup.displayName = "ButtonGroup";
 
 export { Button, ButtonText, ButtonSpinner, ButtonIcon, ButtonGroup };
diff --git a/universal/packages/components/ui/card/index.d.ts b/universal/packages/components/ui/card/index.d.ts
deleted file mode 100644
index 9792bf57..00000000
--- a/universal/packages/components/ui/card/index.d.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const Card: React.ForwardRefExoticComponent<import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-} | ({
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-} & {
-    size: {
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    variant: {
-        elevated: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        outline: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        ghost: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        filled: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "" | "flex flex-col relative z-0", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-}, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-}>, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-}, undefined, "" | "flex flex-col relative z-0", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-}, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-}>, unknown, unknown, undefined>>> & React.RefAttributes<unknown>>;
-export { Card };
diff --git a/universal/packages/components/ui/card/index.jsx b/universal/packages/components/ui/card/index.jsx
deleted file mode 100644
index 2765af8d..00000000
--- a/universal/packages/components/ui/card/index.jsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-import { View } from 'react-native';
-import { cardStyle } from './styles';
-const Card = React.forwardRef(({ className, size = 'md', variant = 'elevated', ...props }, ref) => {
-    return (<View className={cardStyle({ size, variant, class: className })} {...props} ref={ref}/>);
-});
-Card.displayName = 'Card';
-export { Card };
diff --git a/universal/packages/components/ui/card/index.web.d.ts b/universal/packages/components/ui/card/index.web.d.ts
deleted file mode 100644
index 4e56f58b..00000000
--- a/universal/packages/components/ui/card/index.web.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare const Card: {
-    ({ className, size, variant, ...props }: any): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-export { Card };
diff --git a/universal/packages/components/ui/card/index.web.jsx b/universal/packages/components/ui/card/index.web.jsx
deleted file mode 100644
index 4ee62861..00000000
--- a/universal/packages/components/ui/card/index.web.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import 'react';
-import { cardStyle } from './styles';
-const Card = ({ className, size = 'md', variant = 'elevated', ...props }) => {
-    return (<div className={cardStyle({ size, variant, class: className })} {...props}/>);
-};
-Card.displayName = 'Card';
-export { Card };
diff --git a/universal/packages/components/ui/card/styles.d.ts b/universal/packages/components/ui/card/styles.d.ts
deleted file mode 100644
index 2b638673..00000000
--- a/universal/packages/components/ui/card/styles.d.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-export declare const cardStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-} | ({
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-} & {
-    size: {
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    variant: {
-        elevated: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        outline: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        ghost: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        filled: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "" | "flex flex-col relative z-0", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-}, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-}>, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-}, undefined, "" | "flex flex-col relative z-0", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-}, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    variant: {
-        elevated: string;
-        outline: string;
-        ghost: string;
-        filled: string;
-    };
-}>, unknown, unknown, undefined>>;
diff --git a/universal/packages/components/ui/card/styles.jsx b/universal/packages/components/ui/card/styles.jsx
deleted file mode 100644
index 597a0cdb..00000000
--- a/universal/packages/components/ui/card/styles.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { isWeb } from '@gluestack-ui/nativewind-utils/IsWeb';
-const baseStyle = isWeb ? 'flex flex-col relative z-0' : '';
-export const cardStyle = tva({
-    base: baseStyle,
-    variants: {
-        size: {
-            sm: 'p-3 rounded',
-            md: 'p-4 rounded-md',
-            lg: 'p-6 rounded-xl',
-        },
-        variant: {
-            elevated: 'bg-background-0',
-            outline: 'border border-outline-200 ',
-            ghost: 'rounded-none',
-            filled: 'bg-background-50',
-        },
-    },
-});
diff --git a/universal/packages/components/ui/center/index.d.ts b/universal/packages/components/ui/center/index.d.ts
deleted file mode 100644
index fe6fbde7..00000000
--- a/universal/packages/components/ui/center/index.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare const Center: {
-    ({ className, ...props }: any): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-export { Center };
diff --git a/universal/packages/components/ui/center/index.jsx b/universal/packages/components/ui/center/index.jsx
deleted file mode 100644
index aa422436..00000000
--- a/universal/packages/components/ui/center/index.jsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { View } from 'react-native';
-import 'react';
-import { centerStyle } from './styles';
-const Center = ({ className, ...props }) => {
-    return <View className={centerStyle({ class: className })} {...props}/>;
-};
-Center.displayName = 'Center';
-export { Center };
diff --git a/universal/packages/components/ui/center/index.web.d.ts b/universal/packages/components/ui/center/index.web.d.ts
deleted file mode 100644
index fe6fbde7..00000000
--- a/universal/packages/components/ui/center/index.web.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare const Center: {
-    ({ className, ...props }: any): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-export { Center };
diff --git a/universal/packages/components/ui/center/index.web.jsx b/universal/packages/components/ui/center/index.web.jsx
deleted file mode 100644
index e1cc2021..00000000
--- a/universal/packages/components/ui/center/index.web.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import 'react';
-import { centerStyle } from './styles';
-const Center = ({ className, ...props }) => {
-    return <div className={centerStyle({ class: className })} {...props}/>;
-};
-Center.displayName = 'Center';
-export { Center };
diff --git a/universal/packages/components/ui/center/styles.d.ts b/universal/packages/components/ui/center/styles.d.ts
deleted file mode 100644
index dca9fecc..00000000
--- a/universal/packages/components/ui/center/styles.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare const centerStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "justify-center items-center " | "justify-center items-center flex flex-col relative z-0", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "justify-center items-center " | "justify-center items-center flex flex-col relative z-0", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
diff --git a/universal/packages/components/ui/center/styles.jsx b/universal/packages/components/ui/center/styles.jsx
deleted file mode 100644
index 25bc089f..00000000
--- a/universal/packages/components/ui/center/styles.jsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { isWeb } from '@gluestack-ui/nativewind-utils/IsWeb';
-const baseStyle = isWeb ? 'flex flex-col relative z-0' : '';
-export const centerStyle = tva({
-    base: `justify-center items-center ${baseStyle}`,
-});
diff --git a/universal/packages/components/ui/checkbox/index.d.ts b/universal/packages/components/ui/checkbox/index.d.ts
deleted file mode 100644
index 961f1559..00000000
--- a/universal/packages/components/ui/checkbox/index.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const CheckboxGroup: React.ForwardRefExoticComponent<React.RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps & import("@gluestack-ui/checkbox/lib/typescript/types").ICheckboxGroup>;
-declare const Checkbox: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-    size?: string | undefined;
-} & React.RefAttributes<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>> & import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown> & import("@gluestack-ui/checkbox/lib/typescript/types").InterfaceCheckbox & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "group/checkbox flex-row items-center justify-start gap-2 web:cursor-pointer data-[disabled=true]:cursor-not-allowed", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "group/checkbox flex-row items-center justify-start gap-2 web:cursor-pointer data-[disabled=true]:cursor-not-allowed", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const CheckboxIndicator: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        lg: string;
-        md: string;
-        sm: string;
-    };
-}, undefined, "justify-center items-center border-outline-400 bg-transparent rounded web:data-[focus-visible=true]:outline-none web:data-[focus-visible=true]:ring-2 web:data-[focus-visible=true]:ring-primary-700 data-[checked=true]:bg-primary-600 data-[checked=true]:border-primary-600 group-hover/checkbox:data-[checked=false]:border-outline-500 group-hover/checkbox:bg-transparent group-hover/checkbox:data-[invalid=true]:border-error-700 group-hover/checkbox:data-[checked=true]:bg-primary-700 group-hover/checkbox:data-[checked=true]:border-primary-700 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:border-primary-600 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:bg-primary-600 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:opacity-40 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:data-[invalid=true]:border-error-700 group-hover/checkbox:data-[disabled=true]:border-outline-400 group-hover/checkbox:data-[disabled=true]:data-[invalid=true]:border-error-700 active:data-[checked=true]:bg-primary-800 active:data-[checked=true]:border-primary-800 data-[invalid=true]:border-error-700 data-[disabled=true]:opacity-40", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "justify-center items-center border-outline-400 bg-transparent rounded web:data-[focus-visible=true]:outline-none web:data-[focus-visible=true]:ring-2 web:data-[focus-visible=true]:ring-primary-700 data-[checked=true]:bg-primary-600 data-[checked=true]:border-primary-600 group-hover/checkbox:data-[checked=false]:border-outline-500 group-hover/checkbox:bg-transparent group-hover/checkbox:data-[invalid=true]:border-error-700 group-hover/checkbox:data-[checked=true]:bg-primary-700 group-hover/checkbox:data-[checked=true]:border-primary-700 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:border-primary-600 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:bg-primary-600 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:opacity-40 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:data-[invalid=true]:border-error-700 group-hover/checkbox:data-[disabled=true]:border-outline-400 group-hover/checkbox:data-[disabled=true]:data-[invalid=true]:border-error-700 active:data-[checked=true]:bg-primary-800 active:data-[checked=true]:border-primary-800 data-[invalid=true]:border-error-700 data-[disabled=true]:opacity-40", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const CheckboxLabel: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").TextProps> & import("react-native").TextProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        lg: string;
-        md: string;
-        sm: string;
-    };
-}, undefined, "text-typography-600 data-[checked=true]:text-typography-900 group-hover/checkbox:text-typography-900 group-hover/checkbox:data-[checked=true]:text-typography-900 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:text-typography-900 group-hover/checkbox:data-[disabled=true]:text-typography-400 data-[active=true]:text-typography-900 data-[active=true]:data-[checked=true]:text-typography-900 data-[disabled=true]:opacity-40 web:select-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "text-typography-600 data-[checked=true]:text-typography-900 group-hover/checkbox:text-typography-900 group-hover/checkbox:data-[checked=true]:text-typography-900 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:text-typography-900 group-hover/checkbox:data-[disabled=true]:text-typography-400 data-[active=true]:text-typography-900 data-[active=true]:data-[checked=true]:text-typography-900 data-[disabled=true]:opacity-40 web:select-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const CheckboxIcon: React.ForwardRefExoticComponent<Omit<React.RefAttributes<Omit<any, "ref"> & React.RefAttributes<unknown>> & Omit<any, "ref"> & React.RefAttributes<unknown> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "data-[disabled=true]:opacity-40", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "data-[disabled=true]:opacity-40", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & {
-    className?: any;
-    fill?: string | undefined;
-    color?: string | undefined;
-    as?: any;
-}, "ref"> & React.RefAttributes<unknown>>;
-export { Checkbox, CheckboxIndicator, CheckboxLabel, CheckboxIcon, CheckboxGroup, };
diff --git a/universal/packages/components/ui/checkbox/index.jsx b/universal/packages/components/ui/checkbox/index.jsx
deleted file mode 100644
index 8753c656..00000000
--- a/universal/packages/components/ui/checkbox/index.jsx
+++ /dev/null
@@ -1,128 +0,0 @@
-'use client';
-import React, { useMemo } from 'react';
-import { createCheckbox } from '@gluestack-ui/checkbox';
-import { View, Pressable, Text } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { Svg } from 'react-native-svg';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-import { Platform } from 'react-native';
-const PrimitiveIcon = React.forwardRef(({ height, width, fill = 'none', color, size, as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} color={color} {...props}/>);
-});
-const SCOPE = 'CHECKBOX';
-const UICheckbox = createCheckbox({
-    // @ts-ignore
-    Root: Platform.OS === 'web'
-        ? withStyleContext(View, SCOPE)
-        : withStyleContextAndStates(Pressable, SCOPE),
-    Group: Platform.OS === 'web' ? View : withStates(View),
-    Icon: Platform.OS === 'web' ? PrimitiveIcon : withStates(PrimitiveIcon),
-    Label: Platform.OS === 'web' ? Text : withStates(Text),
-    Indicator: Platform.OS === 'web' ? View : withStates(View),
-});
-cssInterop(UICheckbox, { className: 'style' });
-cssInterop(UICheckbox.Group, { className: 'style' });
-cssInterop(UICheckbox.Label, { className: 'style' });
-cssInterop(UICheckbox.Indicator, { className: 'style' });
-cssInterop(UICheckbox.Icon, {
-    className: {
-        target: 'style',
-        nativeStyleToProp: {
-            height: 'height',
-            width: 'width',
-            //@ts-ignore
-            fill: 'fill',
-            color: 'color',
-        },
-    },
-});
-const checkboxStyle = tva({
-    base: 'group/checkbox flex-row items-center justify-start gap-2 web:cursor-pointer data-[disabled=true]:cursor-not-allowed',
-});
-const checkboxIndicatorStyle = tva({
-    base: 'justify-center items-center border-outline-400 bg-transparent rounded web:data-[focus-visible=true]:outline-none web:data-[focus-visible=true]:ring-2 web:data-[focus-visible=true]:ring-primary-700 data-[checked=true]:bg-primary-600 data-[checked=true]:border-primary-600 group-hover/checkbox:data-[checked=false]:border-outline-500 group-hover/checkbox:bg-transparent group-hover/checkbox:data-[invalid=true]:border-error-700 group-hover/checkbox:data-[checked=true]:bg-primary-700 group-hover/checkbox:data-[checked=true]:border-primary-700 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:border-primary-600 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:bg-primary-600 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:opacity-40 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:data-[invalid=true]:border-error-700 group-hover/checkbox:data-[disabled=true]:border-outline-400 group-hover/checkbox:data-[disabled=true]:data-[invalid=true]:border-error-700 active:data-[checked=true]:bg-primary-800 active:data-[checked=true]:border-primary-800 data-[invalid=true]:border-error-700 data-[disabled=true]:opacity-40',
-    parentVariants: {
-        size: {
-            lg: 'w-6 h-6 border-[3px]',
-            md: 'w-5 h-5 border-2',
-            sm: 'w-4 h-4 border-2',
-        },
-    },
-});
-const checkboxLabelStyle = tva({
-    base: 'text-typography-600 data-[checked=true]:text-typography-900 group-hover/checkbox:text-typography-900 group-hover/checkbox:data-[checked=true]:text-typography-900 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:text-typography-900 group-hover/checkbox:data-[disabled=true]:text-typography-400 data-[active=true]:text-typography-900 data-[active=true]:data-[checked=true]:text-typography-900 data-[disabled=true]:opacity-40 web:select-none',
-    parentVariants: {
-        size: {
-            lg: 'text-lg',
-            md: 'text-base',
-            sm: 'text-sm',
-        },
-    },
-});
-const checkboxIconStyle = tva({
-    base: 'data-[disabled=true]:opacity-40',
-    parentVariants: {
-        size: {
-            sm: 'h-3 w-3',
-            md: 'h-4 w-4',
-            lg: 'h-5 w-5',
-        },
-    },
-});
-const CheckboxGroup = UICheckbox.Group;
-const Checkbox = React.forwardRef(({ className, size = 'md', ...props }, ref) => {
-    return (<UICheckbox className={checkboxStyle({
-            class: className,
-        })} {...props} context={{
-            size,
-        }} ref={ref}/>);
-});
-const CheckboxIndicator = React.forwardRef(({ className, ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UICheckbox.Indicator className={checkboxIndicatorStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            class: className,
-        })} {...props} ref={ref}/>);
-});
-const CheckboxLabel = React.forwardRef(({ className, ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UICheckbox.Label className={checkboxLabelStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            class: className,
-        })} {...props} ref={ref}/>);
-});
-const CheckboxIcon = React.forwardRef(({ className, size, color = 'gray', ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    if (typeof size === 'number') {
-        return (<UICheckbox.Icon ref={ref} {...props} color={color} className={checkboxIconStyle({ class: className })} size={size}/>);
-    }
-    else if ((props.height !== undefined || props.width !== undefined) &&
-        size === undefined) {
-        return (<UICheckbox.Icon ref={ref} {...props} color={color} className={checkboxIconStyle({ class: className })}/>);
-    }
-    return (<UICheckbox.Icon className={checkboxIconStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            class: className,
-            size,
-        })} {...props} color={color} ref={ref}/>);
-});
-Checkbox.displayName = 'Checkbox';
-CheckboxIndicator.displayName = 'CheckboxIndicator';
-CheckboxLabel.displayName = 'CheckboxLabel';
-CheckboxIcon.displayName = 'CheckboxIcon';
-export { Checkbox, CheckboxIndicator, CheckboxLabel, CheckboxIcon, CheckboxGroup, };
diff --git a/universal/packages/components/ui/checkbox/index.tsx b/universal/packages/components/ui/checkbox/index.tsx
index 93300d5b..4e85cace 100644
--- a/universal/packages/components/ui/checkbox/index.tsx
+++ b/universal/packages/components/ui/checkbox/index.tsx
@@ -1,19 +1,16 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createCheckbox } from '@gluestack-ui/checkbox';
-import { View, Pressable, Text } from 'react-native';
+import { View, Pressable, Text, Platform } from 'react-native';
 import type { TextProps, ViewProps } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { Svg } from 'react-native-svg';
+import { PrimitiveIcon, IPrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { Platform } from 'react-native';
 
 const IndicatorWrapper = React.forwardRef<
   React.ElementRef<typeof View>,
@@ -28,97 +25,32 @@ const LabelWrapper = React.forwardRef<React.ElementRef<typeof Text>, TextProps>(
   }
 );
 
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
 const IconWrapper = React.forwardRef<
   React.ElementRef<typeof PrimitiveIcon>,
   IPrimitiveIcon
 >(({ ...props }, ref) => {
-  return <PrimitiveIcon {...props} ref={ref} />;
+  return <UIIcon {...props} ref={ref} />;
 });
 
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
-
 const SCOPE = 'CHECKBOX';
 const UICheckbox = createCheckbox({
-  // @ts-ignore
+  // @ts-expect-error
   Root:
     Platform.OS === 'web'
       ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(Pressable, SCOPE),
-  Group: Platform.OS === 'web' ? View : withStates(View),
-  Icon: Platform.OS === 'web' ? IconWrapper : withStates(IconWrapper),
-  Label: Platform.OS === 'web' ? LabelWrapper : withStates(LabelWrapper),
-  Indicator:
-    Platform.OS === 'web' ? IndicatorWrapper : withStates(IndicatorWrapper),
+      : withStyleContext(Pressable, SCOPE),
+  Group: View,
+  Icon: IconWrapper,
+  Label: LabelWrapper,
+  Indicator: IndicatorWrapper,
 });
 
-cssInterop(UICheckbox, { className: 'style' });
-cssInterop(UICheckbox.Group, { className: 'style' });
-cssInterop(LabelWrapper, { className: 'style' });
-cssInterop(IndicatorWrapper, { className: 'style' });
-//@ts-ignore
-cssInterop(IconWrapper, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      //@ts-ignore
       fill: true,
       color: 'classNameColor',
       stroke: true,
diff --git a/universal/packages/components/ui/divider/index.d.ts b/universal/packages/components/ui/divider/index.d.ts
deleted file mode 100644
index edac583f..00000000
--- a/universal/packages/components/ui/divider/index.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import React from 'react';
-declare const Divider: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export { Divider };
diff --git a/universal/packages/components/ui/divider/index.jsx b/universal/packages/components/ui/divider/index.jsx
deleted file mode 100644
index 9c8a2b84..00000000
--- a/universal/packages/components/ui/divider/index.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-'use client';
-import { createDivider } from '@gluestack-ui/divider';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { View } from 'react-native';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-import React from 'react';
-const dividerStyle = tva({
-    base: 'bg-background-200',
-    variants: {
-        orientation: {
-            vertical: 'w-px h-full',
-            horizontal: 'h-px w-full',
-        },
-    },
-});
-const UIDivider = createDivider({ Root: View });
-cssInterop(UIDivider, { className: 'style' });
-const Divider = React.forwardRef(({ className, orientation = 'horizontal', ...props }, ref) => {
-    return (<UIDivider ref={ref} {...props} className={dividerStyle({
-            orientation,
-            class: className,
-        })}/>);
-});
-Divider.displayName = 'Divider';
-export { Divider };
diff --git a/universal/packages/components/ui/divider/index.tsx b/universal/packages/components/ui/divider/index.tsx
index 61404a4b..e9b663a6 100644
--- a/universal/packages/components/ui/divider/index.tsx
+++ b/universal/packages/components/ui/divider/index.tsx
@@ -1,9 +1,7 @@
 'use client';
 import React from 'react';
-import { createDivider } from '@gluestack-ui/divider';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { View } from 'react-native';
-import { cssInterop } from 'nativewind';
+import { Platform, View } from 'react-native';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 const dividerStyle = tva({
@@ -16,21 +14,19 @@ const dividerStyle = tva({
   },
 });
 
-const UIDivider = createDivider({ Root: View });
-
-cssInterop(UIDivider, { className: 'style' });
-
-type IUIDividerProps = React.ComponentPropsWithoutRef<typeof UIDivider> &
+type IUIDividerProps = React.ComponentPropsWithoutRef<typeof View> &
   VariantProps<typeof dividerStyle>;
 
 const Divider = React.forwardRef<
-  React.ElementRef<typeof UIDivider>,
+  React.ElementRef<typeof View>,
   IUIDividerProps
 >(({ className, orientation = 'horizontal', ...props }, ref) => {
   return (
-    <UIDivider
+    <View
       ref={ref}
       {...props}
+      aria-orientation={orientation}
+      role={Platform.OS === 'web' ? 'separator' : undefined}
       className={dividerStyle({
         orientation,
         class: className,
diff --git a/universal/packages/components/ui/drawer/index.tsx b/universal/packages/components/ui/drawer/index.tsx
new file mode 100644
index 00000000..9172862b
--- /dev/null
+++ b/universal/packages/components/ui/drawer/index.tsx
@@ -0,0 +1,336 @@
+'use client';
+import React from 'react';
+import { createModal as createDrawer } from '@gluestack-ui/modal';
+import { Pressable, View, ScrollView, Dimensions } from 'react-native';
+import {
+  Motion,
+  AnimatePresence,
+  createMotionAnimatedComponent,
+} from '@legendapp/motion';
+import { tva } from '@gluestack-ui/nativewind-utils/tva';
+import {
+  withStyleContext,
+  useStyleContext,
+} from '@gluestack-ui/nativewind-utils/withStyleContext';
+import { cssInterop } from 'nativewind';
+import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+
+const AnimatedPressable = createMotionAnimatedComponent(Pressable);
+const SCOPE = 'MODAL';
+const screenWidth = Dimensions.get('window').width;
+const screenHeight = Dimensions.get('window').height;
+const sizes: { [key: string]: number } = {
+  sm: 0.25,
+  md: 0.5,
+  lg: 0.75,
+  full: 1,
+};
+
+const UIDrawer = createDrawer({
+  Root: withStyleContext(View, SCOPE),
+  Backdrop: AnimatedPressable,
+  Content: Motion.View,
+  Body: ScrollView,
+  CloseButton: Pressable,
+  Footer: View,
+  Header: View,
+  AnimatePresence: AnimatePresence,
+});
+
+cssInterop(AnimatedPressable, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
+
+const drawerStyle = tva({
+  base: 'w-full h-full web:pointer-events-none relative',
+  variants: {
+    size: {
+      sm: '',
+      md: '',
+      lg: '',
+      full: '',
+    },
+    anchor: {
+      left: 'items-start',
+      right: 'items-end',
+      top: 'justify-start',
+      bottom: 'justify-end',
+    },
+  },
+});
+
+const drawerBackdropStyle = tva({
+  base: 'absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default',
+});
+
+const drawerContentStyle = tva({
+  base: 'bg-background-0 overflow-scroll border-outline-100 p-6 absolute',
+  parentVariants: {
+    size: {
+      sm: 'w-1/4',
+      md: 'w-1/2',
+      lg: 'w-3/4',
+      full: 'w-full',
+    },
+    anchor: {
+      left: 'h-full border-r',
+      right: 'h-full border-l',
+      top: 'w-full border-b',
+      bottom: 'w-full border-t',
+    },
+  },
+  parentCompoundVariants: [
+    {
+      anchor: 'top',
+      size: 'sm',
+      class: 'h-1/4',
+    },
+    {
+      anchor: 'top',
+      size: 'md',
+      class: 'h-1/2',
+    },
+    {
+      anchor: 'top',
+      size: 'lg',
+      class: 'h-3/4',
+    },
+    {
+      anchor: 'top',
+      size: 'full',
+      class: 'h-full',
+    },
+    {
+      anchor: 'bottom',
+      size: 'sm',
+      class: 'h-1/4',
+    },
+    {
+      anchor: 'bottom',
+      size: 'md',
+      class: 'h-1/2',
+    },
+    {
+      anchor: 'bottom',
+      size: 'lg',
+      class: 'h-3/4',
+    },
+    {
+      anchor: 'bottom',
+      size: 'full',
+      class: 'h-full',
+    },
+  ],
+});
+
+const drawerCloseButtonStyle = tva({
+  base: 'z-10 rounded data-[focus-visible=true]:web:bg-background-100 web:outline-0 cursor-pointer',
+});
+
+const drawerHeaderStyle = tva({
+  base: 'justify-between items-center flex-row',
+});
+
+const drawerBodyStyle = tva({
+  base: 'mt-4 mb-6 shrink-0',
+});
+
+const drawerFooterStyle = tva({
+  base: 'flex-row justify-end items-center',
+});
+
+type IDrawerProps = React.ComponentProps<typeof UIDrawer> &
+  VariantProps<typeof drawerStyle> & { className?: string };
+
+type IDrawerBackdropProps = React.ComponentProps<typeof UIDrawer.Backdrop> &
+  VariantProps<typeof drawerBackdropStyle> & { className?: string };
+
+type IDrawerContentProps = React.ComponentProps<typeof UIDrawer.Content> &
+  VariantProps<typeof drawerContentStyle> & { className?: string };
+
+type IDrawerHeaderProps = React.ComponentProps<typeof UIDrawer.Header> &
+  VariantProps<typeof drawerHeaderStyle> & { className?: string };
+
+type IDrawerBodyProps = React.ComponentProps<typeof UIDrawer.Body> &
+  VariantProps<typeof drawerBodyStyle> & { className?: string };
+
+type IDrawerFooterProps = React.ComponentProps<typeof UIDrawer.Footer> &
+  VariantProps<typeof drawerFooterStyle> & { className?: string };
+
+type IDrawerCloseButtonProps = React.ComponentProps<
+  typeof UIDrawer.CloseButton
+> &
+  VariantProps<typeof drawerCloseButtonStyle> & { className?: string };
+
+const Drawer = React.forwardRef<
+  React.ElementRef<typeof UIDrawer>,
+  IDrawerProps
+>(({ className, size = 'sm', anchor = 'left', ...props }, ref) => {
+  return (
+    <UIDrawer
+      ref={ref}
+      {...props}
+      pointerEvents="box-none"
+      className={drawerStyle({ size, anchor, class: className })}
+      context={{ size, anchor }}
+    />
+  );
+});
+
+const DrawerBackdrop = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Backdrop>,
+  IDrawerBackdropProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.Backdrop
+      ref={ref}
+      initial={{
+        opacity: 0,
+      }}
+      animate={{
+        opacity: 0.5,
+      }}
+      exit={{
+        opacity: 0,
+      }}
+      transition={{
+        type: 'spring',
+        damping: 18,
+        stiffness: 250,
+        opacity: {
+          type: 'timing',
+          duration: 250,
+        },
+      }}
+      {...props}
+      className={drawerBackdropStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+const DrawerContent = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Content>,
+  IDrawerContentProps
+>(({ className, ...props }, ref) => {
+  const { size: parentSize, anchor: parentAnchor } = useStyleContext(SCOPE);
+
+  const drawerHeight = screenHeight * (sizes[parentSize] || sizes.md);
+  const drawerWidth = screenWidth * (sizes[parentSize] || sizes.md);
+
+  const isHorizontal = parentAnchor === 'left' || parentAnchor === 'right';
+
+  const initialObj = isHorizontal
+    ? { x: parentAnchor === 'left' ? -drawerWidth : drawerWidth }
+    : { y: parentAnchor === 'top' ? -drawerHeight : drawerHeight };
+
+  const animateObj = isHorizontal ? { x: 0 } : { y: 0 };
+
+  const exitObj = isHorizontal
+    ? { x: parentAnchor === 'left' ? -drawerWidth : drawerWidth }
+    : { y: parentAnchor === 'top' ? -drawerHeight : drawerHeight };
+
+  const customClass = isHorizontal
+    ? `top-0 ${parentAnchor === 'left' ? 'left-0' : 'right-0'}`
+    : `left-0 ${parentAnchor === 'top' ? 'top-0' : 'bottom-0'}`;
+
+  return (
+    <UIDrawer.Content
+      ref={ref}
+      initial={initialObj}
+      animate={animateObj}
+      exit={exitObj}
+      transition={{
+        type: 'timing',
+        duration: 300,
+      }}
+      {...props}
+      className={drawerContentStyle({
+        parentVariants: {
+          size: parentSize,
+          anchor: parentAnchor,
+        },
+        class: `${className} ${customClass}`,
+      })}
+      pointerEvents="auto"
+    />
+  );
+});
+
+const DrawerHeader = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Header>,
+  IDrawerHeaderProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.Header
+      ref={ref}
+      {...props}
+      className={drawerHeaderStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+const DrawerBody = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Body>,
+  IDrawerBodyProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.Body
+      ref={ref}
+      {...props}
+      className={drawerBodyStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+const DrawerFooter = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.Footer>,
+  IDrawerFooterProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.Footer
+      ref={ref}
+      {...props}
+      className={drawerFooterStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+const DrawerCloseButton = React.forwardRef<
+  React.ElementRef<typeof UIDrawer.CloseButton>,
+  IDrawerCloseButtonProps
+>(({ className, ...props }, ref) => {
+  return (
+    <UIDrawer.CloseButton
+      ref={ref}
+      {...props}
+      className={drawerCloseButtonStyle({
+        class: className,
+      })}
+    />
+  );
+});
+
+Drawer.displayName = 'Drawer';
+DrawerBackdrop.displayName = 'DrawerBackdrop';
+DrawerContent.displayName = 'DrawerContent';
+DrawerHeader.displayName = 'DrawerHeader';
+DrawerBody.displayName = 'DrawerBody';
+DrawerFooter.displayName = 'DrawerFooter';
+DrawerCloseButton.displayName = 'DrawerCloseButton';
+
+export {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerCloseButton,
+  DrawerHeader,
+  DrawerBody,
+  DrawerFooter,
+};
diff --git a/universal/packages/components/ui/fab/index.d.ts b/universal/packages/components/ui/fab/index.d.ts
deleted file mode 100644
index 4bb46694..00000000
--- a/universal/packages/components/ui/fab/index.d.ts
+++ /dev/null
@@ -1,505 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const Fab: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & Omit<Omit<import("react-native").PressableProps & React.RefAttributes<import("react-native").View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown> & import("@gluestack-ui/fab/lib/typescript/types").InterfaceFabProps, "context"> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    placement: {
-        'top right': string;
-        'top left': string;
-        'bottom right': string;
-        'bottom left': string;
-        'top center': string;
-        'bottom center': string;
-    };
-} | ({
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    placement: {
-        'top right': string;
-        'top left': string;
-        'bottom right': string;
-        'bottom left': string;
-        'top center': string;
-        'bottom center': string;
-    };
-} & {
-    size: {
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    placement: {
-        'top right': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        'top left': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        'bottom right': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        'bottom left': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        'top center': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        'bottom center': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "group/fab bg-primary-500 rounded-full z-20 p-4 flex-row items-center justify-center absolute hover:bg-primary-600 active:bg-primary-700 disabled:opacity-40 disabled:pointer-events-all disabled:cursor-not-allowed data-[focus=true]:web:outline-none data-[focus-visible=true]:web:ring-2 data-[focus-visible=true]:web:ring-primary-700", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    placement: {
-        'top right': string;
-        'top left': string;
-        'bottom right': string;
-        'bottom left': string;
-        'top center': string;
-        'bottom center': string;
-    };
-}, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    placement: {
-        'top right': string;
-        'top left': string;
-        'bottom right': string;
-        'bottom left': string;
-        'top center': string;
-        'bottom center': string;
-    };
-}>, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    placement: {
-        'top right': string;
-        'top left': string;
-        'bottom right': string;
-        'bottom left': string;
-        'top center': string;
-        'bottom center': string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    placement: {
-        'top right': string;
-        'top left': string;
-        'bottom right': string;
-        'bottom left': string;
-        'top center': string;
-        'bottom center': string;
-    };
-}, undefined, "group/fab bg-primary-500 rounded-full z-20 p-4 flex-row items-center justify-center absolute hover:bg-primary-600 active:bg-primary-700 disabled:opacity-40 disabled:pointer-events-all disabled:cursor-not-allowed data-[focus=true]:web:outline-none data-[focus-visible=true]:web:ring-2 data-[focus-visible=true]:web:ring-primary-700", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    placement: {
-        'top right': string;
-        'top left': string;
-        'bottom right': string;
-        'bottom left': string;
-        'top center': string;
-        'bottom center': string;
-    };
-}, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-    placement: {
-        'top right': string;
-        'top left': string;
-        'bottom right': string;
-        'bottom left': string;
-        'top center': string;
-        'bottom center': string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const FabLabel: React.ForwardRefExoticComponent<{
-    className?: string | undefined;
-} & import("react-native").TextProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "text-typography-50 font-normal font-body tracking-md text-left mx-2", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "text-typography-50 font-normal font-body tracking-md text-left mx-2", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>> & React.RefAttributes<unknown>>;
-declare const FabIcon: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-    as?: any;
-    fill?: string | undefined;
-    color?: string | undefined;
-} & Omit<any, "ref"> & React.RefAttributes<unknown> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-} | ({
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-} & {
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}>, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, "", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Fab, FabLabel, FabIcon };
diff --git a/universal/packages/components/ui/fab/index.jsx b/universal/packages/components/ui/fab/index.jsx
deleted file mode 100644
index 093575d6..00000000
--- a/universal/packages/components/ui/fab/index.jsx
+++ /dev/null
@@ -1,156 +0,0 @@
-'use client';
-import React, { useMemo } from 'react';
-import { createFab } from '@gluestack-ui/fab';
-import { Platform, Text } from 'react-native';
-import { Pressable } from 'react-native';
-import { Svg } from 'react-native-svg';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-const PrimitiveIcon = React.forwardRef(({ height, width, fill = 'none', color, size, as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} color={color} {...props}/>);
-});
-const SCOPE = 'FAB';
-const UIFab = createFab({
-    Root: Platform.OS === 'web'
-        ? withStyleContext(Pressable, SCOPE)
-        : withStyleContextAndStates(Pressable, SCOPE),
-    Label: Text,
-    Icon: PrimitiveIcon,
-});
-cssInterop(UIFab, { className: 'style' });
-cssInterop(UIFab.Label, { className: 'style' });
-cssInterop(UIFab.Icon, {
-    className: {
-        target: 'style',
-        nativeStyleToProp: {
-            height: 'height',
-            width: 'width',
-            //@ts-ignore
-            fill: 'fill',
-            color: 'color',
-        },
-    },
-});
-const fabStyle = tva({
-    base: 'group/fab bg-primary-500 rounded-full z-20 p-4 flex-row items-center justify-center absolute hover:bg-primary-600 active:bg-primary-700 disabled:opacity-40 disabled:pointer-events-all disabled:cursor-not-allowed data-[focus=true]:web:outline-none data-[focus-visible=true]:web:ring-2 data-[focus-visible=true]:web:ring-primary-700',
-    variants: {
-        size: {
-            sm: 'px-2.5 py-2.5',
-            md: 'px-3 py-3',
-            lg: 'px-4 py-4',
-        },
-        placement: {
-            'top right': 'top-4 right-4',
-            'top left': 'top-4 left-4',
-            'bottom right': 'bottom-4 right-4',
-            'bottom left': 'bottom-4 left-4',
-            'top center': 'top-4 self-center',
-            'bottom center': 'bottom-4 self-center',
-        },
-    },
-});
-const fabLabelStyle = tva({
-    base: 'text-typography-50 font-normal font-body tracking-md text-left mx-2',
-    variants: {
-        isTruncated: {
-            true: '',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-base',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow-500',
-        },
-    },
-    parentVariants: {
-        size: {
-            sm: 'text-sm',
-            md: 'text-base',
-            lg: 'text-lg',
-        },
-    },
-});
-const fabIconStyle = tva({
-    base: '',
-    variants: {
-        size: {
-            '2xs': 'h-3 w-3',
-            'xs': 'h-3.5 w-3.5',
-            'sm': 'h-4 w-4',
-            'md': 'w-[18px] h-[18px]',
-            'lg': 'h-5 w-5',
-            'xl': 'h-6 w-6',
-        },
-    },
-});
-const Fab = React.forwardRef(({ size = 'md', placement = 'bottom right', className, ...props }, ref) => {
-    return (<UIFab ref={ref} {...props} className={fabStyle({ size, placement, class: className })} context={{ size }}/>);
-});
-const FabLabel = React.forwardRef(({ size, isTruncated = false, bold = false, underline = false, strikeThrough = false, className, ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UIFab.Label ref={ref} {...props} className={fabLabelStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            size,
-            isTruncated,
-            bold,
-            underline,
-            strikeThrough,
-            class: className,
-        })}/>);
-});
-const FabIcon = React.forwardRef(({ size, className, color = 'gray', ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    if (typeof size === 'number') {
-        return (<UIFab.Icon ref={ref} {...props} color={color} className={fabIconStyle({ class: className })} size={size}/>);
-    }
-    else if ((props.height !== undefined || props.width !== undefined) &&
-        size === undefined) {
-        return (<UIFab.Icon ref={ref} {...props} color={color} className={fabIconStyle({ class: className })}/>);
-    }
-    return (<UIFab.Icon ref={ref} {...props} className={fabIconStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            size,
-            class: className,
-        })} color={color}/>);
-});
-Fab.displayName = 'Fab';
-FabLabel.displayName = 'FabLabel';
-FabIcon.displayName = 'FabIcon';
-export { Fab, FabLabel, FabIcon };
diff --git a/universal/packages/components/ui/fab/index.tsx b/universal/packages/components/ui/fab/index.tsx
index a3338775..98840f89 100644
--- a/universal/packages/components/ui/fab/index.tsx
+++ b/universal/packages/components/ui/fab/index.tsx
@@ -1,96 +1,30 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createFab } from '@gluestack-ui/fab';
-import { Platform, Text } from 'react-native';
-import { Pressable } from 'react-native';
-import { Svg } from 'react-native-svg';
+import { Pressable, Text } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'FAB';
+const Root = withStyleContext(Pressable, SCOPE);
 const UIFab = createFab({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(Pressable, SCOPE)
-      : withStyleContextAndStates(Pressable, SCOPE),
+  Root: Root,
   Label: Text,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
 });
 
-cssInterop(UIFab, { className: 'style' });
-cssInterop(UIFab.Label, { className: 'style' });
-//@ts-ignore
-cssInterop(UIFab.Icon, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      //@ts-ignore
       fill: true,
       color: 'classNameColor',
       stroke: true,
@@ -165,7 +99,7 @@ const fabLabelStyle = tva({
 });
 
 const fabIconStyle = tva({
-  base: 'text-typography-50 hover:text-typography-0 active:text-typography-0 fill-none',
+  base: 'text-typography-50 fill-none',
   variants: {
     size: {
       '2xs': 'h-3 w-3',
diff --git a/universal/packages/components/ui/flat-list/index.d.ts b/universal/packages/components/ui/flat-list/index.d.ts
deleted file mode 100644
index bc5e26fa..00000000
--- a/universal/packages/components/ui/flat-list/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { FlatList } from 'react-native';
diff --git a/universal/packages/components/ui/flat-list/index.jsx b/universal/packages/components/ui/flat-list/index.jsx
deleted file mode 100644
index 4ccadcd6..00000000
--- a/universal/packages/components/ui/flat-list/index.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-'use client';
-export { FlatList } from 'react-native';
diff --git a/universal/packages/components/ui/form-control/index.d.ts b/universal/packages/components/ui/form-control/index.d.ts
deleted file mode 100644
index ce810ea4..00000000
--- a/universal/packages/components/ui/form-control/index.d.ts
+++ /dev/null
@@ -1,2491 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const formControlStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-} | ({
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-} & {
-    size: {
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "flex flex-col", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}>, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "flex flex-col", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}>, unknown, unknown, undefined>>;
-declare const formControlErrorIconStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-} | ({
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-} & {
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}>, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, "", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}>, unknown, unknown, undefined>>;
-declare const formControlErrorStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "flex flex-row justify-start items-center mt-1 gap-1", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "flex flex-row justify-start items-center mt-1 gap-1", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const formControlErrorTextStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-error-700", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "text-error-700", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>;
-declare const formControlHelperStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "flex flex-row justify-start items-center mt-1", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "flex flex-row justify-start items-center mt-1", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const formControlHelperTextStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-typography-500", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "text-typography-500", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>;
-declare const formControlLabelStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "flex flex-row justify-start items-center mb-1", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "flex flex-row justify-start items-center mb-1", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const formControlLabelTextStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "font-medium text-typography-900", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "font-medium text-typography-900", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>;
-declare const FormControlLabelAstrick: {
-    ({ className, ...props }: any): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-export declare const UIFormControl: import("@gluestack-ui/form-control/lib/typescript/types").IFormControlComponentType<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>, import("react-native").ViewProps, import("react-native").TextProps, Omit<any, "ref"> & React.RefAttributes<unknown>, import("react-native").ViewProps, import("react-native").TextProps, any, import("react-native").ViewProps, import("react-native").TextProps>;
-type IFormControlProps = React.ComponentProps<typeof UIFormControl> & VariantProps<typeof formControlStyle>;
-declare const FormControl: {
-    ({ className, size, ...props }: {
-        className?: string | undefined;
-    } & import("react-native").ViewProps & {
-        context?: any;
-    } & React.RefAttributes<unknown> & import("@gluestack-ui/form-control/lib/typescript/types").InterfaceFormControlProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    } | ({
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    } & {
-        size: {
-            sm: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            md: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            lg: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-    }), undefined, "flex flex-col", import("tailwind-variants/dist/config").TVConfig<{
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }, {
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }>, {
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }, undefined, "flex flex-col", import("tailwind-variants/dist/config").TVConfig<{
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }, {
-        size: {
-            sm: string;
-            md: string;
-            lg: string;
-        };
-    }>, unknown, unknown, undefined>>>): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-type IFormControlErrorProps = React.ComponentProps<typeof UIFormControl.Error> & VariantProps<typeof formControlErrorStyle>;
-declare const FormControlError: {
-    ({ className, ...props }: {
-        className?: string | undefined;
-    } & import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "flex flex-row justify-start items-center mt-1 gap-1", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "flex flex-row justify-start items-center mt-1 gap-1", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-type IFormControlErrorTextProps = React.ComponentProps<typeof UIFormControl.Error.Text> & VariantProps<typeof formControlErrorTextStyle>;
-declare const FormControlErrorText: {
-    ({ className, size, ...props }: {
-        className?: string | undefined;
-    } & import("react-native").TextProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    } | ({
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    } & {
-        isTruncated: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        bold: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        underline: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        strikeThrough: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        size: {
-            '2xs': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            xs: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            sm: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            md: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            lg: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            xl: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '2xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '3xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '4xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '5xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '6xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        sub: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        italic: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        highlight: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-    }), undefined, "text-error-700", import("tailwind-variants/dist/config").TVConfig<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, {
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }>, {
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, undefined, "text-error-700", import("tailwind-variants/dist/config").TVConfig<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, {
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }>, unknown, unknown, undefined>>>): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-type IFormControlErrorIconProps = React.ComponentProps<typeof UIFormControl.Error.Icon> & VariantProps<typeof formControlErrorIconStyle>;
-declare const FormControlErrorIcon: {
-    ({ className, size, color, ...props }: {
-        className?: any;
-        as?: any;
-        fill?: string | undefined;
-        color?: string | undefined;
-    } & Omit<any, "ref"> & React.RefAttributes<unknown> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-        };
-    } | ({
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-        };
-    } & {
-        size: {
-            '2xs': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            xs: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            sm: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            md: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            lg: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            xl: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-    }), undefined, "", import("tailwind-variants/dist/config").TVConfig<{
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-        };
-    }, {
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-        };
-    }>, {
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-        };
-    }, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-        };
-    }, undefined, "", import("tailwind-variants/dist/config").TVConfig<{
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-        };
-    }, {
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-        };
-    }>, unknown, unknown, undefined>>>, ref?: any): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-type IFormControlLabelProps = React.ComponentProps<typeof UIFormControl.Label> & VariantProps<typeof formControlLabelStyle>;
-declare const FormControlLabel: {
-    ({ className, ...props }: {
-        className?: string | undefined;
-    } & import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "flex flex-row justify-start items-center mb-1", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "flex flex-row justify-start items-center mb-1", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-type IFormControlLabelTextProps = React.ComponentProps<typeof UIFormControl.Label.Text> & VariantProps<typeof formControlLabelTextStyle>;
-declare const FormControlLabelText: {
-    ({ className, size, ...props }: {
-        className?: string | undefined;
-    } & import("react-native").TextProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    } | ({
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    } & {
-        isTruncated: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        bold: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        underline: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        strikeThrough: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        size: {
-            '2xs': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            xs: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            sm: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            md: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            lg: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            xl: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '2xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '3xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '4xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '5xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '6xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        sub: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        italic: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        highlight: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-    }), undefined, "font-medium text-typography-900", import("tailwind-variants/dist/config").TVConfig<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, {
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }>, {
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, undefined, "font-medium text-typography-900", import("tailwind-variants/dist/config").TVConfig<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, {
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }>, unknown, unknown, undefined>>>): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-type IFormControlHelperProps = React.ComponentProps<typeof UIFormControl.Helper> & VariantProps<typeof formControlHelperStyle>;
-declare const FormControlHelper: {
-    ({ className, ...props }: {
-        className?: string | undefined;
-    } & import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "flex flex-row justify-start items-center mt-1", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "flex flex-row justify-start items-center mt-1", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-type IFormControlHelperTextProps = React.ComponentProps<typeof UIFormControl.Helper.Text> & VariantProps<typeof formControlHelperTextStyle>;
-declare const FormControlHelperText: {
-    ({ className, size, ...props }: {
-        className?: string | undefined;
-    } & import("react-native").TextProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    } | ({
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    } & {
-        isTruncated: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        bold: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        underline: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        strikeThrough: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        size: {
-            '2xs': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            xs: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            sm: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            md: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            lg: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            xl: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '2xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '3xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '4xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '5xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            '6xl': import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        sub: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        italic: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-        highlight: {
-            true: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-    }), undefined, "text-typography-500", import("tailwind-variants/dist/config").TVConfig<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, {
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }>, {
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, undefined, "text-typography-500", import("tailwind-variants/dist/config").TVConfig<{
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }, {
-        isTruncated: {
-            true: string;
-        };
-        bold: {
-            true: string;
-        };
-        underline: {
-            true: string;
-        };
-        strikeThrough: {
-            true: string;
-        };
-        size: {
-            '2xs': string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            '2xl': string;
-            '3xl': string;
-            '4xl': string;
-            '5xl': string;
-            '6xl': string;
-        };
-        sub: {
-            true: string;
-        };
-        italic: {
-            true: string;
-        };
-        highlight: {
-            true: string;
-        };
-    }>, unknown, unknown, undefined>>>): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-export { FormControl, FormControlError, FormControlErrorText, FormControlErrorIcon, FormControlLabel, FormControlLabelText, FormControlLabelAstrick, FormControlHelper, FormControlHelperText, };
diff --git a/universal/packages/components/ui/form-control/index.jsx b/universal/packages/components/ui/form-control/index.jsx
deleted file mode 100644
index 2e7a1f66..00000000
--- a/universal/packages/components/ui/form-control/index.jsx
+++ /dev/null
@@ -1,306 +0,0 @@
-'use client';
-import { Text, View } from 'react-native';
-import React, { useMemo } from 'react';
-import { Svg } from 'react-native-svg';
-import { createFormControl } from '@gluestack-ui/form-control';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { cssInterop } from 'nativewind';
-const SCOPE = 'FORM_CONTROL';
-const PrimitiveIcon = React.forwardRef(({ height, width, fill = 'none', color, size, as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} color={color} {...props}/>);
-});
-const formControlStyle = tva({
-    base: 'flex flex-col',
-    variants: {
-        size: {
-            sm: '',
-            md: '',
-            lg: '',
-        },
-    },
-});
-const formControlErrorIconStyle = tva({
-    base: '',
-    variants: {
-        size: {
-            '2xs': 'h-3 w-3',
-            'xs': 'h-3.5 w-3.5',
-            'sm': 'h-4 w-4',
-            'md': 'h-[18px] w-[18px]',
-            'lg': 'h-5 w-5',
-            'xl': 'h-6 w-6',
-        },
-    },
-});
-const formControlErrorStyle = tva({
-    base: 'flex flex-row justify-start items-center mt-1 gap-1',
-});
-const formControlErrorTextStyle = tva({
-    base: 'text-error-700',
-    variants: {
-        isTruncated: {
-            true: 'web:truncate',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-base',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow-500',
-        },
-    },
-});
-const formControlHelperStyle = tva({
-    base: 'flex flex-row justify-start items-center mt-1',
-});
-const formControlHelperTextStyle = tva({
-    base: 'text-typography-500',
-    variants: {
-        isTruncated: {
-            true: 'web:truncate',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-base',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow-500',
-        },
-    },
-});
-const formControlLabelStyle = tva({
-    base: 'flex flex-row justify-start items-center mb-1',
-});
-const formControlLabelTextStyle = tva({
-    base: 'font-medium text-typography-900',
-    variants: {
-        isTruncated: {
-            true: 'web:truncate',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-base',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow-500',
-        },
-    },
-});
-const formControlLabelAstrickStyle = tva({
-    base: 'font-medium text-typography-900',
-    variants: {
-        isTruncated: {
-            true: 'web:truncate',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-base',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow-500',
-        },
-    },
-});
-const FormControlLabelAstrick = ({ className, ...props }) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<Text className={formControlLabelAstrickStyle({
-            parentVariants: { size: parentSize },
-            class: className,
-        })} {...props}/>);
-};
-export const UIFormControl = createFormControl({
-    Root: withStyleContext(View, SCOPE),
-    Error: View,
-    ErrorText: Text,
-    ErrorIcon: PrimitiveIcon,
-    Label: View,
-    LabelText: Text,
-    LabelAstrick: FormControlLabelAstrick,
-    Helper: View,
-    HelperText: Text,
-});
-cssInterop(UIFormControl, { className: 'style' });
-cssInterop(UIFormControl.Error, { className: 'style' });
-cssInterop(UIFormControl.Error.Text, { className: 'style' });
-cssInterop(UIFormControl.Label, { className: 'style' });
-cssInterop(UIFormControl.Label.Text, { className: 'style' });
-cssInterop(UIFormControl.Helper, { className: 'style' });
-cssInterop(UIFormControl.Helper.Text, { className: 'style' });
-cssInterop(UIFormControl.Error.Icon, {
-    className: {
-        target: 'style',
-        nativeStyleToProp: {
-            height: 'height',
-            width: 'width',
-            //@ts-ignore
-            fill: 'fill',
-            color: 'color',
-        },
-    },
-});
-const FormControl = ({ className, size = 'md', ...props }) => {
-    return (<UIFormControl className={formControlStyle({ class: className })} {...props} context={{ size }}/>);
-};
-const FormControlError = ({ className, ...props }) => {
-    return (<UIFormControl.Error className={formControlErrorStyle({ class: className })} {...props}/>);
-};
-const FormControlErrorText = ({ className, size, ...props }) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UIFormControl.Error.Text className={formControlErrorTextStyle({
-            parentVariants: { size: parentSize },
-            size,
-            class: className,
-        })} {...props}/>);
-};
-const FormControlErrorIcon = ({ className, size, color = 'red', ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    if (typeof size === 'number') {
-        return (<UIFormControl.Error.Icon ref={ref} {...props} color={color} className={formControlErrorIconStyle({ class: className })} size={size}/>);
-    }
-    else if ((props.height !== undefined || props.width !== undefined) &&
-        size === undefined) {
-        return (<UIFormControl.Error.Icon ref={ref} {...props} color={color} className={formControlErrorIconStyle({ class: className })}/>);
-    }
-    return (<UIFormControl.Error.Icon className={formControlErrorIconStyle({
-            parentVariants: { size: parentSize },
-            size,
-            class: className,
-        })} color={color} {...props}/>);
-};
-const FormControlLabel = ({ className, ...props }) => {
-    return (<UIFormControl.Label className={formControlLabelStyle({ class: className })} {...props}/>);
-};
-const FormControlLabelText = ({ className, size, ...props }) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UIFormControl.Label.Text className={formControlLabelTextStyle({
-            parentVariants: { size: parentSize },
-            size,
-            class: className,
-        })} {...props}/>);
-};
-const FormControlHelper = ({ className, ...props }) => {
-    return (<UIFormControl.Helper className={formControlHelperStyle({
-            class: className,
-        })} {...props}/>);
-};
-const FormControlHelperText = ({ className, size, ...props }) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UIFormControl.Helper.Text className={formControlHelperTextStyle({
-            parentVariants: { size: parentSize },
-            size,
-            class: className,
-        })} {...props}/>);
-};
-FormControl.displayName = 'FormControl';
-FormControlError.displayName = 'FormControlError';
-FormControlErrorText.displayName = 'FormControlErrorText';
-FormControlErrorIcon.displayName = 'FormControlErrorIcon';
-FormControlLabel.displayName = 'FormControlLabel';
-FormControlLabelText.displayName = 'FormControlLabelText';
-FormControlLabelAstrick.displayName = 'FormControlLabelAstrick';
-FormControlHelper.displayName = 'FormControlHelper';
-FormControlHelperText.displayName = 'FormControlHelperText';
-export { FormControl, FormControlError, FormControlErrorText, FormControlErrorIcon, FormControlLabel, FormControlLabelText, FormControlLabelAstrick, FormControlHelper, FormControlHelperText, };
diff --git a/universal/packages/components/ui/form-control/index.tsx b/universal/packages/components/ui/form-control/index.tsx
index fcdf8cc1..895b207a 100644
--- a/universal/packages/components/ui/form-control/index.tsx
+++ b/universal/packages/components/ui/form-control/index.tsx
@@ -1,7 +1,6 @@
 'use client';
 import { Text, View } from 'react-native';
-import React, { useMemo } from 'react';
-import { Svg } from 'react-native-svg';
+import React from 'react';
 import { createFormControl } from '@gluestack-ui/form-control';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
@@ -10,50 +9,10 @@ import {
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
 const SCOPE = 'FORM_CONTROL';
 
-type IPrimitiveIcon = React.ComponentPropsWithoutRef<typeof Svg> & {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
-
 const formControlStyle = tva({
   base: 'flex flex-col',
   variants: {
@@ -278,7 +237,7 @@ export const UIFormControl = createFormControl({
   Root: withStyleContext(View, SCOPE),
   Error: View,
   ErrorText: Text,
-  ErrorIcon: PrimitiveIcon,
+  ErrorIcon: UIIcon,
   Label: View,
   LabelText: Text,
   LabelAstrick: FormControlLabelAstrick,
@@ -286,20 +245,12 @@ export const UIFormControl = createFormControl({
   HelperText: Text,
 });
 
-cssInterop(UIFormControl, { className: 'style' });
-cssInterop(UIFormControl.Error, { className: 'style' });
-cssInterop(UIFormControl.Error.Text, { className: 'style' });
-cssInterop(UIFormControl.Label, { className: 'style' });
-cssInterop(UIFormControl.Label.Text, { className: 'style' });
-cssInterop(UIFormControl.Helper, { className: 'style' });
-cssInterop(UIFormControl.Helper.Text, { className: 'style' });
-cssInterop(UIFormControl.Error.Icon, {
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
       height: true,
       width: true,
-      // @ts-ignore
       fill: true,
       color: true,
       stroke: true,
diff --git a/universal/packages/components/ui/gluestack-ui-provider/config.d.ts b/universal/packages/components/ui/gluestack-ui-provider/config.d.ts
deleted file mode 100644
index 3be2246d..00000000
--- a/universal/packages/components/ui/gluestack-ui-provider/config.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export declare const config: {
-    light: Record<string, string>;
-    dark: Record<string, string>;
-};
diff --git a/universal/packages/components/ui/gluestack-ui-provider/config.js b/universal/packages/components/ui/gluestack-ui-provider/config.js
deleted file mode 100644
index 0a06501d..00000000
--- a/universal/packages/components/ui/gluestack-ui-provider/config.js
+++ /dev/null
@@ -1,304 +0,0 @@
-"use client";
-import { vars } from "nativewind";
-export const config = {
-    light: vars({
-        "--color-primary-0": "#B3B3B3",
-        "--color-primary-50": "#999999",
-        "--color-primary-100": "#808080",
-        "--color-primary-200": "#737373",
-        "--color-primary-300": "#666666",
-        "--color-primary-400": "#525252",
-        "--color-primary-500": "#333333",
-        "--color-primary-600": "#292929",
-        "--color-primary-700": "#1F1F1F",
-        "--color-primary-800": "#0D0D0D",
-        "--color-primary-900": "#0A0A0A",
-        "--color-primary-950": "#080808",
-        /* Secondary  */
-        "--color-secondary-0": "#FEFFFF",
-        "--color-secondary-50": "#F1F2F2",
-        "--color-secondary-100": "#E7E8E8",
-        "--color-secondary-200": "#DBDBDB",
-        "--color-secondary-300": "#AFB0B0",
-        "--color-secondary-400": "#727373",
-        "--color-secondary-500": "#5E5F5F",
-        "--color-secondary-600": "#515252",
-        "--color-secondary-700": "#3F4040",
-        "--color-secondary-800": "#272626",
-        "--color-secondary-900": "#181717",
-        "--color-secondary-950": "#0B0C0C",
-        /* Tertiary */
-        "--color-tertiary-0": "#FFFAF5",
-        "--color-tertiary-50": "#FFF2E5",
-        "--color-tertiary-100": "#FFE9D5",
-        "--color-tertiary-200": "#FED1AA",
-        "--color-tertiary-300": "#FDB474",
-        "--color-tertiary-400": "#FB9D4B",
-        "--color-tertiary-500": "#E78128",
-        "--color-tertiary-600": "#D7751F",
-        "--color-tertiary-700": "#B4621A",
-        "--color-tertiary-800": "#824917",
-        "--color-tertiary-900": "#6C3D13",
-        "--color-tertiary-950": "#543112",
-        /* Error */
-        "--color-error-0": "#FEE9E9",
-        "--color-error-50": "#FEE2E2",
-        "--color-error-100": "#FECACA",
-        "--color-error-200": "#FCA5A5",
-        "--color-error-300": "#F87171",
-        "--color-error-400": "#EF4444",
-        "--color-error-500": "#E63535",
-        "--color-error-600": "#DC2626",
-        "--color-error-700": "#B91C1C",
-        "--color-error-800": "#991B1B",
-        "--color-error-900": "#7F1D1D",
-        "--color-error-950": "#531313",
-        /* Success */
-        "--color-success-0": "#E4FFF4",
-        "--color-success-50": "#CAFFE8",
-        "--color-success-100": "#A2F1C0",
-        "--color-success-200": "#84D3A2",
-        "--color-success-300": "#66B584",
-        "--color-success-400": "#489766",
-        "--color-success-500": "#348352",
-        "--color-success-600": "#2A7948",
-        "--color-success-700": "#206F3E",
-        "--color-success-800": "#166534",
-        "--color-success-900": "#14532D",
-        "--color-success-950": "#1B3224",
-        /* Warning */
-        "--color-warning-0": "#FFFDFB",
-        "--color-warning-50": "#FFF9F5",
-        "--color-warning-100": "#FFE7D5",
-        "--color-warning-200": "#FECDAA",
-        "--color-warning-300": "#FDAD74",
-        "--color-warning-400": "#FB954B",
-        "--color-warning-500": "#E77828",
-        "--color-warning-600": "#D76C1F",
-        "--color-warning-700": "#B45A1A",
-        "--color-warning-800": "#824417",
-        "--color-warning-900": "#6C3813",
-        "--color-warning-950": "#542D12",
-        /* Info */
-        "--color-info-0": "#ECF8FE",
-        "--color-info-50": "#C7EBFC",
-        "--color-info-100": "#A2DDFA",
-        "--color-info-200": "#7CCFF8",
-        "--color-info-300": "#57C2F6",
-        "--color-info-400": "#32B4F4",
-        "--color-info-500": "#0DA6F2",
-        "--color-info-600": "#0B8DCD",
-        "--color-info-700": "#0973A8",
-        "--color-info-800": "#075A83",
-        "--color-info-900": "#05405D",
-        "--color-info-950": "#032638",
-        /* Typography */
-        "--color-typography-0": "#FEFEFF",
-        "--color-typography-50": "#F5F5F5",
-        "--color-typography-100": "#E5E5E5",
-        "--color-typography-200": "#DBDBDC",
-        "--color-typography-300": "#D4D4D4",
-        "--color-typography-400": "#A3A3A3",
-        "--color-typography-500": "#8C8C8C",
-        "--color-typography-600": "#737373",
-        "--color-typography-700": "#525252",
-        "--color-typography-800": "#404040",
-        "--color-typography-900": "#262627",
-        "--color-typography-950": "#171717",
-        /* Outline */
-        "--color-outline-0": "#FDFEFE",
-        "--color-outline-50": "#F3F3F3",
-        "--color-outline-100": "#E6E6E6",
-        "--color-outline-200": "#DDDCDB",
-        "--color-outline-300": "#D3D3D3",
-        "--color-outline-400": "#A5A3A3",
-        "--color-outline-500": "#8C8D8D",
-        "--color-outline-600": "#737474",
-        "--color-outline-700": "#535252",
-        "--color-outline-800": "#414141",
-        "--color-outline-900": "#272624",
-        "--color-outline-950": "#1A1717",
-        /* Background */
-        "--color-background-0": "#FFFFFF",
-        "--color-background-50": "#F6F6F6",
-        "--color-background-100": "#F2F1F1",
-        "--color-background-200": "#DCDBDB",
-        "--color-background-300": "#D5D4D4",
-        "--color-background-400": "#A2A3A3",
-        "--color-background-500": "#8E8E8E",
-        "--color-background-600": "#747474",
-        "--color-background-700": "#535252",
-        "--color-background-800": "#414040",
-        "--color-background-900": "#272625",
-        "--color-background-950": "#181718",
-        /* Background Special */
-        "--color-background-error": "#FEF1F1",
-        "--color-background-warning": "#FFF4EB",
-        "--color-background-success": "#EDFCF2",
-        "--color-background-muted": "#F6F6F7",
-        "--color-background-info": "#EBF8FE",
-        /* Border */
-        "--color-border-0": "#FDFEFE",
-        "--color-border-50": "#F3F3F3",
-        "--color-border-100": "#E6E6E6",
-        "--color-border-200": "#DDDCDB",
-        "--color-border-300": "#D3D3D3",
-        "--color-border-400": "#A5A3A3",
-        "--color-border-500": "#8C8D8D",
-        "--color-border-600": "#737474",
-        "--color-border-700": "#535252",
-        "--color-border-800": "#414141",
-        "--color-border-900": "#272624",
-        "--color-border-950": "#1A1717",
-    }),
-    dark: vars({
-        "--color-primary-0": "#828282",
-        "--color-primary-50": "#949494",
-        "--color-primary-100": "#9E9E9E",
-        "--color-primary-200": "#B3B3B3",
-        "--color-primary-300": "#C7C7C7",
-        "--color-primary-400": "#E6E6E6",
-        "--color-primary-500": "#F0F0F0",
-        "--color-primary-600": "#FAFAFA",
-        "--color-primary-700": "#FCFCFC",
-        "--color-primary-800": "#FDFDFD",
-        "--color-primary-900": "#FDFCFC",
-        "--color-primary-950": "#FDFCFC",
-        /* Secondary  */
-        "--color-secondary-0": "#0B0C0C",
-        "--color-secondary-50": "#181717",
-        "--color-secondary-100": "#272626",
-        "--color-secondary-200": "#3F4040",
-        "--color-secondary-300": "#515252",
-        "--color-secondary-400": "#5E5F5F",
-        "--color-secondary-500": "#727373",
-        "--color-secondary-600": "#AFB0B0",
-        "--color-secondary-700": "#DBDBDB",
-        "--color-secondary-800": "#E7E8E8",
-        "--color-secondary-900": "#F1F2F2",
-        "--color-secondary-950": "#FEFFFF",
-        /* Tertiary */
-        "--color-tertiary-0": "#543112",
-        "--color-tertiary-50": "#6C3D13",
-        "--color-tertiary-100": "#824917",
-        "--color-tertiary-200": "#B4621A",
-        "--color-tertiary-300": "#D7751F",
-        "--color-tertiary-400": "#E78128",
-        "--color-tertiary-500": "#FB9D4B",
-        "--color-tertiary-600": "#FDB474",
-        "--color-tertiary-700": "#FED1AA",
-        "--color-tertiary-800": "#FFE9D5",
-        "--color-tertiary-900": "#FFF2E5",
-        "--color-tertiary-950": "#FFFAF5",
-        /* Error */
-        "--color-error-0": "#531313",
-        "--color-error-50": "#7F1D1D",
-        "--color-error-100": "#991B1B",
-        "--color-error-200": "#B91C1C",
-        "--color-error-300": "#DC2626",
-        "--color-error-400": "#E63535",
-        "--color-error-500": "#EF4444",
-        "--color-error-600": "#F87171",
-        "--color-error-700": "#E63534",
-        "--color-error-800": "#FECACA",
-        "--color-error-900": "#FEE2E2",
-        "--color-error-950": "#FEE9E9",
-        /* Success */
-        "--color-success-0": "#1B3224",
-        "--color-success-50": "#14532D",
-        "--color-success-100": "#166534",
-        "--color-success-200": "#206F3E",
-        "--color-success-300": "#2A7948",
-        "--color-success-400": "#348352",
-        "--color-success-500": "#489766",
-        "--color-success-600": "#66B584",
-        "--color-success-700": "#84D3A2",
-        "--color-success-800": "#A2F1C0",
-        "--color-success-900": "#CAFFE8",
-        "--color-success-950": "#E4FFF4",
-        /* Warning */
-        "--color-warning-0": "#542D12",
-        "--color-warning-50": "#6C3813",
-        "--color-warning-100": "#824417",
-        "--color-warning-200": "#B45A1A",
-        "--color-warning-300": "#D76C1F",
-        "--color-warning-400": "#E77828",
-        "--color-warning-500": "#FB954B",
-        "--color-warning-600": "#FDAD74",
-        "--color-warning-700": "#FECDAA",
-        "--color-warning-800": "#FFE7D5",
-        "--color-warning-900": "#FFF9F5",
-        "--color-warning-950": "#FFFDFB",
-        /* Info */
-        "--color-info-0": "#032638",
-        "--color-info-50": "#05405D",
-        "--color-info-100": "#075A83",
-        "--color-info-200": "#0973A8",
-        "--color-info-300": "#0B8DCD",
-        "--color-info-400": "#0DA6F2",
-        "--color-info-500": "#32B4F4",
-        "--color-info-600": "#57C2F6",
-        "--color-info-700": "#7CCFF8",
-        "--color-info-800": "#A2DDFA",
-        "--color-info-900": "#C7EBFC",
-        "--color-info-950": "#ECF8FE",
-        /* Typography */
-        "--color-typography-0": "#171717",
-        "--color-typography-50": "#262627",
-        "--color-typography-100": "#404040",
-        "--color-typography-200": "#525252",
-        "--color-typography-300": "#737373",
-        "--color-typography-400": "#8C8C8C",
-        "--color-typography-500": "#A3A3A3",
-        "--color-typography-600": "#D4D4D4",
-        "--color-typography-700": "#DBDBDC",
-        "--color-typography-800": "#E5E5E5",
-        "--color-typography-900": "#F5F5F5",
-        "--color-typography-950": "#FEFEFF",
-        /* Outline */
-        "--color-outline-0": "#1A1717",
-        "--color-outline-50": "#272624",
-        "--color-outline-100": "#414141",
-        "--color-outline-200": "#535252",
-        "--color-outline-300": "#737474",
-        "--color-outline-400": "#8C8D8D",
-        "--color-outline-500": "#A5A3A3",
-        "--color-outline-600": "#D3D3D3",
-        "--color-outline-700": "#DDDCDB",
-        "--color-outline-800": "#E6E6E6",
-        "--color-outline-900": "#F3F3F3",
-        "--color-outline-950": "#FDFEFE",
-        /* Background */
-        "--color-background-0": "#121212",
-        "--color-background-50": "#272625",
-        "--color-background-100": "#414040",
-        "--color-background-200": "#535252",
-        "--color-background-300": "#747474",
-        "--color-background-400": "#8E8E8E",
-        "--color-background-500": "#A2A3A3",
-        "--color-background-600": "#D5D4D4",
-        "--color-background-700": "#DCDBDB",
-        "--color-background-800": "#F2F1F1",
-        "--color-background-900": "#F6F6F6",
-        "--color-background-950": "#FEFEFE",
-        /* Background Special */
-        "--color-background-error": "#422B2B",
-        "--color-background-warning": "#412F23",
-        "--color-background-success": "#1C2B21",
-        "--color-background-muted": "#252526",
-        "--color-background-info": "#1A282E",
-        /* Border */
-        "--color-border-0": "#1A1717",
-        "--color-border-50": "#272624",
-        "--color-border-100": "#414141",
-        "--color-border-200": "#535252",
-        "--color-border-300": "#737474",
-        "--color-border-400": "#8C8D8D",
-        "--color-border-500": "#A5A3A3",
-        "--color-border-600": "#D3D3D3",
-        "--color-border-700": "#DDDCDB",
-        "--color-border-800": "#E6E6E6",
-        "--color-border-900": "#F3F3F3",
-        "--color-border-950": "#FDFEFE",
-    }),
-};
diff --git a/universal/packages/components/ui/gluestack-ui-provider/config.ts b/universal/packages/components/ui/gluestack-ui-provider/config.ts
index 3b42a91a..f388cc6e 100644
--- a/universal/packages/components/ui/gluestack-ui-provider/config.ts
+++ b/universal/packages/components/ui/gluestack-ui-provider/config.ts
@@ -1,326 +1,309 @@
-"use client";
-import { vars } from "nativewind";
+'use client';
+import { vars } from 'nativewind';
 
 export const config = {
   light: vars({
-    "--color-primary-0": "#B3B3B3",
-    "--color-primary-50": "#999999",
-    "--color-primary-100": "#808080",
-    "--color-primary-200": "#737373",
-    "--color-primary-300": "#666666",
-    "--color-primary-400": "#525252",
-    "--color-primary-500": "#333333",
-    "--color-primary-600": "#292929",
-    "--color-primary-700": "#1F1F1F",
-    "--color-primary-800": "#0D0D0D",
-    "--color-primary-900": "#0A0A0A",
-    "--color-primary-950": "#080808",
+    '--color-primary-0': '179 179 179',
+    '--color-primary-50': '153 153 153',
+    '--color-primary-100': '128 128 128',
+    '--color-primary-200': '115 115 115',
+    '--color-primary-300': '102 102 102',
+    '--color-primary-400': '82 82 82',
+    '--color-primary-500': '51 51 51',
+    '--color-primary-600': '41 41 41',
+    '--color-primary-700': '31 31 31',
+    '--color-primary-800': '13 13 13',
+    '--color-primary-900': '10 10 10',
+    '--color-primary-950': '8 8 8',
 
     /* Secondary  */
-    "--color-secondary-0": "#FEFFFF",
-    "--color-secondary-50": "#F1F2F2",
-    "--color-secondary-100": "#E7E8E8",
-    "--color-secondary-200": "#DBDBDB",
-    "--color-secondary-300": "#AFB0B0",
-    "--color-secondary-400": "#727373",
-    "--color-secondary-500": "#5E5F5F",
-    "--color-secondary-600": "#515252",
-    "--color-secondary-700": "#3F4040",
-    "--color-secondary-800": "#272626",
-    "--color-secondary-900": "#181717",
-    "--color-secondary-950": "#0B0C0C",
+    '--color-secondary-0': '253 253 253',
+    '--color-secondary-50': '251 251 251',
+    '--color-secondary-100': '246 246 246',
+    '--color-secondary-200': '242 242 242',
+    '--color-secondary-300': '237 237 237',
+    '--color-secondary-400': '230 230 231',
+    '--color-secondary-500': '217 217 219',
+    '--color-secondary-600': '198 199 199',
+    '--color-secondary-700': '189 189 189',
+    '--color-secondary-800': '177 177 177',
+    '--color-secondary-900': '165 164 164',
+    '--color-secondary-950': '157 157 157',
 
     /* Tertiary */
-    "--color-tertiary-0": "#FFFAF5",
-    "--color-tertiary-50": "#FFF2E5",
-    "--color-tertiary-100": "#FFE9D5",
-    "--color-tertiary-200": "#FED1AA",
-    "--color-tertiary-300": "#FDB474",
-    "--color-tertiary-400": "#FB9D4B",
-    "--color-tertiary-500": "#E78128",
-    "--color-tertiary-600": "#D7751F",
-    "--color-tertiary-700": "#B4621A",
-    "--color-tertiary-800": "#824917",
-    "--color-tertiary-900": "#6C3D13",
-    "--color-tertiary-950": "#543112",
+    '--color-tertiary-0': '255 250 245',
+    '--color-tertiary-50': '255 242 229',
+    '--color-tertiary-100': '255 233 213',
+    '--color-tertiary-200': '254 209 170',
+    '--color-tertiary-300': '253 180 116',
+    '--color-tertiary-400': '251 157 75',
+    '--color-tertiary-500': '231 129 40',
+    '--color-tertiary-600': '215 117 31',
+    '--color-tertiary-700': '180 98 26',
+    '--color-tertiary-800': '130 73 23',
+    '--color-tertiary-900': '108 61 19',
+    '--color-tertiary-950': '84 49 18',
 
     /* Error */
-    "--color-error-0": "#FEE9E9",
-    "--color-error-50": "#FEE2E2",
-    "--color-error-100": "#FECACA",
-    "--color-error-200": "#FCA5A5",
-    "--color-error-300": "#F87171",
-    "--color-error-400": "#EF4444",
-    "--color-error-500": "#E63535",
-    "--color-error-600": "#DC2626",
-    "--color-error-700": "#B91C1C",
-    "--color-error-800": "#991B1B",
-    "--color-error-900": "#7F1D1D",
-    "--color-error-950": "#531313",
+    '--color-error-0': '254 233 233',
+    '--color-error-50': '254 226 226',
+    '--color-error-100': '254 202 202',
+    '--color-error-200': '252 165 165',
+    '--color-error-300': '248 113 113',
+    '--color-error-400': '239 68 68',
+    '--color-error-500': '230 53 53',
+    '--color-error-600': '220 38 38',
+    '--color-error-700': '185 28 28',
+    '--color-error-800': '153 27 27',
+    '--color-error-900': '127 29 29',
+    '--color-error-950': '83 19 19',
 
     /* Success */
-    "--color-success-0": "#E4FFF4",
-    "--color-success-50": "#CAFFE8",
-    "--color-success-100": "#A2F1C0",
-    "--color-success-200": "#84D3A2",
-    "--color-success-300": "#66B584",
-    "--color-success-400": "#489766",
-    "--color-success-500": "#348352",
-    "--color-success-600": "#2A7948",
-    "--color-success-700": "#206F3E",
-    "--color-success-800": "#166534",
-    "--color-success-900": "#14532D",
-    "--color-success-950": "#1B3224",
+    '--color-success-0': '228 255 244',
+    '--color-success-50': '202 255 232',
+    '--color-success-100': '162 241 192',
+    '--color-success-200': '132 211 162',
+    '--color-success-300': '102 181 132',
+    '--color-success-400': '72 151 102',
+    '--color-success-500': '52 131 82',
+    '--color-success-600': '42 121 72',
+    '--color-success-700': '32 111 62',
+    '--color-success-800': '22 101 52',
+    '--color-success-900': '20 83 45',
+    '--color-success-950': '27 50 36',
 
     /* Warning */
-    "--color-warning-0": "#FFFDFB",
-    "--color-warning-50": "#FFF9F5",
-    "--color-warning-100": "#FFE7D5",
-    "--color-warning-200": "#FECDAA",
-    "--color-warning-300": "#FDAD74",
-    "--color-warning-400": "#FB954B",
-    "--color-warning-500": "#E77828",
-    "--color-warning-600": "#D76C1F",
-    "--color-warning-700": "#B45A1A",
-    "--color-warning-800": "#824417",
-    "--color-warning-900": "#6C3813",
-    "--color-warning-950": "#542D12",
+    '--color-warning-0': '255 249 245',
+    '--color-warning-50': '255 244 236',
+    '--color-warning-100': '255 231 213',
+    '--color-warning-200': '254 205 170',
+    '--color-warning-300': '253 173 116',
+    '--color-warning-400': '251 149 75',
+    '--color-warning-500': '231 120 40',
+    '--color-warning-600': '215 108 31',
+    '--color-warning-700': '180 90 26',
+    '--color-warning-800': '130 68 23',
+    '--color-warning-900': '108 56 19',
+    '--color-warning-950': '84 45 18',
 
     /* Info */
-    "--color-info-0": "#ECF8FE",
-    "--color-info-50": "#C7EBFC",
-    "--color-info-100": "#A2DDFA",
-    "--color-info-200": "#7CCFF8",
-    "--color-info-300": "#57C2F6",
-    "--color-info-400": "#32B4F4",
-    "--color-info-500": "#0DA6F2",
-    "--color-info-600": "#0B8DCD",
-    "--color-info-700": "#0973A8",
-    "--color-info-800": "#075A83",
-    "--color-info-900": "#05405D",
-    "--color-info-950": "#032638",
+    '--color-info-0': '236 248 254',
+    '--color-info-50': '199 235 252',
+    '--color-info-100': '162 221 250',
+    '--color-info-200': '124 207 248',
+    '--color-info-300': '87 194 246',
+    '--color-info-400': '50 180 244',
+    '--color-info-500': '13 166 242',
+    '--color-info-600': '11 141 205',
+    '--color-info-700': '9 115 168',
+    '--color-info-800': '7 90 131',
+    '--color-info-900': '5 64 93',
+    '--color-info-950': '3 38 56',
 
     /* Typography */
-    "--color-typography-0": "#FEFEFF",
-    "--color-typography-50": "#F5F5F5",
-    "--color-typography-100": "#E5E5E5",
-    "--color-typography-200": "#DBDBDC",
-    "--color-typography-300": "#D4D4D4",
-    "--color-typography-400": "#A3A3A3",
-    "--color-typography-500": "#8C8C8C",
-    "--color-typography-600": "#737373",
-    "--color-typography-700": "#525252",
-    "--color-typography-800": "#404040",
-    "--color-typography-900": "#262627",
-    "--color-typography-950": "#171717",
+    '--color-typography-0': '254 254 255',
+    '--color-typography-50': '245 245 245',
+    '--color-typography-100': '229 229 229',
+    '--color-typography-200': '219 219 220',
+    '--color-typography-300': '212 212 212',
+    '--color-typography-400': '163 163 163',
+    '--color-typography-500': '140 140 140',
+    '--color-typography-600': '115 115 115',
+    '--color-typography-700': '82 82 82',
+    '--color-typography-800': '64 64 64',
+    '--color-typography-900': '38 38 39',
+    '--color-typography-950': '23 23 23',
 
     /* Outline */
-    "--color-outline-0": "#FDFEFE",
-    "--color-outline-50": "#F3F3F3",
-    "--color-outline-100": "#E6E6E6",
-    "--color-outline-200": "#DDDCDB",
-    "--color-outline-300": "#D3D3D3",
-    "--color-outline-400": "#A5A3A3",
-    "--color-outline-500": "#8C8D8D",
-    "--color-outline-600": "#737474",
-    "--color-outline-700": "#535252",
-    "--color-outline-800": "#414141",
-    "--color-outline-900": "#272624",
-    "--color-outline-950": "#1A1717",
+    '--color-outline-0': '253 254 254',
+    '--color-outline-50': '243 243 243',
+    '--color-outline-100': '230 230 230',
+    '--color-outline-200': '221 220 219',
+    '--color-outline-300': '211 211 211',
+    '--color-outline-400': '165 163 163',
+    '--color-outline-500': '140 141 141',
+    '--color-outline-600': '115 116 116',
+    '--color-outline-700': '83 82 82',
+    '--color-outline-800': '65 65 65',
+    '--color-outline-900': '39 38 36',
+    '--color-outline-950': '26 23 23',
+
     /* Background */
-    "--color-background-0": "#FFFFFF",
-    "--color-background-50": "#F6F6F6",
-    "--color-background-100": "#F2F1F1",
-    "--color-background-200": "#DCDBDB",
-    "--color-background-300": "#D5D4D4",
-    "--color-background-400": "#A2A3A3",
-    "--color-background-500": "#8E8E8E",
-    "--color-background-600": "#747474",
-    "--color-background-700": "#535252",
-    "--color-background-800": "#414040",
-    "--color-background-900": "#272625",
-    "--color-background-950": "#181718",
+    '--color-background-0': '255 255 255',
+    '--color-background-50': '246 246 246',
+    '--color-background-100': '242 241 241',
+    '--color-background-200': '220 219 219',
+    '--color-background-300': '213 212 212',
+    '--color-background-400': '162 163 163',
+    '--color-background-500': '142 142 142',
+    '--color-background-600': '116 116 116',
+    '--color-background-700': '83 82 82',
+    '--color-background-800': '65 64 64',
+    '--color-background-900': '39 38 37',
+    '--color-background-950': '18 18 18',
 
     /* Background Special */
-    "--color-background-error": "#FEF1F1",
-    "--color-background-warning": "#FFF4EB",
-    "--color-background-success": "#EDFCF2",
-    "--color-background-muted": "#F6F6F7",
-    "--color-background-info": "#EBF8FE",
+    '--color-background-error': '254 241 241',
+    '--color-background-warning': '255 243 234',
+    '--color-background-success': '237 252 242',
+    '--color-background-muted': '247 248 247',
+    '--color-background-info': '235 248 254',
 
-    /* Border */
-    "--color-border-0": "#FDFEFE",
-    "--color-border-50": "#F3F3F3",
-    "--color-border-100": "#E6E6E6",
-    "--color-border-200": "#DDDCDB",
-    "--color-border-300": "#D3D3D3",
-    "--color-border-400": "#A5A3A3",
-    "--color-border-500": "#8C8D8D",
-    "--color-border-600": "#737474",
-    "--color-border-700": "#535252",
-    "--color-border-800": "#414141",
-    "--color-border-900": "#272624",
-    "--color-border-950": "#1A1717",
+    /* Focus Ring Indicator  */
+    '--color-indicator-primary': '55 55 55',
+    '--color-indicator-info': '83 153 236',
+    '--color-indicator-error': '185 28 28',
   }),
   dark: vars({
-    "--color-primary-0": "#828282",
-    "--color-primary-50": "#949494",
-    "--color-primary-100": "#9E9E9E",
-    "--color-primary-200": "#B3B3B3",
-    "--color-primary-300": "#C7C7C7",
-    "--color-primary-400": "#E6E6E6",
-    "--color-primary-500": "#F0F0F0",
-    "--color-primary-600": "#FAFAFA",
-    "--color-primary-700": "#FCFCFC",
-    "--color-primary-800": "#FDFDFD",
-    "--color-primary-900": "#FDFCFC",
-    "--color-primary-950": "#FDFCFC",
+    '--color-primary-0': '166 166 166',
+    '--color-primary-50': '175 175 175',
+    '--color-primary-100': '186 186 186',
+    '--color-primary-200': '197 197 197',
+    '--color-primary-300': '212 212 212',
+    '--color-primary-400': '221 221 221',
+    '--color-primary-500': '230 230 230',
+    '--color-primary-600': '240 240 240',
+    '--color-primary-700': '250 250 250',
+    '--color-primary-800': '253 253 253',
+    '--color-primary-900': '254 249 249',
+    '--color-primary-950': '253 252 252',
 
     /* Secondary  */
-    "--color-secondary-0": "#0B0C0C",
-    "--color-secondary-50": "#181717",
-    "--color-secondary-100": "#272626",
-    "--color-secondary-200": "#3F4040",
-    "--color-secondary-300": "#515252",
-    "--color-secondary-400": "#5E5F5F",
-    "--color-secondary-500": "#727373",
-    "--color-secondary-600": "#AFB0B0",
-    "--color-secondary-700": "#DBDBDB",
-    "--color-secondary-800": "#E7E8E8",
-    "--color-secondary-900": "#F1F2F2",
-    "--color-secondary-950": "#FEFFFF",
+    '--color-secondary-0': '20 20 20',
+    '--color-secondary-50': '23 23 23',
+    '--color-secondary-100': '31 31 31',
+    '--color-secondary-200': '39 39 39',
+    '--color-secondary-300': '44 44 44',
+    '--color-secondary-400': '56 57 57',
+    '--color-secondary-500': '63 64 64',
+    '--color-secondary-600': '86 86 86',
+    '--color-secondary-700': '110 110 110',
+    '--color-secondary-800': '135 135 135',
+    '--color-secondary-900': '150 150 150',
+    '--color-secondary-950': '164 164 164',
 
     /* Tertiary */
-    "--color-tertiary-0": "#543112",
-    "--color-tertiary-50": "#6C3D13",
-    "--color-tertiary-100": "#824917",
-    "--color-tertiary-200": "#B4621A",
-    "--color-tertiary-300": "#D7751F",
-    "--color-tertiary-400": "#E78128",
-    "--color-tertiary-500": "#FB9D4B",
-    "--color-tertiary-600": "#FDB474",
-    "--color-tertiary-700": "#FED1AA",
-    "--color-tertiary-800": "#FFE9D5",
-    "--color-tertiary-900": "#FFF2E5",
-    "--color-tertiary-950": "#FFFAF5",
+    '--color-tertiary-0': '84 49 18',
+    '--color-tertiary-50': '108 61 19',
+    '--color-tertiary-100': '130 73 23',
+    '--color-tertiary-200': '180 98 26',
+    '--color-tertiary-300': '215 117 31',
+    '--color-tertiary-400': '231 129 40',
+    '--color-tertiary-500': '251 157 75',
+    '--color-tertiary-600': '253 180 116',
+    '--color-tertiary-700': '254 209 170',
+    '--color-tertiary-800': '255 233 213',
+    '--color-tertiary-900': '255 242 229',
+    '--color-tertiary-950': '255 250 245',
 
     /* Error */
-    "--color-error-0": "#531313",
-    "--color-error-50": "#7F1D1D",
-    "--color-error-100": "#991B1B",
-    "--color-error-200": "#B91C1C",
-    "--color-error-300": "#DC2626",
-    "--color-error-400": "#E63535",
-    "--color-error-500": "#EF4444",
-    "--color-error-600": "#F87171",
-    "--color-error-700": "#E63534",
-    "--color-error-800": "#FECACA",
-    "--color-error-900": "#FEE2E2",
-    "--color-error-950": "#FEE9E9",
+    '--color-error-0': '83 19 19',
+    '--color-error-50': '127 29 29',
+    '--color-error-100': '153 27 27',
+    '--color-error-200': '185 28 28',
+    '--color-error-300': '220 38 38',
+    '--color-error-400': '230 53 53',
+    '--color-error-500': '239 68 68',
+    '--color-error-600': '249 97 96',
+    '--color-error-700': '229 91 90',
+    '--color-error-800': '254 202 202',
+    '--color-error-900': '254 226 226',
+    '--color-error-950': '254 233 233',
 
     /* Success */
-    "--color-success-0": "#1B3224",
-    "--color-success-50": "#14532D",
-    "--color-success-100": "#166534",
-    "--color-success-200": "#206F3E",
-    "--color-success-300": "#2A7948",
-    "--color-success-400": "#348352",
-    "--color-success-500": "#489766",
-    "--color-success-600": "#66B584",
-    "--color-success-700": "#84D3A2",
-    "--color-success-800": "#A2F1C0",
-    "--color-success-900": "#CAFFE8",
-    "--color-success-950": "#E4FFF4",
+    '--color-success-0': '27 50 36',
+    '--color-success-50': '20 83 45',
+    '--color-success-100': '22 101 52',
+    '--color-success-200': '32 111 62',
+    '--color-success-300': '42 121 72',
+    '--color-success-400': '52 131 82',
+    '--color-success-500': '72 151 102',
+    '--color-success-600': '102 181 132',
+    '--color-success-700': '132 211 162',
+    '--color-success-800': '162 241 192',
+    '--color-success-900': '202 255 232',
+    '--color-success-950': '228 255 244',
 
     /* Warning */
-    "--color-warning-0": "#542D12",
-    "--color-warning-50": "#6C3813",
-    "--color-warning-100": "#824417",
-    "--color-warning-200": "#B45A1A",
-    "--color-warning-300": "#D76C1F",
-    "--color-warning-400": "#E77828",
-    "--color-warning-500": "#FB954B",
-    "--color-warning-600": "#FDAD74",
-    "--color-warning-700": "#FECDAA",
-    "--color-warning-800": "#FFE7D5",
-    "--color-warning-900": "#FFF9F5",
-    "--color-warning-950": "#FFFDFB",
+    '--color-warning-0': '84 45 18',
+    '--color-warning-50': '108 56 19',
+    '--color-warning-100': '130 68 23',
+    '--color-warning-200': '180 90 26',
+    '--color-warning-300': '215 108 31',
+    '--color-warning-400': '231 120 40',
+    '--color-warning-500': '251 149 75',
+    '--color-warning-600': '253 173 116',
+    '--color-warning-700': '254 205 170',
+    '--color-warning-800': '255 231 213',
+    '--color-warning-900': '255 244 237',
+    '--color-warning-950': '255 249 245',
 
     /* Info */
-    "--color-info-0": "#032638",
-    "--color-info-50": "#05405D",
-    "--color-info-100": "#075A83",
-    "--color-info-200": "#0973A8",
-    "--color-info-300": "#0B8DCD",
-    "--color-info-400": "#0DA6F2",
-    "--color-info-500": "#32B4F4",
-    "--color-info-600": "#57C2F6",
-    "--color-info-700": "#7CCFF8",
-    "--color-info-800": "#A2DDFA",
-    "--color-info-900": "#C7EBFC",
-    "--color-info-950": "#ECF8FE",
+    '--color-info-0': '3 38 56',
+    '--color-info-50': '5 64 93',
+    '--color-info-100': '7 90 131',
+    '--color-info-200': '9 115 168',
+    '--color-info-300': '11 141 205',
+    '--color-info-400': '13 166 242',
+    '--color-info-500': '50 180 244',
+    '--color-info-600': '87 194 246',
+    '--color-info-700': '124 207 248',
+    '--color-info-800': '162 221 250',
+    '--color-info-900': '199 235 252',
+    '--color-info-950': '236 248 254',
 
     /* Typography */
-    "--color-typography-0": "#171717",
-    "--color-typography-50": "#262627",
-    "--color-typography-100": "#404040",
-    "--color-typography-200": "#525252",
-    "--color-typography-300": "#737373",
-    "--color-typography-400": "#8C8C8C",
-    "--color-typography-500": "#A3A3A3",
-    "--color-typography-600": "#D4D4D4",
-    "--color-typography-700": "#DBDBDC",
-    "--color-typography-800": "#E5E5E5",
-    "--color-typography-900": "#F5F5F5",
-    "--color-typography-950": "#FEFEFF",
+    '--color-typography-0': '23 23 23',
+    '--color-typography-50': '38 38 39',
+    '--color-typography-100': '64 64 64',
+    '--color-typography-200': '82 82 82',
+    '--color-typography-300': '115 115 115',
+    '--color-typography-400': '140 140 140',
+    '--color-typography-500': '163 163 163',
+    '--color-typography-600': '212 212 212',
+    '--color-typography-700': '219 219 220',
+    '--color-typography-800': '229 229 229',
+    '--color-typography-900': '245 245 245',
+    '--color-typography-950': '254 254 255',
 
     /* Outline */
-    "--color-outline-0": "#1A1717",
-    "--color-outline-50": "#272624",
-    "--color-outline-100": "#414141",
-    "--color-outline-200": "#535252",
-    "--color-outline-300": "#737474",
-    "--color-outline-400": "#8C8D8D",
-    "--color-outline-500": "#A5A3A3",
-    "--color-outline-600": "#D3D3D3",
-    "--color-outline-700": "#DDDCDB",
-    "--color-outline-800": "#E6E6E6",
-    "--color-outline-900": "#F3F3F3",
-    "--color-outline-950": "#FDFEFE",
+    '--color-outline-0': '26 23 23',
+    '--color-outline-50': '39 38 36',
+    '--color-outline-100': '65 65 65',
+    '--color-outline-200': '83 82 82',
+    '--color-outline-300': '115 116 116',
+    '--color-outline-400': '140 141 141',
+    '--color-outline-500': '165 163 163',
+    '--color-outline-600': '211 211 211',
+    '--color-outline-700': '221 220 219',
+    '--color-outline-800': '230 230 230',
+    '--color-outline-900': '243 243 243',
+    '--color-outline-950': '253 254 254',
 
     /* Background */
-    "--color-background-0": "#121212",
-    "--color-background-50": "#272625",
-    "--color-background-100": "#414040",
-    "--color-background-200": "#535252",
-    "--color-background-300": "#747474",
-    "--color-background-400": "#8E8E8E",
-    "--color-background-500": "#A2A3A3",
-    "--color-background-600": "#D5D4D4",
-    "--color-background-700": "#DCDBDB",
-    "--color-background-800": "#F2F1F1",
-    "--color-background-900": "#F6F6F6",
-    "--color-background-950": "#FEFEFE",
+    '--color-background-0': '18 18 18',
+    '--color-background-50': '39 38 37',
+    '--color-background-100': '65 64 64',
+    '--color-background-200': '83 82 82',
+    '--color-background-300': '116 116 116',
+    '--color-background-400': '142 142 142',
+    '--color-background-500': '162 163 163',
+    '--color-background-600': '213 212 212',
+    '--color-background-700': '229 228 228',
+    '--color-background-800': '242 241 241',
+    '--color-background-900': '246 246 246',
+    '--color-background-950': '255 255 255',
 
     /* Background Special */
-    "--color-background-error": "#422B2B",
-    "--color-background-warning": "#412F23",
-    "--color-background-success": "#1C2B21",
-    "--color-background-muted": "#252526",
-    "--color-background-info": "#1A282E",
+    '--color-background-error': '66 43 43',
+    '--color-background-warning': '65 47 35',
+    '--color-background-success': '28 43 33',
+    '--color-background-muted': '51 51 51',
+    '--color-background-info': '26 40 46',
 
-    /* Border */
-    "--color-border-0": "#1A1717",
-    "--color-border-50": "#272624",
-    "--color-border-100": "#414141",
-    "--color-border-200": "#535252",
-    "--color-border-300": "#737474",
-    "--color-border-400": "#8C8D8D",
-    "--color-border-500": "#A5A3A3",
-    "--color-border-600": "#D3D3D3",
-    "--color-border-700": "#DDDCDB",
-    "--color-border-800": "#E6E6E6",
-    "--color-border-900": "#F3F3F3",
-    "--color-border-950": "#FDFEFE",
+    /* Focus Ring Indicator  */
+    '--color-indicator-primary': '247 247 247',
+    '--color-indicator-info': '161 199 245',
+    '--color-indicator-error': '232 70 69',
   }),
 };
diff --git a/universal/packages/components/ui/gluestack-ui-provider/index.d.ts b/universal/packages/components/ui/gluestack-ui-provider/index.d.ts
deleted file mode 100644
index 54091111..00000000
--- a/universal/packages/components/ui/gluestack-ui-provider/index.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export declare function GluestackUIProvider({ mode, ...props }: {
-    mode?: 'light' | 'dark';
-    children?: any;
-}): import("react/jsx-runtime").JSX.Element;
diff --git a/universal/packages/components/ui/gluestack-ui-provider/index.jsx b/universal/packages/components/ui/gluestack-ui-provider/index.jsx
deleted file mode 100644
index 35885dbb..00000000
--- a/universal/packages/components/ui/gluestack-ui-provider/index.jsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'react';
-import { config } from './config';
-import { View } from 'react-native';
-import { OverlayProvider } from '@gluestack-ui/overlay';
-import { ToastProvider } from '@gluestack-ui/toast';
-export function GluestackUIProvider({ mode = 'light', ...props }) {
-    return (<View style={[
-            config[mode],
-            { flex: 1, height: '100%', width: '100%' },
-            // @ts-ignore
-            props.style,
-        ]}>
-      <OverlayProvider>
-        <ToastProvider>{props.children}</ToastProvider>
-      </OverlayProvider>
-    </View>);
-}
diff --git a/universal/packages/components/ui/gluestack-ui-provider/index.tsx b/universal/packages/components/ui/gluestack-ui-provider/index.tsx
index 4dc2cfe6..4855e434 100644
--- a/universal/packages/components/ui/gluestack-ui-provider/index.tsx
+++ b/universal/packages/components/ui/gluestack-ui-provider/index.tsx
@@ -1,22 +1,42 @@
 import React from 'react';
 import { config } from './config';
-import { View } from 'react-native';
+import { ColorSchemeName, useColorScheme, View, ViewProps } from 'react-native';
 import { OverlayProvider } from '@gluestack-ui/overlay';
 import { ToastProvider } from '@gluestack-ui/toast';
+import { colorScheme as colorSchemeNW } from 'nativewind';
+
+type ModeType = 'light' | 'dark' | 'system';
+
+const getColorSchemeName = (
+  colorScheme: ColorSchemeName,
+  mode: ModeType
+): 'light' | 'dark' => {
+  if (mode === 'system') {
+    return colorScheme ?? 'light';
+  }
+  return mode;
+};
 
 export function GluestackUIProvider({
   mode = 'light',
   ...props
 }: {
-  mode?: 'light' | 'dark';
-  children?: any;
+  mode?: 'light' | 'dark' | 'system';
+  children?: React.ReactNode;
+  style?: ViewProps['style'];
 }) {
+  const colorScheme = useColorScheme();
+
+  const colorSchemeName = getColorSchemeName(colorScheme, mode);
+
+  colorSchemeNW.set(mode);
+
   return (
     <View
       style={[
-        config[mode],
+        config[colorSchemeName],
+        // eslint-disable-next-line react-native/no-inline-styles
         { flex: 1, height: '100%', width: '100%' },
-        // @ts-ignore
         props.style,
       ]}
     >
diff --git a/universal/packages/components/ui/gluestack-ui-provider/index.web.d.ts b/universal/packages/components/ui/gluestack-ui-provider/index.web.d.ts
deleted file mode 100644
index 54091111..00000000
--- a/universal/packages/components/ui/gluestack-ui-provider/index.web.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export declare function GluestackUIProvider({ mode, ...props }: {
-    mode?: 'light' | 'dark';
-    children?: any;
-}): import("react/jsx-runtime").JSX.Element;
diff --git a/universal/packages/components/ui/gluestack-ui-provider/index.web.jsx b/universal/packages/components/ui/gluestack-ui-provider/index.web.jsx
deleted file mode 100644
index 03d38b41..00000000
--- a/universal/packages/components/ui/gluestack-ui-provider/index.web.jsx
+++ /dev/null
@@ -1,26 +0,0 @@
-'use client';
-import 'react';
-import { config } from './config';
-import { OverlayProvider } from '@gluestack-ui/overlay';
-import { ToastProvider } from '@gluestack-ui/toast';
-import { setFlushStyles } from '@gluestack-ui/nativewind-utils/flush';
-export function GluestackUIProvider({ mode = 'light', ...props }) {
-    const stringcssvars = Object.keys(config[mode]).reduce((acc, cur) => {
-        acc += `${cur}:${config[mode][cur]};`;
-        return acc;
-    }, '');
-    setFlushStyles(`:root {${stringcssvars}} `);
-    if (config[mode] && typeof document !== 'undefined') {
-        const element = document.documentElement;
-        if (element) {
-            const head = element.querySelector('head');
-            const style = document.createElement('style');
-            style.innerHTML = `:root {${stringcssvars}} `;
-            if (head)
-                head.appendChild(style);
-        }
-    }
-    return (<OverlayProvider>
-      <ToastProvider>{props.children}</ToastProvider>
-    </OverlayProvider>);
-}
diff --git a/universal/packages/components/ui/gluestack-ui-provider/index.web.tsx b/universal/packages/components/ui/gluestack-ui-provider/index.web.tsx
index 086a7295..30cadaaa 100644
--- a/universal/packages/components/ui/gluestack-ui-provider/index.web.tsx
+++ b/universal/packages/components/ui/gluestack-ui-provider/index.web.tsx
@@ -1,36 +1,94 @@
 'use client';
-import React from 'react';
+import React, { useEffect, useLayoutEffect } from 'react';
 import { config } from './config';
 import { OverlayProvider } from '@gluestack-ui/overlay';
 import { ToastProvider } from '@gluestack-ui/toast';
 import { setFlushStyles } from '@gluestack-ui/nativewind-utils/flush';
+import { script } from './script';
+
+const variableStyleTagId = 'nativewind-style';
+const createStyle = (styleTagId: string) => {
+  const style = document.createElement('style');
+  style.id = styleTagId;
+  style.appendChild(document.createTextNode(''));
+  return style;
+};
+
+export const useSafeLayoutEffect =
+  typeof window !== 'undefined' ? useLayoutEffect : useEffect;
 
 export function GluestackUIProvider({
   mode = 'light',
   ...props
 }: {
-  mode?: 'light' | 'dark';
-  children?: any;
+  mode?: 'light' | 'dark' | 'system';
+  children?: React.ReactNode;
 }) {
-  const stringcssvars = Object.keys(config[mode]).reduce((acc, cur) => {
-    acc += `${cur}:${config[mode][cur]};`;
-    return acc;
-  }, '');
-  setFlushStyles(`:root {${stringcssvars}} `);
-
-  if (config[mode] && typeof document !== 'undefined') {
-    const element = document.documentElement;
-    if (element) {
-      const head = element.querySelector('head');
-      const style = document.createElement('style');
-      style.innerHTML = `:root {${stringcssvars}} `;
-      if (head) head.appendChild(style);
+  let cssVariablesWithMode = ``;
+  Object.keys(config).forEach((configKey) => {
+    cssVariablesWithMode +=
+      configKey === 'dark' ? `\n .dark {\n ` : `\n:root {\n`;
+    const cssVariables = Object.keys(
+      config[configKey as keyof typeof config]
+    ).reduce((acc: string, curr: string) => {
+      acc += `${curr}:${config[configKey as keyof typeof config][curr]}; `;
+      return acc;
+    }, '');
+    cssVariablesWithMode += `${cssVariables} \n}`;
+  });
+
+  setFlushStyles(cssVariablesWithMode);
+
+  const handleMediaQuery = React.useCallback((e: MediaQueryListEvent) => {
+    script(e.matches ? 'dark' : 'light');
+  }, []);
+
+  useSafeLayoutEffect(() => {
+    if (mode !== 'system') {
+      const documentElement = document.documentElement;
+      if (documentElement) {
+        documentElement.classList.add(mode);
+        documentElement.classList.remove(mode === 'light' ? 'dark' : 'light');
+        documentElement.style.colorScheme = mode;
+      }
+    }
+  }, [mode]);
+
+  useSafeLayoutEffect(() => {
+    if (mode !== 'system') return;
+    const media = window.matchMedia('(prefers-color-scheme: dark)');
+
+    media.addListener(handleMediaQuery);
+
+    return () => media.removeListener(handleMediaQuery);
+  }, [handleMediaQuery]);
+
+  useSafeLayoutEffect(() => {
+    if (typeof window !== 'undefined') {
+      const documentElement = document.documentElement;
+      if (documentElement) {
+        const head = documentElement.querySelector('head');
+        let style = head?.querySelector(`[id='${variableStyleTagId}']`);
+        if (!style) {
+          style = createStyle(variableStyleTagId);
+          style.innerHTML = cssVariablesWithMode;
+          if (head) head.appendChild(style);
+        }
+      }
     }
-  }
+  }, []);
 
   return (
-    <OverlayProvider>
-      <ToastProvider>{props.children}</ToastProvider>
-    </OverlayProvider>
+    <>
+      <script
+        suppressHydrationWarning
+        dangerouslySetInnerHTML={{
+          __html: `(${script.toString()})('${mode}')`,
+        }}
+      />
+      <OverlayProvider>
+        <ToastProvider>{props.children}</ToastProvider>
+      </OverlayProvider>
+    </>
   );
 }
diff --git a/universal/packages/components/ui/gluestack-ui-provider/script.ts b/universal/packages/components/ui/gluestack-ui-provider/script.ts
new file mode 100644
index 00000000..732d1363
--- /dev/null
+++ b/universal/packages/components/ui/gluestack-ui-provider/script.ts
@@ -0,0 +1,19 @@
+export const script = (mode: string) => {
+  const documentElement = document.documentElement;
+
+  function getSystemColorMode() {
+    return window.matchMedia('(prefers-color-scheme: dark)').matches
+      ? 'dark'
+      : 'light';
+  }
+
+  try {
+    const isSystem = mode === 'system';
+    const theme = isSystem ? getSystemColorMode() : mode;
+    documentElement.classList.remove(theme === 'light' ? 'dark' : 'light');
+    documentElement.classList.add(theme);
+    documentElement.style.colorScheme = theme;
+  } catch (e) {
+    console.error(e);
+  }
+};
diff --git a/universal/packages/components/ui/grid/index.d.ts b/universal/packages/components/ui/grid/index.d.ts
deleted file mode 100644
index 2d36bfd4..00000000
--- a/universal/packages/components/ui/grid/index.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from "react";
-import type { VariantProps } from "@gluestack-ui/nativewind-utils";
-declare const Grid: React.ForwardRefExoticComponent<import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full box-border flex-row flex-wrap justify-start grid grid-cols-12", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full box-border flex-row flex-wrap justify-start grid grid-cols-12", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & {
-    gap?: number | undefined;
-    rowGap?: number | undefined;
-    columnGap?: number | undefined;
-    flexDirection?: "row" | "column" | "row-reverse" | "column-reverse" | undefined;
-    padding?: number | undefined;
-    paddingLeft?: number | undefined;
-    paddingRight?: number | undefined;
-    paddingStart?: number | undefined;
-    paddingEnd?: number | undefined;
-    _extra: {
-        className: string;
-    };
-} & React.RefAttributes<unknown>>;
-declare const GridItem: React.ForwardRefExoticComponent<import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full col-span-1 " | "w-full col-span-1 w-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full col-span-1 " | "w-full col-span-1 w-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & {
-    index?: number | undefined;
-    _extra: {
-        className: string;
-    };
-} & React.RefAttributes<unknown>>;
-export { Grid, GridItem };
diff --git a/universal/packages/components/ui/grid/index.jsx b/universal/packages/components/ui/grid/index.jsx
deleted file mode 100644
index 67a81f53..00000000
--- a/universal/packages/components/ui/grid/index.jsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import React, { useEffect, useState, createContext, useContext, useMemo, forwardRef, } from "react";
-import { View, Dimensions, Platform } from "react-native";
-import { gridStyle, gridItemStyle } from "./styles";
-import { cssInterop } from "nativewind";
-import { useBreakpointValue, getBreakPointValue, } from "@gluestack-ui/nativewind-utils/useBreakpointValue";
-const { width } = Dimensions.get("window");
-const GridContext = createContext({});
-function arrangeChildrenIntoRows({ childrenArray, colSpanArr, numColumns, }) {
-    let currentRow = 1;
-    let currentRowTotalColSpan = 0;
-    // store how many items in each row
-    const rowItemsCount = {};
-    for (let i = 0; i < childrenArray.length; i++) {
-        const colSpan = colSpanArr[i];
-        // if current row is full, go to next row
-        if (currentRowTotalColSpan + colSpan > numColumns) {
-            currentRow++;
-            currentRowTotalColSpan = colSpan;
-        }
-        else {
-            // if current row is not full, add colSpan to current row
-            currentRowTotalColSpan += colSpan;
-        }
-        rowItemsCount[currentRow] = rowItemsCount[currentRow]
-            ? [...rowItemsCount[currentRow], i]
-            : [i];
-    }
-    return rowItemsCount;
-}
-function generateResponsiveNumColumns({ gridClass }) {
-    const gridClassNamePattern = /\b(?:\w+:)?grid-cols-?\d+\b/g;
-    const numColumns = gridClass?.match(gridClassNamePattern);
-    if (!numColumns) {
-        return 12;
-    }
-    const regex = /^(?:(\w+):)?grid-cols-?(\d+)$/;
-    const result = {};
-    numColumns.forEach((classname) => {
-        const match = classname.match(regex);
-        if (match) {
-            const prefix = match[1] || "default";
-            const value = parseInt(match[2], 10);
-            result[prefix] = value;
-        }
-    });
-    return result;
-}
-function generateResponsiveColSpans({ gridItemClassName, }) {
-    const gridClassNamePattern = /\b(?:\w+:)?col-span-?\d+\b/g;
-    const colSpan = gridItemClassName?.match(gridClassNamePattern);
-    if (!colSpan) {
-        return 1;
-    }
-    const regex = /^(?:(\w+):)?col-span-?(\d+)$/;
-    const result = {};
-    colSpan.forEach((classname) => {
-        const match = classname.match(regex);
-        if (match) {
-            const prefix = match[1] || "default";
-            const value = parseInt(match[2], 10);
-            result[prefix] = value;
-        }
-    });
-    return result;
-}
-const Grid = forwardRef(({ className, _extra, children, ...props }, ref) => {
-    const [calculatedWidth, setCalculatedWidth] = useState(null);
-    const gridClass = _extra?.className;
-    const obj = generateResponsiveNumColumns({ gridClass });
-    const responsiveNumColumns = useBreakpointValue(obj);
-    const itemsPerRow = useMemo(() => {
-        // get the colSpan of each child
-        const colSpanArr = React.Children.map(children, (child) => {
-            const gridItemClassName = child?.props?._extra?.className;
-            const colSpan2 = getBreakPointValue(generateResponsiveColSpans({ gridItemClassName }), width);
-            const colSpan = colSpan2 ? colSpan2 : 1;
-            if (colSpan > responsiveNumColumns) {
-                return responsiveNumColumns;
-            }
-            return colSpan;
-        });
-        const childrenArray = React.Children.toArray(children);
-        const rowItemsCount = arrangeChildrenIntoRows({
-            childrenArray,
-            colSpanArr,
-            numColumns: responsiveNumColumns,
-        });
-        return rowItemsCount;
-    }, [responsiveNumColumns, children]);
-    const childrenWithProps = React.Children.map(children, (child, index) => {
-        if (React.isValidElement(child)) {
-            return React.cloneElement(child, { index });
-        }
-        return child;
-    });
-    const gridClassMerged = `${Platform.select({
-        web: gridClass ?? "",
-    })}`;
-    const contextValue = useMemo(() => {
-        return {
-            calculatedWidth,
-            numColumns: responsiveNumColumns,
-            itemsPerRow,
-            flexDirection: props?.flexDirection || "row",
-            gap: props?.gap || 0,
-            columnGap: props?.columnGap || 0,
-        };
-    }, [calculatedWidth, itemsPerRow, responsiveNumColumns, props]);
-    return (<GridContext.Provider value={contextValue}>
-        <View ref={ref} className={gridStyle({
-            class: className + " " + gridClassMerged,
-        })} onLayout={(event) => {
-            const paddingLeftToSubtract = props?.paddingStart || props?.paddingLeft || props?.padding || 0;
-            const paddingRightToSubtract = props?.paddingEnd || props?.paddingRight || props?.padding || 0;
-            const width = event.nativeEvent.layout.width -
-                paddingLeftToSubtract -
-                paddingRightToSubtract;
-            setCalculatedWidth(width);
-        }} {...props}>
-          {calculatedWidth && childrenWithProps}
-        </View>
-      </GridContext.Provider>);
-});
-//@ts-ignore
-cssInterop(Grid, {
-    className: {
-        target: "style",
-        nativeStyleToProp: {
-            gap: "gap",
-            rowGap: "rowGap",
-            columnGap: "columnGap",
-            flexDirection: "flexDirection",
-            padding: "padding",
-            paddingLeft: "paddingLeft",
-            paddingRight: "paddingRight",
-            paddingStart: "paddingStart",
-            paddingEnd: "paddingEnd",
-        },
-    },
-});
-const GridItem = forwardRef(({ className, _extra, ...props }, ref) => {
-    const [flexBasisValue, setFlexBasisValue] = useState("auto");
-    const { calculatedWidth, numColumns, itemsPerRow, flexDirection, gap, columnGap, } = useContext(GridContext);
-    const gridItemClass = _extra?.className;
-    const responsiveColSpan = useBreakpointValue(generateResponsiveColSpans({ gridItemClassName: gridItemClass }));
-    useEffect(() => {
-        if (!flexDirection?.includes("column") &&
-            calculatedWidth &&
-            numColumns > 0 &&
-            responsiveColSpan > 0) {
-            // find out in which row of itemsPerRow the current item's index is
-            const row = Object.keys(itemsPerRow).find((key) => {
-                return itemsPerRow[key].includes(props?.index);
-            });
-            const rowColsCount = itemsPerRow[row].length;
-            const space = columnGap || gap || 0;
-            const gutterOffset = space *
-                (rowColsCount === 1 && responsiveColSpan < numColumns
-                    ? 2
-                    : rowColsCount - 1);
-            const flexBasisVal = Math.min((((calculatedWidth - gutterOffset) * responsiveColSpan) /
-                numColumns /
-                calculatedWidth) *
-                100, 100) + "%";
-            setFlexBasisValue(flexBasisVal);
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [
-        calculatedWidth,
-        responsiveColSpan,
-        numColumns,
-        columnGap,
-        gap,
-        flexDirection,
-    ]);
-    return (<View ref={ref} gridItemClass={gridItemClass} className={gridItemStyle({
-            class: className + " " + Platform.select({ web: gridItemClass ?? "" }) ??
-                "",
-        })} 
-    //@ts-ignore
-    style={{
-            flexBasis: flexBasisValue,
-        }} {...props}/>);
-});
-Grid.displayName = "Grid";
-GridItem.displayName = "GridItem";
-export { Grid, GridItem };
diff --git a/universal/packages/components/ui/grid/index.tsx b/universal/packages/components/ui/grid/index.tsx
index 7c087a7c..7e0d36b9 100644
--- a/universal/packages/components/ui/grid/index.tsx
+++ b/universal/packages/components/ui/grid/index.tsx
@@ -13,8 +13,9 @@ import { cssInterop } from 'nativewind';
 import {
   useBreakpointValue,
   getBreakPointValue,
-} from '@gluestack-ui/nativewind-utils/useBreakpointValue';
-const { width } = Dimensions.get('window');
+} from '@/components/ui/utils/use-break-point-value';
+
+const { width: DEVICE_WIDTH } = Dimensions.get('window');
 
 const GridContext = createContext<any>({});
 
@@ -117,6 +118,9 @@ type IGridProps = ViewProps &
     paddingRight?: number;
     paddingStart?: number;
     paddingEnd?: number;
+    borderWidth?: number;
+    borderLeftWidth?: number;
+    borderRightWidth?: number;
     _extra: {
       className: string;
     };
@@ -137,7 +141,7 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
 
         const colSpan2 = getBreakPointValue(
           generateResponsiveColSpans({ gridItemClassName }),
-          width
+          DEVICE_WIDTH
         );
         const colSpan = colSpan2 ? colSpan2 : 1;
 
@@ -182,6 +186,10 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
       };
     }, [calculatedWidth, itemsPerRow, responsiveNumColumns, props]);
 
+    const borderLeftWidth = props?.borderLeftWidth || props?.borderWidth || 0;
+    const borderRightWidth = props?.borderRightWidth || props?.borderWidth || 0;
+    const borderWidthToSubtract = borderLeftWidth + borderRightWidth;
+
     return (
       <GridContext.Provider value={contextValue}>
         <View
@@ -196,12 +204,13 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
             const paddingRightToSubtract =
               props?.paddingEnd || props?.paddingRight || props?.padding || 0;
 
-            const width =
+            const gridWidth =
               event.nativeEvent.layout.width -
               paddingLeftToSubtract -
-              paddingRightToSubtract;
+              paddingRightToSubtract -
+              borderWidthToSubtract;
 
-            setCalculatedWidth(width);
+            setCalculatedWidth(gridWidth);
           }}
           {...props}
         >
@@ -212,7 +221,6 @@ const Grid = forwardRef<React.ElementRef<typeof View>, IGridProps>(
   }
 );
 
-//@ts-ignore
 cssInterop(Grid, {
   className: {
     target: 'style',
@@ -226,6 +234,9 @@ cssInterop(Grid, {
       paddingRight: 'paddingRight',
       paddingStart: 'paddingStart',
       paddingEnd: 'paddingEnd',
+      borderWidth: 'borderWidth',
+      borderLeftWidth: 'borderLeftWidth',
+      borderRightWidth: 'borderRightWidth',
     },
   },
 });
@@ -271,7 +282,7 @@ const GridItem = forwardRef<React.ElementRef<typeof View>, IGridItemProps>(
           return itemsPerRow[key].includes(props?.index);
         });
 
-        const rowColsCount = itemsPerRow[row as string].length;
+        const rowColsCount = itemsPerRow[row as string]?.length;
 
         const space = columnGap || gap || 0;
 
@@ -308,9 +319,7 @@ const GridItem = forwardRef<React.ElementRef<typeof View>, IGridItemProps>(
         // @ts-expect-error
         gridItemClass={gridItemClass}
         className={gridItemStyle({
-          class:
-            className + ' ' + Platform.select({ web: gridItemClass ?? '' }) ??
-            '',
+          class: className,
         })}
         {...props}
         style={[
diff --git a/universal/packages/components/ui/grid/index.web.d.ts b/universal/packages/components/ui/grid/index.web.d.ts
deleted file mode 100644
index 99aa00c7..00000000
--- a/universal/packages/components/ui/grid/index.web.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-declare const Grid: {
-    ({ className, _extra, ...props }: any): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-declare const GridItem: {
-    ({ className, _extra, ...props }: any): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-export { Grid, GridItem };
diff --git a/universal/packages/components/ui/grid/index.web.jsx b/universal/packages/components/ui/grid/index.web.jsx
deleted file mode 100644
index d8daaad8..00000000
--- a/universal/packages/components/ui/grid/index.web.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import "react";
-import { gridStyle, gridItemStyle } from "./styles";
-const Grid = ({ className, _extra, ...props }) => {
-    const gridClass = _extra?.className;
-    const finalGridClass = gridClass ?? "";
-    return (<div className={gridStyle({
-            class: className + " " + finalGridClass,
-        })} {...props}/>);
-};
-const GridItem = ({ className, _extra, ...props }) => {
-    const gridItemClass = _extra?.className;
-    const finalGridItemClass = gridItemClass ?? "";
-    return (<div className={gridItemStyle({
-            class: className + " " + finalGridItemClass,
-        })} {...props}/>);
-};
-Grid.displayName = "Grid";
-GridItem.displayName = "GridItem";
-export { Grid, GridItem };
diff --git a/universal/packages/components/ui/grid/styles.d.ts b/universal/packages/components/ui/grid/styles.d.ts
deleted file mode 100644
index bedbd5ab..00000000
--- a/universal/packages/components/ui/grid/styles.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export declare const gridStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full box-border flex-row flex-wrap justify-start grid grid-cols-12", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full box-border flex-row flex-wrap justify-start grid grid-cols-12", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-export declare const gridItemStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full col-span-1 " | "w-full col-span-1 w-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full col-span-1 " | "w-full col-span-1 w-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
diff --git a/universal/packages/components/ui/grid/styles.jsx b/universal/packages/components/ui/grid/styles.jsx
deleted file mode 100644
index 2fd742f3..00000000
--- a/universal/packages/components/ui/grid/styles.jsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { tva } from "@gluestack-ui/nativewind-utils/tva";
-import { isWeb } from "@gluestack-ui/nativewind-utils/IsWeb";
-const gridItemBaseStyle = isWeb ? "w-auto" : "";
-export const gridStyle = tva({
-    base: `w-full box-border flex-row flex-wrap justify-start grid grid-cols-12`,
-});
-export const gridItemStyle = tva({
-    base: `w-full col-span-1 ${gridItemBaseStyle}`,
-});
diff --git a/universal/packages/components/ui/heading/index.d.ts b/universal/packages/components/ui/heading/index.d.ts
deleted file mode 100644
index 5a13c8d6..00000000
--- a/universal/packages/components/ui/heading/index.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare const Heading: {
-    ({ className, size, as: AsComp, ...props }: any): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-export { Heading };
diff --git a/universal/packages/components/ui/heading/index.jsx b/universal/packages/components/ui/heading/index.jsx
deleted file mode 100644
index 9004557c..00000000
--- a/universal/packages/components/ui/heading/index.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useCallback } from 'react';
-import { H1, H2, H3, H4, H5, H6 } from '@expo/html-elements';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-import { headingStyle } from './styles';
-cssInterop(H4, { className: 'style' });
-const Heading = ({ className, size = 'lg', as: AsComp, ...props }) => {
-    const MappedHeading = useCallback(() => {
-        switch (size) {
-            case '5xl':
-            case '4xl':
-            case '3xl':
-                return (<H1 className={headingStyle({ size, class: className })} {...props}/>);
-            case '2xl':
-                return (<H2 className={headingStyle({ size, class: className })} {...props}/>);
-            case 'xl':
-                return (<H3 className={headingStyle({ size, class: className })} {...props}/>);
-            case 'lg':
-                return (<H4 className={headingStyle({ size, class: className })} {...props}/>);
-            case 'md':
-                return (<H5 className={headingStyle({ size, class: className })} {...props}/>);
-            case 'sm':
-            case 'xs':
-                return (<H6 className={headingStyle({ size, class: className })} {...props}/>);
-            default:
-                return (<H4 className={headingStyle({ size, class: className })} {...props}/>);
-        }
-    }, 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [size]);
-    if (AsComp) {
-        return (<AsComp className={headingStyle({ size, class: className })} {...props}/>);
-    }
-    return <MappedHeading />;
-};
-Heading.displayName = 'Heading';
-export { Heading };
diff --git a/universal/packages/components/ui/heading/index.tsx b/universal/packages/components/ui/heading/index.tsx
index 226ab2fe..c617f9bc 100644
--- a/universal/packages/components/ui/heading/index.tsx
+++ b/universal/packages/components/ui/heading/index.tsx
@@ -1,20 +1,20 @@
-import React, { forwardRef, memo } from 'react';
-import { H1, H2, H3, H4, H5, H6 } from '@expo/html-elements';
-import { cssInterop } from 'nativewind';
-import { headingStyle } from './styles';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import React, { forwardRef, memo } from "react";
+import { H1, H2, H3, H4, H5, H6 } from "@expo/html-elements";
+import { headingStyle } from "./styles";
+import type { VariantProps } from "@gluestack-ui/nativewind-utils";
+import { cssInterop } from "nativewind";
 
 type IHeadingProps = VariantProps<typeof headingStyle> &
   React.ComponentPropsWithoutRef<typeof H1> & {
     as?: React.ElementType;
   };
 
-cssInterop(H1, { className: 'style' });
-cssInterop(H2, { className: 'style' });
-cssInterop(H3, { className: 'style' });
-cssInterop(H4, { className: 'style' });
-cssInterop(H5, { className: 'style' });
-cssInterop(H6, { className: 'style' });
+cssInterop(H1, { className: "style" });
+cssInterop(H2, { className: "style" });
+cssInterop(H3, { className: "style" });
+cssInterop(H4, { className: "style" });
+cssInterop(H5, { className: "style" });
+cssInterop(H6, { className: "style" });
 
 const MappedHeading = memo(
   forwardRef<React.ElementRef<typeof H1>, IHeadingProps>(
@@ -34,9 +34,9 @@ const MappedHeading = memo(
       ref
     ) => {
       switch (size) {
-        case '5xl':
-        case '4xl':
-        case '3xl':
+        case "5xl":
+        case "4xl":
+        case "3xl":
           return (
             <H1
               className={headingStyle({
@@ -51,10 +51,11 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
-        case '2xl':
+        case "2xl":
           return (
             <H2
               className={headingStyle({
@@ -69,10 +70,11 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
-        case 'xl':
+        case "xl":
           return (
             <H3
               className={headingStyle({
@@ -87,10 +89,11 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
-        case 'lg':
+        case "lg":
           return (
             <H4
               className={headingStyle({
@@ -105,10 +108,11 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
-        case 'md':
+        case "md":
           return (
             <H5
               className={headingStyle({
@@ -123,11 +127,12 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
-        case 'sm':
-        case 'xs':
+        case "sm":
+        case "xs":
           return (
             <H6
               className={headingStyle({
@@ -142,6 +147,7 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
@@ -160,6 +166,7 @@ const MappedHeading = memo(
                 class: className,
               })}
               {...props}
+              // @ts-expect-error
               ref={ref}
             />
           );
@@ -170,7 +177,7 @@ const MappedHeading = memo(
 
 const Heading = memo(
   forwardRef<React.ElementRef<typeof H1>, IHeadingProps>(
-    ({ className, size = 'lg', as: AsComp, ...props }, ref) => {
+    ({ className, size = "lg", as: AsComp, ...props }, ref) => {
       const {
         isTruncated,
         bold,
@@ -207,6 +214,6 @@ const Heading = memo(
   )
 );
 
-Heading.displayName = 'Heading';
+Heading.displayName = "Heading";
 
 export { Heading };
diff --git a/universal/packages/components/ui/heading/index.web.d.ts b/universal/packages/components/ui/heading/index.web.d.ts
deleted file mode 100644
index cbd4d42d..00000000
--- a/universal/packages/components/ui/heading/index.web.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import React from 'react';
-declare const Heading: React.MemoExoticComponent<({ className, size, as: AsComp, ...props }: any) => import("react/jsx-runtime").JSX.Element>;
-export { Heading };
diff --git a/universal/packages/components/ui/heading/index.web.jsx b/universal/packages/components/ui/heading/index.web.jsx
deleted file mode 100644
index 2bb7b49a..00000000
--- a/universal/packages/components/ui/heading/index.web.jsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { memo } from 'react';
-import { headingStyle } from './styles';
-const Heading = memo(({ className, size = 'lg', as: AsComp, ...props }) => {
-    const MappedHeading = ({ size }) => {
-        switch (size) {
-            case '5xl':
-            case '4xl':
-            case '3xl':
-                return (<h1 className={headingStyle({ size, class: className })} {...props}/>);
-            case '2xl':
-                return (<h2 className={headingStyle({ size, class: className })} {...props}/>);
-            case 'xl':
-                return (<h3 className={headingStyle({ size, class: className })} {...props}/>);
-            case 'lg':
-                return (<h4 className={headingStyle({ size, class: className })} {...props}/>);
-            case 'md':
-                return (<h5 className={headingStyle({ size, class: className })} {...props}/>);
-            case 'sm':
-            case 'xs':
-                return (<h6 className={headingStyle({ size, class: className })} {...props}/>);
-            default:
-                return (<h4 className={headingStyle({ size, class: className })} {...props}/>);
-        }
-    };
-    if (AsComp) {
-        return (<AsComp className={headingStyle({ size, class: className })} {...props}/>);
-    }
-    return <MappedHeading size={size}/>;
-});
-Heading.displayName = 'Heading';
-export { Heading };
diff --git a/universal/packages/components/ui/heading/styles.d.ts b/universal/packages/components/ui/heading/styles.d.ts
deleted file mode 100644
index 0e3a4fdd..00000000
--- a/universal/packages/components/ui/heading/styles.d.ts
+++ /dev/null
@@ -1,330 +0,0 @@
-export declare const headingStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-typography-900 font-bold font-heading tracking-sm my-0 " | "text-typography-900 font-bold font-heading tracking-sm my-0 font-sans tracking-sm bg-transparent border-0 box-border display-inline list-none margin-0 padding-0 position-relative text-start no-underline whitespace-pre-wrap word-wrap-break-word", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-}, undefined, "text-typography-900 font-bold font-heading tracking-sm my-0 " | "text-typography-900 font-bold font-heading tracking-sm my-0 font-sans tracking-sm bg-transparent border-0 box-border display-inline list-none margin-0 padding-0 position-relative text-start no-underline whitespace-pre-wrap word-wrap-break-word", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-}>, unknown, unknown, undefined>>;
diff --git a/universal/packages/components/ui/heading/styles.jsx b/universal/packages/components/ui/heading/styles.jsx
deleted file mode 100644
index 0aa33569..00000000
--- a/universal/packages/components/ui/heading/styles.jsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { isWeb } from '@gluestack-ui/nativewind-utils/IsWeb';
-const baseStyle = isWeb
-    ? 'font-sans tracking-sm bg-transparent border-0 box-border display-inline list-none margin-0 padding-0 position-relative text-start no-underline whitespace-pre-wrap word-wrap-break-word'
-    : '';
-export const headingStyle = tva({
-    base: `text-typography-900 font-bold font-heading tracking-sm my-0 ${baseStyle}`,
-    variants: {
-        isTruncated: {
-            true: 'truncate',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow-500',
-        },
-        size: {
-            '5xl': 'text-6xl',
-            '4xl': 'text-5xl',
-            '3xl': 'text-4xl',
-            '2xl': 'text-3xl',
-            'xl': 'text-2xl',
-            'lg': 'text-xl',
-            'md': 'text-lg',
-            'sm': 'text-base',
-            'xs': 'text-sm',
-        },
-    },
-});
diff --git a/universal/packages/components/ui/hstack/index.d.ts b/universal/packages/components/ui/hstack/index.d.ts
deleted file mode 100644
index 8d819e8d..00000000
--- a/universal/packages/components/ui/hstack/index.d.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const HStack: React.ForwardRefExoticComponent<import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-} | ({
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-} & {
-    space: {
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    reversed: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "flex-row " | "flex-row flex relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none", import("tailwind-variants/dist/config").TVConfig<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}>, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, undefined, "flex-row " | "flex-row flex relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none", import("tailwind-variants/dist/config").TVConfig<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>> & React.RefAttributes<unknown>>;
-export { HStack };
diff --git a/universal/packages/components/ui/hstack/index.jsx b/universal/packages/components/ui/hstack/index.jsx
deleted file mode 100644
index 3cbb3dfa..00000000
--- a/universal/packages/components/ui/hstack/index.jsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-import { View } from 'react-native';
-import { hstackStyle } from './styles';
-const HStack = React.forwardRef(({ className, space, reversed, ...props }, ref) => {
-    return (<View className={hstackStyle({ space, reversed, class: className })} {...props} ref={ref}/>);
-});
-HStack.displayName = 'HStack';
-export { HStack };
diff --git a/universal/packages/components/ui/hstack/index.web.d.ts b/universal/packages/components/ui/hstack/index.web.d.ts
deleted file mode 100644
index b801bb14..00000000
--- a/universal/packages/components/ui/hstack/index.web.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { hstackStyle } from './styles';
-type IHStackProps = React.ComponentProps<'div'> & VariantProps<typeof hstackStyle>;
-declare const HStack: React.ForwardRefExoticComponent<Omit<IHStackProps, "ref"> & React.RefAttributes<unknown>>;
-export { HStack };
diff --git a/universal/packages/components/ui/hstack/index.web.jsx b/universal/packages/components/ui/hstack/index.web.jsx
deleted file mode 100644
index 0eff7d2e..00000000
--- a/universal/packages/components/ui/hstack/index.web.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react';
-import { hstackStyle } from './styles';
-const HStack = React.forwardRef(({ className, space, reversed, ...props }, ref) => {
-    return (<div className={hstackStyle({ space, reversed, class: className })} {...props} ref={ref}/>);
-});
-HStack.displayName = 'HStack';
-export { HStack };
diff --git a/universal/packages/components/ui/hstack/styles.d.ts b/universal/packages/components/ui/hstack/styles.d.ts
deleted file mode 100644
index c77985ed..00000000
--- a/universal/packages/components/ui/hstack/styles.d.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-export declare const hstackStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-} | ({
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-} & {
-    space: {
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    reversed: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "flex-row " | "flex-row flex relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none", import("tailwind-variants/dist/config").TVConfig<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}>, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, undefined, "flex-row " | "flex-row flex relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none", import("tailwind-variants/dist/config").TVConfig<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>;
diff --git a/universal/packages/components/ui/hstack/styles.jsx b/universal/packages/components/ui/hstack/styles.jsx
deleted file mode 100644
index 1e717cf5..00000000
--- a/universal/packages/components/ui/hstack/styles.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { isWeb } from '@gluestack-ui/nativewind-utils/IsWeb';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-const baseStyle = isWeb
-    ? 'flex relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none'
-    : '';
-export const hstackStyle = tva({
-    base: `flex-row ${baseStyle}`,
-    variants: {
-        space: {
-            'xs': 'gap-1',
-            'sm': 'gap-2',
-            'md': 'gap-3',
-            'lg': 'gap-4',
-            'xl': 'gap-5',
-            '2xl': 'gap-6',
-            '3xl': 'gap-7',
-            '4xl': 'gap-8',
-        },
-        reversed: {
-            true: 'flex-row-reverse',
-        },
-    },
-});
diff --git a/universal/packages/components/ui/icon/index.d.ts b/universal/packages/components/ui/icon/index.d.ts
deleted file mode 100644
index 5b77f4e8..00000000
--- a/universal/packages/components/ui/icon/index.d.ts
+++ /dev/null
@@ -1,271 +0,0 @@
-import React from "react";
-import { createIcon } from "@gluestack-ui/icon";
-export declare const UIIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<(Omit<any, "ref"> & React.RefAttributes<unknown>) | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export declare const Icon: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-type ParameterTypes = Omit<Parameters<typeof createIcon>[0], "Root">;
-declare const createIconUI: ({ ...props }: ParameterTypes) => React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export { createIconUI as createIcon };
-declare const AddIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { AddIcon };
-declare const AlertCircleIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { AlertCircleIcon };
-declare const ArrowUpIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const ArrowDownIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const ArrowRightIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const ArrowLeftIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { ArrowUpIcon, ArrowDownIcon, ArrowRightIcon, ArrowLeftIcon };
-declare const AtSignIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { AtSignIcon };
-declare const BellIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { BellIcon };
-declare const CalendarDaysIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { CalendarDaysIcon };
-declare const CheckIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const CheckCircleIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { CheckIcon, CheckCircleIcon };
-declare const ChevronUpIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const ChevronDownIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const ChevronLeftIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const ChevronRightIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const ChevronsLeftIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const ChevronsRightIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const ChevronsUpDownIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { ChevronUpIcon, ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon, ChevronsLeftIcon, ChevronsRightIcon, ChevronsUpDownIcon, };
-declare const CircleIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { CircleIcon };
-declare const ClockIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { ClockIcon };
-declare const CloseIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const CloseCircleIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { CloseIcon, CloseCircleIcon };
-declare const CopyIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { CopyIcon };
-declare const DownloadIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { DownloadIcon };
-declare const EditIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { EditIcon };
-declare const EyeIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const EyeOffIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { EyeIcon, EyeOffIcon };
-declare const FavouriteIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { FavouriteIcon };
-declare const GlobeIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { GlobeIcon };
-declare const GripVerticalIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { GripVerticalIcon };
-declare const HelpCircleIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { HelpCircleIcon };
-declare const InfoIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { InfoIcon };
-declare const LinkIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const ExternalLinkIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { LinkIcon, ExternalLinkIcon };
-declare const LoaderIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { LoaderIcon };
-declare const LockIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { LockIcon };
-declare const MailIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { MailIcon };
-declare const MenuIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { MenuIcon };
-declare const MessageCircleIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { MessageCircleIcon };
-declare const MoonIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { MoonIcon };
-declare const PaperclipIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { PaperclipIcon };
-declare const PhoneIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { PhoneIcon };
-declare const PlayIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { PlayIcon };
-declare const RemoveIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { RemoveIcon };
-declare const RepeatIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-declare const Repeat1Icon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { RepeatIcon, Repeat1Icon };
-declare const SearchIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { SearchIcon };
-declare const SettingsIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { SettingsIcon };
-declare const ShareIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { ShareIcon };
-declare const SlashIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { SlashIcon };
-declare const StarIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { StarIcon };
-declare const SunIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { SunIcon };
-declare const ThreeDotsIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { ThreeDotsIcon };
-declare const TrashIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { TrashIcon };
-declare const UnlockIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<import("react-native-svg").SvgProps | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export { UnlockIcon };
diff --git a/universal/packages/components/ui/icon/index.jsx b/universal/packages/components/ui/icon/index.jsx
deleted file mode 100644
index 1a8782a5..00000000
--- a/universal/packages/components/ui/icon/index.jsx
+++ /dev/null
@@ -1,626 +0,0 @@
-"use client";
-import React, { useMemo } from "react";
-import { createIcon } from "@gluestack-ui/icon";
-import { Path, Svg } from "react-native-svg";
-import { tva } from "@gluestack-ui/nativewind-utils/tva";
-import { cssInterop } from "nativewind";
-const PrimitiveIcon = React.forwardRef(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    const colorProps = stroke === "currentColor" && color !== undefined ? color : stroke;
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} {...props} {...sizeProps} stroke={colorProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} stroke={colorProps} {...props}/>);
-});
-export const UIIcon = createIcon({
-    Root: PrimitiveIcon,
-});
-const iconStyle = tva({
-    base: "stroke-typography-950 fill-none",
-    variants: {
-        size: {
-            "2xs": "h-3 w-3",
-            xs: "h-3.5 w-3.5",
-            sm: "h-4 w-4",
-            md: "h-[18px] w-[18px]",
-            lg: "h-5 w-5",
-            xl: "h-6 w-6",
-        },
-    },
-});
-// @ts-ignore
-cssInterop(UIIcon, {
-    className: {
-        target: "style",
-        nativeStyleToProp: {
-            height: "height",
-            width: "width",
-            fill: "fill",
-            color: "color",
-        },
-    },
-});
-export const Icon = React.forwardRef(({ size = "md", className, ...props }, ref) => {
-    if (typeof size === "number") {
-        return (<UIIcon ref={ref} {...props} className={iconStyle({ class: className })} size={size}/>);
-    }
-    else if ((props.height !== undefined || props.width !== undefined) &&
-        size === undefined) {
-        return (<UIIcon ref={ref} {...props} className={iconStyle({ class: className })}/>);
-    }
-    return (<UIIcon ref={ref} {...props} className={iconStyle({ size, class: className })}/>);
-});
-const createIconUI = ({ ...props }) => {
-    const UIIcon = createIcon({ Root: Svg, ...props });
-    return React.forwardRef(({ className, size, ...props }, ref) => {
-        return (<UIIcon ref={ref} {...props} className={iconStyle({ size, class: className })}/>);
-    });
-};
-export { createIconUI as createIcon };
-// All Icons
-const AddIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 5V19" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M5 12H19" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-AddIcon.displayName = "AddIcon";
-export { AddIcon };
-const AlertCircleIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 8V12" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 16H12.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-AlertCircleIcon.displayName = "AlertCircleIcon";
-export { AlertCircleIcon };
-const ArrowUpIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 19V5" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M5 12L12 5L19 12" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ArrowDownIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 5V19" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M19 12L12 19L5 12" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ArrowRightIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M5 12H19" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 5L19 12L12 19" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ArrowLeftIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M19 12H5" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 19L5 12L12 5" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-ArrowUpIcon.displayName = "ArrowUpIcon";
-ArrowDownIcon.displayName = "ArrowDownIcon";
-ArrowRightIcon.displayName = "ArrowRightIcon";
-ArrowLeftIcon.displayName = "ArrowLeftIcon";
-export { ArrowUpIcon, ArrowDownIcon, ArrowRightIcon, ArrowLeftIcon };
-const AtSignIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <>
-        <Path d="M12 16C14.2091 16 16 14.2091 16 12C16 9.79086 14.2091 8 12 8C9.79086 8 8 9.79086 8 12C8 14.2091 9.79086 16 12 16Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-        <Path d="M16 7.99999V13C16 13.7956 16.3161 14.5587 16.8787 15.1213C17.4413 15.6839 18.2044 16 19 16C19.7957 16 20.5587 15.6839 21.1213 15.1213C21.6839 14.5587 22 13.7956 22 13V12C21.9999 9.74302 21.2362 7.55247 19.8333 5.78452C18.4303 4.01658 16.4706 2.77521 14.2726 2.26229C12.0747 1.74936 9.76794 1.99503 7.72736 2.95936C5.68677 3.92368 4.03241 5.54995 3.03327 7.57371C2.03413 9.59748 1.74898 11.8997 2.22418 14.1061C2.69938 16.3125 3.90699 18.2932 5.65064 19.7263C7.39429 21.1593 9.57144 21.9603 11.8281 21.9991C14.0847 22.0379 16.2881 21.3122 18.08 19.94" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      </>
-    </>),
-});
-AtSignIcon.displayName = "AtSignIcon";
-export { AtSignIcon };
-const BellIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M18 8C18 6.4087 17.3679 4.88258 16.2426 3.75736C15.1174 2.63214 13.5913 2 12 2C10.4087 2 8.88258 2.63214 7.75736 3.75736C6.63214 4.88258 6 6.4087 6 8C6 15 3 17 3 17H21C21 17 18 15 18 8Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M13.73 21C13.5542 21.3031 13.3018 21.5547 12.9982 21.7295C12.6946 21.9044 12.3504 21.9965 12 21.9965C11.6496 21.9965 11.3054 21.9044 11.0018 21.7295C10.6982 21.5547 10.4458 21.3031 10.27 21" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-BellIcon.displayName = "BellIcon";
-export { BellIcon };
-const CalendarDaysIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M19 4H5C3.89543 4 3 4.89543 3 6V20C3 21.1046 3.89543 22 5 22H19C20.1046 22 21 21.1046 21 20V6C21 4.89543 20.1046 4 19 4Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M16 2V6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M8 2V6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M3 10H21" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M8 14H8.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 14H12.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M16 14H16.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M8 18H8.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 18H12.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M16 18H16.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-CalendarDaysIcon.displayName = "CalendarDaysIcon";
-export { CalendarDaysIcon };
-const CheckIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M20 6L9 17L4 12" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const CheckCircleIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 22C17.523 22 22 17.523 22 12C22 6.477 17.523 2 12 2C6.477 2 2 6.477 2 12C2 17.523 6.477 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M9 12L11 14L15 10" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-CheckIcon.displayName = "CheckIcon";
-CheckCircleIcon.displayName = "CheckCircleIcon";
-export { CheckIcon, CheckCircleIcon };
-const ChevronUpIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    d: "M12 10L8 6L4 10",
-    path: (<>
-      <Path d="M18 15L12 9L6 15" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ChevronDownIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M6 9L12 15L18 9" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ChevronLeftIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M15 18L9 12L15 6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ChevronRightIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M9 18L15 12L9 6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ChevronsLeftIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M11 17L6 12L11 7" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M18 17L13 12L18 7" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ChevronsRightIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M13 17L18 12L13 7" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M6 17L11 12L6 7" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ChevronsUpDownIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M7 15L12 20L17 15" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M7 9L12 4L17 9" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-ChevronUpIcon.displayName = "ChevronUpIcon";
-ChevronDownIcon.displayName = "ChevronDownIcon";
-ChevronLeftIcon.displayName = "ChevronLeftIcon";
-ChevronRightIcon.displayName = "ChevronRightIcon";
-ChevronsLeftIcon.displayName = "ChevronsLeftIcon";
-ChevronsRightIcon.displayName = "ChevronsRightIcon";
-ChevronsUpDownIcon.displayName = "ChevronsUpDownIcon";
-export { ChevronUpIcon, ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon, ChevronsLeftIcon, ChevronsRightIcon, ChevronsUpDownIcon, };
-const CircleIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" fill="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-CircleIcon.displayName = "CircleIcon";
-export { CircleIcon };
-const ClockIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 6V12L16 14" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-ClockIcon.displayName = "ClockIcon";
-export { ClockIcon };
-const CloseIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M18 6L6 18" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M6 6L18 18" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const CloseCircleIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M15 9L9 15" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M9 9L15 15" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-CloseIcon.displayName = "CloseIcon";
-CloseCircleIcon.displayName = "CloseCircleIcon";
-export { CloseIcon, CloseCircleIcon };
-const CopyIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M20 9H11C9.89543 9 9 9.89543 9 11V20C9 21.1046 9.89543 22 11 22H20C21.1046 22 22 21.1046 22 20V11C22 9.89543 21.1046 9 20 9Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M5 15H4C3.46957 15 2.96086 14.7893 2.58579 14.4142C2.21071 14.0391 2 13.5304 2 13V4C2 3.46957 2.21071 2.96086 2.58579 2.58579C2.96086 2.21071 3.46957 2 4 2H13C13.5304 2 14.0391 2.21071 14.4142 2.58579C14.7893 2.96086 15 3.46957 15 4V5" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-CopyIcon.displayName = "CopyIcon";
-export { CopyIcon };
-const DownloadIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M21 15V19C21 19.5304 20.7893 20.0391 20.4142 20.4142C20.0391 20.7893 19.5304 21 19 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V15" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M7 10L12 15L17 10" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 15V3" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-DownloadIcon.displayName = "DownloadIcon";
-export { DownloadIcon };
-const EditIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M11 4H4C3.46957 4 2.96086 4.21071 2.58579 4.58579C2.21071 4.96086 2 5.46957 2 6V20C2 20.5304 2.21071 21.0391 2.58579 21.4142C2.96086 21.7893 3.46957 22 4 22H18C18.5304 22 19.0391 21.7893 19.4142 21.4142C19.7893 21.0391 20 20.5304 20 20V13" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M18.5 2.50001C18.8978 2.10219 19.4374 1.87869 20 1.87869C20.5626 1.87869 21.1022 2.10219 21.5 2.50001C21.8978 2.89784 22.1213 3.4374 22.1213 4.00001C22.1213 4.56262 21.8978 5.10219 21.5 5.50001L12 15L8 16L9 12L18.5 2.50001Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-EditIcon.displayName = "EditIcon";
-export { EditIcon };
-const EyeIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M2 12C2 12 5 5 12 5C19 5 22 12 22 12C22 12 19 19 12 19C5 19 2 12 2 12Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-EyeIcon.displayName = "EyeIcon";
-const EyeOffIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M9.88 9.88C9.58525 10.1546 9.34884 10.4859 9.18487 10.8538C9.02091 11.2218 8.93274 11.6191 8.92563 12.0219C8.91852 12.4247 8.99262 12.8248 9.14351 13.1984C9.29439 13.5719 9.51897 13.9113 9.80384 14.1962C10.0887 14.481 10.4281 14.7056 10.8016 14.8565C11.1752 15.0074 11.5753 15.0815 11.9781 15.0744C12.3809 15.0673 12.7782 14.9791 13.1461 14.8151C13.5141 14.6512 13.8453 14.4147 14.12 14.12" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M10.73 5.08C11.1513 5.02751 11.5754 5.00079 12 5C19 5 22 12 22 12C21.5529 12.9571 20.9922 13.8569 20.33 14.68" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M6.61 6.61C4.62125 7.96462 3.02987 9.82526 2 12C2 12 5 19 12 19C13.9159 19.0051 15.7908 18.4451 17.39 17.39" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M2 2L22 22" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-EyeOffIcon.displayName = "EyeOffIcon";
-export { EyeIcon, EyeOffIcon };
-const FavouriteIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M20.42 4.58C19.9183 4.07658 19.3222 3.67714 18.6658 3.40459C18.0094 3.13204 17.3057 2.99174 16.595 2.99174C15.8843 2.99174 15.1806 3.13204 14.5242 3.40459C13.8678 3.67714 13.2717 4.07658 12.77 4.58L12 5.36L11.23 4.58C10.7283 4.07658 10.1322 3.67714 9.47582 3.40459C8.81944 3.13204 8.11571 2.99174 7.40499 2.99174C6.69428 2.99174 5.99055 3.13204 5.33417 3.40459C4.67779 3.67714 4.08167 4.07658 3.57999 4.58C1.45999 6.7 1.32999 10.28 3.99999 13L12 21L20 13C22.67 10.28 22.54 6.7 20.42 4.58Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-FavouriteIcon.displayName = "FavouriteIcon";
-export { FavouriteIcon };
-const GlobeIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M2 12H22" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 2C14.5013 4.73835 15.9228 8.29203 16 12C15.9228 15.708 14.5013 19.2616 12 22C9.49872 19.2616 8.07725 15.708 8 12C8.07725 8.29203 9.49872 4.73835 12 2V2Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-GlobeIcon.displayName = "GlobeIcon";
-export { GlobeIcon };
-const GripVerticalIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M9 13C9.55228 13 10 12.5523 10 12C10 11.4477 9.55228 11 9 11C8.44772 11 8 11.4477 8 12C8 12.5523 8.44772 13 9 13Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M9 6C9.55228 6 10 5.55228 10 5C10 4.44772 9.55228 4 9 4C8.44772 4 8 4.44772 8 5C8 5.55228 8.44772 6 9 6Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M9 20C9.55228 20 10 19.5523 10 19C10 18.4477 9.55228 18 9 18C8.44772 18 8 18.4477 8 19C8 19.5523 8.44772 20 9 20Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M15 13C15.5523 13 16 12.5523 16 12C16 11.4477 15.5523 11 15 11C14.4477 11 14 11.4477 14 12C14 12.5523 14.4477 13 15 13Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M15 6C15.5523 6 16 5.55228 16 5C16 4.44772 15.5523 4 15 4C14.4477 4 14 4.44772 14 5C14 5.55228 14.4477 6 15 6Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M15 20C15.5523 20 16 19.5523 16 19C16 18.4477 15.5523 18 15 18C14.4477 18 14 18.4477 14 19C14 19.5523 14.4477 20 15 20Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-GripVerticalIcon.displayName = "GripVerticalIcon";
-export { GripVerticalIcon };
-const HelpCircleIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M9.09 9.00001C9.3251 8.33167 9.78915 7.76811 10.4 7.40914C11.0108 7.05016 11.7289 6.91894 12.4272 7.03872C13.1255 7.15849 13.7588 7.52153 14.2151 8.06353C14.6713 8.60554 14.9211 9.29153 14.92 10C14.92 12 11.92 13 11.92 13" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 17H12.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-HelpCircleIcon.displayName = "HelpCircleIcon";
-export { HelpCircleIcon };
-const InfoIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 16V12" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 8H12.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-InfoIcon.displayName = "InfoIcon";
-export { InfoIcon };
-const LinkIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M10 13C10.4295 13.5741 10.9774 14.0492 11.6066 14.3929C12.2357 14.7367 12.9315 14.9411 13.6467 14.9923C14.3618 15.0435 15.0796 14.9404 15.7513 14.6898C16.4231 14.4392 17.0331 14.0471 17.54 13.54L20.54 10.54C21.4508 9.59699 21.9548 8.33397 21.9434 7.02299C21.932 5.71201 21.4061 4.45794 20.4791 3.5309C19.5521 2.60386 18.298 2.07802 16.987 2.06663C15.676 2.05523 14.413 2.55921 13.47 3.47L11.75 5.18" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M14 11C13.5705 10.4259 13.0226 9.95083 12.3935 9.60707C11.7643 9.26331 11.0685 9.05889 10.3534 9.00768C9.63821 8.95646 8.92041 9.05964 8.24866 9.31023C7.5769 9.56082 6.96689 9.95294 6.46 10.46L3.46 13.46C2.54921 14.403 2.04524 15.666 2.05663 16.977C2.06802 18.288 2.59387 19.5421 3.52091 20.4691C4.44795 21.3961 5.70201 21.922 7.013 21.9334C8.32398 21.9448 9.58699 21.4408 10.53 20.53L12.24 18.82" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-LinkIcon.displayName = "LinkIcon";
-const ExternalLinkIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M18 13V19C18 19.5304 17.7893 20.0391 17.4142 20.4142C17.0391 20.7893 16.5304 21 16 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V8C3 7.46957 3.21071 6.96086 3.58579 6.58579C3.96086 6.21071 4.46957 6 5 6H11" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M15 3H21V9" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M10 14L21 3" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-ExternalLinkIcon.displayName = "ExternalLinkIcon";
-export { LinkIcon, ExternalLinkIcon };
-const LoaderIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M21 12C20.9999 13.9006 20.3981 15.7524 19.2809 17.2899C18.1637 18.8275 16.5885 19.9719 14.7809 20.5592C12.9733 21.1464 11.0262 21.1464 9.21864 20.559C7.41109 19.9716 5.83588 18.8271 4.71876 17.2895C3.60165 15.7519 2.99999 13.9001 3 11.9995C3.00001 10.0989 3.60171 8.24711 4.71884 6.7095C5.83598 5.17189 7.4112 4.02741 9.21877 3.44008C11.0263 2.85274 12.9734 2.85272 14.781 3.44" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-LoaderIcon.displayName = "LoaderIcon";
-export { LoaderIcon };
-const LockIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M19 11H5C3.89543 11 3 11.8954 3 13V20C3 21.1046 3.89543 22 5 22H19C20.1046 22 21 21.1046 21 20V13C21 11.8954 20.1046 11 19 11Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M7 11V7C7 5.67392 7.52678 4.40215 8.46447 3.46447C9.40215 2.52678 10.6739 2 12 2C13.3261 2 14.5979 2.52678 15.5355 3.46447C16.4732 4.40215 17 5.67392 17 7V11" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-LockIcon.displayName = "LockIcon";
-export { LockIcon };
-const MailIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M20 4H4C2.89543 4 2 4.89543 2 6V18C2 19.1046 2.89543 20 4 20H20C21.1046 20 22 19.1046 22 18V6C22 4.89543 21.1046 4 20 4Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M22 7L13.03 12.7C12.7213 12.8934 12.3643 12.996 12 12.996C11.6357 12.996 11.2787 12.8934 10.97 12.7L2 7" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-MailIcon.displayName = "MailIcon";
-export { MailIcon };
-const MenuIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M4 12H20" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M4 6H20" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M4 18H20" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-MenuIcon.displayName = "MenuIcon";
-export { MenuIcon };
-const MessageCircleIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M21 11.5C21.0034 12.8199 20.6951 14.1219 20.1 15.3C19.3944 16.7117 18.3098 17.8992 16.9674 18.7293C15.6251 19.5594 14.0782 19.9994 12.5 20C11.1801 20.0034 9.87812 19.6951 8.7 19.1L3 21L4.9 15.3C4.30493 14.1219 3.99656 12.8199 4 11.5C4.00061 9.92176 4.44061 8.37485 5.27072 7.03255C6.10083 5.69025 7.28825 4.60557 8.7 3.9C9.87812 3.30493 11.1801 2.99656 12.5 3H13C15.0843 3.11499 17.053 3.99476 18.5291 5.47086C20.0052 6.94695 20.885 8.91565 21 11V11.5Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-MessageCircleIcon.displayName = "MessageCircleIcon";
-export { MessageCircleIcon };
-const MoonIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 3C10.8134 4.19491 10.1488 5.81141 10.1518 7.49539C10.1547 9.17936 10.825 10.7935 12.0157 11.9843C13.2065 13.175 14.8206 13.8453 16.5046 13.8482C18.1886 13.8512 19.8051 13.1866 21 12C21 13.78 20.4722 15.5201 19.4832 17.0001C18.4943 18.4802 17.0887 19.6337 15.4442 20.3149C13.7996 20.9961 11.99 21.1743 10.2442 20.8271C8.49836 20.4798 6.89472 19.6226 5.63604 18.364C4.37737 17.1053 3.5202 15.5016 3.17294 13.7558C2.82567 12.01 3.0039 10.2004 3.68509 8.55585C4.36628 6.91131 5.51983 5.50571 6.99987 4.51677C8.47991 3.52784 10.22 3 12 3V3Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-MoonIcon.displayName = "MoonIcon";
-export { MoonIcon };
-const PaperclipIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M21.44 11.05L12.25 20.24C11.1242 21.3658 9.59718 21.9983 8.005 21.9983C6.41282 21.9983 4.88584 21.3658 3.76 20.24C2.63416 19.1141 2.00166 17.5872 2.00166 15.995C2.00166 14.4028 2.63416 12.8758 3.76 11.75L12.33 3.17997C13.0806 2.42808 14.0991 2.00515 15.1615 2.00421C16.2239 2.00328 17.2431 2.42441 17.995 3.17497C18.7469 3.92554 19.1698 4.94404 19.1708 6.00644C19.1717 7.06883 18.7506 8.08808 18 8.83997L9.41 17.41C9.03472 17.7853 8.52573 17.9961 7.995 17.9961C7.46427 17.9961 6.95528 17.7853 6.58 17.41C6.20472 17.0347 5.99389 16.5257 5.99389 15.995C5.99389 15.4642 6.20472 14.9553 6.58 14.58L15.07 6.09997" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-PaperclipIcon.displayName = "PaperclipIcon";
-export { PaperclipIcon };
-const PhoneIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M22 16.92V19.92C22.0011 20.1985 21.9441 20.4742 21.8325 20.7294C21.7209 20.9845 21.5573 21.2136 21.3521 21.4019C21.1469 21.5901 20.9046 21.7335 20.6408 21.8227C20.3769 21.9119 20.0974 21.9451 19.82 21.92C16.7428 21.5856 13.787 20.5342 11.19 18.85C8.77383 17.3147 6.72534 15.2662 5.19 12.85C3.49998 10.2412 2.44824 7.271 2.12 4.18001C2.09501 3.90347 2.12788 3.62477 2.2165 3.36163C2.30513 3.09849 2.44757 2.85669 2.63477 2.65163C2.82196 2.44656 3.04981 2.28271 3.30379 2.17053C3.55778 2.05834 3.83234 2.00027 4.11 2.00001H7.11C7.59531 1.99523 8.06579 2.16708 8.43376 2.48354C8.80173 2.79999 9.04208 3.23945 9.11 3.72001C9.23662 4.68007 9.47145 5.62273 9.81 6.53001C9.94455 6.88793 9.97366 7.27692 9.89391 7.65089C9.81415 8.02485 9.62886 8.36812 9.36 8.64001L8.09 9.91001C9.51356 12.4136 11.5865 14.4865 14.09 15.91L15.36 14.64C15.6319 14.3711 15.9752 14.1859 16.3491 14.1061C16.7231 14.0263 17.1121 14.0555 17.47 14.19C18.3773 14.5286 19.3199 14.7634 20.28 14.89C20.7658 14.9585 21.2094 15.2032 21.5265 15.5775C21.8437 15.9518 22.0122 16.4296 22 16.92Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-PhoneIcon.displayName = "PhoneIcon";
-export { PhoneIcon };
-const PlayIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M10 8L16 12L10 16V8Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-PlayIcon.displayName = "PlayIcon";
-export { PlayIcon };
-const RemoveIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M5 12H19" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-RemoveIcon.displayName = "RemoveIcon";
-export { RemoveIcon };
-const RepeatIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M17 2L21 6L17 10" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M3 11V10C3 8.93913 3.42143 7.92172 4.17157 7.17157C4.92172 6.42143 5.93913 6 7 6H21" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M7 22L3 18L7 14" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M21 13V14C21 15.0609 20.5786 16.0783 19.8284 16.8284C19.0783 17.5786 18.0609 18 17 18H3" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-RepeatIcon.displayName = "RepeatIcon";
-const Repeat1Icon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M17 2L21 6L17 10" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M3 11V10C3 8.93913 3.42143 7.92172 4.17157 7.17157C4.92172 6.42143 5.93913 6 7 6H21" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M7 22L3 18L7 14" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M21 13V14C21 15.0609 20.5786 16.0783 19.8284 16.8284C19.0783 17.5786 18.0609 18 17 18H3" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M11 10H12V14" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-Repeat1Icon.displayName = "Repeat1Icon";
-export { RepeatIcon, Repeat1Icon };
-const SearchIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M11 19C15.4183 19 19 15.4183 19 11C19 6.58172 15.4183 3 11 3C6.58172 3 3 6.58172 3 11C3 15.4183 6.58172 19 11 19Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M21 21L16.65 16.65" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-SearchIcon.displayName = "SearchIcon";
-export { SearchIcon };
-const SettingsIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12.22 2H11.78C11.2496 2 10.7409 2.21071 10.3658 2.58579C9.99072 2.96086 9.78 3.46957 9.78 4V4.18C9.77964 4.53073 9.68706 4.87519 9.51154 5.17884C9.33602 5.48248 9.08374 5.73464 8.78 5.91L8.35 6.16C8.04596 6.33554 7.70108 6.42795 7.35 6.42795C6.99893 6.42795 6.65404 6.33554 6.35 6.16L6.2 6.08C5.74107 5.81526 5.19584 5.74344 4.684 5.88031C4.17217 6.01717 3.73555 6.35154 3.47 6.81L3.25 7.19C2.98526 7.64893 2.91345 8.19416 3.05031 8.706C3.18717 9.21783 3.52154 9.65445 3.98 9.92L4.13 10.02C4.43228 10.1945 4.68362 10.4451 4.85905 10.7468C5.03448 11.0486 5.1279 11.391 5.13 11.74V12.25C5.1314 12.6024 5.03965 12.949 4.86405 13.2545C4.68844 13.5601 4.43521 13.8138 4.13 13.99L3.98 14.08C3.52154 14.3456 3.18717 14.7822 3.05031 15.294C2.91345 15.8058 2.98526 16.3511 3.25 16.81L3.47 17.19C3.73555 17.6485 4.17217 17.9828 4.684 18.1197C5.19584 18.2566 5.74107 18.1847 6.2 17.92L6.35 17.84C6.65404 17.6645 6.99893 17.5721 7.35 17.5721C7.70108 17.5721 8.04596 17.6645 8.35 17.84L8.78 18.09C9.08374 18.2654 9.33602 18.5175 9.51154 18.8212C9.68706 19.1248 9.77964 19.4693 9.78 19.82V20C9.78 20.5304 9.99072 21.0391 10.3658 21.4142C10.7409 21.7893 11.2496 22 11.78 22H12.22C12.7504 22 13.2591 21.7893 13.6342 21.4142C14.0093 21.0391 14.22 20.5304 14.22 20V19.82C14.2204 19.4693 14.3129 19.1248 14.4885 18.8212C14.664 18.5175 14.9163 18.2654 15.22 18.09L15.65 17.84C15.954 17.6645 16.2989 17.5721 16.65 17.5721C17.0011 17.5721 17.346 17.6645 17.65 17.84L17.8 17.92C18.2589 18.1847 18.8042 18.2566 19.316 18.1197C19.8278 17.9828 20.2645 17.6485 20.53 17.19L20.75 16.8C21.0147 16.3411 21.0866 15.7958 20.9497 15.284C20.8128 14.7722 20.4785 14.3356 20.02 14.07L19.87 13.99C19.5648 13.8138 19.3116 13.5601 19.136 13.2545C18.9604 12.949 18.8686 12.6024 18.87 12.25V11.75C18.8686 11.3976 18.9604 11.051 19.136 10.7455C19.3116 10.4399 19.5648 10.1862 19.87 10.01L20.02 9.92C20.4785 9.65445 20.8128 9.21783 20.9497 8.706C21.0866 8.19416 21.0147 7.64893 20.75 7.19L20.53 6.81C20.2645 6.35154 19.8278 6.01717 19.316 5.88031C18.8042 5.74344 18.2589 5.81526 17.8 6.08L17.65 6.16C17.346 6.33554 17.0011 6.42795 16.65 6.42795C16.2989 6.42795 15.954 6.33554 15.65 6.16L15.22 5.91C14.9163 5.73464 14.664 5.48248 14.4885 5.17884C14.3129 4.87519 14.2204 4.53073 14.22 4.18V4C14.22 3.46957 14.0093 2.96086 13.6342 2.58579C13.2591 2.21071 12.7504 2 12.22 2V2Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-SettingsIcon.displayName = "SettingsIcon";
-export { SettingsIcon };
-const ShareIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M18 8C19.6569 8 21 6.65685 21 5C21 3.34315 19.6569 2 18 2C16.3431 2 15 3.34315 15 5C15 6.65685 16.3431 8 18 8Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M6 15C7.65685 15 9 13.6569 9 12C9 10.3431 7.65685 9 6 9C4.34315 9 3 10.3431 3 12C3 13.6569 4.34315 15 6 15Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M18 22C19.6569 22 21 20.6569 21 19C21 17.3431 19.6569 16 18 16C16.3431 16 15 17.3431 15 19C15 20.6569 16.3431 22 18 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M8.59 13.51L15.42 17.49" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M15.41 6.51L8.59 10.49" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-ShareIcon.displayName = "ShareIcon";
-export { ShareIcon };
-const SlashIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M4.92999 4.92999L19.07 19.07" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-SlashIcon.displayName = "SlashIcon";
-export { SlashIcon };
-const StarIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 2L15.09 8.26L22 9.27L17 14.14L18.18 21.02L12 17.77L5.82 21.02L7 14.14L2 9.27L8.91 8.26L12 2Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-StarIcon.displayName = "StarIcon";
-export { StarIcon };
-const SunIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 16C14.2091 16 16 14.2091 16 12C16 9.79086 14.2091 8 12 8C9.79086 8 8 9.79086 8 12C8 14.2091 9.79086 16 12 16Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 2V4" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M12 20V22" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M4.92999 4.93L6.33999 6.34" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M17.66 17.66L19.07 19.07" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M2 12H4" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M20 12H22" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M6.33999 17.66L4.92999 19.07" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M19.07 4.93L17.66 6.34" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-SunIcon.displayName = "SunIcon";
-export { SunIcon };
-const ThreeDotsIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M12 13C12.5523 13 13 12.5523 13 12C13 11.4477 12.5523 11 12 11C11.4477 11 11 11.4477 11 12C11 12.5523 11.4477 13 12 13Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M19 13C19.5523 13 20 12.5523 20 12C20 11.4477 19.5523 11 19 11C18.4477 11 18 11.4477 18 12C18 12.5523 18.4477 13 19 13Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M5 13C5.55228 13 6 12.5523 6 12C6 11.4477 5.55228 11 5 11C4.44771 11 4 11.4477 4 12C4 12.5523 4.44771 13 5 13Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-ThreeDotsIcon.displayName = "ThreeDotsIcon";
-export { ThreeDotsIcon };
-const TrashIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M3 6H21" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M19 6V20C19 21 18 22 17 22H7C6 22 5 21 5 20V6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M8 6V4C8 3 9 2 10 2H14C15 2 16 3 16 4V6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-TrashIcon.displayName = "TrashIcon";
-export { TrashIcon };
-const UnlockIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <Path d="M19 11H5C3.89543 11 3 11.8954 3 13V20C3 21.1046 3.89543 22 5 22H19C20.1046 22 21 21.1046 21 20V13C21 11.8954 20.1046 11 19 11Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <Path d="M7 11V7C6.99876 5.76005 7.45828 4.56387 8.28938 3.64367C9.12047 2.72347 10.2638 2.1449 11.4975 2.02029C12.7312 1.89568 13.9671 2.2339 14.9655 2.96931C15.9638 3.70472 16.6533 4.78485 16.9 6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-UnlockIcon.displayName = "UnlockIcon";
-export { UnlockIcon };
diff --git a/universal/packages/components/ui/icon/index.tsx b/universal/packages/components/ui/icon/index.tsx
index a6392839..bb0fd52c 100644
--- a/universal/packages/components/ui/icon/index.tsx
+++ b/universal/packages/components/ui/icon/index.tsx
@@ -1,75 +1,21 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createIcon } from '@gluestack-ui/icon';
-import { Path, Svg } from 'react-native-svg';
+import { Path } from 'react-native-svg';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { cssInterop } from 'nativewind';
 import { VariantProps } from '@gluestack-ui/nativewind-utils';
-
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
+import { PrimitiveIcon, IPrimitiveIcon, Svg } from '@gluestack-ui/icon';
 
 export const UIIcon = createIcon({
   Root: PrimitiveIcon,
-});
+}) as React.ForwardRefExoticComponent<
+  React.ComponentPropsWithoutRef<typeof PrimitiveIcon> &
+    React.RefAttributes<React.ElementRef<typeof Svg>>
+>;
 
 const iconStyle = tva({
-  base: 'text-typography-950 fill-none',
+  base: 'text-typography-950 fill-none pointer-events-none',
   variants: {
     size: {
       '2xs': 'h-3 w-3',
@@ -82,7 +28,6 @@ const iconStyle = tva({
   },
 });
 
-// @ts-ignore
 cssInterop(UIIcon, {
   className: {
     target: 'style',
@@ -136,23 +81,28 @@ export const Icon = React.forwardRef<React.ElementRef<typeof Svg>, IIConProps>(
 type ParameterTypes = Omit<Parameters<typeof createIcon>[0], 'Root'>;
 
 const createIconUI = ({ ...props }: ParameterTypes) => {
-  const UIIconCreateIcon = createIcon({ Root: Svg, ...props });
+  const UIIconCreateIcon = createIcon({
+    Root: Svg,
+    ...props,
+  }) as React.ForwardRefExoticComponent<
+    React.ComponentPropsWithoutRef<typeof PrimitiveIcon> &
+      React.RefAttributes<React.ElementRef<typeof Svg>>
+  >;
 
   return React.forwardRef<React.ElementRef<typeof Svg>>(
     (
       {
         className,
         size,
-        ...props
+        ...inComingProps
       }: VariantProps<typeof iconStyle> &
         React.ComponentPropsWithoutRef<typeof UIIconCreateIcon>,
       ref
     ) => {
       return (
         <UIIconCreateIcon
-          // @ts-ignore
           ref={ref}
-          {...props}
+          {...inComingProps}
           className={iconStyle({ size, class: className })}
         />
       );
diff --git a/universal/packages/components/ui/icon/index.web.d.ts b/universal/packages/components/ui/icon/index.web.d.ts
deleted file mode 100644
index 5f52c60e..00000000
--- a/universal/packages/components/ui/icon/index.web.d.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import React from "react";
-import { createIcon } from "@gluestack-ui/icon";
-export declare const UIIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<(Omit<any, "ref"> & React.RefAttributes<unknown>) | {
-    fill?: import("react-native").ColorValue | undefined;
-    stroke?: import("react-native").ColorValue | undefined;
-}>;
-export declare const Icon: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-type ParameterTypes = Omit<Parameters<typeof createIcon>[0], "Root">;
-declare const createIconUI: ({ ...props }: ParameterTypes) => React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export { createIconUI as createIcon };
-declare const AddIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { AddIcon };
-declare const AlertCircleIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { AlertCircleIcon };
-declare const ArrowUpIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const ArrowDownIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const ArrowRightIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const ArrowLeftIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { ArrowUpIcon, ArrowDownIcon, ArrowRightIcon, ArrowLeftIcon };
-declare const AtSignIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { AtSignIcon };
-declare const BellIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { BellIcon };
-declare const CalendarDaysIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { CalendarDaysIcon };
-declare const CheckIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const CheckCircleIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { CheckIcon, CheckCircleIcon };
-declare const ChevronUpIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const ChevronDownIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const ChevronLeftIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const ChevronRightIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const ChevronsLeftIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const ChevronsRightIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const ChevronsUpDownIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { ChevronUpIcon, ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon, ChevronsLeftIcon, ChevronsRightIcon, ChevronsUpDownIcon, };
-declare const CircleIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { CircleIcon };
-declare const ClockIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { ClockIcon };
-declare const CloseIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const CloseCircleIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { CloseIcon, CloseCircleIcon };
-declare const CopyIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { CopyIcon };
-declare const DownloadIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { DownloadIcon };
-declare const EditIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { EditIcon };
-declare const EyeIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const EyeOffIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { EyeIcon, EyeOffIcon };
-declare const FavouriteIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { FavouriteIcon };
-declare const GlobeIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { GlobeIcon };
-declare const GripVerticalIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { GripVerticalIcon };
-declare const HelpCircleIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { HelpCircleIcon };
-declare const InfoIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { InfoIcon };
-declare const LinkIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const ExternalLinkIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { LinkIcon, ExternalLinkIcon };
-declare const LoaderIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { LoaderIcon };
-declare const LockIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { LockIcon };
-declare const MailIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { MailIcon };
-declare const MenuIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { MenuIcon };
-declare const MessageCircleIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { MessageCircleIcon };
-declare const MoonIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { MoonIcon };
-declare const PaperclipIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { PaperclipIcon };
-declare const PhoneIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { PhoneIcon };
-declare const PlayIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { PlayIcon };
-declare const RemoveIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { RemoveIcon };
-declare const RepeatIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-declare const Repeat1Icon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { RepeatIcon, Repeat1Icon };
-declare const SearchIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { SearchIcon };
-declare const SettingsIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { SettingsIcon };
-declare const ShareIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { ShareIcon };
-declare const SlashIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { SlashIcon };
-declare const StarIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { StarIcon };
-declare const SunIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { SunIcon };
-declare const ThreeDotsIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { ThreeDotsIcon };
-declare const TrashIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { TrashIcon };
-declare const UnlockIcon: import("@gluestack-ui/icon/lib/typescript/createIcon").IIconComponentType<any>;
-export { UnlockIcon };
diff --git a/universal/packages/components/ui/icon/index.web.jsx b/universal/packages/components/ui/icon/index.web.jsx
deleted file mode 100644
index 0a2cc422..00000000
--- a/universal/packages/components/ui/icon/index.web.jsx
+++ /dev/null
@@ -1,622 +0,0 @@
-import React, { useMemo } from "react";
-import { createIcon } from "@gluestack-ui/icon";
-import { tva } from "@gluestack-ui/nativewind-utils/tva";
-const accessClassName = (style) => {
-    const obj = style[0];
-    const keys = Object.keys(obj); //will return an array of keys
-    return obj[keys[1]];
-};
-const Svg = ({ style, className, ...props }) => {
-    const calculateClassName = useMemo(() => {
-        return className === undefined ? accessClassName(style) : className;
-    }, [className, style]);
-    return <svg {...props} className={calculateClassName}/>;
-};
-const PrimitiveIcon = React.forwardRef(({ height, width, fill, color, size, stroke = "currentColor", as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    const colorProps = stroke === "currentColor" && color !== undefined ? color : stroke;
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} {...props} {...sizeProps} stroke={colorProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} stroke={colorProps} {...props}/>);
-});
-export const UIIcon = createIcon({
-    Root: PrimitiveIcon,
-});
-const iconStyle = tva({
-    base: "text-typography-950 fill-none",
-    variants: {
-        size: {
-            "2xs": "h-3 w-3",
-            xs: "h-3.5 w-3.5",
-            sm: "h-4 w-4",
-            md: "h-[18px] w-[18px]",
-            lg: "h-5 w-5",
-            xl: "h-6 w-6",
-        },
-    },
-});
-export const Icon = React.forwardRef(({ size = "md", className, ...props }, ref) => {
-    if (typeof size === "number") {
-        return (<UIIcon ref={ref} {...props} className={iconStyle({ class: className })} size={size}/>);
-    }
-    else if ((props.height !== undefined || props.width !== undefined) &&
-        size === undefined) {
-        return (<UIIcon ref={ref} {...props} className={iconStyle({ class: className })}/>);
-    }
-    return (<UIIcon ref={ref} {...props} className={iconStyle({ size, class: className })}/>);
-});
-const createIconUI = ({ ...props }) => {
-    const UIIcon = createIcon({ Root: Svg, ...props });
-    return React.forwardRef(({ className, size, ...props }, ref) => {
-        return (<UIIcon ref={ref} {...props} className={iconStyle({ size, class: className })}/>);
-    });
-};
-export { createIconUI as createIcon };
-// All Icons
-const AddIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 5V19" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M5 12H19" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-AddIcon.displayName = "AddIcon";
-export { AddIcon };
-const AlertCircleIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 8V12" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 16H12.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-AlertCircleIcon.displayName = "AlertCircleIcon";
-export { AlertCircleIcon };
-const ArrowUpIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 19V5" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M5 12L12 5L19 12" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ArrowDownIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 5V19" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M19 12L12 19L5 12" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ArrowRightIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M5 12H19" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 5L19 12L12 19" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ArrowLeftIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M19 12H5" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 19L5 12L12 5" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-ArrowUpIcon.displayName = "ArrowUpIcon";
-ArrowDownIcon.displayName = "ArrowDownIcon";
-ArrowRightIcon.displayName = "ArrowRightIcon";
-ArrowLeftIcon.displayName = "ArrowLeftIcon";
-export { ArrowUpIcon, ArrowDownIcon, ArrowRightIcon, ArrowLeftIcon };
-const AtSignIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <>
-        <path d="M12 16C14.2091 16 16 14.2091 16 12C16 9.79086 14.2091 8 12 8C9.79086 8 8 9.79086 8 12C8 14.2091 9.79086 16 12 16Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-        <path d="M16 7.99999V13C16 13.7956 16.3161 14.5587 16.8787 15.1213C17.4413 15.6839 18.2044 16 19 16C19.7957 16 20.5587 15.6839 21.1213 15.1213C21.6839 14.5587 22 13.7956 22 13V12C21.9999 9.74302 21.2362 7.55247 19.8333 5.78452C18.4303 4.01658 16.4706 2.77521 14.2726 2.26229C12.0747 1.74936 9.76794 1.99503 7.72736 2.95936C5.68677 3.92368 4.03241 5.54995 3.03327 7.57371C2.03413 9.59748 1.74898 11.8997 2.22418 14.1061C2.69938 16.3125 3.90699 18.2932 5.65064 19.7263C7.39429 21.1593 9.57144 21.9603 11.8281 21.9991C14.0847 22.0379 16.2881 21.3122 18.08 19.94" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      </>
-    </>),
-});
-AtSignIcon.displayName = "AtSignIcon";
-export { AtSignIcon };
-const BellIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M18 8C18 6.4087 17.3679 4.88258 16.2426 3.75736C15.1174 2.63214 13.5913 2 12 2C10.4087 2 8.88258 2.63214 7.75736 3.75736C6.63214 4.88258 6 6.4087 6 8C6 15 3 17 3 17H21C21 17 18 15 18 8Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M13.73 21C13.5542 21.3031 13.3018 21.5547 12.9982 21.7295C12.6946 21.9044 12.3504 21.9965 12 21.9965C11.6496 21.9965 11.3054 21.9044 11.0018 21.7295C10.6982 21.5547 10.4458 21.3031 10.27 21" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-BellIcon.displayName = "BellIcon";
-export { BellIcon };
-const CalendarDaysIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M19 4H5C3.89543 4 3 4.89543 3 6V20C3 21.1046 3.89543 22 5 22H19C20.1046 22 21 21.1046 21 20V6C21 4.89543 20.1046 4 19 4Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M16 2V6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M8 2V6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M3 10H21" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M8 14H8.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 14H12.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M16 14H16.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M8 18H8.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 18H12.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M16 18H16.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-CalendarDaysIcon.displayName = "CalendarDaysIcon";
-export { CalendarDaysIcon };
-const CheckIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M20 6L9 17L4 12" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const CheckCircleIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 22C17.523 22 22 17.523 22 12C22 6.477 17.523 2 12 2C6.477 2 2 6.477 2 12C2 17.523 6.477 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M9 12L11 14L15 10" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-CheckIcon.displayName = "CheckIcon";
-CheckCircleIcon.displayName = "CheckCircleIcon";
-export { CheckIcon, CheckCircleIcon };
-const ChevronUpIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    d: "M12 10L8 6L4 10",
-    path: (<>
-      <path d="M18 15L12 9L6 15" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ChevronDownIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M6 9L12 15L18 9" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ChevronLeftIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M15 18L9 12L15 6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ChevronRightIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M9 18L15 12L9 6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ChevronsLeftIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M11 17L6 12L11 7" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M18 17L13 12L18 7" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ChevronsRightIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M13 17L18 12L13 7" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M6 17L11 12L6 7" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const ChevronsUpDownIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M7 15L12 20L17 15" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M7 9L12 4L17 9" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-ChevronUpIcon.displayName = "ChevronUpIcon";
-ChevronDownIcon.displayName = "ChevronDownIcon";
-ChevronLeftIcon.displayName = "ChevronLeftIcon";
-ChevronRightIcon.displayName = "ChevronRightIcon";
-ChevronsLeftIcon.displayName = "ChevronsLeftIcon";
-ChevronsRightIcon.displayName = "ChevronsRightIcon";
-ChevronsUpDownIcon.displayName = "ChevronsUpDownIcon";
-export { ChevronUpIcon, ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon, ChevronsLeftIcon, ChevronsRightIcon, ChevronsUpDownIcon, };
-const CircleIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-CircleIcon.displayName = "CircleIcon";
-export { CircleIcon };
-const ClockIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 6V12L16 14" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-ClockIcon.displayName = "ClockIcon";
-export { ClockIcon };
-const CloseIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M18 6L6 18" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M6 6L18 18" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-const CloseCircleIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M15 9L9 15" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M9 9L15 15" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-CloseIcon.displayName = "CloseIcon";
-CloseCircleIcon.displayName = "CloseCircleIcon";
-export { CloseIcon, CloseCircleIcon };
-const CopyIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M20 9H11C9.89543 9 9 9.89543 9 11V20C9 21.1046 9.89543 22 11 22H20C21.1046 22 22 21.1046 22 20V11C22 9.89543 21.1046 9 20 9Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M5 15H4C3.46957 15 2.96086 14.7893 2.58579 14.4142C2.21071 14.0391 2 13.5304 2 13V4C2 3.46957 2.21071 2.96086 2.58579 2.58579C2.96086 2.21071 3.46957 2 4 2H13C13.5304 2 14.0391 2.21071 14.4142 2.58579C14.7893 2.96086 15 3.46957 15 4V5" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-CopyIcon.displayName = "CopyIcon";
-export { CopyIcon };
-const DownloadIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M21 15V19C21 19.5304 20.7893 20.0391 20.4142 20.4142C20.0391 20.7893 19.5304 21 19 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V15" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M7 10L12 15L17 10" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 15V3" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-DownloadIcon.displayName = "DownloadIcon";
-export { DownloadIcon };
-const EditIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M11 4H4C3.46957 4 2.96086 4.21071 2.58579 4.58579C2.21071 4.96086 2 5.46957 2 6V20C2 20.5304 2.21071 21.0391 2.58579 21.4142C2.96086 21.7893 3.46957 22 4 22H18C18.5304 22 19.0391 21.7893 19.4142 21.4142C19.7893 21.0391 20 20.5304 20 20V13" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M18.5 2.50001C18.8978 2.10219 19.4374 1.87869 20 1.87869C20.5626 1.87869 21.1022 2.10219 21.5 2.50001C21.8978 2.89784 22.1213 3.4374 22.1213 4.00001C22.1213 4.56262 21.8978 5.10219 21.5 5.50001L12 15L8 16L9 12L18.5 2.50001Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-EditIcon.displayName = "EditIcon";
-export { EditIcon };
-const EyeIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M2 12C2 12 5 5 12 5C19 5 22 12 22 12C22 12 19 19 12 19C5 19 2 12 2 12Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-EyeIcon.displayName = "EyeIcon";
-const EyeOffIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M9.88 9.88C9.58525 10.1546 9.34884 10.4859 9.18487 10.8538C9.02091 11.2218 8.93274 11.6191 8.92563 12.0219C8.91852 12.4247 8.99262 12.8248 9.14351 13.1984C9.29439 13.5719 9.51897 13.9113 9.80384 14.1962C10.0887 14.481 10.4281 14.7056 10.8016 14.8565C11.1752 15.0074 11.5753 15.0815 11.9781 15.0744C12.3809 15.0673 12.7782 14.9791 13.1461 14.8151C13.5141 14.6512 13.8453 14.4147 14.12 14.12" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M10.73 5.08C11.1513 5.02751 11.5754 5.00079 12 5C19 5 22 12 22 12C21.5529 12.9571 20.9922 13.8569 20.33 14.68" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M6.61 6.61C4.62125 7.96462 3.02987 9.82526 2 12C2 12 5 19 12 19C13.9159 19.0051 15.7908 18.4451 17.39 17.39" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M2 2L22 22" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-EyeOffIcon.displayName = "EyeOffIcon";
-export { EyeIcon, EyeOffIcon };
-const FavouriteIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M20.42 4.58C19.9183 4.07658 19.3222 3.67714 18.6658 3.40459C18.0094 3.13204 17.3057 2.99174 16.595 2.99174C15.8843 2.99174 15.1806 3.13204 14.5242 3.40459C13.8678 3.67714 13.2717 4.07658 12.77 4.58L12 5.36L11.23 4.58C10.7283 4.07658 10.1322 3.67714 9.47582 3.40459C8.81944 3.13204 8.11571 2.99174 7.40499 2.99174C6.69428 2.99174 5.99055 3.13204 5.33417 3.40459C4.67779 3.67714 4.08167 4.07658 3.57999 4.58C1.45999 6.7 1.32999 10.28 3.99999 13L12 21L20 13C22.67 10.28 22.54 6.7 20.42 4.58Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-FavouriteIcon.displayName = "FavouriteIcon";
-export { FavouriteIcon };
-const GlobeIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M2 12H22" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 2C14.5013 4.73835 15.9228 8.29203 16 12C15.9228 15.708 14.5013 19.2616 12 22C9.49872 19.2616 8.07725 15.708 8 12C8.07725 8.29203 9.49872 4.73835 12 2V2Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-GlobeIcon.displayName = "GlobeIcon";
-export { GlobeIcon };
-const GripVerticalIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M9 13C9.55228 13 10 12.5523 10 12C10 11.4477 9.55228 11 9 11C8.44772 11 8 11.4477 8 12C8 12.5523 8.44772 13 9 13Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M9 6C9.55228 6 10 5.55228 10 5C10 4.44772 9.55228 4 9 4C8.44772 4 8 4.44772 8 5C8 5.55228 8.44772 6 9 6Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M9 20C9.55228 20 10 19.5523 10 19C10 18.4477 9.55228 18 9 18C8.44772 18 8 18.4477 8 19C8 19.5523 8.44772 20 9 20Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M15 13C15.5523 13 16 12.5523 16 12C16 11.4477 15.5523 11 15 11C14.4477 11 14 11.4477 14 12C14 12.5523 14.4477 13 15 13Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M15 6C15.5523 6 16 5.55228 16 5C16 4.44772 15.5523 4 15 4C14.4477 4 14 4.44772 14 5C14 5.55228 14.4477 6 15 6Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M15 20C15.5523 20 16 19.5523 16 19C16 18.4477 15.5523 18 15 18C14.4477 18 14 18.4477 14 19C14 19.5523 14.4477 20 15 20Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-GripVerticalIcon.displayName = "GripVerticalIcon";
-export { GripVerticalIcon };
-const HelpCircleIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M9.09 9.00001C9.3251 8.33167 9.78915 7.76811 10.4 7.40914C11.0108 7.05016 11.7289 6.91894 12.4272 7.03872C13.1255 7.15849 13.7588 7.52153 14.2151 8.06353C14.6713 8.60554 14.9211 9.29153 14.92 10C14.92 12 11.92 13 11.92 13" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 17H12.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-HelpCircleIcon.displayName = "HelpCircleIcon";
-export { HelpCircleIcon };
-const InfoIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 16V12" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 8H12.01" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-InfoIcon.displayName = "InfoIcon";
-export { InfoIcon };
-const LinkIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M10 13C10.4295 13.5741 10.9774 14.0492 11.6066 14.3929C12.2357 14.7367 12.9315 14.9411 13.6467 14.9923C14.3618 15.0435 15.0796 14.9404 15.7513 14.6898C16.4231 14.4392 17.0331 14.0471 17.54 13.54L20.54 10.54C21.4508 9.59699 21.9548 8.33397 21.9434 7.02299C21.932 5.71201 21.4061 4.45794 20.4791 3.5309C19.5521 2.60386 18.298 2.07802 16.987 2.06663C15.676 2.05523 14.413 2.55921 13.47 3.47L11.75 5.18" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M14 11C13.5705 10.4259 13.0226 9.95083 12.3935 9.60707C11.7643 9.26331 11.0685 9.05889 10.3534 9.00768C9.63821 8.95646 8.92041 9.05964 8.24866 9.31023C7.5769 9.56082 6.96689 9.95294 6.46 10.46L3.46 13.46C2.54921 14.403 2.04524 15.666 2.05663 16.977C2.06802 18.288 2.59387 19.5421 3.52091 20.4691C4.44795 21.3961 5.70201 21.922 7.013 21.9334C8.32398 21.9448 9.58699 21.4408 10.53 20.53L12.24 18.82" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-LinkIcon.displayName = "LinkIcon";
-const ExternalLinkIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M18 13V19C18 19.5304 17.7893 20.0391 17.4142 20.4142C17.0391 20.7893 16.5304 21 16 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V8C3 7.46957 3.21071 6.96086 3.58579 6.58579C3.96086 6.21071 4.46957 6 5 6H11" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M15 3H21V9" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M10 14L21 3" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-ExternalLinkIcon.displayName = "ExternalLinkIcon";
-export { LinkIcon, ExternalLinkIcon };
-const LoaderIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M21 12C20.9999 13.9006 20.3981 15.7524 19.2809 17.2899C18.1637 18.8275 16.5885 19.9719 14.7809 20.5592C12.9733 21.1464 11.0262 21.1464 9.21864 20.559C7.41109 19.9716 5.83588 18.8271 4.71876 17.2895C3.60165 15.7519 2.99999 13.9001 3 11.9995C3.00001 10.0989 3.60171 8.24711 4.71884 6.7095C5.83598 5.17189 7.4112 4.02741 9.21877 3.44008C11.0263 2.85274 12.9734 2.85272 14.781 3.44" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-LoaderIcon.displayName = "LoaderIcon";
-export { LoaderIcon };
-const LockIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M19 11H5C3.89543 11 3 11.8954 3 13V20C3 21.1046 3.89543 22 5 22H19C20.1046 22 21 21.1046 21 20V13C21 11.8954 20.1046 11 19 11Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M7 11V7C7 5.67392 7.52678 4.40215 8.46447 3.46447C9.40215 2.52678 10.6739 2 12 2C13.3261 2 14.5979 2.52678 15.5355 3.46447C16.4732 4.40215 17 5.67392 17 7V11" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-LockIcon.displayName = "LockIcon";
-export { LockIcon };
-const MailIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M20 4H4C2.89543 4 2 4.89543 2 6V18C2 19.1046 2.89543 20 4 20H20C21.1046 20 22 19.1046 22 18V6C22 4.89543 21.1046 4 20 4Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M22 7L13.03 12.7C12.7213 12.8934 12.3643 12.996 12 12.996C11.6357 12.996 11.2787 12.8934 10.97 12.7L2 7" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-MailIcon.displayName = "MailIcon";
-export { MailIcon };
-const MenuIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M4 12H20" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M4 6H20" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M4 18H20" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-MenuIcon.displayName = "MenuIcon";
-export { MenuIcon };
-const MessageCircleIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M21 11.5C21.0034 12.8199 20.6951 14.1219 20.1 15.3C19.3944 16.7117 18.3098 17.8992 16.9674 18.7293C15.6251 19.5594 14.0782 19.9994 12.5 20C11.1801 20.0034 9.87812 19.6951 8.7 19.1L3 21L4.9 15.3C4.30493 14.1219 3.99656 12.8199 4 11.5C4.00061 9.92176 4.44061 8.37485 5.27072 7.03255C6.10083 5.69025 7.28825 4.60557 8.7 3.9C9.87812 3.30493 11.1801 2.99656 12.5 3H13C15.0843 3.11499 17.053 3.99476 18.5291 5.47086C20.0052 6.94695 20.885 8.91565 21 11V11.5Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-MessageCircleIcon.displayName = "MessageCircleIcon";
-export { MessageCircleIcon };
-const MoonIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 3C10.8134 4.19491 10.1488 5.81141 10.1518 7.49539C10.1547 9.17936 10.825 10.7935 12.0157 11.9843C13.2065 13.175 14.8206 13.8453 16.5046 13.8482C18.1886 13.8512 19.8051 13.1866 21 12C21 13.78 20.4722 15.5201 19.4832 17.0001C18.4943 18.4802 17.0887 19.6337 15.4442 20.3149C13.7996 20.9961 11.99 21.1743 10.2442 20.8271C8.49836 20.4798 6.89472 19.6226 5.63604 18.364C4.37737 17.1053 3.5202 15.5016 3.17294 13.7558C2.82567 12.01 3.0039 10.2004 3.68509 8.55585C4.36628 6.91131 5.51983 5.50571 6.99987 4.51677C8.47991 3.52784 10.22 3 12 3V3Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-MoonIcon.displayName = "MoonIcon";
-export { MoonIcon };
-const PaperclipIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M21.44 11.05L12.25 20.24C11.1242 21.3658 9.59718 21.9983 8.005 21.9983C6.41282 21.9983 4.88584 21.3658 3.76 20.24C2.63416 19.1141 2.00166 17.5872 2.00166 15.995C2.00166 14.4028 2.63416 12.8758 3.76 11.75L12.33 3.17997C13.0806 2.42808 14.0991 2.00515 15.1615 2.00421C16.2239 2.00328 17.2431 2.42441 17.995 3.17497C18.7469 3.92554 19.1698 4.94404 19.1708 6.00644C19.1717 7.06883 18.7506 8.08808 18 8.83997L9.41 17.41C9.03472 17.7853 8.52573 17.9961 7.995 17.9961C7.46427 17.9961 6.95528 17.7853 6.58 17.41C6.20472 17.0347 5.99389 16.5257 5.99389 15.995C5.99389 15.4642 6.20472 14.9553 6.58 14.58L15.07 6.09997" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-PaperclipIcon.displayName = "PaperclipIcon";
-export { PaperclipIcon };
-const PhoneIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M22 16.92V19.92C22.0011 20.1985 21.9441 20.4742 21.8325 20.7294C21.7209 20.9845 21.5573 21.2136 21.3521 21.4019C21.1469 21.5901 20.9046 21.7335 20.6408 21.8227C20.3769 21.9119 20.0974 21.9451 19.82 21.92C16.7428 21.5856 13.787 20.5342 11.19 18.85C8.77383 17.3147 6.72534 15.2662 5.19 12.85C3.49998 10.2412 2.44824 7.271 2.12 4.18001C2.09501 3.90347 2.12788 3.62477 2.2165 3.36163C2.30513 3.09849 2.44757 2.85669 2.63477 2.65163C2.82196 2.44656 3.04981 2.28271 3.30379 2.17053C3.55778 2.05834 3.83234 2.00027 4.11 2.00001H7.11C7.59531 1.99523 8.06579 2.16708 8.43376 2.48354C8.80173 2.79999 9.04208 3.23945 9.11 3.72001C9.23662 4.68007 9.47145 5.62273 9.81 6.53001C9.94455 6.88793 9.97366 7.27692 9.89391 7.65089C9.81415 8.02485 9.62886 8.36812 9.36 8.64001L8.09 9.91001C9.51356 12.4136 11.5865 14.4865 14.09 15.91L15.36 14.64C15.6319 14.3711 15.9752 14.1859 16.3491 14.1061C16.7231 14.0263 17.1121 14.0555 17.47 14.19C18.3773 14.5286 19.3199 14.7634 20.28 14.89C20.7658 14.9585 21.2094 15.2032 21.5265 15.5775C21.8437 15.9518 22.0122 16.4296 22 16.92Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-PhoneIcon.displayName = "PhoneIcon";
-export { PhoneIcon };
-const PlayIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M10 8L16 12L10 16V8Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-PlayIcon.displayName = "PlayIcon";
-export { PlayIcon };
-const RemoveIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M5 12H19" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-RemoveIcon.displayName = "RemoveIcon";
-export { RemoveIcon };
-const RepeatIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M17 2L21 6L17 10" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M3 11V10C3 8.93913 3.42143 7.92172 4.17157 7.17157C4.92172 6.42143 5.93913 6 7 6H21" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M7 22L3 18L7 14" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M21 13V14C21 15.0609 20.5786 16.0783 19.8284 16.8284C19.0783 17.5786 18.0609 18 17 18H3" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-RepeatIcon.displayName = "RepeatIcon";
-const Repeat1Icon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M17 2L21 6L17 10" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M3 11V10C3 8.93913 3.42143 7.92172 4.17157 7.17157C4.92172 6.42143 5.93913 6 7 6H21" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M7 22L3 18L7 14" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M21 13V14C21 15.0609 20.5786 16.0783 19.8284 16.8284C19.0783 17.5786 18.0609 18 17 18H3" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M11 10H12V14" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-Repeat1Icon.displayName = "Repeat1Icon";
-export { RepeatIcon, Repeat1Icon };
-const SearchIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M11 19C15.4183 19 19 15.4183 19 11C19 6.58172 15.4183 3 11 3C6.58172 3 3 6.58172 3 11C3 15.4183 6.58172 19 11 19Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M21 21L16.65 16.65" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-SearchIcon.displayName = "SearchIcon";
-export { SearchIcon };
-const SettingsIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12.22 2H11.78C11.2496 2 10.7409 2.21071 10.3658 2.58579C9.99072 2.96086 9.78 3.46957 9.78 4V4.18C9.77964 4.53073 9.68706 4.87519 9.51154 5.17884C9.33602 5.48248 9.08374 5.73464 8.78 5.91L8.35 6.16C8.04596 6.33554 7.70108 6.42795 7.35 6.42795C6.99893 6.42795 6.65404 6.33554 6.35 6.16L6.2 6.08C5.74107 5.81526 5.19584 5.74344 4.684 5.88031C4.17217 6.01717 3.73555 6.35154 3.47 6.81L3.25 7.19C2.98526 7.64893 2.91345 8.19416 3.05031 8.706C3.18717 9.21783 3.52154 9.65445 3.98 9.92L4.13 10.02C4.43228 10.1945 4.68362 10.4451 4.85905 10.7468C5.03448 11.0486 5.1279 11.391 5.13 11.74V12.25C5.1314 12.6024 5.03965 12.949 4.86405 13.2545C4.68844 13.5601 4.43521 13.8138 4.13 13.99L3.98 14.08C3.52154 14.3456 3.18717 14.7822 3.05031 15.294C2.91345 15.8058 2.98526 16.3511 3.25 16.81L3.47 17.19C3.73555 17.6485 4.17217 17.9828 4.684 18.1197C5.19584 18.2566 5.74107 18.1847 6.2 17.92L6.35 17.84C6.65404 17.6645 6.99893 17.5721 7.35 17.5721C7.70108 17.5721 8.04596 17.6645 8.35 17.84L8.78 18.09C9.08374 18.2654 9.33602 18.5175 9.51154 18.8212C9.68706 19.1248 9.77964 19.4693 9.78 19.82V20C9.78 20.5304 9.99072 21.0391 10.3658 21.4142C10.7409 21.7893 11.2496 22 11.78 22H12.22C12.7504 22 13.2591 21.7893 13.6342 21.4142C14.0093 21.0391 14.22 20.5304 14.22 20V19.82C14.2204 19.4693 14.3129 19.1248 14.4885 18.8212C14.664 18.5175 14.9163 18.2654 15.22 18.09L15.65 17.84C15.954 17.6645 16.2989 17.5721 16.65 17.5721C17.0011 17.5721 17.346 17.6645 17.65 17.84L17.8 17.92C18.2589 18.1847 18.8042 18.2566 19.316 18.1197C19.8278 17.9828 20.2645 17.6485 20.53 17.19L20.75 16.8C21.0147 16.3411 21.0866 15.7958 20.9497 15.284C20.8128 14.7722 20.4785 14.3356 20.02 14.07L19.87 13.99C19.5648 13.8138 19.3116 13.5601 19.136 13.2545C18.9604 12.949 18.8686 12.6024 18.87 12.25V11.75C18.8686 11.3976 18.9604 11.051 19.136 10.7455C19.3116 10.4399 19.5648 10.1862 19.87 10.01L20.02 9.92C20.4785 9.65445 20.8128 9.21783 20.9497 8.706C21.0866 8.19416 21.0147 7.64893 20.75 7.19L20.53 6.81C20.2645 6.35154 19.8278 6.01717 19.316 5.88031C18.8042 5.74344 18.2589 5.81526 17.8 6.08L17.65 6.16C17.346 6.33554 17.0011 6.42795 16.65 6.42795C16.2989 6.42795 15.954 6.33554 15.65 6.16L15.22 5.91C14.9163 5.73464 14.664 5.48248 14.4885 5.17884C14.3129 4.87519 14.2204 4.53073 14.22 4.18V4C14.22 3.46957 14.0093 2.96086 13.6342 2.58579C13.2591 2.21071 12.7504 2 12.22 2V2Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-SettingsIcon.displayName = "SettingsIcon";
-export { SettingsIcon };
-const ShareIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M18 8C19.6569 8 21 6.65685 21 5C21 3.34315 19.6569 2 18 2C16.3431 2 15 3.34315 15 5C15 6.65685 16.3431 8 18 8Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M6 15C7.65685 15 9 13.6569 9 12C9 10.3431 7.65685 9 6 9C4.34315 9 3 10.3431 3 12C3 13.6569 4.34315 15 6 15Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M18 22C19.6569 22 21 20.6569 21 19C21 17.3431 19.6569 16 18 16C16.3431 16 15 17.3431 15 19C15 20.6569 16.3431 22 18 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M8.59 13.51L15.42 17.49" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M15.41 6.51L8.59 10.49" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-ShareIcon.displayName = "ShareIcon";
-export { ShareIcon };
-const SlashIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M4.92999 4.92999L19.07 19.07" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-SlashIcon.displayName = "SlashIcon";
-export { SlashIcon };
-const StarIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 2L15.09 8.26L22 9.27L17 14.14L18.18 21.02L12 17.77L5.82 21.02L7 14.14L2 9.27L8.91 8.26L12 2Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-StarIcon.displayName = "StarIcon";
-export { StarIcon };
-const SunIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 16C14.2091 16 16 14.2091 16 12C16 9.79086 14.2091 8 12 8C9.79086 8 8 9.79086 8 12C8 14.2091 9.79086 16 12 16Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 2V4" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M12 20V22" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M4.92999 4.93L6.33999 6.34" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M17.66 17.66L19.07 19.07" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M2 12H4" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M20 12H22" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M6.33999 17.66L4.92999 19.07" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M19.07 4.93L17.66 6.34" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-SunIcon.displayName = "SunIcon";
-export { SunIcon };
-const ThreeDotsIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M12 13C12.5523 13 13 12.5523 13 12C13 11.4477 12.5523 11 12 11C11.4477 11 11 11.4477 11 12C11 12.5523 11.4477 13 12 13Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M19 13C19.5523 13 20 12.5523 20 12C20 11.4477 19.5523 11 19 11C18.4477 11 18 11.4477 18 12C18 12.5523 18.4477 13 19 13Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M5 13C5.55228 13 6 12.5523 6 12C6 11.4477 5.55228 11 5 11C4.44771 11 4 11.4477 4 12C4 12.5523 4.44771 13 5 13Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-ThreeDotsIcon.displayName = "ThreeDotsIcon";
-export { ThreeDotsIcon };
-const TrashIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M3 6H21" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M19 6V20C19 21 18 22 17 22H7C6 22 5 21 5 20V6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M8 6V4C8 3 9 2 10 2H14C15 2 16 3 16 4V6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-TrashIcon.displayName = "TrashIcon";
-export { TrashIcon };
-const UnlockIcon = createIcon({
-    Root: Svg,
-    viewBox: "0 0 24 24",
-    path: (<>
-      <path d="M19 11H5C3.89543 11 3 11.8954 3 13V20C3 21.1046 3.89543 22 5 22H19C20.1046 22 21 21.1046 21 20V13C21 11.8954 20.1046 11 19 11Z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-      <path d="M7 11V7C6.99876 5.76005 7.45828 4.56387 8.28938 3.64367C9.12047 2.72347 10.2638 2.1449 11.4975 2.02029C12.7312 1.89568 13.9671 2.2339 14.9655 2.96931C15.9638 3.70472 16.6533 4.78485 16.9 6" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-    </>),
-});
-UnlockIcon.displayName = "UnlockIcon";
-export { UnlockIcon };
diff --git a/universal/packages/components/ui/icon/index.web.tsx b/universal/packages/components/ui/icon/index.web.tsx
index d296a4f8..424ed1d0 100644
--- a/universal/packages/components/ui/icon/index.web.tsx
+++ b/universal/packages/components/ui/icon/index.web.tsx
@@ -1,89 +1,16 @@
-import React, { useMemo } from 'react';
+'use client';
+import React from 'react';
 import { createIcon } from '@gluestack-ui/icon';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { VariantProps } from '@gluestack-ui/nativewind-utils';
-
-const accessClassName = (style: any) => {
-  const obj = style[0];
-  const keys = Object.keys(obj); //will return an array of keys
-  return obj[keys[1]];
-};
-
-const Svg = React.forwardRef<
-  React.ElementRef<'svg'>,
-  React.ComponentPropsWithoutRef<'svg'>
->(({ style, className, ...props }, ref) => {
-  const calculateClassName = useMemo(() => {
-    return className === undefined ? accessClassName(style) : className;
-  }, [className, style]);
-
-  return <svg ref={ref} {...props} className={calculateClassName} />;
-});
-
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
+import { PrimitiveIcon, Svg } from '@gluestack-ui/icon';
 
 export const UIIcon = createIcon({
   Root: PrimitiveIcon,
 });
 
 const iconStyle = tva({
-  base: 'text-typography-950 fill-none',
+  base: 'text-typography-950 fill-none pointer-events-none',
   variants: {
     size: {
       '2xs': 'h-3 w-3',
@@ -136,9 +63,14 @@ export const Icon = React.forwardRef<
 
 type ParameterTypes = Omit<Parameters<typeof createIcon>[0], 'Root'>;
 
-const createIconUI = ({ ...props }: ParameterTypes) => {
-  const UIIcon = createIcon({ Root: Svg, ...props });
+const accessClassName = (style: any) => {
+  const styleObject = Array.isArray(style) ? style[0] : style;
+  const keys = Object.keys(styleObject);
+  return styleObject[keys[1]];
+};
 
+const createIconUI = ({ ...props }: ParameterTypes) => {
+  const NewUIIcon = createIcon({ Root: Svg, ...props });
   return React.forwardRef<
     React.ElementRef<typeof UIIcon>,
     React.ComponentPropsWithoutRef<typeof UIIcon> &
@@ -146,16 +78,18 @@ const createIconUI = ({ ...props }: ParameterTypes) => {
         height?: number | string;
         width?: number | string;
       }
-  >(({ className, size, ...props }, ref) => {
+  >(({ className, ...inComingprops }, ref) => {
+    const calculateClassName = React.useMemo(() => {
+      return className === undefined
+        ? accessClassName(inComingprops?.style)
+        : className;
+    }, [className, inComingprops?.style]);
     return (
-      <UIIcon
-        ref={ref}
-        {...props}
-        className={iconStyle({ size, class: className })}
-      />
+      <NewUIIcon ref={ref} {...inComingprops} className={calculateClassName} />
     );
   });
 };
+
 export { createIconUI as createIcon };
 
 // All Icons
diff --git a/universal/packages/components/ui/image-background/index.d.ts b/universal/packages/components/ui/image-background/index.d.ts
deleted file mode 100644
index b885cd28..00000000
--- a/universal/packages/components/ui/image-background/index.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const ImageBackground: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
diff --git a/universal/packages/components/ui/image-background/index.jsx b/universal/packages/components/ui/image-background/index.jsx
deleted file mode 100644
index f707debf..00000000
--- a/universal/packages/components/ui/image-background/index.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-'use client';
-import { ImageBackground as RNImageBackground } from 'react-native';
-import React from 'react';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-export const ImageBackground = React.forwardRef(({ className, ...props }, ref) => {
-    return (<RNImageBackground className={tva({ base: className })} {...props} ref={ref}/>);
-});
diff --git a/universal/packages/components/ui/image/index.d.ts b/universal/packages/components/ui/image/index.d.ts
deleted file mode 100644
index 32de3edc..00000000
--- a/universal/packages/components/ui/image/index.d.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-import React from "react";
-import type { VariantProps } from "@gluestack-ui/nativewind-utils";
-declare const imageStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        "2xs": string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        "2xl": string;
-        full: string;
-    };
-} | ({
-    size: {
-        "2xs": string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        "2xl": string;
-        full: string;
-    };
-} & {
-    size: {
-        "2xs": import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        "2xl": import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        full: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "max-w-full", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        "2xs": string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        "2xl": string;
-        full: string;
-    };
-}, {
-    size: {
-        "2xs": string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        "2xl": string;
-        full: string;
-    };
-}>, {
-    size: {
-        "2xs": string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        "2xl": string;
-        full: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        "2xs": string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        "2xl": string;
-        full: string;
-    };
-}, undefined, "max-w-full", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        "2xs": string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        "2xl": string;
-        full: string;
-    };
-}, {
-    size: {
-        "2xs": string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        "2xl": string;
-        full: string;
-    };
-}>, unknown, unknown, undefined>>;
-declare const UIImage: import("@gluestack-ui/image/lib/typescript/types").IImageComponentType<import("@unitools/image").IImageProps>;
-type ImageProps = VariantProps<typeof imageStyle> & React.ComponentProps<typeof UIImage>;
-declare const Image: {
-    ({ size, className, ...props }: {
-        className?: any;
-    } & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        size: {
-            "2xs": string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            "2xl": string;
-            full: string;
-        };
-    } | ({
-        size: {
-            "2xs": string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            "2xl": string;
-            full: string;
-        };
-    } & {
-        size: {
-            "2xs": import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            xs: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            sm: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            md: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            lg: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            xl: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            "2xl": import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-            full: import("tailwind-merge").ClassNameValue | {
-                base?: import("tailwind-merge").ClassNameValue;
-            };
-        };
-    }), undefined, "max-w-full", import("tailwind-variants/dist/config").TVConfig<{
-        size: {
-            "2xs": string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            "2xl": string;
-            full: string;
-        };
-    }, {
-        size: {
-            "2xs": string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            "2xl": string;
-            full: string;
-        };
-    }>, {
-        size: {
-            "2xs": string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            "2xl": string;
-            full: string;
-        };
-    }, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-        size: {
-            "2xs": string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            "2xl": string;
-            full: string;
-        };
-    }, undefined, "max-w-full", import("tailwind-variants/dist/config").TVConfig<{
-        size: {
-            "2xs": string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            "2xl": string;
-            full: string;
-        };
-    }, {
-        size: {
-            "2xs": string;
-            xs: string;
-            sm: string;
-            md: string;
-            lg: string;
-            xl: string;
-            "2xl": string;
-            full: string;
-        };
-    }>, unknown, unknown, undefined>>> & import("@gluestack-ui/image/lib/typescript/types").IImageProps & Omit<import("@unitools/image").IImageProps, "source" | "alt">): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
-export { Image };
diff --git a/universal/packages/components/ui/image/index.jsx b/universal/packages/components/ui/image/index.jsx
deleted file mode 100644
index 0cc8ab89..00000000
--- a/universal/packages/components/ui/image/index.jsx
+++ /dev/null
@@ -1,35 +0,0 @@
-"use client";
-import "react";
-import { createImage } from "@gluestack-ui/image";
-import { Platform } from "react-native";
-import UnitoolsImage from "@unitools/image";
-import { tva } from "@gluestack-ui/nativewind-utils/tva";
-import { cssInterop } from "@gluestack-ui/nativewind-utils/cssInterop";
-const imageStyle = tva({
-    base: "max-w-full",
-    variants: {
-        size: {
-            "2xs": "h-6 w-6",
-            xs: "h-10 w-10",
-            sm: "h-16 w-16",
-            md: "h-20 w-20",
-            lg: "h-24 w-24",
-            xl: "h-32 w-32",
-            "2xl": "h-64 w-64",
-            full: "h-full w-full",
-        },
-    },
-});
-const UIImage = createImage({ Root: UnitoolsImage });
-cssInterop(UIImage, 
-//@ts-ignore
-UnitoolsImage.displayName === "NextImage" ? {} : { className: "style" });
-const Image = ({ size = "md", className, ...props }) => {
-    return (<UIImage className={imageStyle({ size, class: className })} {...props} 
-    //@ts-ignore
-    style={Platform.OS === "web"
-            ? { height: "revert-layer", width: "revert-layer" }
-            : undefined}/>);
-};
-Image.displayName = "Image";
-export { Image };
diff --git a/universal/packages/components/ui/image/index.tsx b/universal/packages/components/ui/image/index.tsx
index 26879c42..1afc87a2 100644
--- a/universal/packages/components/ui/image/index.tsx
+++ b/universal/packages/components/ui/image/index.tsx
@@ -4,7 +4,6 @@ import { createImage } from '@gluestack-ui/image';
 import { Platform, Image as RNImage } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { cssInterop } from 'nativewind';
 
 const imageStyle = tva({
   base: 'max-w-full',
@@ -18,12 +17,12 @@ const imageStyle = tva({
       'xl': 'h-32 w-32',
       '2xl': 'h-64 w-64',
       'full': 'h-full w-full',
+      'none': '',
     },
   },
 });
 
 const UIImage = createImage({ Root: RNImage });
-cssInterop(UIImage, { className: 'style' });
 
 type ImageProps = VariantProps<typeof imageStyle> &
   React.ComponentProps<typeof UIImage>;
@@ -36,10 +35,11 @@ const Image = React.forwardRef<
       className={imageStyle({ size, class: className })}
       {...props}
       ref={ref}
-      //@ts-ignore
+      // @ts-expect-error
       style={
         Platform.OS === 'web'
-          ? { height: 'revert-layer', width: 'revert-layer' }
+          ? // eslint-disable-next-line react-native/no-inline-styles
+            { height: 'revert-layer', width: 'revert-layer' }
           : undefined
       }
     />
diff --git a/universal/packages/components/ui/input-accessory-view/index.d.ts b/universal/packages/components/ui/input-accessory-view/index.d.ts
deleted file mode 100644
index 3fadb3b0..00000000
--- a/universal/packages/components/ui/input-accessory-view/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { InputAccessoryView } from 'react-native';
diff --git a/universal/packages/components/ui/input-accessory-view/index.jsx b/universal/packages/components/ui/input-accessory-view/index.jsx
deleted file mode 100644
index 25ebef79..00000000
--- a/universal/packages/components/ui/input-accessory-view/index.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-'use client';
-export { InputAccessoryView } from 'react-native';
diff --git a/universal/packages/components/ui/input/index.d.ts b/universal/packages/components/ui/input/index.d.ts
deleted file mode 100644
index a383a52b..00000000
--- a/universal/packages/components/ui/input/index.d.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import React from 'react';
-import { View } from 'react-native';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const Input: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>> & import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown> & import("@gluestack-ui/input/lib/typescript/types").IInputFieldProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-} | ({
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-} & {
-    size: {
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    variant: {
-        underlined: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        outline: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        rounded: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "border-background-300 flex-row overflow-hidden content-center data-[hover=true]:border-outline-400 data-[focus=true]:border-primary-700 data-[focus=true]:hover:border-primary-700 data-[disabled=true]:opacity-40 data-[disabled=true]:hover:border-background-300 items-center", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}, {
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}>, {
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}, undefined, "border-background-300 flex-row overflow-hidden content-center data-[hover=true]:border-outline-400 data-[focus=true]:border-primary-700 data-[focus=true]:hover:border-primary-700 data-[disabled=true]:opacity-40 data-[disabled=true]:hover:border-background-300 items-center", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}, {
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const InputIcon: React.ForwardRefExoticComponent<Omit<{
-    className?: any;
-    fill?: string | undefined;
-    color?: string | undefined;
-    as?: any;
-} & React.RefAttributes<Omit<any, "ref"> & React.RefAttributes<unknown>> & Omit<any, "ref"> & React.RefAttributes<unknown> & {
-    as: any;
-}, "ref"> & React.RefAttributes<unknown>>;
-declare const InputSlot: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").PressableProps & React.RefAttributes<View>> & import("react-native").PressableProps & React.RefAttributes<View> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "justify-center items-center web:disabled:cursor-not-allowed", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "justify-center items-center web:disabled:cursor-not-allowed", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const InputField: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").TextInputProps> & import("react-native").TextInputProps & import("@gluestack-ui/input/lib/typescript/types").IInputProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, undefined, "flex-1 text-typography-900 py-auto px-3 placeholder:text-typography-500 h-full ios:leading-[0px] web:cursor-text web:data-[disabled=true]:cursor-not-allowed", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "flex-1 text-typography-900 py-auto px-3 placeholder:text-typography-500 h-full ios:leading-[0px] web:cursor-text web:data-[disabled=true]:cursor-not-allowed", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Input, InputField, InputIcon, InputSlot };
diff --git a/universal/packages/components/ui/input/index.jsx b/universal/packages/components/ui/input/index.jsx
deleted file mode 100644
index ac42e797..00000000
--- a/universal/packages/components/ui/input/index.jsx
+++ /dev/null
@@ -1,139 +0,0 @@
-'use client';
-import React, { useMemo } from 'react';
-import { createInput } from '@gluestack-ui/input';
-import { Svg } from 'react-native-svg';
-import { View, Pressable, TextInput, Platform } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-const SCOPE = 'INPUT';
-const PrimitiveIcon = React.forwardRef(({ height, width, fill = 'none', color, size, as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} color={color} {...props}/>);
-});
-const UIInput = createInput({
-    // @ts-ignore
-    Root: Platform.OS === 'web'
-        ? withStyleContext(View, SCOPE)
-        : withStyleContextAndStates(View, SCOPE),
-    Icon: PrimitiveIcon,
-    Slot: Pressable,
-    Input: Platform.OS === 'web' ? TextInput : withStates(TextInput),
-});
-const inputStyle = tva({
-    base: 'border-background-300 flex-row overflow-hidden content-center data-[hover=true]:border-outline-400 data-[focus=true]:border-primary-700 data-[focus=true]:hover:border-primary-700 data-[disabled=true]:opacity-40 data-[disabled=true]:hover:border-background-300 items-center',
-    variants: {
-        size: {
-            xl: 'h-12',
-            lg: 'h-11',
-            md: 'h-10',
-            sm: 'h-9',
-        },
-        variant: {
-            underlined: 'rounded-none border-b data-[invalid=true]:border-b-2 data-[invalid=true]:border-error-700 data-[invalid=true]:hover:border-error-700 data-[invalid=true]:data-[focus=true]:border-error-700 data-[invalid=true]:data-[focus=true]:hover:border-error-700 data-[invalid=true]:data-[disabled=true]:hover:border-error-700',
-            outline: 'rounded border data-[invalid=true]:border-error-700 data-[invalid=true]:hover:border-error-700 data-[invalid=true]:data-[focus=true]:border-error-700 data-[invalid=true]:data-[focus=true]:hover:border-error-700 data-[invalid=true]:data-[disabled=true]:hover:border-error-700 data-[focus=true]:web:ring-1 data-[focus=true]:web:ring-inset data-[focus=true]:web:ring-primary-700 data-[invalid=true]:web:ring-1 data-[invalid=true]:web:ring-inset data-[invalid=true]:web:ring-error-700 data-[invalid=true]:data-[focus=true]:hover:web:ring-1 data-[invalid=true]:data-[focus=true]:hover:web:ring-inset data-[invalid=true]:data-[focus=true]:hover:web:ring-error-700 data-[invalid=true]:data-[disabled=true]:hover:web:ring-1 data-[invalid=true]:data-[disabled=true]:hover:web:ring-inset data-[invalid=true]:data-[disabled=true]:hover:web:ring-error-700',
-            rounded: 'rounded-full border data-[invalid=true]:border-error-700 data-[invalid=true]:hover:border-error-700 data-[invalid=true]:data-[focus=true]:border-error-700 data-[invalid=true]:data-[focus=true]:hover:border-error-700 data-[invalid=true]:data-[disabled=true]:hover:border-error-700 data-[focus=true]:web:ring-1 data-[focus=true]:web:ring-inset data-[focus=true]:web:ring-primary-700 data-[invalid=true]:web:ring-1 data-[invalid=true]:web:ring-inset data-[invalid=true]:web:ring-error-700 data-[invalid=true]:data-[focus=true]:hover:web:ring-1 data-[invalid=true]:data-[focus=true]:hover:web:ring-inset data-[invalid=true]:data-[focus=true]:hover:web:ring-error-700 data-[invalid=true]:data-[disabled=true]:hover:web:ring-1 data-[invalid=true]:data-[disabled=true]:hover:web:ring-inset data-[invalid=true]:data-[disabled=true]:hover:web:ring-error-700',
-        },
-    },
-});
-const inputIconStyle = tva({
-    base: 'justify-center items-center',
-    parentVariants: {
-        size: {
-            '2xs': 'h-3 w-3',
-            'xs': 'h-3.5 w-3.5',
-            'sm': 'h-4 w-4',
-            'md': 'h-[18px] w-[18px]',
-            'lg': 'h-5 w-5',
-            'xl': 'h-6 w-6',
-        },
-    },
-});
-const inputSlotStyle = tva({
-    base: 'justify-center items-center web:disabled:cursor-not-allowed',
-});
-const inputFieldStyle = tva({
-    base: 'flex-1 text-typography-900 py-auto px-3 placeholder:text-typography-500 h-full ios:leading-[0px] web:cursor-text web:data-[disabled=true]:cursor-not-allowed',
-    parentVariants: {
-        variant: {
-            underlined: 'web:outline-0 web:outline-none px-0',
-            outline: 'web:outline-0 web:outline-none',
-            rounded: 'web:outline-0 web:outline-none px-4',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-base',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-    },
-});
-cssInterop(UIInput, { className: 'style' });
-cssInterop(UIInput.Slot, { className: 'style' });
-cssInterop(UIInput.Input, { className: 'style' });
-// @ts-ignore
-cssInterop(UIInput.Icon, {
-    className: {
-        target: 'style',
-        nativeStyleToProp: {
-            height: 'height',
-            width: 'width',
-            //@ts-ignore
-            fill: 'fill',
-            color: 'color',
-        },
-    },
-});
-const Input = React.forwardRef(({ className, variant = 'outline', size = 'md', ...props }, ref) => {
-    return (<UIInput ref={ref} {...props} className={inputStyle({ variant, size, class: className })} context={{ variant, size }}/>);
-});
-const InputIcon = React.forwardRef(({ className, color = '#8C8C8C', size, ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    if (typeof size === 'number') {
-        return (<UIInput.Icon ref={ref} {...props} className={inputIconStyle({ class: className })} size={size} color={color}/>);
-    }
-    else if ((props.height !== undefined || props.width !== undefined) &&
-        size === undefined) {
-        return (<UIInput.Icon ref={ref} {...props} color={color} className={inputIconStyle({ class: className })}/>);
-    }
-    return (<UIInput.Icon ref={ref} {...props} className={inputIconStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            class: className,
-        })} color={color}/>);
-});
-const InputSlot = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIInput.Slot ref={ref} {...props} className={inputSlotStyle({
-            class: className,
-        })}/>);
-});
-const InputField = React.forwardRef(({ className, ...props }, ref) => {
-    const { variant: parentVariant, size: parentSize } = useStyleContext(SCOPE);
-    return (<UIInput.Input ref={ref} {...props} className={inputFieldStyle({
-            parentVariants: {
-                variant: parentVariant,
-                size: parentSize,
-            },
-            class: className,
-        })}/>);
-});
-Input.displayName = 'Input';
-InputIcon.displayName = 'InputIcon';
-InputSlot.displayName = 'InputSlot';
-InputField.displayName = 'InputField';
-export { Input, InputField, InputIcon, InputSlot };
diff --git a/universal/packages/components/ui/input/index.tsx b/universal/packages/components/ui/input/index.tsx
index 3f5013b5..97aa1351 100644
--- a/universal/packages/components/ui/input/index.tsx
+++ b/universal/packages/components/ui/input/index.tsx
@@ -1,93 +1,36 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createInput } from '@gluestack-ui/input';
-import { Svg } from 'react-native-svg';
-import { View, Pressable, TextInput, Platform } from 'react-native';
+import { View, Pressable, TextInput } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-const SCOPE = 'INPUT';
-
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
-const InputWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->(({ ...props }, ref) => {
-  return <View {...props} ref={ref} />;
-});
+const SCOPE = 'INPUT';
 
 const UIInput = createInput({
-  // @ts-ignore
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(InputWrapper, SCOPE)
-      : withStyleContextAndStates(InputWrapper, SCOPE),
-  Icon: PrimitiveIcon,
+  Root: withStyleContext(View, SCOPE),
+  Icon: UIIcon,
   Slot: Pressable,
-  Input: Platform.OS === 'web' ? TextInput : withStates(TextInput),
+  Input: TextInput,
+});
+
+cssInterop(PrimitiveIcon, {
+  className: {
+    target: 'style',
+    nativeStyleToProp: {
+      height: true,
+      width: true,
+      fill: true,
+      color: 'classNameColor',
+      stroke: true,
+    },
+  },
 });
 
 const inputStyle = tva({
@@ -158,25 +101,6 @@ const inputFieldStyle = tva({
   },
 });
 
-cssInterop(InputWrapper, { className: 'style' });
-cssInterop(UIInput.Slot, { className: 'style' });
-cssInterop(UIInput.Input, {
-  className: { target: 'style', nativeStyleToProp: { textAlign: true } },
-});
-//@ts-ignore
-cssInterop(UIInput.Icon, {
-  className: {
-    target: 'style',
-    nativeStyleToProp: {
-      height: true,
-      width: true,
-      fill: true,
-      color: 'classNameColor',
-      stroke: true,
-    },
-  },
-});
-
 type IInputProps = React.ComponentProps<typeof UIInput> &
   VariantProps<typeof inputStyle> & { className?: string };
 const Input = React.forwardRef<React.ElementRef<typeof UIInput>, IInputProps>(
diff --git a/universal/packages/components/ui/keyboard-avoiding-view/index.d.ts b/universal/packages/components/ui/keyboard-avoiding-view/index.d.ts
deleted file mode 100644
index 6743386f..00000000
--- a/universal/packages/components/ui/keyboard-avoiding-view/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { KeyboardAvoidingView } from 'react-native';
diff --git a/universal/packages/components/ui/keyboard-avoiding-view/index.jsx b/universal/packages/components/ui/keyboard-avoiding-view/index.jsx
deleted file mode 100644
index 7fc72834..00000000
--- a/universal/packages/components/ui/keyboard-avoiding-view/index.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-'use client';
-export { KeyboardAvoidingView } from 'react-native';
diff --git a/universal/packages/components/ui/link/index.d.ts b/universal/packages/components/ui/link/index.d.ts
deleted file mode 100644
index 56fe38b9..00000000
--- a/universal/packages/components/ui/link/index.d.ts
+++ /dev/null
@@ -1,365 +0,0 @@
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import React from 'react';
-export declare const UILink: import("@gluestack-ui/link/lib/typescript/types").ILinkComponentType<Omit<import("react-native").PressableProps & React.RefAttributes<import("react-native").View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>, import("react-native").TextProps>;
-declare const Link: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & Omit<import("react-native").PressableProps & React.RefAttributes<import("react-native").View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown> & import("@gluestack-ui/link").InterfaceLinkProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "web:outline-0 web:data-[disabled=true]:cursor-not-allowed web:data-[focus-visible=true]:outline-2 web:data-[focus-visible=true]:outline-primary-700 web:data-[focus-visible=true]:outline data-[disabled=true]:opacity-40 group/link", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "web:outline-0 web:data-[disabled=true]:cursor-not-allowed web:data-[focus-visible=true]:outline-2 web:data-[focus-visible=true]:outline-primary-700 web:data-[focus-visible=true]:outline data-[disabled=true]:opacity-40 group/link", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const LinkText: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").TextProps & React.RefAttributes<import("react-native").TextProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "underline text-info-700 group-hover/link:text-info-600 group-hover/link:no-underline group-active/link:text-info-700 font-normal font-body web:font-sans web:tracking-sm web:my-0 web:bg-transparent web:border-0 web:box-border web:display-inline web:list-none web:margin-0 web:padding-0 web:position-relative web:text-start web:whitespace-pre-wrap web:word-wrap-break-word", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "underline text-info-700 group-hover/link:text-info-600 group-hover/link:no-underline group-active/link:text-info-700 font-normal font-body web:font-sans web:tracking-sm web:my-0 web:bg-transparent web:border-0 web:box-border web:display-inline web:list-none web:margin-0 web:padding-0 web:position-relative web:text-start web:whitespace-pre-wrap web:word-wrap-break-word", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Link, LinkText };
diff --git a/universal/packages/components/ui/link/index.jsx b/universal/packages/components/ui/link/index.jsx
deleted file mode 100644
index fd6b70c9..00000000
--- a/universal/packages/components/ui/link/index.jsx
+++ /dev/null
@@ -1,72 +0,0 @@
-'use client';
-import { createLink } from '@gluestack-ui/link';
-import { Pressable, Platform } from 'react-native';
-import { Text } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-import React from 'react';
-export const UILink = createLink({
-    Root: Platform.OS === 'web'
-        ? withStyleContext(Pressable)
-        : withStyleContextAndStates(Pressable),
-    Text: Platform.OS === 'web' ? Text : withStates(Text),
-});
-cssInterop(UILink, { className: 'style' });
-cssInterop(UILink.Text, { className: 'style' });
-const linkStyle = tva({
-    base: 'web:outline-0 web:data-[disabled=true]:cursor-not-allowed web:data-[focus-visible=true]:outline-2 web:data-[focus-visible=true]:outline-primary-700 web:data-[focus-visible=true]:outline data-[disabled=true]:opacity-40 group/link',
-});
-const linkTextStyle = tva({
-    base: 'underline text-info-700 group-hover/link:text-info-600 group-hover/link:no-underline group-active/link:text-info-700 font-normal font-body web:font-sans web:tracking-sm web:my-0 web:bg-transparent web:border-0 web:box-border web:display-inline web:list-none web:margin-0 web:padding-0 web:position-relative web:text-start web:whitespace-pre-wrap web:word-wrap-break-word',
-    variants: {
-        isTruncated: {
-            true: 'web:truncate',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-base',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow-500',
-        },
-    },
-});
-const Link = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UILink ref={ref} {...props} className={linkStyle({ class: className })}/>);
-});
-const LinkText = React.forwardRef(({ className, size = 'md', ...props }, ref) => {
-    return (<UILink.Text ref={ref} {...props} className={linkTextStyle({
-            class: className,
-            size,
-        })}/>);
-});
-Link.displayName = 'Link';
-LinkText.displayName = 'LinkText';
-export { Link, LinkText };
diff --git a/universal/packages/components/ui/link/index.tsx b/universal/packages/components/ui/link/index.tsx
index 04e8d83f..a17b0b72 100644
--- a/universal/packages/components/ui/link/index.tsx
+++ b/universal/packages/components/ui/link/index.tsx
@@ -1,22 +1,17 @@
 'use client';
 import { createLink } from '@gluestack-ui/link';
-import { Pressable, Platform } from 'react-native';
+import { Pressable } from 'react-native';
 import { Text } from 'react-native';
 
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 import React from 'react';
 export const UILink = createLink({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(Pressable)
-      : withStyleContextAndStates(Pressable),
-  Text: Platform.OS === 'web' ? Text : withStates(Text),
+  Root: withStyleContext(Pressable),
+  Text: Text,
 });
 
 cssInterop(UILink, { className: 'style' });
diff --git a/universal/packages/components/ui/menu/index.d.ts b/universal/packages/components/ui/menu/index.d.ts
deleted file mode 100644
index a2c2842b..00000000
--- a/universal/packages/components/ui/menu/index.d.ts
+++ /dev/null
@@ -1,372 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const menuItemStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "p-3 flex-row items-center data-[hover=true]:bg-background-100 data-[active=true]:bg-background-200 data-[focus=true]:bg-background-100 data-[focus=true]:web:outline-noe data-[focus=true]:web:outline-0 data-[disabled=true]:opacity-40 data-[disabled=true]:web:cursor-not-allowed data-[focus-visible=true]:web:outline-2 data-[focus-visible=true]:web:outline-primary-700 data-[focus-visible=true]:web:outline data-[focus-visible=true]:web:cursor-pointer  data-[disabled=true]:data-[focus=true]:bg-transparent ", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "p-3 flex-row items-center data-[hover=true]:bg-background-100 data-[active=true]:bg-background-200 data-[focus=true]:bg-background-100 data-[focus=true]:web:outline-noe data-[focus=true]:web:outline-0 data-[disabled=true]:opacity-40 data-[disabled=true]:web:cursor-not-allowed data-[focus-visible=true]:web:outline-2 data-[focus-visible=true]:web:outline-primary-700 data-[focus-visible=true]:web:outline data-[focus-visible=true]:web:cursor-pointer  data-[disabled=true]:data-[focus=true]:bg-transparent ", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-type IMenuItemProps = VariantProps<typeof menuItemStyle>;
-export declare const UIMenu: import("@gluestack-ui/menu/lib/typescript/types").IMenuComponentType<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<import("react-native").View>> & import("@legendapp/motion").MotionComponentProps<typeof import("react-native").View, import("react-native").ViewStyle, unknown, unknown, unknown>, {
-    className?: string | undefined;
-} & IMenuItemProps & React.RefAttributes<unknown>, import("react-native").TextProps>;
-declare const Menu: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<import("react-native").View>> & import("@legendapp/motion").MotionComponentProps<typeof import("react-native").View, import("react-native").ViewStyle, unknown, unknown, unknown>> & import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<import("react-native").View>> & import("@legendapp/motion").MotionComponentProps<typeof import("react-native").View, import("react-native").ViewStyle, unknown, unknown, unknown> & import("@gluestack-ui/menu/lib/typescript/types").InterfaceMenuProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "min-w-[200px] py-2 rounded-sm bg-background-0", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "min-w-[200px] py-2 rounded-sm bg-background-0", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const MenuItem: React.ForwardRefExoticComponent<React.RefAttributes<{
-    className?: string | undefined;
-} & IMenuItemProps & React.RefAttributes<unknown>> & {
-    className?: string | undefined;
-} & IMenuItemProps & React.RefAttributes<unknown> & import("react-stately").ItemProps<{
-    className?: string | undefined;
-} & IMenuItemProps & React.RefAttributes<unknown>> & import("@gluestack-ui/menu/lib/typescript/types").IItemProp>;
-declare const MenuItemLabel: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").TextProps> & import("react-native").TextProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-typography-700 font-normal font-body", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "text-typography-700 font-normal font-body", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Menu, MenuItem, MenuItemLabel };
diff --git a/universal/packages/components/ui/menu/index.jsx b/universal/packages/components/ui/menu/index.jsx
deleted file mode 100644
index 82fe80b3..00000000
--- a/universal/packages/components/ui/menu/index.jsx
+++ /dev/null
@@ -1,113 +0,0 @@
-'use client';
-import React from 'react';
-import { createMenu } from '@gluestack-ui/menu';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-import { Pressable, Text } from 'react-native';
-import { Motion, AnimatePresence } from '@legendapp/motion';
-const menuStyle = tva({
-    base: 'min-w-[200px] py-2 rounded-sm bg-background-0',
-});
-const menuItemStyle = tva({
-    base: 'p-3 flex-row items-center data-[hover=true]:bg-background-100 data-[active=true]:bg-background-200 data-[focus=true]:bg-background-100 data-[focus=true]:web:outline-noe data-[focus=true]:web:outline-0 data-[disabled=true]:opacity-40 data-[disabled=true]:web:cursor-not-allowed data-[focus-visible=true]:web:outline-2 data-[focus-visible=true]:web:outline-primary-700 data-[focus-visible=true]:web:outline data-[focus-visible=true]:web:cursor-pointer  data-[disabled=true]:data-[focus=true]:bg-transparent ',
-});
-const menuBackdropStyle = tva({
-    base: 'absolute top-0 bottom-0 left-0 right-0 web:cursor-default',
-    // add this classnames if you want to give background color to backdrop
-    // opacity-50 bg-background-500,
-});
-const menuItemLabelStyle = tva({
-    base: 'text-typography-700 font-normal font-body',
-    variants: {
-        isTruncated: {
-            true: 'web:truncate',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-base',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow-500',
-        },
-    },
-});
-const BackdropPressable = React.forwardRef(({ className, ...props }, ref) => {
-    return (<Pressable ref={ref} className={menuBackdropStyle({
-            class: className,
-        })} {...props}/>);
-});
-const Item = React.forwardRef(({ className, ...props }, ref) => {
-    return (<Pressable ref={ref} className={menuItemStyle({
-            class: className,
-        })} {...props}/>);
-});
-export const UIMenu = createMenu({
-    Root: Motion.View,
-    Item: Item,
-    Label: Text,
-    Backdrop: BackdropPressable,
-    AnimatePresence: AnimatePresence,
-});
-cssInterop(UIMenu, { className: 'style' });
-cssInterop(UIMenu.ItemLabel, { className: 'style' });
-const Menu = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIMenu ref={ref} initial={{
-            opacity: 0,
-        }} animate={{
-            opacity: 1,
-        }} exit={{
-            opacity: 0,
-        }} transition={{
-            type: 'spring',
-            damping: 18,
-            stiffness: 250,
-            opacity: {
-                type: 'timing',
-                duration: 200,
-            },
-        }} className={menuStyle({
-            class: className,
-        })} {...props}/>);
-});
-const MenuItem = UIMenu.Item;
-const MenuItemLabel = React.forwardRef(({ className, isTruncated, bold, underline, strikeThrough, size = 'md', sub, italic, highlight, ...props }, ref) => {
-    return (<UIMenu.ItemLabel ref={ref} className={menuItemLabelStyle({
-            isTruncated,
-            bold,
-            underline,
-            strikeThrough,
-            size,
-            sub,
-            italic,
-            highlight,
-            class: className,
-        })} {...props}/>);
-});
-Menu.displayName = 'Menu';
-MenuItem.displayName = 'MenuItem';
-MenuItemLabel.displayName = 'MenuItemLabel';
-export { Menu, MenuItem, MenuItemLabel };
diff --git a/universal/packages/components/ui/menu/index.tsx b/universal/packages/components/ui/menu/index.tsx
index 2eeffb62..1a3573ca 100644
--- a/universal/packages/components/ui/menu/index.tsx
+++ b/universal/packages/components/ui/menu/index.tsx
@@ -3,10 +3,9 @@ import React from 'react';
 import { createMenu } from '@gluestack-ui/menu';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { cssInterop } from 'nativewind';
-import { Pressable, Text, Platform, View } from 'react-native';
+import { Pressable, Text, View } from 'react-native';
 import { Motion, AnimatePresence } from '@legendapp/motion';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 
 const menuStyle = tva({
   base: 'rounded-md bg-background-0 border border-outline-100 p-1 shadow-hard-5',
@@ -115,15 +114,14 @@ const Separator = React.forwardRef(
 );
 export const UIMenu = createMenu({
   Root: Motion.View,
-  Item: Platform.OS === 'web' ? Item : withStates(Item),
+  Item: Item,
   Label: Text,
   Backdrop: BackdropPressable,
   AnimatePresence: AnimatePresence,
   Separator: Separator,
 });
 
-cssInterop(UIMenu, { className: 'style' });
-cssInterop(UIMenu.ItemLabel, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
 
 type IMenuProps = React.ComponentProps<typeof UIMenu> &
   VariantProps<typeof menuStyle> & { className?: string };
diff --git a/universal/packages/components/ui/modal/index.d.ts b/universal/packages/components/ui/modal/index.d.ts
deleted file mode 100644
index 99a61e93..00000000
--- a/universal/packages/components/ui/modal/index.d.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import React from 'react';
-import { View } from 'react-native';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const Modal: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown> & import("@gluestack-ui/modal/lib/typescript/types").InterfaceModalProps & React.RefAttributes<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-} | ({
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-} & {
-    size: {
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        full: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "group/modal w-full h-full justify-center items-center web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}, {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}>, {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}, undefined, "group/modal w-full h-full justify-center items-center web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}, {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const ModalBackdrop: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown> & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown>> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const ModalContent: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & import("@gluestack-ui/modal/lib/typescript/types").IModalContentProps & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown>> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}, undefined, "bg-background-50 rounded-lg overflow-hidden", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "bg-background-50 rounded-lg overflow-hidden", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const ModalHeader: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ViewProps & React.RefAttributes<import("react-native").ViewProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "px-4 pt-4 pb-2 justify-between items-center flex-row", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "px-4 pt-4 pb-2 justify-between items-center flex-row", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const ModalBody: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ScrollViewProps & React.RefAttributes<import("react-native").ScrollViewProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "px-4 pb-2 pt-0", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "px-4 pb-2 pt-0", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const ModalFooter: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ViewProps & React.RefAttributes<import("react-native").ViewProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "p-4 flex-row justify-end items-center flex-wrap", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "p-4 flex-row justify-end items-center flex-wrap", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const ModalCloseButton: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").PressableProps & React.RefAttributes<View> & React.RefAttributes<import("react-native").PressableProps & React.RefAttributes<View>> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "group/modal-close-button z-10 p-2 rounded data-[focus-visible=true]:web:bg-background-100 web:outline-0 cursor-pointer", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "group/modal-close-button z-10 p-2 rounded data-[focus-visible=true]:web:bg-background-100 web:outline-0 cursor-pointer", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Modal, ModalBackdrop, ModalContent, ModalCloseButton, ModalHeader, ModalBody, ModalFooter, };
diff --git a/universal/packages/components/ui/modal/index.jsx b/universal/packages/components/ui/modal/index.jsx
deleted file mode 100644
index ef28d62b..00000000
--- a/universal/packages/components/ui/modal/index.jsx
+++ /dev/null
@@ -1,138 +0,0 @@
-'use client';
-import React from 'react';
-import { createModal } from '@gluestack-ui/modal';
-import { Pressable, View, ScrollView, Platform } from 'react-native';
-import { Motion, AnimatePresence, createMotionAnimatedComponent, } from '@legendapp/motion';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-const AnimatedPressable = createMotionAnimatedComponent(Pressable);
-const SCOPE = 'MODAL';
-const UIModal = createModal({
-    Root: Platform.OS === 'web'
-        ? withStyleContext(View, SCOPE)
-        : withStyleContextAndStates(View, SCOPE),
-    Backdrop: AnimatedPressable,
-    Content: Motion.View,
-    Body: ScrollView,
-    CloseButton: Pressable,
-    Footer: View,
-    Header: View,
-    AnimatePresence: AnimatePresence,
-});
-cssInterop(UIModal, { className: 'style' });
-cssInterop(UIModal.Backdrop, { className: 'style' });
-cssInterop(UIModal.Content, { className: 'style' });
-cssInterop(UIModal.CloseButton, { className: 'style' });
-cssInterop(UIModal.Header, { className: 'style' });
-cssInterop(UIModal.Body, { className: 'style' });
-cssInterop(UIModal.Footer, { className: 'style' });
-const modalStyle = tva({
-    base: 'group/modal w-full h-full justify-center items-center web:pointer-events-none',
-    variants: {
-        size: {
-            xs: '',
-            sm: '',
-            md: '',
-            lg: '',
-            full: '',
-        },
-    },
-});
-const modalBackdropStyle = tva({
-    base: 'absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default',
-});
-const modalContentStyle = tva({
-    base: 'bg-background-50 rounded-lg overflow-hidden',
-    parentVariants: {
-        size: {
-            xs: 'w-[60%] max-w-[360px]',
-            sm: 'w-[70%] max-w-[420px]',
-            md: 'w-[80%] max-w-[510px]',
-            lg: 'w-[90%] max-w-[640px]',
-            full: 'w-full',
-        },
-    },
-});
-const modalBodyStyle = tva({
-    base: 'px-4 pb-2 pt-0',
-});
-const modalCloseButtonStyle = tva({
-    base: 'group/modal-close-button z-10 p-2 rounded data-[focus-visible=true]:web:bg-background-100 web:outline-0 cursor-pointer',
-});
-const modalHeaderStyle = tva({
-    base: 'px-4 pt-4 pb-2 justify-between items-center flex-row',
-});
-const modalFooterStyle = tva({
-    base: 'p-4 flex-row justify-end items-center flex-wrap',
-});
-const Modal = React.forwardRef((
-//@ts-ignore
-{ className, size = 'md', ...props }, ref) => (<UIModal ref={ref} {...props} pointerEvents="box-none" className={modalStyle({ size, class: className })} context={{ size }}/>));
-const ModalBackdrop = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIModal.Backdrop ref={ref} initial={{
-            opacity: 0,
-        }} animate={{
-            opacity: 0.5,
-        }} exit={{
-            opacity: 0,
-        }} transition={{
-            type: 'spring',
-            damping: 18,
-            stiffness: 250,
-            opacity: {
-                type: 'timing',
-                duration: 250,
-            },
-        }} {...props} className={modalBackdropStyle({
-            class: className,
-        })}/>);
-});
-const ModalContent = React.forwardRef(({ className, size, ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UIModal.Content ref={ref} initial={{
-            opacity: 0,
-            scale: 0.9,
-        }} animate={{
-            opacity: 1,
-            scale: 1,
-        }} exit={{
-            opacity: 0,
-        }} transition={{
-            type: 'spring',
-            damping: 18,
-            stiffness: 250,
-            opacity: {
-                type: 'timing',
-                duration: 250,
-            },
-        }} {...props} className={modalContentStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            size,
-            class: className,
-        })} pointerEvents="auto"/>);
-});
-const ModalHeader = React.forwardRef(({ className, ...props }, ref) => (<UIModal.Header ref={ref} {...props} className={modalHeaderStyle({
-        class: className,
-    })}/>));
-const ModalBody = React.forwardRef(({ className, ...props }, ref) => (<UIModal.Body ref={ref} {...props} className={modalBodyStyle({
-        class: className,
-    })}/>));
-const ModalFooter = React.forwardRef(({ className, ...props }, ref) => (<UIModal.Footer ref={ref} {...props} className={modalFooterStyle({
-        class: className,
-    })}/>));
-const ModalCloseButton = React.forwardRef(({ className, ...props }, ref) => (<UIModal.CloseButton ref={ref} {...props} className={modalCloseButtonStyle({
-        class: className,
-    })}/>));
-// Assign display names
-Modal.displayName = 'Modal';
-ModalBackdrop.displayName = 'ModalBackdrop';
-ModalContent.displayName = 'ModalContent';
-ModalHeader.displayName = 'ModalHeader';
-ModalBody.displayName = 'ModalBody';
-ModalFooter.displayName = 'ModalFooter';
-ModalCloseButton.displayName = 'ModalCloseButton';
-export { Modal, ModalBackdrop, ModalContent, ModalCloseButton, ModalHeader, ModalBody, ModalFooter, };
diff --git a/universal/packages/components/ui/modal/index.tsx b/universal/packages/components/ui/modal/index.tsx
index f19e5118..e38fef1c 100644
--- a/universal/packages/components/ui/modal/index.tsx
+++ b/universal/packages/components/ui/modal/index.tsx
@@ -1,7 +1,7 @@
 'use client';
 import React from 'react';
 import { createModal } from '@gluestack-ui/modal';
-import { Pressable, View, ScrollView, Platform } from 'react-native';
+import { Pressable, View, ScrollView } from 'react-native';
 import {
   Motion,
   AnimatePresence,
@@ -12,19 +12,14 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 const AnimatedPressable = createMotionAnimatedComponent(Pressable);
-
 const SCOPE = 'MODAL';
 
 const UIModal = createModal({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(View, SCOPE),
+  Root: withStyleContext(View, SCOPE),
   Backdrop: AnimatedPressable,
   Content: Motion.View,
   Body: ScrollView,
@@ -33,17 +28,9 @@ const UIModal = createModal({
   Header: View,
   AnimatePresence: AnimatePresence,
 });
-cssInterop(UIModal, { className: 'style' });
-cssInterop(UIModal.Backdrop, { className: 'style' });
-cssInterop(UIModal.Content, { className: 'style' });
-cssInterop(UIModal.CloseButton, { className: 'style' });
-cssInterop(UIModal.Header, { className: 'style' });
-cssInterop(UIModal.Body, {
-  className: 'style',
-  contentContainerClassName: 'contentContainerStyle',
-  indicatorClassName: 'indicatorStyle',
-});
-cssInterop(UIModal.Footer, { className: 'style' });
+
+cssInterop(AnimatedPressable, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
 
 const modalStyle = tva({
   base: 'group/modal w-full h-full justify-center items-center web:pointer-events-none',
@@ -76,7 +63,7 @@ const modalContentStyle = tva({
 });
 
 const modalBodyStyle = tva({
-  base: 'mt-4 mb-6',
+  base: 'mt-2 mb-6',
 });
 
 const modalCloseButtonStyle = tva({
diff --git a/universal/packages/components/ui/popover/index.d.ts b/universal/packages/components/ui/popover/index.d.ts
deleted file mode 100644
index b251577d..00000000
--- a/universal/packages/components/ui/popover/index.d.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { View } from 'react-native';
-declare const Popover: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("@gluestack-ui/popover/lib/typescript/types").InterfacePopoverProps & React.RefAttributes<unknown> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-} | ({
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-} & {
-    size: {
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        full: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "group/popover w-full h-full justify-center items-center web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}, {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}>, {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}, undefined, "group/popover w-full h-full justify-center items-center web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}, {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const PopoverArrow: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown>> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "bg-background-50 z-1 absolute overflow-hidden h-3.5 w-3.5", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "bg-background-50 z-1 absolute overflow-hidden h-3.5 w-3.5", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const PopoverBackdrop: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown> & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown>> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const PopoverBody: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ScrollViewProps & React.RefAttributes<import("react-native").ScrollViewProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "p-4 pt-2", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "p-4 pt-2", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const PopoverCloseButton: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").PressableProps & React.RefAttributes<View> & React.RefAttributes<import("react-native").PressableProps & React.RefAttributes<View>> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "group/popover-close-button z-10 p-2 rounded-sm data-[focus-visible=true]:web:bg-background-100 web:outline-0 cursor-pointer", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "group/popover-close-button z-10 p-2 rounded-sm data-[focus-visible=true]:web:bg-background-100 web:outline-0 cursor-pointer", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const PopoverContent: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown>> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        full: string;
-    };
-}, undefined, "bg-background-50 rounded-lg overflow-hidden", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "bg-background-50 rounded-lg overflow-hidden", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const PopoverFooter: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ViewProps & React.RefAttributes<import("react-native").ViewProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "p-4 flex-row justify-end items-center flex-wrap border-t border-outline-300", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "p-4 flex-row justify-end items-center flex-wrap border-t border-outline-300", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const PopoverHeader: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ViewProps & React.RefAttributes<import("react-native").ViewProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "p-4 pb-2 justify-between items-center flex-row", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "p-4 pb-2 justify-between items-center flex-row", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Popover, PopoverBackdrop, PopoverArrow, PopoverCloseButton, PopoverFooter, PopoverHeader, PopoverBody, PopoverContent, };
diff --git a/universal/packages/components/ui/popover/index.jsx b/universal/packages/components/ui/popover/index.jsx
deleted file mode 100644
index 718d25dd..00000000
--- a/universal/packages/components/ui/popover/index.jsx
+++ /dev/null
@@ -1,151 +0,0 @@
-'use client';
-import React from 'react';
-import { createPopover } from '@gluestack-ui/popover';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-import { View, Pressable, Platform, ScrollView } from 'react-native';
-import { Motion, createMotionAnimatedComponent, AnimatePresence, } from '@legendapp/motion';
-const AnimatedPressable = createMotionAnimatedComponent(Pressable);
-const SCOPE = 'POPOVER';
-const UIPopover = createPopover({
-    // @ts-ignore
-    Root: Platform.OS === 'web'
-        ? withStyleContext(View, SCOPE)
-        : withStyleContextAndStates(View, SCOPE),
-    Arrow: Motion.View,
-    Backdrop: AnimatedPressable,
-    Body: ScrollView,
-    CloseButton: Pressable,
-    Content: Motion.View,
-    Footer: View,
-    Header: View,
-    AnimatedPresence: AnimatePresence,
-});
-cssInterop(UIPopover, { className: 'style' });
-cssInterop(UIPopover.Arrow, { className: 'style' });
-cssInterop(UIPopover.Content, { className: 'style' });
-cssInterop(UIPopover.Header, { className: 'style' });
-cssInterop(UIPopover.Footer, { className: 'style' });
-cssInterop(UIPopover.Body, { className: 'style' });
-cssInterop(UIPopover.Backdrop, { className: 'style' });
-cssInterop(UIPopover.CloseButton, { className: 'style' });
-const popoverStyle = tva({
-    base: 'group/popover w-full h-full justify-center items-center web:pointer-events-none',
-    variants: {
-        size: {
-            xs: '',
-            sm: '',
-            md: '',
-            lg: '',
-            full: '',
-        },
-    },
-});
-const popoverArrowStyle = tva({
-    base: 'bg-background-50 z-1 absolute overflow-hidden h-3.5 w-3.5',
-});
-const popoverBackdropStyle = tva({
-    base: 'absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default',
-});
-const popoverBodyStyle = tva({
-    base: 'p-4 pt-2',
-});
-const popoverCloseButtonStyle = tva({
-    base: 'group/popover-close-button z-10 p-2 rounded-sm data-[focus-visible=true]:web:bg-background-100 web:outline-0 cursor-pointer',
-});
-const popoverContentStyle = tva({
-    base: 'bg-background-50 rounded-lg overflow-hidden',
-    parentVariants: {
-        size: {
-            xs: 'w-[60%] max-w-[360px]',
-            sm: 'w-[70%] max-w-[420px]',
-            md: 'w-[80%] max-w-[510px]',
-            lg: 'w-[90%] max-w-[640px]',
-            full: 'w-full',
-        },
-    },
-});
-const popoverFooterStyle = tva({
-    base: 'p-4 flex-row justify-end items-center flex-wrap border-t border-outline-300',
-});
-const popoverHeaderStyle = tva({
-    base: 'p-4 pb-2 justify-between items-center flex-row',
-});
-const Popover = React.forwardRef(({ className, size = 'md', ...props }, ref) => (<UIPopover ref={ref} {...props} 
-// @ts-ignore
-className={popoverStyle({ size, class: className })} context={{ size }} pointerEvents="box-none"/>));
-const PopoverArrow = React.forwardRef(({ className, ...props }, ref) => (<UIPopover.Arrow ref={ref} transition={{
-        type: 'spring',
-        damping: 18,
-        stiffness: 250,
-        mass: 0.9,
-        opacity: {
-            type: 'timing',
-            duration: 50,
-            delay: 50,
-        },
-    }} {...props} className={popoverArrowStyle({ class: className })}/>));
-const PopoverBackdrop = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIPopover.Backdrop ref={ref} {...props} initial={{
-            opacity: 0,
-        }} animate={{
-            opacity: 0.1,
-        }} exit={{
-            opacity: 0,
-        }} transition={{
-            type: 'spring',
-            damping: 18,
-            stiffness: 450,
-            mass: 0.9,
-            opacity: {
-                type: 'timing',
-                duration: 50,
-                delay: 50,
-            },
-        }} className={popoverBackdropStyle({
-            class: className,
-        })}/>);
-});
-const PopoverBody = React.forwardRef(({ className, ...props }, ref) => (<UIPopover.Body ref={ref} {...props} className={popoverBodyStyle({
-        class: className,
-    })}/>));
-const PopoverCloseButton = React.forwardRef(({ className, ...props }, ref) => (<UIPopover.CloseButton ref={ref} {...props} className={popoverCloseButtonStyle({
-        class: className,
-    })}/>));
-const PopoverContent = React.forwardRef(({ className, size, ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UIPopover.Content ref={ref} transition={{
-            type: 'spring',
-            damping: 18,
-            stiffness: 250,
-            mass: 0.9,
-            opacity: {
-                type: 'timing',
-                duration: 50,
-                delay: 50,
-            },
-        }} {...props} className={popoverContentStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            size,
-            class: className,
-        })} pointerEvents="auto"/>);
-});
-const PopoverFooter = React.forwardRef(({ className, ...props }, ref) => (<UIPopover.Footer ref={ref} {...props} className={popoverFooterStyle({
-        class: className,
-    })}/>));
-const PopoverHeader = React.forwardRef(({ className, ...props }, ref) => (<UIPopover.Header ref={ref} {...props} className={popoverHeaderStyle({
-        class: className,
-    })}/>));
-Popover.displayName = 'Popover';
-PopoverArrow.displayName = 'PopoverArrow';
-PopoverBackdrop.displayName = 'PopoverBackdrop';
-PopoverContent.displayName = 'PopoverContent';
-PopoverHeader.displayName = 'PopoverHeader';
-PopoverFooter.displayName = 'PopoverFooter';
-PopoverBody.displayName = 'PopoverBody';
-PopoverCloseButton.displayName = 'PopoverCloseButton';
-export { Popover, PopoverBackdrop, PopoverArrow, PopoverCloseButton, PopoverFooter, PopoverHeader, PopoverBody, PopoverContent, };
diff --git a/universal/packages/components/ui/popover/index.tsx b/universal/packages/components/ui/popover/index.tsx
index 3854379e..5d53d65a 100644
--- a/universal/packages/components/ui/popover/index.tsx
+++ b/universal/packages/components/ui/popover/index.tsx
@@ -1,6 +1,6 @@
 'use client';
 import React from 'react';
-import { View, Pressable, Platform, ScrollView } from 'react-native';
+import { View, Pressable, ScrollView } from 'react-native';
 import {
   Motion,
   createMotionAnimatedComponent,
@@ -12,26 +12,15 @@ import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 const AnimatedPressable = createMotionAnimatedComponent(Pressable);
 const SCOPE = 'POPOVER';
-const ArrowWrapper = React.forwardRef(({ ...props }, ref) => {
-  return <Motion.View {...props} ref={ref} />;
-}) as React.ForwardRefExoticComponent<
-  React.ElementRef<typeof Motion.View> &
-    React.ComponentProps<typeof Motion.View>
->;
+
 const UIPopover = createPopover({
-  Root: (Platform.OS === 'web'
-    ? withStyleContext(View, SCOPE)
-    : withStyleContextAndStates(View, SCOPE)) as ReturnType<
-    typeof withStyleContext<typeof View>
-  >,
-  Arrow: Platform.OS === 'web' ? Motion.View : withStates(ArrowWrapper),
+  Root: withStyleContext(View, SCOPE),
+  Arrow: Motion.View,
   Backdrop: AnimatedPressable,
   Body: ScrollView,
   CloseButton: Pressable,
@@ -41,18 +30,8 @@ const UIPopover = createPopover({
   AnimatePresence: AnimatePresence,
 });
 
-cssInterop(UIPopover, { className: 'style' });
-cssInterop(ArrowWrapper, { className: 'style' });
-cssInterop(UIPopover.Content, { className: 'style' });
-cssInterop(UIPopover.Header, { className: 'style' });
-cssInterop(UIPopover.Footer, { className: 'style' });
-cssInterop(UIPopover.Body, {
-  className: 'style',
-  contentContainerClassName: 'contentContainerStyle',
-  indicatorClassName: 'indicatorStyle',
-});
-cssInterop(UIPopover.Backdrop, { className: 'style' });
-cssInterop(UIPopover.CloseButton, { className: 'style' });
+cssInterop(Motion.View, { className: 'style' });
+cssInterop(AnimatedPressable, { className: 'style' });
 
 const popoverStyle = tva({
   base: 'group/popover w-full h-full justify-center items-center web:pointer-events-none',
@@ -72,29 +51,29 @@ const popoverArrowStyle = tva({
   variants: {
     placement: {
       'top left':
-        'data-[flip=false]:border-t-transparent data-[flip=false]:border-l-transparent data-[flip=true]:border-b-transparent data-[flip=true]:border-r-transparent',
+        'data-[flip=false]:border-t-0 data-[flip=false]:border-l-0 data-[flip=true]:border-b-0 data-[flip=true]:border-r-0',
       'top':
-        'data-[flip=false]:border-t-transparent data-[flip=false]:border-l-transparent data-[flip=true]:border-b-transparent data-[flip=true]:border-r-transparent',
+        'data-[flip=false]:border-t-0 data-[flip=false]:border-l-0 data-[flip=true]:border-b-0 data-[flip=true]:border-r-0',
       'top right':
-        'data-[flip=false]:border-t-transparent data-[flip=false]:border-l-transparent data-[flip=true]:border-b-transparent data-[flip=true]:border-r-transparent',
+        'data-[flip=false]:border-t-0 data-[flip=false]:border-l-0 data-[flip=true]:border-b-0 data-[flip=true]:border-r-0',
       'bottom':
-        'data-[flip=false]:border-b-transparent data-[flip=false]:border-r-transparent data-[flip=true]:border-t-transparent data-[flip=true]:border-l-transparent',
+        'data-[flip=false]:border-b-0 data-[flip=false]:border-r-0 data-[flip=true]:border-t-0 data-[flip=true]:border-l-0',
       'bottom left':
-        'data-[flip=false]:border-b-transparent data-[flip=false]:border-r-transparent data-[flip=true]:border-t-transparent data-[flip=true]:border-l-transparent',
+        'data-[flip=false]:border-b-0 data-[flip=false]:border-r-0 data-[flip=true]:border-t-0 data-[flip=true]:border-l-0',
       'bottom right':
-        'data-[flip=false]:border-b-transparent data-[flip=false]:border-r-transparent data-[flip=true]:border-t-transparent data-[flip=true]:border-l-transparent',
+        'data-[flip=false]:border-b-0 data-[flip=false]:border-r-0 data-[flip=true]:border-t-0 data-[flip=true]:border-l-0',
       'left':
-        'data-[flip=false]:border-l-transparent data-[flip=false]:border-b-transparent data-[flip=true]:border-r-transparent data-[flip=true]:border-t-transparent',
+        'data-[flip=false]:border-l-0 data-[flip=false]:border-b-0 data-[flip=true]:border-r-0 data-[flip=true]:border-t-0',
       'left top':
-        'data-[flip=false]:border-l-transparent data-[flip=false]:border-b-transparent data-[flip=true]:border-r-transparent data-[flip=true]:border-t-transparent',
+        'data-[flip=false]:border-l-0 data-[flip=false]:border-b-0 data-[flip=true]:border-r-0 data-[flip=true]:border-t-0',
       'left bottom':
-        'data-[flip=false]:border-l-transparent data-[flip=false]:border-b-transparent data-[flip=true]:border-r-transparent data-[flip=true]:border-t-transparent',
+        'data-[flip=false]:border-l-0 data-[flip=false]:border-b-0 data-[flip=true]:border-r-0 data-[flip=true]:border-t-0',
       'right':
-        'data-[flip=false]:border-r-transparent data-[flip=false]:border-t-transparent data-[flip=true]:border-l-transparent data-[flip=true]:border-b-transparent',
+        'data-[flip=false]:border-r-0 data-[flip=false]:border-t-0 data-[flip=true]:border-l-0 data-[flip=true]:border-b-0',
       'right top':
-        'data-[flip=false]:border-r-transparent data-[flip=false]:border-t-transparent data-[flip=true]:border-l-transparent data-[flip=true]:border-b-transparent',
+        'data-[flip=false]:border-r-0 data-[flip=false]:border-t-0 data-[flip=true]:border-l-0 data-[flip=true]:border-b-0',
       'right bottom':
-        'data-[flip=false]:border-r-transparent data-[flip=false]:border-t-transparent data-[flip=true]:border-l-transparent data-[flip=true]:border-b-transparent',
+        'data-[flip=false]:border-r-0 data-[flip=false]:border-t-0 data-[flip=true]:border-l-0 data-[flip=true]:border-b-0',
     },
   },
 });
@@ -167,7 +146,6 @@ const Popover = React.forwardRef<
       ref={ref}
       placement={placement}
       {...props}
-      // @ts-ignore
       className={popoverStyle({ size, class: className })}
       context={{ size, placement }}
       pointerEvents="box-none"
diff --git a/universal/packages/components/ui/pressable/index.d.ts b/universal/packages/components/ui/pressable/index.d.ts
deleted file mode 100644
index f857e839..00000000
--- a/universal/packages/components/ui/pressable/index.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const Pressable: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & Omit<Omit<Omit<import("react-native").PressableProps & React.RefAttributes<import("react-native").View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown> & Omit<import("react-native").PressableProps, "children"> & {
-    tabIndex?: 0 | -1 | undefined;
-} & {
-    children?: React.ReactNode | (({ hovered, pressed, focused, focusVisible, disabled, }: {
-        hovered?: boolean | undefined;
-        pressed?: boolean | undefined;
-        focused?: boolean | undefined;
-        focusVisible?: boolean | undefined;
-        disabled?: boolean | undefined;
-    }) => React.ReactNode);
-}, "ref"> & React.RefAttributes<unknown>, "context"> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "data-[focus-visible=true]:outline-none data-[focus-visible=true]:ring-primary-700 data-[focus-visible=true]:ring-2 data-[disabled=true]:opacity-40", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "data-[focus-visible=true]:outline-none data-[focus-visible=true]:ring-primary-700 data-[focus-visible=true]:ring-2 data-[disabled=true]:opacity-40", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Pressable };
diff --git a/universal/packages/components/ui/pressable/index.jsx b/universal/packages/components/ui/pressable/index.jsx
deleted file mode 100644
index 61dc48d7..00000000
--- a/universal/packages/components/ui/pressable/index.jsx
+++ /dev/null
@@ -1,24 +0,0 @@
-'use client';
-import React from 'react';
-import { createPressable } from '@gluestack-ui/pressable';
-import { Pressable as RNPressable, Platform } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-const UIPressable = createPressable({
-    Root: Platform.OS === 'web'
-        ? withStyleContext(RNPressable)
-        : withStyleContextAndStates(RNPressable),
-});
-const pressableStyle = tva({
-    base: 'data-[focus-visible=true]:outline-none data-[focus-visible=true]:ring-primary-700 data-[focus-visible=true]:ring-2 data-[disabled=true]:opacity-40',
-});
-cssInterop(UIPressable, { className: 'style' });
-const Pressable = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIPressable {...props} ref={ref} className={pressableStyle({
-            class: className,
-        })}/>);
-});
-Pressable.displayName = 'Pressable';
-export { Pressable };
diff --git a/universal/packages/components/ui/pressable/index.tsx b/universal/packages/components/ui/pressable/index.tsx
index 9bfc0c72..e6e5e0b4 100644
--- a/universal/packages/components/ui/pressable/index.tsx
+++ b/universal/packages/components/ui/pressable/index.tsx
@@ -1,27 +1,20 @@
 'use client';
 import React from 'react';
 import { createPressable } from '@gluestack-ui/pressable';
-import { Pressable as RNPressable, Platform } from 'react-native';
+import { Pressable as RNPressable } from 'react-native';
 
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
 const UIPressable = createPressable({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(RNPressable)
-      : withStyleContextAndStates(RNPressable),
+  Root: withStyleContext(RNPressable),
 });
 
 const pressableStyle = tva({
   base: 'data-[focus-visible=true]:outline-none data-[focus-visible=true]:ring-indicator-info data-[focus-visible=true]:ring-2 data-[disabled=true]:opacity-40',
 });
 
-cssInterop(UIPressable, { className: 'style' });
-
 type IPressableProps = Omit<
   React.ComponentProps<typeof UIPressable>,
   'context'
diff --git a/universal/packages/components/ui/progress/index.d.ts b/universal/packages/components/ui/progress/index.d.ts
deleted file mode 100644
index f86b6d69..00000000
--- a/universal/packages/components/ui/progress/index.d.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-export declare const UIProgress: import("@gluestack-ui/progress/lib/typescript/types").IProgressComponentType<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>, import("react-native").ViewProps>;
-declare const progressStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-} | ({
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-} & {
-    size: {
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "bg-background-300 rounded-full w-full", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}, {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}>, {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}, undefined, "bg-background-300 rounded-full w-full", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}, {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}>, unknown, unknown, undefined>>;
-declare const progressFilledTrackStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-    };
-}, undefined, "bg-primary-500 rounded-full", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "bg-primary-500 rounded-full", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-type IProgressProps = VariantProps<typeof progressStyle> & React.ComponentProps<typeof UIProgress>;
-type IProgressFilledTrackProps = VariantProps<typeof progressFilledTrackStyle> & React.ComponentProps<typeof UIProgress.FilledTrack>;
-export declare const Progress: React.ForwardRefExoticComponent<Omit<IProgressProps, "ref"> & React.RefAttributes<unknown>>;
-export declare const ProgressFilledTrack: React.ForwardRefExoticComponent<Omit<IProgressFilledTrackProps, "ref"> & React.RefAttributes<unknown>>;
-export {};
diff --git a/universal/packages/components/ui/progress/index.jsx b/universal/packages/components/ui/progress/index.jsx
deleted file mode 100644
index 14abad97..00000000
--- a/universal/packages/components/ui/progress/index.jsx
+++ /dev/null
@@ -1,52 +0,0 @@
-'use client';
-import React from 'react';
-import { createProgress } from '@gluestack-ui/progress';
-import { View } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-const SCOPE = 'PROGRESS';
-export const UIProgress = createProgress({
-    Root: withStyleContext(View, SCOPE),
-    FilledTrack: View,
-});
-cssInterop(UIProgress, { className: 'style' });
-cssInterop(UIProgress.FilledTrack, { className: 'style' });
-const progressStyle = tva({
-    base: 'bg-background-300 rounded-full w-full',
-    variants: {
-        size: {
-            'xs': 'h-1',
-            'sm': 'h-2',
-            'md': 'h-3',
-            'lg': 'h-4',
-            'xl': 'h-5',
-            '2xl': 'h-6',
-        },
-    },
-});
-const progressFilledTrackStyle = tva({
-    base: 'bg-primary-500 rounded-full',
-    parentVariants: {
-        size: {
-            'xs': 'h-1',
-            'sm': 'h-2',
-            'md': 'h-3',
-            'lg': 'h-4',
-            'xl': 'h-5',
-            '2xl': 'h-6',
-        },
-    },
-});
-export const Progress = React.forwardRef(({ className, size = 'md', ...props }, ref) => {
-    return (<UIProgress ref={ref} {...props} className={progressStyle({ size, class: className })} context={{ size }}/>);
-});
-export const ProgressFilledTrack = React.forwardRef(({ className, ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UIProgress.FilledTrack ref={ref} className={progressFilledTrackStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            class: className,
-        })} {...props}/>);
-});
diff --git a/universal/packages/components/ui/progress/index.tsx b/universal/packages/components/ui/progress/index.tsx
index d098dfdc..c51ac3d0 100644
--- a/universal/packages/components/ui/progress/index.tsx
+++ b/universal/packages/components/ui/progress/index.tsx
@@ -9,6 +9,7 @@ import {
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
 import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+
 const SCOPE = 'PROGRESS';
 export const UIProgress = createProgress({
   Root: withStyleContext(View, SCOPE),
@@ -21,6 +22,10 @@ cssInterop(UIProgress.FilledTrack, { className: 'style' });
 const progressStyle = tva({
   base: 'bg-background-300 rounded-full w-full',
   variants: {
+    orientation: {
+      horizontal: 'w-full',
+      vertical: 'h-full',
+    },
     size: {
       'xs': 'h-1',
       'sm': 'h-2',
@@ -30,10 +35,48 @@ const progressStyle = tva({
       '2xl': 'h-6',
     },
   },
+  compoundVariants: [
+    {
+      orientation: 'vertical',
+      size: 'xs',
+      class: 'h-full w-1 justify-end',
+    },
+    {
+      orientation: 'vertical',
+      size: 'sm',
+      class: 'h-full w-2 justify-end',
+    },
+    {
+      orientation: 'vertical',
+      size: 'md',
+      class: 'h-full w-3 justify-end',
+    },
+    {
+      orientation: 'vertical',
+      size: 'lg',
+      class: 'h-full w-4 justify-end',
+    },
+
+    {
+      orientation: 'vertical',
+      size: 'xl',
+      class: 'h-full w-5 justify-end',
+    },
+    {
+      orientation: 'vertical',
+      size: '2xl',
+      class: 'h-full w-6 justify-end',
+    },
+  ],
 });
+
 const progressFilledTrackStyle = tva({
   base: 'bg-primary-500 rounded-full',
   parentVariants: {
+    orientation: {
+      horizontal: 'w-full',
+      vertical: 'h-full',
+    },
     size: {
       'xs': 'h-1',
       'sm': 'h-2',
@@ -43,6 +86,39 @@ const progressFilledTrackStyle = tva({
       '2xl': 'h-6',
     },
   },
+  parentCompoundVariants: [
+    {
+      orientation: 'vertical',
+      size: 'xs',
+      class: 'h-full w-1',
+    },
+    {
+      orientation: 'vertical',
+      size: 'sm',
+      class: 'h-full w-2',
+    },
+    {
+      orientation: 'vertical',
+      size: 'md',
+      class: 'h-full w-3',
+    },
+    {
+      orientation: 'vertical',
+      size: 'lg',
+      class: 'h-full w-4',
+    },
+
+    {
+      orientation: 'vertical',
+      size: 'xl',
+      class: 'h-full w-5',
+    },
+    {
+      orientation: 'vertical',
+      size: '2xl',
+      class: 'h-full w-6',
+    },
+  ],
 });
 
 type IProgressProps = VariantProps<typeof progressStyle> &
@@ -53,13 +129,14 @@ type IProgressFilledTrackProps = VariantProps<typeof progressFilledTrackStyle> &
 export const Progress = React.forwardRef<
   React.ElementRef<typeof UIProgress>,
   IProgressProps
->(({ className, size = 'md', ...props }, ref) => {
+>(({ className, size = 'md', orientation = 'horizontal', ...props }, ref) => {
   return (
     <UIProgress
       ref={ref}
       {...props}
-      className={progressStyle({ size, class: className })}
-      context={{ size }}
+      className={progressStyle({ size, orientation, class: className })}
+      context={{ size, orientation }}
+      orientation={orientation}
     />
   );
 });
@@ -68,7 +145,8 @@ export const ProgressFilledTrack = React.forwardRef<
   React.ElementRef<typeof UIProgress.FilledTrack>,
   IProgressFilledTrackProps
 >(({ className, ...props }, ref) => {
-  const { size: parentSize } = useStyleContext(SCOPE);
+  const { size: parentSize, orientation: parentOrientation } =
+    useStyleContext(SCOPE);
 
   return (
     <UIProgress.FilledTrack
@@ -76,6 +154,7 @@ export const ProgressFilledTrack = React.forwardRef<
       className={progressFilledTrackStyle({
         parentVariants: {
           size: parentSize,
+          orientation: parentOrientation,
         },
         class: className,
       })}
diff --git a/universal/packages/components/ui/radio/index.d.ts b/universal/packages/components/ui/radio/index.d.ts
deleted file mode 100644
index 0ab7355e..00000000
--- a/universal/packages/components/ui/radio/index.d.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const Radio: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & Omit<import("@gluestack-ui/radio/lib/typescript/types").InterfaceRadio & React.RefAttributes<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>> & import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>, "context"> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-} | ({
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-} & {
-    size: {
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "group/radio flex-row justify-start items-center web:cursor-pointer data-[disabled=true]:web:cursor-not-allowed", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}>, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "group/radio flex-row justify-start items-center web:cursor-pointer data-[disabled=true]:web:cursor-not-allowed", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const RadioGroup: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps & import("@gluestack-ui/radio/lib/typescript/types").IRadioGroupProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "gap-2", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "gap-2", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const RadioIndicator: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "justify-center items-center bg-transparent border-outline-400 border-2 rounded-full data-[focus-visible=true]:web:outline-2 data-[focus-visible=true]:web:outline-primary-700 data-[focus-visible=true]:web:outline data-[checked=true]:border-primary-600 data-[checked=true]:bg-transparent data-[hover=true]:border-outline-500 data-[hover=true]:bg-transparent data-[hover=true]:data-[checked=true]:bg-transparent data-[hover=true]:data-[checked=true]:border-primary-700 data-[hover=true]:data-[invalid=true]:border-error-700 data-[hover=true]:data-[disabled=true]:opacity-40 data-[hover=true]:data-[disabled=true]:border-outline-400 data-[hover=true]:data-[disabled=true]:data-[invalid=true]:border-error-400 data-[active=true]:bg-transparent data-[active=true]:border-primary-800 data-[invalid=true]:border-error-700 data-[disabled=true]:opacity-40 data-[disabled=true]:data-[checked=true]:border-outline-400 data-[disabled=true]:data-[checked=true]:bg-transparent data-[disabled=true]:data-[invalid=true]:border-error-400", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "justify-center items-center bg-transparent border-outline-400 border-2 rounded-full data-[focus-visible=true]:web:outline-2 data-[focus-visible=true]:web:outline-primary-700 data-[focus-visible=true]:web:outline data-[checked=true]:border-primary-600 data-[checked=true]:bg-transparent data-[hover=true]:border-outline-500 data-[hover=true]:bg-transparent data-[hover=true]:data-[checked=true]:bg-transparent data-[hover=true]:data-[checked=true]:border-primary-700 data-[hover=true]:data-[invalid=true]:border-error-700 data-[hover=true]:data-[disabled=true]:opacity-40 data-[hover=true]:data-[disabled=true]:border-outline-400 data-[hover=true]:data-[disabled=true]:data-[invalid=true]:border-error-400 data-[active=true]:bg-transparent data-[active=true]:border-primary-800 data-[invalid=true]:border-error-700 data-[disabled=true]:opacity-40 data-[disabled=true]:data-[checked=true]:border-outline-400 data-[disabled=true]:data-[checked=true]:bg-transparent data-[disabled=true]:data-[invalid=true]:border-error-400", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const RadioLabel: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.RefAttributes<import("react-native").TextProps> & import("react-native").TextProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "justify-center items-center bg-transparent border-outline-400 border-2 rounded-full data-[focus-visible=true]:web:outline-2 data-[focus-visible=true]:web:outline-primary-700 data-[focus-visible=true]:web:outline data-[checked=true]:border-primary-600 data-[checked=true]:bg-transparent data-[hover=true]:border-outline-500 data-[hover=true]:bg-transparent data-[hover=true]:data-[checked=true]:bg-transparent data-[hover=true]:data-[checked=true]:border-primary-700 data-[hover=true]:data-[invalid=true]:border-error-700 data-[hover=true]:data-[disabled=true]:opacity-40 data-[hover=true]:data-[disabled=true]:border-outline-400 data-[hover=true]:data-[disabled=true]:data-[invalid=true]:border-error-400 data-[active=true]:bg-transparent data-[active=true]:border-primary-800 data-[invalid=true]:border-error-700 data-[disabled=true]:opacity-40 data-[disabled=true]:data-[checked=true]:border-outline-400 data-[disabled=true]:data-[checked=true]:bg-transparent data-[disabled=true]:data-[invalid=true]:border-error-400", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "justify-center items-center bg-transparent border-outline-400 border-2 rounded-full data-[focus-visible=true]:web:outline-2 data-[focus-visible=true]:web:outline-primary-700 data-[focus-visible=true]:web:outline data-[checked=true]:border-primary-600 data-[checked=true]:bg-transparent data-[hover=true]:border-outline-500 data-[hover=true]:bg-transparent data-[hover=true]:data-[checked=true]:bg-transparent data-[hover=true]:data-[checked=true]:border-primary-700 data-[hover=true]:data-[invalid=true]:border-error-700 data-[hover=true]:data-[disabled=true]:opacity-40 data-[hover=true]:data-[disabled=true]:border-outline-400 data-[hover=true]:data-[disabled=true]:data-[invalid=true]:border-error-400 data-[active=true]:bg-transparent data-[active=true]:border-primary-800 data-[invalid=true]:border-error-700 data-[disabled=true]:opacity-40 data-[disabled=true]:data-[checked=true]:border-outline-400 data-[disabled=true]:data-[checked=true]:bg-transparent data-[disabled=true]:data-[invalid=true]:border-error-400", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const RadioIcon: React.ForwardRefExoticComponent<Omit<React.RefAttributes<Omit<any, "ref"> & React.RefAttributes<unknown>> & Omit<any, "ref"> & React.RefAttributes<unknown> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "rounded-full justify-center items-center", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "rounded-full justify-center items-center", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & {
-    className?: string | undefined;
-    fill?: string | undefined;
-    color?: string | undefined;
-    as?: any;
-}, "ref"> & React.RefAttributes<unknown>>;
-export { Radio, RadioGroup, RadioIndicator, RadioLabel, RadioIcon };
diff --git a/universal/packages/components/ui/radio/index.jsx b/universal/packages/components/ui/radio/index.jsx
deleted file mode 100644
index 7533d2d4..00000000
--- a/universal/packages/components/ui/radio/index.jsx
+++ /dev/null
@@ -1,140 +0,0 @@
-'use client';
-import React, { useMemo } from 'react';
-import { createRadio } from '@gluestack-ui/radio';
-import { Svg } from 'react-native-svg';
-import { Pressable, View, Platform, Text } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-const PrimitiveIcon = React.forwardRef(({ height, width, fill = 'none', color, size, as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} color={color} {...props}/>);
-});
-const radioStyle = tva({
-    base: 'group/radio flex-row justify-start items-center web:cursor-pointer data-[disabled=true]:web:cursor-not-allowed',
-    variants: {
-        size: {
-            sm: 'gap-1.5',
-            md: 'gap-2',
-            lg: 'gap-2',
-        },
-    },
-});
-const radioGroupStyle = tva({
-    base: 'gap-2',
-});
-const radioIconStyle = tva({
-    base: 'rounded-full justify-center items-center',
-    parentVariants: {
-        size: {
-            sm: 'h-3 w-3',
-            md: 'h-4 w-4',
-            lg: 'h-[18px] w-[18px]',
-        },
-    },
-});
-const radioIndicatorStyle = tva({
-    base: 'justify-center items-center bg-transparent border-outline-400 border-2 rounded-full data-[focus-visible=true]:web:outline-2 data-[focus-visible=true]:web:outline-primary-700 data-[focus-visible=true]:web:outline data-[checked=true]:border-primary-600 data-[checked=true]:bg-transparent data-[hover=true]:border-outline-500 data-[hover=true]:bg-transparent data-[hover=true]:data-[checked=true]:bg-transparent data-[hover=true]:data-[checked=true]:border-primary-700 data-[hover=true]:data-[invalid=true]:border-error-700 data-[hover=true]:data-[disabled=true]:opacity-40 data-[hover=true]:data-[disabled=true]:border-outline-400 data-[hover=true]:data-[disabled=true]:data-[invalid=true]:border-error-400 data-[active=true]:bg-transparent data-[active=true]:border-primary-800 data-[invalid=true]:border-error-700 data-[disabled=true]:opacity-40 data-[disabled=true]:data-[checked=true]:border-outline-400 data-[disabled=true]:data-[checked=true]:bg-transparent data-[disabled=true]:data-[invalid=true]:border-error-400',
-    parentVariants: {
-        size: {
-            sm: 'p-px h-4 w-4',
-            md: 'p-[1.5px] h-5 w-5',
-            lg: 'p-0.5 h-6 w-6',
-        },
-    },
-});
-const radioLabelStyle = tva({
-    base: 'text-typography-600 data-[checked=true]:text-typography-900 data-[hover=true]:text-typography-900 data-[hover=true]:data-[disabled=true]:text-typography-600 data-[hover=true]:data-[disabled=true]:data-[checked=true]:text-typography-900 data-[active=true]:text-typography-900 data-[active=true]:data-[checked=true]:text-typography-900 data-[disabled=true]:opacity-40 web:select-none',
-    parentVariants: {
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-base',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-    },
-});
-const SCOPE = 'Radio';
-const UIRadio = createRadio({
-    // @ts-ignore
-    Root: Platform.OS === 'web'
-        ? withStyleContext(View, SCOPE)
-        : withStyleContextAndStates(Pressable, SCOPE),
-    Group: View,
-    Icon: Platform.OS === 'web' ? PrimitiveIcon : withStates(PrimitiveIcon),
-    Indicator: Platform.OS === 'web' ? View : withStates(View),
-    Label: Platform.OS === 'web' ? Text : withStates(Text),
-});
-cssInterop(UIRadio, { className: 'style' });
-cssInterop(UIRadio.Group, { className: 'style' });
-cssInterop(UIRadio.Indicator, { className: 'style' });
-cssInterop(UIRadio.Label, { className: 'style' });
-cssInterop(UIRadio.Icon, {
-    className: {
-        target: 'style',
-        nativeStyleToProp: {
-            height: 'height',
-            width: 'width',
-            //@ts-ignore
-            fill: 'fill',
-            color: 'color',
-        },
-    },
-});
-const Radio = React.forwardRef(({ className, size = 'md', ...props }, ref) => {
-    return (<UIRadio className={radioStyle({ class: className, size })} {...props} ref={ref} context={{ size }}/>);
-});
-const RadioGroup = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIRadio.Group className={radioGroupStyle({ class: className })} {...props} ref={ref}/>);
-});
-const RadioIndicator = React.forwardRef(({ className, ...props }, ref) => {
-    const { size } = useStyleContext(SCOPE);
-    return (<UIRadio.Indicator className={radioIndicatorStyle({
-            parentVariants: { size },
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const RadioLabel = React.forwardRef(({ className, ...props }, ref) => {
-    const { size } = useStyleContext(SCOPE);
-    return (<UIRadio.Label className={radioLabelStyle({
-            parentVariants: { size },
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const RadioIcon = React.forwardRef(({ className, size, color = 'gray', ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    if (typeof size === 'number') {
-        return (<UIRadio.Icon ref={ref} {...props} color={color} className={radioIconStyle({ class: className })} size={size}/>);
-    }
-    else if ((props.height !== undefined || props.width !== undefined) &&
-        size === undefined) {
-        return (<UIRadio.Icon ref={ref} {...props} color={color} className={radioIconStyle({ class: className })}/>);
-    }
-    return (<UIRadio.Icon {...props} className={radioIconStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            size,
-            class: className,
-        })} color={color} ref={ref}/>);
-});
-Radio.displayName = 'Radio';
-RadioGroup.displayName = 'RadioGroup';
-RadioIndicator.displayName = 'RadioIndicator';
-RadioLabel.displayName = 'RadioLabel';
-RadioIcon.displayName = 'RadioIcon';
-export { Radio, RadioGroup, RadioIndicator, RadioLabel, RadioIcon };
diff --git a/universal/packages/components/ui/radio/index.tsx b/universal/packages/components/ui/radio/index.tsx
index 78733932..a32aee7d 100644
--- a/universal/packages/components/ui/radio/index.tsx
+++ b/universal/packages/components/ui/radio/index.tsx
@@ -1,7 +1,6 @@
 'use client';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { createRadio } from '@gluestack-ui/radio';
-import { Svg } from 'react-native-svg';
 import { Pressable, View, Platform, Text } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
@@ -9,88 +8,35 @@ import {
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
 import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 
-const IndicatorWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->(({ ...props }, ref) => {
-  return <View {...props} ref={ref} />;
-});
-
-const LabelWrapper = React.forwardRef<
-  React.ElementRef<typeof Text>,
-  React.ComponentProps<typeof Text>
->(({ ...props }, ref) => {
-  return <Text {...props} ref={ref} />;
-});
+const SCOPE = 'Radio';
 
-const IconWrapper = React.forwardRef<
-  React.ElementRef<typeof PrimitiveIcon>,
-  React.ComponentProps<typeof PrimitiveIcon>
->(({ ...props }, ref) => {
-  return <PrimitiveIcon {...props} ref={ref} />;
+const UIRadio = createRadio({
+  Root: (Platform.OS === 'web'
+    ? withStyleContext(View, SCOPE)
+    : withStyleContext(Pressable, SCOPE)) as ReturnType<
+    typeof withStyleContext<typeof Pressable>
+  >,
+  Group: View,
+  Icon: UIIcon,
+  Indicator: View,
+  Label: Text,
 });
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
+cssInterop(PrimitiveIcon, {
+  className: {
+    target: 'style',
+    nativeStyleToProp: {
+      height: true,
+      width: true,
+      fill: true,
+      color: 'classNameColor',
+      stroke: true,
     },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
+  },
+});
 
 const radioStyle = tva({
   base: 'group/radio flex-row justify-start items-center web:cursor-pointer data-[disabled=true]:web:cursor-not-allowed',
@@ -149,39 +95,6 @@ const radioLabelStyle = tva({
   },
 });
 
-const SCOPE = 'Radio';
-
-const UIRadio = createRadio({
-  Root: (Platform.OS === 'web'
-    ? withStyleContext(View, SCOPE)
-    : withStyleContextAndStates(Pressable, SCOPE)) as ReturnType<
-    typeof withStyleContextAndStates<typeof Pressable>
-  >,
-  Group: View,
-  Icon: Platform.OS === 'web' ? IconWrapper : withStates(IconWrapper),
-  Indicator:
-    Platform.OS === 'web' ? IndicatorWrapper : withStates(IndicatorWrapper),
-  Label: Platform.OS === 'web' ? LabelWrapper : withStates(LabelWrapper),
-});
-
-cssInterop(UIRadio, { className: 'style' });
-cssInterop(UIRadio.Group, { className: 'style' });
-cssInterop(IndicatorWrapper, { className: 'style' });
-cssInterop(LabelWrapper, { className: 'style' });
-//@ts-ignore
-cssInterop(IconWrapper, {
-  className: {
-    target: 'style',
-    nativeStyleToProp: {
-      height: true,
-      width: true,
-      fill: true,
-      color: 'classNameColor',
-      stroke: true,
-    },
-  },
-});
-
 type IRadioProps = Omit<React.ComponentProps<typeof UIRadio>, 'context'> &
   VariantProps<typeof radioStyle>;
 const Radio = React.forwardRef<React.ElementRef<typeof UIRadio>, IRadioProps>(
diff --git a/universal/packages/components/ui/refresh-control/index.d.ts b/universal/packages/components/ui/refresh-control/index.d.ts
deleted file mode 100644
index cd7c6663..00000000
--- a/universal/packages/components/ui/refresh-control/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { RefreshControl } from 'react-native';
diff --git a/universal/packages/components/ui/refresh-control/index.jsx b/universal/packages/components/ui/refresh-control/index.jsx
deleted file mode 100644
index 761bf777..00000000
--- a/universal/packages/components/ui/refresh-control/index.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-'use client';
-export { RefreshControl } from 'react-native';
diff --git a/universal/packages/components/ui/safe-area-view/index.d.ts b/universal/packages/components/ui/safe-area-view/index.d.ts
deleted file mode 100644
index cb948c8d..00000000
--- a/universal/packages/components/ui/safe-area-view/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { SafeAreaView } from 'react-native';
diff --git a/universal/packages/components/ui/safe-area-view/index.jsx b/universal/packages/components/ui/safe-area-view/index.jsx
deleted file mode 100644
index 10df75d7..00000000
--- a/universal/packages/components/ui/safe-area-view/index.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-'use client';
-export { SafeAreaView } from 'react-native';
diff --git a/universal/packages/components/ui/scroll-view/index.d.ts b/universal/packages/components/ui/scroll-view/index.d.ts
deleted file mode 100644
index dbc6258f..00000000
--- a/universal/packages/components/ui/scroll-view/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ScrollView } from 'react-native';
diff --git a/universal/packages/components/ui/scroll-view/index.jsx b/universal/packages/components/ui/scroll-view/index.jsx
deleted file mode 100644
index 22bd5633..00000000
--- a/universal/packages/components/ui/scroll-view/index.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-'use client';
-export { ScrollView } from 'react-native';
diff --git a/universal/packages/components/ui/section-list/index.d.ts b/universal/packages/components/ui/section-list/index.d.ts
deleted file mode 100644
index cf549c9c..00000000
--- a/universal/packages/components/ui/section-list/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { SectionList } from 'react-native';
diff --git a/universal/packages/components/ui/section-list/index.jsx b/universal/packages/components/ui/section-list/index.jsx
deleted file mode 100644
index fc1058b4..00000000
--- a/universal/packages/components/ui/section-list/index.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-'use client';
-export { SectionList } from 'react-native';
diff --git a/universal/packages/components/ui/select/index.d.ts b/universal/packages/components/ui/select/index.d.ts
deleted file mode 100644
index d738eba3..00000000
--- a/universal/packages/components/ui/select/index.d.ts
+++ /dev/null
@@ -1,1388 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { View } from 'react-native';
-declare const Select: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & import("react-native").ViewProps & import("@gluestack-ui/select/lib/typescript/types").ISelectProps & React.RefAttributes<import("react-native").ViewProps> & {
-    className?: string | undefined;
-}, "ref"> & React.RefAttributes<unknown>>;
-declare const SelectTrigger: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-} | ({
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-} & {
-    size: {
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    variant: {
-        underlined: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        outline: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        rounded: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "border border-background-300 rounded flex-row items-center overflow-hidden data-[hover=true]:border-outline-400 data-[focus=true]:border-primary-700 data-[disabled=true]:opacity-40 data-[disabled=true]:data-[hover=true]:border-background-300", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}, {
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}>, {
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}, undefined, "border border-background-300 rounded flex-row items-center overflow-hidden data-[hover=true]:border-outline-400 data-[focus=true]:border-primary-700 data-[disabled=true]:opacity-40 data-[disabled=true]:data-[hover=true]:border-background-300", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}, {
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}>, unknown, unknown, undefined>>> & Omit<import("react-native").PressableProps & React.RefAttributes<View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<import("react-native").PressableProps & React.RefAttributes<View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>> & {
-    className?: string | undefined;
-}, "ref"> & React.RefAttributes<unknown>>;
-declare const SelectInput: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-    };
-    variant: {
-        underlined: string;
-        outline: string;
-        rounded: string;
-    };
-}, undefined, "py-auto px-3 placeholder:text-typography-500 flex-1 web:w-full h-full text-typography-900 pointer-events-none web:outline-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "py-auto px-3 placeholder:text-typography-500 flex-1 web:w-full h-full text-typography-900 pointer-events-none web:outline-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & import("react-native").TextInputProps & React.RefAttributes<import("react-native").TextInputProps> & {
-    className?: string | undefined;
-}, "ref"> & React.RefAttributes<unknown>>;
-declare const SelectIcon: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, "", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & Omit<any, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<any, "ref"> & React.RefAttributes<unknown>> & {
-    as?: any;
-    color?: string | undefined;
-    fill?: string | undefined;
-    className?: any;
-}, "ref"> & React.RefAttributes<unknown>>;
-declare const SelectPortal: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-full web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-full web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & import("react-native").ViewProps & React.RefAttributes<import("react-native").ViewProps> & import("@gluestack-ui/actionsheet/lib/typescript/types").InterfaceActionsheetProps, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-full web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-full web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & import("react-native").ViewProps & React.RefAttributes<import("react-native").ViewProps> & import("@gluestack-ui/actionsheet/lib/typescript/types").InterfaceActionsheetProps, "ref"> & React.RefAttributes<unknown>>>;
-declare const SelectBackdrop: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default web:pointer-events-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default web:pointer-events-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown>> & import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown> & {
-    className?: string | undefined;
-}, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default web:pointer-events-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default web:pointer-events-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown>> & import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown> & {
-    className?: string | undefined;
-}, "ref"> & React.RefAttributes<unknown>>>;
-declare const SelectContent: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "items-center rounded-tl-3xl rounded-tr-3xl p-2 bg-background-0 web:pointer-events-auto web:select-none shadow-lg", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "items-center rounded-tl-3xl rounded-tr-3xl p-2 bg-background-0 web:pointer-events-auto web:select-none shadow-lg", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & Omit<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>> & import("@gluestack-ui/actionsheet/lib/typescript/types").InterfaceActionsheetContentProps & {
-    className?: string | undefined;
-}, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "items-center rounded-tl-3xl rounded-tr-3xl p-2 bg-background-0 web:pointer-events-auto web:select-none shadow-lg", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "items-center rounded-tl-3xl rounded-tr-3xl p-2 bg-background-0 web:pointer-events-auto web:select-none shadow-lg", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & Omit<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>> & import("@gluestack-ui/actionsheet/lib/typescript/types").InterfaceActionsheetContentProps & {
-    className?: string | undefined;
-}, "ref"> & React.RefAttributes<unknown>>>;
-declare const SelectDragIndicator: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-16 h-1 bg-background-400 rounded-full", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-16 h-1 bg-background-400 rounded-full", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-16 h-1 bg-background-400 rounded-full", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-16 h-1 bg-background-400 rounded-full", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps, "ref"> & React.RefAttributes<unknown>>>;
-declare const SelectDragIndicatorWrapper: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full py-1 items-center", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full py-1 items-center", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full py-1 items-center", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full py-1 items-center", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps, "ref"> & React.RefAttributes<unknown>>>;
-declare const SelectItem: React.ForwardRefExoticComponent<import("@gluestack-ui/select/lib/typescript/types").ISelectItemProps & Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full flex-row items-center p-3 rounded-sm data-[disabled=true]:opacity-40 data-[disabled=true]:web:pointer-events-auto data-[disabled=true]:web:cursor-not-allowed hover:bg-background-50 active:bg-background-100 data-[focus=true]:bg-background-100 web:data-[focus-visible=true]:bg-background-100 data-[checked=true]:bg-background-100", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full flex-row items-center p-3 rounded-sm data-[disabled=true]:opacity-40 data-[disabled=true]:web:pointer-events-auto data-[disabled=true]:web:cursor-not-allowed hover:bg-background-50 active:bg-background-100 data-[focus=true]:bg-background-100 web:data-[focus-visible=true]:bg-background-100 data-[checked=true]:bg-background-100", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & Omit<import("react-native").PressableProps & React.RefAttributes<View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown> & import("@gluestack-ui/actionsheet/lib/typescript/types").InterfaceActionsheetItemProps & React.RefAttributes<Omit<import("react-native").PressableProps & React.RefAttributes<View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>>, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full flex-row items-center p-3 rounded-sm data-[disabled=true]:opacity-40 data-[disabled=true]:web:pointer-events-auto data-[disabled=true]:web:cursor-not-allowed hover:bg-background-50 active:bg-background-100 data-[focus=true]:bg-background-100 web:data-[focus-visible=true]:bg-background-100 data-[checked=true]:bg-background-100", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full flex-row items-center p-3 rounded-sm data-[disabled=true]:opacity-40 data-[disabled=true]:web:pointer-events-auto data-[disabled=true]:web:cursor-not-allowed hover:bg-background-50 active:bg-background-100 data-[focus=true]:bg-background-100 web:data-[focus-visible=true]:bg-background-100 data-[checked=true]:bg-background-100", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & Omit<import("react-native").PressableProps & React.RefAttributes<View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown> & import("@gluestack-ui/actionsheet/lib/typescript/types").InterfaceActionsheetItemProps & React.RefAttributes<Omit<import("react-native").PressableProps & React.RefAttributes<View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>>, "ref"> & React.RefAttributes<unknown>>>;
-declare const SelectItemText: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-typography-700 font-normal font-body tracking-md text-left mx-2", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, undefined, "text-typography-700 font-normal font-body tracking-md text-left mx-2", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").TextProps> & import("react-native").TextProps, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-typography-700 font-normal font-body tracking-md text-left mx-2", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, undefined, "text-typography-700 font-normal font-body tracking-md text-left mx-2", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").TextProps> & import("react-native").TextProps, "ref"> & React.RefAttributes<unknown>>>;
-declare const SelectScrollView: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").ScrollViewProps> & import("react-native").ScrollViewProps, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").ScrollViewProps> & import("react-native").ScrollViewProps, "ref"> & React.RefAttributes<unknown>>>;
-declare const SelectVirtualizedList: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").VirtualizedListProps<unknown>> & import("react-native").VirtualizedListProps<unknown>, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").VirtualizedListProps<unknown>> & import("react-native").VirtualizedListProps<unknown>, "ref"> & React.RefAttributes<unknown>>>;
-declare const SelectFlatList: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").FlatListProps<unknown>> & import("react-native").FlatListProps<unknown>, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").FlatListProps<unknown>> & import("react-native").FlatListProps<unknown>, "ref"> & React.RefAttributes<unknown>>>;
-declare const SelectSectionList: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").SectionListProps<unknown, unknown>> & import("react-native").SectionListProps<unknown, unknown>, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").SectionListProps<unknown, unknown>> & import("react-native").SectionListProps<unknown, unknown>, "ref"> & React.RefAttributes<unknown>>>;
-declare const SelectSectionHeaderText: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "leading-5 font-bold font-heading my-0 text-typography-500 p-3 uppercase", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "leading-5 font-bold font-heading my-0 text-typography-500 p-3 uppercase", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>> & React.RefAttributes<import("@expo/html-elements/build/primitives/Text").TextProps> & Omit<import("react-native").TextProps & React.ClassAttributes<typeof import("react-native").Text>, "style"> & import("@expo/html-elements/build/primitives/Text").WebTextProps, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "leading-5 font-bold font-heading my-0 text-typography-500 p-3 uppercase", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "leading-5 font-bold font-heading my-0 text-typography-500 p-3 uppercase", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>> & React.RefAttributes<import("@expo/html-elements/build/primitives/Text").TextProps> & Omit<import("react-native").TextProps & React.ClassAttributes<typeof import("react-native").Text>, "style"> & import("@expo/html-elements/build/primitives/Text").WebTextProps, "ref"> & React.RefAttributes<unknown>>>;
-export { Select, SelectTrigger, SelectInput, SelectIcon, SelectPortal, SelectBackdrop, SelectContent, SelectDragIndicator, SelectDragIndicatorWrapper, SelectItem, SelectItemText, SelectScrollView, SelectVirtualizedList, SelectFlatList, SelectSectionList, SelectSectionHeaderText, };
diff --git a/universal/packages/components/ui/select/index.jsx b/universal/packages/components/ui/select/index.jsx
deleted file mode 100644
index 43f2f1c2..00000000
--- a/universal/packages/components/ui/select/index.jsx
+++ /dev/null
@@ -1,164 +0,0 @@
-import React, { useMemo } from 'react';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { Svg } from 'react-native-svg';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { createSelect } from '@gluestack-ui/select';
-import { cssInterop } from 'nativewind';
-import { Actionsheet, ActionsheetContent, ActionsheetItem, ActionsheetItemText, ActionsheetDragIndicator, ActionsheetDragIndicatorWrapper, ActionsheetBackdrop, ActionsheetScrollView, ActionsheetVirtualizedList, ActionsheetFlatList, ActionsheetSectionList, ActionsheetSectionHeaderText, } from './select-actionsheet';
-import { Pressable, View, TextInput, Platform } from 'react-native';
-/** Select Components */
-const selectIconStyle = tva({
-    base: '',
-    parentVariants: {
-        size: {
-            '2xs': 'h-3 w-3',
-            'xs': 'h-3.5 w-3.5',
-            'sm': 'h-4 w-4',
-            'md': 'h-[18px] w-[18px]',
-            'lg': 'h-5 w-5',
-            'xl': 'h-6 w-6',
-        },
-    },
-});
-const selectStyle = tva({
-    base: '',
-});
-const selectTriggerStyle = tva({
-    base: 'border border-background-300 rounded flex-row items-center overflow-hidden data-[hover=true]:border-outline-400 data-[focus=true]:border-primary-700 data-[disabled=true]:opacity-40 data-[disabled=true]:data-[hover=true]:border-background-300',
-    variants: {
-        size: {
-            xl: 'h-12',
-            lg: 'h-11',
-            md: 'h-10',
-            sm: 'h-9',
-        },
-        variant: {
-            underlined: 'border-0 border-b rounded-none data-[hover=true]:border-primary-700 data-[focus=true]:border-primary-700 data-[focus=true]:web:shadow-[inset_0_-1px_0_0] data-[focus=true]:web:shadow-primary-700 data-[invalid=true]:border-error-700 data-[invalid=true]:web:shadow-error-700',
-            outline: 'data-[focus=true]:border-primary-700 data-[focus=true]:web:shadow-[inset_0_0_0_1px] data-[focus=true]:data-[hover=true]:web:shadow-primary-600 data-[invalid=true]:web:shadow-[inset_0_0_0_1px] data-[invalid=true]:border-error-700 data-[invalid=true]:web:shadow-error-700 data-[invalid=true]:data-[hover=true]:border-error-700',
-            rounded: 'rounded-full data-[focus=true]:border-primary-700 data-[focus=true]:web:shadow-[inset_0_0_0_1px] data-[focus=true]:web:shadow-primary-700 data-[invalid=true]:border-error-700 data-[invalid=true]:web:shadow-error-700',
-        },
-    },
-});
-const selectInputStyle = tva({
-    base: 'py-auto px-3 placeholder:text-typography-500 flex-1 web:w-full h-full text-typography-900 pointer-events-none web:outline-none',
-    parentVariants: {
-        size: {
-            xl: 'text-xl leading-[0px]',
-            lg: 'text-lg leading-[0px]',
-            md: 'text-base leading-[0px]',
-            sm: 'text-sm leading-[0px]',
-        },
-        variant: {
-            underlined: 'px-0',
-            outline: '',
-            rounded: 'px-4',
-        },
-    },
-});
-const PrimitiveIcon = React.forwardRef(({ height, width, fill = 'none', color, size, as: AsComp, ...props }, ref) => {
-    const sizeProps = useMemo(() => {
-        return size ? { size } : { height, width };
-    }, [size, height, width]);
-    if (AsComp) {
-        return (<AsComp ref={ref} fill={fill} color={color} {...props} {...sizeProps}/>);
-    }
-    return (<Svg ref={ref} height={height} width={width} fill={fill} color={color} {...props}/>);
-});
-const UISelect = createSelect({
-    Root: View,
-    // @ts-ignore
-    Trigger: Platform.OS === 'web'
-        ? withStyleContext(Pressable)
-        : withStyleContextAndStates(Pressable),
-    Input: TextInput,
-    Icon: PrimitiveIcon,
-}, {
-    Portal: Actionsheet,
-    Backdrop: ActionsheetBackdrop,
-    Content: ActionsheetContent,
-    DragIndicator: ActionsheetDragIndicator,
-    DragIndicatorWrapper: ActionsheetDragIndicatorWrapper,
-    Item: ActionsheetItem,
-    ItemText: ActionsheetItemText,
-    ScrollView: ActionsheetScrollView,
-    VirtualizedList: ActionsheetVirtualizedList,
-    FlatList: ActionsheetFlatList,
-    SectionList: ActionsheetSectionList,
-    SectionHeaderText: ActionsheetSectionHeaderText,
-});
-cssInterop(UISelect, { className: 'style' });
-cssInterop(UISelect.Input, { className: 'style' });
-cssInterop(UISelect.Trigger, { className: 'style' });
-// @ts-ignore
-cssInterop(UISelect.Icon, {
-    className: {
-        target: 'style',
-        nativeStyleToProp: {
-            height: 'height',
-            width: 'width',
-            //@ts-ignore
-            fill: 'fill',
-            color: 'color',
-        },
-    },
-});
-const Select = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UISelect className={selectStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const SelectTrigger = React.forwardRef(({ className, size = 'md', variant = 'outline', ...props }, ref) => {
-    return (<UISelect.Trigger className={selectTriggerStyle({
-            class: className,
-            size,
-            variant,
-        })} ref={ref} context={{ size, variant }} {...props}/>);
-});
-const SelectInput = React.forwardRef(({ className, ...props }, ref) => {
-    const { size: parentSize, variant: parentVariant } = useStyleContext();
-    return (<UISelect.Input className={selectInputStyle({
-            class: className,
-            parentVariants: {
-                size: parentSize,
-                variant: parentVariant,
-            },
-        })} ref={ref} {...props}/>);
-});
-const SelectIcon = React.forwardRef(({ className, size, color = 'gray', ...props }, ref) => {
-    const { size: parentSize } = useStyleContext();
-    if (typeof size === 'number') {
-        return (<UISelect.Icon ref={ref} {...props} color={color} className={selectIconStyle({ class: className })} size={size}/>);
-    }
-    else if ((props?.height !== undefined || props?.width !== undefined) &&
-        size === undefined) {
-        return (<UISelect.Icon ref={ref} {...props} color={color} className={selectIconStyle({ class: className })}/>);
-    }
-    return (<UISelect.Icon className={selectIconStyle({
-            class: className,
-            size,
-            parentVariants: {
-                size: parentSize,
-            },
-        })} ref={ref} 
-    //@ts-ignore
-    color={color} {...props}/>);
-});
-Select.displayName = 'Select';
-SelectTrigger.displayName = 'SelectTrigger';
-SelectInput.displayName = 'SelectInput';
-SelectIcon.displayName = 'SelectIcon';
-// Actionsheet Components
-const SelectPortal = UISelect.Portal;
-const SelectBackdrop = UISelect.Backdrop;
-const SelectContent = UISelect.Content;
-const SelectDragIndicator = UISelect.DragIndicator;
-const SelectDragIndicatorWrapper = UISelect.DragIndicatorWrapper;
-const SelectItem = UISelect.Item;
-const SelectItemText = UISelect.ItemText;
-const SelectScrollView = UISelect.ScrollView;
-const SelectVirtualizedList = UISelect.VirtualizedList;
-const SelectFlatList = UISelect.FlatList;
-const SelectSectionList = UISelect.SectionList;
-const SelectSectionHeaderText = UISelect.SectionHeaderText;
-export { Select, SelectTrigger, SelectInput, SelectIcon, SelectPortal, SelectBackdrop, SelectContent, SelectDragIndicator, SelectDragIndicatorWrapper, SelectItem, SelectItemText, SelectScrollView, SelectVirtualizedList, SelectFlatList, SelectSectionList, SelectSectionHeaderText, };
diff --git a/universal/packages/components/ui/select/index.tsx b/universal/packages/components/ui/select/index.tsx
index 2c6ec85f..a81cd3e5 100644
--- a/universal/packages/components/ui/select/index.tsx
+++ b/universal/packages/components/ui/select/index.tsx
@@ -1,7 +1,8 @@
-import React, { useMemo } from 'react';
+'use client';
+
+import React from 'react';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { Svg } from 'react-native-svg';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import {
   withStyleContext,
   useStyleContext,
@@ -23,7 +24,7 @@ import {
   ActionsheetSectionList,
   ActionsheetSectionHeaderText,
 } from './select-actionsheet';
-import { Pressable, View, TextInput, Platform } from 'react-native';
+import { Pressable, View, TextInput } from 'react-native';
 
 const SelectTriggerWrapper = React.forwardRef<
   React.ElementRef<typeof Pressable>,
@@ -87,73 +88,12 @@ const selectInputStyle = tva({
   },
 });
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-  classNameColor?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(
-  (
-    {
-      height,
-      width,
-      fill,
-      color,
-      classNameColor,
-      size,
-      stroke,
-      as: AsComp,
-      ...props
-    },
-    ref
-  ) => {
-    color = color ?? classNameColor;
-    const sizeProps = useMemo(() => {
-      if (size) return { size };
-      if (height && width) return { height, width };
-      if (height) return { height };
-      if (width) return { width };
-      return {};
-    }, [size, height, width]);
-
-    let colorProps = {};
-    if (fill) {
-      colorProps = { ...colorProps, fill: fill };
-    }
-    if (stroke !== 'currentColor') {
-      colorProps = { ...colorProps, stroke: stroke };
-    } else if (stroke === 'currentColor' && color !== undefined) {
-      colorProps = { ...colorProps, stroke: color };
-    }
-
-    if (AsComp) {
-      return <AsComp ref={ref} {...props} {...sizeProps} {...colorProps} />;
-    }
-    return (
-      <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-    );
-  }
-);
-
 const UISelect = createSelect(
   {
     Root: View,
-    Trigger:
-      Platform.OS === 'web'
-        ? withStyleContext(SelectTriggerWrapper)
-        : withStyleContextAndStates(SelectTriggerWrapper),
+    Trigger: withStyleContext(SelectTriggerWrapper),
     Input: TextInput,
-    Icon: PrimitiveIcon,
+    Icon: UIIcon,
   },
   {
     Portal: Actionsheet,
@@ -176,8 +116,8 @@ cssInterop(UISelect.Input, {
   className: { target: 'style', nativeStyleToProp: { textAlign: true } },
 });
 cssInterop(SelectTriggerWrapper, { className: 'style' });
-//@ts-ignore
-cssInterop(UISelect.Icon, {
+
+cssInterop(PrimitiveIcon, {
   className: {
     target: 'style',
     nativeStyleToProp: {
@@ -308,7 +248,6 @@ const SelectContent = UISelect.Content;
 const SelectDragIndicator = UISelect.DragIndicator;
 const SelectDragIndicatorWrapper = UISelect.DragIndicatorWrapper;
 const SelectItem = UISelect.Item;
-const SelectItemText = UISelect.ItemText;
 const SelectScrollView = UISelect.ScrollView;
 const SelectVirtualizedList = UISelect.VirtualizedList;
 const SelectFlatList = UISelect.FlatList;
@@ -326,7 +265,6 @@ export {
   SelectDragIndicator,
   SelectDragIndicatorWrapper,
   SelectItem,
-  SelectItemText,
   SelectScrollView,
   SelectVirtualizedList,
   SelectFlatList,
diff --git a/universal/packages/components/ui/select/select-actionsheet.d.ts b/universal/packages/components/ui/select/select-actionsheet.d.ts
deleted file mode 100644
index e57f7707..00000000
--- a/universal/packages/components/ui/select/select-actionsheet.d.ts
+++ /dev/null
@@ -1,738 +0,0 @@
-import { View } from 'react-native';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import React from 'react';
-export declare const UIActionsheet: import("@gluestack-ui/actionsheet/lib/typescript/types").IActionsheetComponentType<import("react-native").ViewProps, import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown>, Omit<import("react-native").PressableProps & React.RefAttributes<View> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>, import("react-native").TextProps, import("react-native").ViewProps, import("react-native").ViewProps, Omit<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>, import("react-native").ScrollViewProps, import("react-native").VirtualizedListProps<unknown>, import("react-native").FlatListProps<unknown>, import("react-native").SectionListProps<unknown, unknown>, import("@expo/html-elements/build/primitives/Text").TextProps, import("react-native").ViewProps>;
-declare const actionsheetStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-full web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-full web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetItemStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full flex-row items-center p-3 rounded-sm data-[disabled=true]:opacity-40 data-[disabled=true]:web:pointer-events-auto data-[disabled=true]:web:cursor-not-allowed hover:bg-background-50 active:bg-background-100 data-[focus=true]:bg-background-100 web:data-[focus-visible=true]:bg-background-100 data-[checked=true]:bg-background-100", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full flex-row items-center p-3 rounded-sm data-[disabled=true]:opacity-40 data-[disabled=true]:web:pointer-events-auto data-[disabled=true]:web:cursor-not-allowed hover:bg-background-50 active:bg-background-100 data-[focus=true]:bg-background-100 web:data-[focus-visible=true]:bg-background-100 data-[checked=true]:bg-background-100", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetItemTextStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-typography-700 font-normal font-body tracking-md text-left mx-2", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, undefined, "text-typography-700 font-normal font-body tracking-md text-left mx-2", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-}>, unknown, unknown, undefined>>;
-declare const actionsheetDragIndicatorStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-16 h-1 bg-background-400 rounded-full", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-16 h-1 bg-background-400 rounded-full", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetDragIndicatorWrapperStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full py-1 items-center", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full py-1 items-center", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetScrollViewStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetVirtualizedListStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetFlatListStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetSectionListStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-declare const actionsheetSectionHeaderTextStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "leading-5 font-bold font-heading my-0 text-typography-500 p-3 uppercase", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "leading-5 font-bold font-heading my-0 text-typography-500 p-3 uppercase", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '5xl': string;
-        '4xl': string;
-        '3xl': string;
-        '2xl': string;
-        xl: string;
-        lg: string;
-        md: string;
-        sm: string;
-        xs: string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>;
-type IActionsheetProps = VariantProps<typeof actionsheetStyle> & React.ComponentProps<typeof UIActionsheet>;
-type IActionsheetItemProps = VariantProps<typeof actionsheetItemStyle> & React.ComponentProps<typeof UIActionsheet.Item>;
-type IActionsheetItemTextProps = VariantProps<typeof actionsheetItemTextStyle> & React.ComponentProps<typeof UIActionsheet.ItemText>;
-type IActionsheetDragIndicatorProps = VariantProps<typeof actionsheetDragIndicatorStyle> & React.ComponentProps<typeof UIActionsheet.DragIndicator>;
-type IActionsheetDragIndicatorWrapperProps = VariantProps<typeof actionsheetDragIndicatorWrapperStyle> & React.ComponentProps<typeof UIActionsheet.DragIndicatorWrapper>;
-type IActionsheetScrollViewProps = VariantProps<typeof actionsheetScrollViewStyle> & React.ComponentProps<typeof UIActionsheet.ScrollView>;
-type IActionsheetVirtualizedListProps = VariantProps<typeof actionsheetVirtualizedListStyle> & React.ComponentProps<typeof UIActionsheet.VirtualizedList>;
-type IActionsheetFlatListProps = VariantProps<typeof actionsheetFlatListStyle> & React.ComponentProps<typeof UIActionsheet.FlatList>;
-type IActionsheetSectionListProps = VariantProps<typeof actionsheetSectionListStyle> & React.ComponentProps<typeof UIActionsheet.SectionList>;
-type IActionsheetSectionHeaderTextProps = VariantProps<typeof actionsheetSectionHeaderTextStyle> & React.ComponentProps<typeof UIActionsheet.SectionHeaderText>;
-declare const Actionsheet: React.ForwardRefExoticComponent<Omit<IActionsheetProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetContent: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "items-center rounded-tl-3xl rounded-tr-3xl p-2 bg-background-0 web:pointer-events-auto web:select-none shadow-lg", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "items-center rounded-tl-3xl rounded-tr-3xl p-2 bg-background-0 web:pointer-events-auto web:select-none shadow-lg", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & Omit<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown> & React.RefAttributes<Omit<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & {
-    context?: any;
-}, "ref"> & React.RefAttributes<unknown>> & import("@gluestack-ui/actionsheet/lib/typescript/types").InterfaceActionsheetContentProps & {
-    className?: string | undefined;
-}, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetItem: React.ForwardRefExoticComponent<Omit<IActionsheetItemProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetItemText: React.ForwardRefExoticComponent<Omit<IActionsheetItemTextProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetDragIndicator: React.ForwardRefExoticComponent<Omit<IActionsheetDragIndicatorProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetDragIndicatorWrapper: React.ForwardRefExoticComponent<Omit<IActionsheetDragIndicatorWrapperProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetBackdrop: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default web:pointer-events-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default web:pointer-events-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown>> & import("react-native").Animated.AnimatedProps<import("react-native").PressableProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<React.ForwardRefExoticComponent<import("react-native").PressableProps & React.RefAttributes<View>>, import("react-native").ViewStyle | ((state: import("react-native").PressableStateCallbackType) => import("react-native").StyleProp<import("react-native").ViewStyle>), unknown, unknown, unknown> & {
-    className?: string | undefined;
-}, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetScrollView: React.ForwardRefExoticComponent<Omit<IActionsheetScrollViewProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetVirtualizedList: React.ForwardRefExoticComponent<Omit<IActionsheetVirtualizedListProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetFlatList: React.ForwardRefExoticComponent<Omit<IActionsheetFlatListProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetSectionList: React.ForwardRefExoticComponent<Omit<IActionsheetSectionListProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetSectionHeaderText: React.ForwardRefExoticComponent<Omit<IActionsheetSectionHeaderTextProps, "ref"> & React.RefAttributes<unknown>>;
-declare const ActionsheetIcon: React.ForwardRefExoticComponent<Omit<VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-} | ({
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-} & {
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-typography-900", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}>, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, "text-typography-900", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, {
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}>, unknown, unknown, undefined>>> & React.RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps & {
-    as?: any;
-}, "ref"> & React.RefAttributes<unknown>>;
-export { Actionsheet, ActionsheetContent, ActionsheetItem, ActionsheetItemText, ActionsheetDragIndicator, ActionsheetDragIndicatorWrapper, ActionsheetBackdrop, ActionsheetScrollView, ActionsheetVirtualizedList, ActionsheetFlatList, ActionsheetSectionList, ActionsheetSectionHeaderText, ActionsheetIcon, };
diff --git a/universal/packages/components/ui/select/select-actionsheet.jsx b/universal/packages/components/ui/select/select-actionsheet.jsx
deleted file mode 100644
index 50f48a2d..00000000
--- a/universal/packages/components/ui/select/select-actionsheet.jsx
+++ /dev/null
@@ -1,248 +0,0 @@
-import { H4 } from '@expo/html-elements';
-import { createActionsheet } from '@gluestack-ui/actionsheet';
-import { Pressable, View, Text, ScrollView, VirtualizedList, FlatList, SectionList, Platform, } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-import { Motion, AnimatePresence, createMotionAnimatedComponent, } from '@legendapp/motion';
-import React from 'react';
-const AnimatedPressable = createMotionAnimatedComponent(Pressable);
-export const UIActionsheet = createActionsheet({
-    Root: View,
-    Content: withStyleContext(Motion.View),
-    // @ts-ignore
-    Item: Platform.OS === 'web'
-        ? withStyleContext(Pressable)
-        : withStyleContextAndStates(Pressable),
-    ItemText: Text,
-    DragIndicator: View,
-    IndicatorWrapper: View,
-    Backdrop: AnimatedPressable,
-    ScrollView: ScrollView,
-    VirtualizedList: VirtualizedList,
-    FlatList: FlatList,
-    SectionList: SectionList,
-    SectionHeaderText: H4,
-    Icon: View,
-    AnimatePresence: AnimatePresence,
-});
-cssInterop(UIActionsheet, { className: 'style' });
-cssInterop(UIActionsheet.Content, { className: 'style' });
-cssInterop(UIActionsheet.Item, { className: 'style' });
-cssInterop(UIActionsheet.ItemText, { className: 'style' });
-cssInterop(UIActionsheet.DragIndicator, { className: 'style' });
-cssInterop(UIActionsheet.DragIndicatorWrapper, { className: 'style' });
-cssInterop(UIActionsheet.Backdrop, { className: 'style' });
-cssInterop(UIActionsheet.ScrollView, { className: 'style' });
-cssInterop(UIActionsheet.VirtualizedList, { className: 'style' });
-cssInterop(UIActionsheet.FlatList, { className: 'style' });
-cssInterop(UIActionsheet.SectionList, { className: 'style' });
-cssInterop(UIActionsheet.SectionHeaderText, { className: 'style' });
-cssInterop(UIActionsheet.Icon, { className: 'style' });
-const actionsheetStyle = tva({ base: 'w-full h-full web:pointer-events-none' });
-const actionsheetContentStyle = tva({
-    base: 'items-center rounded-tl-3xl rounded-tr-3xl p-2 bg-background-0 web:pointer-events-auto web:select-none shadow-lg',
-});
-const actionsheetItemStyle = tva({
-    base: 'w-full flex-row items-center p-3 rounded-sm data-[disabled=true]:opacity-40 data-[disabled=true]:web:pointer-events-auto data-[disabled=true]:web:cursor-not-allowed hover:bg-background-50 active:bg-background-100 data-[focus=true]:bg-background-100 web:data-[focus-visible=true]:bg-background-100 data-[checked=true]:bg-background-100',
-});
-const actionsheetItemTextStyle = tva({
-    base: 'text-typography-700 font-normal font-body tracking-md text-left mx-2',
-    variants: {
-        isTruncated: {
-            true: '',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-md',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-    },
-    defaultVariants: {
-        size: 'md',
-    },
-});
-const actionsheetDragIndicatorStyle = tva({
-    base: 'w-16 h-1 bg-background-400 rounded-full',
-});
-const actionsheetDragIndicatorWrapperStyle = tva({
-    base: 'w-full py-1 items-center',
-});
-const actionsheetBackdropStyle = tva({
-    base: 'absolute left-0 top-0 right-0 bottom-0 bg-background-dark web:cursor-default web:pointer-events-auto',
-});
-const actionsheetScrollViewStyle = tva({
-    base: 'w-full h-auto',
-});
-const actionsheetVirtualizedListStyle = tva({
-    base: 'w-full h-auto',
-});
-const actionsheetFlatListStyle = tva({
-    base: 'w-full h-auto',
-});
-const actionsheetSectionListStyle = tva({
-    base: 'w-full h-auto',
-});
-const actionsheetSectionHeaderTextStyle = tva({
-    base: 'leading-5 font-bold font-heading my-0 text-typography-500 p-3 uppercase',
-    variants: {
-        isTruncated: {
-            true: '',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '5xl': 'text-5xl',
-            '4xl': 'text-4xl',
-            '3xl': 'text-3xl',
-            '2xl': 'text-2xl',
-            'xl': 'text-xl',
-            'lg': 'text-lg',
-            'md': 'text-md',
-            'sm': 'text-sm',
-            'xs': 'text-xs',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow500',
-        },
-    },
-    defaultVariants: {
-        size: 'xs',
-    },
-});
-const actionsheetIconStyle = tva({
-    base: 'text-typography-900',
-    variants: {
-        size: {
-            '2xs': 'h-3 w-3',
-            'xs': 'h-3.5 w-3.5',
-            'sm': 'h-4 w-4',
-            'md': 'w-4 h-4',
-            'lg': 'h-5 w-5',
-            'xl': 'h-6 w-6',
-        },
-    },
-});
-const Actionsheet = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet className={actionsheetStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetContent = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.Content className={actionsheetContentStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetItem = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.Item className={actionsheetItemStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetItemText = React.forwardRef(({ isTruncated, bold, underline, strikeThrough, size, className, ...props }, ref) => {
-    return (<UIActionsheet.ItemText className={actionsheetItemTextStyle({
-            class: className,
-            isTruncated,
-            bold,
-            underline,
-            strikeThrough,
-            size,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetDragIndicator = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.DragIndicator className={actionsheetDragIndicatorStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetDragIndicatorWrapper = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.DragIndicatorWrapper className={actionsheetDragIndicatorWrapperStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetBackdrop = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.Backdrop initial={{
-            opacity: 0,
-        }} animate={{
-            opacity: 0.5,
-        }} exit={{
-            opacity: 0,
-        }} {...props} className={actionsheetBackdropStyle({
-            class: className,
-        })} ref={ref}/>);
-});
-const ActionsheetScrollView = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.ScrollView className={actionsheetScrollViewStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetVirtualizedList = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.VirtualizedList className={actionsheetVirtualizedListStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetFlatList = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.FlatList className={actionsheetFlatListStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetSectionList = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UIActionsheet.SectionList className={actionsheetSectionListStyle({
-            class: className,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetSectionHeaderText = React.forwardRef(({ className, isTruncated, bold, underline, strikeThrough, size, sub, italic, highlight, ...props }, ref) => {
-    return (<UIActionsheet.SectionHeaderText className={actionsheetSectionHeaderTextStyle({
-            class: className,
-            isTruncated,
-            bold,
-            underline,
-            strikeThrough,
-            size,
-            sub,
-            italic,
-            highlight,
-        })} ref={ref} {...props}/>);
-});
-const ActionsheetIcon = React.forwardRef(({ className, as: AsComp, size = 'sm', ...props }, ref) => {
-    if (AsComp) {
-        return (<AsComp className={actionsheetIconStyle({
-                class: className,
-                size,
-            })} ref={ref} {...props}/>);
-    }
-    return (<UIActionsheet.Icon className={actionsheetIconStyle({
-            class: className,
-            size,
-        })} ref={ref} {...props}/>);
-});
-export { Actionsheet, ActionsheetContent, ActionsheetItem, ActionsheetItemText, ActionsheetDragIndicator, ActionsheetDragIndicatorWrapper, ActionsheetBackdrop, ActionsheetScrollView, ActionsheetVirtualizedList, ActionsheetFlatList, ActionsheetSectionList, ActionsheetSectionHeaderText, ActionsheetIcon, };
diff --git a/universal/packages/components/ui/select/select-actionsheet.tsx b/universal/packages/components/ui/select/select-actionsheet.tsx
index ee3f1ebf..61ab0787 100644
--- a/universal/packages/components/ui/select/select-actionsheet.tsx
+++ b/universal/packages/components/ui/select/select-actionsheet.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import { H4 } from '@expo/html-elements';
 import { createActionsheet } from '@gluestack-ui/actionsheet';
 import {
@@ -8,13 +10,11 @@ import {
   VirtualizedList,
   FlatList,
   SectionList,
-  Platform,
 } from 'react-native';
-
+import { PrimitiveIcon, UIIcon } from '@gluestack-ui/icon';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
 import { cssInterop } from 'nativewind';
 import {
   Motion,
@@ -22,59 +22,14 @@ import {
   createMotionAnimatedComponent,
 } from '@legendapp/motion';
 
-import React, { useMemo } from 'react';
-import { Svg } from 'react-native-svg';
+import React from 'react';
 
 const AnimatedPressable = createMotionAnimatedComponent(Pressable);
 
-type IPrimitiveIcon = {
-  height?: number | string;
-  width?: number | string;
-  fill?: string;
-  color?: string;
-  size?: number | string;
-  stroke?: string;
-  as?: React.ElementType;
-  className?: string;
-};
-
-const PrimitiveIcon = React.forwardRef<
-  React.ElementRef<typeof Svg>,
-  IPrimitiveIcon
->(({ height, width, fill, color, size, stroke, as: AsComp, ...props }, ref) => {
-  const sizeProps = useMemo(() => {
-    if (size) return { size };
-    if (height && width) return { height, width };
-    if (height) return { height };
-    if (width) return { width };
-    return {};
-  }, [size, height, width]);
-
-  let colorProps = {};
-  if (color) {
-    colorProps = { ...colorProps, color: color };
-  }
-  if (stroke) {
-    colorProps = { ...colorProps, stroke: stroke };
-  }
-  if (fill) {
-    colorProps = { ...colorProps, fill: fill };
-  }
-  if (AsComp) {
-    return <AsComp ref={ref} {...sizeProps} {...colorProps} {...props} />;
-  }
-  return (
-    <Svg ref={ref} height={height} width={width} {...colorProps} {...props} />
-  );
-});
-
 export const UIActionsheet = createActionsheet({
   Root: View,
   Content: withStyleContext(Motion.View),
-  Item:
-    Platform.OS === 'web'
-      ? withStyleContext(Pressable)
-      : withStyleContextAndStates(Pressable),
+  Item: withStyleContext(Pressable),
   ItemText: Text,
   DragIndicator: View,
   IndicatorWrapper: View,
@@ -84,7 +39,7 @@ export const UIActionsheet = createActionsheet({
   FlatList: FlatList,
   SectionList: SectionList,
   SectionHeaderText: H4,
-  Icon: PrimitiveIcon,
+  Icon: UIIcon,
   AnimatePresence: AnimatePresence,
 });
 
@@ -117,7 +72,18 @@ cssInterop(UIActionsheet.FlatList, {
 });
 cssInterop(UIActionsheet.SectionList, { className: 'style' });
 cssInterop(UIActionsheet.SectionHeaderText, { className: 'style' });
-cssInterop(UIActionsheet.Icon, { className: 'style' });
+cssInterop(PrimitiveIcon, {
+  className: {
+    target: 'style',
+    nativeStyleToProp: {
+      height: true,
+      width: true,
+      fill: true,
+      color: 'classNameColor',
+      stroke: true,
+    },
+  },
+});
 
 const actionsheetStyle = tva({ base: 'w-full h-full web:pointer-events-none' });
 
diff --git a/universal/packages/components/ui/slider/index.d.ts b/universal/packages/components/ui/slider/index.d.ts
deleted file mode 100644
index 0ecf66da..00000000
--- a/universal/packages/components/ui/slider/index.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { View } from 'react-native';
-import React from 'react';
-export declare const UISlider: import("@gluestack-ui/slider/lib/typescript/types").ISliderComponentType<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>, import("react-native").ViewProps, import("react-native").PressableProps & React.RefAttributes<View>, import("react-native").ViewProps>;
-export declare const Slider: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export declare const SliderThumb: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export declare const SliderTrack: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export declare const SliderFilledTrack: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
diff --git a/universal/packages/components/ui/slider/index.jsx b/universal/packages/components/ui/slider/index.jsx
deleted file mode 100644
index f89a7c29..00000000
--- a/universal/packages/components/ui/slider/index.jsx
+++ /dev/null
@@ -1,179 +0,0 @@
-'use client';
-import { createSlider } from '@gluestack-ui/slider';
-import { Pressable } from 'react-native';
-import { View, Platform } from 'react-native';
-import React from 'react';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-const SCOPE = 'SLIDER';
-export const UISlider = createSlider({
-    Root: Platform.OS === 'web'
-        ? withStyleContext(View, SCOPE)
-        : withStyleContextAndStates(View, SCOPE),
-    Thumb: Platform.OS === 'web' ? View : withStates(View),
-    Track: Pressable,
-    FilledTrack: Platform.OS === 'web' ? View : withStates(View),
-    ThumbInteraction: View,
-});
-cssInterop(UISlider, { className: 'style' });
-cssInterop(UISlider.Thumb, { className: 'style' });
-cssInterop(UISlider.Track, { className: 'style' });
-cssInterop(UISlider.FilledTrack, { className: 'style' });
-const sliderStyle = tva({
-    base: 'justify-center items-center data-[disabled=true]:web:opacity-40 data-[disabled=true]:web:pointer-events-none',
-    variants: {
-        orientation: {
-            horizontal: 'w-full',
-            vertical: 'h-full',
-        },
-        isReversed: {
-            true: '',
-            false: '',
-        },
-    },
-});
-const sliderThumbStyle = tva({
-    base: 'bg-primary-500 absolute rounded-full data-[focus=true]:bg-primary-600 data-[active=true]:bg-primary-600 data-[hover=true]:bg-primary-600 data-[disabled=true]:bg-primary-500 web:cursor-pointer web:active:outline-4 web:active:outline web:active:outline-primary-400 data-[focus=true]:web:outline-4 data-[focus=true]:web:outline data-[focus=true]:web:outline-primary-400 shadow',
-    parentVariants: {
-        size: {
-            sm: 'h-4 w-4',
-            md: 'h-5 w-5',
-            lg: 'h-6 w-6',
-        },
-    },
-});
-const sliderTrackStyle = tva({
-    base: 'bg-background-300 rounded-lg overflow-hidden',
-    parentVariants: {
-        orientation: {
-            horizontal: 'w-full',
-            vertical: 'h-full',
-        },
-        isReversed: {
-            true: '',
-            false: '',
-        },
-        size: {
-            sm: '',
-            md: '',
-            lg: '',
-        },
-    },
-    parentCompoundVariants: [
-        {
-            orientation: 'horizontal',
-            size: 'sm',
-            class: 'h-1 flex-row',
-        },
-        {
-            orientation: 'horizontal',
-            size: 'sm',
-            isReversed: true,
-            class: 'h-1 flex-row-reverse',
-        },
-        {
-            orientation: 'horizontal',
-            size: 'md',
-            class: 'h-1 flex-row',
-        },
-        {
-            orientation: 'horizontal',
-            size: 'md',
-            isReversed: true,
-            class: 'h-[5px] flex-row-reverse',
-        },
-        {
-            orientation: 'horizontal',
-            size: 'lg',
-            class: 'h-1.5 flex-row',
-        },
-        {
-            orientation: 'horizontal',
-            size: 'lg',
-            isReversed: true,
-            class: 'h-1.5 flex-row-reverse',
-        },
-        {
-            orientation: 'vertical',
-            size: 'sm',
-            class: 'w-1 flex-col-reverse',
-        },
-        {
-            orientation: 'vertical',
-            size: 'sm',
-            isReversed: true,
-            class: 'w-1 flex-col',
-        },
-        {
-            orientation: 'vertical',
-            size: 'md',
-            class: 'w-[5px] flex-col-reverse',
-        },
-        {
-            orientation: 'vertical',
-            size: 'md',
-            isReversed: true,
-            class: 'w-[5px] flex-col',
-        },
-        {
-            orientation: 'vertical',
-            size: 'lg',
-            class: 'w-1.5 flex-col-reverse',
-        },
-        {
-            orientation: 'vertical',
-            size: 'lg',
-            isReversed: true,
-            class: 'w-1.5 flex-col',
-        },
-    ],
-});
-const sliderFilledTrackStyle = tva({
-    base: 'bg-primary-500 data-[focus=true]:bg-primary-600 data-[active=true]:bg-primary-600 data-[hover=true]:bg-primary-600',
-    parentVariants: {
-        orientation: {
-            horizontal: 'h-full',
-            vertical: 'w-full',
-        },
-    },
-});
-export const Slider = React.forwardRef(({ className, size = 'md', orientation = 'horizontal', isReversed = false, ...props }, ref) => {
-    return (<UISlider ref={ref} isReversed={isReversed} orientation={orientation} {...props} className={sliderStyle({
-            orientation,
-            isReversed,
-            class: className,
-        })} context={{ size, orientation, isReversed }}/>);
-});
-export const SliderThumb = React.forwardRef(({ className, size, ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UISlider.Thumb ref={ref} {...props} className={sliderThumbStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            size,
-            class: className,
-        })}/>);
-});
-export const SliderTrack = React.forwardRef(({ className, ...props }, ref) => {
-    const { orientation: parentOrientation, size: parentSize, isReversed, } = useStyleContext(SCOPE);
-    return (<UISlider.Track ref={ref} {...props} className={sliderTrackStyle({
-            parentVariants: {
-                orientation: parentOrientation,
-                size: parentSize,
-                isReversed,
-            },
-            class: className,
-        })}/>);
-});
-export const SliderFilledTrack = React.forwardRef(({ className, ...props }, ref) => {
-    const { orientation: parentOrientation } = useStyleContext(SCOPE);
-    return (<UISlider.FilledTrack ref={ref} {...props} className={sliderFilledTrackStyle({
-            parentVariants: {
-                orientation: parentOrientation,
-            },
-            class: className,
-        })}/>);
-});
diff --git a/universal/packages/components/ui/slider/index.tsx b/universal/packages/components/ui/slider/index.tsx
index 455ccd2c..77c70c6d 100644
--- a/universal/packages/components/ui/slider/index.tsx
+++ b/universal/packages/components/ui/slider/index.tsx
@@ -1,47 +1,30 @@
 'use client';
 import { createSlider } from '@gluestack-ui/slider';
 import { Pressable } from 'react-native';
-import { View, Platform } from 'react-native';
+import { View } from 'react-native';
 import React from 'react';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-
-const ThumbWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->((props, ref) => <View ref={ref} {...props} />);
-
-const FilledTrackWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->((props, ref) => <View ref={ref} {...props} />);
+import { cssInterop } from 'nativewind';
 
 const SCOPE = 'SLIDER';
+const Root = withStyleContext(View, SCOPE);
 export const UISlider = createSlider({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(View, SCOPE),
-  Thumb: Platform.OS === 'web' ? ThumbWrapper : withStates(View),
+  Root: Root,
+  Thumb: View,
   Track: Pressable,
-  FilledTrack: Platform.OS === 'web' ? FilledTrackWrapper : withStates(View),
+  FilledTrack: View,
   ThumbInteraction: View,
 });
 
-cssInterop(UISlider, { className: 'style' });
-cssInterop(ThumbWrapper, { className: 'style' });
 cssInterop(UISlider.Track, { className: 'style' });
-cssInterop(FilledTrackWrapper, { className: 'style' });
 
 const sliderStyle = tva({
-  base: 'justify-center items-center data-[disabled=true]:web:opacity-40 data-[disabled=true]:web:pointer-events-none',
+  base: 'justify-center items-center data-[disabled=true]:opacity-40 data-[disabled=true]:web:pointer-events-none',
   variants: {
     orientation: {
       horizontal: 'w-full',
@@ -60,7 +43,7 @@ const sliderStyle = tva({
 });
 
 const sliderThumbStyle = tva({
-  base: 'bg-primary-500 absolute rounded-full data-[focus=true]:bg-primary-600 data-[active=true]:bg-primary-600 data-[hover=true]:bg-primary-600 data-[disabled=true]:bg-primary-500 web:cursor-pointer web:active:outline-4 web:active:outline web:active:outline-primary-400 data-[focus=true]:web:outline-4 data-[focus=true]:web:outline data-[focus=true]:web:outline-primary-400 shadow-hard-1',
+  base: 'bg-primary-500 absolute rounded-full data-[focus=true]:bg-primary-600 data-[active=true]:bg-primary-600 data-[hover=true]:bg-primary-600 data-[disabled=true]:bg-primary-500 web:cursor-pointer web:data-[active=true]:outline web:data-[active=true]:outline-4 web:data-[active=true]:outline-primary-400 shadow-hard-1',
 
   parentVariants: {
     size: {
@@ -213,7 +196,6 @@ export const SliderThumb = React.forwardRef<
 
   return (
     <UISlider.Thumb
-      //@ts-ignore
       ref={ref}
       {...props}
       className={sliderThumbStyle({
@@ -269,7 +251,6 @@ export const SliderFilledTrack = React.forwardRef<
 
   return (
     <UISlider.FilledTrack
-      //@ts-ignore
       ref={ref}
       {...props}
       className={sliderFilledTrackStyle({
diff --git a/universal/packages/components/ui/spinner/index.d.ts b/universal/packages/components/ui/spinner/index.d.ts
deleted file mode 100644
index ab8ef0b4..00000000
--- a/universal/packages/components/ui/spinner/index.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import React from 'react';
-declare const Spinner: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export { Spinner };
diff --git a/universal/packages/components/ui/spinner/index.jsx b/universal/packages/components/ui/spinner/index.jsx
deleted file mode 100644
index db2ef39f..00000000
--- a/universal/packages/components/ui/spinner/index.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-'use client';
-import { ActivityIndicator } from 'react-native';
-import React from 'react';
-import { createSpinner } from '@gluestack-ui/spinner';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-const UISpinner = createSpinner({ Root: ActivityIndicator });
-cssInterop(UISpinner, { className: 'style' });
-const spinnerStyle = tva({});
-const Spinner = React.forwardRef(({ className, color, ...props }, ref) => {
-    return (<UISpinner ref={ref} {...props} color={color} className={spinnerStyle({ class: className })}/>);
-});
-Spinner.displayName = 'Spinner';
-export { Spinner };
diff --git a/universal/packages/components/ui/spinner/index.tsx b/universal/packages/components/ui/spinner/index.tsx
index 8f6a7c51..19e88207 100644
--- a/universal/packages/components/ui/spinner/index.tsx
+++ b/universal/packages/components/ui/spinner/index.tsx
@@ -1,33 +1,41 @@
 'use client';
 import { ActivityIndicator } from 'react-native';
 import React from 'react';
-import { createSpinner } from '@gluestack-ui/spinner';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { cssInterop } from 'nativewind';
 
-const UISpinner = createSpinner({ Root: ActivityIndicator });
-
-cssInterop(UISpinner, {
+cssInterop(ActivityIndicator, {
   className: { target: 'style', nativeStyleToProp: { color: true } },
 });
 
 const spinnerStyle = tva({});
 
-type ISpinnerProps = React.ComponentProps<typeof UISpinner>;
-
 const Spinner = React.forwardRef<
-  React.ElementRef<typeof UISpinner>,
-  ISpinnerProps
->(({ className, color, ...props }, ref) => {
-  return (
-    <UISpinner
-      ref={ref}
-      {...props}
-      color={color}
-      className={spinnerStyle({ class: className })}
-    />
-  );
-});
+  React.ElementRef<typeof ActivityIndicator>,
+  React.ComponentProps<typeof ActivityIndicator>
+>(
+  (
+    {
+      className,
+      color,
+      focusable = false,
+      'aria-label': ariaLabel = 'loading',
+      ...props
+    },
+    ref
+  ) => {
+    return (
+      <ActivityIndicator
+        ref={ref}
+        focusable={focusable}
+        aria-label={ariaLabel}
+        {...props}
+        color={color}
+        className={spinnerStyle({ class: className })}
+      />
+    );
+  }
+);
 
 Spinner.displayName = 'Spinner';
 
diff --git a/universal/packages/components/ui/status-bar/index.d.ts b/universal/packages/components/ui/status-bar/index.d.ts
deleted file mode 100644
index b73ed6b0..00000000
--- a/universal/packages/components/ui/status-bar/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { StatusBar } from 'react-native';
diff --git a/universal/packages/components/ui/status-bar/index.jsx b/universal/packages/components/ui/status-bar/index.jsx
deleted file mode 100644
index 3a61fac5..00000000
--- a/universal/packages/components/ui/status-bar/index.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-'use client';
-export { StatusBar } from 'react-native';
diff --git a/universal/packages/components/ui/switch/index.d.ts b/universal/packages/components/ui/switch/index.d.ts
deleted file mode 100644
index 2f51f210..00000000
--- a/universal/packages/components/ui/switch/index.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const Switch: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").SwitchProps & {
-    context?: any;
-} & React.RefAttributes<unknown> & import("@gluestack-ui/switch/lib/typescript/types").IInterfaceSwitchProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-} | ({
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-} & {
-    size: {
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "data-[focus=true]:outline-0 data-[focus=true]:ring-2 data-[focus=true]:ring-primary-700 web:cursor-pointer disabled:cursor-not-allowed data-[disabled=true]:opacity-40 data-[invalid=true]:border-error-700 data-[invalid=true]:rounded-xl data-[invalid=true]:border-2", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}>, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, undefined, "data-[focus=true]:outline-0 data-[focus=true]:ring-2 data-[focus=true]:ring-primary-700 web:cursor-pointer disabled:cursor-not-allowed data-[disabled=true]:opacity-40 data-[invalid=true]:border-error-700 data-[invalid=true]:rounded-xl data-[invalid=true]:border-2", import("tailwind-variants/dist/config").TVConfig<{
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}, {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Switch };
diff --git a/universal/packages/components/ui/switch/index.jsx b/universal/packages/components/ui/switch/index.jsx
deleted file mode 100644
index 1a17f2fd..00000000
--- a/universal/packages/components/ui/switch/index.jsx
+++ /dev/null
@@ -1,29 +0,0 @@
-'use client';
-import React from 'react';
-import { Switch as RNSwitch, Platform } from 'react-native';
-import { createSwitch } from '@gluestack-ui/switch';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-const UISwitch = createSwitch({
-    Root: Platform.OS === 'web'
-        ? withStyleContext(RNSwitch)
-        : withStyleContextAndStates(RNSwitch),
-});
-cssInterop(UISwitch, { className: 'style' });
-const switchStyle = tva({
-    base: 'data-[focus=true]:outline-0 data-[focus=true]:ring-2 data-[focus=true]:ring-primary-700 web:cursor-pointer disabled:cursor-not-allowed data-[disabled=true]:opacity-40 data-[invalid=true]:border-error-700 data-[invalid=true]:rounded-xl data-[invalid=true]:border-2',
-    variants: {
-        size: {
-            sm: 'scale-75',
-            md: '',
-            lg: 'scale-125',
-        },
-    },
-});
-const Switch = React.forwardRef(({ className, size = 'md', ...props }, ref) => {
-    return (<UISwitch ref={ref} {...props} className={switchStyle({ size, class: className })}/>);
-});
-Switch.displayName = 'Switch';
-export { Switch };
diff --git a/universal/packages/components/ui/switch/index.tsx b/universal/packages/components/ui/switch/index.tsx
index 85d3e6de..c70e6668 100644
--- a/universal/packages/components/ui/switch/index.tsx
+++ b/universal/packages/components/ui/switch/index.tsx
@@ -1,29 +1,15 @@
 'use client';
 import React from 'react';
-import { Switch as RNSwitch, Platform } from 'react-native';
+import { Switch as RNSwitch } from 'react-native';
 import { createSwitch } from '@gluestack-ui/switch';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
-const SwitchWrapper = React.forwardRef<
-  React.ElementRef<typeof RNSwitch>,
-  React.ComponentProps<typeof RNSwitch>
->(({ ...props }, ref) => {
-  return <RNSwitch {...props} ref={ref} />;
-});
-
 const UISwitch = createSwitch({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(SwitchWrapper)
-      : withStyleContextAndStates(SwitchWrapper),
+  Root: withStyleContext(RNSwitch),
 });
 
-cssInterop(SwitchWrapper, { className: 'style' });
-
 const switchStyle = tva({
   base: 'data-[focus=true]:outline-0 data-[focus=true]:ring-2 data-[focus=true]:ring-indicator-primary web:cursor-pointer disabled:cursor-not-allowed data-[disabled=true]:opacity-40 data-[invalid=true]:border-error-700 data-[invalid=true]:rounded-xl data-[invalid=true]:border-2',
 
diff --git a/universal/packages/components/ui/table/index.d.ts b/universal/packages/components/ui/table/index.d.ts
deleted file mode 100644
index f6107b4e..00000000
--- a/universal/packages/components/ui/table/index.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { Text, View } from 'react-native';
-type ITableHeadProps = React.ComponentProps<typeof View | typeof Text> & {
-    useRNView?: boolean;
-};
-type ITableDataProps = React.ComponentProps<typeof View | typeof Text> & {
-    useRNView?: boolean;
-};
-declare const Table: React.ForwardRefExoticComponent<Omit<import("@expo/html-elements/build/primitives/View").WebViewProps & Omit<import("react-native").ViewProps & React.ClassAttributes<typeof View>, "style">, "ref"> & React.RefAttributes<unknown>>;
-declare const TableHeader: React.ForwardRefExoticComponent<Omit<import("@expo/html-elements/build/primitives/View").WebViewProps & Omit<import("react-native").ViewProps & React.ClassAttributes<typeof View>, "style">, "ref"> & React.RefAttributes<unknown>>;
-declare const TableBody: React.ForwardRefExoticComponent<Omit<import("@expo/html-elements/build/primitives/View").WebViewProps & Omit<import("react-native").ViewProps & React.ClassAttributes<typeof View>, "style">, "ref"> & React.RefAttributes<unknown>>;
-declare const TableFooter: React.ForwardRefExoticComponent<Omit<import("@expo/html-elements/build/primitives/View").WebViewProps & Omit<import("react-native").ViewProps & React.ClassAttributes<typeof View>, "style">, "ref"> & React.RefAttributes<unknown>>;
-declare const TableHead: React.ForwardRefExoticComponent<ITableHeadProps & React.RefAttributes<unknown>>;
-declare const TableRow: React.ForwardRefExoticComponent<Omit<import("@expo/html-elements/build/primitives/View").WebViewProps & Omit<import("react-native").ViewProps & React.ClassAttributes<typeof View>, "style">, "ref"> & React.RefAttributes<unknown>>;
-declare const TableData: React.ForwardRefExoticComponent<ITableDataProps & React.RefAttributes<unknown>>;
-declare const TableCaption: React.ForwardRefExoticComponent<Omit<Omit<import("react-native").TextProps & React.ClassAttributes<typeof Text>, "style"> & import("@expo/html-elements/build/primitives/Text").WebTextProps, "ref"> & React.RefAttributes<unknown>>;
-export { Table, TableHeader, TableBody, TableFooter, TableHead, TableRow, TableData, TableCaption, };
diff --git a/universal/packages/components/ui/table/index.jsx b/universal/packages/components/ui/table/index.jsx
deleted file mode 100644
index 2927c115..00000000
--- a/universal/packages/components/ui/table/index.jsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React, { createContext, useMemo, useContext } from 'react';
-import { Table as ExpoTable, THead as ExpoTHead, TBody as ExpoTBody, TFoot as ExpoTFoot, TR as ExpoTR, Caption as ExpoTCaption, } from '@expo/html-elements';
-import { tableStyle, tableHeaderStyle, tableBodyStyle, tableFooterStyle, tableHeadStyle, tableRowStyleStyle, tableDataStyle, tableCaptionStyle, } from './styles';
-import { Text, View } from 'react-native';
-const TableHeaderContext = createContext({});
-const TableFooterContext = createContext({});
-const Table = React.forwardRef(({ className, ...props }, ref) => {
-    return (<ExpoTable ref={ref} className={tableStyle({ class: className })} {...props}/>);
-});
-const TableHeader = React.forwardRef(({ className, ...props }, ref) => {
-    const contextValue = useMemo(() => {
-        return {
-            isHeaderRow: true,
-        };
-    }, []);
-    return (<TableHeaderContext.Provider value={contextValue}>
-        <ExpoTHead ref={ref} className={tableHeaderStyle({ class: className })} {...props}/>
-      </TableHeaderContext.Provider>);
-});
-const TableBody = React.forwardRef(({ className, ...props }, ref) => {
-    return (<ExpoTBody ref={ref} className={tableBodyStyle({ class: className })} {...props}/>);
-});
-const TableFooter = React.forwardRef(({ className, ...props }, ref) => {
-    const contextValue = useMemo(() => {
-        return {
-            isFooterRow: true,
-        };
-    }, []);
-    return (<TableFooterContext.Provider value={contextValue}>
-        <ExpoTFoot ref={ref} className={tableFooterStyle({ class: className })} {...props}/>
-      </TableFooterContext.Provider>);
-});
-const TableHead = React.forwardRef(({ useRNView = false, className, ...props }, ref) => {
-    if (useRNView) {
-        return (<View ref={ref} className={tableHeadStyle({ class: className })} {...props}/>);
-    }
-    else {
-        return (<Text ref={ref} className={tableHeadStyle({ class: className })} {...props}/>);
-    }
-});
-const TableRow = React.forwardRef(({ className, ...props }, ref) => {
-    const { isHeaderRow } = useContext(TableHeaderContext);
-    const { isFooterRow } = useContext(TableFooterContext);
-    return (<ExpoTR ref={ref} className={tableRowStyleStyle({
-            isHeaderRow,
-            isFooterRow,
-            class: className,
-        })} {...props}/>);
-});
-const TableData = React.forwardRef(({ useRNView = false, className, ...props }, ref) => {
-    if (useRNView) {
-        return (<View ref={ref} className={tableDataStyle({ class: className })} {...props}/>);
-    }
-    else {
-        return (<Text ref={ref} className={tableDataStyle({ class: className })} {...props}/>);
-    }
-});
-const TableCaption = React.forwardRef(({ className, ...props }, ref) => {
-    return (<ExpoTCaption ref={ref} className={tableCaptionStyle({ class: className })} {...props}/>);
-});
-Table.displayName = 'Table';
-TableHeader.displayName = 'TableHeader';
-TableBody.displayName = 'TableBody';
-TableFooter.displayName = 'TableFooter';
-TableHead.displayName = 'TableHead';
-TableRow.displayName = 'TableRow';
-TableData.displayName = 'TableData';
-TableCaption.displayName = 'TableCaption';
-export { Table, TableHeader, TableBody, TableFooter, TableHead, TableRow, TableData, TableCaption, };
diff --git a/universal/packages/components/ui/table/index.tsx b/universal/packages/components/ui/table/index.tsx
index 9cdd0f04..10fbd675 100644
--- a/universal/packages/components/ui/table/index.tsx
+++ b/universal/packages/components/ui/table/index.tsx
@@ -7,6 +7,7 @@ import {
   TR as ExpoTR,
   Caption as ExpoTCaption,
 } from '@expo/html-elements';
+
 import {
   tableStyle,
   tableHeaderStyle,
@@ -19,8 +20,16 @@ import {
 } from './styles';
 import { Text, View } from 'react-native';
 
-const TableHeaderContext = createContext<any>({});
-const TableFooterContext = createContext<any>({});
+const TableHeaderContext = createContext<{
+  isHeaderRow: boolean;
+}>({
+  isHeaderRow: false,
+});
+const TableFooterContext = createContext<{
+  isFooterRow: boolean;
+}>({
+  isFooterRow: false,
+});
 
 type ITableProps = React.ComponentProps<typeof ExpoTable>;
 type ITableHeaderProps = React.ComponentProps<typeof ExpoTHead>;
@@ -39,6 +48,7 @@ const Table = React.forwardRef<React.ElementRef<typeof ExpoTable>, ITableProps>(
   ({ className, ...props }, ref) => {
     return (
       <ExpoTable
+        // @ts-expect-error
         ref={ref}
         className={tableStyle({ class: className })}
         {...props}
@@ -59,6 +69,7 @@ const TableHeader = React.forwardRef<
   return (
     <TableHeaderContext.Provider value={contextValue}>
       <ExpoTHead
+        // @ts-expect-error
         ref={ref}
         className={tableHeaderStyle({ class: className })}
         {...props}
@@ -73,6 +84,7 @@ const TableBody = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <ExpoTBody
+      // @ts-expect-error
       ref={ref}
       className={tableBodyStyle({ class: className })}
       {...props}
@@ -92,6 +104,7 @@ const TableFooter = React.forwardRef<
   return (
     <TableFooterContext.Provider value={contextValue}>
       <ExpoTFoot
+        // @ts-expect-error
         ref={ref}
         className={tableFooterStyle({ class: className })}
         {...props}
@@ -132,6 +145,7 @@ const TableRow = React.forwardRef<
 
   return (
     <ExpoTR
+      // @ts-expect-error
       ref={ref}
       className={tableRowStyleStyle({
         isHeaderRow,
@@ -172,6 +186,7 @@ const TableCaption = React.forwardRef<
 >(({ className, ...props }, ref) => {
   return (
     <ExpoTCaption
+      // @ts-expect-error
       ref={ref}
       className={tableCaptionStyle({ class: className })}
       {...props}
diff --git a/universal/packages/components/ui/table/index.web.d.ts b/universal/packages/components/ui/table/index.web.d.ts
deleted file mode 100644
index cca2e7e8..00000000
--- a/universal/packages/components/ui/table/index.web.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react';
-declare const Table: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-declare const TableHeader: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-declare const TableBody: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-declare const TableFooter: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-declare const TableHead: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-declare const TableRow: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-declare const TableData: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-declare const TableCaption: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export { Table, TableHeader, TableBody, TableFooter, TableHead, TableRow, TableData, TableCaption, };
diff --git a/universal/packages/components/ui/table/index.web.jsx b/universal/packages/components/ui/table/index.web.jsx
deleted file mode 100644
index 4408aa7b..00000000
--- a/universal/packages/components/ui/table/index.web.jsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React, { createContext, useMemo, useContext } from 'react';
-import { tableStyle, tableHeaderStyle, tableBodyStyle, tableFooterStyle, tableHeadStyle, tableRowStyleStyle, tableDataStyle, tableCaptionStyle, } from './styles';
-const TableHeaderContext = createContext({});
-const TableFooterContext = createContext({});
-const Table = React.forwardRef(({ className, ...props }, ref) => {
-    return (<table ref={ref} className={tableStyle({ class: className })} {...props}/>);
-});
-const TableHeader = React.forwardRef(({ className, ...props }, ref) => {
-    const contextValue = useMemo(() => {
-        return {
-            isHeaderRow: true,
-        };
-    }, []);
-    return (<TableHeaderContext.Provider value={contextValue}>
-        <thead ref={ref} className={tableHeaderStyle({ class: className })} {...props}/>
-      </TableHeaderContext.Provider>);
-});
-const TableBody = React.forwardRef(({ className, ...props }, ref) => {
-    return (<tbody ref={ref} className={tableBodyStyle({ class: className })} {...props}/>);
-});
-const TableFooter = React.forwardRef(({ className, ...props }, ref) => {
-    const contextValue = useMemo(() => {
-        return {
-            isFooterRow: true,
-        };
-    }, []);
-    return (<TableFooterContext.Provider value={contextValue}>
-        <tfoot ref={ref} className={tableFooterStyle({ class: className })} {...props}/>
-      </TableFooterContext.Provider>);
-});
-const TableHead = React.forwardRef(({ className, ...props }, ref) => {
-    return (<th ref={ref} className={tableHeadStyle({ class: className })} {...props}/>);
-});
-const TableRow = React.forwardRef(({ className, ...props }, ref) => {
-    const { isHeaderRow } = useContext(TableHeaderContext);
-    const { isFooterRow } = useContext(TableFooterContext);
-    return (<tr ref={ref} className={tableRowStyleStyle({
-            isHeaderRow,
-            isFooterRow,
-            class: className,
-        })} {...props}/>);
-});
-const TableData = React.forwardRef(({ className, ...props }, ref) => {
-    return (<td ref={ref} className={tableDataStyle({ class: className })} {...props}/>);
-});
-const TableCaption = React.forwardRef(({ className, ...props }, ref) => {
-    return (<caption ref={ref} className={tableCaptionStyle({ class: className })} {...props}/>);
-});
-Table.displayName = 'Table';
-TableHeader.displayName = 'TableHeader';
-TableBody.displayName = 'TableBody';
-TableFooter.displayName = 'TableFooter';
-TableHead.displayName = 'TableHead';
-TableRow.displayName = 'TableRow';
-TableData.displayName = 'TableData';
-TableCaption.displayName = 'TableCaption';
-export { Table, TableHeader, TableBody, TableFooter, TableHead, TableRow, TableData, TableCaption, };
diff --git a/universal/packages/components/ui/table/index.web.tsx b/universal/packages/components/ui/table/index.web.tsx
index a6a3a79a..e8c848f0 100644
--- a/universal/packages/components/ui/table/index.web.tsx
+++ b/universal/packages/components/ui/table/index.web.tsx
@@ -10,8 +10,16 @@ import {
   tableCaptionStyle,
 } from './styles';
 
-const TableHeaderContext = createContext<any>({});
-const TableFooterContext = createContext<any>({});
+const TableHeaderContext = createContext<{
+  isHeaderRow: boolean;
+}>({
+  isHeaderRow: false,
+});
+const TableFooterContext = createContext<{
+  isFooterRow: boolean;
+}>({
+  isFooterRow: false,
+});
 
 const Table = React.forwardRef(({ className, ...props }: any, ref?: any) => {
   return (
diff --git a/universal/packages/components/ui/table/styles.d.ts b/universal/packages/components/ui/table/styles.d.ts
deleted file mode 100644
index b3bd6edf..00000000
--- a/universal/packages/components/ui/table/styles.d.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-export declare const tableStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "table border-collapse border-collapse w-[800px]", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "table border-collapse border-collapse w-[800px]", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-export declare const tableHeaderStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-export declare const tableBodyStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-export declare const tableFooterStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-export declare const tableHeadStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "flex-1 px-6 py-[14px] text-left font-bold text-[16px] leading-[22px] text-typography-800 font-roboto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "flex-1 px-6 py-[14px] text-left font-bold text-[16px] leading-[22px] text-typography-800 font-roboto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-export declare const tableRowStyleStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isHeaderRow: {
-        true: string;
-    };
-    isFooterRow: {
-        true: string;
-    };
-} | ({
-    isHeaderRow: {
-        true: string;
-    };
-    isFooterRow: {
-        true: string;
-    };
-} & {
-    isHeaderRow: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    isFooterRow: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "border-0 border-b border-solid border-outline-200 bg-background-0", import("tailwind-variants/dist/config").TVConfig<{
-    isHeaderRow: {
-        true: string;
-    };
-    isFooterRow: {
-        true: string;
-    };
-}, {
-    isHeaderRow: {
-        true: string;
-    };
-    isFooterRow: {
-        true: string;
-    };
-}>, {
-    isHeaderRow: {
-        true: string;
-    };
-    isFooterRow: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isHeaderRow: {
-        true: string;
-    };
-    isFooterRow: {
-        true: string;
-    };
-}, undefined, "border-0 border-b border-solid border-outline-200 bg-background-0", import("tailwind-variants/dist/config").TVConfig<{
-    isHeaderRow: {
-        true: string;
-    };
-    isFooterRow: {
-        true: string;
-    };
-}, {
-    isHeaderRow: {
-        true: string;
-    };
-    isFooterRow: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>;
-export declare const tableDataStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "flex-1 px-6 py-[14px] text-left text-[16px] font-medium leading-[22px] text-typography-800 font-roboto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "flex-1 px-6 py-[14px] text-left text-[16px] font-medium leading-[22px] text-typography-800 font-roboto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
-export declare const tableCaptionStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, " px-6 py-[14px] text-[16px] font-normal leading-[22px] text-typography-800 bg-background-50 font-roboto" | "caption-bottom px-6 py-[14px] text-[16px] font-normal leading-[22px] text-typography-800 bg-background-50 font-roboto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, " px-6 py-[14px] text-[16px] font-normal leading-[22px] text-typography-800 bg-background-50 font-roboto" | "caption-bottom px-6 py-[14px] text-[16px] font-normal leading-[22px] text-typography-800 bg-background-50 font-roboto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>;
diff --git a/universal/packages/components/ui/table/styles.jsx b/universal/packages/components/ui/table/styles.jsx
deleted file mode 100644
index 3e897c28..00000000
--- a/universal/packages/components/ui/table/styles.jsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { isWeb } from '@gluestack-ui/nativewind-utils/IsWeb';
-const captionTableStyle = isWeb ? 'caption-bottom' : '';
-export const tableStyle = tva({
-    base: `table border-collapse border-collapse w-[800px]`,
-});
-export const tableHeaderStyle = tva({
-    base: '',
-});
-export const tableBodyStyle = tva({
-    base: '',
-});
-export const tableFooterStyle = tva({
-    base: '',
-});
-export const tableHeadStyle = tva({
-    base: 'flex-1 px-6 py-[14px] text-left font-bold text-[16px] leading-[22px] text-typography-800 font-roboto',
-});
-export const tableRowStyleStyle = tva({
-    base: 'border-0 border-b border-solid border-outline-200 bg-background-0',
-    variants: {
-        isHeaderRow: {
-            true: '',
-        },
-        isFooterRow: {
-            true: 'border-b-0 ',
-        },
-    },
-});
-export const tableDataStyle = tva({
-    base: 'flex-1 px-6 py-[14px] text-left text-[16px] font-medium leading-[22px] text-typography-800 font-roboto',
-});
-export const tableCaptionStyle = tva({
-    base: `${captionTableStyle} px-6 py-[14px] text-[16px] font-normal leading-[22px] text-typography-800 bg-background-50 font-roboto`,
-});
diff --git a/universal/packages/components/ui/text/index.d.ts b/universal/packages/components/ui/text/index.d.ts
deleted file mode 100644
index a9cfe1a8..00000000
--- a/universal/packages/components/ui/text/index.d.ts
+++ /dev/null
@@ -1,357 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const Text: React.ForwardRefExoticComponent<{
-    className?: string | undefined;
-} & import("react-native").TextProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-typography-700 font-normal font-body " | "text-typography-700 font-normal font-body font-sans tracking-sm my-0 bg-transparent border-0 box-border display-inline list-none margin-0 padding-0 position-relative text-start no-underline whitespace-pre-wrap word-wrap-break-word", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "text-typography-700 font-normal font-body " | "text-typography-700 font-normal font-body font-sans tracking-sm my-0 bg-transparent border-0 box-border display-inline list-none margin-0 padding-0 position-relative text-start no-underline whitespace-pre-wrap word-wrap-break-word", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>> & React.RefAttributes<unknown>>;
-export { Text };
diff --git a/universal/packages/components/ui/text/index.jsx b/universal/packages/components/ui/text/index.jsx
deleted file mode 100644
index a2fcb87a..00000000
--- a/universal/packages/components/ui/text/index.jsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import { Text as RNText } from 'react-native';
-import { textStyle } from './styles';
-const Text = React.forwardRef(({ className, isTruncated, bold, underline, strikeThrough, size = 'md', sub, italic, highlight, ...props }, ref) => {
-    return (<RNText className={textStyle({
-            isTruncated,
-            bold,
-            underline,
-            strikeThrough,
-            size,
-            sub,
-            italic,
-            highlight,
-            class: className,
-        })} {...props} ref={ref}/>);
-});
-Text.displayName = 'Text';
-export { Text };
diff --git a/universal/packages/components/ui/text/index.web.d.ts b/universal/packages/components/ui/text/index.web.d.ts
deleted file mode 100644
index 77771eed..00000000
--- a/universal/packages/components/ui/text/index.web.d.ts
+++ /dev/null
@@ -1,357 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const Text: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & React.ClassAttributes<HTMLSpanElement> & React.HTMLAttributes<HTMLSpanElement> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-typography-700 font-normal font-body " | "text-typography-700 font-normal font-body font-sans tracking-sm my-0 bg-transparent border-0 box-border display-inline list-none margin-0 padding-0 position-relative text-start no-underline whitespace-pre-wrap word-wrap-break-word", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "text-typography-700 font-normal font-body " | "text-typography-700 font-normal font-body font-sans tracking-sm my-0 bg-transparent border-0 box-border display-inline list-none margin-0 padding-0 position-relative text-start no-underline whitespace-pre-wrap word-wrap-break-word", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Text };
diff --git a/universal/packages/components/ui/text/index.web.jsx b/universal/packages/components/ui/text/index.web.jsx
deleted file mode 100644
index 6bda51f1..00000000
--- a/universal/packages/components/ui/text/index.web.jsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { textStyle } from './styles';
-const Text = React.forwardRef(({ className, isTruncated, bold, underline, strikeThrough, size = 'md', sub, italic, highlight, ...props }, ref) => {
-    return (<span className={textStyle({
-            isTruncated,
-            bold,
-            underline,
-            strikeThrough,
-            size,
-            sub,
-            italic,
-            highlight,
-            class: className,
-        })} {...props} ref={ref}/>);
-});
-Text.displayName = 'Text';
-export { Text };
diff --git a/universal/packages/components/ui/text/styles.d.ts b/universal/packages/components/ui/text/styles.d.ts
deleted file mode 100644
index 1eaf9314..00000000
--- a/universal/packages/components/ui/text/styles.d.ts
+++ /dev/null
@@ -1,352 +0,0 @@
-export declare const textStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "text-typography-700 font-normal font-body " | "text-typography-700 font-normal font-body font-sans tracking-sm my-0 bg-transparent border-0 box-border display-inline list-none margin-0 padding-0 position-relative text-start no-underline whitespace-pre-wrap word-wrap-break-word", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "text-typography-700 font-normal font-body " | "text-typography-700 font-normal font-body font-sans tracking-sm my-0 bg-transparent border-0 box-border display-inline list-none margin-0 padding-0 position-relative text-start no-underline whitespace-pre-wrap word-wrap-break-word", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: string;
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>;
diff --git a/universal/packages/components/ui/text/styles.jsx b/universal/packages/components/ui/text/styles.jsx
deleted file mode 100644
index 86b78882..00000000
--- a/universal/packages/components/ui/text/styles.jsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { isWeb } from '@gluestack-ui/nativewind-utils/IsWeb';
-const baseStyle = isWeb
-    ? 'font-sans tracking-sm my-0 bg-transparent border-0 box-border display-inline list-none margin-0 padding-0 position-relative text-start no-underline whitespace-pre-wrap word-wrap-break-word'
-    : '';
-export const textStyle = tva({
-    base: `text-typography-700 font-normal font-body ${baseStyle}`,
-    variants: {
-        isTruncated: {
-            true: 'web:truncate',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-base',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow-500',
-        },
-    },
-});
diff --git a/universal/packages/components/ui/textarea/index.d.ts b/universal/packages/components/ui/textarea/index.d.ts
deleted file mode 100644
index aafcdf47..00000000
--- a/universal/packages/components/ui/textarea/index.d.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const Textarea: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown> & import("@gluestack-ui/textarea/lib/typescript/types").ITextareaProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    variant: {
-        default: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-} | ({
-    variant: {
-        default: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-} & {
-    variant: {
-        default: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "w-full h-[100px] border border-background-300 rounded hover:border-outline-400 data-[focus=true]:border-primary-700 data-[focus=true]:hover:border-primary-700 data-[disabled=true]:opacity-40 data-[disabled=true]:hover:border-background-300", import("tailwind-variants/dist/config").TVConfig<{
-    variant: {
-        default: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, {
-    variant: {
-        default: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}>, {
-    variant: {
-        default: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    variant: {
-        default: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, "w-full h-[100px] border border-background-300 rounded hover:border-outline-400 data-[focus=true]:border-primary-700 data-[focus=true]:hover:border-primary-700 data-[disabled=true]:opacity-40 data-[disabled=true]:hover:border-background-300", import("tailwind-variants/dist/config").TVConfig<{
-    variant: {
-        default: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, {
-    variant: {
-        default: string;
-    };
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-declare const TextareaInput: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").TextInputProps & React.RefAttributes<import("react-native").TextInputProps> & import("@gluestack-ui/textarea/lib/typescript/types").IInputProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<({} | {} | {}) & {
-    size: {
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-    };
-}, undefined, "p-2 web:outline-0 web:outline-none flex-1 color-typography-900 align-text-top placeholder:text-typography-500 web:cursor-text web:data-[disabled=true]:cursor-not-allowed", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "p-2 web:outline-0 web:outline-none flex-1 color-typography-900 align-text-top placeholder:text-typography-500 web:cursor-text web:data-[disabled=true]:cursor-not-allowed", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export { Textarea, TextareaInput };
diff --git a/universal/packages/components/ui/textarea/index.jsx b/universal/packages/components/ui/textarea/index.jsx
deleted file mode 100644
index 128eabd3..00000000
--- a/universal/packages/components/ui/textarea/index.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-'use client';
-import React from 'react';
-import { createTextarea } from '@gluestack-ui/textarea';
-import { View, TextInput, Platform } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext, useStyleContext, } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
-const SCOPE = 'TEXTAREA';
-const UITextarea = createTextarea({
-    Root: Platform.OS === 'web'
-        ? withStyleContext(View, SCOPE)
-        : withStyleContextAndStates(View, SCOPE),
-    Input: Platform.OS === 'web' ? TextInput : withStates(TextInput),
-});
-cssInterop(UITextarea, { className: 'style' });
-cssInterop(UITextarea.Input, { className: 'style' });
-const textareaStyle = tva({
-    base: 'w-full h-[100px] border border-background-300 rounded hover:border-outline-400 data-[focus=true]:border-primary-700 data-[focus=true]:hover:border-primary-700 data-[disabled=true]:opacity-40 data-[disabled=true]:hover:border-background-300',
-    variants: {
-        variant: {
-            default: 'data-[focus=true]:border-primary-700 data-[focus=true]:web:ring-1 data-[focus=true]:web:ring-inset data-[focus=true]:web:ring-primary-700 data-[invalid=true]:border-error-700 data-[invalid=true]:web:ring-1 data-[invalid=true]:web:ring-inset data-[invalid=true]:web:ring-error-700 data-[invalid=true]:hover:border-error-700 data-[invalid=true]:data-[focus=true]:hover:border-primary-700 data-[invalid=true]:data-[focus=true]:hover:web:ring-1 data-[invalid=true]:data-[focus=true]:hover:web:ring-inset data-[invalid=true]:data-[focus=true]:hover:web:ring-primary-700 data-[invalid=true]:data-[disabled=true]:hover:border-error-700 data-[invalid=true]:data-[disabled=true]:hover:web:ring-1 data-[invalid=true]:data-[disabled=true]:hover:web:ring-inset data-[invalid=true]:data-[disabled=true]:hover:web:ring-error-700 ',
-        },
-        size: {
-            sm: '',
-            md: '',
-            lg: '',
-            xl: '',
-        },
-    },
-});
-const textareaInputStyle = tva({
-    base: 'p-2 web:outline-0 web:outline-none flex-1 color-typography-900 align-text-top placeholder:text-typography-500 web:cursor-text web:data-[disabled=true]:cursor-not-allowed',
-    parentVariants: {
-        size: {
-            sm: 'text-sm',
-            md: 'text-base',
-            lg: 'text-lg',
-            xl: 'text-xl',
-        },
-    },
-});
-const Textarea = React.forwardRef(({ className, variant = 'default', size = 'md', ...props }, ref) => {
-    return (<UITextarea ref={ref} {...props} className={textareaStyle({ variant, class: className })} context={{ size }}/>);
-});
-const TextareaInput = React.forwardRef(({ className, ...props }, ref) => {
-    const { size: parentSize } = useStyleContext(SCOPE);
-    return (<UITextarea.Input ref={ref} {...props} className={textareaInputStyle({
-            parentVariants: {
-                size: parentSize,
-            },
-            class: className,
-        })}/>);
-});
-Textarea.displayName = 'Textarea';
-TextareaInput.displayName = 'TextareaInput';
-export { Textarea, TextareaInput };
diff --git a/universal/packages/components/ui/textarea/index.tsx b/universal/packages/components/ui/textarea/index.tsx
index 4a5fd19f..0a9b0d90 100644
--- a/universal/packages/components/ui/textarea/index.tsx
+++ b/universal/packages/components/ui/textarea/index.tsx
@@ -1,36 +1,18 @@
 'use client';
 import React from 'react';
 import { createTextarea } from '@gluestack-ui/textarea';
-import { View, TextInput, Platform } from 'react-native';
+import { View, TextInput } from 'react-native';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import {
   withStyleContext,
   useStyleContext,
 } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { cssInterop } from 'nativewind';
-import { withStates } from '@gluestack-ui/nativewind-utils/withStates';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 
-const TextareaWrapper = React.forwardRef<
-  React.ElementRef<typeof View>,
-  React.ComponentProps<typeof View>
->(({ ...props }, ref) => {
-  return <View {...props} ref={ref} />;
-});
-
 const SCOPE = 'TEXTAREA';
 const UITextarea = createTextarea({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(TextareaWrapper, SCOPE)
-      : withStyleContextAndStates(TextareaWrapper, SCOPE),
-  Input: Platform.OS === 'web' ? TextInput : withStates(TextInput),
-});
-
-cssInterop(TextareaWrapper, { className: 'style' });
-cssInterop(UITextarea.Input, {
-  className: { target: 'style', nativeStyleToProp: { textAlign: true } },
+  Root: withStyleContext(View, SCOPE),
+  Input: TextInput,
 });
 
 const textareaStyle = tva({
diff --git a/universal/packages/components/ui/toast/index.d.ts b/universal/packages/components/ui/toast/index.d.ts
deleted file mode 100644
index 6bfacd8a..00000000
--- a/universal/packages/components/ui/toast/index.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-export declare const useToast: () => {
-    show: (props: import("@gluestack-ui/toast/lib/typescript/types").InterfaceToastProps) => any;
-    close: (id: any) => void;
-    closeAll: () => void;
-    isActive: (id: any) => boolean;
-};
-export declare const UIToast: import("@gluestack-ui/toast/lib/typescript/types").IToastComponentType<import("react-native").ViewProps, import("react-native").TextProps, import("react-native").TextProps>;
-export declare const Toast: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export declare const ToastTitle: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export declare const ToastDescription: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
diff --git a/universal/packages/components/ui/toast/index.jsx b/universal/packages/components/ui/toast/index.jsx
deleted file mode 100644
index d86a5c79..00000000
--- a/universal/packages/components/ui/toast/index.jsx
+++ /dev/null
@@ -1,113 +0,0 @@
-'use client';
-import React from 'react';
-import { createToast, createToastHook } from '@gluestack-ui/toast';
-import { Text, View } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-import { Motion, AnimatePresence } from '@legendapp/motion';
-export const useToast = createToastHook(Motion.View, AnimatePresence);
-export const UIToast = createToast({
-    Root: View,
-    Title: Text,
-    Description: Text,
-});
-cssInterop(Motion.View, { className: 'style' });
-cssInterop(UIToast, { className: 'style' });
-cssInterop(UIToast.Title, { className: 'style' });
-cssInterop(UIToast.Description, { className: 'style' });
-const toastStyle = tva({
-    base: 'px-4 py-3 m-3 rounded flex-row web:pointer-events-auto shadow',
-    variants: {
-        action: {
-            error: 'bg-background-error border-error-300',
-            warning: 'bg-background-warning border-warning-300',
-            success: 'bg-background-success border-success-300',
-            info: 'bg-background-info border-info-300',
-            attention: 'bg-background-muted border-secondary-300',
-        },
-        variant: {
-            solid: '',
-            outline: 'border',
-            accent: 'border-l-4',
-        },
-    },
-    defaultVariants: {
-        variant: 'solid',
-        action: 'attention',
-    },
-});
-const toastTitleStyle = tva({
-    base: 'text-typography-700 font-medium font-body tracking-md text-left',
-    variants: {
-        isTruncated: {
-            true: '',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-md',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-    },
-});
-const toastDescriptionStyle = tva({
-    base: 'text-typography-700 font-normal font-body tracking-md text-left',
-    variants: {
-        isTruncated: {
-            true: '',
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-md',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-    },
-});
-export const Toast = React.forwardRef(({ className, variant, action, ...props }, ref) => {
-    return (<UIToast ref={ref} {...props} className={toastStyle({ variant, action, class: className })}/>);
-});
-export const ToastTitle = React.forwardRef(({ className, size = 'md', ...props }, ref) => {
-    return (<UIToast.Title ref={ref} {...props} className={toastTitleStyle({
-            size,
-            class: className,
-        })}/>);
-});
-export const ToastDescription = React.forwardRef(({ className, size, ...props }, ref) => {
-    return (<UIToast.Description ref={ref} {...props} className={toastDescriptionStyle({
-            size,
-            class: className,
-        })}/>);
-});
diff --git a/universal/packages/components/ui/toast/index.tsx b/universal/packages/components/ui/toast/index.tsx
index 21c1f668..049fa19d 100644
--- a/universal/packages/components/ui/toast/index.tsx
+++ b/universal/packages/components/ui/toast/index.tsx
@@ -1,169 +1,158 @@
-'use client';
-import React from 'react';
-import { createToast, createToastHook } from '@gluestack-ui/toast';
-import { Text, View, Platform } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { cssInterop } from 'nativewind';
-import { Motion, AnimatePresence } from '@legendapp/motion';
+"use client";
+import React from "react";
+import { createToastHook } from "@gluestack-ui/toast";
+import { AccessibilityInfo, Text, View } from "react-native";
+import { tva } from "@gluestack-ui/nativewind-utils/tva";
+import { cssInterop } from "nativewind";
+import { Motion, AnimatePresence } from "@legendapp/motion";
 import {
   withStyleContext,
   useStyleContext,
-} from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+} from "@gluestack-ui/nativewind-utils/withStyleContext";
+import type { VariantProps } from "@gluestack-ui/nativewind-utils";
 
 export const useToast = createToastHook(Motion.View, AnimatePresence);
-const SCOPE = 'TOAST';
-export const UIToast = createToast({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View, SCOPE)
-      : withStyleContextAndStates(View, SCOPE),
-  Title: Text,
-  Description: Text,
-});
+const SCOPE = "TOAST";
 
-cssInterop(Motion.View, { className: 'style' });
-cssInterop(UIToast, { className: 'style' });
-cssInterop(UIToast.Title, { className: 'style' });
-cssInterop(UIToast.Description, { className: 'style' });
+cssInterop(Motion.View, { className: "style" });
 
 const toastStyle = tva({
-  base: 'p-4 m-1 rounded-md gap-1 web:pointer-events-auto shadow-hard-5 border-outline-100',
+  base: "p-4 m-1 rounded-md gap-1 web:pointer-events-auto shadow-hard-5 border-outline-100",
   variants: {
     action: {
-      error: 'bg-error-800',
-      warning: 'bg-warning-700',
-      success: 'bg-success-700',
-      info: 'bg-info-700',
-      muted: 'bg-secondary-700',
+      error: "bg-error-800",
+      warning: "bg-warning-700",
+      success: "bg-success-700",
+      info: "bg-info-700",
+      muted: "bg-background-800",
     },
 
     variant: {
-      solid: '',
-      outline: 'border bg-background-0',
+      solid: "",
+      outline: "border bg-background-0",
     },
   },
 });
 
 const toastTitleStyle = tva({
-  base: 'text-typography-0 font-medium font-body tracking-md text-left',
+  base: "text-typography-0 font-medium font-body tracking-md text-left",
   variants: {
     isTruncated: {
-      true: '',
+      true: "",
     },
     bold: {
-      true: 'font-bold',
+      true: "font-bold",
     },
     underline: {
-      true: 'underline',
+      true: "underline",
     },
     strikeThrough: {
-      true: 'line-through',
+      true: "line-through",
     },
     size: {
-      '2xs': 'text-2xs',
-      'xs': 'text-xs',
-      'sm': 'text-sm',
-      'md': 'text-base',
-      'lg': 'text-lg',
-      'xl': 'text-xl',
-      '2xl': 'text-2xl',
-      '3xl': 'text-3xl',
-      '4xl': 'text-4xl',
-      '5xl': 'text-5xl',
-      '6xl': 'text-6xl',
+      "2xs": "text-2xs",
+      xs: "text-xs",
+      sm: "text-sm",
+      md: "text-base",
+      lg: "text-lg",
+      xl: "text-xl",
+      "2xl": "text-2xl",
+      "3xl": "text-3xl",
+      "4xl": "text-4xl",
+      "5xl": "text-5xl",
+      "6xl": "text-6xl",
     },
   },
   parentVariants: {
     variant: {
-      solid: '',
-      outline: '',
+      solid: "",
+      outline: "",
     },
     action: {
-      error: '',
-      warning: '',
-      success: '',
-      info: '',
-      muted: '',
+      error: "",
+      warning: "",
+      success: "",
+      info: "",
+      muted: "",
     },
   },
   parentCompoundVariants: [
     {
-      variant: 'outline',
-      action: 'error',
-      class: 'text-error-800',
+      variant: "outline",
+      action: "error",
+      class: "text-error-800",
     },
     {
-      variant: 'outline',
-      action: 'warning',
-      class: 'text-warning-800',
+      variant: "outline",
+      action: "warning",
+      class: "text-warning-800",
     },
     {
-      variant: 'outline',
-      action: 'success',
-      class: 'text-success-800',
+      variant: "outline",
+      action: "success",
+      class: "text-success-800",
     },
     {
-      variant: 'outline',
-      action: 'info',
-      class: 'text-info-800',
+      variant: "outline",
+      action: "info",
+      class: "text-info-800",
     },
     {
-      variant: 'outline',
-      action: 'muted',
-      class: 'text-background-800',
+      variant: "outline",
+      action: "muted",
+      class: "text-background-800",
     },
   ],
 });
 
 const toastDescriptionStyle = tva({
-  base: 'font-normal font-body tracking-md text-left',
+  base: "font-normal font-body tracking-md text-left",
   variants: {
     isTruncated: {
-      true: '',
+      true: "",
     },
     bold: {
-      true: 'font-bold',
+      true: "font-bold",
     },
     underline: {
-      true: 'underline',
+      true: "underline",
     },
     strikeThrough: {
-      true: 'line-through',
+      true: "line-through",
     },
     size: {
-      '2xs': 'text-2xs',
-      'xs': 'text-xs',
-      'sm': 'text-sm',
-      'md': 'text-base',
-      'lg': 'text-lg',
-      'xl': 'text-xl',
-      '2xl': 'text-2xl',
-      '3xl': 'text-3xl',
-      '4xl': 'text-4xl',
-      '5xl': 'text-5xl',
-      '6xl': 'text-6xl',
+      "2xs": "text-2xs",
+      xs: "text-xs",
+      sm: "text-sm",
+      md: "text-base",
+      lg: "text-lg",
+      xl: "text-xl",
+      "2xl": "text-2xl",
+      "3xl": "text-3xl",
+      "4xl": "text-4xl",
+      "5xl": "text-5xl",
+      "6xl": "text-6xl",
     },
   },
   parentVariants: {
     variant: {
-      solid: 'text-typography-50',
-      outline: 'text-typography-900',
+      solid: "text-typography-50",
+      outline: "text-typography-900",
     },
   },
 });
 
-type IToastProps = React.ComponentProps<typeof UIToast> & {
+const Root = withStyleContext(View, SCOPE);
+type IToastProps = React.ComponentProps<typeof Root> & {
   className?: string;
 } & VariantProps<typeof toastStyle>;
 
 export const Toast = React.forwardRef<
-  React.ElementRef<typeof UIToast>,
+  React.ElementRef<typeof Root>,
   IToastProps
->(({ className, variant = 'solid', action = 'muted', ...props }, ref) => {
+>(({ className, variant = "solid", action = "muted", ...props }, ref) => {
   return (
-    <UIToast
+    <Root
       ref={ref}
       className={toastStyle({ variant, action, class: className })}
       context={{ variant, action }}
@@ -172,20 +161,29 @@ export const Toast = React.forwardRef<
   );
 });
 
-type IToastTitleProps = React.ComponentProps<typeof UIToast.Title> & {
+type IToastTitleProps = React.ComponentProps<typeof Text> & {
   className?: string;
 } & VariantProps<typeof toastTitleStyle>;
 
 export const ToastTitle = React.forwardRef<
-  React.ElementRef<typeof UIToast.Title>,
+  React.ElementRef<typeof Text>,
   IToastTitleProps
->(({ className, size = 'md', ...props }, ref) => {
+>(({ className, size = "md", children, ...props }, ref) => {
   const { variant: parentVariant, action: parentAction } =
     useStyleContext(SCOPE);
+  React.useEffect(() => {
+    // Issue from react-native side
+    // Hack for now, will fix this later
+    AccessibilityInfo.announceForAccessibility(children as string);
+  }, [children]);
+
   return (
-    <UIToast.Title
-      ref={ref}
+    <Text
       {...props}
+      ref={ref}
+      aria-live="assertive"
+      aria-atomic="true"
+      role="alert"
       className={toastTitleStyle({
         size,
         class: className,
@@ -194,23 +192,23 @@ export const ToastTitle = React.forwardRef<
           action: parentAction,
         },
       })}
-    />
+    >
+      {children}
+    </Text>
   );
 });
 
-type IToastDescriptionProps = React.ComponentProps<
-  typeof UIToast.Description
-> & {
+type IToastDescriptionProps = React.ComponentProps<typeof Text> & {
   className?: string;
 } & VariantProps<typeof toastDescriptionStyle>;
 
 export const ToastDescription = React.forwardRef<
-  React.ElementRef<typeof UIToast.Description>,
+  React.ElementRef<typeof Text>,
   IToastDescriptionProps
->(({ className, size = 'md', ...props }, ref) => {
+>(({ className, size = "md", ...props }, ref) => {
   const { variant: parentVariant } = useStyleContext(SCOPE);
   return (
-    <UIToast.Description
+    <Text
       ref={ref}
       {...props}
       className={toastDescriptionStyle({
diff --git a/universal/packages/components/ui/tooltip/index.d.ts b/universal/packages/components/ui/tooltip/index.d.ts
deleted file mode 100644
index 052e5440..00000000
--- a/universal/packages/components/ui/tooltip/index.d.ts
+++ /dev/null
@@ -1,386 +0,0 @@
-import React from 'react';
-import { View } from 'react-native';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-export declare const UITooltip: import("@gluestack-ui/tooltip/lib/typescript/types").IToolTipComponentType<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>, import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown>, import("react-native").TextProps>;
-export declare const Tooltip: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown> & React.RefAttributes<import("react-native").ViewProps & {
-    context?: any;
-} & React.RefAttributes<unknown>> & import("@gluestack-ui/tooltip/lib/typescript/types").InterfaceTooltipProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "w-full h-full web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "w-full h-full web:pointer-events-none", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export declare const TooltipContent: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown> & React.RefAttributes<import("react-native").Animated.AnimatedProps<import("react-native").ViewProps & React.RefAttributes<View>> & import("@legendapp/motion").MotionComponentProps<typeof View, import("react-native").ViewStyle, unknown, unknown, unknown>> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{} | {} | {}, undefined, "py-1 px-3 rounded-sm bg-background-900 web:pointer-events-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, {} | {}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<unknown, undefined, "py-1 px-3 rounded-sm bg-background-900 web:pointer-events-auto", import("tailwind-variants/dist/config").TVConfig<unknown, {} | {}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
-export declare const TooltipText: React.ForwardRefExoticComponent<Omit<{
-    className?: string | undefined;
-} & import("react-native").TextProps & React.RefAttributes<import("react-native").TextProps> & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: {
-            props: string;
-        };
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} | ({
-    isTruncated: {
-        true: {
-            props: string;
-        };
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-} & {
-    isTruncated: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    bold: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    underline: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    strikeThrough: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    size: {
-        '2xs': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '5xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '6xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    sub: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    italic: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    highlight: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "font-normal tracking-normal text-red-400 web:select-none text-xs text-typography-50", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: {
-            props: string;
-        };
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: {
-            props: string;
-        };
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, {
-    isTruncated: {
-        true: {
-            props: string;
-        };
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    isTruncated: {
-        true: {
-            props: string;
-        };
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, undefined, "font-normal tracking-normal text-red-400 web:select-none text-xs text-typography-50", import("tailwind-variants/dist/config").TVConfig<{
-    isTruncated: {
-        true: {
-            props: string;
-        };
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}, {
-    isTruncated: {
-        true: {
-            props: string;
-        };
-    };
-    bold: {
-        true: string;
-    };
-    underline: {
-        true: string;
-    };
-    strikeThrough: {
-        true: string;
-    };
-    size: {
-        '2xs': string;
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-        '5xl': string;
-        '6xl': string;
-    };
-    sub: {
-        true: string;
-    };
-    italic: {
-        true: string;
-    };
-    highlight: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>>, "ref"> & React.RefAttributes<unknown>>;
diff --git a/universal/packages/components/ui/tooltip/index.jsx b/universal/packages/components/ui/tooltip/index.jsx
deleted file mode 100644
index e0a9d2bc..00000000
--- a/universal/packages/components/ui/tooltip/index.jsx
+++ /dev/null
@@ -1,95 +0,0 @@
-'use client';
-import React from 'react';
-import { createTooltip } from '@gluestack-ui/tooltip';
-import { View, Text, Platform } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-import { Motion, AnimatePresence } from '@legendapp/motion';
-export const UITooltip = createTooltip({
-    Root: Platform.OS === 'web'
-        ? withStyleContext(View)
-        : withStyleContextAndStates(View),
-    Content: Motion.View,
-    Text: Text,
-    AnimatePresence: AnimatePresence,
-});
-const tooltipStyle = tva({
-    base: 'w-full h-full web:pointer-events-none',
-});
-const tooltipContentStyle = tva({
-    base: 'py-1 px-3 rounded-sm bg-background-900 web:pointer-events-auto',
-});
-const tooltipTextStyle = tva({
-    base: 'font-normal tracking-normal text-red-400 web:select-none text-xs text-typography-50',
-    variants: {
-        isTruncated: {
-            true: {
-                props: 'line-clamp-1 truncate',
-            },
-        },
-        bold: {
-            true: 'font-bold',
-        },
-        underline: {
-            true: 'underline',
-        },
-        strikeThrough: {
-            true: 'line-through',
-        },
-        size: {
-            '2xs': 'text-2xs',
-            'xs': 'text-xs',
-            'sm': 'text-sm',
-            'md': 'text-base',
-            'lg': 'text-lg',
-            'xl': 'text-xl',
-            '2xl': 'text-2xl',
-            '3xl': 'text-3xl',
-            '4xl': 'text-4xl',
-            '5xl': 'text-5xl',
-            '6xl': 'text-6xl',
-        },
-        sub: {
-            true: 'text-xs',
-        },
-        italic: {
-            true: 'italic',
-        },
-        highlight: {
-            true: 'bg-yellow-500',
-        },
-    },
-});
-cssInterop(UITooltip, { className: 'style' });
-cssInterop(UITooltip.Content, { className: 'style' });
-cssInterop(UITooltip.Text, { className: 'style' });
-export const Tooltip = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UITooltip ref={ref} className={tooltipStyle({ class: className })} {...props}/>);
-});
-export const TooltipContent = React.forwardRef(({ className, ...props }, ref) => {
-    return (<UITooltip.Content ref={ref} initial={{
-            opacity: 0,
-            scale: 0.5,
-        }} animate={{
-            opacity: 1,
-            scale: 1,
-        }} exit={{
-            opacity: 0,
-            scale: 0.5,
-        }} transition={{
-            type: 'spring',
-            damping: 18,
-            stiffness: 50,
-            opacity: {
-                type: 'timing',
-                duration: 250,
-            },
-        }} {...props} className={tooltipContentStyle({
-            class: className,
-        })} pointerEvents="auto"/>);
-});
-export const TooltipText = React.forwardRef(({ className, size = 'md', ...props }, ref) => {
-    return (<UITooltip.Text ref={ref} className={tooltipTextStyle({ size, class: className })} {...props}/>);
-});
diff --git a/universal/packages/components/ui/tooltip/index.tsx b/universal/packages/components/ui/tooltip/index.tsx
index 12315983..eec46228 100644
--- a/universal/packages/components/ui/tooltip/index.tsx
+++ b/universal/packages/components/ui/tooltip/index.tsx
@@ -1,25 +1,21 @@
 'use client';
 import React from 'react';
 import { createTooltip } from '@gluestack-ui/tooltip';
-import { View, Text, Platform } from 'react-native';
+import { View, Text } from 'react-native';
 import type { VariantProps } from '@gluestack-ui/nativewind-utils';
 import { tva } from '@gluestack-ui/nativewind-utils/tva';
 import { withStyleContext } from '@gluestack-ui/nativewind-utils/withStyleContext';
-import { cssInterop } from 'nativewind';
-import { withStyleContextAndStates } from '@gluestack-ui/nativewind-utils/withStyleContextAndStates';
-
 import { Motion, AnimatePresence } from '@legendapp/motion';
-
+import { cssInterop } from 'nativewind';
 export const UITooltip = createTooltip({
-  Root:
-    Platform.OS === 'web'
-      ? withStyleContext(View)
-      : withStyleContextAndStates(View),
+  Root: withStyleContext(View),
   Content: Motion.View,
   Text: Text,
   AnimatePresence: AnimatePresence,
 });
 
+cssInterop(Motion.View, { className: 'style' });
+
 const tooltipStyle = tva({
   base: 'w-full h-full web:pointer-events-none',
 });
@@ -71,10 +67,6 @@ const tooltipTextStyle = tva({
   },
 });
 
-cssInterop(UITooltip, { className: 'style' });
-cssInterop(UITooltip.Content, { className: 'style' });
-cssInterop(UITooltip.Text, { className: 'style' });
-
 type ITooltipProps = React.ComponentProps<typeof UITooltip> &
   VariantProps<typeof tooltipStyle> & { className?: string };
 type ITooltipContentProps = React.ComponentProps<typeof UITooltip.Content> &
diff --git a/universal/packages/components/ui/utils/use-break-point-value.ts b/universal/packages/components/ui/utils/use-break-point-value.ts
new file mode 100644
index 00000000..bc4b59a7
--- /dev/null
+++ b/universal/packages/components/ui/utils/use-break-point-value.ts
@@ -0,0 +1,101 @@
+import { Dimensions, useWindowDimensions } from 'react-native';
+import { useEffect, useState } from 'react';
+
+import resolveConfig from 'tailwindcss/resolveConfig';
+import tailwindConfig from 'tailwind.config';
+
+const TailwindTheme = resolveConfig(tailwindConfig);
+const screenSize = TailwindTheme.theme.screens;
+
+type breakpoints = keyof typeof screenSize | 'default';
+
+type BreakPointValue = Partial<Record<breakpoints, any>>;
+
+const resolveScreenWidth: any = {
+  default: 0,
+};
+
+Object.entries(screenSize).forEach(([key, value]) => {
+  resolveScreenWidth[key] = parseInt(value.replace('px', ''), 10);
+});
+
+export const getBreakPointValue = (values: any, width: any) => {
+  if (typeof values !== 'object') return values;
+
+  let finalBreakPointResolvedValue: any;
+  const mediaQueriesBreakpoints: any = [
+    {
+      key: 'default',
+      breakpoint: 0,
+      isValid: true,
+    },
+  ];
+  Object.keys(resolveScreenWidth).forEach((key) => {
+    const isValid = isValidBreakpoint(resolveScreenWidth[key], width);
+
+    mediaQueriesBreakpoints.push({
+      key: key,
+      breakpoint: resolveScreenWidth[key],
+      isValid: isValid,
+    });
+  });
+
+  mediaQueriesBreakpoints.sort((a: any, b: any) => a.breakpoint - b.breakpoint);
+
+  mediaQueriesBreakpoints.forEach((breakpoint: any, index: any) => {
+    breakpoint.value = values.hasOwnProperty(breakpoint.key)
+      ? // @ts-ignore
+        values[breakpoint.key]
+      : mediaQueriesBreakpoints[index - 1]?.value ||
+        mediaQueriesBreakpoints[0]?.value;
+  });
+
+  const lastValidObject = getLastValidObject(mediaQueriesBreakpoints);
+
+  if (!lastValidObject) {
+    finalBreakPointResolvedValue = values;
+  } else {
+    finalBreakPointResolvedValue = lastValidObject?.value;
+  }
+  return finalBreakPointResolvedValue;
+};
+
+export function useBreakpointValue(values: BreakPointValue): any {
+  const { width } = useWindowDimensions();
+
+  const [currentBreakPointValue, setCurrentBreakPointValue] = useState(
+    getBreakPointValue(values, width)
+  );
+
+  useEffect(() => {
+    if (typeof values === 'object') {
+      const finalBreakPointResolvedValue = getBreakPointValue(values, width);
+      setCurrentBreakPointValue(finalBreakPointResolvedValue);
+    }
+  }, [values, width]);
+
+  if (typeof values !== 'object') return values;
+
+  return currentBreakPointValue;
+}
+
+export function isValidBreakpoint(
+  breakPointWidth: any,
+  width: any = Dimensions.get('window')?.width
+) {
+  const windowWidth = width;
+
+  if (windowWidth >= breakPointWidth) {
+    return true;
+  }
+  return false;
+}
+
+function getLastValidObject(mediaQueries: any) {
+  for (let i = mediaQueries.length - 1; i >= 0; i--) {
+    if (mediaQueries[i].isValid) {
+      return mediaQueries[i];
+    }
+  }
+  return null; // No valid object found
+}
diff --git a/universal/packages/components/ui/view/index.d.ts b/universal/packages/components/ui/view/index.d.ts
deleted file mode 100644
index 8f32b6b1..00000000
--- a/universal/packages/components/ui/view/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { View } from 'react-native';
diff --git a/universal/packages/components/ui/view/index.jsx b/universal/packages/components/ui/view/index.jsx
deleted file mode 100644
index ae979081..00000000
--- a/universal/packages/components/ui/view/index.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-'use client';
-export { View } from 'react-native';
diff --git a/universal/packages/components/ui/virtualized-list/index.d.ts b/universal/packages/components/ui/virtualized-list/index.d.ts
deleted file mode 100644
index be3e2606..00000000
--- a/universal/packages/components/ui/virtualized-list/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { VirtualizedList } from 'react-native';
diff --git a/universal/packages/components/ui/virtualized-list/index.jsx b/universal/packages/components/ui/virtualized-list/index.jsx
deleted file mode 100644
index b90d3a60..00000000
--- a/universal/packages/components/ui/virtualized-list/index.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-'use client';
-export { VirtualizedList } from 'react-native';
diff --git a/universal/packages/components/ui/vstack/index.d.ts b/universal/packages/components/ui/vstack/index.d.ts
deleted file mode 100644
index 33db65fe..00000000
--- a/universal/packages/components/ui/vstack/index.d.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-declare const VStack: React.ForwardRefExoticComponent<import("react-native").ViewProps & VariantProps<import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-} | ({
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-} & {
-    space: {
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    reversed: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "flex-col " | "flex-col flex flex-col relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none", import("tailwind-variants/dist/config").TVConfig<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}>, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, undefined, "flex-col " | "flex-col flex flex-col relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none", import("tailwind-variants/dist/config").TVConfig<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>> & React.RefAttributes<unknown>>;
-export { VStack };
diff --git a/universal/packages/components/ui/vstack/index.jsx b/universal/packages/components/ui/vstack/index.jsx
deleted file mode 100644
index ed65b529..00000000
--- a/universal/packages/components/ui/vstack/index.jsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-import { View } from 'react-native';
-import { vstackStyle } from './styles';
-const VStack = React.forwardRef(({ className, space, reversed, ...props }, ref) => {
-    return (<View className={vstackStyle({ space, reversed, class: className })} {...props} ref={ref}/>);
-});
-VStack.displayName = 'VStack';
-export { VStack };
diff --git a/universal/packages/components/ui/vstack/index.web.d.ts b/universal/packages/components/ui/vstack/index.web.d.ts
deleted file mode 100644
index 7386b3de..00000000
--- a/universal/packages/components/ui/vstack/index.web.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { vstackStyle } from './styles';
-type IVStackProps = React.ComponentProps<'div'> & VariantProps<typeof vstackStyle>;
-declare const VStack: React.ForwardRefExoticComponent<Omit<IVStackProps, "ref"> & React.RefAttributes<unknown>>;
-export { VStack };
diff --git a/universal/packages/components/ui/vstack/index.web.jsx b/universal/packages/components/ui/vstack/index.web.jsx
deleted file mode 100644
index bad1fef7..00000000
--- a/universal/packages/components/ui/vstack/index.web.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react';
-import { vstackStyle } from './styles';
-const VStack = React.forwardRef(({ className, space, reversed, ...props }, ref) => {
-    return (<div className={vstackStyle({ space, reversed, class: className })} {...props} ref={ref}/>);
-});
-VStack.displayName = 'VStack';
-export { VStack };
diff --git a/universal/packages/components/ui/vstack/styles.d.ts b/universal/packages/components/ui/vstack/styles.d.ts
deleted file mode 100644
index 58daf69c..00000000
--- a/universal/packages/components/ui/vstack/styles.d.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-export declare const vstackStyle: import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-} | ({
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-} & {
-    space: {
-        xs: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        sm: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        md: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        lg: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        xl: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '2xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '3xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-        '4xl': import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-    reversed: {
-        true: import("tailwind-merge").ClassNameValue | {
-            base?: import("tailwind-merge").ClassNameValue;
-        };
-    };
-}), undefined, "flex-col " | "flex-col flex flex-col relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none", import("tailwind-variants/dist/config").TVConfig<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}>, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, undefined, import("@gluestack-ui/nativewind-utils/types").TVReturnType<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, undefined, "flex-col " | "flex-col flex flex-col relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none", import("tailwind-variants/dist/config").TVConfig<{
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}, {
-    space: {
-        xs: string;
-        sm: string;
-        md: string;
-        lg: string;
-        xl: string;
-        '2xl': string;
-        '3xl': string;
-        '4xl': string;
-    };
-    reversed: {
-        true: string;
-    };
-}>, unknown, unknown, undefined>>;
diff --git a/universal/packages/components/ui/vstack/styles.jsx b/universal/packages/components/ui/vstack/styles.jsx
deleted file mode 100644
index 9455f6db..00000000
--- a/universal/packages/components/ui/vstack/styles.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { isWeb } from '@gluestack-ui/nativewind-utils/IsWeb';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-const baseStyle = isWeb
-    ? 'flex flex-col relative z-0 box-border border-0 list-none min-w-0 min-h-0 bg-transparent items-stretch m-0 p-0 text-decoration-none'
-    : '';
-export const vstackStyle = tva({
-    base: `flex-col ${baseStyle}`,
-    variants: {
-        space: {
-            'xs': 'gap-1',
-            'sm': 'gap-2',
-            'md': 'gap-3',
-            'lg': 'gap-4',
-            'xl': 'gap-5',
-            '2xl': 'gap-6',
-            '3xl': 'gap-7',
-            '4xl': 'gap-8',
-        },
-        reversed: {
-            true: 'flex-col-reverse',
-        },
-    },
-});
diff --git a/universal/patches/react-native-css-interop+0.0.36.patch b/universal/patches/react-native-css-interop+0.0.36.patch
deleted file mode 100644
index 139276de..00000000
--- a/universal/patches/react-native-css-interop+0.0.36.patch
+++ /dev/null
@@ -1,346 +0,0 @@
-diff --git a/node_modules/react-native-css-interop/dist/runtime/api.d.ts b/node_modules/react-native-css-interop/dist/runtime/api.d.ts
-index 05c3461..0e94bc5 100644
---- a/node_modules/react-native-css-interop/dist/runtime/api.d.ts
-+++ b/node_modules/react-native-css-interop/dist/runtime/api.d.ts
-@@ -1 +1,2 @@
- export * from "./web/api";
-+export * from "./web/interopComponentsMap";
-diff --git a/node_modules/react-native-css-interop/dist/runtime/api.js b/node_modules/react-native-css-interop/dist/runtime/api.js
-index d532aa8..340d8fd 100644
---- a/node_modules/react-native-css-interop/dist/runtime/api.js
-+++ b/node_modules/react-native-css-interop/dist/runtime/api.js
-@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
- };
- Object.defineProperty(exports, "__esModule", { value: true });
- __exportStar(require("./web/api"), exports);
-+__exportStar(require("./web/interopComponentsMap"), exports);
- //# sourceMappingURL=api.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/api.js.map b/node_modules/react-native-css-interop/dist/runtime/api.js.map
-index 7825b53..c59fa3b 100644
---- a/node_modules/react-native-css-interop/dist/runtime/api.js.map
-+++ b/node_modules/react-native-css-interop/dist/runtime/api.js.map
-@@ -1 +1 @@
--{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/runtime/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B"}
-\ No newline at end of file
-+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/runtime/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,6DAA2C"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/components.js b/node_modules/react-native-css-interop/dist/runtime/components.js
-index c4832b0..63aa94e 100644
---- a/node_modules/react-native-css-interop/dist/runtime/components.js
-+++ b/node_modules/react-native-css-interop/dist/runtime/components.js
-@@ -1,4 +1,5 @@
- "use strict";
-+"use client";
- Object.defineProperty(exports, "__esModule", { value: true });
- const react_native_1 = require("react-native");
- const api_1 = require("./api");
-diff --git a/node_modules/react-native-css-interop/dist/runtime/components.js.map b/node_modules/react-native-css-interop/dist/runtime/components.js.map
-index 0101386..9549388 100644
---- a/node_modules/react-native-css-interop/dist/runtime/components.js.map
-+++ b/node_modules/react-native-css-interop/dist/runtime/components.js.map
-@@ -1 +1 @@
--{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/runtime/components.ts"],"names":[],"mappings":";;AAAA,+CAkBsB;AAEtB,+BAA+C;AAE/C,IAAA,gBAAU,EAAC,oBAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC1C,IAAA,gBAAU,EAAC,wBAAS,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC9C,IAAA,gBAAU,EAAC,2BAAY,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACjD,IAAA,gBAAU,EAAC,qBAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC3C,IAAA,gBAAU,EAAC,mBAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACzC,IAAA,gBAAU,EAAC,iCAAkB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACvD,IAAA,gBAAU,EAAC,+BAAgB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACrD,IAAA,gBAAU,EAAC,uCAAwB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC7D,IAAA,gBAAU,EAAC,mBAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACzC,IAAA,gBAAU,EAAC,gCAAiB,EAAE;IAC5B,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;CACnE,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,wBAAS,EAAE;IACpB,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE;CAC3E,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,yBAAU,EAAE;IACrB,SAAS,EAAE,OAAO;IAClB,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,wBAAS,EAAE;IACpB,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;CACvE,CAAC,CAAC;AAEH,IAAA,gBAAU,EAAC,uBAAQ,EAAE;IACnB,SAAS,EAAE,OAAO;IAClB,4BAA4B,EAAE,0BAA0B;IACxD,4BAA4B,EAAE,0BAA0B;IACxD,sBAAsB,EAAE,oBAAoB;IAC5C,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,8BAAe,EAAE;IAC1B,SAAS,EAAE,OAAO;IAClB,cAAc,EAAE,YAAY;CAC7B,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,mCAAoB,EAAE;IAC/B,SAAS,EAAE,OAAO;IAClB,yBAAyB,EAAE,uBAAuB;CACnD,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,8BAAe,EAAE;IAC1B,SAAS,EAAE,OAAO;IAClB,4BAA4B,EAAE,0BAA0B;IACxD,4BAA4B,EAAE,0BAA0B;IACxD,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC"}
-\ No newline at end of file
-+{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/runtime/components.ts"],"names":[],"mappings":";AAAA,YAAY,CAAC;;AAEb,+CAkBsB;AAEtB,+BAA+C;AAE/C,IAAA,gBAAU,EAAC,oBAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC1C,IAAA,gBAAU,EAAC,wBAAS,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC9C,IAAA,gBAAU,EAAC,2BAAY,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACjD,IAAA,gBAAU,EAAC,qBAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC3C,IAAA,gBAAU,EAAC,mBAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACzC,IAAA,gBAAU,EAAC,iCAAkB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACvD,IAAA,gBAAU,EAAC,+BAAgB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACrD,IAAA,gBAAU,EAAC,uCAAwB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC7D,IAAA,gBAAU,EAAC,mBAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AACzC,IAAA,gBAAU,EAAC,gCAAiB,EAAE;IAC5B,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;CACnE,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,wBAAS,EAAE;IACpB,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE;CAC3E,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,yBAAU,EAAE;IACrB,SAAS,EAAE,OAAO;IAClB,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,wBAAS,EAAE;IACpB,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;CACvE,CAAC,CAAC;AAEH,IAAA,gBAAU,EAAC,uBAAQ,EAAE;IACnB,SAAS,EAAE,OAAO;IAClB,4BAA4B,EAAE,0BAA0B;IACxD,4BAA4B,EAAE,0BAA0B;IACxD,sBAAsB,EAAE,oBAAoB;IAC5C,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,8BAAe,EAAE;IAC1B,SAAS,EAAE,OAAO;IAClB,cAAc,EAAE,YAAY;CAC7B,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,mCAAoB,EAAE;IAC/B,SAAS,EAAE,OAAO;IAClB,yBAAyB,EAAE,uBAAuB;CACnD,CAAC,CAAC;AACH,IAAA,gBAAU,EAAC,8BAAe,EAAE;IAC1B,SAAS,EAAE,OAAO;IAClB,4BAA4B,EAAE,0BAA0B;IACxD,4BAA4B,EAAE,0BAA0B;IACxD,yBAAyB,EAAE,uBAAuB;IAClD,kBAAkB,EAAE,gBAAgB;CACrC,CAAC,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.d.ts b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.d.ts
-index 05710bd..21028f3 100644
---- a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.d.ts
-+++ b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.d.ts
-@@ -17,4 +17,8 @@ export declare function setDeep(target: Record<string, any>, paths: string[], va
- export declare function getWidth(state: PropState): number;
- export declare function getHeight(state: PropState): number;
- export declare const defaultValues: Record<string, AnimatableValue | ((effect: Effect) => AnimatableValue)>;
--export declare function calc(state: PropState, expression: RuntimeValueDescriptor[], style?: Record<string, any>): string | number | undefined;
-+export declare function calc(state: PropState, expression: RuntimeValueDescriptor, style?: Record<string, any>): {
-+    mode: string;
-+    raw: number;
-+    value: string | number;
-+} | undefined;
-diff --git a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js
-index 5f9c2b2..cec8e9a 100644
---- a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js
-+++ b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js
-@@ -23,12 +23,59 @@ function resolveValue(state, descriptor, style) {
-     }
-     switch (descriptor.name) {
-         case "var": {
--            const value = resolve(state, descriptor.arguments[0], style);
-+            let value = resolve(state, descriptor.arguments[0], style);
-             if (typeof value === "string")
--                return getVar(state, value, style);
-+                value = getVar(state, value, style);
-+            if (value === undefined && descriptor.arguments[1]) {
-+                value = resolveValue(state, descriptor.arguments[1], style);
-+            }
-+            return value;
-         }
-         case "calc": {
--            return calc(state, descriptor.arguments, style);
-+            return calc(state, descriptor.arguments, style)?.value;
-+        }
-+        case "max": {
-+            let mode;
-+            let values = [];
-+            for (const arg of descriptor.arguments) {
-+                const result = calc(state, arg, style);
-+                if (result) {
-+                    if (!mode)
-+                        mode = result?.mode;
-+                    if (result.mode === mode) {
-+                        values.push(result.raw);
-+                    }
-+                }
-+            }
-+            const max = Math.max(...values);
-+            return mode === "percentage" ? `${max}%` : max;
-+        }
-+        case "min": {
-+            let mode;
-+            let values = [];
-+            for (const arg of descriptor.arguments) {
-+                const result = calc(state, arg, style);
-+                if (result) {
-+                    if (!mode)
-+                        mode = result?.mode;
-+                    if (result.mode === mode) {
-+                        values.push(result.raw);
-+                    }
-+                }
-+            }
-+            const min = Math.min(...values);
-+            return mode === "percentage" ? `${min}%` : min;
-+        }
-+        case "clamp": {
-+            const min = calc(state, descriptor.arguments[0], style);
-+            const val = calc(state, descriptor.arguments[1], style);
-+            const max = calc(state, descriptor.arguments[2], style);
-+            if (!min || !val || !max)
-+                return;
-+            if (min.mode !== val.mode && max.mode !== val.mode)
-+                return;
-+            const value = Math.max(min.raw, Math.min(val.raw, max.raw));
-+            return val.mode === "percentage" ? `${value}%` : value;
-         }
-         case "vh": {
-             const value = resolve(state, descriptor.arguments[0], style);
-@@ -357,6 +404,9 @@ function calc(state, expression, style) {
-     const values = [];
-     const ops = [];
-     let mode;
-+    if (!Array.isArray(expression)) {
-+        expression = [expression];
-+    }
-     for (let token of expression) {
-         switch (typeof token) {
-             case "undefined":
-@@ -427,7 +477,11 @@ function calc(state, expression, style) {
-     if (!mode)
-         return;
-     const value = round(values[0]);
--    return mode === "percentage" ? `${value}%` : value;
-+    return {
-+        mode,
-+        raw: value,
-+        value: mode === "percentage" ? `${value}%` : value,
-+    };
- }
- exports.calc = calc;
- //# sourceMappingURL=resolve-value.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js.map b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js.map
-index ae1884d..a14dc2e 100644
---- a/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js.map
-+++ b/node_modules/react-native-css-interop/dist/runtime/native/resolve-value.js.map
-@@ -1 +1 @@
--{"version":3,"file":"resolve-value.js","sourceRoot":"","sources":["../../../src/runtime/native/resolve-value.ts"],"names":[],"mappings":"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"}
-\ No newline at end of file
-+{"version":3,"file":"resolve-value.js","sourceRoot":"","sources":["../../../src/runtime/native/resolve-value.ts"],"names":[],"mappings":"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"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/test.d.ts b/node_modules/react-native-css-interop/dist/runtime/test.d.ts
-deleted file mode 100644
-index a326c79..0000000
---- a/node_modules/react-native-css-interop/dist/runtime/test.d.ts
-+++ /dev/null
-@@ -1 +0,0 @@
--export declare const testContext: Record<string, any>;
-diff --git a/node_modules/react-native-css-interop/dist/runtime/test.js b/node_modules/react-native-css-interop/dist/runtime/test.js
-deleted file mode 100644
-index 9c6f4c8..0000000
---- a/node_modules/react-native-css-interop/dist/runtime/test.js
-+++ /dev/null
-@@ -1,7 +0,0 @@
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.testContext = void 0;
--exports.testContext = {
--    "--theme-fg": "blue",
--};
--//# sourceMappingURL=test.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/test.js.map b/node_modules/react-native-css-interop/dist/runtime/test.js.map
-deleted file mode 100644
-index 5ec3e17..0000000
---- a/node_modules/react-native-css-interop/dist/runtime/test.js.map
-+++ /dev/null
-@@ -1 +0,0 @@
--{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/runtime/test.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAwB;IAC9C,YAAY,EAAE,MAAM;CACrB,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/api.d.ts b/node_modules/react-native-css-interop/dist/runtime/web/api.d.ts
-index d38ce4a..3ec4979 100644
---- a/node_modules/react-native-css-interop/dist/runtime/web/api.d.ts
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/api.d.ts
-@@ -1,16 +1,10 @@
--/// <reference types="react" />
- import { CssInterop } from "../../types";
- export { StyleSheet } from "./stylesheet";
- export { colorScheme } from "./color-scheme";
- export { rem } from "./rem";
--export declare const interopComponents: Map<string | object, import("react").ComponentType<{}>>;
-+export { useColorScheme } from "./useColorScheme";
- export declare const cssInterop: CssInterop;
- export declare const remapProps: CssInterop;
--export declare function useColorScheme(): {
--    colorScheme: "light" | "dark" | undefined;
--    setColorScheme: (value: "light" | "dark" | "system") => void;
--    toggleColorScheme: () => void;
--};
- export declare const useUnstableNativeVariable: (name: string) => undefined;
- export declare function vars<T extends Record<`--${string}`, string | number>>(variables: T): Record<string, string>;
- export declare function useSafeAreaEnv(): {} | undefined;
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/api.js b/node_modules/react-native-css-interop/dist/runtime/web/api.js
-index 99eda40..5eb4764 100644
---- a/node_modules/react-native-css-interop/dist/runtime/web/api.js
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/api.js
-@@ -1,17 +1,19 @@
- "use strict";
-+"use client";
- Object.defineProperty(exports, "__esModule", { value: true });
--exports.useSafeAreaEnv = exports.vars = exports.useUnstableNativeVariable = exports.useColorScheme = exports.remapProps = exports.cssInterop = exports.interopComponents = exports.rem = exports.colorScheme = exports.StyleSheet = void 0;
-+exports.useSafeAreaEnv = exports.vars = exports.useUnstableNativeVariable = exports.remapProps = exports.cssInterop = exports.useColorScheme = exports.rem = exports.colorScheme = exports.StyleSheet = void 0;
- const react_1 = require("react");
- const config_1 = require("../config");
--const color_scheme_1 = require("./color-scheme");
- var stylesheet_1 = require("./stylesheet");
- Object.defineProperty(exports, "StyleSheet", { enumerable: true, get: function () { return stylesheet_1.StyleSheet; } });
--var color_scheme_2 = require("./color-scheme");
--Object.defineProperty(exports, "colorScheme", { enumerable: true, get: function () { return color_scheme_2.colorScheme; } });
-+var color_scheme_1 = require("./color-scheme");
-+Object.defineProperty(exports, "colorScheme", { enumerable: true, get: function () { return color_scheme_1.colorScheme; } });
- var rem_1 = require("./rem");
- Object.defineProperty(exports, "rem", { enumerable: true, get: function () { return rem_1.rem; } });
--exports.interopComponents = new Map();
-+const interopComponentsMap_1 = require("./interopComponentsMap");
- const ForwardRefSymbol = Symbol.for("react.forward_ref");
-+var useColorScheme_1 = require("./useColorScheme");
-+Object.defineProperty(exports, "useColorScheme", { enumerable: true, get: function () { return useColorScheme_1.useColorScheme; } });
- const cssInterop = (baseComponent, mapping) => {
-     const configs = (0, config_1.getNormalizeConfig)(mapping);
-     const interopComponent = (0, react_1.forwardRef)(function CssInteropComponent({ ...props }, ref) {
-@@ -56,23 +58,11 @@ const cssInterop = (baseComponent, mapping) => {
-         }
-     });
-     interopComponent.displayName = `CssInterop.${baseComponent.displayName ?? baseComponent.name ?? "unknown"}`;
--    exports.interopComponents.set(baseComponent, interopComponent);
-+    interopComponentsMap_1.interopComponents.set(baseComponent, interopComponent);
-     return interopComponent;
- };
- exports.cssInterop = cssInterop;
- exports.remapProps = exports.cssInterop;
--function useColorScheme() {
--    const [effect, setEffect] = (0, react_1.useState)(() => ({
--        rerun: () => setEffect((s) => ({ ...s })),
--        dependencies: new Set(),
--    }));
--    return {
--        colorScheme: color_scheme_1.colorScheme.get(effect),
--        setColorScheme: color_scheme_1.colorScheme.set,
--        toggleColorScheme: color_scheme_1.colorScheme.toggle,
--    };
--}
--exports.useColorScheme = useColorScheme;
- const useUnstableNativeVariable = (name) => {
-     if (process.env.NODE_ENV !== "production") {
-         console.log("useUnstableNativeVariable is not supported on web.");
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/api.js.map b/node_modules/react-native-css-interop/dist/runtime/web/api.js.map
-index d64992f..38a7312 100644
---- a/node_modules/react-native-css-interop/dist/runtime/web/api.js.map
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/api.js.map
-@@ -1 +1 @@
--{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/runtime/web/api.ts"],"names":[],"mappings":"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"}
-\ No newline at end of file
-+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/runtime/web/api.ts"],"names":[],"mappings":"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"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.d.ts b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.d.ts
-new file mode 100644
-index 0000000..303c043
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.d.ts
-@@ -0,0 +1,2 @@
-+/// <reference types="react" />
-+export declare const interopComponents: Map<string | object, import("react").ComponentType<{}>>;
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js
-new file mode 100644
-index 0000000..3ff844a
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js
-@@ -0,0 +1,5 @@
-+"use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
-+exports.interopComponents = void 0;
-+exports.interopComponents = new Map();
-+//# sourceMappingURL=interopComponentsMap.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js.map b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js.map
-new file mode 100644
-index 0000000..601d610
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/interopComponentsMap.js.map
-@@ -0,0 +1 @@
-+{"version":3,"file":"interopComponentsMap.js","sourceRoot":"","sources":["../../../src/runtime/web/interopComponentsMap.ts"],"names":[],"mappings":";;;AAEa,QAAA,iBAAiB,GAAG,IAAI,GAAG,EAGrC,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.d.ts b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.d.ts
-new file mode 100644
-index 0000000..874a890
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.d.ts
-@@ -0,0 +1,5 @@
-+export declare function useColorScheme(): {
-+    colorScheme: "light" | "dark" | undefined;
-+    setColorScheme: (value: "light" | "dark" | "system") => void;
-+    toggleColorScheme: () => void;
-+};
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js
-new file mode 100644
-index 0000000..9de6ccb
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js
-@@ -0,0 +1,18 @@
-+"use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
-+exports.useColorScheme = void 0;
-+const react_1 = require("react");
-+const color_scheme_1 = require("./color-scheme");
-+function useColorScheme() {
-+    const [effect, setEffect] = (0, react_1.useState)(() => ({
-+        rerun: () => setEffect((s) => ({ ...s })),
-+        dependencies: new Set(),
-+    }));
-+    return {
-+        colorScheme: color_scheme_1.colorScheme.get(effect),
-+        setColorScheme: color_scheme_1.colorScheme.set,
-+        toggleColorScheme: color_scheme_1.colorScheme.toggle,
-+    };
-+}
-+exports.useColorScheme = useColorScheme;
-+//# sourceMappingURL=useColorScheme.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js.map b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js.map
-new file mode 100644
-index 0000000..69f3b00
---- /dev/null
-+++ b/node_modules/react-native-css-interop/dist/runtime/web/useColorScheme.js.map
-@@ -0,0 +1 @@
-+{"version":3,"file":"useColorScheme.js","sourceRoot":"","sources":["../../../src/runtime/web/useColorScheme.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,iDAA6C;AAE7C,SAAgB,cAAc;IAC5B,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAS,GAAG,EAAE,CAAC,CAAC;QAClD,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,YAAY,EAAE,IAAI,GAAG,EAAE;KACxB,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,WAAW,EAAE,0BAAW,CAAC,GAAG,CAAC,MAAM,CAAC;QACpC,cAAc,EAAE,0BAAW,CAAC,GAAG;QAC/B,iBAAiB,EAAE,0BAAW,CAAC,MAAM;KACtC,CAAC;AACJ,CAAC;AAXD,wCAWC"}
-\ No newline at end of file
diff --git a/universal/yarn.lock b/universal/yarn.lock
index 28e851b4..c5cff180 100644
--- a/universal/yarn.lock
+++ b/universal/yarn.lock
@@ -48,11 +48,25 @@
     "@babel/highlight" "^7.24.2"
     picocolors "^1.0.0"
 
+"@babel/code-frame@^7.25.9":
+  version "7.26.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
+  integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.25.9"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
+
 "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.5":
   version "7.23.5"
   resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz"
   integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
 
+"@babel/compat-data@^7.25.9":
+  version "7.26.2"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.2.tgz#278b6b13664557de95b8f35b90d96785850bb56e"
+  integrity sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==
+
 "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.0", "@babel/core@^7.23.9", "@babel/core@^7.24.0":
   version "7.24.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.5.tgz#15ab5b98e101972d171aeef92ac70d8d6718f06a"
@@ -115,6 +129,17 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.25.9":
+  version "7.26.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.2.tgz#87b75813bec87916210e5e01939a4c823d6bb74f"
+  integrity sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==
+  dependencies:
+    "@babel/parser" "^7.26.2"
+    "@babel/types" "^7.26.0"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^3.0.2"
+
 "@babel/helper-annotate-as-pure@^7.22.5":
   version "7.22.5"
   resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz"
@@ -122,6 +147,13 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-annotate-as-pure@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4"
+  integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==
+  dependencies:
+    "@babel/types" "^7.25.9"
+
 "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6":
   version "7.23.6"
   resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz"
@@ -133,6 +165,17 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
+"@babel/helper-compilation-targets@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875"
+  integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==
+  dependencies:
+    "@babel/compat-data" "^7.25.9"
+    "@babel/helper-validator-option" "^7.25.9"
+    browserslist "^4.24.0"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
 "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.15", "@babel/helper-create-class-features-plugin@^7.23.6":
   version "7.23.10"
   resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.10.tgz"
@@ -163,6 +206,19 @@
     "@babel/helper-split-export-declaration" "^7.24.5"
     semver "^6.3.1"
 
+"@babel/helper-create-class-features-plugin@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz#7644147706bb90ff613297d49ed5266bde729f83"
+  integrity sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-member-expression-to-functions" "^7.25.9"
+    "@babel/helper-optimise-call-expression" "^7.25.9"
+    "@babel/helper-replace-supers" "^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
+    semver "^6.3.1"
+
 "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
   version "7.22.15"
   resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz"
@@ -172,6 +228,15 @@
     regexpu-core "^5.3.1"
     semver "^6.3.1"
 
+"@babel/helper-create-regexp-features-plugin@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz#3e8999db94728ad2b2458d7a470e7770b7764e26"
+  integrity sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    regexpu-core "^6.1.1"
+    semver "^6.3.1"
+
 "@babel/helper-define-polyfill-provider@^0.5.0":
   version "0.5.0"
   resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz"
@@ -217,6 +282,14 @@
   dependencies:
     "@babel/types" "^7.24.5"
 
+"@babel/helper-member-expression-to-functions@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz#9dfffe46f727005a5ea29051ac835fb735e4c1a3"
+  integrity sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==
+  dependencies:
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
+
 "@babel/helper-module-imports@^7.22.15":
   version "7.22.15"
   resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz"
@@ -260,11 +333,23 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-optimise-call-expression@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz#3324ae50bae7e2ab3c33f60c9a877b6a0146b54e"
+  integrity sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==
+  dependencies:
+    "@babel/types" "^7.25.9"
+
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.24.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.24.5"
   resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz"
   integrity sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==
 
+"@babel/helper-plugin-utils@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz#9cbdd63a9443a2c92a725cca7ebca12cc8dd9f46"
+  integrity sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==
+
 "@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.20":
   version "7.22.20"
   resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz"
@@ -292,6 +377,15 @@
     "@babel/helper-member-expression-to-functions" "^7.23.0"
     "@babel/helper-optimise-call-expression" "^7.22.5"
 
+"@babel/helper-replace-supers@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz#ba447224798c3da3f8713fc272b145e33da6a5c5"
+  integrity sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.25.9"
+    "@babel/helper-optimise-call-expression" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
+
 "@babel/helper-simple-access@^7.22.5":
   version "7.22.5"
   resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz"
@@ -313,6 +407,14 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-skip-transparent-expression-wrappers@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9"
+  integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==
+  dependencies:
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
+
 "@babel/helper-split-export-declaration@^7.22.6":
   version "7.22.6"
   resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz"
@@ -337,6 +439,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
   integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
 
+"@babel/helper-string-parser@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
+  integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==
+
 "@babel/helper-validator-identifier@^7.22.20":
   version "7.22.20"
   resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"
@@ -347,11 +454,21 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz#918b1a7fa23056603506370089bd990d8720db62"
   integrity sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==
 
+"@babel/helper-validator-identifier@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
+  integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
+
 "@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.23.5":
   version "7.23.5"
   resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz"
   integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
 
+"@babel/helper-validator-option@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72"
+  integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==
+
 "@babel/helper-wrap-function@^7.22.20":
   version "7.22.20"
   resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz"
@@ -408,6 +525,13 @@
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz"
   integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==
 
+"@babel/parser@^7.25.9", "@babel/parser@^7.26.2":
+  version "7.26.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.2.tgz#fd7b6f487cfea09889557ef5d4eeb9ff9a5abd11"
+  integrity sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==
+  dependencies:
+    "@babel/types" "^7.26.0"
+
 "@babel/plugin-proposal-async-generator-functions@^7.0.0":
   version "7.20.7"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz"
@@ -686,6 +810,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-class-properties@^7.0.0-0":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz#a8ce84fedb9ad512549984101fa84080a9f5f51f"
+  integrity sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
 "@babel/plugin-transform-class-properties@^7.22.5":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.1.tgz#bcbf1aef6ba6085cfddec9fc8d58871cf011fc29"
@@ -708,6 +840,18 @@
     "@babel/helper-split-export-declaration" "^7.22.6"
     globals "^11.1.0"
 
+"@babel/plugin-transform-classes@^7.0.0-0":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz#7152457f7880b593a63ade8a861e6e26a4469f52"
+  integrity sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-replace-supers" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
+    globals "^11.1.0"
+
 "@babel/plugin-transform-computed-properties@^7.0.0":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz"
@@ -971,6 +1115,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-unicode-regex@^7.0.0-0":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz#5eae747fe39eacf13a8bd006a4fb0b5d1fa5e9b1"
+  integrity sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
 "@babel/preset-flow@^7.13.13":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.23.3.tgz"
@@ -1071,6 +1223,15 @@
     "@babel/parser" "^7.24.0"
     "@babel/types" "^7.24.0"
 
+"@babel/template@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016"
+  integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==
+  dependencies:
+    "@babel/code-frame" "^7.25.9"
+    "@babel/parser" "^7.25.9"
+    "@babel/types" "^7.25.9"
+
 "@babel/traverse@^7.20.0", "@babel/traverse@^7.23.9":
   version "7.23.9"
   resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz"
@@ -1103,6 +1264,19 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
+"@babel/traverse@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84"
+  integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==
+  dependencies:
+    "@babel/code-frame" "^7.25.9"
+    "@babel/generator" "^7.25.9"
+    "@babel/parser" "^7.25.9"
+    "@babel/template" "^7.25.9"
+    "@babel/types" "^7.25.9"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.0", "@babel/types@^7.24.5", "@babel/types@^7.3.3":
   version "7.24.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.5.tgz#7661930afc638a5383eb0c4aee59b74f38db84d7"
@@ -1121,6 +1295,14 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.25.9", "@babel/types@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff"
+  integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==
+  dependencies:
+    "@babel/helper-string-parser" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.25.9"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -1345,10 +1527,10 @@
     resolve-from "^5.0.0"
     semver "^7.6.0"
 
-"@expo/html-elements@latest":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@expo/html-elements/-/html-elements-0.10.1.tgz#ec2625370cf1d4cb78efa954df45d422532d5ab6"
-  integrity sha512-3PTmtkV15D7+lykXVtvkH1jQ5Y6JE+e3zCaoMMux7z2cSLGQUNwDEUwG37gew3OEB1/E4/SEWgjvg8m7E6/e2Q==
+"@expo/html-elements@0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@expo/html-elements/-/html-elements-0.4.2.tgz#4e9f6b9250af8d0befe3242fd42704cca2421e0e"
+  integrity sha512-lNioCgdtOrCMMqzHY+PCTdyuWBTU4yMBlOzPSkS4YFIWt9bq0zexM2ZJkpybTXmowNdE3zHO93xxAmiA2yDi2w==
 
 "@expo/image-utils@^0.5.0":
   version "0.5.1"
@@ -1552,69 +1734,69 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@gluestack-ui/accordion@latest":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/accordion/-/accordion-1.0.4.tgz#cb1f2a61da033f23df3f83d483e03079c3f8c8f0"
-  integrity sha512-zcoOo0spRUG11mVZk6wgsE22LRq8btYnxrxkrBFekmmE51sU7ccoe0XxwvFfEubRPNlD8VjZyuDYIL452Ha/Xw==
+"@gluestack-ui/accordion@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/accordion/-/accordion-1.0.8.tgz#29486b7ce125a880abf7d55e966f04987989e2d1"
+  integrity sha512-Hcq/mJ6zDaQuqh/2pVbJB8UbB5vyNSYmuRc5dFP5DFZredywPrkEpz2awJodaQRCMBIh8jm6NEYfndMIuRFBTA==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/accordion" "^0.0.2"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/actionsheet@latest":
-  version "0.2.41"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/actionsheet/-/actionsheet-0.2.41.tgz#a9b2b0b02a35fc8d8f3e89560c222cfbf6403ec3"
-  integrity sha512-g4jHSbvL8dOE/Eg8b2ANTwF2aGc4LvD6EqOgdX/233dsGfUH1lbT4NgVbEbBYRc8nyVZE5n3NF/owzRXcWbCPw==
+"@gluestack-ui/actionsheet@^0.2.46":
+  version "0.2.46"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/actionsheet/-/actionsheet-0.2.46.tgz#3efb27d5aa480d5718cc762fa1bc6dfbbc35d1b1"
+  integrity sha512-zZ4t0gLtHeN6pDDBAPduqnB6ySnqKtWcQfdWQF0KSjpicxMmk22kJQEuPbPPurdZKvq2dCpzQMsJUKe1Xar7Sg==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/transitions" "^0.1.10"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/transitions" "^0.1.11"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/dialog" "^0.0.4"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/alert-dialog@latest":
-  version "0.1.28"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/alert-dialog/-/alert-dialog-0.1.28.tgz#c0a37546d23e43bc12e25c8aca4b884fb207e33e"
-  integrity sha512-B1WdDjVmSA3/pz9qvlV9iVQIMSPj7DxN5vGznr6xFo9nJE4C30JidYBwK9VgGFo4qIibRkuzGVNzaZSCGOj4Hg==
+"@gluestack-ui/alert-dialog@^0.1.32":
+  version "0.1.32"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/alert-dialog/-/alert-dialog-0.1.32.tgz#d99b76a676edff2840008f03f4e3f1d2af38c330"
+  integrity sha512-+imIkN0SgEuikQKgevBw2uBUE0ypD4VygGkPGwq/t8WVLlKp/DCz3GQhsiZavkFi/fbXHNNldwOjSP4RjlYfFQ==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/dialog" "^0.0.4"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/alert@latest":
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/alert/-/alert-0.1.14.tgz#a92e042e5a7fa3013f11265f014e761d7ab74817"
-  integrity sha512-eBQTfZrktiTria3/2mWpnEjptvjlVv1Vn3fDs6RBJCqA7k/c5RTfipyawixejRcg5zT+PoWwR11hvnEPv3UDng==
-
-"@gluestack-ui/avatar@^0.1.16":
+"@gluestack-ui/alert@^0.1.16":
   version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/avatar/-/avatar-0.1.16.tgz#87e60a171cd510084ec1d0c5bbe0602b3e771abc"
-  integrity sha512-5and3vzYuv/Si0q2n+5qOp1mmaT5GKgBBNtMBr+/gtYtqxPV299B0AUL513JDSRaDiJHw/gb0Xxaf5VbgJ0UNA==
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/alert/-/alert-0.1.16.tgz#cede162e04c3dcb07a3da797221852bb7c127311"
+  integrity sha512-vE0litmicuKFJFp9TY3mRuZmyH/E24IdHlC0f3FZjfa+AzeOS+bZdKMRix2EYkvBGrA6uNffWUuHeXWQGMRVJQ==
+
+"@gluestack-ui/avatar@^0.1.18":
+  version "0.1.18"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/avatar/-/avatar-0.1.18.tgz#bb890a7b889060e01faf549f59a47d11c04ada1c"
+  integrity sha512-VA9XwtavYLYCWrjxHc2u9gRpV97cPRcr/6KJ4tLiMiQbiRL1b4zckiL+/F39fB6xjUOUQHl3Fjo/Yd8swa0MBg==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
 
-"@gluestack-ui/button@latest":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/button/-/button-1.0.4.tgz#565341ac0dfb199ca392bc878505daedc505d4f7"
-  integrity sha512-azM1D2qRcMs4gnIe8BkbBImIGCTjAAsUbh4vPHEz7sRXCS8wnOfg038EMcni+g8lmHTFb4nOSqAhuTdjRFprDg==
+"@gluestack-ui/button@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/button/-/button-1.0.8.tgz#fb6c1a3e6c59561d0cd6e7d8d0f519034144c66d"
+  integrity sha512-60ZcFd0XWIwoWe35GSf5jdcgpDI4R1LcQr098SYMUoYg3cWNFrbKUIa+cdCtD7oV/crVFjrmyj+6wZpiyDtx5g==
   dependencies:
-    "@gluestack-ui/utils" "0.1.12"
+    "@gluestack-ui/utils" "0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/checkbox@latest":
-  version "0.1.28"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/checkbox/-/checkbox-0.1.28.tgz#e28028d8b789114b70483dfae826226ab6ef3660"
-  integrity sha512-V+FAt1dQro0Pqt4wA7w4Av5kR5lr7O8haqybDwxVjog0Pbp58s237XqbWz/bPx8mvbrU3O0tCdHKsYqdBqZ06g==
+"@gluestack-ui/checkbox@^0.1.33":
+  version "0.1.33"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/checkbox/-/checkbox-0.1.33.tgz#8fc6f6e9b4fe51118abf28b66a82b4667fb7b18b"
+  integrity sha512-sTbjWiqJDzwfIzp1ZUnHV4MnR08+mlfixsBNqJHCUPrcFCvW2DMFyyRKHWdgHj3BJcfPZQH/kYljVGzJQeAetA==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.17"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-aria/visually-hidden" "^3.8.6"
     "@react-native-aria/checkbox" "^0.2.9"
     "@react-native-aria/focus" "^0.2.9"
@@ -1622,78 +1804,79 @@
     "@react-native-aria/utils" "0.2.11"
     "@react-stately/checkbox" "^3.4.2"
 
-"@gluestack-ui/divider@latest":
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/divider/-/divider-0.1.8.tgz#114584279aebc8bf6b718d039c521330051d8e44"
-  integrity sha512-l+OQ1XD5qI20ghxKbpi+pqntRtd0mtkmhfXYLODbjt2eec3U9kpV1xawXpfN/TFd45WWZTpEQ616sOQqFLo3RA==
+"@gluestack-ui/divider@^0.1.10":
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/divider/-/divider-0.1.10.tgz#506ec45f9b5183a0e3b293dbff7b7da19edcfda8"
+  integrity sha512-/hZx1Rmy4Pgln9AwAprAEQcxYPEHjHSNF4xCUWlK/q0peyiMT5Nagt54VnxykVn5A0b2zg5QKP0pOqOF9xeE6w==
 
-"@gluestack-ui/fab@latest":
-  version "0.1.20"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/fab/-/fab-0.1.20.tgz#ea7a9eb7d5512db1b08494d38236e36b24570761"
-  integrity sha512-N1vqn/6hOP1pzvcrKWHgsfhfLGF/wctbjqQQNc/z7Dzy8IbigA84vqD2p/xfp3d7KKDeE7BOPYFGvYNctuSPsg==
+"@gluestack-ui/fab@^0.1.22":
+  version "0.1.22"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/fab/-/fab-0.1.22.tgz#46861c5d886f5304fb8cf67033012cb4cc2d3239"
+  integrity sha512-kemsTSOFu18fL0stTAJ5O1FXcrDW2FULNpq3wJJT5aBiwHhQhvWHq1Dyzn/7kT2jSHrvNHDsTzzTcDzGIgVqmg==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/form-control@^0.1.16", "@gluestack-ui/form-control@^0.1.17", "@gluestack-ui/form-control@latest":
-  version "0.1.17"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/form-control/-/form-control-0.1.17.tgz#f3f4f83a38b2533c1fbbfed5e60cf4a946104601"
-  integrity sha512-ctmbce3Tf/rpZyXSleOI2aUrOZEa/t7ubaB61F9Y0CauoaELMHrfSr4UZ5y4GC7z7pwvLXtMEpzEWvDQ9Af9Bg==
+"@gluestack-ui/form-control@^0.1.19":
+  version "0.1.19"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/form-control/-/form-control-0.1.19.tgz#7a75b65f5ec89da95c30442750d6f7af71db6868"
+  integrity sha512-6YbPbi/RZrXc5DyVPbxPV17FYaBoEl1yAdSwut8iE6n+yQekjluINrh2q5ZPWF2SGmyo7VSNcL85yeU5I97xHg==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/hooks@0.1.11":
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/hooks/-/hooks-0.1.11.tgz#6b925d1dc4ac853cc24b0702e62b73224e375b7c"
-  integrity sha512-bcBsF7bTo//JD6L9ekJu0rZs83qYD/pE/Uj3ih3OYEtGU0LDoYiGkBMmDRpVMcVv8bE3TCKivnhHaT/heafInA==
+"@gluestack-ui/hooks@0.1.12":
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/hooks/-/hooks-0.1.12.tgz#4a92de73eec7b6ba6fc8e781c23417252993c95c"
+  integrity sha512-jMZS+aIPYvouRKkWUzOYFKeWyt+YFIojYFuSq8sNZTjAq72xtiKZQKxNwOgTorEDD4CAIk0bncRS0TneNSuMAA==
 
-"@gluestack-ui/icon@latest":
-  version "0.1.21"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/icon/-/icon-0.1.21.tgz#b2d2fd787d85de4e906352bce8630e9625e6d9cd"
-  integrity sha512-QZsx/MUS9AVjMka1mOcDPH6NDvPHQpp/nYEBD8M8pqj6C3SPtLbNAQJNWewy7WQTAsUdJblk6mUayq7LDrkQtA==
+"@gluestack-ui/icon@^0.1.24-alpha.0":
+  version "0.1.24-alpha.0"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/icon/-/icon-0.1.24-alpha.0.tgz#2315eb76fe14801056bdc5f6083fe5ec8461216c"
+  integrity sha512-PHLG/BnEw4eUNLmsZ7aMHAPPMcD0GizNHE8e+88m9h0+6Qb5HJ9sQi2qnhviO2JRyDi2z2pR1XNLuOlhzkKJag==
   dependencies:
-    "@gluestack-ui/provider" "^0.1.6"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/provider" "^0.1.13"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/image@latest":
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/image/-/image-0.1.9.tgz#cbab6569c10108d7bd60cff96d923ed308ac5845"
-  integrity sha512-Qalp99NrOz/AQM95fYhrKtO7+6s5vtgd8OkxGkdlU+HMiI0m6cDbQRG5jSE5M+RmWJLajfCmKYlNIg2rIj68HA==
+"@gluestack-ui/image@^0.1.11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/image/-/image-0.1.11.tgz#f7e624a4cdfc227a068e28331db457f31e7e1c94"
+  integrity sha512-Zg9+vdNr6jwM71RBxROzTSyNfLFOncBVSZfJX7nJ4N/8cRsSwbYCDJqt+UYe/+I1KYIpHCAICdgsJdas/lthkw==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/input@latest":
-  version "0.1.29"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/input/-/input-0.1.29.tgz#b4d884015ee3c9f94798fa9c4542f296c999e096"
-  integrity sha512-nrgE9NKL1qMleHhxZ7a0aS/A04b5U+ZliapQYoBV4t1TjJIyqpJcXIxQnXWp/JwHoWogJc+yZXAJnwcPK+bbeg==
+"@gluestack-ui/input@^0.1.32":
+  version "0.1.32"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/input/-/input-0.1.32.tgz#d4d64e43938b2cf9ee3f816fa774d08333305d28"
+  integrity sha512-RWtqpo0p37GYjwBTiMf4fpvKYe32OMa6lxFbDqPqEX1m994D9QwP7iWnDWA/9nr/Mf3eET6dMWbH4/eL4oZr8Q==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.17"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/link@latest":
-  version "0.1.20"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/link/-/link-0.1.20.tgz#983842b822093c3025642b33ce456a51f47cf49b"
-  integrity sha512-htYxFh2n1yJAq8JUGNMzOY4RV3F3+yD6QHCt5JpOo3ZBIyOZUMrLzPIaFmDPNRwb2sbzCFYZhK5Qk6v7IsWxPQ==
+"@gluestack-ui/link@^0.1.23":
+  version "0.1.23"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/link/-/link-0.1.23.tgz#624fa5adfbb7951529a7e48003d5bca926dd8ef3"
+  integrity sha512-j/YIdlq6V+Ad8c6X1EVL4jUI/Zo/L9S6WLZYPKNArlidRxjEME7d2maIl2O20ZcRSOHvee2VAf7HHNem+Jn+AA==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/menu@latest":
-  version "0.2.33"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/menu/-/menu-0.2.33.tgz#25d2cebf867a97cd893810523256b1c892c83a93"
-  integrity sha512-jHGxqHrSCK0zji9kCY4VIXW5vEVCnQbeTQr7BEbvlSzhnA+ISoqQB/KX4GKGHkZEC60YwQJ8nYoqMeyPFvHt1A==
+"@gluestack-ui/menu@^0.2.37":
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/menu/-/menu-0.2.37.tgz#094f365d07648792e6b5081533b9592afc64ddfa"
+  integrity sha512-2XxDG4pNPygtKe6icI1SN9HdlDS3nqPd3CiJ8HSHsTywjCDHZbm6zBamK9evWiOuKArGaNtcjEtXEm6lm56CFw==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
+    "@react-aria/menu" "^3.14.1"
     "@react-aria/overlays" "^3.19.0"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
@@ -1702,180 +1885,180 @@
     "@react-stately/utils" "^3.6.0"
     react-stately "^3.21.0"
 
-"@gluestack-ui/modal@latest":
-  version "0.1.32"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/modal/-/modal-0.1.32.tgz#f7d79d94349e4063aeafa55698313b9ed88941b5"
-  integrity sha512-nqAxbw6hdbHgt4sQR/JCRcwpr4avI4CD1E03Xu+nbfo86qeFi8LgzgSRkoxFQ3pDb0Mej6L/QdZ3RKMpcBPwRg==
+"@gluestack-ui/modal@^0.1.35":
+  version "0.1.35"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/modal/-/modal-0.1.35.tgz#5ed5df4b999926bc13456d94a2ae4fc647b98e16"
+  integrity sha512-KfA2aJ/ZsdM5rggAAJOykVHsOZf7aYjTfDNsd5JHUC7Uo8IrQAZJBX1DEz+Y3V8dPMXEIlEFGMaVh4o29nZXcw==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/dialog" "^0.0.4"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/overlays" "^0.3.12"
 
-"@gluestack-ui/nativewind-utils@latest":
-  version "1.0.20"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/nativewind-utils/-/nativewind-utils-1.0.20.tgz#24c6a9fa1c81d69a22b36ea42ccac849d69f776e"
-  integrity sha512-WnZc0u0jP6i0/KrYIy0iXRSnqrxoLUeEA1k/YN2eNbnCPBP4b55GMfBlGSln1/chWEUuDJHFEI7XlojcQDaIHw==
+"@gluestack-ui/nativewind-utils@^1.0.26-alpha.2":
+  version "1.0.26-alpha.2"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/nativewind-utils/-/nativewind-utils-1.0.26-alpha.2.tgz#c3ae0459f12e0187d985082681434d9ed7544cf4"
+  integrity sha512-YTIm6xLu/TBlnqWOE67cjcHFN7x1FE9iMPyspFD63lE8k58ZV5e9GngzS+HXQ+vfoumPMfY/Gxi5RJhIYy/tWA==
   dependencies:
     find-yarn-workspace-root "^2.0.0"
     patch-package "8.0.0"
     tailwind-variants "0.1.20"
 
-"@gluestack-ui/overlay@^0.1.12", "@gluestack-ui/overlay@^0.1.14", "@gluestack-ui/overlay@^0.1.7", "@gluestack-ui/overlay@latest":
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/overlay/-/overlay-0.1.14.tgz#2889f7a4f1234b1716d280e81da01eac4b5f356c"
-  integrity sha512-luLb6HRjF51PLfJC1RoEmdcC75WFN9x2jyMh9hTw2UPCzPKi7H0sTLgzyQwyJd57pH06otlJSzzVBxT7VV9QXw==
+"@gluestack-ui/overlay@0.1.16", "@gluestack-ui/overlay@^0.1.15", "@gluestack-ui/overlay@^0.1.16":
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/overlay/-/overlay-0.1.16.tgz#1902a0985c45dd829ed13892935a360be3f6fe2c"
+  integrity sha512-08QFwioMroNia33Fe1zqhHjUL/CErr2swMMcN6vNWNWad6VfwXx3dZIXJxCIL1W90Rz908pWfIGrQEYaT6VAkw==
   dependencies:
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/overlays" "^0.3.12"
 
-"@gluestack-ui/popover@latest":
-  version "0.1.34"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/popover/-/popover-0.1.34.tgz#b91f4087c69af027c20f5a1659e91f0b54b33da5"
-  integrity sha512-Fr+VB+OWDsF55weCav2f2mtJG3b7xIIo1MC+4xWI4OmpuhGDJ4ixWic57mhtliRnHiJT+3Iyb6hJ2veT6u424Q==
+"@gluestack-ui/popover@^0.1.43":
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/popover/-/popover-0.1.43.tgz#7a9a4af29fecac0019cbec204a4f063c82ac5e0d"
+  integrity sha512-O+pcLWze+H/1fIzn+0Kx7rPgjOzXoUM4eVAM2f/vmqZ0g3hciT/2voNi2lV5mwwtfZOfNlWkgJZQHQ+DIkQx6g==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/dialog" "^0.0.4"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
-    "@react-native-aria/overlays" "^0.3.12"
+    "@react-native-aria/overlays" "0.3.14"
 
-"@gluestack-ui/pressable@latest":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/pressable/-/pressable-0.1.16.tgz#b204b17a1f26c20a9cc8ba2c0af132bc91697fc0"
-  integrity sha512-SGUqCCZyMgRtlDN5mO7CN0NM+NMG9S2M3BdhdjI48Jnaks1DdWxzZeaD5xlEhg+Ww/KtmGzVrlSKqPDvVyROiA==
+"@gluestack-ui/pressable@^0.1.17":
+  version "0.1.17"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/pressable/-/pressable-0.1.17.tgz#96a09dc05e3b6beba8201dd83f6c19dafc875fff"
+  integrity sha512-tmyxyNsCCzF0spHwE6CcNq6WretE/Q42EQqvSGKvqk+HHetHGYdLdnWQ2jIxvdmFYXXqBwm5VbC0C8tzbc9A0w==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
 
-"@gluestack-ui/progress@latest":
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/progress/-/progress-0.1.14.tgz#4092596c2ace6edcad28f3896800a3f18eb1a4c7"
-  integrity sha512-06ZiHV5JfCOvy+LVgTf91xoNrqVxHXsLJW5J2RphnAV2BsuPfE9Us99nt2NcEYkqK+gSN1rTk4yGZ7RA64DS9g==
+"@gluestack-ui/progress@^0.1.18":
+  version "0.1.18"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/progress/-/progress-0.1.18.tgz#9a659115b4579fee057c2d13bbc52e9e080a6958"
+  integrity sha512-WQCLdvqoiIIQnLBXG7+HDTREMbUfEy9rV7FuBMcBBqEFILuVT1W4hyuXLz/CPrUoCWZJ8OUKvLZvaWWzW8pA9Q==
   dependencies:
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
 
-"@gluestack-ui/provider@^0.1.6":
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/provider/-/provider-0.1.12.tgz#9694c23c7a50cb9567b9433602b66f483ee4dc0e"
-  integrity sha512-EvDEknx6qkrJuKC8ygdixiTvnAAji9moArREueNJdhJp8Af53UIzgWk4m4oqGlRfgrw6p1xApgE/2VTwGE5f7w==
+"@gluestack-ui/provider@^0.1.13":
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/provider/-/provider-0.1.13.tgz#4df09fa12655624688dc00fc24b58de36d72d739"
+  integrity sha512-kJaELgfowTBsJ90XIHW70LsvEg5PKdtmrjfmaU+Hea1spAPgPDh1z5gpmfVoUiZipUUdZoiUgnHbkVh5OMar4g==
   dependencies:
     "@react-native-aria/interactions" "0.2.13"
     tsconfig "7"
-    typescript "^4.9.4"
+    typescript "^5.6.3"
 
-"@gluestack-ui/radio@latest":
-  version "0.1.29"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/radio/-/radio-0.1.29.tgz#e31f3faab25ba2902bf08d0dffe47c9ce1d2827b"
-  integrity sha512-npPrKKLN5vMRYxL3nKBGLCMPz1azfD6Mb30Mwk2GHEaN3ib13BmpMKvXr4DyDkQUeicnGGLE/secZQG3iQPpkg==
+"@gluestack-ui/radio@^0.1.34":
+  version "0.1.34"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/radio/-/radio-0.1.34.tgz#939b18372ac6b032d563f0e54b2a730b84e3e196"
+  integrity sha512-6izkm5t+rbmPemkpIh0k9F9E3UdIFqbzKT6+WMUbmcaiHeTmWhI0njPiA0S8ge+RpKHXZmXgbiRK1TVkvu17Hw==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.17"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-aria/visually-hidden" "^3.7.0"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/radio" "^0.2.10"
     "@react-stately/radio" "^3.8.1"
 
-"@gluestack-ui/react-native-aria@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/react-native-aria/-/react-native-aria-0.1.5.tgz#604b6ca22364841d644f6b2911f8f5b776a7cea9"
-  integrity sha512-6IaE4fcBaGMu3kSDKAoo1wE5qXcoKDX5YA14zzYzXN2d67/K9NYSjpoo/GbxDWZVl45X6Z9QLS/SBP7SmsPO+Q==
+"@gluestack-ui/react-native-aria@^0.1.6":
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/react-native-aria/-/react-native-aria-0.1.6.tgz#5b0292fe1b7794743c5ab92dd6bc35741cbffb33"
+  integrity sha512-uLsdiTacS6iBVvk/+6Vvh2AJN9u0OzTvT0FqTiM8vgtesZvSBpv1DN1o5cQR+C/7s56yujdjRXzmRarknm60Qg==
   dependencies:
-    "@react-native-aria/focus" "^0.2.7"
+    "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/select@latest":
-  version "0.1.26"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/select/-/select-0.1.26.tgz#f1112eb8c327b5da2b2caca9e10b189a2be42fdb"
-  integrity sha512-gclLFh3zI1RF2/ViKg7e3EF+ZVf6aNPa45KZFdvHlt3Po8QITtzeK0OXWT/xyb2MtNztNcuILbcCC4GhVNuFIA==
+"@gluestack-ui/select@^0.1.30":
+  version "0.1.30"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/select/-/select-0.1.30.tgz#96a22e4702d228feeb05e2c630e613615f5bf79a"
+  integrity sha512-P47rX2vV6cX73Xvqgj3OyQC3Iw2Hj1r2jffdV2Ch+RzYGAbK97jfLJSG/MyK8awelw8s9r0U9VYgT8eez90ehg==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.16"
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/slider@latest":
-  version "0.1.23"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/slider/-/slider-0.1.23.tgz#a70417fb597aabeae0d7e3918237195c91280e22"
-  integrity sha512-8lIK03uFJwGaaoFdpnJ0mnCi/jK3y98HphbK34AwDpMFCHbjrG80jNz5YsoX7qTHgDQKwuADlHr7jprC9PM4gA==
+"@gluestack-ui/slider@^0.1.26":
+  version "0.1.26"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/slider/-/slider-0.1.26.tgz#09abc0152e268e202605e3a0538a792d704a7e45"
+  integrity sha512-Fe7ab1RBPilWamYHU5M5uA7GK+9PmISkliye+PToYkJRpp43mOa5llKCaViQ3aALnhI7GAawcJtbSsvUTpFEvw==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.16"
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-aria/visually-hidden" "^3.8.1"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/slider" "^0.2.11"
     "@react-stately/slider" "^3.2.4"
 
-"@gluestack-ui/spinner@latest":
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/spinner/-/spinner-0.1.14.tgz#b0afb1e310b409b343d6f59f9127642a97ce224b"
-  integrity sha512-6uLUvyJMhYR/sIMU/purfaYPqaKiLqnBi0n0LiWRsJNGDgENqdWVHMJpGTdWaFuCLxumZ7xnp0wG2KAdG9UyyQ==
+"@gluestack-ui/spinner@^0.1.15":
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/spinner/-/spinner-0.1.15.tgz#712276227568476f55672b7bbe0082478c0c0a65"
+  integrity sha512-jkXOGhna05HM2tcPKbA+t+vqcVRgRowwC6ES0A9kY5fcuURH1V41UFx/YWyHdSsHwmWlIoCCdWycF78UbNVdPg==
 
-"@gluestack-ui/switch@latest":
-  version "0.1.21"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/switch/-/switch-0.1.21.tgz#3d498ac175782ec6e93427c6f3c427adfc5e63a0"
-  integrity sha512-mtntQcMWDMPgmEvBuan/svi3yt1ENiYsC+XvgKTIG5IFT8kZP6sgRZu12Jfu5vf8/fAfpe+nMqIgCgDzJ1xFbQ==
+"@gluestack-ui/switch@^0.1.23":
+  version "0.1.23"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/switch/-/switch-0.1.23.tgz#4a1ba812a34be5a626ad6b1f55b3bc54cbabc3c8"
+  integrity sha512-Ur2EMsDyXMTUdXcvrs24InpXpqY0Mq2BhzfxdfvDWXEuPGn6+UFokIBTUE7HwHBWp07Gjqj6WGDiGnhKJMuT+w==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.16"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-stately/toggle" "^3.4.4"
 
-"@gluestack-ui/textarea@latest":
-  version "0.1.21"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/textarea/-/textarea-0.1.21.tgz#af438e71a5d1eb613ca0a2662d5077e3c475e5c5"
-  integrity sha512-Ykzf03oPIErXVf4+9MuCtehc/q2IvU5OxW1Uhr1J/DQSHshcviUhWzYnNbXvDR+wluqojGRALynqzOfXFj2ONw==
+"@gluestack-ui/textarea@^0.1.24":
+  version "0.1.24"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/textarea/-/textarea-0.1.24.tgz#bf3f6379ec49fec21e30aea2ccf79865ecee3625"
+  integrity sha512-maABWaI+Vif9S5twBVzcF1pqv43NMigYuKNM7aNZA5+Mzi3/cf3esPpYjB2VFg3r3VKLZq9JbVFkgLq9MauFxw==
   dependencies:
-    "@gluestack-ui/form-control" "^0.1.17"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/form-control" "^0.1.19"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/toast@latest":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/toast/-/toast-1.0.4.tgz#b4e33b60d0ded2438b598d03a25d6ac5427308da"
-  integrity sha512-GVEESsSl567OR/0JlVTuivK6G1EgfEC7N+CAuH6lx+s87qXcOMXeFAgltp6Mxl8g0g5hTPLWrDts2qQLzqwFOA==
+"@gluestack-ui/toast@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/toast/-/toast-1.0.8.tgz#af77d31fdf5fc440041c3a4e08ede4dd2b950e66"
+  integrity sha512-Lwa8YU6rvmo9JhBAiSJZZoSyuyvZMKnBHcDJc+cPTd6OYybHF4bcEAEXQRQRu86EY0SfU63trCC3hEbXaSFWCg==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.12"
-    "@gluestack-ui/transitions" "^0.1.10"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/transitions" "^0.1.11"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/tooltip@latest":
-  version "0.1.30"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/tooltip/-/tooltip-0.1.30.tgz#15f5ef1202e21fd02df2cc999b258be68a09d13d"
-  integrity sha512-Z3HModlriqqnC7Jgk0s5aPwEamHfrMF11TKn3d/LyTMUQj9ZxoAD9IWT0rRvPU2/VXlydJHXbG0smnD6xVlHtA==
+"@gluestack-ui/tooltip@^0.1.36-alpha.0":
+  version "0.1.36-alpha.0"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/tooltip/-/tooltip-0.1.36-alpha.0.tgz#ff435e8709967688814b377a49456fab014f7a8c"
+  integrity sha512-pKlbOp3n2U3AXpS3Yz7a1u2mwmE1AFeeTctsz8DfA+8LTn0d34O76dKMkJxjY84kAKfSPq3Yi4oAxgobQLoeww==
   dependencies:
-    "@gluestack-ui/hooks" "0.1.11"
-    "@gluestack-ui/overlay" "^0.1.14"
-    "@gluestack-ui/utils" "^0.1.12"
+    "@gluestack-ui/hooks" "0.1.12"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/utils" "^0.1.14"
     "@react-native-aria/focus" "^0.2.9"
     "@react-native-aria/interactions" "0.2.13"
     "@react-native-aria/overlays" "^0.3.12"
 
-"@gluestack-ui/transitions@^0.1.10":
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/transitions/-/transitions-0.1.10.tgz#53e563dc0030bac020437ec3493e1bcda5373bab"
-  integrity sha512-oOwYAmbebAowDCDZyRdGwhK2of46b642OZQxBBkln/BX7YEvY4PhQIfup0HUCG9YA5IzlQnw0iwqREbaVNKIgA==
+"@gluestack-ui/transitions@^0.1.11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/transitions/-/transitions-0.1.11.tgz#e84a9841fabb8e67ce17cea979a1cd77b5edac56"
+  integrity sha512-GuCprzasuU8GKXm1GUmaVJ1Njiq72pQ4Ni0g+rg6kRQ7hyR0K4d0wdHRyFldHKmfLcQkM3i70rvYq/468hLKLw==
   dependencies:
-    "@gluestack-ui/overlay" "^0.1.7"
-    "@gluestack-ui/react-native-aria" "^0.1.5"
-    "@gluestack-ui/utils" "^0.1.9"
-    "@react-native-aria/focus" "^0.2.7"
+    "@gluestack-ui/overlay" "^0.1.16"
+    "@gluestack-ui/react-native-aria" "^0.1.6"
+    "@gluestack-ui/utils" "^0.1.14"
+    "@react-native-aria/focus" "^0.2.9"
 
-"@gluestack-ui/utils@0.1.12", "@gluestack-ui/utils@^0.1.12", "@gluestack-ui/utils@^0.1.9":
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/@gluestack-ui/utils/-/utils-0.1.12.tgz#0bb3400c9315fb6c0fd1bc697b20d80f82cd3899"
-  integrity sha512-OhOkljhr7foCUJP//8LwMN3EX4/pniFWmQpk1yDJMQL9DaTJbP7s3HsnTM7UzH2kp9DR1Utoz9Y9WscH3ajLpQ==
+"@gluestack-ui/utils@0.1.14", "@gluestack-ui/utils@^0.1.14":
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/@gluestack-ui/utils/-/utils-0.1.14.tgz#83af7f58716fe9ec7ea7dc358a791d33b8271cd7"
+  integrity sha512-dGe2LWJi8KcNmfM/Nt/WAT0I5s2F/Lud7nR/gTyksdLs9AZ8YoRkKt0s4q0ofz6ku1yEHDLa/YOuk2+APd8qNQ==
   dependencies:
     "@react-native-aria/focus" "^0.2.9"
 
@@ -1938,6 +2121,13 @@
   dependencies:
     "@swc/helpers" "^0.5.0"
 
+"@internationalized/date@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@internationalized/date/-/date-3.6.0.tgz#b30d43030bfed1855f20c9503606926d75bfdf64"
+  integrity sha512-+z6ti+CcJnRlLHok/emGEsWQhe7kfSmEW+/6qCzvKY67YPh7YOBfvc7+/+NXq+zJlbArg30tYpqLjNgcAYv2YQ==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
 "@internationalized/message@^3.1.3":
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/@internationalized/message/-/message-3.1.3.tgz#9b6138ce78d8cfb256649c1ce12895214cb538ab"
@@ -1946,6 +2136,14 @@
     "@swc/helpers" "^0.5.0"
     intl-messageformat "^10.1.0"
 
+"@internationalized/message@^3.1.6":
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/@internationalized/message/-/message-3.1.6.tgz#e5a832788a17214bfb3e5bbf5f0e23ed2f568ad7"
+  integrity sha512-JxbK3iAcTIeNr1p0WIFg/wQJjIzJt9l/2KNY/48vXV7GRGZSv3zMxJsce008fZclk2cDC8y0Ig3odceHO7EfNQ==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+    intl-messageformat "^10.1.0"
+
 "@internationalized/number@^3.5.2":
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/@internationalized/number/-/number-3.5.2.tgz#2edc8e830268dca7283dad6def728f34eb5b7fdc"
@@ -1953,6 +2151,13 @@
   dependencies:
     "@swc/helpers" "^0.5.0"
 
+"@internationalized/number@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@internationalized/number/-/number-3.6.0.tgz#dc6ba20c41b25eb605f1d5cac7d8668e9022c224"
+  integrity sha512-PtrRcJVy7nw++wn4W2OuePQQfTqDzfusSuY1QTtui4wa7r+rGVtR75pO8CyKvHvzyQYi3Q1uO5sY0AsB4e65Bw==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
 "@internationalized/string@^3.2.2":
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/@internationalized/string/-/string-3.2.2.tgz#658e34d61ead5fb9b19b2bbdfbb4a8af3e239abe"
@@ -1960,6 +2165,13 @@
   dependencies:
     "@swc/helpers" "^0.5.0"
 
+"@internationalized/string@^3.2.5":
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/@internationalized/string/-/string-3.2.5.tgz#2f387b256e79596a2e62ddd5e15c619fe241189c"
+  integrity sha512-rKs71Zvl2OKOHM+mzAFMIyqR5hI1d1O6BBkMK2/lkfg3fkmVh9Eeg0awcA8W2WqYqDOv6a86DIOlFpggwLtbuw==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -2265,10 +2477,10 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@legendapp/motion@latest":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@legendapp/motion/-/motion-2.3.0.tgz#1fce718884d0b98f5a77b4b5a2f6e43885c7a7e9"
-  integrity sha512-LtTD06eyz/Ge23FAR6BY+i9Gsgr/ZgxE12FneML8LrZGcZOSPN2Ojz3N2eJaTiA50kqoeqrGCaYJja8KgKpL6Q==
+"@legendapp/motion@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@legendapp/motion/-/motion-2.4.0.tgz#eef6f934b784e07fe94631d5648d412f34fa0c6b"
+  integrity sha512-AAYpRLGvxGD5hIGl9sVHyoUufr66zoH82PuxYcKiPSMdCBI3jwZFWh6CuHjV1leRKVIRk2py1rSvIVabG8eqcw==
   dependencies:
     "@legendapp/tools" "2.0.1"
 
@@ -2277,10 +2489,10 @@
   resolved "https://registry.yarnpkg.com/@legendapp/tools/-/tools-2.0.1.tgz#995fe6cb3e2398b939f645505aa8e1abc84bd07f"
   integrity sha512-Kxt0HWvWElRK6oybHRzcYxdgaKGwuaiRNreS7usW7QuHXRIHaH4yMcW2YNRG4DHE5fpefv+Bno/BohQcCE4FaA==
 
-"@next/env@13.5.6":
-  version "13.5.6"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.5.6.tgz#c1148e2e1aa166614f05161ee8f77ded467062bc"
-  integrity sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==
+"@next/env@13.5.7":
+  version "13.5.7"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.5.7.tgz#5006f4460a7fa598a03e1c2aa4e59e45c71082d3"
+  integrity sha512-uVuRqoj28Ys/AI/5gVEgRAISd0KWI0HRjOO1CTpNgmX3ZsHb5mdn14Y59yk0IxizXdo7ZjsI2S7qbWnO+GNBcA==
 
 "@next/env@14.1.0":
   version "14.1.0"
@@ -2294,90 +2506,90 @@
   dependencies:
     glob "7.1.7"
 
-"@next/swc-darwin-arm64@13.5.6":
-  version "13.5.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz#b15d139d8971360fca29be3bdd703c108c9a45fb"
-  integrity sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA==
+"@next/swc-darwin-arm64@13.5.7":
+  version "13.5.7"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.7.tgz#b99b91c04a884ba1272a3bd5db2b6f47a5bb10c2"
+  integrity sha512-7SxmxMex45FvKtRoP18eftrDCMyL6WQVYJSEE/s7A1AW/fCkznxjEShKet2iVVzf89gWp8HbXGaL4hCaseux6g==
 
 "@next/swc-darwin-arm64@14.1.0":
   version "14.1.0"
   resolved "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.0.tgz"
   integrity sha512-nUDn7TOGcIeyQni6lZHfzNoo9S0euXnu0jhsbMOmMJUBfgsnESdjN97kM7cBqQxZa8L/bM9om/S5/1dzCrW6wQ==
 
-"@next/swc-darwin-x64@13.5.6":
-  version "13.5.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.6.tgz#9c72ee31cc356cb65ce6860b658d807ff39f1578"
-  integrity sha512-6cgBfxg98oOCSr4BckWjLLgiVwlL3vlLj8hXg2b+nDgm4bC/qVXXLfpLB9FHdoDu4057hzywbxKvmYGmi7yUzA==
+"@next/swc-darwin-x64@13.5.7":
+  version "13.5.7"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.7.tgz#0a30d1c40430ed09ef4384bd90148e68badbf5e5"
+  integrity sha512-6iENvgyIkGFLFszBL4b1VfEogKC3TDPEB6/P/lgxmgXVXIV09Q4or1MVn+U/tYyYmm7oHMZ3oxGpHAyJ80nA6g==
 
 "@next/swc-darwin-x64@14.1.0":
   version "14.1.0"
   resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.0.tgz#0863a22feae1540e83c249384b539069fef054e9"
   integrity sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==
 
-"@next/swc-linux-arm64-gnu@13.5.6":
-  version "13.5.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.6.tgz#59f5f66155e85380ffa26ee3d95b687a770cfeab"
-  integrity sha512-txagBbj1e1w47YQjcKgSU4rRVQ7uF29YpnlHV5xuVUsgCUf2FmyfJ3CPjZUvpIeXCJAoMCFAoGnbtX86BK7+sg==
+"@next/swc-linux-arm64-gnu@13.5.7":
+  version "13.5.7"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.7.tgz#f6464e423186494d44ae9544c76b50e661682bc0"
+  integrity sha512-P42jDX56wu9zEdVI+Xv4zyTeXB3DpqgE1Gb4bWrc0s2RIiDYr6uKBprnOs1hCGIwfVyByxyTw5Va66QCdFFNUg==
 
 "@next/swc-linux-arm64-gnu@14.1.0":
   version "14.1.0"
   resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.0.tgz#893da533d3fce4aec7116fe772d4f9b95232423c"
   integrity sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==
 
-"@next/swc-linux-arm64-musl@13.5.6":
-  version "13.5.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.6.tgz#f012518228017052736a87d69bae73e587c76ce2"
-  integrity sha512-cGd+H8amifT86ZldVJtAKDxUqeFyLWW+v2NlBULnLAdWsiuuN8TuhVBt8ZNpCqcAuoruoSWynvMWixTFcroq+Q==
+"@next/swc-linux-arm64-musl@13.5.7":
+  version "13.5.7"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.7.tgz#88b62e006d00fc31359723f96cbd601132812873"
+  integrity sha512-A06vkj+8X+tLRzSja5REm/nqVOCzR+x5Wkw325Q/BQRyRXWGCoNbQ6A+BR5M86TodigrRfI3lUZEKZKe3QJ9Bg==
 
 "@next/swc-linux-arm64-musl@14.1.0":
   version "14.1.0"
   resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.0.tgz#d81ddcf95916310b8b0e4ad32b637406564244c0"
   integrity sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==
 
-"@next/swc-linux-x64-gnu@13.5.6":
-  version "13.5.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.6.tgz#339b867a7e9e7ee727a700b496b269033d820df4"
-  integrity sha512-Mc2b4xiIWKXIhBy2NBTwOxGD3nHLmq4keFk+d4/WL5fMsB8XdJRdtUlL87SqVCTSaf1BRuQQf1HvXZcy+rq3Nw==
+"@next/swc-linux-x64-gnu@13.5.7":
+  version "13.5.7"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.7.tgz#68d31a7c75f1b0dbc408f9fe49ac878c6723446c"
+  integrity sha512-UdHm7AlxIbdRdMsK32cH0EOX4OmzAZ4Xm+UVlS0YdvwLkI3pb7AoBEoVMG5H0Wj6Wpz6GNkrFguHTRLymTy6kw==
 
 "@next/swc-linux-x64-gnu@14.1.0":
   version "14.1.0"
   resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.0.tgz#18967f100ec19938354332dcb0268393cbacf581"
   integrity sha512-zJ2pnoFYB1F4vmEVlb/eSe+VH679zT1VdXlZKX+pE66grOgjmKJHKacf82g/sWE4MQ4Rk2FMBCRnX+l6/TVYzQ==
 
-"@next/swc-linux-x64-musl@13.5.6":
-  version "13.5.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.6.tgz#ae0ae84d058df758675830bcf70ca1846f1028f2"
-  integrity sha512-CFHvP9Qz98NruJiUnCe61O6GveKKHpJLloXbDSWRhqhkJdZD2zU5hG+gtVJR//tyW897izuHpM6Gtf6+sNgJPQ==
+"@next/swc-linux-x64-musl@13.5.7":
+  version "13.5.7"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.7.tgz#09c9c3c667abd55f2af0b4e464342350baeabdb3"
+  integrity sha512-c50Y8xBKU16ZGj038H6C13iedRglxvdQHD/1BOtes56gwUrIRDX2Nkzn3mYtpz3Wzax0gfAF9C0Nqljt93IxvA==
 
 "@next/swc-linux-x64-musl@14.1.0":
   version "14.1.0"
   resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.0.tgz#77077cd4ba8dda8f349dc7ceb6230e68ee3293cf"
   integrity sha512-rbaIYFt2X9YZBSbH/CwGAjbBG2/MrACCVu2X0+kSykHzHnYH5FjHxwXLkcoJ10cX0aWCEynpu+rP76x0914atg==
 
-"@next/swc-win32-arm64-msvc@13.5.6":
-  version "13.5.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.6.tgz#a5cc0c16920485a929a17495064671374fdbc661"
-  integrity sha512-aFv1ejfkbS7PUa1qVPwzDHjQWQtknzAZWGTKYIAaS4NMtBlk3VyA6AYn593pqNanlicewqyl2jUhQAaFV/qXsg==
+"@next/swc-win32-arm64-msvc@13.5.7":
+  version "13.5.7"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.7.tgz#3314966f960a22ee95adb8285e0927c9e4ba7205"
+  integrity sha512-NcUx8cmkA+JEp34WNYcKW6kW2c0JBhzJXIbw+9vKkt9m/zVJ+KfizlqmoKf04uZBtzFN6aqE2Fyv2MOd021WIA==
 
 "@next/swc-win32-arm64-msvc@14.1.0":
   version "14.1.0"
   resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.0.tgz#5f0b8cf955644104621e6d7cc923cad3a4c5365a"
   integrity sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==
 
-"@next/swc-win32-ia32-msvc@13.5.6":
-  version "13.5.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.6.tgz#6a2409b84a2cbf34bf92fe714896455efb4191e4"
-  integrity sha512-XqqpHgEIlBHvzwG8sp/JXMFkLAfGLqkbVsyN+/Ih1mR8INb6YCc2x/Mbwi6hsAgUnqQztz8cvEbHJUbSl7RHDg==
+"@next/swc-win32-ia32-msvc@13.5.7":
+  version "13.5.7"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.7.tgz#fd118f3bd5a87453b252eb3c5fae54ddce035026"
+  integrity sha512-wXp+/3NVcuyJDED6gJiLXs5dqHaWO7moAB6aBtjlKZvsxBDxpcyjsfRbtHPeYtaT20zCkmPs69H0K25lrVZmlA==
 
 "@next/swc-win32-ia32-msvc@14.1.0":
   version "14.1.0"
   resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.0.tgz#21f4de1293ac5e5a168a412b139db5d3420a89d0"
   integrity sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==
 
-"@next/swc-win32-x64-msvc@13.5.6":
-  version "13.5.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.6.tgz#4a3e2a206251abc729339ba85f60bc0433c2865d"
-  integrity sha512-Cqfe1YmOS7k+5mGu92nl5ULkzpKuxJrP3+4AEuPmrpFZ3BHxTY3TnHmU1On3bFmFFs6FbTcdF58CCUProGpIGQ==
+"@next/swc-win32-x64-msvc@13.5.7":
+  version "13.5.7"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.7.tgz#3eff03a5a80281449c58fece85a780c1e6e3594b"
+  integrity sha512-PLyD3Dl6jTTkLG8AoqhPGd5pXtSs8wbqIhWPQt3yEMfnYld/dGYuF2YPs3YHaVFrijCIF9pXY3+QOyvP23Zn7g==
 
 "@next/swc-win32-x64-msvc@14.1.0":
   version "14.1.0"
@@ -2477,6 +2689,17 @@
     "@swc/helpers" "^0.5.0"
     clsx "^2.0.0"
 
+"@react-aria/focus@^3.19.0":
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/focus/-/focus-3.19.0.tgz#82b9a5b83f023b943a7970df3d059f49d61df05d"
+  integrity sha512-hPF9EXoUQeQl1Y21/rbV2H4FdUR2v+4/I0/vB+8U3bT1CJ+1AFj1hc/rqx2DqEwDlEwOHN+E4+mRahQmlybq0A==
+  dependencies:
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+    clsx "^2.0.0"
+
 "@react-aria/form@^3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@react-aria/form/-/form-3.0.4.tgz#e0ad830046abbbdd19fd968ab8f1d8fabe8f24ef"
@@ -2502,6 +2725,20 @@
     "@react-types/shared" "^3.23.0"
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/i18n@^3.12.4":
+  version "3.12.4"
+  resolved "https://registry.yarnpkg.com/@react-aria/i18n/-/i18n-3.12.4.tgz#4520ce48a1b6ebe4aa470d72eba300e65de01814"
+  integrity sha512-j9+UL3q0Ls8MhXV9gtnKlyozq4aM95YywXqnmJtzT1rYeBx7w28hooqrWkCYLfqr4OIryv1KUnPiCSLwC2OC7w==
+  dependencies:
+    "@internationalized/date" "^3.6.0"
+    "@internationalized/message" "^3.1.6"
+    "@internationalized/number" "^3.6.0"
+    "@internationalized/string" "^3.2.5"
+    "@react-aria/ssr" "^3.9.7"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-aria/interactions@^3.21.2", "@react-aria/interactions@^3.3.2":
   version "3.21.2"
   resolved "https://registry.yarnpkg.com/@react-aria/interactions/-/interactions-3.21.2.tgz#f55d059a876b094787ee53b5a17a4ea2dc34f70f"
@@ -2512,6 +2749,16 @@
     "@react-types/shared" "^3.23.0"
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/interactions@^3.22.5":
+  version "3.22.5"
+  resolved "https://registry.yarnpkg.com/@react-aria/interactions/-/interactions-3.22.5.tgz#9cd8c93b8b6988f1d315d3efb450119d1432bbb8"
+  integrity sha512-kMwiAD9E0TQp+XNnOs13yVJghiy8ET8L0cbkeuTgNI96sOAp/63EJ1FSrDf17iD8sdjt41LafwX/dKXW9nCcLQ==
+  dependencies:
+    "@react-aria/ssr" "^3.9.7"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-aria/label@^3.1.1", "@react-aria/label@^3.7.7":
   version "3.7.7"
   resolved "https://registry.yarnpkg.com/@react-aria/label/-/label-3.7.7.tgz#7d6615cbf6b4062c9680a9306d5839cf40fb901f"
@@ -2540,6 +2787,26 @@
     "@react-types/shared" "^3.23.0"
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/menu@^3.14.1":
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/menu/-/menu-3.16.0.tgz#119e562806e9f8a39fd468ab790d788905c6df83"
+  integrity sha512-TNk+Vd3TbpBPUxEloAdHRTaRxf9JBK7YmkHYiq0Yj5Lc22KS0E2eTyhpPM9xJvEWN2TlC5TEvNfdyui2kYWFFQ==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/overlays" "^3.24.0"
+    "@react-aria/selection" "^3.21.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/menu" "^3.9.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-stately/tree" "^3.8.6"
+    "@react-types/button" "^3.10.1"
+    "@react-types/menu" "^3.9.13"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-aria/overlays@^3.19.0", "@react-aria/overlays@^3.22.0", "@react-aria/overlays@^3.7.0":
   version "3.22.0"
   resolved "https://registry.yarnpkg.com/@react-aria/overlays/-/overlays-3.22.0.tgz#002fb2303debe163e2d51b57d601e08866871eae"
@@ -2557,6 +2824,23 @@
     "@react-types/shared" "^3.23.0"
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/overlays@^3.24.0":
+  version "3.24.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/overlays/-/overlays-3.24.0.tgz#7f97cd12506961abfab3ae653822cea05d1cacd3"
+  integrity sha512-0kAXBsMNTc/a3M07tK9Cdt/ea8CxTAEJ223g8YgqImlmoBBYAL7dl5G01IOj67TM64uWPTmZrOklBchHWgEm3A==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/ssr" "^3.9.7"
+    "@react-aria/utils" "^3.26.0"
+    "@react-aria/visually-hidden" "^3.8.18"
+    "@react-stately/overlays" "^3.6.12"
+    "@react-types/button" "^3.10.1"
+    "@react-types/overlays" "^3.8.11"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-aria/radio@^3.1.2":
   version "3.10.3"
   resolved "https://registry.yarnpkg.com/@react-aria/radio/-/radio-3.10.3.tgz#01811f3072f29837855588b2a55f9b61e9abeed3"
@@ -2586,6 +2870,19 @@
     "@react-types/shared" "^3.23.0"
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/selection@^3.21.0":
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/selection/-/selection-3.21.0.tgz#c5660e73a38db5e3e1cdc722e408b4489f5f589a"
+  integrity sha512-52JJ6hlPcM+gt0VV3DBmz6Kj1YAJr13TfutrKfGWcK36LvNCBm1j0N+TDqbdnlp8Nue6w0+5FIwZq44XPYiBGg==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-aria/slider@^3.0.1":
   version "3.7.7"
   resolved "https://registry.yarnpkg.com/@react-aria/slider/-/slider-3.7.7.tgz#728f9168fc91e4d27111624794326c4b716e3aff"
@@ -2608,6 +2905,13 @@
   dependencies:
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/ssr@^3.9.7":
+  version "3.9.7"
+  resolved "https://registry.yarnpkg.com/@react-aria/ssr/-/ssr-3.9.7.tgz#d89d129f7bbc5148657e6c952ac31c9353183770"
+  integrity sha512-GQygZaGlmYjmYM+tiNBA5C6acmiDWF52Nqd40bBp0Znk4M4hP+LTmI0lpI1BuKMw45T8RIhrAsICIfKwZvi2Gg==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
 "@react-aria/toggle@^3.1.1":
   version "3.10.3"
   resolved "https://registry.yarnpkg.com/@react-aria/toggle/-/toggle-3.10.3.tgz#111bb8fb44646700dc29d5d709917c0ac2bdfac8"
@@ -2631,6 +2935,17 @@
     "@swc/helpers" "^0.5.0"
     clsx "^2.0.0"
 
+"@react-aria/utils@^3.26.0":
+  version "3.26.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/utils/-/utils-3.26.0.tgz#833cbfa33e75d15835b757791b3f754432d2f948"
+  integrity sha512-LkZouGSjjQ0rEqo4XJosS4L3YC/zzQkfRM3KoqK6fUOmUJ9t0jQ09WjiF+uOoG9u+p30AVg3TrZRUWmoTS+koQ==
+  dependencies:
+    "@react-aria/ssr" "^3.9.7"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+    clsx "^2.0.0"
+
 "@react-aria/visually-hidden@^3.7.0", "@react-aria/visually-hidden@^3.8.1", "@react-aria/visually-hidden@^3.8.11", "@react-aria/visually-hidden@^3.8.6":
   version "3.8.11"
   resolved "https://registry.yarnpkg.com/@react-aria/visually-hidden/-/visually-hidden-3.8.11.tgz#a29eda3114629456a700b1d8396e539bb8a37436"
@@ -2641,6 +2956,16 @@
     "@react-types/shared" "^3.23.0"
     "@swc/helpers" "^0.5.0"
 
+"@react-aria/visually-hidden@^3.8.18":
+  version "3.8.18"
+  resolved "https://registry.yarnpkg.com/@react-aria/visually-hidden/-/visually-hidden-3.8.18.tgz#13c168736944cbe19cd8917ec33a4e6f5f694119"
+  integrity sha512-l/0igp+uub/salP35SsNWq5mGmg3G5F5QMS1gDZ8p28n7CgjvzyiGhJbbca7Oxvaw1HRFzVl9ev+89I7moNnFQ==
+  dependencies:
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-native-aria/accordion@^0.0.2":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@react-native-aria/accordion/-/accordion-0.0.2.tgz#28e57f5c3690b2b33f36acd6aff7d91a75fbf384"
@@ -2667,7 +2992,7 @@
     "@react-types/dialog" "*"
     "@react-types/shared" "*"
 
-"@react-native-aria/focus@^0.2.7", "@react-native-aria/focus@^0.2.9":
+"@react-native-aria/focus@^0.2.9":
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/@react-native-aria/focus/-/focus-0.2.9.tgz#bdfa84f9711843df771877ac436ee3b4f8878b74"
   integrity sha512-zVgOIzKwnsyyurUxlZnzUKB2ekK/cmK64sQJIKKUlkJKVxd2EAFf7Sjz/NVEoMhTODN3qGRASTv9bMk/pBzzVA==
@@ -2700,6 +3025,18 @@
     "@react-stately/tree" "^3.1.2"
     "@react-types/menu" "^3.1.1"
 
+"@react-native-aria/overlays@0.3.14":
+  version "0.3.14"
+  resolved "https://registry.yarnpkg.com/@react-native-aria/overlays/-/overlays-0.3.14.tgz#3992f656704d67bbe9d5c28862e6fac841f263ae"
+  integrity sha512-a8MIB2aBw5yitNB0szNqKQlm4ngOozHGVmXTbslejGIX2+3YQUg8e7J4ouT7ZgK2iIr2gIB3YrstHDM6mvKVmw==
+  dependencies:
+    "@react-aria/interactions" "^3.3.2"
+    "@react-aria/overlays" "^3.7.0"
+    "@react-native-aria/utils" "0.2.11"
+    "@react-stately/overlays" "^3.1.1"
+    "@react-types/overlays" "^3.4.0"
+    dom-helpers "^5.0.0"
+
 "@react-native-aria/overlays@^0.3.12":
   version "0.3.12"
   resolved "https://registry.yarnpkg.com/@react-native-aria/overlays/-/overlays-0.3.12.tgz#224cc8a096a16fb6ee8ffe15d6a4290c7447db84"
@@ -3439,6 +3776,14 @@
     "@react-types/shared" "^3.23.0"
     "@swc/helpers" "^0.5.0"
 
+"@react-stately/collections@^3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/collections/-/collections-3.12.0.tgz#6240d3517d0d86f7d9eb4997108fb432d569e8d7"
+  integrity sha512-MfR9hwCxe5oXv4qrLUnjidwM50U35EFmInUeFf8i9mskYwWlRYS0O1/9PZ0oF1M0cKambaRHKEy98jczgb9ycA==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-stately/combobox@^3.8.3":
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/@react-stately/combobox/-/combobox-3.8.3.tgz#28cc70009287b673af24ec9ae034428fe610a733"
@@ -3532,6 +3877,16 @@
     "@react-types/shared" "^3.23.0"
     "@swc/helpers" "^0.5.0"
 
+"@react-stately/menu@^3.9.0":
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/menu/-/menu-3.9.0.tgz#b1e55996405f4e43ff844cbd325df9842914efe4"
+  integrity sha512-++sm0fzZeUs9GvtRbj5RwrP+KL9KPANp9f4SvtI3s+MP+Y/X3X7LNNePeeccGeyikB5fzMsuyvd82bRRW9IhDQ==
+  dependencies:
+    "@react-stately/overlays" "^3.6.12"
+    "@react-types/menu" "^3.9.13"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-stately/numberfield@^3.9.2":
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/@react-stately/numberfield/-/numberfield-3.9.2.tgz#f9e9246d6f20fb897387d262a41b35e51c193091"
@@ -3552,6 +3907,15 @@
     "@react-types/overlays" "^3.8.6"
     "@swc/helpers" "^0.5.0"
 
+"@react-stately/overlays@^3.6.12":
+  version "3.6.12"
+  resolved "https://registry.yarnpkg.com/@react-stately/overlays/-/overlays-3.6.12.tgz#beb594a0e140dbd7957bfa181006854f91480bea"
+  integrity sha512-QinvZhwZgj8obUyPIcyURSCjTZlqZYRRCS60TF8jH8ZpT0tEAuDb3wvhhSXuYA3Xo9EHLwvLjEf3tQKKdAQArw==
+  dependencies:
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/overlays" "^3.8.11"
+    "@swc/helpers" "^0.5.0"
+
 "@react-stately/radio@^3.10.3", "@react-stately/radio@^3.2.1", "@react-stately/radio@^3.8.1":
   version "3.10.3"
   resolved "https://registry.yarnpkg.com/@react-stately/radio/-/radio-3.10.3.tgz#1ad28e9f33b3f9f869c28dc3a1bf690a309df815"
@@ -3594,6 +3958,16 @@
     "@react-types/shared" "^3.23.0"
     "@swc/helpers" "^0.5.0"
 
+"@react-stately/selection@^3.18.0":
+  version "3.18.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/selection/-/selection-3.18.0.tgz#eb723dc26eafd9b016c55056fb550bdde8b4f87b"
+  integrity sha512-6EaNNP3exxBhW2LkcRR4a3pg+3oDguZlBSqIVVR7lyahv/D8xXHRC4dX+m0mgGHJpsgjs7664Xx6c8v193TFxg==
+  dependencies:
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-stately/slider@^3.0.1", "@react-stately/slider@^3.2.4", "@react-stately/slider@^3.5.3":
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/@react-stately/slider/-/slider-3.5.3.tgz#77f92da5514d017342b582f803b7f1973f2e35a2"
@@ -3658,6 +4032,17 @@
     "@react-types/shared" "^3.23.0"
     "@swc/helpers" "^0.5.0"
 
+"@react-stately/tree@^3.8.6":
+  version "3.8.6"
+  resolved "https://registry.yarnpkg.com/@react-stately/tree/-/tree-3.8.6.tgz#85dc33c5d5b9a455ffc0b474300957e511db1ea4"
+  integrity sha512-lblUaxf1uAuIz5jm6PYtcJ+rXNNVkqyFWTIMx6g6gW/mYvm8GNx1G/0MLZE7E6CuDGaO9dkLSY2bB1uqyKHidA==
+  dependencies:
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
 "@react-stately/utils@^3.10.0", "@react-stately/utils@^3.6.0":
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.10.0.tgz#2479c891b9d726cc43e6abcc0cc74498eda8e0fa"
@@ -3665,6 +4050,20 @@
   dependencies:
     "@swc/helpers" "^0.5.0"
 
+"@react-stately/utils@^3.10.5":
+  version "3.10.5"
+  resolved "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.10.5.tgz#47bb91cd5afd1bafe39353614e5e281b818ebccc"
+  integrity sha512-iMQSGcpaecghDIh3mZEpZfoFH3ExBwTtuBEcvZ2XnGzCgQjeYXcMdIUwAfVQLXFTdHUHGF6Gu6/dFrYsCzySBQ==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
+"@react-types/button@^3.10.1":
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/@react-types/button/-/button-3.10.1.tgz#fc7ada2e83bc661b31c1473a82ec86dc11de057c"
+  integrity sha512-XTtap8o04+4QjPNAshFWOOAusUTxQlBjU2ai0BTVLShQEjHhRVDBIWsI2B2FKJ4KXT6AZ25llaxhNrreWGonmA==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
 "@react-types/button@^3.9.3":
   version "3.9.3"
   resolved "https://registry.yarnpkg.com/@react-types/button/-/button-3.9.3.tgz#9698ea30411fcfc02890a067b258d2cec3891fcd"
@@ -3727,6 +4126,14 @@
     "@react-types/overlays" "^3.8.6"
     "@react-types/shared" "^3.23.0"
 
+"@react-types/menu@^3.9.13":
+  version "3.9.13"
+  resolved "https://registry.yarnpkg.com/@react-types/menu/-/menu-3.9.13.tgz#a666c2233cbdb495202586df86a798601788f74d"
+  integrity sha512-7SuX6E2tDsqQ+HQdSvIda1ji/+ujmR86dtS9CUu5yWX91P25ufRjZ72EvLRqClWNQsj1Xl4+2zBDLWlceznAjw==
+  dependencies:
+    "@react-types/overlays" "^3.8.11"
+    "@react-types/shared" "^3.26.0"
+
 "@react-types/numberfield@^3.8.2":
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/@react-types/numberfield/-/numberfield-3.8.2.tgz#8eb608669ece9be226eddb3b1eef0e2aca5ff559"
@@ -3741,6 +4148,13 @@
   dependencies:
     "@react-types/shared" "^3.23.0"
 
+"@react-types/overlays@^3.8.11":
+  version "3.8.11"
+  resolved "https://registry.yarnpkg.com/@react-types/overlays/-/overlays-3.8.11.tgz#313964703b2a23572138120b619d35da33445dfd"
+  integrity sha512-aw7T0rwVI3EuyG5AOaEIk8j7dZJQ9m34XAztXJVZ/W2+4pDDkLDbJ/EAPnuo2xGYRGhowuNDn4tDju01eHYi+w==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
 "@react-types/radio@^3.1.1", "@react-types/radio@^3.8.0":
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/@react-types/radio/-/radio-3.8.0.tgz#c843a973ce6d5cc63d6f51b7bbb6a170b5e61df6"
@@ -3768,6 +4182,11 @@
   resolved "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.23.0.tgz#59c9d2683d131b81a8f775b56408782fc70bc79b"
   integrity sha512-GQm/iPiii3ikcaMNR4WdVkJ4w0mKtV3mLqeSfSqzdqbPr6vONkqXbh3RhPlPmAJs1b4QHnexd/wZQP3U9DHOwQ==
 
+"@react-types/shared@^3.26.0":
+  version "3.26.0"
+  resolved "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.26.0.tgz#21a8b579f0097ee78de18e3e580421ced89e4c8c"
+  integrity sha512-6FuPqvhmjjlpEDLTiYx29IJCbCNWPlsyO+ZUmCUXzhUv2ttShOXfw8CmeHWHftT/b2KweAWuzqSlfeXPR76jpw==
+
 "@react-types/slider@^3.7.2":
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/@react-types/slider/-/slider-3.7.2.tgz#4ba02cf626ecbaa077502ce42c9fd675590a877f"
@@ -4550,6 +4969,11 @@ array-includes@^3.1.6, array-includes@^3.1.7:
     get-intrinsic "^1.2.1"
     is-string "^1.0.7"
 
+array-timsort@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-timsort/-/array-timsort-1.0.3.tgz#3c9e4199e54fb2b9c3fe5976396a21614ef0d926"
+  integrity sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
@@ -4675,16 +5099,16 @@ at-least-node@^1.0.0:
   resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-autoprefixer@latest:
-  version "10.4.19"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.19.tgz#ad25a856e82ee9d7898c59583c1afeb3fa65f89f"
-  integrity sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==
+autoprefixer@^10.4.20:
+  version "10.4.20"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.20.tgz#5caec14d43976ef42e32dcb4bd62878e96be5b3b"
+  integrity sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==
   dependencies:
-    browserslist "^4.23.0"
-    caniuse-lite "^1.0.30001599"
+    browserslist "^4.23.3"
+    caniuse-lite "^1.0.30001646"
     fraction.js "^4.3.7"
     normalize-range "^0.1.2"
-    picocolors "^1.0.0"
+    picocolors "^1.0.1"
     postcss-value-parser "^4.2.0"
 
 available-typed-arrays@^1.0.5:
@@ -4795,17 +5219,6 @@ babel-plugin-react-native-web@~0.19.10:
   resolved "https://registry.yarnpkg.com/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.19.11.tgz#32316f51de0053bba6815f6522bf7b17c483bf17"
   integrity sha512-0sHf8GgDhsRZxGwlwHHdfL3U8wImFaLw4haEa60U9M3EiO3bg6u3BJ+1vXhwgrevqSq76rMb5j1HJs+dNvMj5g==
 
-babel-plugin-tester@^11.0.4:
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-tester/-/babel-plugin-tester-11.0.4.tgz#4a661c5f08a63c344d46247f1256a7ef5175b405"
-  integrity sha512-cqswtpSPo0e++rZB0l/54EG17LL25l9gLgh59yXfnmNxX+2lZTIOpx2zt4YI9QIClVXc8xf63J6yWwKkzy0jNg==
-  dependencies:
-    core-js "^3.27.2"
-    debug "^4.3.4"
-    lodash.mergewith "^4.6.2"
-    prettier "^2.8.3"
-    strip-indent "^3.0.0"
-
 babel-plugin-transform-flow-enums@^0.0.2:
   version "0.0.2"
   resolved "https://registry.npmjs.org/babel-plugin-transform-flow-enums/-/babel-plugin-transform-flow-enums-0.0.2.tgz"
@@ -4938,6 +5351,13 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+  dependencies:
+    fill-range "^7.1.1"
+
 browserslist@^4.22.2:
   version "4.22.3"
   resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz"
@@ -4948,15 +5368,15 @@ browserslist@^4.22.2:
     node-releases "^2.0.14"
     update-browserslist-db "^1.0.13"
 
-browserslist@^4.23.0:
-  version "4.23.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
-  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
+browserslist@^4.23.3, browserslist@^4.24.0:
+  version "4.24.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580"
+  integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
   dependencies:
-    caniuse-lite "^1.0.30001587"
-    electron-to-chromium "^1.4.668"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
+    caniuse-lite "^1.0.30001669"
+    electron-to-chromium "^1.5.41"
+    node-releases "^2.0.18"
+    update-browserslist-db "^1.1.1"
 
 bser@2.1.1:
   version "2.1.1"
@@ -5087,10 +5507,10 @@ camelcase@^6.2.0:
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001599:
-  version "1.0.30001617"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001617.tgz#809bc25f3f5027ceb33142a7d6c40759d7a901eb"
-  integrity sha512-mLyjzNI9I+Pix8zwcrpxEbGlfqOkF9kM3ptzmKNw5tizSyYwMe+nGLTqMK9cO+0E+Bh6TsBxNAaHWEM8xwSsmA==
+caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001669:
+  version "1.0.30001684"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz#0eca437bab7d5f03452ff0ef9de8299be6b08e16"
+  integrity sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==
 
 caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001580:
   version "1.0.30001581"
@@ -5137,7 +5557,7 @@ charenc@0.0.2, charenc@~0.0.1:
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
   integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
 
-chokidar@^3.5.3:
+chokidar@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
   integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -5352,6 +5772,17 @@ commander@^9.4.1:
   resolved "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz"
   integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
 
+comment-json@^4.2.5:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-4.2.5.tgz#482e085f759c2704b60bc6f97f55b8c01bc41e70"
+  integrity sha512-bKw/r35jR3HGt5PEPm1ljsQQGyCrR8sFGNiN5L+ykDHdpO8Smxkrkla9Yi6NkQyUrb8V54PGhfMs6NrIwtxtdw==
+  dependencies:
+    array-timsort "^1.0.3"
+    core-util-is "^1.0.3"
+    esprima "^4.0.1"
+    has-own-prop "^2.0.0"
+    repeat-string "^1.6.1"
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
@@ -5419,12 +5850,7 @@ core-js-compat@^3.34.0:
   dependencies:
     browserslist "^4.22.2"
 
-core-js@^3.27.2:
-  version "3.37.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.0.tgz#d8dde58e91d156b2547c19d8a4efd5c7f6c426bb"
-  integrity sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug==
-
-core-util-is@~1.0.0:
+core-util-is@^1.0.3, core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
@@ -5629,6 +6055,13 @@ debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.7:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
+  dependencies:
+    ms "^2.1.3"
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
@@ -5868,10 +6301,10 @@ electron-to-chromium@^1.4.648:
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.652.tgz"
   integrity sha512-XvQaa8hVUAuEJtLw6VKQqvdOxTOfBLWfI10t2xWpezx4XXD3k8bdLweEKeItqaa0+OkJX5l0mP1W+JWobyIDrg==
 
-electron-to-chromium@^1.4.668:
-  version "1.4.766"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.766.tgz#09fa302a4d0201e6aafc4da815d6b40e93b75c8d"
-  integrity sha512-QkqagkSWWIngOO+f/DkMtTfzX/hpESMljeYzwZvOzmk2G6oEiG1JxE2hVXY6/XoVXMkILaJ6ASUnrMPiEA7x9A==
+electron-to-chromium@^1.5.41:
+  version "1.5.67"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.67.tgz#66ebd2be4a77469ac2760ef5e9e460ba9a43a845"
+  integrity sha512-nz88NNBsD7kQSAGGJyp8hS6xSPtWwqNogA0mjtc2nUYeEf3nURK9qpV18TuBdDmEDgVWotS8Wkzf+V52dSQ/LQ==
 
 emittery@^0.13.1:
   version "0.13.1"
@@ -5901,9 +6334,9 @@ end-of-stream@^1.1.0:
     once "^1.4.0"
 
 enhanced-resolve@^5.10.0:
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz#e8bc63d51b826d6f1cbc0a150ecb5a8b0c62e567"
-  integrity sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==
+  version "5.17.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
+  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -6133,6 +6566,11 @@ escalade@^3.1.1:
   resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
+escalade@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
@@ -6616,7 +7054,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.5, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1, fast-glob@^3.3.2:
+fast-glob@^3.2.5, fast-glob@^3.2.9, fast-glob@^3.3.1, fast-glob@^3.3.2:
   version "3.3.2"
   resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -6707,6 +7145,13 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 filter-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
@@ -7163,6 +7608,11 @@ has-flag@^4.0.0:
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-own-prop@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-own-prop/-/has-own-prop-2.0.0.tgz#f0f95d58f65804f5d218db32563bb85b8e0417af"
+  integrity sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==
+
 has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz"
@@ -8315,10 +8765,10 @@ jimp-compact@0.16.1:
   resolved "https://registry.yarnpkg.com/jimp-compact/-/jimp-compact-0.16.1.tgz#9582aea06548a2c1e04dd148d7c3ab92075aefa3"
   integrity sha512-dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww==
 
-jiti@^1.21.0:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d"
-  integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==
+jiti@^1.21.6:
+  version "1.21.6"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.6.tgz#6c7f7398dd4b3142767f9a168af2f317a428d268"
+  integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==
 
 joi@^17.2.1:
   version "17.12.1"
@@ -8454,6 +8904,11 @@ jsesc@^2.5.1:
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
+jsesc@^3.0.2, jsesc@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
+  integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==
+
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
@@ -8625,102 +9080,108 @@ lightningcss-darwin-arm64@1.19.0:
   resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.19.0.tgz#56ab071e932f845dbb7667f44f5b78441175a343"
   integrity sha512-wIJmFtYX0rXHsXHSr4+sC5clwblEMji7HHQ4Ub1/CznVRxtCFha6JIt5JZaNf8vQrfdZnBxLLC6R8pC818jXqg==
 
-lightningcss-darwin-arm64@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.22.0.tgz#28e189ce15290b3d0ab43704fc33e8e6366e6df4"
-  integrity sha512-aH2be3nNny+It5YEVm8tBSSdRlBVWQV8m2oJ7dESiYRzyY/E/bQUe2xlw5caaMuhlM9aoTMtOH25yzMhir0qPg==
+lightningcss-darwin-arm64@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.28.2.tgz#a906fd84cb43d753cb5db9c367f8f38482e8fb03"
+  integrity sha512-/8cPSqZiusHSS+WQz0W4NuaqFjquys1x+NsdN/XOHb+idGHJSoJ7SoQTVl3DZuAgtPZwFZgRfb/vd1oi8uX6+g==
 
 lightningcss-darwin-x64@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.19.0.tgz#c867308b88859ba61a2c46c82b1ca52ff73a1bd0"
   integrity sha512-Lif1wD6P4poaw9c/4Uh2z+gmrWhw/HtXFoeZ3bEsv6Ia4tt8rOJBdkfVaUJ6VXmpKHALve+iTyP2+50xY1wKPw==
 
-lightningcss-darwin-x64@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.22.0.tgz#1c5fe3e3ab31c9f1741f6d5d650ab683bd942854"
-  integrity sha512-9KHRFA0Y6mNxRHeoQMp0YaI0R0O2kOgUlYPRjuasU4d+pI8NRhVn9bt0yX9VPs5ibWX1RbDViSPtGJvYYrfVAQ==
+lightningcss-darwin-x64@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.28.2.tgz#6c43249d4ae821416d0d78403eae56111d0c6a94"
+  integrity sha512-R7sFrXlgKjvoEG8umpVt/yutjxOL0z8KWf0bfPT3cYMOW4470xu5qSHpFdIOpRWwl3FKNMUdbKtMUjYt0h2j4g==
 
-lightningcss-freebsd-x64@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.22.0.tgz#1ee7bcb68258b2cb1425bdc7ccb632233eae639c"
-  integrity sha512-xaYL3xperGwD85rQioDb52ozF3NAJb+9wrge3jD9lxGffplu0Mn35rXMptB8Uc2N9Mw1i3Bvl7+z1evlqVl7ww==
+lightningcss-freebsd-x64@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.28.2.tgz#804bc6652c6721e94a92e7bbb5e65165376cf108"
+  integrity sha512-l2qrCT+x7crAY+lMIxtgvV10R8VurzHAoUZJaVFSlHrN8kRLTvEg9ObojIDIexqWJQvJcVVV3vfzsEynpiuvgA==
 
 lightningcss-linux-arm-gnueabihf@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.19.0.tgz#0f921dc45f2e5c3aea70fab98844ac0e5f2f81be"
   integrity sha512-P15VXY5682mTXaiDtbnLYQflc8BYb774j2R84FgDLJTN6Qp0ZjWEFyN1SPqyfTj2B2TFjRHRUvQSSZ7qN4Weig==
 
-lightningcss-linux-arm-gnueabihf@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.22.0.tgz#1c4287ec7268dcee6d9dcccb3d0810ecdcd35b74"
-  integrity sha512-epQGvXIjOuxrZpMpMnRjK54ZqzhiHhCPLtHvw2fb6NeK2kK9YtF0wqmeTBiQ1AkbWfnnXGTstYaFNiadNK+StQ==
+lightningcss-linux-arm-gnueabihf@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.28.2.tgz#c32595127b565690d854c9ff641831e4ad739ee1"
+  integrity sha512-DKMzpICBEKnL53X14rF7hFDu8KKALUJtcKdFUCW5YOlGSiwRSgVoRjM97wUm/E0NMPkzrTi/rxfvt7ruNK8meg==
 
 lightningcss-linux-arm64-gnu@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.19.0.tgz#027f9df9c7f4ffa127c37a71726245a5794d7ba2"
   integrity sha512-zwXRjWqpev8wqO0sv0M1aM1PpjHz6RVIsBcxKszIG83Befuh4yNysjgHVplF9RTU7eozGe3Ts7r6we1+Qkqsww==
 
-lightningcss-linux-arm64-gnu@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.22.0.tgz#b8e6daee4a60020a4930fc3564669868e723a10d"
-  integrity sha512-AArGtKSY4DGTA8xP8SDyNyKtpsUl1Rzq6FW4JomeyUQ4nBrR71uPChksTpj3gmWuGhZeRKLeCUI1DBid/zhChg==
+lightningcss-linux-arm64-gnu@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.28.2.tgz#85646f08c5efbfd7c94f8e5ed6392d5cf95fa42c"
+  integrity sha512-nhfjYkfymWZSxdtTNMWyhFk2ImUm0X7NAgJWFwnsYPOfmtWQEapzG/DXZTfEfMjSzERNUNJoQjPAbdqgB+sjiw==
 
 lightningcss-linux-arm64-musl@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.19.0.tgz#85ea987da868524eac6db94f8e1eaa23d0b688a3"
   integrity sha512-vSCKO7SDnZaFN9zEloKSZM5/kC5gbzUjoJQ43BvUpyTFUX7ACs/mDfl2Eq6fdz2+uWhUh7vf92c4EaaP4udEtA==
 
-lightningcss-linux-arm64-musl@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.22.0.tgz#8d863a5470ee50369f13974325f2a3326b5f77df"
-  integrity sha512-RRraNgP8hnBPhInTTUdlFm+z16C/ghbxBG51Sw00hd7HUyKmEUKRozyc5od+/N6pOrX/bIh5vIbtMXIxsos0lg==
+lightningcss-linux-arm64-musl@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.28.2.tgz#4d9bc20cf6de28c4d0c586d81c577891555ad831"
+  integrity sha512-1SPG1ZTNnphWvAv8RVOymlZ8BDtAg69Hbo7n4QxARvkFVCJAt0cgjAw1Fox0WEhf4PwnyoOBaVH0Z5YNgzt4dA==
 
 lightningcss-linux-x64-gnu@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.19.0.tgz#02bec89579ab4153dccc0def755d1fd9e3ee7f3c"
   integrity sha512-0AFQKvVzXf9byrXUq9z0anMGLdZJS+XSDqidyijI5njIwj6MdbvX2UZK/c4FfNmeRa2N/8ngTffoIuOUit5eIQ==
 
-lightningcss-linux-x64-gnu@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.22.0.tgz#4798711d1897fe19fccd039640389c5049fb03fb"
-  integrity sha512-grdrhYGRi2KrR+bsXJVI0myRADqyA7ekprGxiuK5QRNkv7kj3Yq1fERDNyzZvjisHwKUi29sYMClscbtl+/Zpw==
+lightningcss-linux-x64-gnu@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.28.2.tgz#74bd797d7157817c4e42ec45f1844a69636a9d82"
+  integrity sha512-ZhQy0FcO//INWUdo/iEdbefntTdpPVQ0XJwwtdbBuMQe+uxqZoytm9M+iqR9O5noWFaxK+nbS2iR/I80Q2Ofpg==
 
 lightningcss-linux-x64-musl@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.19.0.tgz#e36a5df8193ae961d22974635e4c100a1823bb8c"
   integrity sha512-SJoM8CLPt6ECCgSuWe+g0qo8dqQYVcPiW2s19dxkmSI5+Uu1GIRzyKA0b7QqmEXolA+oSJhQqCmJpzjY4CuZAg==
 
-lightningcss-linux-x64-musl@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.22.0.tgz#1d34f5bf428b0d2d4550627e653231d33fda90f9"
-  integrity sha512-t5f90X+iQUtIyR56oXIHMBUyQFX/zwmPt72E6Dane3P8KNGlkijTg2I75XVQS860gNoEFzV7Mm5ArRRA7u5CAQ==
+lightningcss-linux-x64-musl@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.28.2.tgz#13ce6db4c491ebbb93099d6427746ab7bff3774f"
+  integrity sha512-alb/j1NMrgQmSFyzTbN1/pvMPM+gdDw7YBuQ5VSgcFDypN3Ah0BzC2dTZbzwzaMdUVDszX6zH5MzjfVN1oGuww==
+
+lightningcss-win32-arm64-msvc@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.28.2.tgz#eaae12c4a58a545a3adf40b22ba9625e5c0ebd29"
+  integrity sha512-WnwcjcBeAt0jGdjlgbT9ANf30pF0C/QMb1XnLnH272DQU8QXh+kmpi24R55wmWBwaTtNAETZ+m35ohyeMiNt+g==
 
 lightningcss-win32-x64-msvc@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.19.0.tgz#0854dbd153035eca1396e2227c708ad43655a61c"
   integrity sha512-C+VuUTeSUOAaBZZOPT7Etn/agx/MatzJzGRkeV+zEABmPuntv1zihncsi+AyGmjkkzq3wVedEy7h0/4S84mUtg==
 
-lightningcss-win32-x64-msvc@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.22.0.tgz#2fece601ea92298f73008bdf96ed0af8132d318f"
-  integrity sha512-64HTDtOOZE9PUCZJiZZQpyqXBbdby1lnztBccnqh+NtbKxjnGzP92R2ngcgeuqMPecMNqNWxgoWgTGpC+yN5Sw==
+lightningcss-win32-x64-msvc@1.28.2:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.28.2.tgz#1f7c4474b2dc3dd1c12e22de32e4de23bdfa41e7"
+  integrity sha512-3piBifyT3avz22o6mDKywQC/OisH2yDK+caHWkiMsF82i3m5wDBadyCjlCQ5VNgzYkxrWZgiaxHDdd5uxsi0/A==
 
-lightningcss@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.22.0.tgz#76c9a17925e660741858e88b774172cb1923bb4a"
-  integrity sha512-+z0qvwRVzs4XGRXelnWRNwqsXUx8k3bSkbP8vD42kYKSk3z9OM2P3e/gagT7ei/gwh8DTS80LZOFZV6lm8Z8Fg==
+lightningcss@^1.27.0:
+  version "1.28.2"
+  resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.28.2.tgz#cc26fad9ad64a621bd39ac6248095891cf584cce"
+  integrity sha512-ePLRrbt3fgjXI5VFZOLbvkLD5ZRuxGKm+wJ3ujCqBtL3NanDHPo/5zicR5uEKAPiIjBYF99BM4K4okvMznjkVA==
   dependencies:
     detect-libc "^1.0.3"
   optionalDependencies:
-    lightningcss-darwin-arm64 "1.22.0"
-    lightningcss-darwin-x64 "1.22.0"
-    lightningcss-freebsd-x64 "1.22.0"
-    lightningcss-linux-arm-gnueabihf "1.22.0"
-    lightningcss-linux-arm64-gnu "1.22.0"
-    lightningcss-linux-arm64-musl "1.22.0"
-    lightningcss-linux-x64-gnu "1.22.0"
-    lightningcss-linux-x64-musl "1.22.0"
-    lightningcss-win32-x64-msvc "1.22.0"
+    lightningcss-darwin-arm64 "1.28.2"
+    lightningcss-darwin-x64 "1.28.2"
+    lightningcss-freebsd-x64 "1.28.2"
+    lightningcss-linux-arm-gnueabihf "1.28.2"
+    lightningcss-linux-arm64-gnu "1.28.2"
+    lightningcss-linux-arm64-musl "1.28.2"
+    lightningcss-linux-x64-gnu "1.28.2"
+    lightningcss-linux-x64-musl "1.28.2"
+    lightningcss-win32-arm64-msvc "1.28.2"
+    lightningcss-win32-x64-msvc "1.28.2"
 
 lightningcss@~1.19.0:
   version "1.19.0"
@@ -8785,11 +9246,6 @@ lodash.merge@^4.6.2:
   resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.mergewith@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
-  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
-
 lodash.throttle@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"
@@ -9310,7 +9766,7 @@ metro@0.80.9, metro@^0.80.3:
     ws "^7.5.1"
     yargs "^17.6.2"
 
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -9318,6 +9774,14 @@ micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
+micromatch@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
+  dependencies:
+    braces "^3.0.3"
+    picomatch "^2.3.1"
+
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   version "1.52.0"
   resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
@@ -9350,11 +9814,6 @@ mimic-fn@^2.1.0:
   resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-min-indent@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
-  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
-
 "minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
@@ -9466,7 +9925,7 @@ ms@2.1.2:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.1.1:
+ms@2.1.3, ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -9494,12 +9953,14 @@ nanoid@^3.1.23, nanoid@^3.3.6, nanoid@^3.3.7:
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"
   integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
-nativewind@4.0.36:
-  version "4.0.36"
-  resolved "https://registry.yarnpkg.com/nativewind/-/nativewind-4.0.36.tgz#25a79d37cd89575f92d6095749a1620195459b30"
-  integrity sha512-nd0Xgjzaq0ISvUAjibZXcuSvvpX1BGX2mfOGBPZpjGfHL3By6fwLGsNhrKU6mi2FF30c+kdok3e2I4k/O0UO1Q==
+nativewind@^4.1.23:
+  version "4.1.23"
+  resolved "https://registry.yarnpkg.com/nativewind/-/nativewind-4.1.23.tgz#badfa94a5cd2e12ff8971dd274d234cd843ca74e"
+  integrity sha512-oLX3suGI6ojQqWxdQezOSM5GmJ4KvMnMtmaSMN9Ggb5j7ysFt4nHxb1xs8RDjZR7BWc+bsetNJU8IQdQMHqRpg==
   dependencies:
-    react-native-css-interop "0.0.36"
+    comment-json "^4.2.5"
+    debug "^4.3.7"
+    react-native-css-interop "0.1.22"
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -9539,11 +10000,11 @@ next-transpile-modules@^10.0.0:
     enhanced-resolve "^5.10.0"
 
 next@^13.1.6:
-  version "13.5.6"
-  resolved "https://registry.yarnpkg.com/next/-/next-13.5.6.tgz#e964b5853272236c37ce0dd2c68302973cf010b1"
-  integrity sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw==
+  version "13.5.7"
+  resolved "https://registry.yarnpkg.com/next/-/next-13.5.7.tgz#deddbb6644b235f0f6be2bbb6facce9ce004fd8e"
+  integrity sha512-W7KIRTE+hPcgGdq89P3mQLDX3m7pJ6nxSyC+YxYaUExE+cS4UledB+Ntk98tKoyhsv6fjb2TRAnD7VDvoqmeFg==
   dependencies:
-    "@next/env" "13.5.6"
+    "@next/env" "13.5.7"
     "@swc/helpers" "0.5.2"
     busboy "1.6.0"
     caniuse-lite "^1.0.30001406"
@@ -9551,15 +10012,15 @@ next@^13.1.6:
     styled-jsx "5.1.1"
     watchpack "2.4.0"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "13.5.6"
-    "@next/swc-darwin-x64" "13.5.6"
-    "@next/swc-linux-arm64-gnu" "13.5.6"
-    "@next/swc-linux-arm64-musl" "13.5.6"
-    "@next/swc-linux-x64-gnu" "13.5.6"
-    "@next/swc-linux-x64-musl" "13.5.6"
-    "@next/swc-win32-arm64-msvc" "13.5.6"
-    "@next/swc-win32-ia32-msvc" "13.5.6"
-    "@next/swc-win32-x64-msvc" "13.5.6"
+    "@next/swc-darwin-arm64" "13.5.7"
+    "@next/swc-darwin-x64" "13.5.7"
+    "@next/swc-linux-arm64-gnu" "13.5.7"
+    "@next/swc-linux-arm64-musl" "13.5.7"
+    "@next/swc-linux-x64-gnu" "13.5.7"
+    "@next/swc-linux-x64-musl" "13.5.7"
+    "@next/swc-win32-arm64-msvc" "13.5.7"
+    "@next/swc-win32-ia32-msvc" "13.5.7"
+    "@next/swc-win32-x64-msvc" "13.5.7"
 
 next@^14.0.4:
   version "14.1.0"
@@ -9628,6 +10089,11 @@ node-releases@^2.0.14:
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz"
   integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
+node-releases@^2.0.18:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
+
 node-stream-zip@^1.9.1:
   version "1.15.0"
   resolved "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz"
@@ -10063,6 +10529,11 @@ picocolors@^1.0.0:
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
+picocolors@^1.0.1, picocolors@^1.1.0, picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
@@ -10144,7 +10615,7 @@ postcss-js@^4.0.1:
   dependencies:
     camelcase-css "^2.0.1"
 
-postcss-load-config@^4.0.1:
+postcss-load-config@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3"
   integrity sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==
@@ -10152,17 +10623,17 @@ postcss-load-config@^4.0.1:
     lilconfig "^3.0.0"
     yaml "^2.3.4"
 
-postcss-nested@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c"
-  integrity sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==
+postcss-nested@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.2.0.tgz#4c2d22ab5f20b9cb61e2c5c5915950784d068131"
+  integrity sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==
   dependencies:
-    postcss-selector-parser "^6.0.11"
+    postcss-selector-parser "^6.1.1"
 
-postcss-selector-parser@^6.0.11:
-  version "6.0.16"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04"
-  integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==
+postcss-selector-parser@^6.1.1, postcss-selector-parser@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
+  integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -10181,7 +10652,16 @@ postcss@8.4.31:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.4.23, postcss@latest, postcss@~8.4.32:
+postcss@^8.4.47, postcss@^8.4.49:
+  version "8.4.49"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
+  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
+postcss@~8.4.32:
   version "8.4.38"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
   integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
@@ -10195,11 +10675,6 @@ prelude-ls@^1.2.1:
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prettier@^2.8.3:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
-  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
-
 prettier@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz"
@@ -10409,16 +10884,17 @@ react-is@^18.2.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
   integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
 
-react-native-css-interop@0.0.36:
-  version "0.0.36"
-  resolved "https://registry.yarnpkg.com/react-native-css-interop/-/react-native-css-interop-0.0.36.tgz#ff87c9ab5cab72c4b24f0f6eed60ca95c31f0dc2"
-  integrity sha512-ZWoKQlq6XrI5DB4BdPk5ABvJQsX7zls1SQYWuYXOQB8u5QE0KH3OfOGAGRZPekTjgkhjqGO4Bf8G2JTSWAYMSg==
+react-native-css-interop@0.1.22, react-native-css-interop@^0.1.22:
+  version "0.1.22"
+  resolved "https://registry.yarnpkg.com/react-native-css-interop/-/react-native-css-interop-0.1.22.tgz#70cc6ca7a8f14126e123e44a19ceed74dd2a167a"
+  integrity sha512-Mu01e+H9G+fxSWvwtgWlF5MJBJC4VszTCBXopIpeR171lbeBInHb8aHqoqRPxmJpi3xIHryzqKFOJYAdk7PBxg==
   dependencies:
     "@babel/helper-module-imports" "^7.22.15"
     "@babel/traverse" "^7.23.0"
     "@babel/types" "^7.23.0"
-    babel-plugin-tester "^11.0.4"
-    lightningcss "1.22.0"
+    debug "^4.3.7"
+    lightningcss "^1.27.0"
+    semver "^7.6.3"
 
 react-native-helmet-async@2.0.4:
   version "2.0.4"
@@ -10429,16 +10905,19 @@ react-native-helmet-async@2.0.4:
     react-fast-compare "^3.2.2"
     shallowequal "^1.1.0"
 
-react-native-reanimated@latest:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.11.0.tgz#d4265d4e0232623f5958ed60e1686ca884fc3452"
-  integrity sha512-BNw/XDgUfs8UhfY1X6IniU8kWpnotWGyt8qmQviaHisTi5lvwnaOdXQKfN1KGONx6ekdFRHRP5EFwLi0UajwKA==
+react-native-reanimated@^3.16.3:
+  version "3.16.3"
+  resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.16.3.tgz#3b559dca49e9e40abcf5de834dc27fc05f856b66"
+  integrity sha512-OWlA6e1oHhytTpc7WiSZ7Tmb8OYwLKYZz29Sz6d6WAg60Hm5GuAiKIWUG7Ako7FLcYhFkA0pEQ2xPMEYUo9vlw==
   dependencies:
     "@babel/plugin-transform-arrow-functions" "^7.0.0-0"
+    "@babel/plugin-transform-class-properties" "^7.0.0-0"
+    "@babel/plugin-transform-classes" "^7.0.0-0"
     "@babel/plugin-transform-nullish-coalescing-operator" "^7.0.0-0"
     "@babel/plugin-transform-optional-chaining" "^7.0.0-0"
     "@babel/plugin-transform-shorthand-properties" "^7.0.0-0"
     "@babel/plugin-transform-template-literals" "^7.0.0-0"
+    "@babel/plugin-transform-unicode-regex" "^7.0.0-0"
     "@babel/preset-typescript" "^7.16.7"
     convert-source-map "^2.0.0"
     invariant "^2.2.4"
@@ -10448,6 +10927,11 @@ react-native-safe-area-context@4.10.1:
   resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.10.1.tgz#29fb27395ff7dfa2fa38788a27226330d73a81cc"
   integrity sha512-w8tCuowDorUkPoWPXmhqosovBr33YsukkwYCDERZFHAxIkx6qBadYxfeoaJ91nCQKjkNzGrK5qhoNOeSIcYSpA==
 
+react-native-safe-area-context@^4.14.0:
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.14.0.tgz#138f4b2e180cb7517c78bd5f4d4cf91325ba0b1a"
+  integrity sha512-/SyYpCulWQOnnXhRq6wepkhoyQMowHm1ptDyRz20s+YS/R9mbd+mK+jFyFCyXFJn8jp7vFl43VUCgspuOiEbwA==
+
 react-native-screens@3.31.1:
   version "3.31.1"
   resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.31.1.tgz#909a890f669e32b0fb1b1410278b71ad2f8238f6"
@@ -10456,7 +10940,7 @@ react-native-screens@3.31.1:
     react-freeze "^1.0.0"
     warn-once "^0.1.0"
 
-react-native-svg@^15.2.0:
+react-native-svg@15.2.0:
   version "15.2.0"
   resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-15.2.0.tgz#9561a6b3bd6b44689f437ba13182afee33bd5557"
   integrity sha512-R0E6IhcJfVLsL0lRmnUSm72QO+mTqcAOM5Jb8FVGxJqX3NfJMlMP0YyvcajZiaRR8CqQUpEoqrY25eyZb006kw==
@@ -10464,7 +10948,21 @@ react-native-svg@^15.2.0:
     css-select "^5.1.0"
     css-tree "^1.1.3"
 
-react-native-web@latest, react-native-web@~0.19.6:
+react-native-web@^0.19.13:
+  version "0.19.13"
+  resolved "https://registry.yarnpkg.com/react-native-web/-/react-native-web-0.19.13.tgz#2d84849bf0251ec0e3a8072fda7f9a7c29375331"
+  integrity sha512-etv3bN8rJglrRCp/uL4p7l8QvUNUC++QwDbdZ8CB7BvZiMvsxfFIRM1j04vxNldG3uo2puRd6OSWR3ibtmc29A==
+  dependencies:
+    "@babel/runtime" "^7.18.6"
+    "@react-native/normalize-colors" "^0.74.1"
+    fbjs "^3.0.4"
+    inline-style-prefixer "^6.0.1"
+    memoize-one "^6.0.0"
+    nullthrows "^1.1.1"
+    postcss-value-parser "^4.2.0"
+    styleq "^0.1.3"
+
+react-native-web@~0.19.6:
   version "0.19.11"
   resolved "https://registry.yarnpkg.com/react-native-web/-/react-native-web-0.19.11.tgz#1b96ac3cea9af4e1280fd5fa3b606b471f66edc3"
   integrity sha512-51Qcjr0AtIgskwLqLsBByUMPs2nAWZ+6QF7x/siC72svNPcJ1/daXoPTNuHR2fX4oOrDATC4Vmc/SXOYPH19rw==
@@ -10708,6 +11206,13 @@ regenerate-unicode-properties@^10.1.0:
   dependencies:
     regenerate "^1.4.2"
 
+regenerate-unicode-properties@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0"
+  integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==
+  dependencies:
+    regenerate "^1.4.2"
+
 regenerate@^1.4.2:
   version "1.4.2"
   resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"
@@ -10754,6 +11259,30 @@ regexpu-core@^5.3.1:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.1.0"
 
+regexpu-core@^6.1.1:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.2.0.tgz#0e5190d79e542bf294955dccabae04d3c7d53826"
+  integrity sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==
+  dependencies:
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.2.0"
+    regjsgen "^0.8.0"
+    regjsparser "^0.12.0"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
+
+regjsgen@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab"
+  integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==
+
+regjsparser@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.12.0.tgz#0e846df6c6530586429377de56e0475583b088dc"
+  integrity sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==
+  dependencies:
+    jsesc "~3.0.2"
+
 regjsparser@^0.9.1:
   version "0.9.1"
   resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz"
@@ -10766,6 +11295,11 @@ remove-trailing-slash@^0.1.0:
   resolved "https://registry.yarnpkg.com/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz#be2285a59f39c74d1bce4f825950061915e3780d"
   integrity sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==
 
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
@@ -11037,6 +11571,11 @@ semver@^7.5.2, semver@^7.5.3, semver@^7.5.4:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.6.3:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+
 send@0.18.0, send@^0.18.0:
   version "0.18.0"
   resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
@@ -11233,6 +11772,11 @@ source-map-js@^1.2.0:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
+source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
+
 source-map-support@0.5.13:
   version "0.5.13"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
@@ -11541,13 +12085,6 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-indent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
-  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
-  dependencies:
-    min-indent "^1.0.0"
-
 strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
@@ -11593,7 +12130,7 @@ sucrase@3.34.0:
     pirates "^4.0.1"
     ts-interface-checker "^0.1.9"
 
-sucrase@^3.32.0:
+sucrase@^3.35.0:
   version "3.35.0"
   resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263"
   integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==
@@ -11672,33 +12209,33 @@ tailwind-variants@0.1.20:
   dependencies:
     tailwind-merge "^1.14.0"
 
-tailwindcss@3.4.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.3.tgz#be48f5283df77dfced705451319a5dffb8621519"
-  integrity sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==
+tailwindcss@^3.4.15:
+  version "3.4.15"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.15.tgz#04808bf4bf1424b105047d19e7d4bfab368044a9"
+  integrity sha512-r4MeXnfBmSOuKUWmXe6h2CcyfzJCEk4F0pptO5jlnYSIViUkVmsawj80N5h2lO3gwcmSb4n3PuN+e+GC1Guylw==
   dependencies:
     "@alloc/quick-lru" "^5.2.0"
     arg "^5.0.2"
-    chokidar "^3.5.3"
+    chokidar "^3.6.0"
     didyoumean "^1.2.2"
     dlv "^1.1.3"
-    fast-glob "^3.3.0"
+    fast-glob "^3.3.2"
     glob-parent "^6.0.2"
     is-glob "^4.0.3"
-    jiti "^1.21.0"
+    jiti "^1.21.6"
     lilconfig "^2.1.0"
-    micromatch "^4.0.5"
+    micromatch "^4.0.8"
     normalize-path "^3.0.0"
     object-hash "^3.0.0"
-    picocolors "^1.0.0"
-    postcss "^8.4.23"
+    picocolors "^1.1.1"
+    postcss "^8.4.47"
     postcss-import "^15.1.0"
     postcss-js "^4.0.1"
-    postcss-load-config "^4.0.1"
-    postcss-nested "^6.0.1"
-    postcss-selector-parser "^6.0.11"
-    resolve "^1.22.2"
-    sucrase "^3.32.0"
+    postcss-load-config "^4.0.2"
+    postcss-nested "^6.2.0"
+    postcss-selector-parser "^6.1.2"
+    resolve "^1.22.8"
+    sucrase "^3.35.0"
 
 tapable@^2.2.0:
   version "2.2.1"
@@ -12097,16 +12634,16 @@ typedarray.prototype.slice@^1.0.3:
     typed-array-buffer "^1.0.2"
     typed-array-byte-offset "^1.0.2"
 
-typescript@^4.9.4:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
-
 typescript@^5.3.3, typescript@~5.3.3:
   version "5.3.3"
   resolved "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz"
   integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
 
+typescript@^5.6.3:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
+  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
+
 ua-parser-js@^1.0.35:
   version "1.0.37"
   resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz"
@@ -12216,6 +12753,14 @@ update-browserslist-db@^1.0.13:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
+update-browserslist-db@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5"
+  integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==
+  dependencies:
+    escalade "^3.2.0"
+    picocolors "^1.1.0"
+
 uri-js@^4.2.2, uri-js@^4.4.1:
   version "4.4.1"
   resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"