diff --git a/src/components/Headline.tsx b/src/components/Headline.tsx
index 27881a8..16b0db6 100644
--- a/src/components/Headline.tsx
+++ b/src/components/Headline.tsx
@@ -16,7 +16,7 @@ export const Headline: FunctionalComponent<Props> = ({
 }) => {
 	const Tag = as;
 	const classes = cx(
-		'text-5 font-black tracking-tight mbe-10 mbs-16 first-of-type:mbs-0 dark:font-extrabold',
+		'text-5 font-black tracking-tight mbe-10 mbs-12 dark:font-extrabold',
 		className
 	);
 
diff --git a/src/components/Subheadline.tsx b/src/components/Subheadline.tsx
index 96c818c..69c30b0 100644
--- a/src/components/Subheadline.tsx
+++ b/src/components/Subheadline.tsx
@@ -16,7 +16,7 @@ export const Subheadline: FunctionalComponent<Props> = ({
 }) => {
 	const Tag = as;
 	const classes = cx(
-		'text-4 font-black tracking-tight mbe-8 mbs-14 first-of-type:mbs-0 dark:font-extrabold',
+		'text-4 font-black tracking-tight mbe-8 mbs-12 dark:font-extrabold',
 		className
 	);
 
diff --git a/src/components/Subsubheadline.tsx b/src/components/Subsubheadline.tsx
index 02e8b88..1c0c885 100644
--- a/src/components/Subsubheadline.tsx
+++ b/src/components/Subsubheadline.tsx
@@ -16,7 +16,7 @@ export const Subsubheadline: FunctionalComponent<Props> = ({
 }) => {
 	const Tag = as;
 	const classes = cx(
-		'text-3 font-black tracking-tight mbe-5 mbs-14 first-of-type:mbs-0 dark:font-extrabold',
+		'text-3 font-black tracking-tight mbe-5 mbs-12 dark:font-extrabold',
 		className
 	);
 
diff --git a/src/components/Text.tsx b/src/components/Text.tsx
index a8c91a9..64a681b 100644
--- a/src/components/Text.tsx
+++ b/src/components/Text.tsx
@@ -16,7 +16,7 @@ export const Text: FunctionalComponent<Props> = ({
 }) => {
 	const Tag = as;
 	const classes = cx(
-		'text-3 font-normal tracking-normal mbe-10 mbs-0 last-of-type:mbe-0 dark:font-light',
+		'text-3 font-normal tracking-normal mbe-10 mbs-0 dark:font-light',
 		className
 	);
 
diff --git a/src/components/TextLink.tsx b/src/components/TextLink.tsx
index 7a4b587..89827c9 100644
--- a/src/components/TextLink.tsx
+++ b/src/components/TextLink.tsx
@@ -12,7 +12,7 @@ export const TextLink: FunctionalComponent<Props> = ({
 	...props
 }: Props) => {
 	const classes = cx(
-		'font-semibold text-shibui-950 underline decoration-shibui-900/20 decoration-4 underline-offset-auto no-common-ligatures no-discretionary-ligatures hover:!decoration-accent focus:!decoration-accent dark:text-shibui-200/[0.87] dark:decoration-shibui-100/20',
+		'font-semibold text-shibui-950 underline decoration-shibui-900/20 decoration-4 underline-offset-auto no-common-ligatures hover:!decoration-accent focus:!decoration-accent dark:text-shibui-200/[0.87] dark:decoration-shibui-100/20',
 		className as string
 	);