diff --git a/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/BottomLogo.kt b/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/BottomLogo.kt
index 626179ff..8a455f83 100644
--- a/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/BottomLogo.kt
+++ b/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/BottomLogo.kt
@@ -24,7 +24,7 @@ fun BottomLogo(color: Color = MaterialTheme.colorScheme.onSecondaryFixed) {
     ) {
         Text(
             text = "Droid Knights 2023",
-            style = MaterialTheme.typography.labelMedium,
+            style = KnightsTheme.typography.labelMediumR,
             color = color,
         )
     }
diff --git a/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/Chip.kt b/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/Chip.kt
index e0359cd1..ecd8c1d3 100644
--- a/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/Chip.kt
+++ b/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/Chip.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.droidknights.app2023.core.designsystem.theme.KnightsTheme
 
 @Composable
 fun TextChip(
@@ -27,7 +28,7 @@ fun TextChip(
         shape = RoundedCornerShape(10.dp),
         color = containerColor,
     ) {
-        ProvideTextStyle(MaterialTheme.typography.labelMedium) {
+        ProvideTextStyle(KnightsTheme.typography.labelMediumR) {
             Text(text = text, color = labelColor, modifier = Modifier.padding(TextChipPadding))
         }
     }
diff --git a/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/TopAppBar.kt b/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/TopAppBar.kt
index f1ced2a2..9a84b8a7 100644
--- a/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/TopAppBar.kt
+++ b/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/TopAppBar.kt
@@ -22,6 +22,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.droidknights.app2023.core.designsystem.theme.KnightsTheme
 
 @Composable
 fun KnightsTopAppBar(
@@ -68,7 +69,7 @@ fun KnightsTopAppBar(
             }
             Text(
                 text = stringResource(id = titleRes),
-                style = MaterialTheme.typography.titleSmall,
+                style = KnightsTheme.typography.titleSmallM,
                 modifier = Modifier.align(Alignment.Center)
             )
         }
diff --git a/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/theme/Theme.kt b/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/theme/Theme.kt
index c8a65e1a..da9a0306 100644
--- a/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/theme/Theme.kt
+++ b/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/theme/Theme.kt
@@ -86,11 +86,19 @@ fun KnightsTheme(
     content: @Composable () -> Unit,
 ) {
     val colorScheme = if (darkTheme) DarkColorScheme else LightColorScheme
-    CompositionLocalProvider(LocalDarkTheme provides darkTheme) {
+    CompositionLocalProvider(
+        LocalDarkTheme provides darkTheme,
+        LocalTypography provides Typography
+    ) {
         MaterialTheme(
-            typography = Typography,
             colorScheme = colorScheme,
             content = content,
         )
     }
 }
+
+object KnightsTheme {
+    val typography: KnightsTypography
+        @Composable
+        get() = LocalTypography.current
+}
diff --git a/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/theme/Type.kt b/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/theme/Type.kt
index a51342fb..3cc54c19 100644
--- a/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/theme/Type.kt
+++ b/core/designsystem/src/main/java/com/droidknights/app2023/core/designsystem/theme/Type.kt
@@ -1,6 +1,7 @@
 package com.droidknights.app2023.core.designsystem.theme
 
-import androidx.compose.material3.Typography
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -11,100 +12,219 @@ private val SansSerifStyle = TextStyle(
     fontWeight = FontWeight.Normal,
 )
 
-private val DisplayLarge = SansSerifStyle.copy(
-    fontSize = 57.sp,
-    lineHeight = 64.sp,
-    letterSpacing = (-0.25).sp
-)
-
-private val DisplayMedium = SansSerifStyle.copy(
-    fontSize = 45.sp,
-    lineHeight = 52.sp,
-)
-
-private val DisplaySmall = SansSerifStyle.copy(
-    fontSize = 36.sp,
-    lineHeight = 44.sp,
-)
-
-private val HeadlineLarge = SansSerifStyle.copy(
-    fontSize = 32.sp,
-    lineHeight = 40.sp,
-)
-
-private val HeadlineMedium = SansSerifStyle.copy(
-    fontSize = 28.sp,
-    lineHeight = 36.sp,
-)
-
-private val HeadlineSmall = SansSerifStyle.copy(
-    fontSize = 24.sp,
-    lineHeight = 32.sp,
-    fontWeight = FontWeight.W900,
-)
-
-private val TitleLarge = SansSerifStyle.copy(
-    fontSize = 22.sp,
-    lineHeight = 28.sp,
-)
-
-private val TitleMedium = SansSerifStyle.copy(
-    fontSize = 16.sp,
-    lineHeight = 24.sp,
-)
-
-private val TitleSmall = SansSerifStyle.copy(
-    fontSize = 14.sp,
-    lineHeight = 20.sp,
-)
-
-private val LabelLarge = SansSerifStyle.copy(
-    fontSize = 12.sp,
-    lineHeight = 16.sp,
-)
-
-private val LabelMedium = SansSerifStyle.copy(
-    fontSize = 12.sp,
-    lineHeight = 16.sp,
-)
-
-private val LabelSmall = SansSerifStyle.copy(
-    fontSize = 11.sp,
-    lineHeight = 16.sp,
-)
-
-private val BodyLarge = SansSerifStyle.copy(
-    fontSize = 16.sp,
-    lineHeight = 24.sp,
-    letterSpacing = 0.5.sp
-)
-
-private val BodyMedium = SansSerifStyle.copy(
-    fontSize = 14.sp,
-    lineHeight = 20.sp,
-    letterSpacing = 0.25.sp
-)
-
-private val BodySmall = SansSerifStyle.copy(
-    fontSize = 12.sp,
-    lineHeight = 16.sp,
-    letterSpacing = 0.4.sp
-)
-
-val Typography = Typography(
-    displayLarge = DisplayLarge,
-    displayMedium = DisplayMedium,
-    displaySmall = DisplaySmall,
-    headlineLarge = HeadlineLarge,
-    headlineMedium = HeadlineMedium,
-    headlineSmall = HeadlineSmall,
-    titleLarge = TitleLarge,
-    titleMedium = TitleMedium,
-    titleSmall = TitleSmall,
-    labelLarge = LabelLarge,
-    labelMedium = LabelMedium,
-    labelSmall = LabelSmall,
-    bodyLarge = BodyLarge,
-    bodyMedium = BodyMedium,
-    bodySmall = BodySmall,
-)
+internal val Typography = KnightsTypography(
+    displayLargeR = SansSerifStyle.copy(
+        fontSize = 57.sp,
+        lineHeight = 64.sp,
+        letterSpacing = (-0.25).sp
+    ),
+    displayMediumR = SansSerifStyle.copy(
+        fontSize = 45.sp,
+        lineHeight = 52.sp,
+    ),
+    displaySmallR = SansSerifStyle.copy(
+        fontSize = 36.sp,
+        lineHeight = 44.sp,
+    ),
+    headlineLargeEB = SansSerifStyle.copy(
+        fontSize = 32.sp,
+        lineHeight = 40.sp,
+        fontWeight = FontWeight.ExtraBold
+    ),
+    headlineLargeSB = SansSerifStyle.copy(
+        fontSize = 32.sp,
+        lineHeight = 40.sp,
+        fontWeight = FontWeight.SemiBold
+    ),
+    headlineLargeR = SansSerifStyle.copy(
+        fontSize = 32.sp,
+        lineHeight = 40.sp,
+    ),
+    headlineMediumB = SansSerifStyle.copy(
+        fontSize = 28.sp,
+        lineHeight = 36.sp,
+        fontWeight = FontWeight.Bold
+    ),
+    headlineMediumM = SansSerifStyle.copy(
+        fontSize = 28.sp,
+        lineHeight = 36.sp,
+        fontWeight = FontWeight.Medium
+    ),
+    headlineMediumR = SansSerifStyle.copy(
+        fontSize = 28.sp,
+        lineHeight = 36.sp,
+    ),
+    headlineSmallBL = SansSerifStyle.copy(
+        fontSize = 24.sp,
+        lineHeight = 32.sp,
+        fontWeight = FontWeight.Black,
+        letterSpacing = (-0.2).sp
+    ),
+    headlineSmallM = SansSerifStyle.copy(
+        fontSize = 24.sp,
+        lineHeight = 32.sp,
+        fontWeight = FontWeight.Medium
+    ),
+    headlineSmallR = SansSerifStyle.copy(
+        fontSize = 24.sp,
+        lineHeight = 32.sp,
+    ),
+    titleLargeBL = SansSerifStyle.copy(
+        fontSize = 22.sp,
+        lineHeight = 28.sp,
+        fontWeight = FontWeight.Black
+    ),
+    titleLargeB = SansSerifStyle.copy(
+        fontSize = 22.sp,
+        lineHeight = 28.sp,
+        fontWeight = FontWeight.Bold
+    ),
+    titleLargeM = SansSerifStyle.copy(
+        fontSize = 22.sp,
+        lineHeight = 28.sp,
+        fontWeight = FontWeight.Medium
+    ),
+    titleLargeR = SansSerifStyle.copy(
+        fontSize = 22.sp,
+        lineHeight = 28.sp,
+    ),
+    titleMediumBL = SansSerifStyle.copy(
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+        fontWeight = FontWeight.Black
+    ),
+    titleMediumB = SansSerifStyle.copy(
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+        fontWeight = FontWeight.Bold
+    ),
+    titleMediumR = SansSerifStyle.copy(
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+    ),
+    titleSmallB = SansSerifStyle.copy(
+        fontSize = 14.sp,
+        lineHeight = 20.sp,
+        fontWeight = FontWeight.Bold
+    ),
+    titleSmallM = SansSerifStyle.copy(
+        fontSize = 14.sp,
+        lineHeight = 20.sp,
+        fontWeight = FontWeight.Medium
+    ),
+    titleSmallM140 = SansSerifStyle.copy(
+        fontSize = 14.sp,
+        lineHeight = 140.sp,
+        fontWeight = FontWeight.Medium
+    ),
+    titleSmallR140 = SansSerifStyle.copy(
+        fontSize = 14.sp,
+        lineHeight = 140.sp,
+    ),
+    titleSmallR = SansSerifStyle.copy(
+        fontSize = 14.sp,
+        lineHeight = 20.sp,
+    ),
+    labelLargeM = SansSerifStyle.copy(
+        fontSize = 12.sp,
+        lineHeight = 16.sp,
+        fontWeight = FontWeight.Medium,
+    ),
+    labelMediumR = SansSerifStyle.copy(
+        fontSize = 12.sp,
+        lineHeight = 16.sp,
+    ),
+    labelSmallM = SansSerifStyle.copy(
+        fontSize = 11.sp,
+        lineHeight = 16.sp,
+        fontWeight = FontWeight.Medium,
+    ),
+    bodyLargeR = SansSerifStyle.copy(
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+        letterSpacing = 0.5.sp
+    ),
+    bodyMediumR = SansSerifStyle.copy(
+        fontSize = 14.sp,
+        lineHeight = 20.sp,
+        letterSpacing = 0.25.sp
+    ),
+    bodySmallR = SansSerifStyle.copy(
+        fontSize = 12.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.4.sp
+    ),
+)
+
+@Immutable
+data class KnightsTypography(
+    val displayLargeR: TextStyle,
+    val displayMediumR: TextStyle,
+    val displaySmallR: TextStyle,
+
+    val headlineLargeEB: TextStyle,
+    val headlineLargeSB: TextStyle,
+    val headlineLargeR: TextStyle,
+    val headlineMediumB: TextStyle,
+    val headlineMediumM: TextStyle,
+    val headlineMediumR: TextStyle,
+    val headlineSmallBL: TextStyle,
+    val headlineSmallM: TextStyle,
+    val headlineSmallR: TextStyle,
+
+    val titleLargeBL: TextStyle,
+    val titleLargeB: TextStyle,
+    val titleLargeM: TextStyle,
+    val titleLargeR: TextStyle,
+    val titleMediumBL: TextStyle,
+    val titleMediumB: TextStyle,
+    val titleMediumR: TextStyle,
+    val titleSmallB: TextStyle,
+    val titleSmallM: TextStyle,
+    val titleSmallM140: TextStyle,
+    val titleSmallR: TextStyle,
+    val titleSmallR140: TextStyle,
+
+    val labelLargeM: TextStyle,
+    val labelMediumR: TextStyle,
+    val labelSmallM: TextStyle,
+
+    val bodyLargeR: TextStyle,
+    val bodyMediumR: TextStyle,
+    val bodySmallR: TextStyle,
+)
+
+val LocalTypography = staticCompositionLocalOf {
+    KnightsTypography(
+        labelSmallM = SansSerifStyle,
+        displayLargeR = SansSerifStyle,
+        displayMediumR = SansSerifStyle,
+        displaySmallR = SansSerifStyle,
+        headlineLargeEB = SansSerifStyle,
+        headlineLargeSB = SansSerifStyle,
+        headlineLargeR = SansSerifStyle,
+        headlineMediumB = SansSerifStyle,
+        headlineMediumM = SansSerifStyle,
+        headlineMediumR = SansSerifStyle,
+        headlineSmallBL = SansSerifStyle,
+        headlineSmallM = SansSerifStyle,
+        headlineSmallR = SansSerifStyle,
+        titleLargeBL = SansSerifStyle,
+        titleLargeB = SansSerifStyle,
+        titleLargeM = SansSerifStyle,
+        titleLargeR = SansSerifStyle,
+        titleMediumBL = SansSerifStyle,
+        titleMediumB = SansSerifStyle,
+        titleMediumR = SansSerifStyle,
+        titleSmallB = SansSerifStyle,
+        titleSmallM = SansSerifStyle,
+        titleSmallM140 = SansSerifStyle,
+        titleSmallR = SansSerifStyle,
+        titleSmallR140 = SansSerifStyle,
+        labelLargeM = SansSerifStyle,
+        labelMediumR = SansSerifStyle,
+        bodyLargeR = SansSerifStyle,
+        bodyMediumR = SansSerifStyle,
+        bodySmallR = SansSerifStyle,
+    )
+}
diff --git a/feature/contributor/src/main/java/com/droidknights/app2023/feature/contributor/ContributorScreen.kt b/feature/contributor/src/main/java/com/droidknights/app2023/feature/contributor/ContributorScreen.kt
index 8f54ff8f..0bdeedd9 100644
--- a/feature/contributor/src/main/java/com/droidknights/app2023/feature/contributor/ContributorScreen.kt
+++ b/feature/contributor/src/main/java/com/droidknights/app2023/feature/contributor/ContributorScreen.kt
@@ -33,6 +33,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.droidknights.app2023.core.designsystem.component.KnightsCard
 import com.droidknights.app2023.core.designsystem.component.TextChip
 import com.droidknights.app2023.core.designsystem.theme.LocalDarkTheme
+import com.droidknights.app2023.core.designsystem.theme.KnightsTheme
 import com.droidknights.app2023.core.model.Contributor
 
 @Composable
@@ -84,7 +85,7 @@ private fun ActionBarContent(
     ) {
         Text(
             text = stringResource(id = R.string.contributor_top_title),
-            style = MaterialTheme.typography.titleSmall,
+            style = KnightsTheme.typography.titleSmallM,
             modifier = Modifier
                 .padding(14.dp)
                 .align(Alignment.Center)
@@ -122,13 +123,13 @@ private fun TopBanner(darkTheme: Boolean = LocalDarkTheme.current) {
         Column(modifier = Modifier.padding(horizontal = 32.dp)) {
             Text(
                 text = stringResource(id = R.string.contributor_banner_title),
-                style = MaterialTheme.typography.headlineSmall,
+                style = KnightsTheme.typography.headlineSmallBL,
                 color = Color(0xFF000000),
                 modifier = Modifier.padding(top = 24.dp),
             )
             Text(
                 text = stringResource(id = R.string.contributor_banner_description),
-                style = MaterialTheme.typography.titleSmall,
+                style = KnightsTheme.typography.titleSmallM140,
                 color = Color(0xFF52C520),
                 modifier = Modifier.padding(top = 6.dp, start = 3.dp),
             )
@@ -181,8 +182,7 @@ private fun ContributorItem(
                 )
                 Text(
                     text = contributor.name,
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold,
+                    style = KnightsTheme.typography.headlineSmallBL,
                     color = Color(0xFF000000),
                     modifier = Modifier.padding(top = 12.dp)
                 )
@@ -205,7 +205,7 @@ private fun ContributorItem(
 private fun Footer() {
     Text(
         text = stringResource(id = R.string.contributor_footer),
-        style = MaterialTheme.typography.labelMedium,
+        style = KnightsTheme.typography.titleMediumR,
         color = Color(0xFFDCDCDC),
         textAlign = Center,
         modifier = Modifier
diff --git a/feature/home/src/main/java/com/droidknights/app2023/feature/home/ContributorCard.kt b/feature/home/src/main/java/com/droidknights/app2023/feature/home/ContributorCard.kt
index 56a4dc06..686fd10e 100644
--- a/feature/home/src/main/java/com/droidknights/app2023/feature/home/ContributorCard.kt
+++ b/feature/home/src/main/java/com/droidknights/app2023/feature/home/ContributorCard.kt
@@ -45,14 +45,14 @@ internal fun ContributorCard(
         Column(modifier = Modifier.padding(horizontal = 24.dp)) {
             Text(
                 text = stringResource(id = R.string.contributor_card_title),
-                style = MaterialTheme.typography.headlineSmall,
+                style = KnightsTheme.typography.headlineSmallBL,
                 color = Color(0xFF000000),
                 modifier = Modifier.padding(top = 24.dp),
             )
 
             Text(
                 text = stringResource(id = R.string.contributor_card_description),
-                style = MaterialTheme.typography.titleSmall,
+                style = KnightsTheme.typography.titleSmallR,
                 color = Color(0xFF52C520),
                 modifier = Modifier.padding(top = 6.dp),
             )
diff --git a/feature/home/src/main/java/com/droidknights/app2023/feature/home/SessionCard.kt b/feature/home/src/main/java/com/droidknights/app2023/feature/home/SessionCard.kt
index 4fae8888..1af106db 100644
--- a/feature/home/src/main/java/com/droidknights/app2023/feature/home/SessionCard.kt
+++ b/feature/home/src/main/java/com/droidknights/app2023/feature/home/SessionCard.kt
@@ -42,8 +42,7 @@ internal fun SessionCard(
             SessionCardCaption()
             Text(
                 text = stringResource(id = R.string.session_card_title),
-                style = MaterialTheme.typography.headlineSmall,
-                fontWeight = FontWeight.Black,
+                style = KnightsTheme.typography.headlineSmallBL,
                 color = Color(0xFF000000),
                 modifier = Modifier.padding(top = 12.dp),
             )
@@ -60,8 +59,7 @@ private fun SessionCardCaption() {
     ) {
         Text(
             text = stringResource(id = R.string.session_card_caption),
-            style = MaterialTheme.typography.labelSmall,
-            fontWeight = FontWeight.Medium,
+            style = KnightsTheme.typography.labelSmallM,
             color = Color(0xFFFFFFFF),
         )
     }
diff --git a/feature/home/src/main/java/com/droidknights/app2023/feature/home/SponsorCard.kt b/feature/home/src/main/java/com/droidknights/app2023/feature/home/SponsorCard.kt
index 710195a5..0c0302f6 100644
--- a/feature/home/src/main/java/com/droidknights/app2023/feature/home/SponsorCard.kt
+++ b/feature/home/src/main/java/com/droidknights/app2023/feature/home/SponsorCard.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -37,7 +36,7 @@ fun SponsorCard(
         ) {
             Text(
                 text = stringResource(id = R.string.sponsor_card_title),
-                style = MaterialTheme.typography.headlineSmall,
+                style = KnightsTheme.typography.headlineSmallBL,
                 color = Color(0xFF000000),
                 modifier = Modifier.padding(top = 24.dp),
             )
@@ -47,7 +46,7 @@ fun SponsorCard(
                     uiState.platinumCount,
                     uiState.goldCount
                 ),
-                style = MaterialTheme.typography.titleSmall,
+                style = KnightsTheme.typography.titleSmallR,
                 color = Color(0xFF868686),
                 modifier = Modifier.padding(top = 8.dp),
             )
diff --git a/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionCard.kt b/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionCard.kt
index 1c4b0b14..9a3dd487 100644
--- a/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionCard.kt
+++ b/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionCard.kt
@@ -47,7 +47,7 @@ internal fun SessionCard(
                 Spacer(modifier = Modifier.width(8.dp))
                 Text(
                     text = "효율적인 코드 베이스",
-                    style = MaterialTheme.typography.labelLarge,
+                    style = KnightsTheme.typography.labelLargeM,
                     color = MaterialTheme.colorScheme.secondaryFixed,
                 )
             }
@@ -56,7 +56,7 @@ internal fun SessionCard(
             Spacer(modifier = Modifier.height(8.dp))
             Text(
                 text = "Jetpack Compose에 있는 것, 없는 것",
-                style = MaterialTheme.typography.titleLarge,
+                style = KnightsTheme.typography.titleLargeB,
                 color = MaterialTheme.colorScheme.onSecondaryContainer,
                 modifier = Modifier.padding(end = 50.dp)
             )
@@ -74,7 +74,7 @@ internal fun SessionCard(
             Row {
                 Text(
                     text = "안성용",
-                    style = MaterialTheme.typography.titleLarge,
+                    style = KnightsTheme.typography.titleLargeB,
                     color = MaterialTheme.colorScheme.onSecondaryContainer,
                     modifier = Modifier
                         .align(Alignment.Bottom)
diff --git a/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionScreen.kt b/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionScreen.kt
index 54e236a1..21b66dc3 100644
--- a/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionScreen.kt
+++ b/feature/session/src/main/java/com/droidknights/app2023/feature/session/SessionScreen.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.droidknights.app2023.core.designsystem.component.KnightsTopAppBar
 import com.droidknights.app2023.core.designsystem.component.TopAppBarNavigationType
+import com.droidknights.app2023.core.designsystem.theme.KnightsTheme
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
@@ -166,7 +167,7 @@ private fun SessionContent(
         state = state
     ) {
         item {
-            Text(text = "Track 01", style = MaterialTheme.typography.titleLarge)
+            Text(text = "Track 01", style = KnightsTheme.typography.titleLargeB)
             Spacer(modifier = Modifier.height(16.dp))
         }
 
@@ -182,7 +183,7 @@ private fun SessionContent(
 
         item {
             Spacer(modifier = Modifier.height(72.dp))
-            Text(text = "Track 02", style = MaterialTheme.typography.titleLarge)
+            Text(text = "Track 02", style = KnightsTheme.typography.titleLargeB)
             Spacer(modifier = Modifier.height(16.dp))
         }
 
@@ -198,7 +199,7 @@ private fun SessionContent(
 
         item {
             Spacer(modifier = Modifier.height(72.dp))
-            Text(text = "Track 03", style = MaterialTheme.typography.titleLarge)
+            Text(text = "Track 03", style = KnightsTheme.typography.titleLargeB)
             Spacer(modifier = Modifier.height(16.dp))
         }
 
diff --git a/feature/setting/src/main/java/com/droidknights/app2023/feature/setting/SettingScreen.kt b/feature/setting/src/main/java/com/droidknights/app2023/feature/setting/SettingScreen.kt
index a0ea7c18..33aa2d4d 100644
--- a/feature/setting/src/main/java/com/droidknights/app2023/feature/setting/SettingScreen.kt
+++ b/feature/setting/src/main/java/com/droidknights/app2023/feature/setting/SettingScreen.kt
@@ -63,7 +63,7 @@ private fun LightDarkThemeCard(darkTheme: Boolean = LocalDarkTheme.current) {
             Column {
                 Text(
                     text = stringResource(id = R.string.setting),
-                    style = MaterialTheme.typography.headlineSmall,
+                    style = KnightsTheme.typography.headlineSmallBL,
                     modifier = Modifier.padding(top = 24.dp, start = 24.dp)
                 )
                 Spacer(modifier = Modifier.height(40.dp))
@@ -121,7 +121,7 @@ private fun ThemeCard(
         Text(
             text = stringResource(id = titleRes),
             modifier = Modifier.padding(top = 16.dp, bottom = 8.dp),
-            style = MaterialTheme.typography.titleSmall,
+            style = KnightsTheme.typography.titleSmallM140,
         )
 
         RadioButton(