diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7ad5fa3..912de8f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,7 +40,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="false"
-        android:theme="@style/Theme.PSX2"
+        android:theme="@style/AppTheme"
         tools:targetApi="31">
 
         <meta-data android:name="android.max_aspect" android:value="2.4" />
diff --git a/app/src/main/java/com/izzy2lost/psx2/MainActivity.java b/app/src/main/java/com/izzy2lost/psx2/MainActivity.java
index 709ea82..7babbbd 100644
--- a/app/src/main/java/com/izzy2lost/psx2/MainActivity.java
+++ b/app/src/main/java/com/izzy2lost/psx2/MainActivity.java
@@ -342,7 +342,7 @@ public class MainActivity extends AppCompatActivity implements GamesCoverDialogF
 
         setSurfaceView(new SDLSurface(this));
 
-        // Improve button outline contrast across all MaterialButtons
+        // Ensure consistent ripple across all MaterialButtons
         tintAllMaterialButtonOutlines();
 
         // Settings are already applied in Initialize() -> loadAndApplySettings()
@@ -426,29 +426,17 @@ public class MainActivity extends AppCompatActivity implements GamesCoverDialogF
             });
         }
 
-        // Toggle on-screen controls visibility
+        // Toggle all UI visibility (including controls)
         MaterialButton btnToggleControls = findViewById(R.id.btn_toggle_controls);
         if (btnToggleControls != null) {
             btnToggleControls.setOnClickListener(v -> {
-                View llDpad = findViewById(R.id.ll_pad_dpad);
-                View llRight = findViewById(R.id.ll_pad_right_buttons);
-                View llSelectStart = findViewById(R.id.ll_pad_select_start);
-                View llJoy = findViewById(R.id.ll_pad_joy);
-
-                boolean currentlyVisible = (llDpad != null && llDpad.getVisibility() == View.VISIBLE);
-                setControlsVisible(!currentlyVisible);
+                toggleAllUIVisibility();
             });
         }
 
         // HUD toggle moved to Settings (Developer section)
 
-        // Hide UI button
-        MaterialButton btn_hide_ui = findViewById(R.id.btn_hide_ui);
-        if(btn_hide_ui != null) {
-            btn_hide_ui.setOnClickListener(v -> {
-                toggleAllUIVisibility();
-            });
-        }
+        // Hide UI button (removed - functionality moved to toggle button)
 
         // Small unhide button (appears when all UI is hidden)
         MaterialButton btn_unhide_ui = findViewById(R.id.btn_unhide_ui);
@@ -780,20 +768,27 @@ public class MainActivity extends AppCompatActivity implements GamesCoverDialogF
         allUIHidden = !allUIHidden;
         int vis = allUIHidden ? View.GONE : View.VISIBLE;
         
-        // Hide/show all UI elements
+        // Hide/show all UI elements except the toggle button itself
         View btnSettings = findViewById(R.id.btn_settings);
-        View btnToggleControls = findViewById(R.id.btn_toggle_controls);
+        MaterialButton btnToggleControls = findViewById(R.id.btn_toggle_controls);
         View btnFile = findViewById(R.id.btn_file);
         View btnBios = findViewById(R.id.btn_bios);
         View btnSaves = findViewById(R.id.btn_saves);
         View btnHideUI = findViewById(R.id.btn_hide_ui);
+        View llQuickActions = findViewById(R.id.ll_quick_actions);
         
         if (btnSettings != null) btnSettings.setVisibility(vis);
-        if (btnToggleControls != null) btnToggleControls.setVisibility(vis);
+        // Keep toggle button visible but change its icon
+        if (btnToggleControls != null) {
+            // Change icon based on visibility state
+            int iconRes = allUIHidden ? R.drawable.visibility_24px : R.drawable.visibility_off_24px;
+            btnToggleControls.setIcon(ContextCompat.getDrawable(this, iconRes));
+        }
         if (btnFile != null) btnFile.setVisibility(vis);
         if (btnBios != null) btnBios.setVisibility(vis);
         if (btnSaves != null) btnSaves.setVisibility(vis);
         if (btnHideUI != null) btnHideUI.setVisibility(vis);
+        if (llQuickActions != null) llQuickActions.setVisibility(vis);
         
         // Hide/show on-screen controls
         if (!allUIHidden) {
@@ -804,68 +799,54 @@ public class MainActivity extends AppCompatActivity implements GamesCoverDialogF
             setControlsVisible(false);
         }
         
-        // Show a small unhide button when UI is hidden
+        // The unhide button is no longer needed since toggle button stays visible
         View unhideButton = findViewById(R.id.btn_unhide_ui);
         if (unhideButton != null) {
-            unhideButton.setVisibility(allUIHidden ? View.VISIBLE : View.GONE);
+            unhideButton.setVisibility(View.GONE);
         }
     }
 
     private void tintAllMaterialButtonOutlines() {
-        // Brand strokes
-        final ColorStateList strokeDefault = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.brand_outline));
-        final ColorStateList strokePrimary = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.brand_primary));
-        final ColorStateList strokeSecondary = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.brand_secondary));
-
+        // Ripple + specific color tweaks, no strokes (transparent container style)
         View root = findViewById(android.R.id.content);
         if (root instanceof ViewGroup) {
-            traverseAndTintButtons((ViewGroup) root, strokeDefault, strokePrimary, strokeSecondary);
+            traverseAndTintButtons((ViewGroup) root);
         }
     }
 
-    private void traverseAndTintButtons(ViewGroup group, ColorStateList strokeDefault, ColorStateList strokePrimary, ColorStateList strokeSecondary) {
+    private void traverseAndTintButtons(ViewGroup group) {
         for (int i = 0; i < group.getChildCount(); i++) {
             View child = group.getChildAt(i);
             if (child instanceof ViewGroup) {
-                traverseAndTintButtons((ViewGroup) child, strokeDefault, strokePrimary, strokeSecondary);
+                traverseAndTintButtons((ViewGroup) child);
             }
             if (child instanceof MaterialButton) {
                 MaterialButton mb = (MaterialButton) child;
                 // Ensure ripple matches brand globally
                 mb.setRippleColor(ColorStateList.valueOf(ContextCompat.getColor(this, R.color.brand_ripple)));
                 int id = mb.getId();
-                if (id == R.id.btn_settings || id == R.id.btn_toggle_controls) {
-                    mb.setStrokeColor(strokePrimary);
-                } else if (id == R.id.btn_file || id == R.id.btn_bios || id == R.id.btn_saves || id == R.id.btn_hide_ui) {
-                    mb.setStrokeColor(strokeSecondary);
-                } else if (id == R.id.btn_pad_y) { // Triangle = green
+                if (id == R.id.btn_pad_y) { // Triangle = green
                     final int base = ContextCompat.getColor(this, R.color.ps2_triangle_green);
                     ColorStateList stateful = pressedColorStateList(base);
-                    mb.setStrokeColor(stateful);
                     mb.setTextColor(stateful);
                 } else if (id == R.id.btn_pad_b) { // Circle = red
                     final int base = ContextCompat.getColor(this, R.color.ps2_circle_red);
                     ColorStateList stateful = pressedColorStateList(base);
-                    mb.setStrokeColor(stateful);
                     mb.setTextColor(stateful);
                 } else if (id == R.id.btn_pad_a) { // Cross = blue
                     final int base = ContextCompat.getColor(this, R.color.ps2_cross_blue);
                     ColorStateList stateful = pressedColorStateList(base);
-                    mb.setStrokeColor(stateful);
                     mb.setTextColor(stateful);
                 } else if (id == R.id.btn_pad_x) { // Square = pink
                     final int base = ContextCompat.getColor(this, R.color.ps2_square_pink);
                     ColorStateList stateful = pressedColorStateList(base);
-                    mb.setStrokeColor(stateful);
                     mb.setTextColor(stateful);
                 } else if (id == R.id.btn_pad_dir_top || id == R.id.btn_pad_dir_left || id == R.id.btn_pad_dir_right || id == R.id.btn_pad_dir_bottom) {
                     // D-pad arrow icon tint to brand accent
                     ColorStateList iconTint = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.brand_accent));
                     mb.setIconTint(iconTint);
-                } else {
-                    mb.setStrokeColor(strokeDefault);
                 }
-                mb.setStrokeWidth(1);
+                // No stroke; background is transparent per style
             }
         }
     }
diff --git a/app/src/main/res/drawable/settings_24px.xml b/app/src/main/res/drawable/settings_24px.xml
new file mode 100644
index 0000000..4bcd4aa
--- /dev/null
+++ b/app/src/main/res/drawable/settings_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM440,800L519,800L533,694Q564,686 590.5,670.5Q617,655 639,633L738,674L777,606L691,541Q696,527 698,511.5Q700,496 700,480Q700,464 698,448.5Q696,433 691,419L777,354L738,286L639,328Q617,305 590.5,289.5Q564,274 533,266L520,160L441,160L427,266Q396,274 369.5,289.5Q343,305 321,327L222,286L183,354L269,418Q264,433 262,448Q260,463 260,480Q260,496 262,511Q264,526 269,541L183,606L222,674L321,632Q343,655 369.5,670.5Q396,686 427,694L440,800ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/visibility_24px.xml b/app/src/main/res/drawable/visibility_24px.xml
new file mode 100644
index 0000000..23d640a
--- /dev/null
+++ b/app/src/main/res/drawable/visibility_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,640Q555,640 607.5,587.5Q660,535 660,460Q660,385 607.5,332.5Q555,280 480,280Q405,280 352.5,332.5Q300,385 300,460Q300,535 352.5,587.5Q405,640 480,640ZM480,568Q435,568 403.5,536.5Q372,505 372,460Q372,415 403.5,383.5Q435,352 480,352Q525,352 556.5,383.5Q588,415 588,460Q588,505 556.5,536.5Q525,568 480,568ZM480,760Q334,760 214,678.5Q94,597 40,460Q94,323 214,241.5Q334,160 480,160Q626,160 746,241.5Q866,323 920,460Q866,597 746,678.5Q626,760 480,760ZM480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,680Q593,680 687.5,620.5Q782,561 832,460Q782,359 687.5,299.5Q593,240 480,240Q367,240 272.5,299.5Q178,359 128,460Q178,561 272.5,620.5Q367,680 480,680Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/visibility_off_24px.xml b/app/src/main/res/drawable/visibility_off_24px.xml
new file mode 100644
index 0000000..6fa698a
--- /dev/null
+++ b/app/src/main/res/drawable/visibility_off_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M644,532L586,474Q595,427 559,386Q523,345 466,354L408,296Q425,288 442.5,284Q460,280 480,280Q555,280 607.5,332.5Q660,385 660,460Q660,480 656,497.5Q652,515 644,532ZM772,658L714,602Q752,573 781.5,538.5Q811,504 832,460Q782,359 688.5,299.5Q595,240 480,240Q451,240 423,244Q395,248 368,256L306,194Q347,177 390,168.5Q433,160 480,160Q631,160 749,243.5Q867,327 920,460Q897,519 859.5,569.5Q822,620 772,658ZM792,904L624,738Q589,749 553.5,754.5Q518,760 480,760Q329,760 211,676.5Q93,593 40,460Q61,407 93,361.5Q125,316 166,280L56,168L112,112L848,848L792,904ZM222,336Q193,362 169,393Q145,424 128,460Q178,561 271.5,620.5Q365,680 480,680Q500,680 519,677.5Q538,675 558,672L522,634Q511,637 501,638.5Q491,640 480,640Q405,640 352.5,587.5Q300,535 300,460Q300,449 301.5,439Q303,429 306,418L222,336ZM541,429L541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429ZM390,504Q390,504 390,504Q390,504 390,504L390,504Q390,504 390,504Q390,504 390,504Q390,504 390,504Q390,504 390,504Z"/>
+</vector>
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 313d61a..06434f6 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -12,30 +12,45 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <!-- Top-left Settings button -->
+    <!-- Settings button in top left corner -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_settings"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="settings"
-        android:textColor="@color/white"
+        style="@style/PSX2.ElevatedTransparentButton"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:insetLeft="0dp"
+        android:insetRight="0dp"
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:gravity="center"
+        android:text=""
+        app:icon="@drawable/settings_24px"
+        app:iconGravity="textStart"
+        app:iconSize="24dp"
+        app:iconPadding="0dp"
         app:rippleColor="#80cdcdcd"
-        app:strokeColor="#80000000"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_margin="12dp"/>
 
     <!-- Controls toggle (top-right) -->
+    <!-- Visibility toggle button in upper right corner -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_toggle_controls"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="controls"
-        android:textColor="@color/white"
+        style="@style/PSX2.ElevatedTransparentButton"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:insetLeft="0dp"
+        android:insetRight="0dp"
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:gravity="center"
+        android:text=""
+        app:icon="@drawable/visibility_off_24px"
+        app:iconGravity="textStart"
+        app:iconSize="24dp"
+        app:iconPadding="0dp"
         app:rippleColor="#80cdcdcd"
-        app:strokeColor="#80000000"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_margin="12dp"/>
@@ -43,10 +58,9 @@
     <!-- Small unhide button (only visible when all UI is hidden) -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_unhide_ui"
-        style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+        style="@style/PSX2.ElevatedTransparentButton"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:backgroundTint="#33000000"
         android:visibility="gone"
         app:icon="@drawable/ic_unhide"
         app:iconSize="24dp"
@@ -74,43 +88,32 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_file"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="GAMES"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_bios"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="bios"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_saves"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="saves"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
+
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_hide_ui"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="hide"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
     </LinearLayout>
 
     <!-- Bottom center Select/Start -->
@@ -120,7 +123,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -128,23 +131,21 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_pad_select"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="select"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            android:textColor="@color/md_theme_onSurface"
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_pad_start"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="start"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            android:textColor="@color/md_theme_onSurface"
+            app:rippleColor="#80cdcdcd" />
 
     </LinearLayout>
 
@@ -155,7 +156,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_margin="6dp">
@@ -174,7 +175,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_margin="12dp">
@@ -186,23 +187,23 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_l3"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PSX2.ElevatedTransparentButton"
+                android:layout_width="70dp"
+                android:layout_height="38dp"
+                android:layout_marginEnd="8dp"
                 android:text="L3"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+            
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_r3"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PSX2.ElevatedTransparentButton"
+                android:layout_width="70dp"
+                android:layout_height="38dp"
+                android:layout_marginStart="8dp"
                 android:text="R3"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+            
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -212,23 +213,23 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_l2"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PSX2.ElevatedTransparentButton"
+                android:layout_width="70dp"
+                android:layout_height="38dp"
+                android:layout_marginEnd="8dp"
                 android:text="L2"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_r2"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PSX2.ElevatedTransparentButton"
+                android:layout_width="70dp"
+                android:layout_height="38dp"
+                android:layout_marginStart="8dp"
                 android:text="R2"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -238,23 +239,23 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_l1"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PSX2.ElevatedTransparentButton"
+                android:layout_width="70dp"
+                android:layout_height="38dp"
+                android:layout_marginEnd="8dp"
                 android:text="L1"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_r1"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PSX2.ElevatedTransparentButton"
+                android:layout_width="70dp"
+                android:layout_height="38dp"
+                android:layout_marginStart="8dp"
                 android:text="R1"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -264,9 +265,10 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_x"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="4dp"
                 android:text=""
                 android:gravity="center"
                 app:icon="@drawable/ic_ps2_square"
@@ -274,14 +276,14 @@
                 app:iconPadding="0dp"
                 app:iconSize="20dp"
                 app:iconGravity="textStart"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_y"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
                 android:text=""
                 android:gravity="center"
                 app:icon="@drawable/ic_ps2_triangle"
@@ -289,8 +291,7 @@
                 app:iconPadding="0dp"
                 app:iconSize="20dp"
                 app:iconGravity="textStart"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -300,9 +301,10 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_a"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="4dp"
                 android:text=""
                 android:gravity="center"
                 app:icon="@drawable/ic_ps2_x"
@@ -310,14 +312,14 @@
                 app:iconPadding="0dp"
                 app:iconSize="20dp"
                 app:iconGravity="textStart"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_b"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
                 android:text=""
                 android:gravity="center"
                 app:icon="@drawable/ic_ps2_circle"
@@ -325,8 +327,7 @@
                 app:iconPadding="0dp"
                 app:iconSize="20dp"
                 app:iconGravity="textStart"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
     </LinearLayout>
 
@@ -338,7 +339,7 @@
         android:padding="2dp"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@id/ll_pad_joy"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginBottom="2dp">
@@ -357,7 +358,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_dir_top"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:insetLeft="0dp"
@@ -369,12 +370,10 @@
                 android:layout_column="1"
                 android:text=""
                 app:icon="@drawable/ic_arrow_up"
-                app:iconTint="@color/white"
+                app:iconGravity="textStart"
                 app:iconPadding="0dp"
                 app:iconSize="18dp"
-                app:strokeWidth="0dp"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="@android:color/transparent" />
+                app:rippleColor="#80cdcdcd" />
 
             <Space
                 android:layout_width="0dp"
@@ -384,7 +383,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_dir_left"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:insetLeft="0dp"
@@ -396,12 +395,10 @@
                 android:layout_column="0"
                 android:text=""
                 app:icon="@drawable/ic_arrow_left"
-                app:iconTint="@color/white"
+                app:iconGravity="textStart"
                 app:iconPadding="0dp"
                 app:iconSize="18dp"
-                app:strokeWidth="0dp"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="@android:color/transparent" />
+                app:rippleColor="#80cdcdcd" />
 
             <Space
                 android:layout_width="0dp"
@@ -411,7 +408,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_dir_right"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:insetLeft="0dp"
@@ -423,12 +420,10 @@
                 android:layout_column="2"
                 android:text=""
                 app:icon="@drawable/ic_arrow_right"
-                app:iconTint="@color/white"
+                app:iconGravity="textStart"
                 app:iconPadding="0dp"
                 app:iconSize="18dp"
-                app:strokeWidth="0dp"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="@android:color/transparent" />
+                app:rippleColor="#80cdcdcd" />
 
             <Space
                 android:layout_width="0dp"
@@ -438,7 +433,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_dir_bottom"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:insetLeft="0dp"
@@ -450,12 +445,10 @@
                 android:layout_column="1"
                 android:text=""
                 app:icon="@drawable/ic_arrow_down"
-                app:iconTint="@color/white"
+                app:iconGravity="textStart"
                 app:iconPadding="0dp"
                 app:iconSize="18dp"
-                app:strokeWidth="0dp"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="@android:color/transparent" />
+                app:rippleColor="#80cdcdcd" />
 
             <Space
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout-port/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml
index d773c97..104a141 100644
--- a/app/src/main/res/layout-port/activity_main.xml
+++ b/app/src/main/res/layout-port/activity_main.xml
@@ -12,16 +12,23 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <!-- Top-left Settings button -->
+    <!-- Settings button in top left corner -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_settings"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="settings"
-        android:textColor="@color/white"
+        style="@style/PSX2.ElevatedTransparentButton"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:insetLeft="0dp"
+        android:insetRight="0dp"
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:gravity="center"
+        android:text=""
+        app:icon="@drawable/settings_24px"
+        app:iconGravity="textStart"
+        app:iconSize="24dp"
+        app:iconPadding="0dp"
         app:rippleColor="#80cdcdcd"
-        app:strokeColor="#80000000"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_margin="12dp"/>
@@ -38,48 +45,53 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_ogl"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="60dip"
             android:layout_height="wrap_content"
             android:text="OGL"
             android:textSize="12dp"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_vulkan"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="60dip"
             android:layout_height="wrap_content"
             android:text="VK"
             android:textSize="12dp"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_sw"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="60dip"
             android:layout_height="wrap_content"
             android:text="SW"
             android:textSize="12dp"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
     </LinearLayout>
 
     <!-- Controls toggle (top-right) -->
+    <!-- Visibility toggle button in upper right corner -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_toggle_controls"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="controls"
-        android:textColor="@color/white"
+        style="@style/PSX2.ElevatedTransparentButton"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:insetLeft="0dp"
+        android:insetRight="0dp"
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:gravity="center"
+        android:text=""
+        app:icon="@drawable/visibility_off_24px"
+        app:iconGravity="textStart"
+        app:iconSize="24dp"
+        app:iconPadding="0dp"
         app:rippleColor="#80cdcdcd"
-        app:strokeColor="#80000000"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_margin="12dp"/>
@@ -87,10 +99,9 @@
     <!-- Small unhide button (only visible when all UI is hidden) -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_unhide_ui"
-        style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+        style="@style/PSX2.ElevatedTransparentButton"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:backgroundTint="#33000000"
         android:visibility="gone"
         app:icon="@drawable/ic_unhide"
         app:iconSize="24dp"
@@ -118,43 +129,36 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_file"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="4dp"
             android:text="GAMES"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_bios"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
             android:text="bios"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_saves"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
             android:text="saves"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
+
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_hide_ui"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="hide"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
     </LinearLayout>
 
     <!-- Portrait control stack: Joy above D-Pad; both above Select/Start; Right cluster above Select/Start -->
@@ -163,7 +167,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:visibility="gone"
+        android:visibility="visible"
         android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -171,23 +175,23 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_pad_select"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
             android:text="select"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            android:textColor="@color/md_theme_onSurface"
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_pad_start"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
             android:text="start"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            android:textColor="@color/md_theme_onSurface"
+            app:rippleColor="#80cdcdcd" />
 
     </LinearLayout>
 
@@ -197,7 +201,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@id/ll_pad_select_start"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginBottom="8dp">
@@ -209,23 +213,23 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_l3"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PSX2.ElevatedTransparentButton"
+                android:layout_width="70dp"
+                android:layout_height="38dp"
+                android:layout_marginEnd="8dp"
                 android:text="L3"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_r3"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PSX2.ElevatedTransparentButton"
+                android:layout_width="70dp"
+                android:layout_height="38dp"
+                android:layout_marginStart="8dp"
                 android:text="R3"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -235,23 +239,23 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_l2"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PSX2.ElevatedTransparentButton"
+                android:layout_width="70dp"
+                android:layout_height="38dp" 
+                android:layout_marginEnd="8dp"
                 android:text="L2"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_r2"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PSX2.ElevatedTransparentButton"
+                android:layout_width="70dp"
+                android:layout_height="38dp" 
+                android:layout_marginStart="8dp"
                 android:text="R2"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -261,23 +265,23 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_l1"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PSX2.ElevatedTransparentButton"
+                android:layout_width="70dp"
+                android:layout_height="38dp" 
+                android:layout_marginEnd="8dp"
                 android:text="L1"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_r1"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PSX2.ElevatedTransparentButton"
+                android:layout_width="70dp"
+                android:layout_height="38dp" 
+                android:layout_marginStart="8dp"
                 android:text="R1"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -287,9 +291,10 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_x"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="wrap_content" 
+                android:layout_marginEnd="4dp"
                 android:text=""
                 android:gravity="center"
                 app:icon="@drawable/ic_ps2_square"
@@ -297,14 +302,14 @@
                 app:iconPadding="0dp"
                 app:iconSize="20dp"
                 app:iconGravity="textStart"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_y"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="wrap_content" 
+                android:layout_marginStart="4dp"
                 android:text=""
                 android:gravity="center"
                 app:icon="@drawable/ic_ps2_triangle"
@@ -312,8 +317,7 @@
                 app:iconPadding="0dp"
                 app:iconSize="20dp"
                 app:iconGravity="textStart"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -323,9 +327,10 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_a"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="wrap_content" 
+                android:layout_marginEnd="4dp"
                 android:text=""
                 android:gravity="center"
                 app:icon="@drawable/ic_ps2_x"
@@ -333,14 +338,14 @@
                 app:iconPadding="0dp"
                 app:iconSize="20dp"
                 app:iconGravity="textStart"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_b"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="wrap_content" 
+                android:layout_marginStart="4dp"
                 android:text=""
                 android:gravity="center"
                 app:icon="@drawable/ic_ps2_circle"
@@ -348,8 +353,7 @@
                 app:iconPadding="0dp"
                 app:iconSize="20dp"
                 app:iconGravity="textStart"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
     </LinearLayout>
 
@@ -359,7 +363,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginBottom="6dp">
@@ -378,7 +382,7 @@
         android:padding="2dp"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@id/ll_pad_joy"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginBottom="0dp">
@@ -397,7 +401,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_dir_top"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:insetLeft="0dp"
@@ -409,12 +413,10 @@
                 android:layout_column="1"
                 android:text=""
                 app:icon="@drawable/ic_arrow_up"
-                app:iconTint="@color/white"
+                app:iconGravity="textStart"
                 app:iconPadding="0dp"
                 app:iconSize="18dp"
-                app:strokeWidth="0dp"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="@android:color/transparent" />
+                app:rippleColor="#80cdcdcd" />
 
             <Space
                 android:layout_width="0dp"
@@ -424,7 +426,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_dir_left"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:insetLeft="0dp"
@@ -436,12 +438,10 @@
                 android:layout_column="0"
                 android:text=""
                 app:icon="@drawable/ic_arrow_left"
-                app:iconTint="@color/white"
+                app:iconGravity="textStart"
                 app:iconPadding="0dp"
                 app:iconSize="18dp"
-                app:strokeWidth="0dp"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="@android:color/transparent" />
+                app:rippleColor="#80cdcdcd" />
 
             <Space
                 android:layout_width="0dp"
@@ -451,7 +451,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_dir_right"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:insetLeft="0dp"
@@ -463,12 +463,10 @@
                 android:layout_column="2"
                 android:text=""
                 app:icon="@drawable/ic_arrow_right"
-                app:iconTint="@color/white"
+                app:iconGravity="textStart"
                 app:iconPadding="0dp"
                 app:iconSize="18dp"
-                app:strokeWidth="0dp"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="@android:color/transparent" />
+                app:rippleColor="#80cdcdcd" />
 
             <Space
                 android:layout_width="0dp"
@@ -478,7 +476,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_dir_bottom"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:insetLeft="0dp"
@@ -490,12 +488,10 @@
                 android:layout_column="1"
                 android:text=""
                 app:icon="@drawable/ic_arrow_down"
-                app:iconTint="@color/white"
+                app:iconGravity="textStart"
                 app:iconPadding="0dp"
                 app:iconSize="18dp"
-                app:strokeWidth="0dp"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="@android:color/transparent" />
+                app:rippleColor="#80cdcdcd" />
 
             <Space
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 48bf983..931143f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,13 +15,12 @@
     <!-- Top-left Settings button -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_settings"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/PSX2.ElevatedTransparentButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="settings"
-        android:textColor="@color/white"
+        
         app:rippleColor="#80cdcdcd"
-        app:strokeColor="#80000000"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_margin="12dp"/>
@@ -38,48 +37,44 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_ogl"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="60dip"
             android:layout_height="wrap_content"
             android:text="OGL"
             android:textSize="12dp"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_vulkan"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="60dip"
             android:layout_height="wrap_content"
             android:text="VK"
             android:textSize="12dp"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_sw"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="60dip"
             android:layout_height="wrap_content"
             android:text="SW"
             android:textSize="12dp"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
     </LinearLayout>
 
     <!-- Controls toggle (top-right) -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_toggle_controls"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/PSX2.ElevatedTransparentButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="controls"
-        android:textColor="@color/white"
+        
         app:rippleColor="#80cdcdcd"
-        app:strokeColor="#80000000"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_margin="12dp"/>
@@ -87,10 +82,9 @@
     <!-- Small unhide button (only visible when all UI is hidden) -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_unhide_ui"
-        style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+        style="@style/PSX2.ElevatedTransparentButton"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:backgroundTint="#33000000"
         android:visibility="gone"
         app:icon="@drawable/ic_unhide"
         app:iconSize="24dp"
@@ -130,43 +124,39 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_file"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="GAMES"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_bios"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="bios"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_saves"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="saves"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_hide_ui"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="hide"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
     </LinearLayout>
 
     <LinearLayout
@@ -182,23 +172,21 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_pad_select"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="select"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_pad_start"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="start"
-            android:textColor="@color/white"
-            app:rippleColor="#80cdcdcd"
-            app:strokeColor="#80000000" />
+            
+            app:rippleColor="#80cdcdcd" />
 
     </LinearLayout>
 
@@ -219,23 +207,19 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_l3"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="L3"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_r3"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="R3"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -245,23 +229,19 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_l2"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="L2"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_r2"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="R2"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -271,23 +251,19 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_l1"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="L1"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_r1"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="R1"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -297,7 +273,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_x"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=""
@@ -307,12 +283,11 @@
                 app:iconPadding="0dp"
                 app:iconSize="20dp"
                 app:iconGravity="textStart"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_y"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=""
@@ -322,8 +297,7 @@
                 app:iconPadding="0dp"
                 app:iconSize="20dp"
                 app:iconGravity="textStart"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -333,7 +307,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_a"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=""
@@ -343,12 +317,11 @@
                 app:iconPadding="0dp"
                 app:iconSize="20dp"
                 app:iconGravity="textStart"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_b"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=""
@@ -358,8 +331,7 @@
                 app:iconPadding="0dp"
                 app:iconSize="20dp"
                 app:iconGravity="textStart"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
     </LinearLayout>
 
@@ -380,33 +352,27 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_joy_lt"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="60dip"
                 android:layout_height="wrap_content"
                 android:text="↖"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_joy_t"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="60dip"
                 android:layout_height="wrap_content"
                 android:text="↑"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_joy_rt"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="60dip"
                 android:layout_height="wrap_content"
                 android:text="↗"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
         </LinearLayout>
 
@@ -417,33 +383,28 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_joy_l"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="60dip"
                 android:layout_height="wrap_content"
                 android:text="←"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_joy_center"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="60dip"
                 android:layout_height="wrap_content"
                 android:text=""
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_joy_r"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="60dip"
                 android:layout_height="wrap_content"
                 android:text="→"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
 
         </LinearLayout>
 
@@ -454,33 +415,30 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_joy_lb"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="60dip"
                 android:layout_height="wrap_content"
                 android:text="↙"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_joy_b"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="60dip"
                 android:layout_height="wrap_content"
                 android:text="↓"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_joy_rb"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="60dip"
                 android:layout_height="wrap_content"
                 android:text="↘"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeColor="#80000000" />
+                
+                app:rippleColor="#80cdcdcd" />
 
         </LinearLayout>
     </LinearLayout>
@@ -504,25 +462,21 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_dir_top"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="↑"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeWidth="0dp"
-                app:strokeColor="@android:color/transparent" />
+                
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_dir_bottom"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="↓"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeWidth="0dp"
-                app:strokeColor="@android:color/transparent" />
+                
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
         <LinearLayout
@@ -532,25 +486,19 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_dir_left"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="←"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeWidth="0dp"
-                app:strokeColor="@android:color/transparent" />
+                app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_pad_dir_right"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/PSX2.ElevatedTransparentButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="→"
-                android:textColor="@color/white"
-                app:rippleColor="#80cdcdcd"
-                app:strokeWidth="0dp"
-                app:strokeColor="@android:color/transparent" />
+                app:rippleColor="#80cdcdcd" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_covers_grid.xml b/app/src/main/res/layout/dialog_covers_grid.xml
index 500b4c2..0349236 100644
--- a/app/src/main/res/layout/dialog_covers_grid.xml
+++ b/app/src/main/res/layout/dialog_covers_grid.xml
@@ -32,7 +32,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_download"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Download Covers" />
diff --git a/app/src/main/res/layout/dialog_game_settings.xml b/app/src/main/res/layout/dialog_game_settings.xml
index a5a2569..de3e465 100644
--- a/app/src/main/res/layout/dialog_game_settings.xml
+++ b/app/src/main/res/layout/dialog_game_settings.xml
@@ -137,7 +137,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_import_pnach"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Import Cheats / Patch Codes (.pnach)" />
diff --git a/app/src/main/res/layout/item_cover.xml b/app/src/main/res/layout/item_cover.xml
index 5f41dd7..6dd0db1 100644
--- a/app/src/main/res/layout/item_cover.xml
+++ b/app/src/main/res/layout/item_cover.xml
@@ -24,7 +24,6 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:gravity="center"
-        android:textColor="#FFFFFF"
         android:textSize="12sp"
         android:layout_marginTop="6dp"
         android:paddingLeft="4dp"
diff --git a/app/src/main/res/layout/item_save_slot.xml b/app/src/main/res/layout/item_save_slot.xml
index 1268cc0..e7e2095 100644
--- a/app/src/main/res/layout/item_save_slot.xml
+++ b/app/src/main/res/layout/item_save_slot.xml
@@ -54,7 +54,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_slot_save"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
             android:text="Save"
@@ -64,7 +64,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_slot_load"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
             android:text="Load"
diff --git a/app/src/main/res/values-night/brand_aliases.xml b/app/src/main/res/values-night/brand_aliases.xml
new file mode 100644
index 0000000..e02c7bf
--- /dev/null
+++ b/app/src/main/res/values-night/brand_aliases.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Night aliases to Theme Builder tokens -->
+    <color name="brand_primary">@color/md_theme_primary</color>
+    <color name="brand_secondary">@color/md_theme_secondary</color>
+    <color name="brand_outline">@color/md_theme_outline</color>
+    <color name="brand_accent">@color/md_theme_secondary</color>
+    <!-- Ripple based on night primary (50% alpha) -->
+    <color name="brand_ripple">#809ECAFF</color>
+    
+    <!-- Semi-transparent surface container for buttons (70% alpha) -->
+    <color name="brand_surface_container_semi">#B3393F46</color>
+</resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..3f63578
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,143 @@
+<resources>
+    <color name="md_theme_primary">#9ECAFF</color>
+    <color name="md_theme_onPrimary">#003258</color>
+    <color name="md_theme_primaryContainer">#33A1FF</color>
+    <color name="md_theme_onPrimaryContainer">#00365E</color>
+    <color name="md_theme_secondary">#A9C9F2</color>
+    <color name="md_theme_onSecondary">#0C3253</color>
+    <color name="md_theme_secondaryContainer">#2A4B6E</color>
+    <color name="md_theme_onSecondaryContainer">#9BBBE3</color>
+    <color name="md_theme_tertiary">#EEB1FF</color>
+    <color name="md_theme_onTertiary">#53006F</color>
+    <color name="md_theme_tertiaryContainer">#CD7DE8</color>
+    <color name="md_theme_onTertiaryContainer">#580375</color>
+    <color name="md_theme_error">#FFB4AB</color>
+    <color name="md_theme_onError">#690005</color>
+    <color name="md_theme_errorContainer">#93000A</color>
+    <color name="md_theme_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_background">#0F1419</color>
+    <color name="md_theme_onBackground">#DFE2EA</color>
+    <color name="md_theme_surface">#0F1419</color>
+    <color name="md_theme_onSurface">#DFE2EA</color>
+    <color name="md_theme_surfaceVariant">#404752</color>
+    <color name="md_theme_onSurfaceVariant">#BFC7D4</color>
+    <color name="md_theme_outline">#89919E</color>
+    <color name="md_theme_outlineVariant">#404752</color>
+    <color name="md_theme_scrim">#000000</color>
+    <color name="md_theme_inverseSurface">#DFE2EA</color>
+    <color name="md_theme_inverseOnSurface">#2C3137</color>
+    <color name="md_theme_inversePrimary">#0061A3</color>
+    <color name="md_theme_primaryFixed">#D1E4FF</color>
+    <color name="md_theme_onPrimaryFixed">#001D36</color>
+    <color name="md_theme_primaryFixedDim">#9ECAFF</color>
+    <color name="md_theme_onPrimaryFixedVariant">#00497D</color>
+    <color name="md_theme_secondaryFixed">#D1E4FF</color>
+    <color name="md_theme_onSecondaryFixed">#001D36</color>
+    <color name="md_theme_secondaryFixedDim">#A9C9F2</color>
+    <color name="md_theme_onSecondaryFixedVariant">#28496B</color>
+    <color name="md_theme_tertiaryFixed">#F9D8FF</color>
+    <color name="md_theme_onTertiaryFixed">#330045</color>
+    <color name="md_theme_tertiaryFixedDim">#EEB1FF</color>
+    <color name="md_theme_onTertiaryFixedVariant">#6E228A</color>
+    <color name="md_theme_surfaceDim">#0F1419</color>
+    <color name="md_theme_surfaceBright">#353940</color>
+    <color name="md_theme_surfaceContainerLowest">#0A0E14</color>
+    <color name="md_theme_surfaceContainerLow">#181C22</color>
+    <color name="md_theme_surfaceContainer">#1C2026</color>
+    <color name="md_theme_surfaceContainerHigh">#262A30</color>
+    <color name="md_theme_surfaceContainerHighest">#31353B</color>
+    <color name="md_theme_primary_mediumContrast">#C6DEFF</color>
+    <color name="md_theme_onPrimary_mediumContrast">#002746</color>
+    <color name="md_theme_primaryContainer_mediumContrast">#33A1FF</color>
+    <color name="md_theme_onPrimaryContainer_mediumContrast">#000F20</color>
+    <color name="md_theme_secondary_mediumContrast">#C6DEFF</color>
+    <color name="md_theme_onSecondary_mediumContrast">#002746</color>
+    <color name="md_theme_secondaryContainer_mediumContrast">#7493BA</color>
+    <color name="md_theme_onSecondaryContainer_mediumContrast">#000000</color>
+    <color name="md_theme_tertiary_mediumContrast">#F7CFFF</color>
+    <color name="md_theme_onTertiary_mediumContrast">#420059</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#CD7DE8</color>
+    <color name="md_theme_onTertiaryContainer_mediumContrast">#1E002B</color>
+    <color name="md_theme_error_mediumContrast">#FFD2CC</color>
+    <color name="md_theme_onError_mediumContrast">#540003</color>
+    <color name="md_theme_errorContainer_mediumContrast">#FF5449</color>
+    <color name="md_theme_onErrorContainer_mediumContrast">#000000</color>
+    <color name="md_theme_background_mediumContrast">#0F1419</color>
+    <color name="md_theme_onBackground_mediumContrast">#DFE2EA</color>
+    <color name="md_theme_surface_mediumContrast">#0F1419</color>
+    <color name="md_theme_onSurface_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceVariant_mediumContrast">#404752</color>
+    <color name="md_theme_onSurfaceVariant_mediumContrast">#D5DDEA</color>
+    <color name="md_theme_outline_mediumContrast">#ABB2BF</color>
+    <color name="md_theme_outlineVariant_mediumContrast">#89919D</color>
+    <color name="md_theme_scrim_mediumContrast">#000000</color>
+    <color name="md_theme_inverseSurface_mediumContrast">#DFE2EA</color>
+    <color name="md_theme_inverseOnSurface_mediumContrast">#262A30</color>
+    <color name="md_theme_inversePrimary_mediumContrast">#004A7E</color>
+    <color name="md_theme_primaryFixed_mediumContrast">#D1E4FF</color>
+    <color name="md_theme_onPrimaryFixed_mediumContrast">#001225</color>
+    <color name="md_theme_primaryFixedDim_mediumContrast">#9ECAFF</color>
+    <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#003861</color>
+    <color name="md_theme_secondaryFixed_mediumContrast">#D1E4FF</color>
+    <color name="md_theme_onSecondaryFixed_mediumContrast">#001225</color>
+    <color name="md_theme_secondaryFixedDim_mediumContrast">#A9C9F2</color>
+    <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#143859</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#F9D8FF</color>
+    <color name="md_theme_onTertiaryFixed_mediumContrast">#220030</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#EEB1FF</color>
+    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#5B0777</color>
+    <color name="md_theme_surfaceDim_mediumContrast">#0F1419</color>
+    <color name="md_theme_surfaceBright_mediumContrast">#41454B</color>
+    <color name="md_theme_surfaceContainerLowest_mediumContrast">#04080D</color>
+    <color name="md_theme_surfaceContainerLow_mediumContrast">#1A1E24</color>
+    <color name="md_theme_surfaceContainer_mediumContrast">#24282E</color>
+    <color name="md_theme_surfaceContainerHigh_mediumContrast">#2F3339</color>
+    <color name="md_theme_surfaceContainerHighest_mediumContrast">#3A3E44</color>
+    <color name="md_theme_primary_highContrast">#E8F0FF</color>
+    <color name="md_theme_onPrimary_highContrast">#000000</color>
+    <color name="md_theme_primaryContainer_highContrast">#96C6FF</color>
+    <color name="md_theme_onPrimaryContainer_highContrast">#000C1B</color>
+    <color name="md_theme_secondary_highContrast">#E8F0FF</color>
+    <color name="md_theme_onSecondary_highContrast">#000000</color>
+    <color name="md_theme_secondaryContainer_highContrast">#A5C5EE</color>
+    <color name="md_theme_onSecondaryContainer_highContrast">#000C1B</color>
+    <color name="md_theme_tertiary_highContrast">#FEEAFF</color>
+    <color name="md_theme_onTertiary_highContrast">#000000</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#ECABFF</color>
+    <color name="md_theme_onTertiaryContainer_highContrast">#190024</color>
+    <color name="md_theme_error_highContrast">#FFECE9</color>
+    <color name="md_theme_onError_highContrast">#000000</color>
+    <color name="md_theme_errorContainer_highContrast">#FFAEA4</color>
+    <color name="md_theme_onErrorContainer_highContrast">#220001</color>
+    <color name="md_theme_background_highContrast">#0F1419</color>
+    <color name="md_theme_onBackground_highContrast">#DFE2EA</color>
+    <color name="md_theme_surface_highContrast">#0F1419</color>
+    <color name="md_theme_onSurface_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceVariant_highContrast">#404752</color>
+    <color name="md_theme_onSurfaceVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_outline_highContrast">#E9F0FE</color>
+    <color name="md_theme_outlineVariant_highContrast">#BBC3D0</color>
+    <color name="md_theme_scrim_highContrast">#000000</color>
+    <color name="md_theme_inverseSurface_highContrast">#DFE2EA</color>
+    <color name="md_theme_inverseOnSurface_highContrast">#000000</color>
+    <color name="md_theme_inversePrimary_highContrast">#004A7E</color>
+    <color name="md_theme_primaryFixed_highContrast">#D1E4FF</color>
+    <color name="md_theme_onPrimaryFixed_highContrast">#000000</color>
+    <color name="md_theme_primaryFixedDim_highContrast">#9ECAFF</color>
+    <color name="md_theme_onPrimaryFixedVariant_highContrast">#001225</color>
+    <color name="md_theme_secondaryFixed_highContrast">#D1E4FF</color>
+    <color name="md_theme_onSecondaryFixed_highContrast">#000000</color>
+    <color name="md_theme_secondaryFixedDim_highContrast">#A9C9F2</color>
+    <color name="md_theme_onSecondaryFixedVariant_highContrast">#001225</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#F9D8FF</color>
+    <color name="md_theme_onTertiaryFixed_highContrast">#000000</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#EEB1FF</color>
+    <color name="md_theme_onTertiaryFixedVariant_highContrast">#220030</color>
+    <color name="md_theme_surfaceDim_highContrast">#0F1419</color>
+    <color name="md_theme_surfaceBright_highContrast">#4C5057</color>
+    <color name="md_theme_surfaceContainerLowest_highContrast">#000000</color>
+    <color name="md_theme_surfaceContainerLow_highContrast">#1C2026</color>
+    <color name="md_theme_surfaceContainer_highContrast">#2C3137</color>
+    <color name="md_theme_surfaceContainerHigh_highContrast">#383C42</color>
+    <color name="md_theme_surfaceContainerHighest_highContrast">#43474D</color>
+</resources>
diff --git a/app/src/main/res/values-night/theme_overlays.xml b/app/src/main/res/values-night/theme_overlays.xml
new file mode 100644
index 0000000..02adac7
--- /dev/null
+++ b/app/src/main/res/values-night/theme_overlays.xml
@@ -0,0 +1,98 @@
+<resources>
+    <style name="ThemeOverlay.AppTheme.MediumContrast" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_primary_mediumContrast</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast</item>
+        <item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast</item>
+        <item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast</item>
+        <item name="colorError">@color/md_theme_error_mediumContrast</item>
+        <item name="colorOnError">@color/md_theme_onError_mediumContrast</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_mediumContrast</item>
+        <item name="android:colorBackground">@color/md_theme_background_mediumContrast</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground_mediumContrast</item>
+        <item name="colorSurface">@color/md_theme_surface_mediumContrast</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface_mediumContrast</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_mediumContrast</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_mediumContrast</item>
+        <item name="colorOutline">@color/md_theme_outline_mediumContrast</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant_mediumContrast</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_mediumContrast</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_mediumContrast</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_mediumContrast</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_mediumContrast</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_mediumContrast</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_mediumContrast</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_mediumContrast</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_mediumContrast</item>
+    </style>
+    <style name="ThemeOverlay.AppTheme.HighContrast" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_primary_highContrast</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary_highContrast</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_highContrast</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_highContrast</item>
+        <item name="colorSecondary">@color/md_theme_secondary_highContrast</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast</item>
+        <item name="colorTertiary">@color/md_theme_tertiary_highContrast</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast</item>
+        <item name="colorError">@color/md_theme_error_highContrast</item>
+        <item name="colorOnError">@color/md_theme_onError_highContrast</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_highContrast</item>
+        <item name="android:colorBackground">@color/md_theme_background_highContrast</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground_highContrast</item>
+        <item name="colorSurface">@color/md_theme_surface_highContrast</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface_highContrast</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_highContrast</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_highContrast</item>
+        <item name="colorOutline">@color/md_theme_outline_highContrast</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant_highContrast</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_highContrast</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_highContrast</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_highContrast</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_highContrast</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_highContrast</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_highContrast</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_highContrast</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index fa51bf4..7402b0a 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,26 +1,52 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.PSX2" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-        <!-- Keep default dark palette, just ensure outlined buttons are visible -->
+<resources>
+    <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_error</item>
+        <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="colorSurface">@color/md_theme_surface</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_outline</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
+        <!-- Default MaterialButton styles -->
         <item name="materialButtonOutlinedStyle">@style/PSX2.OutlinedButton</item>
     </style>
-
-    <!-- Night variant: bright outline -->
-    <style name="PSX2.OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="strokeColor">#E6FFFFFF</item> <!-- 90% white for dark bg -->
-        <item name="strokeWidth">1dp</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="rippleColor">#80cdcdcd</item>
-    </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/brand_aliases.xml b/app/src/main/res/values/brand_aliases.xml
new file mode 100644
index 0000000..69606cf
--- /dev/null
+++ b/app/src/main/res/values/brand_aliases.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Aliases to Material 3 Theme Builder tokens so existing code compiles -->
+    <color name="brand_primary">@color/md_theme_primary</color>
+    <color name="brand_secondary">@color/md_theme_secondary</color>
+    <color name="brand_outline">@color/md_theme_outline</color>
+    <color name="brand_accent">@color/md_theme_secondary</color>
+    <!-- Ripple based on primary (50% alpha) for light theme -->
+    <color name="brand_ripple">#800061A3</color>
+    
+    <!-- Semi-transparent surface container for buttons (70% alpha) - dark theme -->
+    <color name="brand_surface_container_semi">#B31C2026</color>
+
+    <!-- PS2 face button colors (static) -->
+    <color name="ps2_triangle_green">#00D000</color>
+    <color name="ps2_circle_red">#FF3030</color>
+    <color name="ps2_cross_blue">#4080FF</color>
+    <color name="ps2_square_pink">#FF80C0</color>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 78b6cb4..430b364 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,23 +1,143 @@
-<?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>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-
-    <!-- Brand palette derived from psx2_logo2_fixed.xml -->
-    <color name="brand_primary">#33A1FF</color>      <!-- core blue (#FF33A1FF sans alpha) -->
-    <color name="brand_secondary">#7C52FF</color>    <!-- violet (#FF7C52FF sans alpha) -->
-    <color name="brand_accent">#66CCFF</color>       <!-- light blue (#FF66CCFF sans alpha) -->
-    <color name="brand_outline">#8F61FF</color>      <!-- subtle outline glow from logo -->
-    <color name="brand_ripple">#8033A1FF</color>     <!-- 50% alpha ripple of primary -->
-
-    <!-- PS2 face button colors -->
-    <color name="ps2_triangle_green">#00D000</color>
-    <color name="ps2_circle_red">#FF3030</color>
-    <color name="ps2_cross_blue">#4080FF</color>
-    <color name="ps2_square_pink">#FF80C0</color>
-</resources>
\ No newline at end of file
+    <color name="md_theme_primary">#0061A3</color>
+    <color name="md_theme_onPrimary">#FFFFFF</color>
+    <color name="md_theme_primaryContainer">#33A1FF</color>
+    <color name="md_theme_onPrimaryContainer">#00365E</color>
+    <color name="md_theme_secondary">#416184</color>
+    <color name="md_theme_onSecondary">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer">#B4D4FE</color>
+    <color name="md_theme_onSecondaryContainer">#3C5C7F</color>
+    <color name="md_theme_tertiary">#883DA4</color>
+    <color name="md_theme_onTertiary">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer">#CD7DE8</color>
+    <color name="md_theme_onTertiaryContainer">#580375</color>
+    <color name="md_theme_error">#BA1A1A</color>
+    <color name="md_theme_onError">#FFFFFF</color>
+    <color name="md_theme_errorContainer">#FFDAD6</color>
+    <color name="md_theme_onErrorContainer">#93000A</color>
+    <color name="md_theme_background">#F8F9FF</color>
+    <color name="md_theme_onBackground">#181C22</color>
+    <color name="md_theme_surface">#F8F9FF</color>
+    <color name="md_theme_onSurface">#181C22</color>
+    <color name="md_theme_surfaceVariant">#DBE3F0</color>
+    <color name="md_theme_onSurfaceVariant">#404752</color>
+    <color name="md_theme_outline">#707883</color>
+    <color name="md_theme_outlineVariant">#BFC7D4</color>
+    <color name="md_theme_scrim">#000000</color>
+    <color name="md_theme_inverseSurface">#2C3137</color>
+    <color name="md_theme_inverseOnSurface">#EEF1F9</color>
+    <color name="md_theme_inversePrimary">#9ECAFF</color>
+    <color name="md_theme_primaryFixed">#D1E4FF</color>
+    <color name="md_theme_onPrimaryFixed">#001D36</color>
+    <color name="md_theme_primaryFixedDim">#9ECAFF</color>
+    <color name="md_theme_onPrimaryFixedVariant">#00497D</color>
+    <color name="md_theme_secondaryFixed">#D1E4FF</color>
+    <color name="md_theme_onSecondaryFixed">#001D36</color>
+    <color name="md_theme_secondaryFixedDim">#A9C9F2</color>
+    <color name="md_theme_onSecondaryFixedVariant">#28496B</color>
+    <color name="md_theme_tertiaryFixed">#F9D8FF</color>
+    <color name="md_theme_onTertiaryFixed">#330045</color>
+    <color name="md_theme_tertiaryFixedDim">#EEB1FF</color>
+    <color name="md_theme_onTertiaryFixedVariant">#6E228A</color>
+    <color name="md_theme_surfaceDim">#D7DAE2</color>
+    <color name="md_theme_surfaceBright">#F8F9FF</color>
+    <color name="md_theme_surfaceContainerLowest">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow">#F0F3FC</color>
+    <color name="md_theme_surfaceContainer">#EBEEF6</color>
+    <color name="md_theme_surfaceContainerHigh">#E5E8F0</color>
+    <color name="md_theme_surfaceContainerHighest">#DFE2EA</color>
+    <color name="md_theme_primary_mediumContrast">#003861</color>
+    <color name="md_theme_onPrimary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_primaryContainer_mediumContrast">#0070BB</color>
+    <color name="md_theme_onPrimaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondary_mediumContrast">#143859</color>
+    <color name="md_theme_onSecondary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer_mediumContrast">#506F94</color>
+    <color name="md_theme_onSecondaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiary_mediumContrast">#5B0777</color>
+    <color name="md_theme_onTertiary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#994DB4</color>
+    <color name="md_theme_onTertiaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_error_mediumContrast">#740006</color>
+    <color name="md_theme_onError_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_errorContainer_mediumContrast">#CF2C27</color>
+    <color name="md_theme_onErrorContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_background_mediumContrast">#F8F9FF</color>
+    <color name="md_theme_onBackground_mediumContrast">#181C22</color>
+    <color name="md_theme_surface_mediumContrast">#F8F9FF</color>
+    <color name="md_theme_onSurface_mediumContrast">#0D1117</color>
+    <color name="md_theme_surfaceVariant_mediumContrast">#DBE3F0</color>
+    <color name="md_theme_onSurfaceVariant_mediumContrast">#2F3741</color>
+    <color name="md_theme_outline_mediumContrast">#4B535E</color>
+    <color name="md_theme_outlineVariant_mediumContrast">#666E79</color>
+    <color name="md_theme_scrim_mediumContrast">#000000</color>
+    <color name="md_theme_inverseSurface_mediumContrast">#2C3137</color>
+    <color name="md_theme_inverseOnSurface_mediumContrast">#EEF1F9</color>
+    <color name="md_theme_inversePrimary_mediumContrast">#9ECAFF</color>
+    <color name="md_theme_primaryFixed_mediumContrast">#0070BB</color>
+    <color name="md_theme_onPrimaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_primaryFixedDim_mediumContrast">#005794</color>
+    <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixed_mediumContrast">#506F94</color>
+    <color name="md_theme_onSecondaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixedDim_mediumContrast">#37577A</color>
+    <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#994DB4</color>
+    <color name="md_theme_onTertiaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#7D3299</color>
+    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceDim_mediumContrast">#C3C6CE</color>
+    <color name="md_theme_surfaceBright_mediumContrast">#F8F9FF</color>
+    <color name="md_theme_surfaceContainerLowest_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow_mediumContrast">#F0F3FC</color>
+    <color name="md_theme_surfaceContainer_mediumContrast">#E5E8F0</color>
+    <color name="md_theme_surfaceContainerHigh_mediumContrast">#DADDE5</color>
+    <color name="md_theme_surfaceContainerHighest_mediumContrast">#CED2D9</color>
+    <color name="md_theme_primary_highContrast">#002E51</color>
+    <color name="md_theme_onPrimary_highContrast">#FFFFFF</color>
+    <color name="md_theme_primaryContainer_highContrast">#004B80</color>
+    <color name="md_theme_onPrimaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondary_highContrast">#052E4F</color>
+    <color name="md_theme_onSecondary_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer_highContrast">#2A4B6E</color>
+    <color name="md_theme_onSecondaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiary_highContrast">#4C0066</color>
+    <color name="md_theme_onTertiary_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#70258C</color>
+    <color name="md_theme_onTertiaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_error_highContrast">#600004</color>
+    <color name="md_theme_onError_highContrast">#FFFFFF</color>
+    <color name="md_theme_errorContainer_highContrast">#98000A</color>
+    <color name="md_theme_onErrorContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_background_highContrast">#F8F9FF</color>
+    <color name="md_theme_onBackground_highContrast">#181C22</color>
+    <color name="md_theme_surface_highContrast">#F8F9FF</color>
+    <color name="md_theme_onSurface_highContrast">#000000</color>
+    <color name="md_theme_surfaceVariant_highContrast">#DBE3F0</color>
+    <color name="md_theme_onSurfaceVariant_highContrast">#000000</color>
+    <color name="md_theme_outline_highContrast">#252D37</color>
+    <color name="md_theme_outlineVariant_highContrast">#424A55</color>
+    <color name="md_theme_scrim_highContrast">#000000</color>
+    <color name="md_theme_inverseSurface_highContrast">#2C3137</color>
+    <color name="md_theme_inverseOnSurface_highContrast">#FFFFFF</color>
+    <color name="md_theme_inversePrimary_highContrast">#9ECAFF</color>
+    <color name="md_theme_primaryFixed_highContrast">#004B80</color>
+    <color name="md_theme_onPrimaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_primaryFixedDim_highContrast">#00345C</color>
+    <color name="md_theme_onPrimaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixed_highContrast">#2A4B6E</color>
+    <color name="md_theme_onSecondaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixedDim_highContrast">#0F3456</color>
+    <color name="md_theme_onSecondaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#70258C</color>
+    <color name="md_theme_onTertiaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#570074</color>
+    <color name="md_theme_onTertiaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceDim_highContrast">#B5B9C1</color>
+    <color name="md_theme_surfaceBright_highContrast">#F8F9FF</color>
+    <color name="md_theme_surfaceContainerLowest_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow_highContrast">#EEF1F9</color>
+    <color name="md_theme_surfaceContainer_highContrast">#DFE2EA</color>
+    <color name="md_theme_surfaceContainerHigh_highContrast">#D1D4DC</color>
+    <color name="md_theme_surfaceContainerHighest_highContrast">#C3C6CE</color>
+</resources>
diff --git a/app/src/main/res/values/colors_base.xml b/app/src/main/res/values/colors_base.xml
new file mode 100644
index 0000000..d035627
--- /dev/null
+++ b/app/src/main/res/values/colors_base.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="white">#FFFFFFFF</color>
+    <color name="black">#FF000000</color>
+</resources>
diff --git a/app/src/main/res/values/styles_buttons.xml b/app/src/main/res/values/styles_buttons.xml
new file mode 100644
index 0000000..859c94e
--- /dev/null
+++ b/app/src/main/res/values/styles_buttons.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- M3 outlined button (if used anywhere) -->
+    <style name="PSX2.OutlinedButton" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="strokeColor">@color/brand_outline</item>
+        <item name="strokeWidth">1dp</item>
+        <item name="rippleColor">@color/brand_ripple</item>
+        <item name="android:textAllCaps">true</item>
+    </style>
+
+    <!-- M3 elevated button with semi-transparent surface container background and uppercase text -->
+    <style name="PSX2.ElevatedTransparentButton" parent="Widget.Material3.Button.ElevatedButton">
+        <item name="rippleColor">@color/brand_ripple</item>
+        <item name="backgroundTint">@color/brand_surface_container_semi</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="strokeColor">@android:color/transparent</item>
+        <item name="strokeWidth">0dp</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/theme_overlays.xml b/app/src/main/res/values/theme_overlays.xml
new file mode 100644
index 0000000..e81f18f
--- /dev/null
+++ b/app/src/main/res/values/theme_overlays.xml
@@ -0,0 +1,98 @@
+<resources>
+    <style name="ThemeOverlay.AppTheme.MediumContrast" parent="Theme.Material3.Light.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_primary_mediumContrast</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast</item>
+        <item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast</item>
+        <item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast</item>
+        <item name="colorError">@color/md_theme_error_mediumContrast</item>
+        <item name="colorOnError">@color/md_theme_onError_mediumContrast</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_mediumContrast</item>
+        <item name="android:colorBackground">@color/md_theme_background_mediumContrast</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground_mediumContrast</item>
+        <item name="colorSurface">@color/md_theme_surface_mediumContrast</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface_mediumContrast</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_mediumContrast</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_mediumContrast</item>
+        <item name="colorOutline">@color/md_theme_outline_mediumContrast</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant_mediumContrast</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_mediumContrast</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_mediumContrast</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_mediumContrast</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_mediumContrast</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_mediumContrast</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_mediumContrast</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_mediumContrast</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_mediumContrast</item>
+    </style>
+    <style name="ThemeOverlay.AppTheme.HighContrast" parent="Theme.Material3.Light.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_primary_highContrast</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary_highContrast</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_highContrast</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_highContrast</item>
+        <item name="colorSecondary">@color/md_theme_secondary_highContrast</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast</item>
+        <item name="colorTertiary">@color/md_theme_tertiary_highContrast</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast</item>
+        <item name="colorError">@color/md_theme_error_highContrast</item>
+        <item name="colorOnError">@color/md_theme_onError_highContrast</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_highContrast</item>
+        <item name="android:colorBackground">@color/md_theme_background_highContrast</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground_highContrast</item>
+        <item name="colorSurface">@color/md_theme_surface_highContrast</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface_highContrast</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_highContrast</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_highContrast</item>
+        <item name="colorOutline">@color/md_theme_outline_highContrast</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant_highContrast</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_highContrast</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_highContrast</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_highContrast</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_highContrast</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_highContrast</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_highContrast</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_highContrast</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 868e007..ee05449 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,22 +1,52 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="Theme.PSX2" parent="@style/Theme.MaterialComponents.Light.NoActionBar">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowIsTranslucent">false</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation</item>
-        <!-- Apply custom outlined button style globally -->
+<resources>
+    <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="colorPrimary">#9ECAFF</item>
+        <item name="colorOnPrimary">#003258</item>
+        <item name="colorPrimaryContainer">#33A1FF</item>
+        <item name="colorOnPrimaryContainer">#00365E</item>
+        <item name="colorSecondary">#A9C9F2</item>
+        <item name="colorOnSecondary">#0C3253</item>
+        <item name="colorSecondaryContainer">#2A4B6E</item>
+        <item name="colorOnSecondaryContainer">#9BBBE3</item>
+        <item name="colorTertiary">#EEB1FF</item>
+        <item name="colorOnTertiary">#53006F</item>
+        <item name="colorTertiaryContainer">#CD7DE8</item>
+        <item name="colorOnTertiaryContainer">#580375</item>
+        <item name="colorError">#FFB4AB</item>
+        <item name="colorOnError">#690005</item>
+        <item name="colorErrorContainer">#93000A</item>
+        <item name="colorOnErrorContainer">#FFDAD6</item>
+        <item name="android:colorBackground">#0F1419</item>
+        <item name="colorOnBackground">#DFE2EA</item>
+        <item name="colorSurface">#0F1419</item>
+        <item name="colorOnSurface">#DFE2EA</item>
+        <item name="colorSurfaceVariant">#404752</item>
+        <item name="colorOnSurfaceVariant">#BFC7D4</item>
+        <item name="colorOutline">#89919E</item>
+        <item name="colorOutlineVariant">#404752</item>
+        <item name="colorSurfaceInverse">#DFE2EA</item>
+        <item name="colorOnSurfaceInverse">#2C3137</item>
+        <item name="colorPrimaryInverse">#0061A3</item>
+        <item name="colorPrimaryFixed">#D1E4FF</item>
+        <item name="colorOnPrimaryFixed">#001D36</item>
+        <item name="colorPrimaryFixedDim">#9ECAFF</item>
+        <item name="colorOnPrimaryFixedVariant">#00497D</item>
+        <item name="colorSecondaryFixed">#D1E4FF</item>
+        <item name="colorOnSecondaryFixed">#001D36</item>
+        <item name="colorSecondaryFixedDim">#A9C9F2</item>
+        <item name="colorOnSecondaryFixedVariant">#28496B</item>
+        <item name="colorTertiaryFixed">#F9D8FF</item>
+        <item name="colorOnTertiaryFixed">#330045</item>
+        <item name="colorTertiaryFixedDim">#EEB1FF</item>
+        <item name="colorOnTertiaryFixedVariant">#6E228A</item>
+        <item name="colorSurfaceDim">#0F1419</item>
+        <item name="colorSurfaceBright">#353940</item>
+        <item name="colorSurfaceContainerLowest">#0A0E14</item>
+        <item name="colorSurfaceContainerLow">#181C22</item>
+        <item name="colorSurfaceContainer">#1C2026</item>
+        <item name="colorSurfaceContainerHigh">#262A30</item>
+        <item name="colorSurfaceContainerHighest">#31353B</item>
+        <!-- Default MaterialButton styles -->
         <item name="materialButtonOutlinedStyle">@style/PSX2.OutlinedButton</item>
-        <!-- Brand blue for activated controls (RadioButton, Switch, etc.) -->
-        <item name="colorControlActivated">@color/brand_primary</item>
-        <!-- Fallback for platform widgets using accent -->
-        <item name="colorAccent">@color/brand_primary</item>
-    </style>
-
-    <!-- Custom outlined button style with light gray stroke for visibility on dark backgrounds -->
-    <style name="PSX2.OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="strokeColor">@color/brand_outline</item>
-        <item name="strokeWidth">1dp</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="rippleColor">@color/brand_ripple</item>
     </style>
 </resources>