diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index 6bc1b27f7..6c3992607 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -3,7 +3,6 @@ package org.oxycblt.auxio
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
 
 class MainActivity : AppCompatActivity() {
 
@@ -11,7 +10,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+        // AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
 
         Log.d(this::class.simpleName, "Activity Created.")
     }
diff --git a/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt b/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt
index 7865da7f0..6d6445e4f 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt
@@ -3,7 +3,6 @@ package org.oxycblt.auxio.music.processing
 import android.app.Application
 import android.content.ContentResolver
 import android.database.Cursor
-import android.graphics.Bitmap
 import android.graphics.ImageDecoder
 import android.os.Build
 import android.provider.MediaStore
@@ -198,12 +197,11 @@ class MusicLoader(private val app: Application) {
                 // Album art loading during the initial load isn't really practical for a large amount of albums
                 // Use glide or something
                 val artUri = id.toAlbumArtURI()
-                var cover: Bitmap? = null
 
                 // Get the album art through either ImageDecoder or MediaStore depending on the
                 // version.
-                try {
-                    cover = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                val cover = try {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                         ImageDecoder.decodeBitmap(
                             ImageDecoder.createSource(resolver, artUri)
                         )
@@ -211,7 +209,7 @@ class MusicLoader(private val app: Application) {
                         MediaStore.Images.Media.getBitmap(resolver, artUri)
                     }
                 } catch (noFound: FileNotFoundException) {
-                    cover = null
+                    null
                 }
 
                 albums.add(
diff --git a/app/src/main/res/font/source_sans_pro.ttf b/app/src/main/res/font/source_sans_pro.ttf
new file mode 100644
index 000000000..91e9ea575
Binary files /dev/null and b/app/src/main/res/font/source_sans_pro.ttf differ
diff --git a/app/src/main/res/font/source_sans_pro_black.ttf b/app/src/main/res/font/source_sans_pro_black.ttf
new file mode 100644
index 000000000..cb89a2d17
Binary files /dev/null and b/app/src/main/res/font/source_sans_pro_black.ttf differ
diff --git a/app/src/main/res/layout/album_item.xml b/app/src/main/res/layout/album_item.xml
index fbbc562b8..93bf4870c 100644
--- a/app/src/main/res/layout/album_item.xml
+++ b/app/src/main/res/layout/album_item.xml
@@ -31,9 +31,11 @@
             android:id="@+id/albumNameText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@{album.title}"
-            android:textAppearance="?attr/textAppearanceListItem"
             android:layout_marginStart="@dimen/margin_medium"
+            android:fontFamily="@font/source_sans_pro"
+            android:text="@{album.title}"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.05"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 7c5469cee..cb93f7cba 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -10,10 +10,10 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
+            android:layout_height="?android:attr/actionBarSize"
+            android:background="?android:attr/windowBackground"
             android:elevation="@dimen/elevation_normal"
-            android:textColor="?attr/titleTextColor"
+            app:titleTextAppearance="@style/ToolbarText"
             app:layout_constraintTop_toTopOf="parent"
             app:title="@string/title_library_fragment" />
 
diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml
index b0456f858..ca32128eb 100644
--- a/app/src/main/res/layout/fragment_loading.xml
+++ b/app/src/main/res/layout/fragment_loading.xml
@@ -18,7 +18,7 @@
             android:id="@+id/loading_bar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:indeterminateTint="?attr/colorAccent"
+            android:indeterminateTint="?android:attr/colorAccent"
             android:indeterminateTintMode="src_in"
             android:paddingBottom="@dimen/padding_small"
             app:layout_constraintBottom_toTopOf="@+id/error_text"
@@ -32,6 +32,7 @@
             android:id="@+id/error_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:fontFamily="@font/source_sans_pro"
             app:layout_constraintBottom_toTopOf="@+id/reset_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
@@ -44,8 +45,9 @@
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/label_retry"
+            android:fontFamily="@font/source_sans_pro"
             android:onClick="@{() -> loadingModel.retry()}"
+            android:text="@string/label_retry"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a4a3f43ac..8adb8a4a0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,4 +9,7 @@
     <color name="black">#000000</color>
 
     <color name="white">#ffffff</color>
+
+    <!-- TODO: Placeholder accent color, need to remove -->
+    <color name="blue">#2979FF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index addf50e7d..87cbe14b7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,7 +7,7 @@
 
     <string name="label_retry">Retry</string>
 
-    <string name="title_library_fragment">Library</string>
+    <string name="title_library_fragment"><b>Library</b></string>
 
     <string name="description_cover_art">Cover art for </string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6c956e4be..caad868be 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,6 +3,11 @@
     <!-- Base theme -->
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- TODO: Make this accent settable -->
-        <item name="colorAccent">#295DE5</item>
+        <item name="colorAccent">@color/blue</item>
+    </style>
+
+    <style name="ToolbarText" parent="TextAppearance.AppCompat.Title">
+        <item name="android:fontFamily">@font/source_sans_pro_black</item>
+        <item name="android:textColor">@color/blue</item>
     </style>
 </resources>
\ No newline at end of file