diff --git a/app/src/main/java/com/cappielloantonio/play/App.java b/app/src/main/java/com/cappielloantonio/play/App.java
index 49fd07bd..82e0287c 100644
--- a/app/src/main/java/com/cappielloantonio/play/App.java
+++ b/app/src/main/java/com/cappielloantonio/play/App.java
@@ -23,7 +23,7 @@ public class App extends Application {
         CrashReporter.initialize(this);
 
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        String themePref = sharedPreferences.getString("theme", ThemeHelper.DEFAULT_MODE);
+        String themePref = sharedPreferences.getString(PreferenceUtil.THEME, ThemeHelper.DEFAULT_MODE);
         ThemeHelper.applyTheme(themePref);
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java
index f9a5056a..ac9957a6 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java
@@ -116,7 +116,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.global_preferences, rootKey);
-        ListPreference themePreference = findPreference("theme");
+        ListPreference themePreference = findPreference(PreferenceUtil.THEME);
         if (themePreference != null) {
             themePreference.setOnPreferenceChangeListener(
                     (preference, newValue) -> {