diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt
index d49c3e65..b845f8cd 100644
--- a/common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt
+++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt
@@ -7,6 +7,7 @@ import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.ProvidedValue
+import com.halilibo.richtext.ui.material3.SetupMaterial3RichText
 
 val LightThemeColors =
   lightColorScheme(
@@ -73,6 +74,8 @@ fun LobstersTheme(
   content: @Composable () -> Unit,
 ) {
   CompositionLocalProvider(*providedValues) {
-    MaterialTheme(colorScheme = colorScheme, typography = AppTypography, content = content)
+    MaterialTheme(colorScheme = colorScheme, typography = AppTypography) {
+      SetupMaterial3RichText { content() }
+    }
   }
 }
diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Markdown.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Markdown.kt
index 0ed32d63..79a8d178 100644
--- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Markdown.kt
+++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Markdown.kt
@@ -7,7 +7,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import com.halilibo.richtext.markdown.Markdown
-import com.halilibo.richtext.ui.material3.Material3RichText
+import com.halilibo.richtext.ui.RichText
+import com.halilibo.richtext.ui.RichTextStyle
 
 @Composable
 fun ThemedRichText(
@@ -18,6 +19,11 @@ fun ThemedRichText(
     LocalTextStyle provides MaterialTheme.typography.bodyLarge,
     LocalContentColor provides MaterialTheme.colorScheme.onBackground,
   ) {
-    Material3RichText(modifier) { Markdown(text) }
+    RichText(
+      modifier = modifier,
+      style = RichTextStyle.Default,
+    ) {
+      Markdown(text)
+    }
   }
 }