citra_android: Start material 3 migration (#6335)

2023-03-09 17:22:11 -05:00 · 2023-03-09 17:22:11 -05:00 · d2caf2d386
parent 1cca713e3b
commit d2caf2d386
83 changed files with 494 additions and 352 deletions
--- a/src/android/app/src/main/AndroidManifest.xml
+++ b/src/android/app/src/main/AndroidManifest.xml
@ -34,7 +34,7 @@

        <activity
            android:name="org.citra.citra_emu.ui.main.MainActivity"
-            android:theme="@style/CitraBase"
+            android:theme="@style/Theme.Citra.Main"
            android:resizeableActivity="false">

            <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
@ -48,13 +48,13 @@
        <activity
            android:name="org.citra.citra_emu.features.settings.ui.SettingsActivity"
            android:configChanges="orientation|screenSize|uiMode"
-            android:theme="@style/CitraSettingsBase"
+            android:theme="@style/Theme.Citra.Main"
            android:label="@string/preferences_settings"/>

        <activity
            android:name="org.citra.citra_emu.activities.EmulationActivity"
            android:resizeableActivity="false"
-            android:theme="@style/CitraEmulationBase"
+            android:theme="@style/Theme.Citra.Main"
            android:launchMode="singleTop"/>

        <service android:name="org.citra.citra_emu.utils.ForegroundService"/>
@ -72,7 +72,7 @@
        <activity
            android:name="org.citra.citra_emu.features.cheats.ui.CheatsActivity"
            android:exported="false"
-            android:theme="@style/CitraSettingsBase"
+            android:theme="@style/Theme.Citra.Main"
            android:label="@string/cheats"/>

        <service android:name="org.citra.citra_emu.utils.DirectoryInitialization"/>
--- a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java
@ -38,6 +38,8 @@ import java.util.Objects;
 import static android.Manifest.permission.CAMERA;
 import static android.Manifest.permission.RECORD_AUDIO;

+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 /**
 * Class which contains methods that interact
 * with the native side of the Citra code.
@ -245,7 +247,7 @@ public final class NativeLibrary {
            final String title = Objects.requireNonNull(Objects.requireNonNull(getArguments()).getString("title"));
            final String message = Objects.requireNonNull(Objects.requireNonNull(getArguments()).getString("message"));

-            return new AlertDialog.Builder(emulationActivity)
+            return new MaterialAlertDialogBuilder(emulationActivity)
                    .setTitle(title)
                    .setMessage(message)
                    .setPositiveButton(R.string.continue_button, (dialog, which) -> {
@ -345,7 +347,7 @@ public final class NativeLibrary {
        } else {
            // Create object used for waiting.
            final Object lock = new Object();
-            AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity)
+            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(emulationActivity)
                    .setTitle(caption)
                    .setMessage(text);

@ -427,7 +429,7 @@ public final class NativeLibrary {
        return alertPromptResult;
    }

-    public static AlertDialog.Builder displayAlertPromptImpl(String caption, String text, int buttonConfig) {
+    public static MaterialAlertDialogBuilder displayAlertPromptImpl(String caption, String text, int buttonConfig) {
        final EmulationActivity emulationActivity = sEmulationActivity.get();
        alertPromptResult = "";
        alertPromptButton = 0;
@ -444,7 +446,7 @@ public final class NativeLibrary {
        FrameLayout container = new FrameLayout(emulationActivity);
        container.addView(alertPromptEditText);

-        AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity)
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(emulationActivity)
                .setTitle(caption)
                .setView(container)
                .setPositiveButton(android.R.string.ok, (dialogInterface, i) ->
@ -506,7 +508,7 @@ public final class NativeLibrary {
            captionId = R.string.loader_error_encrypted;
        }

-        AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity)
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(emulationActivity)
                .setTitle(captionId)
                .setMessage(Html.fromHtml("Please follow the guides to redump your <a href=\"https://citra-emu.org/wiki/dumping-game-cartridges/\">game cartidges</a> or <a href=\"https://citra-emu.org/wiki/dumping-installed-titles/\">installed titles</a>.", Html.FROM_HTML_MODE_LEGACY))
                .setPositiveButton(android.R.string.ok, (dialog, whichButton) -> emulationActivity.finish())
--- a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java
@ -18,13 +18,11 @@ import android.view.MotionEvent;
 import android.view.SubMenu;
 import android.view.View;
 import android.widget.CheckBox;
-import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;

 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.core.app.NotificationManagerCompat;
@ -45,6 +43,7 @@ import org.citra.citra_emu.utils.EmulationMenuSettings;
 import org.citra.citra_emu.utils.FileBrowserHelper;
 import org.citra.citra_emu.utils.FileUtil;
 import org.citra.citra_emu.utils.ForegroundService;
+import org.citra.citra_emu.utils.ThemeUtil;

 import java.io.File;
 import java.io.IOException;
@ -56,6 +55,9 @@ import static android.Manifest.permission.CAMERA;
 import static android.Manifest.permission.RECORD_AUDIO;
 import static java.lang.annotation.RetentionPolicy.SOURCE;

+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.slider.Slider;
+
 public final class EmulationActivity extends AppCompatActivity {
    public static final String EXTRA_SELECTED_GAME = "SelectedGame";
    public static final String EXTRA_SELECTED_TITLE = "SelectedTitle";
@ -151,6 +153,8 @@ public final class EmulationActivity extends AppCompatActivity {

    @Override
    protected void onCreate(Bundle savedInstanceState) {
+        ThemeUtil.applyTheme(this);
+
        super.onCreate(savedInstanceState);

        if (savedInstanceState == null) {
@ -179,8 +183,6 @@ public final class EmulationActivity extends AppCompatActivity {
        // Set these options now so that the SurfaceView the game renders into is the right size.
        enableFullscreenImmersive();

-        setTheme(R.style.CitraEmulationBase);
-
        setContentView(R.layout.activity_emulation);

        // Find or create the EmulationFragment
@ -243,7 +245,7 @@ public final class EmulationActivity extends AppCompatActivity {
            case NativeLibrary.REQUEST_CODE_NATIVE_CAMERA:
                if (grantResults[0] != PackageManager.PERMISSION_GRANTED &&
                        shouldShowRequestPermissionRationale(CAMERA)) {
-                    new AlertDialog.Builder(this)
+                    new MaterialAlertDialogBuilder(this)
                            .setTitle(R.string.camera)
                            .setMessage(R.string.camera_permission_needed)
                            .setPositiveButton(android.R.string.ok, null)
@ -254,7 +256,7 @@ public final class EmulationActivity extends AppCompatActivity {
            case NativeLibrary.REQUEST_CODE_NATIVE_MIC:
                if (grantResults[0] != PackageManager.PERMISSION_GRANTED &&
                        shouldShowRequestPermissionRationale(RECORD_AUDIO)) {
-                    new AlertDialog.Builder(this)
+                    new MaterialAlertDialogBuilder(this)
                            .setTitle(R.string.microphone)
                            .setMessage(R.string.microphone_permission_needed)
                            .setPositiveButton(android.R.string.ok, null)
@ -324,7 +326,7 @@ public final class EmulationActivity extends AppCompatActivity {
        View view = inflater.inflate(R.layout.dialog_checkbox, null);
        CheckBox checkBox = view.findViewById(R.id.checkBox);

-        new AlertDialog.Builder(this)
+        new MaterialAlertDialogBuilder(this)
                .setTitle(R.string.savestate_warning_title)
                .setMessage(R.string.savestate_warning_message)
                .setView(view)
@ -464,8 +466,8 @@ public final class EmulationActivity extends AppCompatActivity {

            case MENU_ACTION_LOAD_AMIIBO:
                FileBrowserHelper.openFilePicker(this, REQUEST_SELECT_AMIIBO,
-                                                 R.string.select_amiibo,
-                                                 Collections.singletonList("bin"), false);
+                        R.string.select_amiibo,
+                        Collections.singletonList("bin"), false);
                break;

            case MENU_ACTION_REMOVE_AMIIBO:
@ -490,7 +492,7 @@ public final class EmulationActivity extends AppCompatActivity {

            case MENU_ACTION_CLOSE_GAME:
                NativeLibrary.PauseEmulation();
-                new AlertDialog.Builder(this)
+                new MaterialAlertDialogBuilder(this)
                        .setTitle(R.string.emulation_close_game)
                        .setMessage(R.string.emulation_close_game_message)
                        .setPositiveButton(android.R.string.yes, (dialogInterface, i) ->
@ -498,11 +500,8 @@ public final class EmulationActivity extends AppCompatActivity {
                            mEmulationFragment.stopEmulation();
                            finish();
                        })
-                        .setNegativeButton(android.R.string.cancel, (dialogInterface, i) ->
-                                NativeLibrary.UnPauseEmulation())
-                        .setOnCancelListener(dialogInterface ->
-                                NativeLibrary.UnPauseEmulation())
-                        .create()
+                        .setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> NativeLibrary.UnPauseEmulation())
+                        .setOnCancelListener(dialogInterface -> NativeLibrary.UnPauseEmulation())
                        .show();
                break;
        }
@ -589,11 +588,10 @@ public final class EmulationActivity extends AppCompatActivity {
        }

        if (!success) {
-            new AlertDialog.Builder(this)
+            new MaterialAlertDialogBuilder(this)
                    .setTitle(R.string.amiibo_load_error)
                    .setMessage(R.string.amiibo_load_error_message)
                    .setPositiveButton(android.R.string.ok, null)
-                    .create()
                    .show();
        }
    }
@ -605,8 +603,6 @@ public final class EmulationActivity extends AppCompatActivity {
    private void toggleControls() {
        final SharedPreferences.Editor editor = mPreferences.edit();
        boolean[] enabledButtons = new boolean[14];
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.emulation_toggle_controls);

        for (int i = 0; i < enabledButtons.length; i++) {
            // Buttons that are disabled by default
@ -621,63 +617,47 @@ public final class EmulationActivity extends AppCompatActivity {

            enabledButtons[i] = mPreferences.getBoolean("buttonToggle" + i, defaultValue);
        }
-        builder.setMultiChoiceItems(R.array.n3dsButtons, enabledButtons,
-                (dialog, indexSelected, isChecked) -> editor
-                        .putBoolean("buttonToggle" + indexSelected, isChecked));
-        builder.setPositiveButton(android.R.string.ok, (dialogInterface, i) ->
-        {
-            editor.apply();

-            mEmulationFragment.refreshInputOverlay();
-        });
-
-        AlertDialog alertDialog = builder.create();
-        alertDialog.show();
+        new MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.emulation_toggle_controls)
+                .setMultiChoiceItems(R.array.n3dsButtons, enabledButtons,
+                        (dialog, indexSelected, isChecked) -> editor
+                                .putBoolean("buttonToggle" + indexSelected, isChecked))
+                .setPositiveButton(android.R.string.ok, (dialogInterface, i) ->
+                {
+                    editor.apply();
+                    mEmulationFragment.refreshInputOverlay();
+                })
+                .show();
    }

    private void adjustScale() {
        LayoutInflater inflater = LayoutInflater.from(this);
-        View view = inflater.inflate(R.layout.dialog_seekbar, null);
+        View view = inflater.inflate(R.layout.dialog_slider, null);

-        final SeekBar seekbar = view.findViewById(R.id.seekbar);
-        final TextView value = view.findViewById(R.id.text_value);
+        final Slider slider = view.findViewById(R.id.slider);
+        final TextView textValue = view.findViewById(R.id.text_value);
        final TextView units = view.findViewById(R.id.text_units);

-        seekbar.setMax(150);
-        seekbar.setProgress(mPreferences.getInt("controlScale", 50));
-        seekbar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            public void onStartTrackingTouch(SeekBar seekBar) {
-            }
-
-            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                value.setText(String.valueOf(progress + 50));
-            }
-
-            public void onStopTrackingTouch(SeekBar seekBar) {
-                setControlScale(seekbar.getProgress());
-            }
+        slider.setValueTo(150);
+        slider.setValue(mPreferences.getInt("controlScale", 50));
+        slider.addOnChangeListener((slider1, progress, fromUser) -> {
+            textValue.setText(String.valueOf((int) progress + 50));
+            setControlScale((int) slider1.getValue());
        });

-        value.setText(String.valueOf(seekbar.getProgress() + 50));
+        textValue.setText(String.valueOf((int) slider.getValue() + 50));
        units.setText("%");

-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.emulation_control_scale);
-        builder.setView(view);
-        final int previousProgress = seekbar.getProgress();
-        builder.setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> {
-            setControlScale(previousProgress);
-        });
-        builder.setPositiveButton(android.R.string.ok, (dialogInterface, i) ->
-        {
-            setControlScale(seekbar.getProgress());
-        });
-        builder.setNeutralButton(R.string.slider_default, (dialogInterface, i) -> {
-            setControlScale(50);
-        });
+        final int previousProgress = (int) slider.getValue();

-        AlertDialog alertDialog = builder.create();
-        alertDialog.show();
+        new MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.emulation_control_scale)
+                .setView(view)
+                .setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> setControlScale(previousProgress))
+                .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> setControlScale((int) slider.getValue()))
+                .setNeutralButton(R.string.slider_default, (dialogInterface, i) -> setControlScale(50))
+                .show();
    }

    private void setControlScale(int scale) {
@ -688,12 +668,10 @@ public final class EmulationActivity extends AppCompatActivity {
    }

    private void resetOverlay() {
-        new AlertDialog.Builder(this)
+        new MaterialAlertDialogBuilder(this)
                .setTitle(getString(R.string.emulation_touch_overlay_reset))
                .setPositiveButton(android.R.string.yes, (dialogInterface, i) -> mEmulationFragment.resetInputOverlay())
-                .setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> {
-                })
-                .create()
+                .setNegativeButton(android.R.string.cancel, null)
                .show();
    }

--- a/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java
@ -2,8 +2,6 @@ package org.citra.citra_emu.adapters;

 import android.database.Cursor;
 import android.database.DataSetObserver;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.SystemClock;
 import android.view.LayoutInflater;
@ -12,14 +10,14 @@ import android.view.ViewGroup;

 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.RecyclerView;

+import com.google.android.material.color.MaterialColors;
+
 import org.citra.citra_emu.R;
 import org.citra.citra_emu.activities.EmulationActivity;
 import org.citra.citra_emu.model.GameDatabase;
-import org.citra.citra_emu.ui.DividerItemDecoration;
 import org.citra.citra_emu.utils.Log;
 import org.citra.citra_emu.utils.PicassoUtils;
 import org.citra.citra_emu.viewholders.GameViewHolder;
@ -99,9 +97,9 @@ public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> impl
                holder.regions = mCursor.getString(GameDatabase.GAME_COLUMN_REGIONS);
                holder.company = mCursor.getString(GameDatabase.GAME_COLUMN_COMPANY);

-                final int backgroundColorId = isValidGame(holder.path) ? R.color.card_view_background : R.color.card_view_disabled;
+                final int backgroundColorId = isValidGame(holder.path) ? R.attr.colorSurface : R.attr.colorErrorContainer;
                View itemView = holder.getItemView();
-                itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), backgroundColorId));
+                itemView.setBackgroundColor(MaterialColors.getColor(itemView, backgroundColorId));
            } else {
                Log.error("[GameAdapter] Can't bind view; Cursor is not valid.");
            }
@ -204,24 +202,6 @@ public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> impl
        EmulationActivity.launch((FragmentActivity) view.getContext(), holder.path, holder.title);
    }

-    public static class SpacesItemDecoration extends DividerItemDecoration {
-        private int space;
-
-        public SpacesItemDecoration(Drawable divider, int space) {
-            super(divider);
-            this.space = space;
-        }
-
-        @Override
-        public void getItemOffsets(Rect outRect, @NonNull View view, @NonNull RecyclerView parent,
-                                   @NonNull RecyclerView.State state) {
-            outRect.left = 0;
-            outRect.right = 0;
-            outRect.bottom = space;
-            outRect.top = 0;
-        }
-    }
-
    private boolean isValidGame(String path) {
        return Stream.of(
                ".rar", ".zip", ".7z", ".torrent", ".tar", ".gz").noneMatch(suffix -> path.toLowerCase().endsWith(suffix));
--- a/src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.java
@ -22,6 +22,8 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;

+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 public final class MiiSelector {
    public static class MiiSelectorConfig implements java.io.Serializable {
        public boolean enable_cancel_button;
@ -69,8 +71,8 @@ public final class MiiSelector {
                    ? (int) config.initially_selected_mii_index
                    : 0;
            data.index = initialIndex;
-            AlertDialog.Builder builder =
-                    new AlertDialog.Builder(emulationActivity)
+            MaterialAlertDialogBuilder builder =
+                    new MaterialAlertDialogBuilder(emulationActivity)
                            .setTitle(config.title.isEmpty()
                                    ? emulationActivity.getString(R.string.mii_selector)
                                    : config.title)
--- a/src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.java
@ -19,6 +19,8 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;

+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import org.citra.citra_emu.CitraApplication;
 import org.citra.citra_emu.NativeLibrary;
 import org.citra.citra_emu.R;
@ -124,7 +126,7 @@ public final class SoftwareKeyboard {
            FrameLayout container = new FrameLayout(emulationActivity);
            container.addView(editText);

-            AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity)
+            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(emulationActivity)
                    .setTitle(R.string.software_keyboard)
                    .setView(container);
            setCancelable(false);
@ -227,7 +229,7 @@ public final class SoftwareKeyboard {
                break;
        }

-        new AlertDialog.Builder(emulationActivity)
+        new MaterialAlertDialogBuilder(emulationActivity)
                .setTitle(R.string.software_keyboard)
                .setMessage(message)
                .setPositiveButton(android.R.string.ok, null)
--- a/src/android/app/src/main/java/org/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress.java
@ -8,7 +8,6 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ProgressBar;
@ -18,6 +17,8 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;

+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import org.citra.citra_emu.NativeLibrary;
 import org.citra.citra_emu.R;
 import org.citra.citra_emu.activities.EmulationActivity;
@ -70,22 +71,15 @@ public class DiskShaderCacheProgress {
            setCancelable(false);
            setRetainInstance(true);

-            AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity);
-            builder.setTitle(title);
-            builder.setMessage(message);
-            builder.setView(view);
-            builder.setNegativeButton(android.R.string.cancel, null);
-
-            dialog = builder.create();
-            dialog.create();
-
-            dialog.getButton(DialogInterface.BUTTON_NEGATIVE).setOnClickListener((v) -> emulationActivity.onBackPressed());
-
            synchronized (finishLock) {
                finishLock.notifyAll();
            }

-            return dialog;
+            return new MaterialAlertDialogBuilder(emulationActivity)
+                    .setTitle(title)
+                    .setMessage(message)
+                    .setNegativeButton(android.R.string.cancel, (dialog, which) -> emulationActivity.onBackPressed())
+                    .create();
        }

        private void onUpdateProgress(String msg, int progress, int max) {
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatDetailsFragment.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatDetailsFragment.java
@ -15,6 +15,8 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;

+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import org.citra.citra_emu.R;
 import org.citra.citra_emu.features.cheats.model.Cheat;
 import org.citra.citra_emu.features.cheats.model.CheatsViewModel;
@ -80,12 +82,12 @@ public class CheatDetailsFragment extends Fragment {
    private void onDeleteClicked(View view) {
        String name = mEditName.getText().toString();

-        AlertDialog.Builder builder = new AlertDialog.Builder(requireContext());
-        builder.setMessage(getString(R.string.cheats_delete_confirmation, name));
-        builder.setPositiveButton(android.R.string.yes,
-                (dialog, i) -> mViewModel.deleteSelectedCheat());
-        builder.setNegativeButton(android.R.string.no, null);
-        builder.show();
+        new MaterialAlertDialogBuilder(requireContext())
+                .setMessage(getString(R.string.cheats_delete_confirmation, name))
+                .setPositiveButton(android.R.string.yes,
+                        (dialog, i) -> mViewModel.deleteSelectedCheat())
+                .setNegativeButton(android.R.string.no, null)
+                .show();
    }

    private void onEditClicked(View view) {
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsActivity.java
@ -14,10 +14,13 @@ import androidx.core.view.ViewCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.slidingpanelayout.widget.SlidingPaneLayout;

+import com.google.android.material.appbar.MaterialToolbar;
+
 import org.citra.citra_emu.R;
 import org.citra.citra_emu.features.cheats.model.Cheat;
 import org.citra.citra_emu.features.cheats.model.CheatsViewModel;
 import org.citra.citra_emu.ui.TwoPaneOnBackPressedCallback;
+import org.citra.citra_emu.utils.ThemeUtil;

 public class CheatsActivity extends AppCompatActivity
        implements SlidingPaneLayout.PanelSlideListener {
@ -37,6 +40,8 @@ public class CheatsActivity extends AppCompatActivity

    @Override
    protected void onCreate(Bundle savedInstanceState) {
+        ThemeUtil.applyTheme(this);
+
        super.onCreate(savedInstanceState);

        mViewModel = new ViewModelProvider(this).get(CheatsViewModel.class);
@ -63,6 +68,8 @@ public class CheatsActivity extends AppCompatActivity
        mViewModel.getOpenDetailsViewEvent().observe(this, this::openDetailsView);

        // Show "Up" button in the action bar for navigation
+        MaterialToolbar toolbar = findViewById(R.id.toolbar_cheats);
+        setSupportActionBar(toolbar);
        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
    }

--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java
@ -15,11 +15,14 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

+import com.google.android.material.appbar.MaterialToolbar;
+
 import org.citra.citra_emu.NativeLibrary;
 import org.citra.citra_emu.R;
 import org.citra.citra_emu.utils.DirectoryInitialization;
 import org.citra.citra_emu.utils.DirectoryStateReceiver;
 import org.citra.citra_emu.utils.EmulationMenuSettings;
+import org.citra.citra_emu.utils.ThemeUtil;

 public final class SettingsActivity extends AppCompatActivity implements SettingsActivityView {
    private static final String ARG_MENU_TAG = "menu_tag";
@ -38,6 +41,8 @@ public final class SettingsActivity extends AppCompatActivity implements Setting

    @Override
    protected void onCreate(Bundle savedInstanceState) {
+        ThemeUtil.applyTheme(this);
+
        super.onCreate(savedInstanceState);

        setContentView(R.layout.activity_settings);
@ -49,6 +54,8 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
        mPresenter.onCreate(savedInstanceState, menuTag, gameID);

        // Show "Back" button in the action bar for navigation
+        MaterialToolbar toolbar = findViewById(R.id.toolbar_settings);
+        setSupportActionBar(toolbar);
        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
    }

--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java
@ -4,6 +4,8 @@ import android.content.IntentFilter;
 import android.os.Bundle;
 import android.text.TextUtils;

+import androidx.appcompat.app.AppCompatActivity;
+
 import org.citra.citra_emu.NativeLibrary;
 import org.citra.citra_emu.features.settings.model.Settings;
 import org.citra.citra_emu.features.settings.utils.SettingsFile;
@ -109,8 +111,6 @@ public final class SettingsActivityPresenter {
            mSettings.saveSettings(mView);
        }

-        ThemeUtil.applyTheme();
-
        NativeLibrary.ReloadSettings();
    }

--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.java
@ -6,13 +6,16 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.DatePicker;
-import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.TimePicker;

+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.RecyclerView;

+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.slider.Slider;
+
 import org.citra.citra_emu.R;
 import org.citra.citra_emu.dialogs.MotionAlertDialog;
 import org.citra.citra_emu.features.settings.model.FloatSetting;
@ -41,15 +44,14 @@ import org.citra.citra_emu.utils.Log;

 import java.util.ArrayList;

-public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolder>
-        implements DialogInterface.OnClickListener, SeekBar.OnSeekBarChangeListener {
+public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolder> implements DialogInterface.OnClickListener, Slider.OnChangeListener {
    private SettingsFragmentView mView;
    private Context mContext;
    private ArrayList<SettingsItem> mSettings;

    private SettingsItem mClickedItem;
    private int mClickedPosition;
-    private int mSeekbarProgress;
+    private int mSliderProgress;

    private AlertDialog mDialog;
    private TextView mTextSliderValue;
@ -149,11 +151,9 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde

        int value = getSelectionForSingleChoiceValue(item);

-        AlertDialog.Builder builder = new AlertDialog.Builder(mView.getActivity());
-
-        builder.setTitle(item.getNameId());
-        builder.setSingleChoiceItems(item.getChoicesId(), value, this);
-
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(mView.getActivity())
+                .setTitle(item.getNameId())
+                .setSingleChoiceItems(item.getChoicesId(), value, this);
        mDialog = builder.show();
    }

@ -162,11 +162,9 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde

        int value = getSelectionForSingleChoiceValue(item);

-        AlertDialog.Builder builder = new AlertDialog.Builder(mView.getActivity());
-
-        builder.setTitle(item.getNameId());
-        builder.setSingleChoiceItems(item.getChoicesId(), value, this);
-
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(mView.getActivity())
+                .setTitle(item.getNameId())
+                .setSingleChoiceItems(item.getChoicesId(), value, this);
        mDialog = builder.show();
    }

@ -199,11 +197,9 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
    public void onStringSingleChoiceClick(StringSingleChoiceSetting item) {
        mClickedItem = item;

-        AlertDialog.Builder builder = new AlertDialog.Builder(mView.getActivity());
-
-        builder.setTitle(item.getNameId());
-        builder.setSingleChoiceItems(item.getChoicesId(), item.getSelectValueIndex(), this);
-
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(mView.getActivity())
+                .setTitle(item.getNameId())
+                .setSingleChoiceItems(item.getChoicesId(), item.getSelectValueIndex(), this);
        mDialog = builder.show();
    }

@ -226,8 +222,6 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
        mClickedItem = item;
        mClickedPosition = position;

-        AlertDialog.Builder builder = new AlertDialog.Builder(mView.getActivity());
-
        LayoutInflater inflater = LayoutInflater.from(mView.getActivity());
        View view = inflater.inflate(R.layout.sysclock_datetime_picker, null);

@ -265,44 +259,45 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
            closeDialog();
        };

-        builder.setView(view);
-        builder.setPositiveButton(android.R.string.ok, ok);
-        builder.setNegativeButton(android.R.string.cancel, defaultCancelListener);
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(mView.getActivity())
+                .setView(view)
+                .setPositiveButton(android.R.string.ok, ok)
+                .setNegativeButton(android.R.string.cancel, defaultCancelListener);
        mDialog = builder.show();
    }

    public void onSliderClick(SliderSetting item, int position) {
        mClickedItem = item;
        mClickedPosition = position;
-        mSeekbarProgress = item.getSelectedValue();
-        AlertDialog.Builder builder = new AlertDialog.Builder(mView.getActivity());
+        mSliderProgress = item.getSelectedValue();

        LayoutInflater inflater = LayoutInflater.from(mView.getActivity());
-        View view = inflater.inflate(R.layout.dialog_seekbar, null);
+        View view = inflater.inflate(R.layout.dialog_slider, null);

-        SeekBar seekbar = view.findViewById(R.id.seekbar);
+        Slider slider = view.findViewById(R.id.slider);

-        builder.setTitle(item.getNameId());
-        builder.setView(view);
-        builder.setPositiveButton(android.R.string.ok, this);
-        builder.setNegativeButton(android.R.string.cancel, defaultCancelListener);
-        builder.setNeutralButton(R.string.slider_default, (DialogInterface dialog, int which) -> {
-            seekbar.setProgress(item.getDefaultValue());
-            onClick(dialog, which);
-        });
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(mView.getActivity())
+                .setTitle(item.getNameId())
+                .setView(view)
+                .setPositiveButton(android.R.string.ok, this)
+                .setNegativeButton(android.R.string.cancel, defaultCancelListener)
+                .setNeutralButton(R.string.slider_default, (DialogInterface dialog, int which) -> {
+                    slider.setValue(item.getDefaultValue());
+                    onClick(dialog, which);
+                });
        mDialog = builder.show();

        mTextSliderValue = view.findViewById(R.id.text_value);
-        mTextSliderValue.setText(String.valueOf(mSeekbarProgress));
+        mTextSliderValue.setText(String.valueOf(mSliderProgress));

        TextView units = view.findViewById(R.id.text_units);
        units.setText(item.getUnits());

-        seekbar.setMin(item.getMin());
-        seekbar.setMax(item.getMax());
-        seekbar.setProgress(mSeekbarProgress);
+        slider.setValueFrom(item.getMin());
+        slider.setValueTo(item.getMax());
+        slider.setValue(mSliderProgress);

-        seekbar.setOnSeekBarChangeListener(this);
+        slider.addOnChangeListener(this);
    }

    public void onSubmenuClick(SubmenuSetting item) {
@ -375,19 +370,19 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
            closeDialog();
        } else if (mClickedItem instanceof SliderSetting) {
            SliderSetting sliderSetting = (SliderSetting) mClickedItem;
-            if (sliderSetting.getSelectedValue() != mSeekbarProgress) {
+            if (sliderSetting.getSelectedValue() != mSliderProgress) {
                mView.onSettingChanged();
            }

            if (sliderSetting.getSetting() instanceof FloatSetting) {
-                float value = (float) mSeekbarProgress;
+                float value = (float) mSliderProgress;

                FloatSetting setting = sliderSetting.setSelectedValue(value);
                if (setting != null) {
                    mView.putSetting(setting);
                }
            } else {
-                IntSetting setting = sliderSetting.setSelectedValue(mSeekbarProgress);
+                IntSetting setting = sliderSetting.setSelectedValue(mSliderProgress);
                if (setting != null) {
                    mView.putSetting(setting);
                }
@ -397,7 +392,7 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
        }

        mClickedItem = null;
-        mSeekbarProgress = -1;
+        mSliderProgress = -1;
    }

    public void closeDialog() {
@ -411,20 +406,6 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
        }
    }

-    @Override
-    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-        mSeekbarProgress = progress;
-        mTextSliderValue.setText(String.valueOf(mSeekbarProgress));
-    }
-
-    @Override
-    public void onStartTrackingTouch(SeekBar seekBar) {
-    }
-
-    @Override
-    public void onStopTrackingTouch(SeekBar seekBar) {
-    }
-
    private int getValueForSingleChoiceSelection(SingleChoiceSetting item, int which) {
        int valuesId = item.getValuesId();

@ -484,4 +465,10 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde

        return -1;
    }
+
+    @Override
+    public void onValueChange(@NonNull Slider slider, float value, boolean fromUser) {
+        mSliderProgress = (int) value;
+        mTextSliderValue.setText(String.valueOf(mSliderProgress));
+    }
 }
--- a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java
@ -48,7 +48,7 @@ public final class MainActivity extends AppCompatActivity implements MainView {

    @Override
    protected void onCreate(Bundle savedInstanceState) {
-        ThemeUtil.applyTheme();
+        ThemeUtil.applyTheme(this);

        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_main);
--- a/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java
@ -10,9 +10,13 @@ import android.widget.TextView;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

+import com.google.android.material.color.MaterialColors;
+import com.google.android.material.divider.MaterialDividerItemDecoration;
+
 import org.citra.citra_emu.CitraApplication;
 import org.citra.citra_emu.R;
 import org.citra.citra_emu.adapters.GameAdapter;
@ -49,7 +53,9 @@ public final class PlatformGamesFragment extends Fragment implements PlatformGam

        mRecyclerView.setLayoutManager(layoutManager);
        mRecyclerView.setAdapter(mAdapter);
-        mRecyclerView.addItemDecoration(new GameAdapter.SpacesItemDecoration(ContextCompat.getDrawable(getActivity(), R.drawable.gamelist_divider), 1));
+        MaterialDividerItemDecoration divider = new MaterialDividerItemDecoration(requireContext(), LinearLayoutManager.VERTICAL);
+        divider.setLastItemDecorated(false);
+        mRecyclerView.addItemDecoration(divider);

        // Add swipe down to refresh gesture
        final SwipeRefreshLayout pullToRefresh = view.findViewById(R.id.refresh_grid_games);
@ -59,6 +65,9 @@ public final class PlatformGamesFragment extends Fragment implements PlatformGam
            refresh();
            pullToRefresh.setRefreshing(false);
        });
+
+        pullToRefresh.setProgressBackgroundColorSchemeColor(MaterialColors.getColor(pullToRefresh, R.attr.colorPrimary));
+        pullToRefresh.setColorSchemeColors(MaterialColors.getColor(pullToRefresh, R.attr.colorOnPrimary));
    }

    @Override
--- a/src/android/app/src/main/java/org/citra/citra_emu/utils/StartupHandler.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/StartupHandler.java
@ -7,6 +7,8 @@ import android.text.TextUtils;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;

+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import org.citra.citra_emu.R;
 import org.citra.citra_emu.activities.EmulationActivity;

@ -33,7 +35,7 @@ public final class StartupHandler {
    public static void HandleInit(FragmentActivity parent) {
        if (PermissionsHandler.isFirstBoot(parent)) {
            // Prompt user with standard first boot disclaimer
-            new AlertDialog.Builder(parent)
+            new MaterialAlertDialogBuilder(parent)
                    .setTitle(R.string.app_name)
                    .setIcon(R.mipmap.ic_launcher)
                    .setMessage(parent.getResources().getString(R.string.app_disclaimer))
--- a/src/android/app/src/main/java/org/citra/citra_emu/utils/ThemeUtil.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/ThemeUtil.java
@ -1,10 +1,14 @@
 package org.citra.citra_emu.utils;

 import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.os.Build;
 import android.preference.PreferenceManager;

+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsControllerCompat;

 import org.citra.citra_emu.CitraApplication;
 import org.citra.citra_emu.features.settings.utils.SettingsFile;
@ -12,7 +16,7 @@ import org.citra.citra_emu.features.settings.utils.SettingsFile;
 public class ThemeUtil {
    private static SharedPreferences mPreferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext());

-    private static void applyTheme(int designValue) {
+    private static void applyTheme(int designValue, AppCompatActivity activity) {
        switch (designValue) {
            case 0:
                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
@ -26,9 +30,13 @@ public class ThemeUtil {
                        AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY);
                break;
        }
+
+        int systemReportedThemeMode = activity.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        WindowInsetsControllerCompat windowController = WindowCompat.getInsetsController(activity.getWindow(), activity.getWindow().getDecorView());
+        windowController.setAppearanceLightStatusBars(systemReportedThemeMode == Configuration.UI_MODE_NIGHT_NO);
    }

-    public static void applyTheme() {
-        applyTheme(mPreferences.getInt(SettingsFile.KEY_DESIGN, 0));
+    public static void applyTheme(AppCompatActivity activity) {
+        applyTheme(mPreferences.getInt(SettingsFile.KEY_DESIGN, 0), activity);
    }
 }
--- a/src/android/app/src/main/res/drawable-hdpi/ic_cia_install.png
+++ b/src/android/app/src/main/res/drawable-hdpi/ic_cia_install.png
--- a/src/android/app/src/main/res/drawable-hdpi/ic_folder.png
+++ b/src/android/app/src/main/res/drawable-hdpi/ic_folder.png
--- a/src/android/app/src/main/res/drawable-hdpi/ic_premium.png
+++ b/src/android/app/src/main/res/drawable-hdpi/ic_premium.png
--- a/src/android/app/src/main/res/drawable-hdpi/ic_settings_core.png
+++ b/src/android/app/src/main/res/drawable-hdpi/ic_settings_core.png
--- a/src/android/app/src/main/res/drawable-mdpi/ic_cia_install.png
+++ b/src/android/app/src/main/res/drawable-mdpi/ic_cia_install.png
--- a/src/android/app/src/main/res/drawable-mdpi/ic_folder.png
+++ b/src/android/app/src/main/res/drawable-mdpi/ic_folder.png
--- a/src/android/app/src/main/res/drawable-mdpi/ic_premium.png
+++ b/src/android/app/src/main/res/drawable-mdpi/ic_premium.png
--- a/src/android/app/src/main/res/drawable-night-hdpi/ic_cia_install.png
+++ b/src/android/app/src/main/res/drawable-night-hdpi/ic_cia_install.png
--- a/src/android/app/src/main/res/drawable-night-hdpi/ic_folder.png
+++ b/src/android/app/src/main/res/drawable-night-hdpi/ic_folder.png
--- a/src/android/app/src/main/res/drawable-night-hdpi/ic_premium.png
+++ b/src/android/app/src/main/res/drawable-night-hdpi/ic_premium.png
--- a/src/android/app/src/main/res/drawable-night-hdpi/ic_settings_core.png
+++ b/src/android/app/src/main/res/drawable-night-hdpi/ic_settings_core.png
--- a/src/android/app/src/main/res/drawable-night-mdpi/ic_cia_install.png
+++ b/src/android/app/src/main/res/drawable-night-mdpi/ic_cia_install.png
--- a/src/android/app/src/main/res/drawable-night-mdpi/ic_folder.png
+++ b/src/android/app/src/main/res/drawable-night-mdpi/ic_folder.png
--- a/src/android/app/src/main/res/drawable-night-mdpi/ic_premium.png
+++ b/src/android/app/src/main/res/drawable-night-mdpi/ic_premium.png
--- a/src/android/app/src/main/res/drawable-night-xhdpi/ic_cia_install.png
+++ b/src/android/app/src/main/res/drawable-night-xhdpi/ic_cia_install.png
--- a/src/android/app/src/main/res/drawable-night-xhdpi/ic_folder.png
+++ b/src/android/app/src/main/res/drawable-night-xhdpi/ic_folder.png
--- a/src/android/app/src/main/res/drawable-night-xhdpi/ic_premium.png
+++ b/src/android/app/src/main/res/drawable-night-xhdpi/ic_premium.png
--- a/src/android/app/src/main/res/drawable-night-xhdpi/ic_settings_core.png
+++ b/src/android/app/src/main/res/drawable-night-xhdpi/ic_settings_core.png
--- a/src/android/app/src/main/res/drawable-night-xxhdpi/ic_cia_install.png
+++ b/src/android/app/src/main/res/drawable-night-xxhdpi/ic_cia_install.png
--- a/src/android/app/src/main/res/drawable-night-xxhdpi/ic_folder.png
+++ b/src/android/app/src/main/res/drawable-night-xxhdpi/ic_folder.png
--- a/src/android/app/src/main/res/drawable-night-xxhdpi/ic_premium.png
+++ b/src/android/app/src/main/res/drawable-night-xxhdpi/ic_premium.png
--- a/src/android/app/src/main/res/drawable-night-xxhdpi/ic_settings_core.png
+++ b/src/android/app/src/main/res/drawable-night-xxhdpi/ic_settings_core.png
--- a/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_cia_install.png
+++ b/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_cia_install.png
--- a/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_folder.png
+++ b/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_folder.png
--- a/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_premium.png
+++ b/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_premium.png
--- a/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_settings_core.png
+++ b/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_settings_core.png
--- a/src/android/app/src/main/res/drawable-xhdpi/ic_cia_install.png
+++ b/src/android/app/src/main/res/drawable-xhdpi/ic_cia_install.png
--- a/src/android/app/src/main/res/drawable-xhdpi/ic_folder.png
+++ b/src/android/app/src/main/res/drawable-xhdpi/ic_folder.png
--- a/src/android/app/src/main/res/drawable-xhdpi/ic_premium.png
+++ b/src/android/app/src/main/res/drawable-xhdpi/ic_premium.png
--- a/src/android/app/src/main/res/drawable-xhdpi/ic_settings_core.png
+++ b/src/android/app/src/main/res/drawable-xhdpi/ic_settings_core.png
--- a/src/android/app/src/main/res/drawable-xxhdpi/ic_cia_install.png
+++ b/src/android/app/src/main/res/drawable-xxhdpi/ic_cia_install.png
--- a/src/android/app/src/main/res/drawable-xxhdpi/ic_folder.png
+++ b/src/android/app/src/main/res/drawable-xxhdpi/ic_folder.png
--- a/src/android/app/src/main/res/drawable-xxhdpi/ic_premium.png
+++ b/src/android/app/src/main/res/drawable-xxhdpi/ic_premium.png
--- a/src/android/app/src/main/res/drawable-xxhdpi/ic_settings_core.png
+++ b/src/android/app/src/main/res/drawable-xxhdpi/ic_settings_core.png
--- a/src/android/app/src/main/res/drawable-xxxhdpi/ic_cia_install.png
+++ b/src/android/app/src/main/res/drawable-xxxhdpi/ic_cia_install.png
--- a/src/android/app/src/main/res/drawable-xxxhdpi/ic_folder.png
+++ b/src/android/app/src/main/res/drawable-xxxhdpi/ic_folder.png
--- a/src/android/app/src/main/res/drawable-xxxhdpi/ic_premium.png
+++ b/src/android/app/src/main/res/drawable-xxxhdpi/ic_premium.png
--- a/src/android/app/src/main/res/drawable-xxxhdpi/ic_settings_core.png
+++ b/src/android/app/src/main/res/drawable-xxxhdpi/ic_settings_core.png
--- a/src/android/app/src/main/res/drawable/gamelist_divider.xml
+++ b/src/android/app/src/main/res/drawable/gamelist_divider.xml
@ -6,6 +6,6 @@
        android:width="1dp"
        android:height="1dp" />

-    <solid android:color="@color/gamelist_divider" />
+    <solid android:color="@color/citra_outlineVariant" />

 </shape>
--- a/src/android/app/src/main/res/drawable/ic_add.xml
+++ b/src/android/app/src/main/res/drawable/ic_add.xml
@ -4,6 +4,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="@android:color/white"
+      android:fillColor="?attr/colorControlNormal"
      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
--- a/src/android/app/src/main/res/drawable/ic_back.xml
+++ b/src/android/app/src/main/res/drawable/ic_back.xml
@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>
--- a/src/android/app/src/main/res/drawable/ic_folder.xml
+++ b/src/android/app/src/main/res/drawable/ic_folder.xml
@ -0,0 +1,9 @@
+<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="?attr/colorControlNormal"
+        android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
+</vector>
--- a/src/android/app/src/main/res/drawable/ic_heart.xml
+++ b/src/android/app/src/main/res/drawable/ic_heart.xml
@ -0,0 +1,9 @@
+<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="?attr/colorControlNormal"
+        android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z" />
+</vector>
--- a/src/android/app/src/main/res/drawable/ic_install.xml
+++ b/src/android/app/src/main/res/drawable/ic_install.xml
@ -0,0 +1,9 @@
+<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="?attr/colorControlNormal"
+        android:pathData="M19,12v7L5,19v-7L3,12v7c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2zM13,12.67l2.59,-2.58L17,11.5l-5,5 -5,-5 1.41,-1.41L11,12.67L11,3h2z" />
+</vector>
--- a/src/android/app/src/main/res/drawable/ic_settings.xml
+++ b/src/android/app/src/main/res/drawable/ic_settings.xml
@ -0,0 +1,9 @@
+<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="?attr/colorControlNormal"
+        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
+</vector>
--- a/src/android/app/src/main/res/drawable/popup_background.xml
+++ b/src/android/app/src/main/res/drawable/popup_background.xml
@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/colorSurface"/>
+    <corners android:radius="4dp" />
+</shape>
--- a/src/android/app/src/main/res/layout-ldrtl/list_item_cheat.xml
+++ b/src/android/app/src/main/res/layout-ldrtl/list_item_cheat.xml
@ -13,7 +13,6 @@
        android:id="@+id/text_name"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
-        android:textColor="@color/header_text"
        android:textSize="16sp"
        android:layout_margin="@dimen/spacing_large"
        style="@style/TextAppearance.AppCompat.Headline"
--- a/src/android/app/src/main/res/layout/activity_cheats.xml
+++ b/src/android/app/src/main/res/layout/activity_cheats.xml
@ -1,22 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.slidingpanelayout.widget.SlidingPaneLayout
+<androidx.constraintlayout.widget.ConstraintLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/sliding_pane_layout"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

-    <androidx.fragment.app.FragmentContainerView
-        android:layout_width="320dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:id="@+id/cheat_list"
-        android:name="org.citra.citra_emu.features.cheats.ui.CheatListFragment" />
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinator_cheats"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">

-    <androidx.fragment.app.FragmentContainerView
-        android:layout_width="320dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:id="@+id/cheat_details"
-        android:name="org.citra.citra_emu.features.cheats.ui.CheatDetailsFragment" />
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appbar_cheats"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:elevation="0dp"
+            app:liftOnScroll="false">

-</androidx.slidingpanelayout.widget.SlidingPaneLayout>
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar_cheats"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/colorSurface" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <androidx.slidingpanelayout.widget.SlidingPaneLayout
+        android:id="@+id/sliding_pane_layout"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/coordinator_cheats">
+
+        <androidx.fragment.app.FragmentContainerView
+            android:layout_width="320dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:id="@+id/cheat_list"
+            android:name="org.citra.citra_emu.features.cheats.ui.CheatListFragment" />
+
+        <androidx.fragment.app.FragmentContainerView
+            android:layout_width="320dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:id="@+id/cheat_details"
+            android:name="org.citra.citra_emu.features.cheats.ui.CheatDetailsFragment" />
+
+    </androidx.slidingpanelayout.widget.SlidingPaneLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/src/android/app/src/main/res/layout/activity_main.xml
+++ b/src/android/app/src/main/res/layout/activity_main.xml
@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/coordinator_main"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar_main"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorSurface"
+            app:subtitleTextColor="?attr/colorOnSurface"
+            app:titleTextColor="?attr/colorOnSurface" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
    <FrameLayout
        android:id="@+id/games_platform_frame"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        app:layout_behavior="@string/appbar_scrolling_view_behavior" />

-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar_main"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?colorPrimary"/>
-
-    </com.google.android.material.appbar.AppBarLayout>
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/src/android/app/src/main/res/layout/activity_settings.xml
+++ b/src/android/app/src/main/res/layout/activity_settings.xml
@ -1,5 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator_settings"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/frame_content" />
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_settings"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar_settings"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorSurface" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/frame_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/src/android/app/src/main/res/layout/card_game.xml
+++ b/src/android/app/src/main/res/layout/card_game.xml
@ -36,15 +36,13 @@
            android:layout_marginStart="8dp"
            android:baselineAligned="false"
            android:ellipsize="end"
-            android:gravity="center_vertical"
            android:lines="1"
            android:maxLines="1"
            android:textAlignment="viewStart"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toEndOf="@+id/image_game_screen"
            app:layout_constraintTop_toTopOf="parent"
-            tools:text="The Legend of Zelda\nOcarina of Time 3D"
-            android:textColor="@color/header_text" />
+            tools:text="The Legend of Zelda\nOcarina of Time 3D" />

        <TextView
            android:id="@+id/text_company"
@ -58,8 +56,7 @@
            app:layout_constraintStart_toStartOf="@+id/text_game_title"
            app:layout_constraintTop_toBottomOf="@+id/text_game_title"
            app:layout_constraintVertical_bias="0.842"
-            tools:text="Nintendo"
-            android:textColor="@color/header_subtext" />
+            tools:text="Nintendo" />

        <TextView
            android:id="@+id/text_filename"
@ -73,10 +70,8 @@
            app:layout_constraintStart_toStartOf="@+id/text_game_title"
            app:layout_constraintTop_toBottomOf="@+id/text_game_title"
            app:layout_constraintVertical_bias="0.0"
-            tools:text="Pilotwings_Resort.cxi"
-            android:textColor="@color/header_subtext" />
+            tools:text="Pilotwings_Resort.cxi" />

    </androidx.constraintlayout.widget.ConstraintLayout>

 </androidx.cardview.widget.CardView>
-
--- a/src/android/app/src/main/res/layout/dialog_seekbar.xml
+++ b/src/android/app/src/main/res/layout/dialog_seekbar.xml
@ -5,8 +5,8 @@
    android:layout_width="match_parent"
    android:layout_height="wrap_content">

-    <SeekBar
-        android:id="@+id/seekbar"
+    <com.google.android.material.slider.Slider
+        android:id="@+id/slider"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginLeft="@dimen/spacing_large"
@ -34,4 +34,4 @@
        android:layout_alignTop="@+id/text_value"
        android:layout_toEndOf="@+id/text_value" />

-</RelativeLayout>
+</RelativeLayout>
--- a/src/android/app/src/main/res/layout/fragment_emulation.xml
+++ b/src/android/app/src/main/res/layout/fragment_emulation.xml
@ -40,7 +40,6 @@
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:padding="@dimen/spacing_small"
-        android:background="@color/citra_orange"
        android:text="@string/emulation_done"
        android:visibility="gone" />

--- a/src/android/app/src/main/res/layout/fragment_grid.xml
+++ b/src/android/app/src/main/res/layout/fragment_grid.xml
@ -17,17 +17,19 @@
                android:id="@+id/gamelist_empty_text"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
+                android:gravity="center"
                android:text="@string/empty_gamelist"
-                android:visibility="gone"
                android:textSize="18sp"
-                android:gravity="center" />
+                android:visibility="gone" />

            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/grid_games"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                tools:listitem="@layout/card_game" />
+
        </RelativeLayout>

    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-</FrameLayout>
+
+</FrameLayout>
--- a/src/android/app/src/main/res/layout/fragment_settings.xml
+++ b/src/android/app/src/main/res/layout/fragment_settings.xml
@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.citra.citra_emu.features.settings.ui.SettingsFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.citra.citra_emu.features.settings.ui.SettingsFrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface">

    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/list_settings"
        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/card_view_background" />
+        android:layout_height="match_parent" />

-</org.citra.citra_emu.features.settings.ui.SettingsFrameLayout>
+</org.citra.citra_emu.features.settings.ui.SettingsFrameLayout>
--- a/src/android/app/src/main/res/layout/list_item_cheat.xml
+++ b/src/android/app/src/main/res/layout/list_item_cheat.xml
@ -13,7 +13,6 @@
        android:id="@+id/text_name"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
-        android:textColor="@color/header_text"
        android:textSize="16sp"
        android:layout_margin="@dimen/spacing_large"
        style="@style/TextAppearance.AppCompat.Headline"
--- a/src/android/app/src/main/res/layout/list_item_setting.xml
+++ b/src/android/app/src/main/res/layout/list_item_setting.xml
@ -21,7 +21,6 @@
        android:layout_alignParentEnd="true"
        android:layout_marginStart="@dimen/spacing_large"
        android:layout_marginEnd="@dimen/spacing_large"
-        android:textColor="@color/header_text"
        android:textSize="16sp"
        tools:text="Setting Name" />

@ -37,7 +36,6 @@
        android:layout_marginTop="@dimen/spacing_small"
        android:layout_marginEnd="@dimen/spacing_large"
        android:visibility="visible"
-        tools:text="@string/app_disclaimer"
-        android:textColor="@color/header_subtext" />
+        tools:text="@string/app_disclaimer" />

 </RelativeLayout>
--- a/src/android/app/src/main/res/layout/list_item_setting_checkbox.xml
+++ b/src/android/app/src/main/res/layout/list_item_setting_checkbox.xml
@ -19,7 +19,6 @@
        android:layout_marginStart="@dimen/spacing_large"
        android:layout_marginTop="@dimen/spacing_large"
        android:layout_toStartOf="@+id/checkbox"
-        android:textColor="@color/header_text"
        android:textSize="16sp"
        tools:text="@string/frame_limit_enable" />

@ -36,7 +35,6 @@
        android:layout_marginTop="@dimen/spacing_small"
        android:layout_toStartOf="@+id/checkbox"
        android:textAlignment="textStart"
-        android:textColor="@color/header_subtext"
        tools:text="@string/frame_limit_enable_description" />

    <CheckBox
--- a/src/android/app/src/main/res/layout/list_item_settings_header.xml
+++ b/src/android/app/src/main/res/layout/list_item_settings_header.xml
@ -12,8 +12,8 @@
        android:layout_marginStart="@dimen/spacing_large"
        android:layout_marginBottom="@dimen/spacing_small"
        android:layout_marginTop="@dimen/spacing_small"
-        android:textColor="?android:colorAccent"
+        android:textColor="?attr/colorPrimary"
        android:textStyle="bold"
        tools:text="CPU Settings" />

-</FrameLayout>
+</FrameLayout>
--- a/src/android/app/src/main/res/layout/premium_item_setting.xml
+++ b/src/android/app/src/main/res/layout/premium_item_setting.xml
@ -21,7 +21,7 @@
        android:layout_alignParentEnd="true"
        android:layout_marginStart="@dimen/spacing_large"
        android:layout_marginEnd="@dimen/spacing_large"
-        android:textColor="?android:colorAccent"
+        android:textColor="?attr/colorPrimary"
        android:textStyle="bold"
        tools:text="Setting Name" />

@ -37,7 +37,6 @@
        android:layout_marginTop="@dimen/spacing_small"
        android:layout_marginEnd="@dimen/spacing_large"
        android:visibility="visible"
-        tools:text="@string/app_disclaimer"
-        android:textColor="@color/header_subtext" />
+        tools:text="@string/app_disclaimer" />

 </RelativeLayout>
--- a/src/android/app/src/main/res/menu/menu_game_grid.xml
+++ b/src/android/app/src/main/res/menu/menu_game_grid.xml
@ -4,7 +4,7 @@

    <item
        android:id="@+id/button_premium"
-        android:icon="@drawable/ic_premium"
+        android:icon="@drawable/ic_heart"
        android:title="@string/premium_text"
        app:showAsAction="ifRoom" />
    <item
@ -20,14 +20,14 @@
                app:showAsAction="ifRoom" />
            <item
                android:id="@+id/button_install_cia"
-                android:icon="@drawable/ic_cia_install"
+                android:icon="@drawable/ic_install"
                android:title="@string/install_cia_title"
                app:showAsAction="ifRoom" />
        </menu>
    </item>
    <item
        android:id="@+id/menu_settings_core"
-        android:icon="@drawable/ic_settings_core"
+        android:icon="@drawable/ic_settings"
        android:title="@string/grid_menu_core_settings"
        app:showAsAction="ifRoom" />

--- a/src/android/app/src/main/res/values-night/citra_colors.xml
+++ b/src/android/app/src/main/res/values-night/citra_colors.xml
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="citra_primary">#F8BE00</color>
+    <color name="citra_onPrimary">#3F2E00</color>
+    <color name="citra_primaryContainer">#451C00</color>
+    <color name="citra_onPrimaryContainer">#FFDF9A</color>
+    <color name="citra_secondary">#D7C4A0</color>
+    <color name="citra_onSecondary">#3A2F15</color>
+    <color name="citra_secondaryContainer">#52452A</color>
+    <color name="citra_onSecondaryContainer">#F4E0BB</color>
+    <color name="citra_tertiary">#FFB2BC</color>
+    <color name="citra_onTertiary">#5F1126</color>
+    <color name="citra_tertiaryContainer">#7D293B</color>
+    <color name="citra_onTertiaryContainer">#FFD9DD</color>
+    <color name="citra_error">#FFB4AB</color>
+    <color name="citra_errorContainer">#93000A</color>
+    <color name="citra_onError">#690005</color>
+    <color name="citra_onErrorContainer">#FFDAD6</color>
+    <color name="citra_background">#1E1B16</color>
+    <color name="citra_onBackground">#E9E1D9</color>
+    <color name="citra_surface">#1E1B16</color>
+    <color name="citra_onSurface">#E9E1D9</color>
+    <color name="citra_surfaceVariant">#4D4639</color>
+    <color name="citra_onSurfaceVariant">#D0C5B4</color>
+    <color name="citra_outline">#999080</color>
+    <color name="citra_inverseOnSurface">#1E1B16</color>
+    <color name="citra_inverseSurface">#E9E1D9</color>
+    <color name="citra_inversePrimary">#785A00</color>
+    <color name="citra_surfaceTint">#F8BE00</color>
+    <color name="citra_outlineVariant">#4D4639</color>
+
+</resources>
--- a/src/android/app/src/main/res/values-night/colors.xml
+++ b/src/android/app/src/main/res/values-night/colors.xml
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="citra_orange">#272727</color>
-    <color name="citra_orange_dark">#121212</color>
-    <color name="citra_accent">#FEC303</color>
-
-    <color name="card_view_background">#121212</color>
-    <color name="card_view_disabled">#3D3D3D</color>
-
-    <color name="gamelist_divider">#404040</color>
-
-    <color name="header_text">#E0E0E0</color>
-    <color name="header_subtext">#A0A0A0</color>
-
-    <color name="citra_logo_text_color">@color/citra_accent</color>
-</resources>
--- a/src/android/app/src/main/res/values/citra_colors.xml
+++ b/src/android/app/src/main/res/values/citra_colors.xml
@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="citra_primary">#FFAB03</color>
+    <color name="citra_onPrimary">#FFFFFF</color>
+    <color name="citra_primaryContainer">#FFDF9A</color>
+    <color name="citra_onPrimaryContainer">#251A00</color>
+    <color name="citra_secondary">#6B5D3F</color>
+    <color name="citra_onSecondary">#FFFFFF</color>
+    <color name="citra_secondaryContainer">#F4E0BB</color>
+    <color name="citra_onSecondaryContainer">#241A04</color>
+    <color name="citra_tertiary">#9B4052</color>
+    <color name="citra_onTertiary">#FFFFFF</color>
+    <color name="citra_tertiaryContainer">#FFD9DD</color>
+    <color name="citra_onTertiaryContainer">#400013</color>
+    <color name="citra_error">#BA1A1A</color>
+    <color name="citra_errorContainer">#FFDAD6</color>
+    <color name="citra_onError">#FFFFFF</color>
+    <color name="citra_onErrorContainer">#410002</color>
+    <color name="citra_background">#FFFBFF</color>
+    <color name="citra_onBackground">#1E1B16</color>
+    <color name="citra_surface">#FFFBFF</color>
+    <color name="citra_onSurface">#1E1B16</color>
+    <color name="citra_surfaceVariant">#EDE1CF</color>
+    <color name="citra_onSurfaceVariant">#4D4639</color>
+    <color name="citra_outline">#7F7667</color>
+    <color name="citra_inverseOnSurface">#F7F0E7</color>
+    <color name="citra_inverseSurface">#33302A</color>
+    <color name="citra_inversePrimary">#F8BE00</color>
+    <color name="citra_shadow">#000000</color>
+    <color name="citra_surfaceTint">#783E00</color>
+    <color name="citra_outlineVariant">#D0C5B4</color>
+    <color name="citra_scrim">#000000</color>
+
+</resources>
--- a/src/android/app/src/main/res/values/colors.xml
+++ b/src/android/app/src/main/res/values/colors.xml
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="citra_orange">#FFC303</color>
-    <color name="citra_orange_dark">#FF8D03</color>
-    <color name="citra_accent">#CC7102</color>
-
-    <color name="card_view_background">#ffffff</color>
-    <color name="card_view_disabled">#D5D5D5</color>
-
-    <color name="gamelist_divider">#ffffff</color>
-
-    <color name="header_text">#1C1424</color>
-    <color name="header_subtext">#5C5661</color>
-
-    <color name="citra_logo_text_color">@color/header_text</color>
-</resources>
--- a/src/android/app/src/main/res/values/styles.xml
+++ b/src/android/app/src/main/res/values/styles.xml
@ -1,65 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>

-    <!-- Inherit from the material theme -->
-    <style name="CitraBase" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <!-- Main theme colors -->
-        <!-- Branding color for the app bar -->
-        <item name="colorPrimary">@color/citra_orange</item>
-        <!-- Darker variant for the status bar and contextual app bars -->
-        <item name="colorPrimaryDark">@color/citra_orange_dark</item>
-        <item name="colorAccent">@color/citra_accent</item>
-
-        <item name="titleTextColor">@color/citra_logo_text_color</item>
-
-        <!-- Enable window content transitions -->
-        <item name="android:windowContentTransitions">true</item>
-        <item name="android:windowAllowEnterTransitionOverlap">true</item>
-        <item name="android:windowAllowReturnTransitionOverlap">true</item>
-
-        <item name="android:colorControlHighlight">?attr/colorAccent</item>
-    </style>
-
-    <!-- Same as above, but use default action bar, and mandate margins. -->
-    <style name="CitraSettingsBase" parent="Theme.AppCompat.DayNight">
-        <item name="colorPrimary">@color/citra_orange</item>
-        <item name="colorPrimaryDark">@color/citra_orange_dark</item>
-        <item name="colorAccent">@color/citra_accent</item>
-    </style>
-
-    <!-- Inherit from the Base Citra Dialog Theme -->
-    <style name="CitraEmulationBase" parent="Theme.AppCompat.DayNight">
-        <item name="colorPrimary">@color/citra_orange</item>
-        <item name="colorPrimaryDark">@color/citra_orange_dark</item>
-        <item name="colorAccent">@color/citra_accent</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-
-        <item name="android:windowBackground">@android:color/black</item>
-
-        <!-- Enable window content transitions -->
-        <item name="android:windowContentTransitions">true</item>
-        <item name="android:windowAllowEnterTransitionOverlap">true</item>
-        <item name="android:windowAllowReturnTransitionOverlap">true</item>
-    </style>
-
-    <!-- Inherit from a base file picker theme that handles day/night -->
-    <style name="FilePickerTheme" parent="FilePickerBaseTheme">
-        <item name="colorPrimary">@color/citra_orange</item>
-        <item name="colorPrimaryDark">@color/citra_orange_dark</item>
-        <item name="colorAccent">@color/citra_accent</item>
-        <item name="android:windowBackground">@color/card_view_background</item>
-
-        <!-- Need to set this also to style create folder dialog -->
-        <item name="alertDialogTheme">@style/FilePickerAlertDialogTheme</item>
-
-        <item name="nnf_list_item_divider">@drawable/gamelist_divider</item>
-        <item name="nnf_toolbarTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
-    </style>
-
    <style name="FilePickerAlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="colorPrimary">@color/citra_orange</item>
-        <item name="colorPrimaryDark">@color/citra_orange_dark</item>
-        <item name="colorAccent">@color/citra_accent</item>
+        <item name="colorPrimary">@color/citra_primary</item>
+        <item name="colorPrimaryDark">@color/citra_secondary</item>
+        <item name="colorAccent">@color/citra_primaryContainer</item>
+    </style>
+
+    <style name="CitraMaterialDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="colorPrimary">@color/citra_surface</item>
+        <item name="colorSurface">@color/citra_surface</item>
+        <item name="colorSecondary">@color/citra_primary</item>
+        <item name="buttonBarPositiveButtonStyle">@style/CitraButton</item>
+        <item name="buttonBarNegativeButtonStyle">@style/CitraButton</item>
+        <item name="buttonBarNeutralButtonStyle">@style/CitraButton</item>
+    </style>
+
+    <style name="CitraButton" parent="Widget.Material3.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/citra_primary</item>
+        <item name="rippleColor">@color/citra_secondaryContainer</item>
+    </style>
+
+    <style name="CitraShapedPopup" parent="Widget.Material3.PopupMenu">
+        <item name="android:popupBackground">@drawable/popup_background</item>
+    </style>
+
+    <style name="CitraPopup" parent="ThemeOverlay.Material3">
+        <item name="colorPrimary">@color/citra_surface</item>
+    </style>
+
+    <style name="CitraSlider" parent="Widget.Material3.Slider">
+        <item name="tickVisible">false</item>
+        <item name="labelBehavior">gone</item>
    </style>

 </resources>
--- a/src/android/app/src/main/res/values/themes.xml
+++ b/src/android/app/src/main/res/values/themes.xml
@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Citra.Main" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Main theme colors -->
+        <item name="colorPrimary">@color/citra_primary</item>
+        <item name="colorOnPrimary">@color/citra_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/citra_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/citra_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/citra_secondary</item>
+        <item name="colorOnSecondary">@color/citra_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/citra_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/citra_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/citra_tertiary</item>
+        <item name="colorOnTertiary">@color/citra_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/citra_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/citra_onTertiaryContainer</item>
+        <item name="colorError">@color/citra_error</item>
+        <item name="colorErrorContainer">@color/citra_errorContainer</item>
+        <item name="colorOnError">@color/citra_onError</item>
+        <item name="colorOnErrorContainer">@color/citra_onErrorContainer</item>
+        <item name="android:colorBackground">@color/citra_background</item>
+        <item name="colorOnBackground">@color/citra_onBackground</item>
+        <item name="colorSurface">@color/citra_surface</item>
+        <item name="colorOnSurface">@color/citra_onSurface</item>
+        <item name="colorSurfaceVariant">@color/citra_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/citra_onSurfaceVariant</item>
+        <item name="colorOutline">@color/citra_outline</item>
+        <item name="colorOnSurfaceInverse">@color/citra_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/citra_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/citra_inversePrimary</item>
+
+        <item name="homeAsUpIndicator">@drawable/ic_back</item>
+        <item name="android:statusBarColor">@color/citra_surface</item>
+        <item name="android:textColorLink">@color/citra_primary</item>
+        <item name="materialAlertDialogTheme">@style/CitraMaterialDialog</item>
+        <item name="popupMenuStyle">@style/CitraShapedPopup</item>
+        <item name="popupTheme">@style/CitraPopup</item>
+        <item name="sliderStyle">@style/CitraSlider</item>
+    </style>
+
+    <!-- Inherit from a base file picker theme that handles day/night -->
+    <style name="FilePickerTheme" parent="FilePickerBaseTheme">
+        <item name="colorPrimary">@color/citra_primary</item>
+        <item name="colorPrimaryDark">@color/citra_primary</item>
+        <item name="colorAccent">@color/citra_primary</item>
+
+        <!-- Need to set this also to style create folder dialog -->
+        <item name="alertDialogTheme">@style/FilePickerAlertDialogTheme</item>
+
+        <item name="nnf_list_item_divider">@drawable/gamelist_divider</item>
+        <item name="nnf_toolbarTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
+    </style>
+
+</resources>