diff --git a/app/src/main/res/layout/app_widget_big.xml b/app/src/main/res/layout/app_widget_big.xml
index c20cfe96..75ba63e6 100755
--- a/app/src/main/res/layout/app_widget_big.xml
+++ b/app/src/main/res/layout/app_widget_big.xml
@@ -1,101 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="@android:color/black">
-
-  <ImageView
-    android:id="@+id/image"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:scaleType="centerCrop"
-    tools:ignore="ContentDescription"/>
+    android:background="@android:color/black">
 
-  <LinearLayout
-    android:id="@+id/media_actions"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:background="@drawable/shadow_up_strong"
-    android:gravity="center_vertical"
-    android:layoutDirection="ltr"
-    android:orientation="horizontal">
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        tools:ignore="ContentDescription" />
 
-    <ImageButton
-      android:id="@+id/button_prev"
-      android:layout_width="72dp"
-      android:layout_height="72dp"
-      android:layout_weight="1"
-      android:padding="22dp"
-      android:background="@drawable/widget_selector_dark"
-      tools:ignore="ContentDescription"
-      tools:src="@drawable/ic_skip_previous_white_24dp"
-      tools:tint="@color/ate_primary_text_dark"/>
+    <LinearLayout
+        android:id="@+id/media_actions"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="@drawable/shadow_up_strong"
+        android:gravity="center_vertical"
+        android:layoutDirection="ltr"
+        android:orientation="horizontal">
 
-    <ImageButton
-      android:id="@+id/button_toggle_play_pause"
-      android:layout_width="72dp"
-      android:layout_height="72dp"
-      android:layout_weight="1"
-      android:padding="22dp"
-      android:background="@drawable/widget_selector_dark"
-      tools:ignore="ContentDescription"
-      tools:src="@drawable/ic_play_arrow_white_32dp"
-      tools:tint="@color/ate_primary_text_dark"/>
+        <ImageButton
+            android:id="@+id/button_prev"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
+            android:layout_weight="1"
+            android:background="@drawable/widget_selector_dark"
+            android:padding="22dp"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_skip_previous_white_24dp"
+            tools:tint="@color/ate_primary_text_dark" />
 
-    <ImageButton
-      android:id="@+id/button_next"
-      android:layout_width="72dp"
-      android:layout_height="72dp"
-      android:layout_weight="1"
-      android:padding="22dp"
-      android:background="@drawable/widget_selector_dark"
-      tools:ignore="ContentDescription"
-      tools:src="@drawable/ic_skip_next_white_24dp"
-      tools:tint="@color/ate_primary_text_dark"/>
+        <ImageButton
+            android:id="@+id/button_toggle_play_pause"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
+            android:layout_weight="1"
+            android:background="@drawable/widget_selector_dark"
+            android:padding="22dp"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_play_arrow_white_32dp"
+            tools:tint="@color/ate_primary_text_dark" />
+
+        <ImageButton
+            android:id="@+id/button_next"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
+            android:layout_weight="1"
+            android:background="@drawable/widget_selector_dark"
+            android:padding="22dp"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_skip_next_white_24dp"
+            tools:tint="@color/ate_primary_text_dark" />
 
 
-  </LinearLayout>
+    </LinearLayout>
 
-  <FrameLayout
-    android:id="@+id/clickable_area"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_above="@id/media_actions"
-    android:layout_alignParentTop="true"/>
+    <FrameLayout
+        android:id="@+id/clickable_area"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/media_actions"
+        android:layout_alignParentTop="true" />
 
-  <LinearLayout
-    android:id="@+id/media_titles"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentTop="true"
-    android:padding="16dp"
-    android:background="@drawable/shadow_down_strong"
-    android:orientation="vertical">
+    <LinearLayout
+        android:id="@+id/media_titles"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:background="@drawable/shadow_down_strong"
+        android:orientation="vertical"
+        android:padding="16dp">
 
-    <TextView
-      android:id="@+id/title"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_weight="1"
-      android:gravity="center_vertical"
-      android:singleLine="true"
-      android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-      android:textColor="@color/ate_primary_text_dark"
-      tools:text="Title"/>
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewHeadline6"
+            android:textColor="@color/ate_primary_text_dark"
+            tools:text="Title" />
 
-    <TextView
-      android:id="@+id/text"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_weight="1"
-      android:gravity="center_vertical"
-      android:singleLine="true"
-      android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-      android:textColor="@color/ate_secondary_text_dark"
-      tools:text="Text"/>
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewSubtitle1"
+            android:textColor="@color/ate_secondary_text_dark"
+            tools:text="Text" />
 
-  </LinearLayout>
+    </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_widget_card.xml b/app/src/main/res/layout/app_widget_card.xml
index 8acb568f..2eae7e4a 100755
--- a/app/src/main/res/layout/app_widget_card.xml
+++ b/app/src/main/res/layout/app_widget_card.xml
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                android:textAppearance="@style/TextViewBody1"
                 android:textColor="@color/ate_primary_text_light"
                 tools:text="Title" />
 
@@ -50,7 +50,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:singleLine="true"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                    android:textAppearance="@style/TextViewBody2"
                     android:textColor="@color/ate_secondary_text_light"
                     tools:text="Album" />
 
diff --git a/app/src/main/res/layout/app_widget_classic.xml b/app/src/main/res/layout/app_widget_classic.xml
index e31a1b14..af62ab6a 100755
--- a/app/src/main/res/layout/app_widget_classic.xml
+++ b/app/src/main/res/layout/app_widget_classic.xml
@@ -27,8 +27,8 @@
             android:layoutDirection="ltr"
             android:orientation="horizontal"
             android:paddingStart="8dp"
-            android:paddingBottom="8dp"
-            android:paddingEnd="8dp">
+            android:paddingEnd="8dp"
+            android:paddingBottom="8dp">
 
             <ImageButton
                 android:id="@+id/button_prev"
@@ -76,6 +76,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:singleLine="true"
+                android:textAppearance="@style/TextViewNormal"
                 android:textColor="@color/ate_primary_text_dark"
                 tools:text="Title" />
 
@@ -85,7 +86,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+                android:textAppearance="@style/TextViewCaption"
                 android:textColor="@color/ate_secondary_text_dark"
                 tools:text="Text" />
 
diff --git a/app/src/main/res/layout/app_widget_small.xml b/app/src/main/res/layout/app_widget_small.xml
index c2fbcce6..dae15541 100755
--- a/app/src/main/res/layout/app_widget_small.xml
+++ b/app/src/main/res/layout/app_widget_small.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:tools="http://schemas.android.com/tools"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#AA000000"
-            android:columnCount="2"
-            android:gravity="top"
-            android:rowCount="3">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#AA000000"
+    android:columnCount="2"
+    android:gravity="top"
+    android:rowCount="3">
 
     <ImageView
         android:id="@+id/image"
         android:layout_width="@dimen/app_widget_small_image_size"
         android:layout_height="@dimen/app_widget_small_image_size"
         android:scaleType="centerInside"
-        tools:ignore="ContentDescription"/>
+        tools:ignore="ContentDescription" />
 
     <LinearLayout
         android:id="@+id/media_actions"
@@ -31,7 +31,7 @@
             android:background="@drawable/widget_selector"
             tools:ignore="ContentDescription"
             tools:src="@drawable/ic_skip_previous_white_24dp"
-            tools:tint="@color/ate_secondary_text_dark"/>
+            tools:tint="@color/ate_secondary_text_dark" />
 
         <ImageButton
             android:id="@+id/button_toggle_play_pause"
@@ -41,7 +41,7 @@
             android:background="@drawable/widget_selector"
             tools:ignore="ContentDescription"
             tools:src="@drawable/ic_play_arrow_white_32dp"
-            tools:tint="@color/ate_secondary_text_dark"/>
+            tools:tint="@color/ate_secondary_text_dark" />
 
         <ImageButton
             android:id="@+id/button_next"
@@ -51,7 +51,7 @@
             android:background="@drawable/widget_selector"
             tools:ignore="ContentDescription"
             tools:src="@drawable/ic_skip_next_white_24dp"
-            tools:tint="@color/ate_secondary_text_dark"/>
+            tools:tint="@color/ate_secondary_text_dark" />
 
     </LinearLayout>
 
@@ -62,7 +62,7 @@
         android:layout_columnSpan="2"
         android:layout_gravity="fill_horizontal"
         android:background="@color/md_white_1000"
-        tools:ignore="Orientation"/>
+        tools:ignore="Orientation" />
 
     <LinearLayout
         android:id="@+id/media_titles"
@@ -80,9 +80,9 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+            android:textAppearance="@style/TextViewBody2"
             android:textColor="@color/ate_primary_text_dark"
-            tools:text="Title"/>
+            tools:text="Title" />
 
         <TextView
             android:id="@+id/text_separator"
@@ -92,10 +92,10 @@
             android:paddingLeft="4dp"
             android:paddingRight="4dp"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textAppearance="@style/TextViewBody1"
             android:textColor="@color/ate_secondary_text_dark"
             tools:ignore="HardcodedText"
-            tools:text="•"/>
+            tools:text="•" />
 
         <TextView
             android:id="@+id/text"
@@ -103,9 +103,9 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textAppearance="@style/TextViewBody1"
             android:textColor="@color/ate_secondary_text_dark"
-            tools:text="Text"/>
+            tools:text="Text" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/app_widget_text.xml b/app/src/main/res/layout/app_widget_text.xml
index 4c436382..f62a0eb6 100644
--- a/app/src/main/res/layout/app_widget_text.xml
+++ b/app/src/main/res/layout/app_widget_text.xml
@@ -29,7 +29,7 @@
             android:shadowColor="@color/md_black_1000"
             android:shadowRadius="8"
             android:text="@string/normal_lyrics"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
+            android:textAppearance="@style/TextViewHeadline6"
             android:textColor="@color/md_white_1000" />
 
         <TextView
@@ -43,7 +43,7 @@
             android:shadowColor="@color/md_grey_800"
             android:shadowRadius="6"
             android:text="@string/normal_lyrics"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+            android:textAppearance="@style/TextViewBody2"
             android:textColor="@color/md_white_1000" />
     </LinearLayout>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fa27d045..fbe24c14 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -172,6 +172,10 @@
         <item name="android:fontFamily">@font/circular</item>
     </style>
 
+    <style name="TextViewCaption" parent="TextAppearance.MaterialComponents.Caption">
+        <item name="android:fontFamily">@font/circular</item>
+    </style>
+
     <style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6">
         <item name="android:fontFamily">@font/circular</item>
     </style>