diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33eb738..7ff828b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,6 +17,11 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.DeadHash"
         tools:ignore="GoogleAppIndexingWarning">
+        <activity
+            android:name=".gui.SettingsActivity"
+            android:exported="false"
+            android:label="@string/nav_settings"
+            android:theme="@style/Theme.DeadHash.NoActionBar" />
         <activity
             android:name=".gui.MainActivity"
             android:exported="true"
diff --git a/app/src/main/java/com/codedead/deadhash/domain/objects/settings/SettingsContainer.java b/app/src/main/java/com/codedead/deadhash/domain/objects/settings/SettingsContainer.java
index 8e638b1..959160a 100644
--- a/app/src/main/java/com/codedead/deadhash/domain/objects/settings/SettingsContainer.java
+++ b/app/src/main/java/com/codedead/deadhash/domain/objects/settings/SettingsContainer.java
@@ -3,6 +3,8 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import androidx.preference.PreferenceManager;
+
 import com.codedead.deadhash.R;
 
 public class SettingsContainer {
@@ -16,7 +18,7 @@ public class SettingsContainer {
     private boolean calculateSha512;
     private boolean calculateCrc32;
     private int reviewTimes;
-    private int theme;
+    private String theme;
 
     /**
      * Initialize a new SettingsContainer
@@ -34,15 +36,6 @@ public String getLanguageCode() {
         return languageCode;
     }
 
-    /**
-     * Set the language code
-     *
-     * @param languageCode The language code
-     */
-    public void setLanguageCode(final String languageCode) {
-        this.languageCode = languageCode;
-    }
-
     /**
      * Get whether MD5 hashes should be calculated
      *
@@ -52,15 +45,6 @@ public boolean isCalculateMd5() {
         return calculateMd5;
     }
 
-    /**
-     * Set whether MD5 hashes should be calculated
-     *
-     * @param calculateMd5 True if MD5 hashes should be calculated, otherwise false
-     */
-    public void setCalculateMd5(final boolean calculateMd5) {
-        this.calculateMd5 = calculateMd5;
-    }
-
     /**
      * Get whether SHA1 hashes should be calculated
      *
@@ -70,15 +54,6 @@ public boolean isCalculateSha1() {
         return calculateSha1;
     }
 
-    /**
-     * Set whether SHA1 hashes should be calculated
-     *
-     * @param calculateSha1 True if SHA1 hashes should be calculated, otherwise false
-     */
-    public void setCalculateSha1(final boolean calculateSha1) {
-        this.calculateSha1 = calculateSha1;
-    }
-
     /**
      * Get whether SHA224 hashes should be calculated
      *
@@ -88,15 +63,6 @@ public boolean isCalculateSha224() {
         return calculateSha224;
     }
 
-    /**
-     * Set whether SHA224 hashes should be calculated
-     *
-     * @param calculateSha224 True if SHA224 hashes should be calculated, otherwise false
-     */
-    public void setCalculateSha224(final boolean calculateSha224) {
-        this.calculateSha224 = calculateSha224;
-    }
-
     /**
      * Get whether SHA256 hashes should be calculated
      *
@@ -106,15 +72,6 @@ public boolean isCalculateSha256() {
         return calculateSha256;
     }
 
-    /**
-     * Set whether SHA256 hashes should be calculated
-     *
-     * @param calculateSha256 True if SHA256 hashes should be calculated, otherwise false
-     */
-    public void setCalculateSha256(final boolean calculateSha256) {
-        this.calculateSha256 = calculateSha256;
-    }
-
     /**
      * Get whether SHA384 hashes should be calculated
      *
@@ -124,15 +81,6 @@ public boolean isCalculateSha384() {
         return calculateSha384;
     }
 
-    /**
-     * Set whether SHA384 hashes should be calculated
-     *
-     * @param calculateSha384 True if SHA384 hashes should be calculated, otherwise false
-     */
-    public void setCalculateSha384(final boolean calculateSha384) {
-        this.calculateSha384 = calculateSha384;
-    }
-
     /**
      * Get whether SHA512 hashes should be calculated
      *
@@ -142,15 +90,6 @@ public boolean isCalculateSha512() {
         return calculateSha512;
     }
 
-    /**
-     * Set whether SHA512 hashes should be calculated
-     *
-     * @param calculateSha512 True if SHA512 hashes should be calculated, otherwise false
-     */
-    public void setCalculateSha512(final boolean calculateSha512) {
-        this.calculateSha512 = calculateSha512;
-    }
-
     /**
      * Get whether CRC32 values should be calculated
      *
@@ -160,15 +99,6 @@ public boolean isCalculateCrc32() {
         return calculateCrc32;
     }
 
-    /**
-     * Set whether CRC32 values should be calculated
-     *
-     * @param calculateCrc32 True if CRC32 values should be calculated, otherwise false
-     */
-    public void setCalculateCrc32(final boolean calculateCrc32) {
-        this.calculateCrc32 = calculateCrc32;
-    }
-
     /**
      * Get the amount of times a user has been asked to review the application
      *
@@ -195,28 +125,20 @@ public void setReviewTimes(final int reviewTimes) {
      *
      * @return The theme index
      */
-    public int getTheme() {
+    public String getTheme() {
         return theme;
     }
 
-    /**
-     * Set the theme index
-     *
-     * @param theme The theme index
-     */
-    public void setTheme(final int theme) {
-        this.theme = theme;
-    }
-
     /**
      * Load the settings
      *
      * @param context The Context that can be used to load the settings
      */
     public void loadSettings(final Context context) {
-        if (context == null) throw new NullPointerException("Context cannot be null!");
+        if (context == null)
+            throw new NullPointerException("Context cannot be null!");
 
-        final SharedPreferences sharedPreferences = context.getSharedPreferences(context.getString(R.string.preferences_file_key), Context.MODE_PRIVATE);
+        final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
 
         languageCode = sharedPreferences.getString("language", "en");
         calculateMd5 = sharedPreferences.getBoolean("md5", true);
@@ -227,7 +149,7 @@ public void loadSettings(final Context context) {
         calculateSha512 = sharedPreferences.getBoolean("sha512", true);
         calculateCrc32 = sharedPreferences.getBoolean("crc32", true);
         reviewTimes = sharedPreferences.getInt("reviewTimes", 0);
-        theme = sharedPreferences.getInt("theme", 0);
+        theme = sharedPreferences.getString("theme", "2");
     }
 
     /**
@@ -250,7 +172,7 @@ public void saveSettings(final Context context) {
         edit.putBoolean("sha512", isCalculateSha512());
         edit.putBoolean("crc32", isCalculateCrc32());
         edit.putInt("reviewTimes", getReviewTimes());
-        edit.putInt("theme", getTheme());
+        edit.putString("theme", getTheme());
 
         edit.apply();
     }
diff --git a/app/src/main/java/com/codedead/deadhash/domain/utils/IntentUtils.java b/app/src/main/java/com/codedead/deadhash/domain/utils/IntentUtils.java
index 85aa753..0d2e603 100644
--- a/app/src/main/java/com/codedead/deadhash/domain/utils/IntentUtils.java
+++ b/app/src/main/java/com/codedead/deadhash/domain/utils/IntentUtils.java
@@ -5,6 +5,8 @@
 import android.net.Uri;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AlertDialog;
+
 import com.codedead.deadhash.R;
 
 public final class IntentUtils {
@@ -56,4 +58,23 @@ public static void openPlayStore(final Context context) {
             Toast.makeText(context, context.getString(R.string.error_playstore), Toast.LENGTH_SHORT).show();
         }
     }
+
+    /**
+     * Display an alert to the user
+     *
+     * @param context The context that can be used to display the alert
+     * @param message The message that needs to be displayed to the user
+     */
+    public static void showAlert(final Context context, final String message) {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setMessage(message);
+        builder.setCancelable(true);
+
+        builder.setPositiveButton(
+                android.R.string.ok,
+                (dialog, id) -> dialog.cancel());
+
+        final AlertDialog alert = builder.create();
+        alert.show();
+    }
 }
diff --git a/app/src/main/java/com/codedead/deadhash/domain/utils/LocaleHelper.java b/app/src/main/java/com/codedead/deadhash/domain/utils/LocaleHelper.java
index b09fc51..64c844c 100644
--- a/app/src/main/java/com/codedead/deadhash/domain/utils/LocaleHelper.java
+++ b/app/src/main/java/com/codedead/deadhash/domain/utils/LocaleHelper.java
@@ -5,8 +5,6 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 
-import androidx.preference.PreferenceManager;
-
 import java.util.Locale;
 
 public final class LocaleHelper {
@@ -42,7 +40,6 @@ public static Context onAttach(final Context context, final String defaultLangua
      * @return The Context that contains the correct locale
      */
     public static Context setLocale(final Context context, final String language) {
-        persist(context, language);
         return updateResourcesLegacy(context, language);
     }
 
@@ -58,20 +55,6 @@ private static String getPersistedData(final Context context, final String defau
         return preferences.getString("language", defaultLanguage);
     }
 
-    /**
-     * Persist the language code
-     *
-     * @param context  The Context that can be used to persist the data
-     * @param language The language code that should be persisted
-     */
-    private static void persist(final Context context, final String language) {
-        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        SharedPreferences.Editor editor = preferences.edit();
-
-        editor.putString("language", language);
-        editor.apply();
-    }
-
     /**
      * Update the resources of a specific Context
      *
@@ -86,7 +69,7 @@ private static Context updateResourcesLegacy(final Context context, final String
         final Resources resources = context.getResources();
 
         final Configuration configuration = resources.getConfiguration();
-        configuration.locale = locale;
+        configuration.setLocale(locale);
 
         resources.updateConfiguration(configuration, resources.getDisplayMetrics());
 
diff --git a/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java b/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java
index 062e581..455a2bc 100644
--- a/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java
+++ b/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java
@@ -35,16 +35,14 @@
 
 import android.os.Looper;
 import android.text.method.LinkMovementMethod;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
-import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ProgressBar;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ViewFlipper;
@@ -94,25 +92,18 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     private boolean paused;
 
-    private Spinner spnLanguages;
-    private RadioButton rdbLightTheme;
-    private RadioButton rdbDarkTheme;
-    private RadioButton rdbDefaultTheme;
-    private CheckBox ChbMD5;
-    private CheckBox ChbSHA1;
-    private CheckBox ChbSHA224;
-    private CheckBox ChbSHA256;
-    private CheckBox ChbSHA384;
-    private CheckBox ChbSHA512;
-    private CheckBox ChbCRC32;
-
     private final String tmpFile = "tmpFile";
+    private String lastLanguage;
+
     private ActivityResultLauncher<Intent> activityResultLauncher;
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         settingsContainer.loadSettings(getApplicationContext());
         LocaleHelper.setLocale(this, settingsContainer.getLanguageCode());
+        lastLanguage = settingsContainer.getLanguageCode();
+
+        loadTheme();
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
@@ -146,23 +137,11 @@ protected void onCreate(final Bundle savedInstanceState) {
             navigationView.setCheckedItem(navigationView.getMenu().getItem(0).getSubMenu().getItem(0).getItemId());
             deleteTempFile();
         }
-        spnLanguages = findViewById(R.id.SpnLanguages);
-        rdbLightTheme = findViewById(R.id.RdbLightTheme);
-        rdbDarkTheme = findViewById(R.id.RdbDarkTheme);
-        rdbDefaultTheme = findViewById(R.id.RdbDefaultTheme);
-        ChbMD5 = findViewById(R.id.ChbMD5);
-        ChbSHA1 = findViewById(R.id.ChbSHA1);
-        ChbSHA224 = findViewById(R.id.ChbSHA224);
-        ChbSHA256 = findViewById(R.id.ChbSHA256);
-        ChbSHA384 = findViewById(R.id.ChbSHA384);
-        ChbSHA512 = findViewById(R.id.ChbSHA512);
-        ChbCRC32 = findViewById(R.id.ChbCRC32);
 
         loadFileHashContent(savedInstanceState);
         loadTextHashContent(savedInstanceState);
         loadHelpContent();
         loadAboutContent();
-        loadSettingsContent();
 
         loadAlertContent();
 
@@ -196,6 +175,39 @@ protected void onCreate(final Bundle savedInstanceState) {
                 });
     }
 
+    /**
+     * Load the current theme
+     */
+    private void loadTheme() {
+        switch (settingsContainer.getTheme()) {
+            case "0":
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                break;
+            case "1":
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+                break;
+            case "2":
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                break;
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(final Menu menu) {
+        final MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.top_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        final int itemId = item.getItemId();
+        if (itemId == R.id.nav_scan_settings) {
+            startActivity(new Intent(this, SettingsActivity.class));
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     /**
      * Delete the temporary file to save storage
      */
@@ -271,6 +283,17 @@ private void addReview(final boolean done) {
     @Override
     protected void onResume() {
         paused = false;
+
+        settingsContainer.loadSettings(getApplicationContext());
+
+        final String selectedLanguage = settingsContainer.getLanguageCode();
+        if (!lastLanguage.equals(selectedLanguage)) {
+            LocaleHelper.setLocale(getApplicationContext(), selectedLanguage);
+            recreate();
+        }
+
+        loadTheme();
+
         super.onResume();
     }
 
@@ -510,146 +533,6 @@ private void loadAboutContent() {
         txtAbout.setMovementMethod(LinkMovementMethod.getInstance());
     }
 
-    /**
-     * Load the settings into the view
-     */
-    private void loadSettings() {
-        switch (settingsContainer.getLanguageCode()) {
-            default:
-            case "en":
-                spnLanguages.setSelection(0);
-                break;
-            case "nl":
-                spnLanguages.setSelection(1);
-                break;
-            case "fr":
-                spnLanguages.setSelection(2);
-                break;
-            case "de":
-                spnLanguages.setSelection(3);
-                break;
-            case "it":
-                spnLanguages.setSelection(4);
-                break;
-            case "pt":
-                spnLanguages.setSelection(5);
-                break;
-            case "ru":
-                spnLanguages.setSelection(6);
-                break;
-        }
-
-        getDelegate().applyDayNight();
-
-        switch (settingsContainer.getTheme()) {
-            case 0:
-                rdbDefaultTheme.setChecked(true);
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
-                break;
-            case 1:
-                rdbLightTheme.setChecked(true);
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-                break;
-            case 2:
-                rdbDarkTheme.setChecked(true);
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-                break;
-        }
-
-        ChbMD5.setChecked(settingsContainer.isCalculateMd5());
-        ChbSHA1.setChecked(settingsContainer.isCalculateSha1());
-        ChbSHA224.setChecked(settingsContainer.isCalculateSha224());
-        ChbSHA256.setChecked(settingsContainer.isCalculateSha256());
-        ChbSHA384.setChecked(settingsContainer.isCalculateSha384());
-        ChbSHA512.setChecked(settingsContainer.isCalculateSha512());
-        ChbCRC32.setChecked(settingsContainer.isCalculateCrc32());
-    }
-
-    /**
-     * Load the content and logic for the settings view
-     */
-    private void loadSettingsContent() {
-        final Button btnReset = findViewById(R.id.BtnResetSettings);
-        final Button btnSave = findViewById(R.id.BtnSaveSettings);
-        loadSettings();
-
-        final RadioGroup group = findViewById(R.id.RgrThemes);
-
-        btnReset.setOnClickListener(v -> {
-            saveSettings("en", true, true, true, true, true, true, true, 0);
-            final Context c = LocaleHelper.setLocale(getApplicationContext(), settingsContainer.getLanguageCode());
-            Toast.makeText(MainActivity.this, c.getString(R.string.toast_settings_reset), Toast.LENGTH_SHORT).show();
-            recreate();
-            loadSettings();
-        });
-
-        btnSave.setOnClickListener(v -> {
-            String lang;
-            switch (spnLanguages.getSelectedItemPosition()) {
-                default:
-                    lang = "en";
-                    break;
-                case 1:
-                    lang = "nl";
-                    break;
-                case 2:
-                    lang = "fr";
-                    break;
-                case 3:
-                    lang = "de";
-                    break;
-                case 4:
-                    lang = "it";
-                    break;
-                case 5:
-                    lang = "pt";
-                    break;
-                case 6:
-                    lang = "ru";
-            }
-
-            final int checkedRadioButtonId = group.getCheckedRadioButtonId();
-            int themeIndex = 0;
-            if (checkedRadioButtonId == R.id.RdbLightTheme) {
-                themeIndex = 1;
-            } else if (checkedRadioButtonId == R.id.RdbDarkTheme) {
-                themeIndex = 2;
-            }
-
-            saveSettings(lang, ChbMD5.isChecked(), ChbSHA1.isChecked(), ChbSHA224.isChecked(), ChbSHA256.isChecked(), ChbSHA384.isChecked(), ChbSHA512.isChecked(), ChbCRC32.isChecked(), themeIndex);
-            final Context c = LocaleHelper.setLocale(getApplicationContext(), settingsContainer.getLanguageCode());
-            Toast.makeText(MainActivity.this, c.getString(R.string.toast_settings_save), Toast.LENGTH_SHORT).show();
-            recreate();
-            loadSettings();
-        });
-    }
-
-    /**
-     * Save the user preferences
-     *
-     * @param lang   The language code
-     * @param md5    Whether or not MD5 hashes should be calculated
-     * @param sha1   Whether or not SHA1 hashes should be calculated
-     * @param sha224 Whether or not SHA224 hashes should be calculated
-     * @param sha256 Whether or not SHA256 hashes should be calculated
-     * @param sha384 Whether or not SHA384 hashes should be calculated
-     * @param sha512 Whether or not SHA512 hashes should be calculated
-     * @param crc32  Whether or not CRC32 values should be calculated
-     */
-    private void saveSettings(final String lang, final boolean md5, final boolean sha1, final boolean sha224, final boolean sha256, final boolean sha384, final boolean sha512, final boolean crc32, final int theme) {
-        settingsContainer.setLanguageCode(lang);
-        settingsContainer.setCalculateMd5(md5);
-        settingsContainer.setCalculateSha1(sha1);
-        settingsContainer.setCalculateSha224(sha224);
-        settingsContainer.setCalculateSha256(sha256);
-        settingsContainer.setCalculateSha384(sha384);
-        settingsContainer.setCalculateSha512(sha512);
-        settingsContainer.setCalculateCrc32(crc32);
-        settingsContainer.setTheme(theme);
-
-        settingsContainer.saveSettings(getApplicationContext());
-    }
-
     @Override
     public void onSaveInstanceState(final Bundle savedInstanceState) {
         savedInstanceState.putInt("TAB_NUMBER", viewFlipper.getDisplayedChild());
@@ -703,8 +586,6 @@ public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
             page = 2;
         } else if (itemId == R.id.nav_about) {
             page = 3;
-        } else if (itemId == R.id.nav_manage) {
-            page = 4;
         }
 
         viewFlipper.setDisplayedChild(page);
diff --git a/app/src/main/java/com/codedead/deadhash/gui/SettingsActivity.java b/app/src/main/java/com/codedead/deadhash/gui/SettingsActivity.java
new file mode 100644
index 0000000..d75a41e
--- /dev/null
+++ b/app/src/main/java/com/codedead/deadhash/gui/SettingsActivity.java
@@ -0,0 +1,112 @@
+package com.codedead.deadhash.gui;
+
+import static android.content.pm.PackageManager.GET_META_DATA;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+
+import com.codedead.deadhash.R;
+import com.codedead.deadhash.domain.utils.IntentUtils;
+import com.codedead.deadhash.domain.utils.LocaleHelper;
+
+public class SettingsActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+
+        sharedPreferences.registerOnSharedPreferenceChangeListener(listener);
+        LocaleHelper.setLocale(this, sharedPreferences.getString("language", "en"));
+
+        resetTitle();
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.settings_activity);
+
+        final Toolbar toolbar = findViewById(R.id.toolbar_settings);
+        setSupportActionBar(toolbar);
+
+        if (savedInstanceState == null) {
+            getSupportFragmentManager()
+                    .beginTransaction()
+                    .replace(R.id.settings, new SettingsFragment())
+                    .commit();
+        }
+
+        final ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+    }
+
+    private final SharedPreferences.OnSharedPreferenceChangeListener listener = (prefs, key) -> {
+        if (key.equals("language")) {
+            LocaleHelper.setLocale(getApplicationContext(), prefs.getString("language", "en"));
+            recreate();
+        } else if (key.equals("theme")) {
+            final String theme = prefs.getString("theme", "0");
+            switch (theme) {
+                case "0":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                    break;
+                case "1":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+                    break;
+                case "2":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    break;
+            }
+        }
+    };
+
+    /**
+     * Reset the title of the activity
+     */
+    private void resetTitle() {
+        try {
+            final int label = getPackageManager().getActivityInfo(getComponentName(), GET_META_DATA).labelRes;
+            if (label != 0) {
+                setTitle(label);
+            }
+        } catch (final PackageManager.NameNotFoundException ex) {
+            IntentUtils.showAlert(this, ex.getMessage());
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onConfigurationChanged(@NonNull final Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        LocaleHelper.onAttach(getBaseContext());
+    }
+
+    @Override
+    protected void attachBaseContext(final Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
+    public static class SettingsFragment extends PreferenceFragmentCompat {
+        @Override
+        public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
+            setPreferencesFromResource(R.xml.root_preferences, rootKey);
+        }
+    }
+}
diff --git a/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.xml b/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.xml
new file mode 100644
index 0000000..6055510
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_manage.xml b/app/src/main/res/drawable/ic_menu_manage.xml
deleted file mode 100644
index 24a5623..0000000
--- a/app/src/main/res/drawable/ic_menu_manage.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml
index 5840463..12d9779 100644
--- a/app/src/main/res/drawable/side_nav_bar.xml
+++ b/app/src/main/res/drawable/side_nav_bar.xml
@@ -6,4 +6,4 @@
         android:endColor="@color/purple_500"
         android:startColor="@color/purple_500"
         android:type="linear" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 0a4a6ad..b66bc33 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -33,8 +33,6 @@
         <include layout="@layout/content_help" />
 
         <include layout="@layout/content_about" />
-
-        <include layout="@layout/content_settings" />
     </ViewFlipper>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/content_about.xml b/app/src/main/res/layout/content_about.xml
index ede468c..f175bd6 100644
--- a/app/src/main/res/layout/content_about.xml
+++ b/app/src/main/res/layout/content_about.xml
@@ -73,4 +73,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/layout/content_file.xml b/app/src/main/res/layout/content_file.xml
index 374552e..aa42b29 100644
--- a/app/src/main/res/layout/content_file.xml
+++ b/app/src/main/res/layout/content_file.xml
@@ -22,7 +22,6 @@
             <TableRow>
 
                 <TextView
-                    android:id="@+id/TxtFile_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/card_file"
@@ -45,6 +44,7 @@
                     android:inputType="none" />
 
                 <ImageButton
+                    android:layout_weight="1"
                     android:id="@+id/ImgBtnFileData"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -52,10 +52,9 @@
                     android:src="@drawable/ic_open_folder" />
             </TableRow>
 
-            <TableRow>
+            <TableRow android:paddingTop="5dp">
 
                 <TextView
-                    android:id="@+id/Text_FileCompare"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/text_compare"
@@ -104,4 +103,4 @@
 
     </androidx.recyclerview.widget.RecyclerView>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/content_help.xml b/app/src/main/res/layout/content_help.xml
index 6eb04bf..e592954 100644
--- a/app/src/main/res/layout/content_help.xml
+++ b/app/src/main/res/layout/content_help.xml
@@ -48,4 +48,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/layout/content_settings.xml b/app/src/main/res/layout/content_settings.xml
deleted file mode 100644
index c14bcdf..0000000
--- a/app/src/main/res/layout/content_settings.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        android:text="@string/text_interface"
-        android:textAlignment="center"
-        android:textSize="16sp"
-        android:textStyle="bold" />
-
-    <TableLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        android:gravity="center">
-
-        <TableRow android:gravity="center">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/text_language"
-                android:textSize="16sp" />
-
-            <Spinner
-                android:id="@+id/SpnLanguages"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:entries="@array/array_languages" />
-        </TableRow>
-
-        <TableRow android:gravity="center">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/theme"
-                android:textSize="16sp" />
-
-            <RadioGroup
-                android:id="@+id/RgrThemes"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <RadioButton
-                    android:id="@+id/RdbDarkTheme"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="16sp"
-                    android:text="@string/dark" />
-                <RadioButton
-                    android:id="@+id/RdbLightTheme"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="16sp"
-                    android:text="@string/light" />
-                <RadioButton
-                    android:id="@+id/RdbDefaultTheme"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="16sp"
-                    android:text="@string/defaultTheme" />
-            </RadioGroup>
-        </TableRow>
-
-    </TableLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        android:text="@string/text_hash_generator"
-        android:textAlignment="center"
-        android:textSize="16sp"
-        android:textStyle="bold">
-
-    </TextView>
-
-    <TableLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp">
-
-        <TableRow android:gravity="center">
-
-            <CheckBox
-                android:id="@+id/ChbMD5"
-                android:text="@string/md5"
-                android:textSize="16sp" />
-
-            <CheckBox
-                android:id="@+id/ChbSHA1"
-                android:text="@string/sha_1"
-                android:textSize="16sp" />
-        </TableRow>
-
-        <TableRow android:gravity="center">
-
-            <CheckBox
-                android:id="@+id/ChbSHA224"
-                android:text="@string/sha_224"
-                android:textSize="16sp" />
-
-            <CheckBox
-                android:id="@+id/ChbSHA256"
-                android:text="@string/sha_256"
-                android:textSize="16sp" />
-        </TableRow>
-
-        <TableRow android:gravity="center">
-
-            <CheckBox
-                android:id="@+id/ChbSHA384"
-                android:text="@string/sha_384"
-                android:textSize="16sp" />
-
-            <CheckBox
-                android:id="@+id/ChbSHA512"
-                android:text="@string/sha_512"
-                android:textSize="16sp" />
-        </TableRow>
-
-        <TableRow android:gravity="center">
-
-            <CheckBox
-                android:id="@+id/ChbCRC32"
-                android:text="@string/crc32"
-                android:textSize="16sp" />
-        </TableRow>
-
-    </TableLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-
-        <Button
-            android:id="@+id/BtnResetSettings"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/button_reset" />
-
-        <Button
-            android:id="@+id/BtnSaveSettings"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/button_save" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_text.xml b/app/src/main/res/layout/content_text.xml
index ff2c54d..e5c9283 100644
--- a/app/src/main/res/layout/content_text.xml
+++ b/app/src/main/res/layout/content_text.xml
@@ -14,33 +14,23 @@
         android:orientation="vertical"
         android:padding="10dp">
 
-        <TableLayout
-            android:id="@+id/layout_text"
+        <EditText
+            android:id="@+id/EdtText_Content"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TableRow>
-
-                <EditText
-                    android:id="@+id/EdtText_Content"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:hint="@string/text_content_hint"
-                    android:importantForAutofill="no"
-                    android:inputType="text" />
-            </TableRow>
-        </TableLayout>
+            android:layout_height="wrap_content"
+            android:hint="@string/text_content_hint"
+            android:importantForAutofill="no"
+            android:inputType="text" />
 
         <TableLayout
             android:id="@+id/layout_compare"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/layout_text">
+            android:layout_below="@+id/EdtText_Content"
+            android:paddingTop="5dp">
 
             <TableRow>
                 <TextView
-                    android:id="@+id/Text_FileCompare"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/text_compare"
@@ -89,4 +79,4 @@
 
     </androidx.recyclerview.widget.RecyclerView>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/filerecycler_item_row.xml b/app/src/main/res/layout/filerecycler_item_row.xml
index b117301..dc4548c 100644
--- a/app/src/main/res/layout/filerecycler_item_row.xml
+++ b/app/src/main/res/layout/filerecycler_item_row.xml
@@ -53,4 +53,4 @@
 
     </RelativeLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
new file mode 100644
index 0000000..3faf2f6
--- /dev/null
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -0,0 +1,25 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/Theme.DeadHash.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar_settings"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/Theme.DeadHash.PopupOverlay" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/settings"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 092e9e4..2f9eccd 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -5,11 +5,8 @@
         android:checkable="false"
         android:title="@string/nav_tools">
         <menu>
-            <group
-                android:id="@+id/icon_group_nav"
-                android:checkableBehavior="single">
+            <group android:checkableBehavior="single">
                 <item
-                    android:id="@+id/nav_file"
                     android:icon="@drawable/ic_menu_file"
                     android:title="@string/nav_file" />
                 <item
@@ -24,9 +21,7 @@
         android:checkable="false"
         android:title="@string/nav_info">
         <menu>
-            <group
-                android:id="@+id/icon_group_info"
-                android:checkableBehavior="single">
+            <group android:checkableBehavior="single">
                 <item
                     android:id="@+id/nav_help"
                     android:icon="@drawable/ic_menu_help"
@@ -35,10 +30,6 @@
                     android:id="@+id/nav_about"
                     android:icon="@drawable/ic_menu_about"
                     android:title="@string/nav_about" />
-                <item
-                    android:id="@+id/nav_manage"
-                    android:icon="@drawable/ic_menu_manage"
-                    android:title="@string/nav_settings" />
             </group>
         </menu>
     </item>
diff --git a/app/src/main/res/menu/top_menu.xml b/app/src/main/res/menu/top_menu.xml
new file mode 100644
index 0000000..a9d9561
--- /dev/null
+++ b/app/src/main/res/menu/top_menu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/nav_scan_settings"
+        android:icon="@drawable/ic_settings_black_24dp"
+        android:title="@string/nav_settings"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd..5ed0a2d 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd..5ed0a2d 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d93b893..5be80bf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="button_generate">Berechnen</string>
-    <string name="button_reset">Zurücksetzen</string>
-    <string name="button_save">Sparen</string>
     <string name="button_support">Unterstützung</string>
     <string name="button_website">Webseite</string>
     <string name="card_file">Datei:</string>
@@ -23,17 +21,13 @@
     <string name="text_compare_hash">Hash vergleichen</string>
     <string name="text_compare_hint">Lege deinen Hash hier</string>
     <string name="text_content_hint">Geben Sie hier Ihren Text ein</string>
-    <string name="text_hash_generator">Hash Generator</string>
     <string name="text_help">Das Erstellen von Aktenhacken kann nur durchgeführt werden, wenn DeadHash die Berechtigung zum Lesen deines Speichers erhalten hat. Das Erzeugen von Hashes für größere Dateien kann eine Weile dauern. Dies hängt ganz von der Rechenleistung Ihres Gerätes ab.\n\nBei der Erstellung von Text-Hashes sind keine zusätzlichen Berechtigungen erforderlich. Das Erzeugen von Hashes für größere Saiten kann eine Weile dauern. Dies hängt ganz von der Rechenleistung Ihres Gerätes ab.\n\nWenn du zufällig über einen Bug kommst oder wenn du Unterstützung brauchst, kannst du uns jederzeit kontaktieren!</string>
-    <string name="text_interface">Schnittstelle</string>
-    <string name="text_language">Sprache:</string>
+    <string name="text_language">Sprache</string>
     <string name="toast_back_again">Drücken Sie erneut \'ZURÜCK\', um zu beenden.</string>
     <string name="toast_data_copied">Daten in die Zwischenablage kopiert!</string>
     <string name="toast_error_notext">Bitte zuerst einen Text eingeben!</string>
     <string name="toast_hash_match">Hash passt zu Ihrer Eingabe!</string>
     <string name="toast_hash_mismatch">Hash stimmt nicht mit deinem Eingang überein!</string>
-    <string name="toast_settings_reset">Alle Einstellungen wurden zurückgesetzt!</string>
-    <string name="toast_settings_save">Alle Einstellungen wurden gespeichert!</string>
     <string name="text_send_mail">Senden Sie uns eine Email</string>
     <string name="alert_review_title">Rezension</string>
     <string name="alert_review_text">Betrachten Sie eine Rezension zu verlassen, wenn Sie diese App gefällt!</string>
@@ -46,8 +40,12 @@
     <string name="error_copy_file">Es kann keine Kopie der ausgewählten Datei erstellt werden!</string>
     <string name="error_open_file">Die ausgewählte Datei kann nicht geöffnet werden!</string>
     <string name="error_no_file">Es wurde keine Datei ausgewählt!</string>
-    <string name="theme">Thema:</string>
-    <string name="light">Licht</string>
-    <string name="dark">Dunkel</string>
-    <string name="defaultTheme">Standard</string>
-</resources>
\ No newline at end of file
+    <string name="theme">Thema</string>
+    <string name="ui_header">Benutzeroberfläche</string>
+    <string name="hashing">Hashing</string>
+    <string-array name="deadhash_theme_values">
+        <item>Licht</item>
+        <item>Dunkel</item>
+        <item>Systemfehler</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index fbc00cd..85aefb1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="button_generate">Calculer</string>
-    <string name="button_reset">Réinitialiser</string>
-    <string name="button_save">Sauvegarder</string>
     <string name="button_support">Soutien</string>
     <string name="button_website">Site internet</string>
     <string name="card_file">Fichier:</string>
@@ -16,16 +14,12 @@
     <string name="nav_settings">Paramètres</string>
     <string name="nav_text">Texte</string>
     <string name="nav_tools">Outils</string>
-    <string name="toast_settings_save">Tous les réglages ont été sauvegardés!</string>
-    <string name="toast_settings_reset">Tous les réglages ont été réinitialisés!</string>
     <string name="toast_hash_mismatch">Hash ne correspond pas à votre saisie!</string>
     <string name="toast_hash_match">Le hash correspond à votre saisie!</string>
     <string name="toast_error_notext">Entrez d\'abord un texte!</string>
     <string name="toast_data_copied">Les données sont copiées dans le presse-papiers.</string>
     <string name="toast_back_again">Appuyez de nouveau sur \'RETOURNER\' pour quitter.</string>
-    <string name="text_language">Langue:</string>
-    <string name="text_interface">Interface</string>
-    <string name="text_hash_generator">Générateur hash</string>
+    <string name="text_language">Langue</string>
     <string name="text_content_hint">Entrez votre texte ici</string>
     <string name="text_compare_hint">Placez votre hash ici</string>
     <string name="text_compare_hash">Comparer hash</string>
@@ -46,8 +40,12 @@
     <string name="error_copy_file">Impossible de créer une copie du fichier sélectionné!</string>
     <string name="error_open_file">Impossible d\'ouvrir le fichier sélectionné!</string>
     <string name="error_no_file">Aucun fichier n\'a été sélectionné!</string>
-    <string name="theme">Thème:</string>
-    <string name="light">Lumière</string>
-    <string name="dark">Foncé</string>
-    <string name="defaultTheme">Défaut</string>
-</resources>
\ No newline at end of file
+    <string name="theme">Thème</string>
+    <string name="ui_header">Interface utilisateur</string>
+    <string name="hashing">Hachage</string>
+    <string-array name="deadhash_theme_values">
+        <item>Léger</item>
+        <item>Foncé</item>
+        <item>Défaillance du système</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 03aaf58..8538690 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -27,13 +27,7 @@
     <string name="text_help">La generazione di hash di file può essere eseguita solo quando DeadHash è stato autorizzato a leggere la propria memoria. La generazione di hash per file più grandi può richiedere un po \'di tempo. Questo dipende interamente dalla potenza di elaborazione del dispositivo.\n\nLa generazione di hash di testo non richiede autorizzazioni aggiuntive. La generazione di hash per stringhe più grandi può richiedere un po \'di tempo. Ciò dipende interamente dalla potenza di elaborazione del dispositivo.\n\nSe si verifica un errore o se hai bisogno di supporto, puoi sempre contattarci!</string>
     <string name="nav_tools">Strumenti</string>
     <string name="text_about">DeadHash è stato creato da DeadLine. Questa applicazione può essere utilizzata per generare hash di file e stringhe.\n\nNon sono inclusi dispositivi di pubblicità o di rilevamento in questa versione. Tutte le autorizzazioni richieste sono necessarie per utilizzare correttamente questa applicazione.\n\nTutte le immagini sono a cura di Google.\n\nCopyright © 2022 CodeDead</string>
-    <string name="toast_settings_reset">Tutte le impostazioni sono state ripristinate!</string>
-    <string name="toast_settings_save">Tutte le impostazioni sono state salvate!</string>
-    <string name="text_interface">Interfaccia</string>
-    <string name="text_language">Lingua:</string>
-    <string name="text_hash_generator">Generatore di hash</string>
-    <string name="button_reset">Reset</string>
-    <string name="button_save">Salva</string>
+    <string name="text_language">Lingua</string>
     <string name="text_send_mail">Inviaci una e-mail</string>
     <string name="alert_review_title">Recensione</string>
     <string name="alert_review_text">Considera di lasciare una recensione se ti piace questa applicazione!</string>
@@ -46,8 +40,12 @@
     <string name="error_copy_file">Impossibile creare una copia del file selezionato!</string>
     <string name="error_open_file">Impossibile aprire il file selezionato!</string>
     <string name="error_no_file">Nessun file è stato selezionato!</string>
-    <string name="theme">Tema:</string>
-    <string name="light">Luce</string>
-    <string name="dark">Buio</string>
-    <string name="defaultTheme">Predefinito</string>
-</resources>
\ No newline at end of file
+    <string name="theme">Tema</string>
+    <string name="ui_header">Interfaccia utente</string>
+    <string name="hashing">Hashing</string>
+    <string-array name="deadhash_theme_values">
+        <item>Leggero</item>
+        <item>Buio</item>
+        <item>Default del sistema</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index b477e22..63e8769 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -13,4 +13,13 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
+
+    <style name="Theme.DeadHash.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Theme.DeadHash.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" />
+
+    <style name="Theme.DeadHash.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight" />
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 14ab843..658939d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="button_generate">Bereken</string>
-    <string name="button_reset">Reset</string>
-    <string name="button_save">Opslaan</string>
     <string name="button_support">Ondersteuning</string>
     <string name="button_website">Website</string>
     <string name="card_file">Bestand:</string>
@@ -23,17 +21,13 @@
     <string name="text_compare_hash">Vergelijk hash</string>
     <string name="text_compare_hint">Plaats uw hash hier</string>
     <string name="text_content_hint">Plaats uw tekst hier</string>
-    <string name="text_hash_generator">Hash generator</string>
     <string name="text_help">Bestand hashes kunnen alleen gegenereerd worden indien DeadHash toegang heeft tot uw bestanden. Het genereren van hashes voor grotere bestanden kan enige tijd in beslag nemen. Dit is volledig afhankelijk van de kracht van uw toestel.\n\nHet genereren van tekst hashes heeft geen nood aan additionele permissies. Het genereren van tekst hashes kan enige tijd in beslag nemen. Dit is volledig afhankelijk van de kracht van uw toestel.\n\nIndien u een fout tegenkomt of indien u hulp nodig heeft kunt u ons steeds contacteren!</string>
-    <string name="text_interface">Interface</string>
-    <string name="text_language">Taal:</string>
+    <string name="text_language">Taal</string>
     <string name="toast_back_again">Druk nogmaals op \'TERUG\' om de app te sluiten.</string>
     <string name="toast_data_copied">Data gekopieerd naar het klembord.</string>
     <string name="toast_error_notext">Gelieve eerst tekst op te geven!</string>
     <string name="toast_hash_match">Hash is gelijk aan uw input!</string>
     <string name="toast_hash_mismatch">Hash is niet gelijk aan uw input!</string>
-    <string name="toast_settings_reset">Alle instellingen zijn hersteld!</string>
-    <string name="toast_settings_save">Alle instellingen zijn opgeslagen!</string>
     <string name="text_send_mail">Stuur ons een e-mail</string>
     <string name="alert_review_title">Recensie</string>
     <string name="alert_review_text">Overweeg om een beoordeling te schrijven als je deze app leuk vindt!</string>
@@ -46,8 +40,12 @@
     <string name="error_copy_file">Kon geen kopie van het bestand maken!</string>
     <string name="error_open_file">Kon het geselecteerde bestand niet openen!</string>
     <string name="error_no_file">Geen bestand geselecteerd!</string>
-    <string name="theme">Thema:</string>
-    <string name="dark">Donker</string>
-    <string name="light">Licht</string>
-    <string name="defaultTheme">Standaard</string>
-</resources>
\ No newline at end of file
+    <string name="theme">Thema</string>
+    <string name="ui_header">Gebruikersinterface</string>
+    <string name="hashing">Hashing</string>
+    <string-array name="deadhash_theme_values">
+        <item>Licht</item>
+        <item>Donker</item>
+        <item>Systeemstandaard</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d43dacf..ccbbd94 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -27,13 +27,7 @@
     <string name="text_help">A geração de hashes para arquivos só pode ser feita se o DeadHash tiver permissão para ler o seu armazenamento. A geração de hashes para arquivos grandes poderá demorar um pouco. Isso dependerá exclusivamente do poder de processamento do seu dispositivo.\n\nA geração de hashes para textos não necessita que nenhuma permissão seja concedida. A geração de hashes para textos grandes poderá demorar um pouco. Isso dependerá exclusivamente do poder de processamento do seu dispositivo.\n\nSe chegar à encontrar algum bug ou precisar de suporte, você sempre poderá em contato conosco!</string>
     <string name="nav_tools">Ferramentas</string>
     <string name="text_about">DeadHash foi criado por DeadLine. Este aplicativo pode ser utilizado para gerar hashes de arquivos e textos.\n\nNenhum anúncio ou serviço de coleta de dados está incluído nesta versão. Todas as permissões requisitadas pelo aplicativo são necessárias para que ele funcione corretamente.\n\nTodas as imagens são cortesia do Google.\nTraduções fornecidas por <a href="https://github.com/SnwMds">SnwMds</a>\n\nCopyright © 2022 CodeDead</string>
-    <string name="toast_settings_reset">Todas as configurações foram restauradas!</string>
-    <string name="toast_settings_save">Todas as configurações foram salvas!</string>
-    <string name="text_interface">Interface</string>
-    <string name="text_language">Idioma:</string>
-    <string name="text_hash_generator">Gerador de Hash</string>
-    <string name="button_reset">Restaurar</string>
-    <string name="button_save">Salvar</string>
+    <string name="text_language">Idioma</string>
     <string name="text_send_mail">Envie-nos um e-mail</string>
     <string name="alert_review_title">Avalie-nos</string>
     <string name="alert_review_text">Considere deixar uma avaliação se você está gostando deste aplicativo!</string>
@@ -46,8 +40,12 @@
     <string name="error_copy_file">Não foi possível criar uma cópia do arquivo selecionado!</string>
     <string name="error_open_file">Não foi possível abrir o arquivo selecionado!</string>
     <string name="error_no_file">Nenhum arquivo foi selecionado!</string>
-    <string name="theme">Tema:</string>
-    <string name="light">Claro</string>
-    <string name="dark">Escuro</string>
-    <string name="defaultTheme">Predefinição</string>
+    <string name="theme">Tema</string>
+    <string name="ui_header">Interface de usuário</string>
+    <string name="hashing">Hashing</string>
+    <string-array name="deadhash_theme_values">
+        <item>Leve</item>
+        <item>Escuro</item>
+        <item>Sistema padrão</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 508a482..f8179ee 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="button_generate">Вычислить</string>
-    <string name="button_reset">Сброс</string>
-    <string name="button_save">Сохран.</string>
     <string name="button_support">Поддержка</string>
     <string name="button_website">Веб-сайт</string>
     <string name="card_file">Файл:</string>
@@ -16,16 +14,12 @@
     <string name="nav_settings">Параметры</string>
     <string name="nav_text">Текст</string>
     <string name="nav_tools">Инструменты</string>
-    <string name="toast_settings_save">Все настройки были сохранены!</string>
-    <string name="toast_settings_reset">Все настройки были сброшены!</string>
     <string name="toast_hash_mismatch">Хеш не совпадает с введённым вами хешем!</string>
     <string name="toast_hash_match">Хеш совпадает с введённым вами хешем!</string>
     <string name="toast_error_notext">Пожалуйста, сначала введите текст!</string>
     <string name="toast_data_copied">Данные скопированы в буфер обмена!</string>
     <string name="toast_back_again">Нажмите \'НАЗАД\' ещё раз, чтобы выйти из приложения.</string>
-    <string name="text_language">Язык:</string>
-    <string name="text_interface">Интерфейс</string>
-    <string name="text_hash_generator">Генератор хешей</string>
+    <string name="text_language">Язык</string>
     <string name="text_content_hint">Введите ваш текст сюда</string>
     <string name="text_compare_hint">Вставьте ваш хеш сюда</string>
     <string name="text_compare_hash">Сравнить хеши</string>
@@ -46,8 +40,12 @@
     <string name="error_copy_file">Не могу копировать выбранный файл!</string>
     <string name="error_open_file">Не могу открыть выбранный файл!</string>
     <string name="error_no_file">Не был выбран ни один файл!</string>
-    <string name="theme">Тема:</string>
-    <string name="dark">Тёмная</string>
-    <string name="light">Светлая</string>
-    <string name="defaultTheme">По умолчанию</string>
+    <string name="theme">Тема</string>
+    <string name="ui_header">Пользовательский интерфейс</string>
+    <string name="hashing">Хеширование</string>
+    <string-array name="deadhash_theme_values">
+        <item>Светлый</item>
+        <item>Темный</item>
+        <item>Системные установки по умолчанию</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..f1a05d0
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,27 @@
+<resources>
+    <string-array name="language_entries" translatable="false">
+        <item>English</item>
+        <item>Nederlands</item>
+        <item>Français</item>
+        <item>Deutsch</item>
+        <item>Italiano</item>
+        <item>Português (Brasil)</item>
+        <item>Русский</item>
+    </string-array>
+
+    <string-array name="language_values" translatable="false">
+        <item>en</item>
+        <item>nl</item>
+        <item>fr</item>
+        <item>de</item>
+        <item>it</item>
+        <item>pt</item>
+        <item>ru</item>
+    </string-array>
+
+    <string-array name="deadhash_theme_entries" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3605b87..cf71cb4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
     <color name="purple_500">#FF6200EE</color>
     <color name="purple_700">#FF3700B3</color>
     <color name="teal_200">#FF03DAC5</color>
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index beab31f..cdde88f 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="ic_launcher_background">#000000</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0677246..557916c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,13 +28,7 @@
     <string name="text_help">Generating file hashes can only be done when DeadHash has been given permission to read your storage. Generating hashes for larger files may take a while. This depends entirely on the processing power of your device.\n\nGenerating text hashes does not require any additional permissions to be granted. Generating hashes for larger strings may take a while. This depends entirely on the processing power of your device.\n\nIf you happen to come across a bug or if you need support, you can always contact us!</string>
     <string name="nav_tools">Tools</string>
     <string name="text_about">DeadHash was created by DeadLine. This app can be used to generate hashes of files and strings.\n\nNo ads or tracking devices are included in this release. All requested permissions are required in order to properly use this app.\n\nAll images are courtesy of Google.\n\nCopyright © 2022 CodeDead</string>
-    <string name="toast_settings_reset">All settings have been reset!</string>
-    <string name="toast_settings_save">All settings have been saved!</string>
-    <string name="text_interface">Interface</string>
-    <string name="text_language">Language:</string>
-    <string name="text_hash_generator">Hash generator</string>
-    <string name="button_reset">Reset</string>
-    <string name="button_save">Save</string>
+    <string name="text_language">Language</string>
     <string name="md5" translatable="false">MD5</string>
     <string name="sha_1" translatable="false">SHA-1</string>
     <string name="sha_224" translatable="false">SHA-224</string>
@@ -58,18 +52,12 @@
     <string name="error_open_file">Unable to open the selected file!</string>
     <string name="error_copy_file">Unable to create a copy of the selected file!</string>
     <string name="error_no_file">No file was selected!</string>
-    <string name="theme">Theme:</string>
-    <string name="dark">Dark</string>
-    <string name="light">Light</string>
-    <string name="defaultTheme">Default</string>
-
-    <string-array name="array_languages" translatable="false">
-        <item>English</item>
-        <item>Nederlands</item>
-        <item>Français</item>
-        <item>Deutsch</item>
-        <item>Italiano</item>
-        <item>Português (Brasil)</item>
-        <item>Русский</item>
+    <string name="theme">Theme</string>
+    <string name="ui_header">User interface</string>
+    <string name="hashing">Hashing</string>
+    <string-array name="deadhash_theme_values">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>System default</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml
index c0a1a63..1b0854f 100644
--- a/app/src/main/res/xml/backup_descriptor.xml
+++ b/app/src/main/res/xml/backup_descriptor.xml
@@ -1,7 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<full-backup-content>
-    <!-- Exclude the shared preferences file that contains the GCM registrationId -->
-    <exclude
-        domain="sharedpref"
-        path="deadhashsettings.xml" />
-</full-backup-content>
+<full-backup-content />
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
new file mode 100644
index 0000000..4b8567a
--- /dev/null
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -0,0 +1,61 @@
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory app:title="@string/ui_header">
+
+        <ListPreference
+            app:defaultValue="en"
+            app:entries="@array/language_entries"
+            app:entryValues="@array/language_values"
+            app:key="language"
+            app:title="@string/text_language"
+            app:useSimpleSummaryProvider="true" />
+
+        <ListPreference
+            app:defaultValue="2"
+            app:entries="@array/deadhash_theme_values"
+            app:entryValues="@array/deadhash_theme_entries"
+            app:key="theme"
+            app:title="@string/theme"
+            app:useSimpleSummaryProvider="true" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory app:title="@string/hashing">
+
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:key="md5"
+            app:title="@string/md5" />
+
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:key="sha1"
+            app:title="@string/sha_1" />
+
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:key="sha224"
+            app:title="@string/sha_224" />
+
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:key="sha256"
+            app:title="@string/sha_256" />
+
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:key="sha384"
+            app:title="@string/sha_384" />
+
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:key="sha512"
+            app:title="@string/sha_512" />
+
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:key="crc32"
+            app:title="@string/crc32" />
+
+    </PreferenceCategory>
+</PreferenceScreen>