diff --git a/app/src/main/res/layout/base_item.xml b/app/src/main/res/layout/base_item.xml
index 200c42ca..873d4737 100644
--- a/app/src/main/res/layout/base_item.xml
+++ b/app/src/main/res/layout/base_item.xml
@@ -27,12 +27,12 @@
 
         <TextView
             android:id="@+id/item_name"
-            style="@style/text_subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="2"
             android:text="@{item.name}"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             tools:text="Movie title" />
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/collection_item.xml b/app/src/main/res/layout/collection_item.xml
index bd4fae7a..a5d170e2 100644
--- a/app/src/main/res/layout/collection_item.xml
+++ b/app/src/main/res/layout/collection_item.xml
@@ -26,10 +26,10 @@
             app:shapeAppearanceOverlay="@style/roundedImageView" />
 
         <TextView
-            style="@style/text_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@{collection.name}"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             tools:text="Movies" />
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_add_server.xml b/app/src/main/res/layout/fragment_add_server.xml
index b98c521b..09193c67 100644
--- a/app/src/main/res/layout/fragment_add_server.xml
+++ b/app/src/main/res/layout/fragment_add_server.xml
@@ -44,11 +44,11 @@
 
             <TextView
                 android:id="@+id/text_add_server"
-                style="@style/text_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="32dp"
                 android:text="@string/add_server"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
                 android:textColor="?android:textColorPrimary" />
 
             <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index e146eb4e..df3608d8 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -42,11 +42,11 @@
 
             <TextView
                 android:id="@+id/text_login"
-                style="@style/text_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="32dp"
                 android:text="@string/login"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
                 android:textColor="?android:textColorPrimary" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -61,8 +61,8 @@
                     android:id="@+id/edit_text_username"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="text"
-                    android:autofillHints="username"/>
+                    android:autofillHints="username"
+                    android:inputType="text" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -79,8 +79,8 @@
                     android:id="@+id/edit_text_password"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="textPassword"
-                    android:autofillHints="password"/>
+                    android:autofillHints="password"
+                    android:inputType="textPassword" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/fragment_server_select.xml b/app/src/main/res/layout/fragment_server_select.xml
index b10630a0..a4bb63ee 100644
--- a/app/src/main/res/layout/fragment_server_select.xml
+++ b/app/src/main/res/layout/fragment_server_select.xml
@@ -41,7 +41,7 @@
 
             <TextView
                 android:id="@+id/text_add_server"
-                style="@style/text_header"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="12dp"
diff --git a/app/src/main/res/layout/server_item.xml b/app/src/main/res/layout/server_item.xml
index b57c99c7..a0756374 100644
--- a/app/src/main/res/layout/server_item.xml
+++ b/app/src/main/res/layout/server_item.xml
@@ -37,6 +37,7 @@
             android:layout_height="wrap_content"
             android:text="@{server.name}"
             android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/view_item.xml b/app/src/main/res/layout/view_item.xml
index a233a3d0..887fb0d0 100644
--- a/app/src/main/res/layout/view_item.xml
+++ b/app/src/main/res/layout/view_item.xml
@@ -17,22 +17,22 @@
 
         <TextView
             android:id="@+id/view_name"
-            style="@style/text_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
             android:text="@{view.name}"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="Movies" />
 
         <TextView
             android:id="@+id/view_all"
-            style="@style/text_regular"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="24dp"
             android:text="@string/view_all"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
             app:layout_constraintBaseline_toBaselineOf="@id/view_name"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fd4f903e..23c362f1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,27 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="text_giant_header">
-        <item name="android:textSize">48sp</item>
-        <item name="android:textFontWeight" tools:targetApi="p">700</item>
-    </style>
-    <style name="text_title">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textFontWeight" tools:targetApi="p">500</item>
-    </style>
-    <style name="text_header">
-        <item name="android:textSize">24sp</item>
-        <item name="android:textFontWeight" tools:targetApi="p">500</item>
-    </style>
-    <style name="text_regular">
-        <item name="android:textSize">14sp</item>
-    </style>
-    <style name="text_subtitle">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textFontWeight" tools:targetApi="p">500</item>
-    </style>
-    <style name="text_metadata">
-        <item name="android:textSize">12sp</item>
-    </style>
+
     <style name="setup_button">
         <item name="android:layout_height">48dp</item>
         <item name="android:background">@drawable/button_setup_background</item>