diff --git a/packages/kit/src/components/Button/ButtonIcon.tsx b/packages/kit/src/components/Button/ButtonIcon.tsx
index bbb9b95..b231ab2 100644
--- a/packages/kit/src/components/Button/ButtonIcon.tsx
+++ b/packages/kit/src/components/Button/ButtonIcon.tsx
@@ -1,5 +1,5 @@
 import * as styles from "./Button.css";
-import { JSX, splitProps } from "solid-js";
+import { JSX } from "solid-js";
 
 export function ButtonIcon(props: JSX.IntrinsicElements["span"]) {
 	return <span class={styles.buttonIcon} {...props} />;
diff --git a/packages/kit/src/components/CheckBox/CheckBox.tsx b/packages/kit/src/components/CheckBox/CheckBox.tsx
index 300bac8..9ab56f1 100644
--- a/packages/kit/src/components/CheckBox/CheckBox.tsx
+++ b/packages/kit/src/components/CheckBox/CheckBox.tsx
@@ -1,7 +1,7 @@
 import { Checkbox as KCheckbox } from "@kobalte/core";
 import { JSX, Ref, Show, splitProps } from "solid-js";
 import * as styles from "./CheckBox.css";
-import { BaseFieldProps, createBaseFieldProps } from "../Field/createBaseFieldProps";
+import { BaseFieldProps } from "../Field/createBaseFieldProps";
 import {
 	createFieldErrorMessageProps,
 	FieldWithErrorMessageSupport,
diff --git a/packages/kit/src/components/Dropdown/Dropdown.tsx b/packages/kit/src/components/Dropdown/Dropdown.tsx
index 3751682..43a1408 100644
--- a/packages/kit/src/components/Dropdown/Dropdown.tsx
+++ b/packages/kit/src/components/Dropdown/Dropdown.tsx
@@ -1,8 +1,7 @@
 import { GetKobalteParams } from "../../utils/types";
-import { As, DropdownMenu as KDropdownMenu } from "@kobalte/core";
+import { DropdownMenu as KDropdownMenu } from "@kobalte/core";
 import * as styles from "./Dropdown.css";
 import { JSX, JSXElement, Show, splitProps } from "solid-js";
-import { OverrideComponentProps } from "@kobalte/utils";
 
 export function DropdownMenuContent(props: KDropdownMenu.DropdownMenuContentProps) {
 	return <KDropdownMenu.Content {...props} class={styles.content} />;
diff --git a/packages/kit/src/components/Field/Field.css.ts b/packages/kit/src/components/Field/Field.css.ts
index f734459..260dda8 100644
--- a/packages/kit/src/components/Field/Field.css.ts
+++ b/packages/kit/src/components/Field/Field.css.ts
@@ -4,6 +4,7 @@ import { recipe, RecipeVariants } from "@vanilla-extract/recipes";
 import { componentStateStyles } from "@kobalte/vanilla-extract";
 import { themeTokens } from "../../foundation/themes.css";
 import { tokens } from "../../foundation/contract.css";
+import { themeVars } from "../../foundation";
 
 export const FieldSizes = {
 	xs: "xs",
@@ -41,7 +42,7 @@ export const baseFieldVariants = recipe({
 		},
 		{
 			":focus": {
-				borderColor: themeTokens.colors.blue8,
+				borderColor: themeVars.brand,
 			},
 		},
 		componentStateStyles({
diff --git a/packages/kit/src/components/Field/FieldLabel/createFieldLabelProps.ts b/packages/kit/src/components/Field/FieldLabel/createFieldLabelProps.ts
index e0e8244..d92f098 100644
--- a/packages/kit/src/components/Field/FieldLabel/createFieldLabelProps.ts
+++ b/packages/kit/src/components/Field/FieldLabel/createFieldLabelProps.ts
@@ -1,7 +1,7 @@
 import { label } from "./FieldLabel.css";
-import { PolymorphicProps } from "@kobalte/utils/dist/types/polymorphic";
 import { mergeProps } from "solid-js";
 import { mergeClasses } from "../../../utils/css";
+import { PolymorphicProps } from "@kobalte/core";
 
 export function createFieldLabelProps<T extends PolymorphicProps<"label">>(props: T) {
 	return mergeProps(props, {
diff --git a/packages/kit/src/components/Field/FieldMessage/createFieldMessageProps.ts b/packages/kit/src/components/Field/FieldMessage/createFieldMessageProps.ts
index 3040fe3..1601a46 100644
--- a/packages/kit/src/components/Field/FieldMessage/createFieldMessageProps.ts
+++ b/packages/kit/src/components/Field/FieldMessage/createFieldMessageProps.ts
@@ -1,7 +1,7 @@
 import { description } from "./FieldMessage.css";
-import { PolymorphicProps } from "@kobalte/utils/dist/types/polymorphic";
 import { mergeProps } from "solid-js";
 import { mergeClasses } from "../../../utils/css";
+import { PolymorphicProps } from "@kobalte/core";
 
 export function createFieldMessageProps<T extends PolymorphicProps<"div">>(props: T) {
 	return mergeProps(props, {
diff --git a/packages/kit/src/components/Select/Select.css.ts b/packages/kit/src/components/Select/Select.css.ts
index ede000b..9fe6f14 100644
--- a/packages/kit/src/components/Select/Select.css.ts
+++ b/packages/kit/src/components/Select/Select.css.ts
@@ -4,7 +4,6 @@ import { componentStateStyles } from "@kobalte/vanilla-extract";
 import { tokens } from "../../foundation/contract.css";
 import { baseFieldTheme, baseFieldVars } from "../Field/Field.css";
 import { responsiveStyle } from "../../foundation/responsive";
-import { dropdownMenuThemeVars } from "../Dropdown/Dropdown.css";
 
 export const [selectTheme, selectThemeVars] = createTheme({
 	contentBackground: tokens.dropdownBackground,
diff --git a/packages/kit/src/components/Tabs/Tabs.tsx b/packages/kit/src/components/Tabs/Tabs.tsx
index dcae655..d026271 100644
--- a/packages/kit/src/components/Tabs/Tabs.tsx
+++ b/packages/kit/src/components/Tabs/Tabs.tsx
@@ -73,6 +73,6 @@ type TabsIndicatorProps = KTabs.TabsIndicatorProps;
 export function TabsIndicator(props: TabsIndicatorProps) {
 	const [local, others] = splitProps(props, ["class"]);
 	return (
-		<KTabs.Indicator {...props} class={mergeClasses(styles.indicator, local.class)} />
+		<KTabs.Indicator {...others} class={mergeClasses(styles.indicator, local.class)} />
 	);
 }
diff --git a/packages/kit/src/components/TextArea/TextArea.tsx b/packages/kit/src/components/TextArea/TextArea.tsx
index a82cf11..885ceb3 100644
--- a/packages/kit/src/components/TextArea/TextArea.tsx
+++ b/packages/kit/src/components/TextArea/TextArea.tsx
@@ -1,7 +1,7 @@
 import { TextField as KTextField } from "@kobalte/core";
 import { JSX, Ref, Show, splitProps } from "solid-js";
 import * as styles from "./TextArea.css";
-import { baseFieldContainer, textArea } from "./TextArea.css";
+import { baseFieldContainer } from "./TextArea.css";
 import { mergeClasses } from "../../utils/css";
 import { TextAreaLabel } from "./TextAreaLabel";
 import { TextAreaMessage } from "./TextAreaMessage";
diff --git a/packages/kit/src/icons/CloseIcon.tsx b/packages/kit/src/icons/CloseIcon.tsx
index 41fe542..9744399 100644
--- a/packages/kit/src/icons/CloseIcon.tsx
+++ b/packages/kit/src/icons/CloseIcon.tsx
@@ -1,4 +1,3 @@
-import { JSX } from "solid-js";
 import { SvgIcon, SvgIconProps } from "./SvgIcon";
 
 export function CloseIcon(props: SvgIconProps) {