diff --git a/app/src/main/res/font/opensans.xml b/app/src/main/res/font/opensans.xml
deleted file mode 100644
index 98830240..00000000
--- a/app/src/main/res/font/opensans.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <font app:font="@font/opensans_regular" app:fontStyle="normal" app:fontWeight="400" />
-    <font app:font="@font/opensans_bold" app:fontStyle="normal" app:fontWeight="700" />
-    <font app:font="@font/opensans_extra_bold" app:fontStyle="normal" app:fontWeight="900" />
-</font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/opensans_bold.ttf b/app/src/main/res/font/opensans_bold.ttf
deleted file mode 100644
index 54e7059c..00000000
Binary files a/app/src/main/res/font/opensans_bold.ttf and /dev/null differ
diff --git a/app/src/main/res/font/opensans_extra_bold.ttf b/app/src/main/res/font/opensans_extra_bold.ttf
deleted file mode 100644
index 67fcf0fb..00000000
Binary files a/app/src/main/res/font/opensans_extra_bold.ttf and /dev/null differ
diff --git a/app/src/main/res/font/opensans_regular.ttf b/app/src/main/res/font/opensans_regular.ttf
deleted file mode 100644
index 29bfd35a..00000000
Binary files a/app/src/main/res/font/opensans_regular.ttf and /dev/null differ
diff --git a/app/src/main/res/layout/bottom_sheet_album_dialog.xml b/app/src/main/res/layout/bottom_sheet_album_dialog.xml
index 3d115e20..70000085 100644
--- a/app/src/main/res/layout/bottom_sheet_album_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_album_dialog.xml
@@ -40,12 +40,12 @@
 
         <TextView
             android:id="@+id/album_title_text_view"
+            style="@style/LabelMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:fontFamily="@font/opensans"
             android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
             android:paddingTop="8dp"
@@ -53,23 +53,18 @@
             android:scrollHorizontally="true"
             android:singleLine="true"
             android:text="@string/label_placeholder"
-            android:textColor="@color/titleTextColor"
-            android:textSize="14sp"
-            android:textStyle="bold"
             app:layout_constraintEnd_toStartOf="@id/button_favorite"
             app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/album_artist_text_view"
+            style="@style/LabelSmall"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/opensans"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:text="@string/label_placeholder"
-            android:textColor="@color/subtitleTextColor"
-            android:textSize="12sp"
             app:layout_constraintEnd_toStartOf="@id/button_favorite"
             app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
             app:layout_constraintTop_toBottomOf="@+id/album_title_text_view" />
@@ -88,114 +83,93 @@
 
         <TextView
             android:id="@+id/play_radio_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/album_bottom_sheet_instant_mix"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/album_bottom_sheet_instant_mix" />
 
         <TextView
             android:id="@+id/play_random_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/album_bottom_sheet_shuffle"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/album_bottom_sheet_shuffle" />
 
         <TextView
             android:id="@+id/play_next_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/album_bottom_sheet_play_next"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/album_bottom_sheet_play_next" />
 
         <TextView
             android:id="@+id/add_to_queue_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/album_bottom_sheet_add_to_queue"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/album_bottom_sheet_add_to_queue" />
 
         <TextView
             android:id="@+id/download_all_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/album_bottom_sheet_download_all"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/album_bottom_sheet_download_all" />
 
         <TextView
             android:id="@+id/remove_all_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/album_bottom_sheet_remove_all"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/album_bottom_sheet_remove_all" />
 
         <TextView
             android:id="@+id/go_to_artist_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/album_bottom_sheet_go_to_artist"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/album_bottom_sheet_go_to_artist" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_artist_dialog.xml b/app/src/main/res/layout/bottom_sheet_artist_dialog.xml
index 8c3e2a9f..6c1495ac 100644
--- a/app/src/main/res/layout/bottom_sheet_artist_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_artist_dialog.xml
@@ -41,22 +41,19 @@
 
         <TextView
             android:id="@+id/song_title_text_view"
+            style="@style/LabelMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:ellipsize="marquee"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:fontFamily="@font/opensans"
             android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:scrollHorizontally="true"
             android:singleLine="true"
             android:text="@string/label_placeholder"
-            android:textColor="@color/titleTextColor"
-            android:textSize="14sp"
-            android:textStyle="bold"
             app:layout_constraintEnd_toStartOf="@id/button_favorite"
             app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view"
             app:layout_constraintTop_toTopOf="parent" />
@@ -75,34 +72,28 @@
 
         <TextView
             android:id="@+id/play_radio_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/artist_bottom_sheet_instant_mix"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/artist_bottom_sheet_instant_mix" />
 
         <TextView
             android:id="@+id/play_random_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/artist_bottom_sheet_shuffle"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/artist_bottom_sheet_shuffle" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_song_dialog.xml b/app/src/main/res/layout/bottom_sheet_song_dialog.xml
index 56408d4c..9fdd86d9 100644
--- a/app/src/main/res/layout/bottom_sheet_song_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_song_dialog.xml
@@ -41,36 +41,31 @@
 
         <TextView
             android:id="@+id/song_title_text_view"
+            style="@style/LabelMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:ellipsize="marquee"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:fontFamily="@font/opensans"
             android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:scrollHorizontally="true"
             android:singleLine="true"
             android:text="@string/label_placeholder"
-            android:textColor="@color/titleTextColor"
-            android:textSize="14sp"
-            android:textStyle="bold"
             app:layout_constraintEnd_toStartOf="@id/button_favorite"
             app:layout_constraintStart_toEndOf="@+id/song_cover_image_view"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/song_artist_text_view"
+            style="@style/LabelSmall"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/opensans"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:text="@string/label_placeholder"
-            android:textColor="@color/subtitleTextColor"
-            android:textSize="12sp"
             app:layout_constraintEnd_toStartOf="@id/button_favorite"
             app:layout_constraintStart_toEndOf="@+id/song_cover_image_view"
             app:layout_constraintTop_toBottomOf="@+id/song_title_text_view" />
@@ -89,147 +84,120 @@
 
         <TextView
             android:id="@+id/play_radio_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/song_bottom_sheet_instant_mix"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/song_bottom_sheet_instant_mix" />
 
         <TextView
             android:id="@+id/play_next_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/song_bottom_sheet_play_next"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/song_bottom_sheet_play_next" />
 
         <TextView
             android:id="@+id/add_to_queue_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/song_bottom_sheet_add_to_queue"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/song_bottom_sheet_add_to_queue" />
 
         <TextView
             android:id="@+id/rate_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/song_bottom_sheet_rate"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/song_bottom_sheet_rate" />
 
         <TextView
             android:id="@+id/download_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/song_bottom_sheet_download"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/song_bottom_sheet_download" />
 
         <TextView
             android:id="@+id/remove_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/song_bottom_sheet_remove"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/song_bottom_sheet_remove" />
 
         <TextView
             android:id="@+id/add_to_playlist_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/song_bottom_sheet_add_to_playlist"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/song_bottom_sheet_add_to_playlist" />
 
         <TextView
             android:id="@+id/go_to_album_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/song_bottom_sheet_go_to_album"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/song_bottom_sheet_go_to_album" />
 
         <TextView
             android:id="@+id/go_to_artist_text_view"
+            style="@style/LabelMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:fontFamily="@font/opensans"
             android:paddingStart="20dp"
             android:paddingTop="12dp"
             android:paddingEnd="20dp"
             android:paddingBottom="12dp"
-            android:text="@string/song_bottom_sheet_go_to_artist"
-            android:textColor="@color/titleTextColor"
-            android:textFontWeight="700"
-            android:textSize="14sp" />
+            android:text="@string/song_bottom_sheet_go_to_artist" />
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chip_search_filter_genre.xml b/app/src/main/res/layout/chip_search_filter_genre.xml
index c21769e5..7c6a65c8 100644
--- a/app/src/main/res/layout/chip_search_filter_genre.xml
+++ b/app/src/main/res/layout/chip_search_filter_genre.xml
@@ -5,9 +5,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:checkable="true"
-    android:fontFamily="@font/opensans"
     android:gravity="center"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
-    android:textAppearance="?android:attr/textAppearance"
     app:chipStrokeWidth="1.5dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_playlist_chooser.xml b/app/src/main/res/layout/dialog_playlist_chooser.xml
index c81f245e..80b4bfbe 100644
--- a/app/src/main/res/layout/dialog_playlist_chooser.xml
+++ b/app/src/main/res/layout/dialog_playlist_chooser.xml
@@ -5,21 +5,21 @@
 
     <TextView
         android:id="@+id/no_playlists_created_text_view"
-        style="@style/SubheadTextView"
+        style="@style/TitleMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:gravity="center"
         android:paddingStart="16dp"
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
-        android:gravity="center"
         android:text="@string/playlist_chooser_dialog_empty"
-        android:clipToPadding="false"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/playlist_dialog_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:clipToPadding="false"
-        android:layout_marginTop="8dp"/>
+        android:layout_marginTop="8dp"
+        android:clipToPadding="false" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_catalogue.xml b/app/src/main/res/layout/fragment_album_catalogue.xml
index 4bd8cbe2..f0eb06f6 100644
--- a/app/src/main/res/layout/fragment_album_catalogue.xml
+++ b/app/src/main/res/layout/fragment_album_catalogue.xml
@@ -30,7 +30,7 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/fragment_album_list_page.xml b/app/src/main/res/layout/fragment_album_list_page.xml
index cd735806..c2c9f505 100644
--- a/app/src/main/res/layout/fragment_album_list_page.xml
+++ b/app/src/main/res/layout/fragment_album_list_page.xml
@@ -32,7 +32,7 @@
 
                 <TextView
                     android:id="@+id/page_title_label"
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/fragment_album_page.xml b/app/src/main/res/layout/fragment_album_page.xml
index 8417668e..55539e62 100644
--- a/app/src/main/res/layout/fragment_album_page.xml
+++ b/app/src/main/res/layout/fragment_album_page.xml
@@ -45,7 +45,7 @@
 
                 <TextView
                     android:id="@+id/album_name_label"
-                    style="@style/ShowcaseTitleTextView"
+                    style="@style/LabelExtraLarge"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="18dp"
@@ -62,7 +62,7 @@
 
                 <TextView
                     android:id="@+id/album_artist_label"
-                    style="@style/ShowcaseSubtitleTextView"
+                    style="@style/LabelMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="18dp"
@@ -77,7 +77,7 @@
 
                 <TextView
                     android:id="@+id/album_release_year_label"
-                    style="@style/ShowcaseExtraTextView"
+                    style="@style/LabelSmall"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="18dp"
@@ -111,7 +111,6 @@
 
                     <Button
                         android:id="@+id/album_page_play_button"
-                        style="@style/MainButton"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
@@ -126,7 +125,6 @@
 
                     <Button
                         android:id="@+id/album_page_shuffle_button"
-                        style="@style/MainButton"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -142,7 +140,7 @@
 
                 <TextView
                     android:id="@+id/album_bio_label"
-                    style="@style/ShowcaseExtraTextView"
+                    style="@style/LabelSmall"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="18dp"
@@ -188,7 +186,7 @@
                     android:visibility="gone">
 
                     <TextView
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/fragment_artist_catalogue.xml b/app/src/main/res/layout/fragment_artist_catalogue.xml
index 5b300902..da98af7b 100644
--- a/app/src/main/res/layout/fragment_artist_catalogue.xml
+++ b/app/src/main/res/layout/fragment_artist_catalogue.xml
@@ -30,7 +30,7 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/fragment_artist_list_page.xml b/app/src/main/res/layout/fragment_artist_list_page.xml
index 64c775a8..5f767c14 100644
--- a/app/src/main/res/layout/fragment_artist_list_page.xml
+++ b/app/src/main/res/layout/fragment_artist_list_page.xml
@@ -32,7 +32,7 @@
 
                 <TextView
                     android:id="@+id/page_title_label"
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/fragment_artist_page.xml b/app/src/main/res/layout/fragment_artist_page.xml
index 241c00c5..be259fe6 100644
--- a/app/src/main/res/layout/fragment_artist_page.xml
+++ b/app/src/main/res/layout/fragment_artist_page.xml
@@ -70,7 +70,6 @@
 
                 <Button
                     android:id="@+id/artist_page_shuffle_button"
-                    style="@style/MainButton"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -85,7 +84,6 @@
 
                 <Button
                     android:id="@+id/artist_page_radio_button"
-                    style="@style/MainButton"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
@@ -119,7 +117,7 @@
                     android:orientation="horizontal">
 
                     <TextView
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -129,7 +127,7 @@
 
                     <TextView
                         android:id="@+id/bio_more_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingEnd="16dp"
@@ -138,7 +136,7 @@
 
                 <TextView
                     android:id="@+id/bio_text_view"
-                    style="@style/SubheadTextView"
+                    style="@style/TitleMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:paddingStart="16dp"
@@ -161,7 +159,7 @@
                     android:orientation="horizontal">
 
                     <TextView
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -171,7 +169,7 @@
 
                     <TextView
                         android:id="@+id/most_streamed_song_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingEnd="16dp"
@@ -195,7 +193,7 @@
                 android:orientation="vertical">
 
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
@@ -223,7 +221,7 @@
                 android:orientation="vertical">
 
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/fragment_download.xml b/app/src/main/res/layout/fragment_download.xml
index 28a60fc2..8c00e7ac 100644
--- a/app/src/main/res/layout/fragment_download.xml
+++ b/app/src/main/res/layout/fragment_download.xml
@@ -29,7 +29,7 @@
                     android:background="@drawable/ic_toolbar_motion_on" />
 
                 <TextView
-                    style="@style/ToolbarTextView"
+                    style="@style/HeadlineMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="8dp"
@@ -59,7 +59,7 @@
 
         <TextView
             android:id="@+id/title_download_screen"
-            style="@style/ItemTitleTextView"
+            style="@style/LabelMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingTop="12dp"
@@ -67,7 +67,7 @@
 
         <TextView
             android:id="@+id/subtitle_download_screen"
-            style="@style/ItemSubtitleTextView"
+            style="@style/LabelSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="56dp"
@@ -107,7 +107,7 @@
 
                     <TextView
                         android:id="@+id/downloaded_artist_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -119,7 +119,7 @@
 
                     <TextView
                         android:id="@+id/downloaded_artist_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
@@ -163,7 +163,7 @@
 
                     <TextView
                         android:id="@+id/downloaded_album_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -175,7 +175,7 @@
 
                     <TextView
                         android:id="@+id/downloaded_album_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
@@ -219,7 +219,7 @@
 
                     <TextView
                         android:id="@+id/downloaded_tracks_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -231,7 +231,7 @@
 
                     <TextView
                         android:id="@+id/downloaded_tracks_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
@@ -275,7 +275,7 @@
 
                     <TextView
                         android:id="@+id/downloaded_playlist_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -287,7 +287,7 @@
 
                     <TextView
                         android:id="@+id/downloaded_playlist_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
diff --git a/app/src/main/res/layout/fragment_filter.xml b/app/src/main/res/layout/fragment_filter.xml
index 83daab6a..44068a30 100644
--- a/app/src/main/res/layout/fragment_filter.xml
+++ b/app/src/main/res/layout/fragment_filter.xml
@@ -31,7 +31,7 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/fragment_genre_catalogue.xml b/app/src/main/res/layout/fragment_genre_catalogue.xml
index f3ece665..6313b24c 100644
--- a/app/src/main/res/layout/fragment_genre_catalogue.xml
+++ b/app/src/main/res/layout/fragment_genre_catalogue.xml
@@ -31,7 +31,7 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index b4e76fae..a3db3c61 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -29,7 +29,7 @@
                     android:background="@drawable/ic_toolbar_motion_on" />
 
                 <TextView
-                    style="@style/ToolbarTextView"
+                    style="@style/HeadlineMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="8dp"
@@ -61,7 +61,7 @@
 
                 <TextView
                     android:id="@+id/music_discovery_text_view_refreshable"
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="8dp"
@@ -93,7 +93,7 @@
 
                 <TextView
                     android:id="@+id/similar_tracks_pre_text_view"
-                    style="@style/SubheadTextView"
+                    style="@style/TitleMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
@@ -104,7 +104,7 @@
 
                 <TextView
                     android:id="@+id/similar_tracks_text_view_refreshable"
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
@@ -148,7 +148,7 @@
 
                     <TextView
                         android:id="@+id/most_played_albums_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -160,7 +160,7 @@
 
                     <TextView
                         android:id="@+id/most_played_albums_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
@@ -206,7 +206,7 @@
 
                     <TextView
                         android:id="@+id/recently_played_albums_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -218,7 +218,7 @@
 
                     <TextView
                         android:id="@+id/recently_played_albums_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
@@ -255,7 +255,7 @@
 
                 <!--  Label and button  -->
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
@@ -299,7 +299,7 @@
 
                     <TextView
                         android:id="@+id/starred_tracks_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -311,7 +311,7 @@
 
                     <TextView
                         android:id="@+id/starred_tracks_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
@@ -354,7 +354,7 @@
 
                     <TextView
                         android:id="@+id/starred_albums_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -366,7 +366,7 @@
 
                     <TextView
                         android:id="@+id/starred_albums_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
@@ -409,7 +409,7 @@
 
                     <TextView
                         android:id="@+id/starred_artists_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -421,7 +421,7 @@
 
                     <TextView
                         android:id="@+id/starred_artists_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
@@ -465,7 +465,7 @@
 
                     <TextView
                         android:id="@+id/recently_added_albums_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -477,7 +477,7 @@
 
                     <TextView
                         android:id="@+id/recently_added_albums_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 41b604fd..4ac95f9a 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -29,7 +29,7 @@
                     android:background="@drawable/ic_toolbar_motion_on" />
 
                 <TextView
-                    style="@style/ToolbarTextView"
+                    style="@style/HeadlineMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="8dp"
@@ -60,7 +60,7 @@
 
                 <!--  New releases  -->
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
@@ -102,7 +102,7 @@
 
                     <TextView
                         android:id="@+id/album_catalogue_sample_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -113,7 +113,7 @@
 
                     <TextView
                         android:id="@+id/album_catalogue_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
@@ -159,7 +159,7 @@
 
                     <TextView
                         android:id="@+id/artist_catalogue_sample_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -171,7 +171,7 @@
 
                     <TextView
                         android:id="@+id/artist_catalogue_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
@@ -218,7 +218,7 @@
 
                     <TextView
                         android:id="@+id/genre_catalogue_sample_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -230,7 +230,7 @@
 
                     <TextView
                         android:id="@+id/genre_catalogue_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
@@ -275,7 +275,7 @@
 
                     <TextView
                         android:id="@+id/playlist_catalogue_sample_text_view_refreshable"
-                        style="@style/HeadlineTextView"
+                        style="@style/TitleLarge"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -287,7 +287,7 @@
 
                     <TextView
                         android:id="@+id/playlist_catalogue_text_view_clickable"
-                        style="@style/SubheadTextView"
+                        style="@style/TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 66267bf2..4a997018 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -29,7 +29,7 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
@@ -45,7 +45,7 @@
 
         <TextView
             android:id="@+id/no_server_added_text_view"
-            style="@style/SubheadTextView"
+            style="@style/TitleMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:clipToPadding="false"
diff --git a/app/src/main/res/layout/fragment_playlist_catalogue.xml b/app/src/main/res/layout/fragment_playlist_catalogue.xml
index 186071dd..940e6d1f 100644
--- a/app/src/main/res/layout/fragment_playlist_catalogue.xml
+++ b/app/src/main/res/layout/fragment_playlist_catalogue.xml
@@ -30,7 +30,7 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/fragment_playlist_page.xml b/app/src/main/res/layout/fragment_playlist_page.xml
index e64bc88f..352bccc5 100644
--- a/app/src/main/res/layout/fragment_playlist_page.xml
+++ b/app/src/main/res/layout/fragment_playlist_page.xml
@@ -75,7 +75,7 @@
 
                 <TextView
                     android:id="@+id/playlist_name_label"
-                    style="@style/ShowcaseTitleTextView"
+                    style="@style/LabelExtraLarge"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="18dp"
@@ -92,7 +92,7 @@
 
                 <TextView
                     android:id="@+id/playlist_song_count_label"
-                    style="@style/ShowcaseSubtitleTextView"
+                    style="@style/LabelMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="18dp"
@@ -107,7 +107,7 @@
 
                 <TextView
                     android:id="@+id/playlist_duration_label"
-                    style="@style/ShowcaseExtraTextView"
+                    style="@style/LabelSmall"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="18dp"
@@ -141,7 +141,6 @@
 
                     <Button
                         android:id="@+id/playlist_page_play_button"
-                        style="@style/MainButton"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
@@ -156,7 +155,6 @@
 
                     <Button
                         android:id="@+id/playlist_page_shuffle_button"
-                        style="@style/MainButton"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -172,7 +170,7 @@
 
                 <TextView
                     android:id="@+id/album_bio_label"
-                    style="@style/ShowcaseExtraTextView"
+                    style="@style/LabelSmall"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="18dp"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 25eed1f6..dd501240 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -52,7 +52,7 @@
                 android:visibility="gone">
 
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
@@ -83,7 +83,7 @@
                 android:visibility="gone">
 
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
@@ -114,7 +114,7 @@
                 android:visibility="gone">
 
                 <TextView
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/fragment_song_list_page.xml b/app/src/main/res/layout/fragment_song_list_page.xml
index d685076f..9a0374d7 100644
--- a/app/src/main/res/layout/fragment_song_list_page.xml
+++ b/app/src/main/res/layout/fragment_song_list_page.xml
@@ -26,13 +26,13 @@
                 android:id="@+id/album_info_sector"
                 android:layout_width="match_parent"
                 android:layout_height="172dp"
-                android:clipChildren="false"
                 android:background="?attr/colorSurface"
+                android:clipChildren="false"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
                     android:id="@+id/page_title_label"
-                    style="@style/HeadlineTextView"
+                    style="@style/TitleLarge"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/generic_playlist_sector.xml b/app/src/main/res/layout/generic_playlist_sector.xml
index 2b9bd638..5669b614 100644
--- a/app/src/main/res/layout/generic_playlist_sector.xml
+++ b/app/src/main/res/layout/generic_playlist_sector.xml
@@ -15,7 +15,7 @@
 
         <TextView
             android:id="@+id/generic_playlist_title_text_view"
-            style="@style/HeadlineTextView"
+            style="@style/TitleLarge"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/generic_playlist_text_view_clickable"
-            style="@style/SubheadTextView"
+            style="@style/TitleMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="8dp"
diff --git a/app/src/main/res/layout/inner_fragment_player_controller_layout.xml b/app/src/main/res/layout/inner_fragment_player_controller_layout.xml
index 06ebd2b8..5928897d 100644
--- a/app/src/main/res/layout/inner_fragment_player_controller_layout.xml
+++ b/app/src/main/res/layout/inner_fragment_player_controller_layout.xml
@@ -33,7 +33,7 @@
                     android:foreground="?android:attr/selectableItemBackgroundBorderless" />
 
                 <TextView
-                    style="@style/ToolbarTextView"
+                    style="@style/HeadlineMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="8dp"
@@ -61,7 +61,7 @@
 
     <TextView
         android:id="@+id/player_song_title_label"
-        style="@style/TitleTextView"
+        style="@style/HeadlineLarge"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
@@ -90,7 +90,7 @@
 
     <TextView
         android:id="@+id/player_artist_name_label"
-        style="@style/SubheadTextView"
+        style="@style/TitleMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
diff --git a/app/src/main/res/layout/inner_fragment_player_lyrics.xml b/app/src/main/res/layout/inner_fragment_player_lyrics.xml
index 01aa9bd2..1f6cad9c 100644
--- a/app/src/main/res/layout/inner_fragment_player_lyrics.xml
+++ b/app/src/main/res/layout/inner_fragment_player_lyrics.xml
@@ -4,9 +4,9 @@
 
     <TextView
         android:id="@+id/now_playing_song_lyrics_text_view"
-        style="@style/LyricsTextView"
+        style="@style/BodyLarge"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingStart="24dp"
-        android:paddingEnd="24dp"/>
+        android:paddingEnd="24dp" />
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_home_similar_track.xml b/app/src/main/res/layout/item_home_similar_track.xml
index 08fd459c..d05e40f1 100644
--- a/app/src/main/res/layout/item_home_similar_track.xml
+++ b/app/src/main/res/layout/item_home_similar_track.xml
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/title_track_label"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout/item_home_year.xml b/app/src/main/res/layout/item_home_year.xml
index 4545a85b..702c1074 100644
--- a/app/src/main/res/layout/item_home_year.xml
+++ b/app/src/main/res/layout/item_home_year.xml
@@ -25,11 +25,11 @@
             <View
                 android:layout_width="6dp"
                 android:layout_height="match_parent"
-                android:background="?attr/colorPrimary"/>
+                android:background="?attr/colorPrimary" />
 
             <TextView
                 android:id="@+id/year_label"
-                style="@style/ItemTitleTextView"
+                style="@style/LabelMedium"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
diff --git a/app/src/main/res/layout/item_horizontal_album.xml b/app/src/main/res/layout/item_horizontal_album.xml
index 26fd08c7..23c1cb31 100644
--- a/app/src/main/res/layout/item_horizontal_album.xml
+++ b/app/src/main/res/layout/item_horizontal_album.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/album_title_text_view"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/album_artist_text_view"
-        style="@style/ItemSubtitleTextView"
+        style="@style/LabelSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
diff --git a/app/src/main/res/layout/item_horizontal_artist.xml b/app/src/main/res/layout/item_horizontal_artist.xml
index f68bdf1e..74a06d94 100644
--- a/app/src/main/res/layout/item_horizontal_artist.xml
+++ b/app/src/main/res/layout/item_horizontal_artist.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/artist_name_text_view"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
@@ -34,18 +34,17 @@
         android:scrollHorizontally="true"
         android:singleLine="true"
         android:text="@string/label_placeholder"
+        app:layout_constraintBottom_toTopOf="@id/artist_info_text_view"
         app:layout_constraintEnd_toStartOf="@+id/artist_more_button"
         app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/artist_info_text_view"
         app:layout_constraintVertical_chainStyle="spread"
-        app:layout_constraintVertical_weight="1"/>
+        app:layout_constraintVertical_weight="1" />
 
 
     <TextView
-        android:visibility="gone"
         android:id="@+id/artist_info_text_view"
-        style="@style/ItemSubtitleTextView"
+        style="@style/LabelSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
@@ -56,10 +55,11 @@
         android:paddingStart="12dp"
         android:paddingEnd="16dp"
         android:text="@string/label_placeholder"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/artist_more_button"
         app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view"
-        app:layout_constraintTop_toBottomOf="@+id/artist_name_text_view"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:layout_constraintTop_toBottomOf="@+id/artist_name_text_view" />
 
     <ImageView
         android:id="@+id/artist_more_button"
diff --git a/app/src/main/res/layout/item_horizontal_playlist.xml b/app/src/main/res/layout/item_horizontal_playlist.xml
index a2168dd7..69f853a7 100644
--- a/app/src/main/res/layout/item_horizontal_playlist.xml
+++ b/app/src/main/res/layout/item_horizontal_playlist.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/playlist_dialog_title_text_view"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/playlist_dialog_count_text_view"
-            style="@style/ItemSubtitleTextView"
+            style="@style/LabelSmall"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -53,14 +53,14 @@
 
         <TextView
             android:id="@+id/queue_separator_text_view"
-            style="@style/ItemSubtitleTextView"
+            style="@style/LabelSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/label_dot_separator" />
 
         <TextView
             android:id="@+id/playlist_dialog_duration_text_view"
-            style="@style/ItemSubtitleTextView"
+            style="@style/LabelSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:maxLines="1"
diff --git a/app/src/main/res/layout/item_horizontal_playlist_dialog_track.xml b/app/src/main/res/layout/item_horizontal_playlist_dialog_track.xml
index 3e6b6384..2ada1756 100644
--- a/app/src/main/res/layout/item_horizontal_playlist_dialog_track.xml
+++ b/app/src/main/res/layout/item_horizontal_playlist_dialog_track.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/playlist_dialog_song_title_text_view"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
@@ -51,7 +51,7 @@
 
         <TextView
             android:id="@+id/playlist_dialog_album_artist_text_view"
-            style="@style/ItemSubtitleTextView"
+            style="@style/LabelSmall"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -63,14 +63,14 @@
 
         <TextView
             android:id="@+id/queue_separator_text_view"
-            style="@style/ItemSubtitleTextView"
+            style="@style/LabelSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/label_dot_separator" />
 
         <TextView
             android:id="@+id/playlist_dialog_song_duration_text_view"
-            style="@style/ItemSubtitleTextView"
+            style="@style/LabelSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:maxLines="1"
diff --git a/app/src/main/res/layout/item_horizontal_track.xml b/app/src/main/res/layout/item_horizontal_track.xml
index 15cbd1e0..27988a91 100644
--- a/app/src/main/res/layout/item_horizontal_track.xml
+++ b/app/src/main/res/layout/item_horizontal_track.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/track_number_text_view"
-        style="@style/TrackNumberTextView"
+        style="@style/LabelLarge"
         android:layout_width="52dp"
         android:layout_height="52dp"
         android:layout_margin="2dp"
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/search_result_song_title_text_view"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
@@ -59,7 +59,7 @@
 
     <TextView
         android:id="@+id/search_result_song_subtitle_text_view"
-        style="@style/ItemSubtitleTextView"
+        style="@style/LabelSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
diff --git a/app/src/main/res/layout/item_library_album.xml b/app/src/main/res/layout/item_library_album.xml
index 3b37a5f9..7d74c767 100644
--- a/app/src/main/res/layout/item_library_album.xml
+++ b/app/src/main/res/layout/item_library_album.xml
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/album_name_label"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
@@ -29,7 +29,7 @@
 
     <TextView
         android:id="@+id/artist_name_label"
-        style="@style/ItemSubtitleTextView"
+        style="@style/LabelSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout/item_library_artist.xml b/app/src/main/res/layout/item_library_artist.xml
index 3a3909a8..7f423e44 100644
--- a/app/src/main/res/layout/item_library_artist.xml
+++ b/app/src/main/res/layout/item_library_artist.xml
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/artist_name_label"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout/item_library_artist_page_or_similar_album.xml b/app/src/main/res/layout/item_library_artist_page_or_similar_album.xml
index 62c26a4b..543abace 100644
--- a/app/src/main/res/layout/item_library_artist_page_or_similar_album.xml
+++ b/app/src/main/res/layout/item_library_artist_page_or_similar_album.xml
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/album_name_label"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
@@ -30,7 +30,7 @@
 
     <TextView
         android:id="@+id/artist_name_label"
-        style="@style/ItemSubtitleTextView"
+        style="@style/LabelSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout/item_library_catalogue_album.xml b/app/src/main/res/layout/item_library_catalogue_album.xml
index 1d5dc65a..1943a34e 100644
--- a/app/src/main/res/layout/item_library_catalogue_album.xml
+++ b/app/src/main/res/layout/item_library_catalogue_album.xml
@@ -15,7 +15,7 @@
 
     <TextView
         android:id="@+id/album_name_label"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/artist_name_label"
-        style="@style/ItemSubtitleTextView"
+        style="@style/LabelSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout/item_library_catalogue_artist.xml b/app/src/main/res/layout/item_library_catalogue_artist.xml
index bef4bc7e..3689bc67 100644
--- a/app/src/main/res/layout/item_library_catalogue_artist.xml
+++ b/app/src/main/res/layout/item_library_catalogue_artist.xml
@@ -15,7 +15,7 @@
 
     <TextView
         android:id="@+id/artist_name_label"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout/item_library_catalogue_genre.xml b/app/src/main/res/layout/item_library_catalogue_genre.xml
index f6e3d27a..85b3e5cf 100644
--- a/app/src/main/res/layout/item_library_catalogue_genre.xml
+++ b/app/src/main/res/layout/item_library_catalogue_genre.xml
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/genre_label"
-                style="@style/ItemTitleTextView"
+                style="@style/LabelMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center"
diff --git a/app/src/main/res/layout/item_library_genre.xml b/app/src/main/res/layout/item_library_genre.xml
index ffe02b49..b636d2ff 100644
--- a/app/src/main/res/layout/item_library_genre.xml
+++ b/app/src/main/res/layout/item_library_genre.xml
@@ -24,11 +24,11 @@
             <View
                 android:layout_width="6dp"
                 android:layout_height="match_parent"
-                android:background="?attr/colorPrimary"/>
+                android:background="?attr/colorPrimary" />
 
             <TextView
                 android:id="@+id/genre_label"
-                style="@style/ItemTitleTextView"
+                style="@style/LabelMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/item_library_similar_artist.xml b/app/src/main/res/layout/item_library_similar_artist.xml
index 223beaff..14a75ba0 100644
--- a/app/src/main/res/layout/item_library_similar_artist.xml
+++ b/app/src/main/res/layout/item_library_similar_artist.xml
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/artist_name_label"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout/item_login_server.xml b/app/src/main/res/layout/item_login_server.xml
index abb1ea6f..66a32092 100644
--- a/app/src/main/res/layout/item_login_server.xml
+++ b/app/src/main/res/layout/item_login_server.xml
@@ -1,5 +1,4 @@
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,7 +7,7 @@
 
     <TextView
         android:id="@+id/server_name_text_view"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
@@ -18,18 +17,18 @@
         android:maxLines="1"
         android:paddingStart="20dp"
         android:paddingTop="12dp"
-        android:paddingBottom="4dp"
         android:paddingEnd="12dp"
+        android:paddingBottom="4dp"
         android:scrollHorizontally="true"
         android:text="@string/label_placeholder"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
 
     <TextView
         android:id="@+id/server_address_text_view"
-        style="@style/ItemSubtitleTextView"
+        style="@style/LabelSmall"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
@@ -38,10 +37,10 @@
         android:marqueeRepeatLimit="marquee_forever"
         android:maxLines="1"
         android:paddingStart="20dp"
-        android:paddingBottom="12dp"
         android:paddingEnd="12dp"
+        android:paddingBottom="12dp"
         android:text="@string/label_placeholder"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/server_name_text_view" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_player_queue_song.xml b/app/src/main/res/layout/item_player_queue_song.xml
index 6d1d3e46..7b05ff66 100644
--- a/app/src/main/res/layout/item_player_queue_song.xml
+++ b/app/src/main/res/layout/item_player_queue_song.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/queue_song_title_text_view"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/queue_song_subtitle_text_view"
-        style="@style/ItemSubtitleTextView"
+        style="@style/LabelSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
diff --git a/app/src/main/res/layout/player_header_bottom_sheet.xml b/app/src/main/res/layout/player_header_bottom_sheet.xml
index 213a45b1..33217cdc 100644
--- a/app/src/main/res/layout/player_header_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_header_bottom_sheet.xml
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/player_header_song_title_label"
-        style="@style/ItemTitleTextView"
+        style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
@@ -32,11 +32,10 @@
 
     <TextView
         android:id="@+id/player_header_song_artist_label"
-        style="@style/ItemSubtitleTextView"
+        style="@style/LabelSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:fontFamily="@font/opensans"
         android:maxLines="1"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
@@ -76,11 +75,11 @@
         android:id="@+id/player_header_seek_bar"
         android:layout_width="match_parent"
         android:layout_height="2dp"
+        android:background="?attr/colorSurface"
         android:clickable="false"
         android:paddingStart="0dp"
         android:paddingEnd="0dp"
         android:thumb="@android:color/transparent"
-        android:background="?attr/colorSurface"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/values/fonts.xml b/app/src/main/res/values/fonts.xml
deleted file mode 100644
index 9bed7dcc..00000000
--- a/app/src/main/res/values/fonts.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- FONT STYLE -->
-
-    <style name="InterFontFamily">
-        <item name="android:fontFamily">@font/inter</item>
-    </style>
-
-    <!-- Font di tutti i titoli di sezione.
-    Prevalentemente utilizzato nel bottom_sheet_player,
-    il titolo della canzone e la stringa in alto   -->
-    <style name="ToolbarTextView" parent="InterFontFamily">
-        <item name="android:textSize">24sp</item>
-        <item name="android:textFontWeight">700</item>
-        <item name="android:textColor">@color/titleTextColor</item>
-    </style>
-
-    <!-- Font di tutti i titoli di sezione.
-    Prevalentemente utilizzato nel bottom_sheet_player,
-    il titolo della canzone e la stringa in alto   -->
-    <style name="TitleTextView" parent="InterFontFamily">
-        <item name="android:textSize">26sp</item>
-        <item name="android:textFontWeight">700</item>
-        <item name="android:textColor">@color/titleTextColor</item>
-    </style>
-
-    <!-- Font di tutti i titoli grossi.
-    Questi comprendono i titoli nelle schermate principali, nel bottom_sheet_player
-    il titolo della canzone e la stringa in alto  -->
-    <style name="HeadlineTextView" parent="InterFontFamily">
-        <item name="android:textSize">22sp</item>
-        <item name="android:textFontWeight">700</item>
-        <item name="android:textColor">@color/titleTextColor</item>
-    </style>
-
-    <!-- Font delle stringhe piccole come il see all e il nome dell'artista nel player
-    Da accompagnre all'Headline-->
-    <style name="SubheadTextView" parent="InterFontFamily">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textFontWeight">400</item>
-        <item name="android:textColor">@color/subtitleTextColor</item>
-    </style>
-
-    <!-- I seguenti due font vanno insieme e sono utilizzati per titolo e sottotitolo
-     degli oggetti come canzoni (ricerca e coda), album (home, cataloghi, e album artista)
-     e artista (home, catalogo). Usato anche per le card dei generi (catalogo e non) e degli anni-->
-    <style name="ItemTitleTextView" parent="InterFontFamily">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textFontWeight">500</item>
-        <item name="android:textColor">@color/titleTextColor</item>
-    </style>
-
-    <style name="ItemSubtitleTextView" parent="InterFontFamily">
-        <item name="android:textSize">12sp</item>
-        <item name="android:textFontWeight">400</item>
-        <item name="android:textColor">@color/subtitleTextColor</item>
-    </style>
-
-    <!-- I seguenti tre font sono destinati a situazioni come la vetrina dell'album
-    Il primo font indica il titolo o il nome dell'album, il secondo il sottotitolo o il
-    nome dell'artista, mentre il terzo indica l'informazione agiuntiva che può esserci o meno
-    come l'anno di pubblicazione dell'album. Eventualmente potrà essere definito un quarto font
-    per un testo di informazioni sull'elemento in vetrina-->
-    <style name="ShowcaseTitleTextView" parent="InterFontFamily">
-        <item name="android:textSize">22sp</item>
-        <item name="android:textFontWeight">700</item>
-        <item name="android:textColor">@color/titleTextColor</item>
-    </style>
-
-    <style name="ShowcaseSubtitleTextView" parent="InterFontFamily">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textFontWeight">500</item>
-        <item name="android:textColor">@color/titleTextColor</item>
-    </style>
-
-    <style name="ShowcaseExtraTextView" parent="InterFontFamily">
-        <item name="android:textSize">12sp</item>
-        <item name="android:textFontWeight">400</item>
-        <item name="android:textColor">@color/titleTextColor</item>
-    </style>
-
-    <style name="LyricsTextView" parent="InterFontFamily">
-        <item name="android:textSize">24sp</item>
-        <item name="android:textFontWeight">700</item>
-        <item name="android:textColor">@color/titleTextColor</item>
-    </style>
-
-    <!-- Font utilizzato nel conteggio delle canzoni nella visualizzazione per album  -->
-    <style name="TrackNumberTextView" parent="InterFontFamily">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textFontWeight">700</item>
-        <item name="android:textColor">@color/titleTextColor</item>
-    </style>
-
-    <!-- Font dei pulsanti vari presenti nell'applicazione -->
-    <style name="MainButton" parent="Widget.Material3.Button.UnelevatedButton">
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textFontWeight">700</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/typography.xml b/app/src/main/res/values/typography.xml
new file mode 100644
index 00000000..a242a4f5
--- /dev/null
+++ b/app/src/main/res/values/typography.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- FONT STYLE -->
+
+    <style name="InterFontFamily">
+        <item name="android:fontFamily">@font/inter</item>
+    </style>
+
+
+    <style name="HeadlineLarge" parent="InterFontFamily">
+        <item name="android:textSize">26sp</item>
+        <item name="android:textFontWeight">700</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+
+    <style name="HeadlineMedium" parent="InterFontFamily">
+        <item name="android:textSize">24sp</item>
+        <item name="android:textFontWeight">700</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+
+    <style name="HeadlineSmall" parent="InterFontFamily">
+        <item name="android:textSize">22sp</item>
+        <item name="android:textFontWeight">700</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+
+
+    <style name="TitleLarge" parent="InterFontFamily">
+        <item name="android:textSize">22sp</item>
+        <item name="android:textFontWeight">700</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+
+    <style name="TitleMedium" parent="InterFontFamily">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textFontWeight">400</item>
+        <item name="android:textColor">@color/subtitleTextColor</item>
+    </style>
+
+    <style name="TitleSmall" parent="InterFontFamily">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textFontWeight">400</item>
+        <item name="android:textColor">@color/subtitleTextColor</item>
+    </style>
+
+
+    <style name="LabelExtraLarge" parent="InterFontFamily">
+        <item name="android:textSize">22sp</item>
+        <item name="android:textFontWeight">700</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+
+    <style name="LabelLarge" parent="InterFontFamily">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textFontWeight">700</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+
+    <style name="LabelMedium" parent="InterFontFamily">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textFontWeight">500</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+
+    <style name="LabelSmall" parent="InterFontFamily">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textFontWeight">400</item>
+        <item name="android:textColor">@color/subtitleTextColor</item>
+    </style>
+
+
+    <style name="BodyLarge" parent="InterFontFamily">
+        <item name="android:textSize">24sp</item>
+        <item name="android:textFontWeight">700</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+
+    <style name="BodyMedium" parent="InterFontFamily">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textFontWeight">500</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+
+    <style name="BodySmall" parent="InterFontFamily">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textFontWeight">400</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+</resources>
\ No newline at end of file