diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c579c9ce..81edcf7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -100,7 +100,7 @@
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/app_widget_album_info" />
+                android:resource="@xml/widget_album" />
         </receiver>
         <receiver
             android:name=".widgets.AppWidgetClassic"
@@ -112,7 +112,7 @@
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/app_widget_classic_info" />
+                android:resource="@xml/widget_classic" />
         </receiver>
         <receiver
             android:name=".widgets.AppWidgetCard"
@@ -124,7 +124,7 @@
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/app_widget_card_info" />
+                android:resource="@xml/widget_card" />
         </receiver>
 
         <provider
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/CategoryInfoAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/CategoryInfoAdapter.java
index 1f18be00..c25e6b57 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/CategoryInfoAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/CategoryInfoAdapter.java
@@ -31,7 +31,7 @@ public class CategoryInfoAdapter extends RecyclerView.Adapter<CategoryInfoAdapte
     @Override
     @NonNull
     public CategoryInfoAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.preference_dialog_library_categories_listitem, parent, false);
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.preference_dialog_category_item, parent, false);
         return new ViewHolder(view);
     }
 
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/DirectPlayCodecAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/DirectPlayCodecAdapter.java
index a6e0c6dd..f80ec14c 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/DirectPlayCodecAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/DirectPlayCodecAdapter.java
@@ -25,7 +25,7 @@ public class DirectPlayCodecAdapter extends RecyclerView.Adapter<DirectPlayCodec
     @Override
     @NonNull
     public DirectPlayCodecAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.preference_dialog_direct_play_codecs_listitem, parent, false);
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.preference_dialog_direct_play_codecs_item, parent, false);
         return new ViewHolder(view);
     }
 
diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java
index c6698db8..48a58932 100644
--- a/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java
@@ -27,7 +27,7 @@ public class CategoryPreferenceDialog extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        View view = getActivity().getLayoutInflater().inflate(R.layout.preference_dialog_library_categories, null);
+        View view = getActivity().getLayoutInflater().inflate(R.layout.preference_dialog_category, null);
 
         List<CategoryInfo> categoryInfos;
         if (savedInstanceState != null) {
diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
index abfc2fb1..7557ba7a 100644
--- a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
@@ -35,7 +35,7 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        @SuppressLint("InflateParams") View view = LayoutInflater.from(getContext()).inflate(R.layout.preference_dialog_now_playing_screen, null);
+        @SuppressLint("InflateParams") View view = LayoutInflater.from(getContext()).inflate(R.layout.preference_dialog_now_playing, null);
         ViewPager viewPager = view.findViewById(R.id.now_playing_screen_view_pager);
         viewPager.setAdapter(new NowPlayingScreenAdapter(getContext()));
         viewPager.addOnPageChangeListener(this);
@@ -94,7 +94,7 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements
             NowPlayingScreen nowPlayingScreen = NowPlayingScreen.values()[position];
 
             LayoutInflater inflater = LayoutInflater.from(context);
-            ViewGroup layout = (ViewGroup) inflater.inflate(R.layout.preference_now_playing_screen_item, collection, false);
+            ViewGroup layout = (ViewGroup) inflater.inflate(R.layout.preference_dialog_now_playing_item, collection, false);
             collection.addView(layout);
 
             ImageView image = layout.findViewById(R.id.image);
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java
index 170b84e6..b43e2833 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java
@@ -118,11 +118,11 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
         @Override
         public void onCreatePreferences(Bundle bundle, String s) {
             addPreferencesFromResource(R.xml.pref_library);
-            addPreferencesFromResource(R.xml.pref_colors);
+            addPreferencesFromResource(R.xml.pref_interface);
             addPreferencesFromResource(R.xml.pref_notification);
             addPreferencesFromResource(R.xml.pref_now_playing);
-            addPreferencesFromResource(R.xml.pref_lockscreen);
-            addPreferencesFromResource(R.xml.pref_audio);
+            addPreferencesFromResource(R.xml.pref_lock_screen);
+            addPreferencesFromResource(R.xml.pref_playback);
             addPreferencesFromResource(R.xml.pref_images);
         }
 
diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml
index 762d6f5e..f4b04a38 100644
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@@ -62,7 +62,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content">
 
-                <include layout="@layout/shadow_statusbar_toolbar" />
+                <include layout="@layout/shadow_status_bar_toolbar" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/preference_dialog_library_categories.xml b/app/src/main/res/layout/preference_dialog_category.xml
similarity index 100%
rename from app/src/main/res/layout/preference_dialog_library_categories.xml
rename to app/src/main/res/layout/preference_dialog_category.xml
diff --git a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml b/app/src/main/res/layout/preference_dialog_category_item.xml
similarity index 100%
rename from app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
rename to app/src/main/res/layout/preference_dialog_category_item.xml
diff --git a/app/src/main/res/layout/preference_dialog_direct_play_codecs_listitem.xml b/app/src/main/res/layout/preference_dialog_direct_play_codecs_item.xml
similarity index 100%
rename from app/src/main/res/layout/preference_dialog_direct_play_codecs_listitem.xml
rename to app/src/main/res/layout/preference_dialog_direct_play_codecs_item.xml
diff --git a/app/src/main/res/layout/preference_dialog_now_playing_screen.xml b/app/src/main/res/layout/preference_dialog_now_playing.xml
similarity index 100%
rename from app/src/main/res/layout/preference_dialog_now_playing_screen.xml
rename to app/src/main/res/layout/preference_dialog_now_playing.xml
diff --git a/app/src/main/res/layout/preference_now_playing_screen_item.xml b/app/src/main/res/layout/preference_dialog_now_playing_item.xml
similarity index 100%
rename from app/src/main/res/layout/preference_now_playing_screen_item.xml
rename to app/src/main/res/layout/preference_dialog_now_playing_item.xml
diff --git a/app/src/main/res/layout/shadow_statusbar_toolbar.xml b/app/src/main/res/layout/shadow_status_bar_toolbar.xml
similarity index 100%
rename from app/src/main/res/layout/shadow_statusbar_toolbar.xml
rename to app/src/main/res/layout/shadow_status_bar_toolbar.xml
diff --git a/app/src/main/res/xml/pref_colors.xml b/app/src/main/res/xml/pref_interface.xml
similarity index 100%
rename from app/src/main/res/xml/pref_colors.xml
rename to app/src/main/res/xml/pref_interface.xml
diff --git a/app/src/main/res/xml/pref_lockscreen.xml b/app/src/main/res/xml/pref_lock_screen.xml
similarity index 100%
rename from app/src/main/res/xml/pref_lockscreen.xml
rename to app/src/main/res/xml/pref_lock_screen.xml
diff --git a/app/src/main/res/xml/pref_audio.xml b/app/src/main/res/xml/pref_playback.xml
similarity index 100%
rename from app/src/main/res/xml/pref_audio.xml
rename to app/src/main/res/xml/pref_playback.xml
diff --git a/app/src/main/res/xml/app_widget_album_info.xml b/app/src/main/res/xml/widget_album.xml
similarity index 100%
rename from app/src/main/res/xml/app_widget_album_info.xml
rename to app/src/main/res/xml/widget_album.xml
diff --git a/app/src/main/res/xml/app_widget_card_info.xml b/app/src/main/res/xml/widget_card.xml
similarity index 100%
rename from app/src/main/res/xml/app_widget_card_info.xml
rename to app/src/main/res/xml/widget_card.xml
diff --git a/app/src/main/res/xml/app_widget_classic_info.xml b/app/src/main/res/xml/widget_classic.xml
similarity index 100%
rename from app/src/main/res/xml/app_widget_classic_info.xml
rename to app/src/main/res/xml/widget_classic.xml