diff --git a/packages/raystack/avatar/avatar.tsx b/packages/raystack/avatar/avatar.tsx
index f27032421..31906fa7c 100644
--- a/packages/raystack/avatar/avatar.tsx
+++ b/packages/raystack/avatar/avatar.tsx
@@ -26,6 +26,10 @@ const avatar = cva(styles.avatar, {
 });
 
 const image = cva(styles.image);
+
+/**
+ * @deprecated Use AvatarProps from '@raystack/apsara/v1' instead.
+ */
 export interface AvatarProps
   extends ComponentPropsWithoutRef<typeof AvatarPrimitive.Root>,
     VariantProps<typeof avatar> {}
@@ -59,6 +63,9 @@ const AvatarRoot = forwardRef<
 
 AvatarRoot.displayName = AvatarPrimitive.Root.displayName;
 
+/**
+ * @deprecated Use AvatarImageProps from '@raystack/apsara/v1' instead.
+ */
 export interface AvatarImageProps
   extends ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>,
     VariantProps<typeof image> {}
@@ -77,6 +84,9 @@ AvatarImage.displayName = AvatarPrimitive.Image.displayName;
 
 const fallback = cva(styles.fallback);
 
+/**
+ * @deprecated Use FallbackProps from '@raystack/apsara/v1' instead.
+ */
 export interface FallbackProps
   extends ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback>,
     VariantProps<typeof fallback> {}
diff --git a/packages/raystack/badge/badge.tsx b/packages/raystack/badge/badge.tsx
index 65457e411..b3e0c801a 100644
--- a/packages/raystack/badge/badge.tsx
+++ b/packages/raystack/badge/badge.tsx
@@ -22,4 +22,7 @@ const Badge: ForwardRefRenderFunction<unknown, BadgeProps> = (props, ref) => {
   return <span className={badge({ color, className })}>{children}</span>;
 };
 
+/**
+ * @deprecated Use Badge from '@raystack/apsara/v1' instead.
+ */
 export default React.forwardRef<unknown, BadgeProps>(Badge);
diff --git a/packages/raystack/checkbox/checkbox.tsx b/packages/raystack/checkbox/checkbox.tsx
index cac4124a0..b1b6e2416 100644
--- a/packages/raystack/checkbox/checkbox.tsx
+++ b/packages/raystack/checkbox/checkbox.tsx
@@ -18,6 +18,9 @@ const checkbox = cva(styles.checkbox, {
   },
 });
 
+/**
+ * @deprecated Use CheckboxProps from '@raystack/apsara/v1' instead.
+ */
 export interface CheckboxProps
   extends ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>,
     VariantProps<typeof checkbox>,
@@ -45,6 +48,10 @@ export const Checkbox = forwardRef<
 ));
 
 const indicator = cva(styles.indicator);
+
+/**
+ * @deprecated Use IndicatorProps from '@raystack/apsara/v1' instead.
+ */
 export interface IndicatorProps
   extends ComponentPropsWithoutRef<typeof CheckboxPrimitive.Indicator>,
     VariantProps<typeof indicator> {}
diff --git a/packages/raystack/dropdown-menu/dropdown-menu.tsx b/packages/raystack/dropdown-menu/dropdown-menu.tsx
index 7acd77d95..37b0f98c5 100644
--- a/packages/raystack/dropdown-menu/dropdown-menu.tsx
+++ b/packages/raystack/dropdown-menu/dropdown-menu.tsx
@@ -80,6 +80,10 @@ DropdownMenuGroup.displayName = DropdownMenuPrimitive.Group.displayName;
 type DropdownMenuProps = React.ComponentProps<
   typeof DropdownMenuPrimitive.Root
 >;
+
+/**
+ * @deprecated Use RootDropdownMenu from '@raystack/apsara/v1' instead.
+ */
 export function RootDropdownMenu({ children, ...props }: DropdownMenuProps) {
   return (
     <DropdownMenuPrimitive.Root {...props}>
diff --git a/packages/raystack/inputfield/inputfield.tsx b/packages/raystack/inputfield/inputfield.tsx
index 69364d55b..15ecfafd8 100644
--- a/packages/raystack/inputfield/inputfield.tsx
+++ b/packages/raystack/inputfield/inputfield.tsx
@@ -27,6 +27,10 @@ type InputFieldProps = PropsWithChildren<VariantProps<typeof inputfield>> &
     children?: React.ReactNode;
   };
 
+
+/**
+ * @deprecated Use InputField from '@raystack/apsara/v1' instead.
+ */
 export const InputField = ({ label, children, ...props }: InputFieldProps) => {
   return (
     <Flex direction="column" gap="extra-small" {...props}>
diff --git a/packages/raystack/text/text.tsx b/packages/raystack/text/text.tsx
index 2a23eb25f..260d99e9c 100644
--- a/packages/raystack/text/text.tsx
+++ b/packages/raystack/text/text.tsx
@@ -38,6 +38,9 @@ const text = cva(styles.text, {
   },
 });
 
+/**
+ * @deprecated Use TextProps from '@raystack/apsara/v1' instead.
+ */
 export type TextProps = PropsWithChildren<VariantProps<typeof text>> &
   HTMLAttributes<HTMLSpanElement>;
 
diff --git a/packages/raystack/v1/components/badge/badge.tsx b/packages/raystack/v1/components/badge/badge.tsx
index 347f03053..613f545d0 100644
--- a/packages/raystack/v1/components/badge/badge.tsx
+++ b/packages/raystack/v1/components/badge/badge.tsx
@@ -1,5 +1,5 @@
-import { ReactNode } from "react";
 import { cva, type VariantProps } from "class-variance-authority";
+import { ReactNode } from "react";
 
 import styles from "./badge.module.css";
 
diff --git a/packages/raystack/v1/index.tsx b/packages/raystack/v1/index.tsx
index 34efe8e51..19472eba9 100644
--- a/packages/raystack/v1/index.tsx
+++ b/packages/raystack/v1/index.tsx
@@ -1,6 +1,7 @@
 import "./styles/index.css";
 
 export { Avatar, AvatarGroup } from "./components/avatar";
+export { Badge } from "./components/badge";
 export { Box } from "./components/box"
 export { Breadcrumb } from "./components/breadcrumb";
 export { Button } from "./components/button";
@@ -12,7 +13,6 @@ export { Flex } from "./components/flex";
 export { InputField } from "./components/inputField";
 export { Spinner } from "./components/spinner";
 export { Text } from "./components/text";
-export { Badge } from "./components/badge";
 export {
   ThemeProvider,
   ThemeProviderProps,
diff --git a/packages/raystack/v1/styles/colors.css b/packages/raystack/v1/styles/colors.css
index 78c9da9e9..a2de6024e 100644
--- a/packages/raystack/v1/styles/colors.css
+++ b/packages/raystack/v1/styles/colors.css
@@ -40,7 +40,7 @@
   --rs-color-text-success-primary-hover: var(--rs-success-11);
 
   /* Border Colors */
-  --rs-color-border-base-tertiary: var(--rs-neutral-1);
+  --rs-color-border-base-tertiary: var(--rs-neutral-7);
   --rs-color-border-base-focus: var(--rs-neutral-8);
   --rs-color-border-base-primary: var(--rs-neutral-4);
   --rs-color-border-accent-primary: var(--rs-accent-7);