diff --git a/common/src/androidMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt b/common/src/androidMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt
index 1d5594ea..0497c2ff 100644
--- a/common/src/androidMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt
+++ b/common/src/androidMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt
@@ -7,7 +7,7 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import dev.msfjarvis.claw.common.R
 
-actual val Manrope =
+actual fun createFontFamily() =
   FontFamily(
     Font(R.font.manrope_bold, FontWeight.Bold),
     Font(R.font.manrope_extrabold, FontWeight.ExtraBold),
diff --git a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt
index fce179c5..43f5c6fc 100644
--- a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt
+++ b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt
@@ -6,7 +6,9 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
 
-expect val Manrope: FontFamily
+expect fun createFontFamily(): FontFamily
+
+private val Manrope = createFontFamily()
 
 val AppTypography =
   Typography(
diff --git a/common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt b/common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt
index 297d7dfe..5a68080b 100644
--- a/common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt
+++ b/common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt
@@ -6,7 +6,7 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.platform.Font
 
-actual val Manrope =
+actual fun createFontFamily() =
   FontFamily(
     Font("font/manrope_bold.ttf", FontWeight.Bold),
     Font("font/manrope_extrabold.ttf", FontWeight.ExtraBold),