diff --git a/.changeset/short-comics-wish.md b/.changeset/short-comics-wish.md
new file mode 100644
index 00000000..982dc81a
--- /dev/null
+++ b/.changeset/short-comics-wish.md
@@ -0,0 +1,5 @@
+---
+"reshaped": patch
+---
+
+Text: Added semibold and extrabold weight support
diff --git a/packages/reshaped/src/cli/theming/tailwind.ts b/packages/reshaped/src/cli/theming/tailwind.ts
index cea558a8..bdec7183 100644
--- a/packages/reshaped/src/cli/theming/tailwind.ts
+++ b/packages/reshaped/src/cli/theming/tailwind.ts
@@ -61,6 +61,15 @@ export const transformToTailwind = (theme?: GeneratedThemeDefinition) => {
 		return;
 	});
 
+	Object.keys(definition.fontWeight).forEach((tokenName) => {
+		const cssTokenName = camelToKebab(tokenName);
+		const cssVariable = ["rs", "font-weight", cssTokenName].join("-");
+		const configValue = `var(--${cssVariable})`;
+
+		variables[`--font-weight-${cssTokenName}`] = configValue;
+		return;
+	});
+
 	Object.keys(definition.unit).forEach((tokenName) => {
 		if (tokenName.startsWith("base")) {
 			[...Array(11).keys()].forEach((i) => {
diff --git a/packages/reshaped/src/components/Accordion/Accordion.types.ts b/packages/reshaped/src/components/Accordion/Accordion.types.ts
index 44082935..0681edaa 100644
--- a/packages/reshaped/src/components/Accordion/Accordion.types.ts
+++ b/packages/reshaped/src/components/Accordion/Accordion.types.ts
@@ -1,7 +1,7 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { IconProps } from "@/components/Icon";
-import type React from "react";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 export type BaseProps = {
 	/** Expand / collapse icon size in units */
diff --git a/packages/reshaped/src/components/ActionBar/ActionBar.types.ts b/packages/reshaped/src/components/ActionBar/ActionBar.types.ts
index 519a5a5e..b0367242 100644
--- a/packages/reshaped/src/components/ActionBar/ActionBar.types.ts
+++ b/packages/reshaped/src/components/ActionBar/ActionBar.types.ts
@@ -1,7 +1,7 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { ViewProps } from "@/components/View";
-import type React from "react";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 export type Props = Pick<ViewProps, "paddingBlock" | "paddingInline" | "padding"> & {
 	/** Show or hide the component */
diff --git a/packages/reshaped/src/components/Alert/Alert.types.ts b/packages/reshaped/src/components/Alert/Alert.types.ts
index 18eb3dad..93c73ba2 100644
--- a/packages/reshaped/src/components/Alert/Alert.types.ts
+++ b/packages/reshaped/src/components/Alert/Alert.types.ts
@@ -1,7 +1,7 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { IconProps } from "@/components/Icon";
-import type React from "react";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 export type Props = {
 	/** SVG component for the icon */
diff --git a/packages/reshaped/src/components/Avatar/Avatar.types.ts b/packages/reshaped/src/components/Avatar/Avatar.types.ts
index 4c5235e7..2f89077e 100644
--- a/packages/reshaped/src/components/Avatar/Avatar.types.ts
+++ b/packages/reshaped/src/components/Avatar/Avatar.types.ts
@@ -1,6 +1,6 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { IconProps } from "@/components/Icon";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
 
 export type Props = {
 	/** Image URL */
diff --git a/packages/reshaped/src/components/Badge/Badge.types.ts b/packages/reshaped/src/components/Badge/Badge.types.ts
index e3f8b676..871db5c9 100644
--- a/packages/reshaped/src/components/Badge/Badge.types.ts
+++ b/packages/reshaped/src/components/Badge/Badge.types.ts
@@ -1,6 +1,6 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { ActionableProps } from "@/components/Actionable";
 import type { IconProps } from "@/components/Icon";
+import type { Attributes, ClassName } from "@reshaped/headless";
 import type React from "react";
 
 type BaseProps = {
diff --git a/packages/reshaped/src/components/Breadcrumbs/Breadcrumbs.types.ts b/packages/reshaped/src/components/Breadcrumbs/Breadcrumbs.types.ts
index f9c83ed5..6b39f362 100644
--- a/packages/reshaped/src/components/Breadcrumbs/Breadcrumbs.types.ts
+++ b/packages/reshaped/src/components/Breadcrumbs/Breadcrumbs.types.ts
@@ -1,5 +1,5 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { LinkProps } from "@/components/Link";
+import type { Attributes, ClassName } from "@reshaped/headless";
 import type React from "react";
 
 export type Props = {
diff --git a/packages/reshaped/src/components/Button/Button.types.ts b/packages/reshaped/src/components/Button/Button.types.ts
index 3d329ebf..d2b82f82 100644
--- a/packages/reshaped/src/components/Button/Button.types.ts
+++ b/packages/reshaped/src/components/Button/Button.types.ts
@@ -1,9 +1,9 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { AlignerProps as BaseAlignerProps } from "@/components/_private/Aligner";
 import type { ActionableProps } from "@/components/Actionable";
 import type { IconProps } from "@/components/Icon";
-import type React from "react";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 export type Size = "xlarge" | "large" | "medium" | "small";
 
diff --git a/packages/reshaped/src/components/Carousel/Carousel.types.ts b/packages/reshaped/src/components/Carousel/Carousel.types.ts
index c687c6ae..ce61a503 100644
--- a/packages/reshaped/src/components/Carousel/Carousel.types.ts
+++ b/packages/reshaped/src/components/Carousel/Carousel.types.ts
@@ -1,7 +1,7 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { ActionableRef } from "@/components/Actionable";
-import type React from "react";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 export type Instance =
 	| {
diff --git a/packages/reshaped/src/components/Checkbox/Checkbox.types.ts b/packages/reshaped/src/components/Checkbox/Checkbox.types.ts
index ea5ca965..695f8c2e 100644
--- a/packages/reshaped/src/components/Checkbox/Checkbox.types.ts
+++ b/packages/reshaped/src/components/Checkbox/Checkbox.types.ts
@@ -1,6 +1,6 @@
+import type * as G from "@/types/global";
 import type { Attributes, ClassName } from "@reshaped/headless";
 import type React from "react";
-import type * as G from "@/types/global";
 
 type BaseProps = {
 	/** Node for inserting the label */
diff --git a/packages/reshaped/src/components/CheckboxGroup/CheckboxGroup.types.ts b/packages/reshaped/src/components/CheckboxGroup/CheckboxGroup.types.ts
index f0b11966..d9262114 100644
--- a/packages/reshaped/src/components/CheckboxGroup/CheckboxGroup.types.ts
+++ b/packages/reshaped/src/components/CheckboxGroup/CheckboxGroup.types.ts
@@ -1,6 +1,6 @@
 import type { CheckboxProps } from "@/components/Checkbox";
-import type React from "react";
 import type * as G from "@/types/global";
+import type React from "react";
 
 type BaseProps = {
 	/** Component id attribute */
diff --git a/packages/reshaped/src/components/Container/Container.types.ts b/packages/reshaped/src/components/Container/Container.types.ts
index e9c060f8..094bc2c3 100644
--- a/packages/reshaped/src/components/Container/Container.types.ts
+++ b/packages/reshaped/src/components/Container/Container.types.ts
@@ -1,7 +1,7 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { ViewProps } from "@/components/View";
-import type React from "react";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 export type Props = Pick<ViewProps, "align" | "justify" | "height" | "maxHeight"> & {
 	/** Component inline padding */
diff --git a/packages/reshaped/src/components/Divider/Divider.types.ts b/packages/reshaped/src/components/Divider/Divider.types.ts
index d72c93b1..9a8e3567 100644
--- a/packages/reshaped/src/components/Divider/Divider.types.ts
+++ b/packages/reshaped/src/components/Divider/Divider.types.ts
@@ -1,6 +1,6 @@
+import type * as G from "@/types/global";
 import type { Attributes, ClassName } from "@reshaped/headless";
 import type React from "react";
-import type * as G from "@/types/global";
 
 export type Props = {
 	/** Change component to take no space, useful for using it as a border in components like Tabs */
diff --git a/packages/reshaped/src/components/FileUpload/FileUpload.types.ts b/packages/reshaped/src/components/FileUpload/FileUpload.types.ts
index 1f7ceca0..5588e9da 100644
--- a/packages/reshaped/src/components/FileUpload/FileUpload.types.ts
+++ b/packages/reshaped/src/components/FileUpload/FileUpload.types.ts
@@ -1,7 +1,7 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { ViewProps } from "@/components/View";
-import type React from "react";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 export type Props = {
 	/** Name of the input element */
diff --git a/packages/reshaped/src/components/Grid/Grid.types.ts b/packages/reshaped/src/components/Grid/Grid.types.ts
index f0cabefe..5eec9dd4 100644
--- a/packages/reshaped/src/components/Grid/Grid.types.ts
+++ b/packages/reshaped/src/components/Grid/Grid.types.ts
@@ -1,8 +1,8 @@
+import type * as TStyles from "@/styles/types";
+import type * as G from "@/types/global";
 import type { Attributes, ClassName } from "@reshaped/headless";
 import type { Property } from "csstype";
 import type React from "react";
-import type * as TStyles from "@/styles/types";
-import type * as G from "@/types/global";
 
 export type Props<TagName extends keyof React.JSX.IntrinsicElements | void = void> = {
 	/** Gap between grid items */
diff --git a/packages/reshaped/src/components/Hidden/Hidden.types.ts b/packages/reshaped/src/components/Hidden/Hidden.types.ts
index cd9367e7..8eb70baa 100644
--- a/packages/reshaped/src/components/Hidden/Hidden.types.ts
+++ b/packages/reshaped/src/components/Hidden/Hidden.types.ts
@@ -1,5 +1,5 @@
-import type React from "react";
 import type * as G from "@/types/global";
+import type React from "react";
 
 export type Props = {
 	/** Pick at which viewport sizes to hide the children*/
diff --git a/packages/reshaped/src/components/HiddenInput/HiddenInput.types.ts b/packages/reshaped/src/components/HiddenInput/HiddenInput.types.ts
index dcda1753..3e90d15e 100644
--- a/packages/reshaped/src/components/HiddenInput/HiddenInput.types.ts
+++ b/packages/reshaped/src/components/HiddenInput/HiddenInput.types.ts
@@ -1,7 +1,7 @@
 import React from "react";
 
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
 
 export type Props = {
 	/** Name of the input element */
diff --git a/packages/reshaped/src/components/Icon/Icon.types.ts b/packages/reshaped/src/components/Icon/Icon.types.ts
index 0aadbfb0..f980472a 100644
--- a/packages/reshaped/src/components/Icon/Icon.types.ts
+++ b/packages/reshaped/src/components/Icon/Icon.types.ts
@@ -1,6 +1,6 @@
+import type * as G from "@/types/global";
 import type { Attributes, ClassName } from "@reshaped/headless";
 import type React from "react";
-import type * as G from "@/types/global";
 
 export type Props = {
 	/** Icon svg component or node */
diff --git a/packages/reshaped/src/components/Image/Image.types.ts b/packages/reshaped/src/components/Image/Image.types.ts
index d2debb94..56de7fbe 100644
--- a/packages/reshaped/src/components/Image/Image.types.ts
+++ b/packages/reshaped/src/components/Image/Image.types.ts
@@ -1,7 +1,7 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
-import type React from "react";
 import type * as TStyles from "@/styles/types";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 export type Props = {
 	/** Image URL */
diff --git a/packages/reshaped/src/components/Loader/Loader.types.ts b/packages/reshaped/src/components/Loader/Loader.types.ts
index db6e9f77..5b2c1b7b 100644
--- a/packages/reshaped/src/components/Loader/Loader.types.ts
+++ b/packages/reshaped/src/components/Loader/Loader.types.ts
@@ -1,5 +1,5 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
 
 export type Props = {
 	/** Component size */
diff --git a/packages/reshaped/src/components/MenuItem/MenuItem.types.ts b/packages/reshaped/src/components/MenuItem/MenuItem.types.ts
index 79635c92..6c4da06a 100644
--- a/packages/reshaped/src/components/MenuItem/MenuItem.types.ts
+++ b/packages/reshaped/src/components/MenuItem/MenuItem.types.ts
@@ -1,8 +1,8 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { ActionableProps } from "@/components/Actionable";
 import type { IconProps } from "@/components/Icon";
-import type React from "react";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 export type Size = "small" | "medium" | "large";
 
diff --git a/packages/reshaped/src/components/Modal/Modal.types.ts b/packages/reshaped/src/components/Modal/Modal.types.ts
index d828c003..f2882231 100644
--- a/packages/reshaped/src/components/Modal/Modal.types.ts
+++ b/packages/reshaped/src/components/Modal/Modal.types.ts
@@ -1,7 +1,7 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { OverlayProps, OverlayCloseReason } from "@/components/Overlay";
-import type React from "react";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 export type Context = {
 	id: string;
diff --git a/packages/reshaped/src/components/PinField/PinField.types.ts b/packages/reshaped/src/components/PinField/PinField.types.ts
index a802bded..8e8fee0b 100644
--- a/packages/reshaped/src/components/PinField/PinField.types.ts
+++ b/packages/reshaped/src/components/PinField/PinField.types.ts
@@ -1,5 +1,5 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
 
 export type Size = "small" | "medium" | "large" | "xlarge";
 
diff --git a/packages/reshaped/src/components/Radio/Radio.types.ts b/packages/reshaped/src/components/Radio/Radio.types.ts
index 6991cb04..777858c0 100644
--- a/packages/reshaped/src/components/Radio/Radio.types.ts
+++ b/packages/reshaped/src/components/Radio/Radio.types.ts
@@ -1,6 +1,6 @@
+import type * as G from "@/types/global";
 import type { Attributes, ClassName } from "@reshaped/headless";
 import type React from "react";
-import type * as G from "@/types/global";
 
 type BaseProps = {
 	/** Node for inserting children */
diff --git a/packages/reshaped/src/components/RadioGroup/RadioGroup.types.ts b/packages/reshaped/src/components/RadioGroup/RadioGroup.types.ts
index 93ebadc8..5a2b6807 100644
--- a/packages/reshaped/src/components/RadioGroup/RadioGroup.types.ts
+++ b/packages/reshaped/src/components/RadioGroup/RadioGroup.types.ts
@@ -1,7 +1,7 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { RadioProps } from "@/components/Radio";
-import type React from "react";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 type BaseProps = {
 	/** Unique identifier for the radio group */
diff --git a/packages/reshaped/src/components/Reshaped/Reshaped.types.ts b/packages/reshaped/src/components/Reshaped/Reshaped.types.ts
index 207ebff8..56d9e528 100644
--- a/packages/reshaped/src/components/Reshaped/Reshaped.types.ts
+++ b/packages/reshaped/src/components/Reshaped/Reshaped.types.ts
@@ -1,8 +1,8 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { GlobalColorModeProps, ThemeProps } from "@/components/Theme";
 import type { ToastProviderProps } from "@/components/Toast";
-import type React from "react";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 export type Props = {
 	/** Node for inserting children */
diff --git a/packages/reshaped/src/components/Scrim/Scrim.types.ts b/packages/reshaped/src/components/Scrim/Scrim.types.ts
index df1503a8..30f72bb3 100644
--- a/packages/reshaped/src/components/Scrim/Scrim.types.ts
+++ b/packages/reshaped/src/components/Scrim/Scrim.types.ts
@@ -1,7 +1,7 @@
 import React from "react";
 
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { ViewProps } from "@/components/View";
+import type { Attributes, ClassName } from "@reshaped/headless";
 
 export type Props = {
 	/** Node for inserting content */
diff --git a/packages/reshaped/src/components/ScrollArea/ScrollArea.types.ts b/packages/reshaped/src/components/ScrollArea/ScrollArea.types.ts
index ded65fb4..4f0bbcd9 100644
--- a/packages/reshaped/src/components/ScrollArea/ScrollArea.types.ts
+++ b/packages/reshaped/src/components/ScrollArea/ScrollArea.types.ts
@@ -1,7 +1,7 @@
+import type * as G from "@/types/global";
 import type { Attributes, ClassName } from "@reshaped/headless";
 import type { Coordinates } from "@reshaped/headless/internal";
 import type React from "react";
-import type * as G from "@/types/global";
 
 export type Props = {
 	/** Node for inserting content */
diff --git a/packages/reshaped/src/components/Select/Select.types.ts b/packages/reshaped/src/components/Select/Select.types.ts
index 333ea583..eb2c9140 100644
--- a/packages/reshaped/src/components/Select/Select.types.ts
+++ b/packages/reshaped/src/components/Select/Select.types.ts
@@ -1,11 +1,11 @@
 import React from "react";
 
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { ActionableProps } from "@/components/Actionable";
 import type { DropdownMenuProps } from "@/components/DropdownMenu";
 import type { IconProps } from "@/components/Icon";
 import type { MenuItemProps } from "@/components/MenuItem";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
 
 type Size = G.Responsive<"small" | "medium" | "large" | "xlarge">;
 
diff --git a/packages/reshaped/src/components/Skeleton/Skeleton.types.ts b/packages/reshaped/src/components/Skeleton/Skeleton.types.ts
index e2931b42..df523f2e 100644
--- a/packages/reshaped/src/components/Skeleton/Skeleton.types.ts
+++ b/packages/reshaped/src/components/Skeleton/Skeleton.types.ts
@@ -1,5 +1,5 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { ViewProps } from "@/components/View";
+import type { Attributes, ClassName } from "@reshaped/headless";
 
 export type Props = Pick<ViewProps, "width" | "height" | "borderRadius"> & {
 	/** Additional classname for the root element */
diff --git a/packages/reshaped/src/components/Stepper/Stepper.types.ts b/packages/reshaped/src/components/Stepper/Stepper.types.ts
index 551d7b0b..897242b7 100644
--- a/packages/reshaped/src/components/Stepper/Stepper.types.ts
+++ b/packages/reshaped/src/components/Stepper/Stepper.types.ts
@@ -1,6 +1,6 @@
+import type * as G from "@/types/global";
 import type { Attributes, ClassName } from "@reshaped/headless";
 import type React from "react";
-import type * as G from "@/types/global";
 
 export type Props = {
 	/** Id of the item to display as active */
diff --git a/packages/reshaped/src/components/Switch/Switch.types.ts b/packages/reshaped/src/components/Switch/Switch.types.ts
index 79e2d95e..56e9974b 100644
--- a/packages/reshaped/src/components/Switch/Switch.types.ts
+++ b/packages/reshaped/src/components/Switch/Switch.types.ts
@@ -1,7 +1,7 @@
 import React from "react";
 
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
 
 type BaseProps = {
 	/** Node for inserting children */
diff --git a/packages/reshaped/src/components/Tabs/Tabs.types.ts b/packages/reshaped/src/components/Tabs/Tabs.types.ts
index 93d92b91..bf8dae36 100644
--- a/packages/reshaped/src/components/Tabs/Tabs.types.ts
+++ b/packages/reshaped/src/components/Tabs/Tabs.types.ts
@@ -1,5 +1,5 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { IconProps } from "@/components/Icon";
+import type { Attributes, ClassName } from "@reshaped/headless";
 import type React from "react";
 
 export type SelectionState = {
diff --git a/packages/reshaped/src/components/Text/Text.module.css b/packages/reshaped/src/components/Text/Text.module.css
index dec49593..6649dc54 100644
--- a/packages/reshaped/src/components/Text/Text.module.css
+++ b/packages/reshaped/src/components/Text/Text.module.css
@@ -162,9 +162,17 @@
 		font-weight: var(--rs-font-weight-medium) !important;
 	}
 
+	@value semibold {
+		font-weight: var(--rs-font-weight-semibold) !important;
+	}
+
 	@value bold {
 		font-weight: var(--rs-font-weight-bold) !important;
 	}
+
+	@value extrabold {
+		font-weight: var(--rs-font-weight-extrabold) !important;
+	}
 }
 
 @each $color in neutral, neutral-faded, primary, warning, positive, critical, disabled {
diff --git a/packages/reshaped/src/components/Text/Text.types.ts b/packages/reshaped/src/components/Text/Text.types.ts
index acb08951..9400559c 100644
--- a/packages/reshaped/src/components/Text/Text.types.ts
+++ b/packages/reshaped/src/components/Text/Text.types.ts
@@ -1,6 +1,6 @@
+import type * as G from "@/types/global";
 import type { Attributes, ClassName } from "@reshaped/headless";
 import type React from "react";
-import type * as G from "@/types/global";
 
 export type Variant =
 	| "title-1"
@@ -22,7 +22,7 @@ export type Props<TagName extends keyof React.JSX.IntrinsicElements | void = voi
 	/** Text render variant */
 	variant?: G.Responsive<Variant>;
 	/** Text font weight */
-	weight?: G.Responsive<"regular" | "medium" | "bold">;
+	weight?: G.Responsive<"regular" | "medium" | "semibold" | "bold" | "extrabold">;
 	/** Render monospace font */
 	monospace?: boolean;
 	/** Text color, based on the color tokens */
diff --git a/packages/reshaped/src/components/Text/tests/Text.stories.tsx b/packages/reshaped/src/components/Text/tests/Text.stories.tsx
index 613fac44..e0a21788 100644
--- a/packages/reshaped/src/components/Text/tests/Text.stories.tsx
+++ b/packages/reshaped/src/components/Text/tests/Text.stories.tsx
@@ -77,9 +77,15 @@ export const weight = {
 			<Example.Item title="weight: medium">
 				<Text weight="medium">Medium</Text>
 			</Example.Item>
+			<Example.Item title="weight: semibold">
+				<Text weight="semibold">Semibold</Text>
+			</Example.Item>
 			<Example.Item title="weight: bold">
 				<Text weight="bold">Bold</Text>
 			</Example.Item>
+			<Example.Item title="weight: extrabold">
+				<Text weight="extrabold">Extrabold</Text>
+			</Example.Item>
 			<Example.Item title={["responsive", "[s] weight: regular", "[m+] bold"]}>
 				<Text weight={{ s: "regular", m: "bold" }}>Responsive</Text>
 			</Example.Item>
diff --git a/packages/reshaped/src/components/TextArea/TextArea.types.ts b/packages/reshaped/src/components/TextArea/TextArea.types.ts
index fc717885..666bade6 100644
--- a/packages/reshaped/src/components/TextArea/TextArea.types.ts
+++ b/packages/reshaped/src/components/TextArea/TextArea.types.ts
@@ -1,8 +1,8 @@
 import React from "react";
 
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { FormControlProps } from "@/components/FormControl";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
 
 type Size = G.Responsive<"medium" | "large" | "xlarge">;
 
diff --git a/packages/reshaped/src/components/TextField/TextField.types.ts b/packages/reshaped/src/components/TextField/TextField.types.ts
index f0581a30..c9939b55 100644
--- a/packages/reshaped/src/components/TextField/TextField.types.ts
+++ b/packages/reshaped/src/components/TextField/TextField.types.ts
@@ -1,8 +1,8 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { FormControlProps } from "@/components/FormControl";
 import type { IconProps } from "@/components/Icon";
-import type React from "react";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 type Size = G.Responsive<"small" | "medium" | "large" | "xlarge">;
 
diff --git a/packages/reshaped/src/components/Toast/Toast.types.ts b/packages/reshaped/src/components/Toast/Toast.types.ts
index ca74f354..94f09adc 100644
--- a/packages/reshaped/src/components/Toast/Toast.types.ts
+++ b/packages/reshaped/src/components/Toast/Toast.types.ts
@@ -1,5 +1,5 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
 import type { IconProps } from "@/components/Icon";
+import type { Attributes, ClassName } from "@reshaped/headless";
 import type React from "react";
 
 export type Status = "entering" | "entered" | "exited";
diff --git a/packages/reshaped/src/components/View/View.types.ts b/packages/reshaped/src/components/View/View.types.ts
index 37786fcd..18903583 100644
--- a/packages/reshaped/src/components/View/View.types.ts
+++ b/packages/reshaped/src/components/View/View.types.ts
@@ -1,7 +1,7 @@
-import type { Attributes, ClassName } from "@reshaped/headless";
-import type React from "react";
 import type * as TStyles from "@/styles/types";
 import type * as G from "@/types/global";
+import type { Attributes, ClassName } from "@reshaped/headless";
+import type React from "react";
 
 type Columns = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | "auto";
 export type Direction = "row" | "column" | "row-reverse" | "column-reverse";
diff --git a/packages/reshaped/src/styles/mixin.ts b/packages/reshaped/src/styles/mixin.ts
index 6f4c7ab7..cab4abce 100644
--- a/packages/reshaped/src/styles/mixin.ts
+++ b/packages/reshaped/src/styles/mixin.ts
@@ -37,8 +37,8 @@ import radius from "@/styles/resolvers/radius";
 import textAlign from "@/styles/resolvers/textAlign";
 import width from "@/styles/resolvers/width";
 
-import type { ClassName } from "@reshaped/headless";
 import type { Mixin } from "@/styles/types";
+import type { ClassName } from "@reshaped/headless";
 
 const mixinMap = {
 	align,
diff --git a/packages/reshaped/src/utilities/props.ts b/packages/reshaped/src/utilities/props.ts
index 1dd47639..d5c07e90 100644
--- a/packages/reshaped/src/utilities/props.ts
+++ b/packages/reshaped/src/utilities/props.ts
@@ -1,5 +1,5 @@
-import type { CSSVariable } from "@reshaped/headless";
 import type * as G from "@/types/global";
+import type { CSSVariable } from "@reshaped/headless";
 
 type Value = string | boolean | number | undefined;
 type ClassNameResolver = string | ((value: Value) => string);