diff --git a/app/build.gradle b/app/build.gradle
index 20dd2ec5..410c016e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.1'
 
     implementation 'androidx.core:core:1.3.1'
-    implementation 'androidx.media:media:1.1.0'
+    implementation 'androidx.media:media:1.2.0'
     implementation 'androidx.fragment:fragment:1.2.5'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java
index 05e0625d..33e7674f 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java
@@ -165,7 +165,7 @@ public abstract class AbsMusicServiceActivity extends AbsBaseActivity implements
         public void onReceive(final Context context, @NonNull final Intent intent) {
             final String action = intent.getAction();
             AbsMusicServiceActivity activity = reference.get();
-            if (activity != null) {
+            if (activity != null && action != null) {
                 switch (action) {
                     case MusicService.META_CHANGED:
                         activity.onPlayMetadataChanged();
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java
index 6786517a..14420c0e 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java
@@ -16,12 +16,12 @@ import com.dkanada.gramophone.util.PreferenceUtil;
 import com.dkanada.gramophone.util.Util;
 
 public abstract class AbsThemeActivity extends ATHToolbarActivity {
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         setTheme(PreferenceUtil.getInstance(this).getGeneralTheme());
         super.onCreate(savedInstanceState);
         MaterialDialogsUtil.updateMaterialDialogsThemeSingleton(this);
+        ThemeStore.coloredNavigationBar(this);
     }
 
     protected void setDrawUnderStatusbar() {
diff --git a/app/src/main/res/xml/pref_images.xml b/app/src/main/res/xml/pref_images.xml
index 69ee78a5..8c3b77f0 100644
--- a/app/src/main/res/xml/pref_images.xml
+++ b/app/src/main/res/xml/pref_images.xml
@@ -9,7 +9,7 @@
             android:defaultValue="400000000"
             android:entries="@array/pref_images_cache_size_titles"
             android:entryValues="@array/pref_images_cache_size_values"
-            android:key="images_cache_size"
+            android:key="cache_size"
             android:negativeButtonText="@null"
             android:positiveButtonText="@null"
             android:title="@string/pref_title_images_cache_size" />
@@ -17,7 +17,7 @@
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             app:iconSpaceReserved="false"
             android:defaultValue="false"
-            android:key="images_external_directory"
+            android:key="external_directory"
             android:summary="@string/pref_summary_images_external_directory"
             android:title="@string/pref_title_images_external_directory" />