diff --git a/app/src/main/res/drawable/tab_default_onboarding.xml b/app/src/main/res/drawable/tab_default_onboarding.xml
index a07313369..e4ac5eb16 100644
--- a/app/src/main/res/drawable/tab_default_onboarding.xml
+++ b/app/src/main/res/drawable/tab_default_onboarding.xml
@@ -24,7 +24,7 @@
             android:shape="ring"
             android:thickness="8dp"
             android:useLevel="false">
-            <solid android:color="?colorControlNormal" />
+            <solid android:color="?colorControlHighlight" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_apps_games.xml b/app/src/main/res/layout/fragment_apps_games.xml
index c4cd86b53..0bbc4fa1b 100644
--- a/app/src/main/res/layout/fragment_apps_games.xml
+++ b/app/src/main/res/layout/fragment_apps_games.xml
@@ -42,8 +42,7 @@
         app:tabIndicatorHeight="2dp"
         app:tabMode="scrollable"
         app:tabPaddingEnd="@dimen/padding_normal"
-        app:tabPaddingStart="@dimen/padding_normal"
-        app:tabTextAppearance="@style/TextAppearance.Aurora.Tab.Title" />
+        app:tabPaddingStart="@dimen/padding_normal" />
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/pager"
diff --git a/app/src/main/res/layout/fragment_generic_with_pager.xml b/app/src/main/res/layout/fragment_generic_with_pager.xml
index 3d0a74e04..c31f8e8ea 100644
--- a/app/src/main/res/layout/fragment_generic_with_pager.xml
+++ b/app/src/main/res/layout/fragment_generic_with_pager.xml
@@ -37,8 +37,7 @@
         app:tabIndicatorHeight="2dp"
         app:tabMode="scrollable"
         app:tabPaddingEnd="@dimen/padding_small"
-        app:tabPaddingStart="@dimen/padding_small"
-        app:tabTextAppearance="@style/TextAppearance.Aurora.Tab.Title" />
+        app:tabPaddingStart="@dimen/padding_small" />
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/pager"
diff --git a/app/src/main/res/layout/fragment_onboarding.xml b/app/src/main/res/layout/fragment_onboarding.xml
index bc171aaab..19fb7d5b0 100644
--- a/app/src/main/res/layout/fragment_onboarding.xml
+++ b/app/src/main/res/layout/fragment_onboarding.xml
@@ -37,8 +37,8 @@
             app:tabBackground="@drawable/tab_selector_onboarding"
             app:tabGravity="center"
             app:tabIndicatorHeight="0dp"
-            app:tabSelectedTextColor="@android:color/white"
             app:tabTextAppearance="@style/TextAppearance.Aurora.Tab"
+            app:tabSelectedTextColor="?colorOnSurface"
             app:tabTextColor="@android:color/transparent" />
 
         <androidx.viewpager2.widget.ViewPager2
diff --git a/app/src/main/res/layout/fragment_search_result.xml b/app/src/main/res/layout/fragment_search_result.xml
index 5fc053b8c..4027605a2 100644
--- a/app/src/main/res/layout/fragment_search_result.xml
+++ b/app/src/main/res/layout/fragment_search_result.xml
@@ -57,7 +57,6 @@
         android:layout_gravity="center_horizontal|bottom"
         android:layout_marginBottom="@dimen/margin_normal"
         android:text="@string/action_filter"
-        android:textAppearance="@style/TextAppearance.Aurora.SubTitle.Alt"
         app:iconPadding="@dimen/padding_small"
         app:icon="@drawable/ic_filter" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/sheet_filter.xml b/app/src/main/res/layout/sheet_filter.xml
index 57901a7e1..64f796d69 100644
--- a/app/src/main/res/layout/sheet_filter.xml
+++ b/app/src/main/res/layout/sheet_filter.xml
@@ -22,116 +22,97 @@
     android:layout_height="wrap_content"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
-
-    <RelativeLayout
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:padding="@dimen/padding_medium"
+        android:scrollbars="none">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/txt_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/margin_normal"
-            android:layout_marginBottom="@dimen/margin_small"
-            android:paddingHorizontal="@dimen/margin_normal"
-            android:text="@string/action_filter"
-            android:textAppearance="@style/TextAppearance.Aurora.SubTitle.Alt" />
-
-        <androidx.core.widget.NestedScrollView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/txt_title"
-            android:padding="@dimen/padding_medium"
-            android:scrollbars="none">
+            android:orientation="vertical">
 
-            <LinearLayout
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
+                android:text="@string/action_filter_rating"
+                android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
+
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/rating_chips"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_marginTop="10dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                app:chipSpacingHorizontal="@dimen/margin_small"
+                app:chipSpacingVertical="@dimen/margin_xsmall"
+                app:selectionRequired="true"
+                app:singleSelection="true" />
 
-                <androidx.appcompat.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
+                android:text="@string/action_filter_downloads"
+                android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
+
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/download_chips"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                app:chipSpacingHorizontal="@dimen/margin_small"
+                app:chipSpacingVertical="@dimen/margin_xsmall"
+                app:selectionRequired="true"
+                app:singleSelection="true" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
+                android:text="@string/action_filter_misc"
+                android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
+
+            <com.google.android.material.chip.ChipGroup
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp">
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/filter_gfs"
+                    style="@style/AppTheme.FilterChip"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp"
-                    android:text="@string/action_filter_rating"
-                    android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
+                    android:text="@string/action_filter_gsf_dependent_apps" />
 
-                <com.google.android.material.chip.ChipGroup
-                    android:id="@+id/rating_chips"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="8dp"
-                    app:chipSpacingHorizontal="@dimen/margin_small"
-                    app:chipSpacingVertical="@dimen/margin_xsmall"
-                    app:selectionRequired="true"
-                    app:singleSelection="true" />
-
-                <androidx.appcompat.widget.AppCompatTextView
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/filter_paid"
+                    style="@style/AppTheme.FilterChip"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp"
-                    android:text="@string/action_filter_downloads"
-                    android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
+                    android:text="@string/action_filter_paid_apps" />
 
-                <com.google.android.material.chip.ChipGroup
-                    android:id="@+id/download_chips"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="8dp"
-                    app:chipSpacingHorizontal="@dimen/margin_small"
-                    app:chipSpacingVertical="@dimen/margin_xsmall"
-                    app:selectionRequired="true"
-                    app:singleSelection="true" />
-
-                <androidx.appcompat.widget.AppCompatTextView
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/filter_ads"
+                    style="@style/AppTheme.FilterChip"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp"
-                    android:text="@string/action_filter_misc"
-                    android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
+                    android:text="@string/action_filter_apps_with_ads" />
 
-                <com.google.android.material.chip.ChipGroup
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp">
-
-                    <com.google.android.material.chip.Chip
-                        android:id="@+id/filter_gfs"
-                        style="@style/AppTheme.FilterChip"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/action_filter_gsf_dependent_apps" />
-
-                    <com.google.android.material.chip.Chip
-                        android:id="@+id/filter_paid"
-                        style="@style/AppTheme.FilterChip"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/action_filter_paid_apps" />
-
-                    <com.google.android.material.chip.Chip
-                        android:id="@+id/filter_ads"
-                        style="@style/AppTheme.FilterChip"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/action_filter_apps_with_ads" />
-
-                </com.google.android.material.chip.ChipGroup>
-            </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
-    </RelativeLayout>
+            </com.google.android.material.chip.ChipGroup>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_app_update.xml b/app/src/main/res/layout/view_app_update.xml
index 8e421cd53..e508bff03 100644
--- a/app/src/main/res/layout/view_app_update.xml
+++ b/app/src/main/res/layout/view_app_update.xml
@@ -111,8 +111,8 @@
 
     <com.aurora.store.view.custom.layouts.button.UpdateButton
         android:id="@+id/btn_action"
-        android:layout_width="120dp"
-        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/height_button"
         android:layout_alignTop="@id/txt_line1"
         android:layout_alignParentEnd="true"
         android:gravity="center" />
diff --git a/app/src/main/res/layout/view_header_update.xml b/app/src/main/res/layout/view_header_update.xml
index 36e494012..6276cda27 100644
--- a/app/src/main/res/layout/view_header_update.xml
+++ b/app/src/main/res/layout/view_header_update.xml
@@ -41,10 +41,10 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_action"
-        android:layout_width="120dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:text="@string/action_update_all"
-        android:textAppearance="@style/TextAppearance.Aurora.Line1" />
+        android:ellipsize="end"
+        android:text="@string/action_update_all" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/view_state_button.xml b/app/src/main/res/layout/view_state_button.xml
index 5d0637c62..639d39de8 100644
--- a/app/src/main/res/layout/view_state_button.xml
+++ b/app/src/main/res/layout/view_state_button.xml
@@ -27,7 +27,7 @@
         android:id="@+id/btn"
         style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/height_button"
         android:layout_centerHorizontal="true"
         android:textAlignment="viewStart"
         android:textColor="?colorControlNormal"
diff --git a/app/src/main/res/layout/view_update_button.xml b/app/src/main/res/layout/view_update_button.xml
index 366a5efb0..782fbddc8 100644
--- a/app/src/main/res/layout/view_update_button.xml
+++ b/app/src/main/res/layout/view_update_button.xml
@@ -19,12 +19,12 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
     <ViewFlipper
         android:id="@+id/view_flipper"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:inAnimation="@anim/fade_in"
         android:outAnimation="@anim/fade_out"
@@ -32,15 +32,14 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnPositive"
                 style="@style/Widget.Material3.Button.TonalButton"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/action_update"
-                android:textAppearance="@style/TextAppearance.Aurora.Line1" />
+                android:text="@string/action_update" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -50,11 +49,10 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnQueued"
                 style="@style/Widget.Material3.Button.TonalButton"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="false"
-                android:text="@string/download_queued"
-                android:textAppearance="@style/TextAppearance.Aurora.Line1" />
+                android:text="@string/download_queued" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -64,10 +62,9 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnNegative"
                 style="@style/Widget.Material3.Button.TonalButton"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/action_cancel"
-                android:textAppearance="@style/TextAppearance.Aurora.Line1" />
+                android:text="@string/action_cancel" />
         </RelativeLayout>
     </ViewFlipper>
 </RelativeLayout>
diff --git a/app/src/main/res/values-v26/styles_text.xml b/app/src/main/res/values-v26/styles_text.xml
index 91662e959..7de3434b0 100644
--- a/app/src/main/res/values-v26/styles_text.xml
+++ b/app/src/main/res/values-v26/styles_text.xml
@@ -18,53 +18,30 @@
   -->
 
 <resources>
-
+    <!-- Title Styles -->
     <style name="AuroraTextStyle" parent="Widget.AppCompat.TextView">
         <item name="android:autoSizeTextType">uniform</item>
-        <item name="android:autoSizeMinTextSize">12sp</item>
-        <item name="android:autoSizeStepGranularity">1sp</item>
-        <item name="android:autoSizePresetSizes">@array/auto_size_text_sizes</item>
-    </style>
-
-    <style name="AuroraTextStyle.Title" parent="AuroraTextStyle">
-        <item name="android:maxLines">1</item>
-        <item name="android:ellipsize">end</item>
+        <item name="android:autoSizeMinTextSize">10sp</item>
         <item name="android:autoSizeMaxTextSize">20sp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Aurora.Title</item>
+        <item name="android:autoSizeStepGranularity">2sp</item>
     </style>
 
-    <!--  Subtitle Styles  -->
-    <style name="AuroraTextStyle.Subtitle" parent="AuroraTextStyle">
-        <item name="android:autoSizeMaxTextSize">16sp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Aurora.SubTitle</item>
+    <style name="AuroraTextStyle.Rating" parent="@style/AuroraTextStyle">
+        <item name="autoSizeMinTextSize">24sp</item>
+        <item name="android:autoSizeMaxTextSize">48sp</item>
+        <item name="autoSizeStepGranularity">1sp</item>
+        <item name="android:textAppearance">@style/TextAppearance.Aurora.Title.Rating</item>
     </style>
 
-    <style name="AuroraTextStyle.Subtitle.Alt" parent="AuroraTextStyle">
-        <item name="android:autoSizeMaxTextSize">18sp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Aurora.SubTitle.Alt</item>
-    </style>
+    <!-- Text Appearance -->
+    <style name="TextAppearance.Base" parent="TextAppearance.AppCompat.Medium">
+        <item name="android:autoSizeTextType">uniform</item>
+        <item name="android:autoSizeMinTextSize">12sp</item>
+        <item name="android:autoSizeMaxTextSize">20sp</item>
+        <item name="android:autoSizeStepGranularity">1sp</item>
 
-    <style name="AuroraTextStyle.Subtitle.Secondary" parent="AuroraTextStyle">
-        <item name="android:autoSizeMaxTextSize">16sp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Aurora.Line1</item>
-    </style>
-
-
-    <!-- Line Styles -->
-    <style name="AuroraTextStyle.Line3" parent="AuroraTextStyle.Line1">
-        <item name="android:autoSizeMaxTextSize">10sp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Aurora.Line3</item>
-    </style>
-
-    <style name="AuroraTextStyle.Line2" parent="AuroraTextStyle.Line1">
-        <item name="android:autoSizeMaxTextSize">12sp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Aurora.Line2</item>
-    </style>
-
-    <style name="AuroraTextStyle.Line1" parent="AuroraTextStyle">
-        <item name="android:maxLines">1</item>
+        <item name="android:letterSpacing">0.05</item>
         <item name="android:ellipsize">end</item>
-        <item name="android:autoSizeMaxTextSize">14sp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Aurora.Line1</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_text.xml b/app/src/main/res/values/styles_text.xml
index 8fce93538..0eac122eb 100644
--- a/app/src/main/res/values/styles_text.xml
+++ b/app/src/main/res/values/styles_text.xml
@@ -19,124 +19,108 @@
 
 <resources>
     <!-- Title Styles -->
-
     <style name="AuroraTextStyle" parent="Widget.AppCompat.TextView">
         <item name="autoSizeTextType">uniform</item>
         <item name="autoSizeMinTextSize">12sp</item>
+        <item name="autoSizeMaxTextSize">20sp</item>
         <item name="autoSizeStepGranularity">1sp</item>
         <item name="autoSizePresetSizes">@array/auto_size_text_sizes</item>
     </style>
 
-    <style name="AuroraTextStyle.Rating" parent="AuroraTextStyle">
+    <style name="AuroraTextStyle.Rating" parent="@style/AuroraTextStyle">
         <item name="autoSizeMinTextSize">24sp</item>
+        <item name="autoSizeMaxTextSize">48sp</item>
         <item name="autoSizeStepGranularity">1sp</item>
         <item name="autoSizePresetSizes">@array/auto_size_text_sizes_large</item>
         <item name="android:textAppearance">@style/TextAppearance.Aurora.Title.Rating</item>
     </style>
 
-    <style name="AuroraTextStyle.Title" parent="AuroraTextStyle">
-        <item name="android:maxLines">1</item>
-        <item name="android:ellipsize">end</item>
-        <item name="autoSizeMaxTextSize">20sp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Aurora.Title</item>
-    </style>
-
-    <style name="AuroraTextStyle.Title.Primary" parent="AuroraTextStyle.Title">
-        <item name="android:textAppearance">@style/TextAppearance.Aurora.Title.Primary</item>
-    </style>
-
-    <style name="TextAppearance.Aurora.Title" parent="TextAppearance.AppCompat.Medium">
-        <item name="android:letterSpacing">0.05</item>
-        <item name="android:maxLines">1</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:textSize">20sp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="TextAppearance.Aurora.Title.Rating" parent="TextAppearance.Aurora.Title.Primary">
-        <item name="android:textSize">48sp</item>
-    </style>
-
-    <style name="TextAppearance.Aurora.Title.Primary" parent="TextAppearance.Aurora.Title">
-        <item name="android:textSize">20sp</item>
-        <item name="android:textStyle">normal</item>
-        <item name="textAllCaps">true</item>
-    </style>
-
     <!--  Subtitle Styles  -->
-
-    <style name="AuroraTextStyle.Subtitle" parent="AuroraTextStyle">
+    <style name="AuroraTextStyle.Subtitle" parent="@style/AuroraTextStyle">
         <item name="autoSizeMaxTextSize">16sp</item>
         <item name="android:textAppearance">@style/TextAppearance.Aurora.SubTitle</item>
     </style>
 
-    <style name="AuroraTextStyle.Subtitle.Alt" parent="AuroraTextStyle">
+    <style name="AuroraTextStyle.Subtitle.Alt" parent="@style/AuroraTextStyle">
         <item name="autoSizeMaxTextSize">18sp</item>
         <item name="android:textAppearance">@style/TextAppearance.Aurora.SubTitle.Alt</item>
     </style>
 
-    <style name="AuroraTextStyle.Subtitle.Secondary" parent="AuroraTextStyle">
-        <item name="autoSizeMaxTextSize">16sp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Aurora.Line1</item>
-    </style>
-
-    <style name="TextAppearance.Aurora.SubTitle" parent="TextAppearance.Aurora.Title">
-        <item name="android:letterSpacing">0.025</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="TextAppearance.Aurora.SubTitle.Alt" parent="TextAppearance.Aurora.Title">
-        <item name="android:letterSpacing">0.005</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
     <!-- Line Styles -->
-    <style name="AuroraTextStyle.Line1" parent="AuroraTextStyle">
+    <style name="AuroraTextStyle.Line1" parent="@style/AuroraTextStyle">
         <item name="android:maxLines">1</item>
         <item name="android:ellipsize">end</item>
-        <item name="autoSizeMaxTextSize">14sp</item>
         <item name="android:textAppearance">@style/TextAppearance.Aurora.Line1</item>
     </style>
 
-    <style name="AuroraTextStyle.Line2" parent="AuroraTextStyle.Line1">
+    <style name="AuroraTextStyle.Line2" parent="@style/AuroraTextStyle.Line1">
         <item name="autoSizeMaxTextSize">12sp</item>
         <item name="android:textAppearance">@style/TextAppearance.Aurora.Line2</item>
     </style>
 
-    <style name="AuroraTextStyle.Line3" parent="AuroraTextStyle.Line1">
+    <style name="AuroraTextStyle.Line3" parent="@style/AuroraTextStyle.Line1">
         <item name="autoSizeMaxTextSize">10sp</item>
         <item name="android:textAppearance">@style/TextAppearance.Aurora.Line3</item>
     </style>
 
-    <style name="TextAppearance.Aurora.Line1" parent="TextAppearance.AppCompat.Medium">
+    <!-- Title Appearances -->
+    <style name="TextAppearance.Base" parent="TextAppearance.AppCompat.Medium">
+        <item name="autoSizeTextType">uniform</item>
+        <item name="autoSizeMinTextSize">12sp</item>
+        <item name="autoSizeMaxTextSize">20sp</item>
+        <item name="autoSizeStepGranularity">1sp</item>
+        <item name="autoSizePresetSizes">@array/auto_size_text_sizes</item>
+
+        <item name="android:letterSpacing">0.05</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
+    <style name="TextAppearance.Aurora.Title" parent="@style/TextAppearance.Base">
+        <item name="android:textSize">20sp</item>
+    </style>
+
+    <style name="TextAppearance.Aurora.Title.Primary" parent="@style/TextAppearance.Aurora.Title">
+        <item name="android:textStyle">normal</item>
+        <item name="android:textAllCaps">true</item>
+    </style>
+
+    <style name="TextAppearance.Aurora.Title.Rating" parent="@style/TextAppearance.Aurora.Title.Primary">
+        <item name="android:textSize">48sp</item>
+    </style>
+
+    <!-- Subtitle Appearances -->
+    <style name="TextAppearance.Aurora.SubTitle" parent="@style/TextAppearance.Aurora.Title">
+        <item name="android:letterSpacing">0.025</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="TextAppearance.Aurora.SubTitle.Alt" parent="@style/TextAppearance.Aurora.Title">
+        <item name="android:letterSpacing">0.005</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <!-- Line Appearances -->
+    <style name="TextAppearance.Aurora.Line1" parent="@style/TextAppearance.Base">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
-    <style name="TextAppearance.Aurora.Line2" parent="TextAppearance.Aurora.Line1">
+    <style name="TextAppearance.Aurora.Line2" parent="@style/TextAppearance.Aurora.Line1">
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
-    <style name="TextAppearance.Aurora.Line3" parent="TextAppearance.Aurora.Line2">
+    <style name="TextAppearance.Aurora.Line3" parent="@style/TextAppearance.Aurora.Line2">
         <item name="android:textSize">10sp</item>
         <item name="android:textColor">?android:attr/textColorTertiary</item>
     </style>
 
+    <!-- Tab Appearances -->
     <style name="TextAppearance.Aurora.Tab" parent="Widget.AppCompat.Light.ActionBar.TabText">
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="TextAppearance.Aurora.Tab.Title" parent="TextAppearance.Aurora.Tab">
-        <item name="android:letterSpacing">0.075</item>
-        <item name="textAllCaps">false</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="TextAppearance.Aurora.Chip" parent="TextAppearance.Aurora.SubTitle">
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">12sp</item>
     </style>
 </resources>