diff --git a/packages/kit/src/components/CheckBox/CheckBox.tsx b/packages/kit/src/components/CheckBox/CheckBox.tsx
index 9ab56f1..3625844 100644
--- a/packages/kit/src/components/CheckBox/CheckBox.tsx
+++ b/packages/kit/src/components/CheckBox/CheckBox.tsx
@@ -34,7 +34,7 @@ export function Checkbox(props: CheckBoxProps) {
 	]);
 
 	const errorMessageProps = createFieldErrorMessageProps(props);
-	const fieldLabelProps = createFieldMessageProps(props);
+	const fieldLabelProps = createFieldMessageProps({});
 
 	const inputClasses = () => mergeClasses(styles.input, local.slotClasses?.input);
 
diff --git a/packages/kit/src/components/Field/FieldLabel/createFieldLabelProps.ts b/packages/kit/src/components/Field/FieldLabel/createFieldLabelProps.ts
index d92f098..2c4bcb9 100644
--- a/packages/kit/src/components/Field/FieldLabel/createFieldLabelProps.ts
+++ b/packages/kit/src/components/Field/FieldLabel/createFieldLabelProps.ts
@@ -1,9 +1,11 @@
 import { label } from "./FieldLabel.css";
-import { mergeProps } from "solid-js";
+import { mergeProps, ValidComponent } from "solid-js";
 import { mergeClasses } from "../../../utils/css";
 import { PolymorphicProps } from "@kobalte/core";
 
-export function createFieldLabelProps<T extends PolymorphicProps<"label">>(props: T) {
+export function createFieldLabelProps<TValidComponent extends ValidComponent = "label">(
+	props: PolymorphicProps<TValidComponent>,
+) {
 	return mergeProps(props, {
 		get class() {
 			return mergeClasses(props.class, label);
diff --git a/packages/kit/src/components/Field/FieldMessage/createFieldMessageProps.ts b/packages/kit/src/components/Field/FieldMessage/createFieldMessageProps.ts
index 1601a46..345e2c4 100644
--- a/packages/kit/src/components/Field/FieldMessage/createFieldMessageProps.ts
+++ b/packages/kit/src/components/Field/FieldMessage/createFieldMessageProps.ts
@@ -1,10 +1,13 @@
 import { description } from "./FieldMessage.css";
-import { mergeProps } from "solid-js";
+import { mergeProps, splitProps, ValidComponent } 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, {
+export function createFieldMessageProps<TComponent extends ValidComponent = "div">(
+	props: PolymorphicProps<TComponent>,
+) {
+	const [local] = splitProps(props, []);
+	return mergeProps(local, {
 		get class() {
 			return mergeClasses(props.class, description);
 		},
diff --git a/packages/kit/src/components/Link/Link.css.ts b/packages/kit/src/components/Link/Link.css.ts
index 6b621d3..2f0dd9b 100644
--- a/packages/kit/src/components/Link/Link.css.ts
+++ b/packages/kit/src/components/Link/Link.css.ts
@@ -1,10 +1,7 @@
 import { createTheme } from "@vanilla-extract/css";
 import { recipe, RecipeVariants } from "@vanilla-extract/recipes";
-import { themeTokens } from "../../foundation/themes.css";
 
-const [linkTheme, linkVars] = createTheme({
-	blockBorderRadius: themeTokens.radii.sm,
-});
+const [linkTheme] = createTheme({});
 
 export const link = recipe({
 	base: [
diff --git a/packages/kit/src/components/RadioList/RadioList.tsx b/packages/kit/src/components/RadioList/RadioList.tsx
index 717ddb6..ae1dc7a 100644
--- a/packages/kit/src/components/RadioList/RadioList.tsx
+++ b/packages/kit/src/components/RadioList/RadioList.tsx
@@ -16,7 +16,7 @@ export type RadioListProps = RadioGroup.RadioGroupRootProps &
 	FieldWithErrorMessageSupport & { label?: JSXElement; description?: string };
 
 function RadioGroupLabel(props: RadioGroup.RadioGroupLabelProps) {
-	const fieldLabelProps = createFieldLabelProps(props);
+	const fieldLabelProps = createFieldLabelProps<"span">(props);
 
 	return <RadioGroup.Label {...fieldLabelProps} />;
 }
diff --git a/packages/kit/src/components/Select/Select.tsx b/packages/kit/src/components/Select/Select.tsx
index 1adbd73..ea4ad28 100644
--- a/packages/kit/src/components/Select/Select.tsx
+++ b/packages/kit/src/components/Select/Select.tsx
@@ -62,7 +62,7 @@ export function Select<T>(props: ParentProps<SelectProps<T>>) {
 		["options", "value"],
 	);
 	const baseFieldProps = createBaseFieldProps(props);
-	const labelProps = createFieldLabelProps({});
+	const labelProps = createFieldLabelProps<"span">({});
 	const descriptionProps = createFieldMessageProps({});
 	const errorProps = createFieldErrorMessageProps(props);