diff --git a/app/src/main/res/layout/activity_alert_dialog.xml b/app/src/main/res/layout/activity_alert_dialog.xml
index fdbf53a5..d7259b86 100644
--- a/app/src/main/res/layout/activity_alert_dialog.xml
+++ b/app/src/main/res/layout/activity_alert_dialog.xml
@@ -11,10 +11,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/show_dialog"
+        android:textAppearance="@style/TextAppearance.BodyLargeEmphasized"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeTokens.Clover" />
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/floating_button_show_syntax"
@@ -28,4 +30,4 @@
         app:icon="@drawable/ic_code"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_android_start_project.xml b/app/src/main/res/layout/activity_android_start_project.xml
index aa15f69d..fd32e140 100644
--- a/app/src/main/res/layout/activity_android_start_project.xml
+++ b/app/src/main/res/layout/activity_android_start_project.xml
@@ -13,6 +13,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:menu="@menu/menu_share"
+        app:shapeAppearanceOverlay="@style/ShapeTokens.Clover"
         app:title="@string/android_start_project" />
 
     <me.zhanghai.android.fastscroll.FastScrollScrollView
@@ -30,11 +31,11 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text_view_first_step"
-                style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="24dp"
                 android:text="@string/step1"
+                android:textAppearance="@style/TextAppearance.TitleLargeEmphasized"
                 android:textColor="?attr/colorSecondary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -45,6 +46,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="24dp"
                 android:text="@string/summary_first_step"
+                android:textAppearance="@style/TextAppearance.BodyLargeEmphasized"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/text_view_first_step" />
 
@@ -54,10 +56,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="256dp"
                 android:layout_margin="24dp"
-                app:cardCornerRadius="24dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/text_view_first_step_summary">
+                app:layout_constraintTop_toBottomOf="@id/text_view_first_step_summary"
+                app:shapeAppearanceOverlay="@style/ShapeTokens.Clover">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="match_parent"
@@ -77,11 +79,11 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text_view_second_step"
-                style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="24dp"
                 android:text="@string/step2"
+                android:textAppearance="@style/TextAppearance.TitleLargeEmphasized"
                 android:textColor="?attr/colorSecondary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/ad_view" />
@@ -92,6 +94,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="24dp"
                 android:text="@string/summary_second_step"
+                android:textAppearance="@style/TextAppearance.BodyLargeEmphasized"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/text_view_second_step" />
 
@@ -101,10 +104,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="256dp"
                 android:layout_margin="24dp"
-                app:cardCornerRadius="24dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/text_view_second_step_summary">
+                app:layout_constraintTop_toBottomOf="@id/text_view_second_step_summary"
+                app:shapeAppearanceOverlay="@style/ShapeTokens.Clover">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="match_parent"
@@ -115,11 +118,11 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text_view_third_step"
-                style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="24dp"
                 android:text="@string/step3"
+                android:textAppearance="@style/TextAppearance.TitleLargeEmphasized"
                 android:textColor="?attr/colorSecondary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/card_view_second_step" />
@@ -130,6 +133,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="24dp"
                 android:text="@string/summary_third_step"
+                android:textAppearance="@style/TextAppearance.BodyLargeEmphasized"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/text_view_third_step" />
 
@@ -139,10 +143,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="256dp"
                 android:layout_margin="24dp"
-                app:cardCornerRadius="24dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/text_view_third_step_summary">
+                app:layout_constraintTop_toBottomOf="@id/text_view_third_step_summary"
+                app:shapeAppearanceOverlay="@style/ShapeTokens.Clover">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3be8215d..7dd30641 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,6 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:navigationIcon="@drawable/ic_menu"
+            app:shapeAppearanceOverlay="@style/ShapeTokens.Clover"
             app:title="@string/app_name" />
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/values/shape_tokens.xml b/app/src/main/res/values/shape_tokens.xml
new file mode 100644
index 00000000..cb60bef7
--- /dev/null
+++ b/app/src/main/res/values/shape_tokens.xml
@@ -0,0 +1,12 @@
+<resources>
+    <!-- Base style required for Material 3 shape tokens -->
+    <style name="ShapeTokens" />
+
+    <style name="ShapeTokens.Clover" parent="ShapeTokens">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSizeTopLeft">24dp</item>
+        <item name="cornerSizeTopRight">24dp</item>
+        <item name="cornerSizeBottomLeft">8dp</item>
+        <item name="cornerSizeBottomRight">8dp</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 839f9a47..a327eacc 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -28,6 +28,35 @@
         <item name="dialogCornerRadius">28dp</item>
         <item name="alertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
         <item name="switchPreferenceCompatStyle">@style/switchPreferenceCompatStyle</item>
+        <!-- Apply emphasized text appearances -->
+        <item name="textAppearanceTitleLarge">@style/TextAppearance.TitleLargeEmphasized</item>
+        <item name="textAppearanceBodyLarge">@style/TextAppearance.BodyLargeEmphasized</item>
+        <!-- Map custom widget styles using Material 3 shape tokens -->
+        <item name="toolbarStyle">@style/Widget.App.Toolbar.Clover</item>
+        <item name="materialCardViewStyle">@style/Widget.App.CardView.Clover</item>
+        <item name="materialButtonStyle">@style/Widget.App.Button.Clover</item>
+    </style>
+
+    <!-- Emphasized text appearances -->
+    <style name="TextAppearance.TitleLargeEmphasized" parent="TextAppearance.Material3.TitleLarge">
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TextAppearance.BodyLargeEmphasized" parent="TextAppearance.Material3.BodyLarge">
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <!-- Widget styles using Material 3 shape tokens -->
+    <style name="Widget.App.Toolbar.Clover" parent="@style/Widget.Material3.Toolbar">
+        <item name="shapeAppearanceOverlay">@style/ShapeTokens.Clover</item>
+    </style>
+
+    <style name="Widget.App.CardView.Clover" parent="@style/Widget.Material3.CardView.Outlined">
+        <item name="shapeAppearanceOverlay">@style/ShapeTokens.Clover</item>
+    </style>
+
+    <style name="Widget.App.Button.Clover" parent="@style/Widget.Material3.Button">
+        <item name="shapeAppearance">@style/ShapeTokens.Clover</item>
     </style>
 
     <style name="ShapeAppearanceOverlay.CardView" parent="">
@@ -61,4 +90,4 @@
     <style name="switchPreferenceCompatStyle" parent="@style/Preference.SwitchPreferenceCompat.Material">
         <item name="widgetLayout">@layout/preference_switch_widget_layout</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>