diff --git a/app/build.gradle b/app/build.gradle
index ab2aace..d2129b9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.izzy2lost.psx2"
         minSdk 26
         targetSdk 36
-        versionCode 8
-        versionName "1.0.6"
+        versionCode 9
+        versionName "1.0.7"
         // APK
         setProperty("archivesBaseName","PSX2_${versionCode}_${new Date().format('yyyyMMddHHmm')}")
 
diff --git a/app/src/main/java/com/izzy2lost/psx2/MainActivity.java b/app/src/main/java/com/izzy2lost/psx2/MainActivity.java
index 9c3fc07..90441b2 100644
--- a/app/src/main/java/com/izzy2lost/psx2/MainActivity.java
+++ b/app/src/main/java/com/izzy2lost/psx2/MainActivity.java
@@ -425,6 +425,17 @@ public class MainActivity extends AppCompatActivity implements GamesCoverDialogF
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
+        // Force dark mode for consistent appearance
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            // Android 12+ (API 31+)
+            getWindow().getDecorView().getWindowInsetsController().setSystemBarsAppearance(0, 
+                android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS | 
+                android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS);
+        }
+        // Force dark mode using AppCompat
+        androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode(
+            androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES);
+        
         // Enable edge-to-edge for Android 15+ compatibility
         EdgeToEdge.enable(this);
         
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a10639e..8a8653b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,53 +1,57 @@
 <resources>
+    <!-- Force dark theme for light mode - use same colors as night theme -->
     <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>
+        <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>
+        <!-- Force dark status and navigation bars -->
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
     </style>
 
     <!-- Fullscreen Material3 dialog theme with no frame and transparent window background -->
@@ -59,5 +63,7 @@
         <item name="android:windowBackground">?attr/colorSurface</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
     </style>
 </resources>