diff --git a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java
index bd478967..4e7bbb2c 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java
@@ -45,9 +45,9 @@ public abstract class AbsThemeActivity extends AppCompatActivity {
 
     @Override
     public void setTheme(int resId) {
-        currentTheme = resId;
-
         super.setTheme(resId);
+
+        currentTheme = resId;
     }
 
     protected void setDrawUnderStatusBar() {
diff --git a/app/src/main/res/layout/dialog_sleep_timer.xml b/app/src/main/res/layout/dialog_sleep_timer.xml
index 374bae1c..532ed754 100644
--- a/app/src/main/res/layout/dialog_sleep_timer.xml
+++ b/app/src/main/res/layout/dialog_sleep_timer.xml
@@ -31,7 +31,7 @@
 
     </FrameLayout>
 
-    <com.kabouzeid.appthemehelper.common.views.ATECheckBox
+    <CheckBox
         android:id="@+id/should_finish_last_song"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/preference_dialog_category_item.xml b/app/src/main/res/layout/preference_dialog_category_item.xml
index f1c4b1f4..62e5da84 100644
--- a/app/src/main/res/layout/preference_dialog_category_item.xml
+++ b/app/src/main/res/layout/preference_dialog_category_item.xml
@@ -15,7 +15,7 @@
     android:paddingStart="@dimen/md_dialog_frame_margin"
     tools:gravity="start|center_vertical">
 
-    <com.kabouzeid.appthemehelper.common.views.ATECheckBox
+    <CheckBox
         android:id="@+id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/preference_dialog_direct_play_codecs_item.xml b/app/src/main/res/layout/preference_dialog_direct_play_codecs_item.xml
index 76a22346..5cefdceb 100644
--- a/app/src/main/res/layout/preference_dialog_direct_play_codecs_item.xml
+++ b/app/src/main/res/layout/preference_dialog_direct_play_codecs_item.xml
@@ -13,7 +13,7 @@
     android:paddingTop="8dp"
     android:paddingStart="20dp">
 
-    <com.kabouzeid.appthemehelper.common.views.ATECheckBox
+    <CheckBox
         android:id="@+id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/xml/pref_cache.xml b/app/src/main/res/xml/pref_cache.xml
index da377581..756d48ed 100644
--- a/app/src/main/res/xml/pref_cache.xml
+++ b/app/src/main/res/xml/pref_cache.xml
@@ -9,8 +9,9 @@
             android:key="location_download"
             android:title="@string/pref_title_download_location" />
 
-        <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEListPreference
+        <ListPreference
             app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true"
             android:defaultValue="400"
             android:entries="@array/pref_cache_size_titles"
             android:entryValues="@array/pref_cache_size_values"
@@ -19,8 +20,9 @@
             android:positiveButtonText="@null"
             android:title="@string/pref_title_image_cache_size" />
 
-        <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEListPreference
+        <ListPreference
             app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true"
             android:defaultValue="400"
             android:entries="@array/pref_cache_size_titles"
             android:entryValues="@array/pref_cache_size_values"
diff --git a/app/src/main/res/xml/pref_interface.xml b/app/src/main/res/xml/pref_interface.xml
index 8ffceaaf..99cfe156 100644
--- a/app/src/main/res/xml/pref_interface.xml
+++ b/app/src/main/res/xml/pref_interface.xml
@@ -3,8 +3,9 @@
 
     <com.dkanada.gramophone.views.settings.JellyPreferenceCategory android:title="@string/pref_header_colors">
 
-        <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEListPreference
+        <ListPreference
             app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true"
             android:defaultValue="dark"
             android:entries="@array/pref_theme_titles"
             android:entryValues="@array/pref_theme_values"
diff --git a/app/src/main/res/xml/pref_library.xml b/app/src/main/res/xml/pref_library.xml
index 7c578e50..835e9265 100644
--- a/app/src/main/res/xml/pref_library.xml
+++ b/app/src/main/res/xml/pref_library.xml
@@ -9,8 +9,9 @@
             android:summary="@string/pref_summary_categories"
             android:title="@string/pref_title_categories" />
 
-        <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEListPreference
+        <ListPreference
             app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true"
             android:defaultValue="100"
             android:entries="@array/pref_page_size_titles"
             android:entryValues="@array/pref_page_size_values"
diff --git a/app/src/main/res/xml/pref_playback.xml b/app/src/main/res/xml/pref_playback.xml
index ecadca87..79defa10 100644
--- a/app/src/main/res/xml/pref_playback.xml
+++ b/app/src/main/res/xml/pref_playback.xml
@@ -4,8 +4,9 @@
 
     <com.dkanada.gramophone.views.settings.JellyPreferenceCategory android:title="@string/pref_header_audio">
 
-        <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEListPreference
+        <ListPreference
             app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true"
             android:defaultValue="aac"
             android:entries="@array/pref_transcode_codec_titles"
             android:entryValues="@array/pref_transcode_codec_values"
@@ -19,8 +20,9 @@
             android:summary="@string/pref_summary_direct_play_codecs"
             android:title="@string/pref_title_direct_play_codecs" />
 
-        <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEListPreference
+        <ListPreference
             app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true"
             android:defaultValue="10000000"
             android:entries="@array/pref_maximum_bitrate_titles"
             android:entryValues="@array/pref_maximum_bitrate_values"