diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
index db1f808017..03fa1a3a2e 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
@@ -3,6 +3,7 @@
 
 package org.yuzu.yuzu_emu.ui
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
@@ -94,6 +95,7 @@ class GamesFragment : Fragment() {
         return binding.root
     }
 
+    @SuppressLint("NotifyDataSetChanged")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         homeViewModel.setStatusBarShadeVisibility(true)
diff --git a/src/android/app/src/main/res/values-night/yuzu_colors.xml b/src/android/app/src/main/res/values-night/yuzu_colors.xml
index 513245d7c4..d39e1327b0 100644
--- a/src/android/app/src/main/res/values-night/yuzu_colors.xml
+++ b/src/android/app/src/main/res/values-night/yuzu_colors.xml
@@ -226,6 +226,64 @@
     <color name="yuzu_inversePrimary_gray">#B7B7B7</color>
     <color name="yuzu_surfaceTint_gray">#B7B7B7</color>
 
+    <!-- Eden Theme Colors -->
+
+    <!-- Synthwave/Vaporwave Primary Colors -->
+    <color name="eden_primary">#FF0080</color> <!-- Neon magenta -->
+    <color name="eden_primary_variant">#E6006B</color> <!-- Darker magenta -->
+    <color name="eden_secondary">#00FFFF</color> <!-- Electric cyan -->
+    <color name="eden_secondary_variant">#00E6E6</color> <!-- Darker cyan -->
+
+    <!-- Background Colors - Deep space black -->
+    <color name="eden_background">#000000</color> <!-- Pure black background -->
+    <color name="eden_surface">#0D0D0D</color> <!-- Card surface -->
+    <color name="eden_surface_variant">#1A1A1A</color> <!-- Elevated surface -->
+
+    <!-- Text Colors - High contrast for readability -->
+    <color name="eden_on_background">#FFFFFF</color> <!-- Pure white text -->
+    <color name="eden_on_surface">#FFFFFF</color> <!-- Pure white text -->
+    <color name="eden_on_primary">#FFFFFF</color> <!-- White on neon -->
+    <color name="eden_on_secondary">#000000</color> <!-- Black on cyan -->
+
+    <!-- Synthwave Status Colors -->
+    <color name="eden_error">#FF0040</color> <!-- Neon red -->
+    <color name="eden_success">#00FF80</color> <!-- Neon green -->
+    <color name="eden_warning">#FFFF00</color> <!-- Neon yellow -->
+    <color name="eden_info">#0080FF</color> <!-- Electric blue -->
+
+    <!-- Synthwave Accent Colors -->
+    <color name="eden_accent_purple">#9D00FF</color> <!-- Electric purple -->
+    <color name="eden_accent_blue">#0080FF</color> <!-- Electric blue -->
+    <color name="eden_accent_orange">#FF8000</color> <!-- Neon orange -->
+
+    <!-- Neon Glow Effects -->
+    <color name="eden_glow_pink">#80FF0080</color> <!-- Magenta glow -->
+    <color name="eden_glow_cyan">#8060D1F6</color> <!-- Cyan glow -->
+    <color name="eden_glow_orange">#80FF8000</color> <!-- Orange glow -->
+
+    <!-- Neon Border Colors -->
+    <color name="eden_border">#7c757f</color> <!-- Subtle border -->
+    <color name="eden_border_light">#948b98</color> <!-- Lighter border -->
+    <color name="eden_border_gradient_start">#FF0080</color> <!-- Neon magenta -->
+    <color name="eden_border_gradient_end">#60D1F6</color> <!-- Electric cyan -->
+
+    <!-- Overlay Colors -->
+    <color name="eden_overlay">#CC000000</color>
+
+    <!-- Neon Button Colors -->
+    <color name="eden_button_primary_bg">#FF0080</color> <!-- Neon magenta -->
+    <color name="eden_button_secondary_bg">#00000000</color> <!-- Transparent -->
+    <color name="eden_button_secondary_border">#00FFFF</color> <!-- Electric cyan -->
+
+    <!-- Synthwave Card Colors -->
+    <color name="eden_card_background">#0D0D0D</color> <!-- Almost black -->
+    <color name="eden_card_background_elevated">#1A1A1A</color> <!-- Elevated black -->
+
+    <!-- Transparent versions for gradients -->
+    <color name="eden_transparent">#00000000</color>
+    <color name="eden_primary_transparent">#05FF0080</color>
+    <color name="eden_secondary_transparent">#0500FFFF</color>
+
     <!-- Common Colors Across All Themes -->
     <color name="yuzu_transparent_black">#80000000</color>
     <color name="yuzu_outlineVariant">#C6C5D0</color>
diff --git a/src/android/app/src/main/res/values/eden_colors.xml b/src/android/app/src/main/res/values/eden_colors.xml
deleted file mode 100644
index 58041a29f5..0000000000
--- a/src/android/app/src/main/res/values/eden_colors.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Synthwave/Vaporwave Primary Colors -->
-    <color name="eden_primary">#FF0080</color> <!-- Neon magenta -->
-    <color name="eden_primary_variant">#E6006B</color> <!-- Darker magenta -->
-    <color name="eden_secondary">#00FFFF</color> <!-- Electric cyan -->
-    <color name="eden_secondary_variant">#00E6E6</color> <!-- Darker cyan -->
-
-    <!-- Background Colors - Deep space black -->
-    <color name="eden_background">#000000</color> <!-- Pure black background -->
-    <color name="eden_surface">#0D0D0D</color> <!-- Card surface -->
-    <color name="eden_surface_variant">#1A1A1A</color> <!-- Elevated surface -->
-
-    <!-- Text Colors - High contrast for readability -->
-    <color name="eden_on_background">#FFFFFF</color> <!-- Pure white text -->
-    <color name="eden_on_surface">#FFFFFF</color> <!-- Pure white text -->
-    <color name="eden_on_primary">#FFFFFF</color> <!-- White on neon -->
-    <color name="eden_on_secondary">#000000</color> <!-- Black on cyan -->
-
-    <!-- Synthwave Accent Colors -->
-    <color name="eden_accent_pink">#FF0080</color> <!-- Neon magenta -->
-    <color name="eden_accent_purple">#9D00FF</color> <!-- Electric purple -->
-    <color name="eden_accent_blue">#0080FF</color> <!-- Electric blue -->
-    <color name="eden_accent_orange">#FF8000</color> <!-- Neon orange -->
-
-    <!-- Synthwave Gradient Colors -->
-    <color name="eden_gradient_start">#FF0080</color> <!-- Neon magenta -->
-    <color name="eden_gradient_middle">#9D00FF</color> <!-- Electric purple -->
-    <color name="eden_gradient_end">#00FFFF</color> <!-- Electric cyan -->
-
-    <!-- Neon Glow Effects -->
-    <color name="eden_glow_pink">#80FF0080</color> <!-- Magenta glow -->
-    <color name="eden_glow_cyan">#8000FFFF</color> <!-- Cyan glow -->
-    <color name="eden_glow_purple">#809D00FF</color> <!-- Purple glow -->
-    <color name="eden_glow_orange">#80FF8000</color> <!-- Orange glow -->
-
-    <!-- Neon Border Colors -->
-    <color name="eden_border">#7c757f</color> <!-- Subtle border -->
-    <color name="eden_border_light">#948b98</color> <!-- Lighter border -->
-    <color name="eden_border_gradient_start">#FF0080</color> <!-- Neon magenta -->
-    <color name="eden_border_gradient_end">#00FFFF</color> <!-- Electric cyan -->
-
-    <!-- Retro Grid Pattern -->
-    <color name="eden_grid_line">#1A1A1A</color> <!-- Grid lines -->
-    <color name="eden_grid_line_accent">#FF0080</color> <!-- Neon grid lines -->
-    <color name="eden_grid_line_cyan">#00FFFF</color> <!-- Cyan grid lines -->
-
-    <!-- Synthwave Status Colors -->
-    <color name="eden_error">#FF0040</color> <!-- Neon red -->
-    <color name="eden_success">#00FF80</color> <!-- Neon green -->
-    <color name="eden_warning">#FFFF00</color> <!-- Neon yellow -->
-    <color name="eden_info">#0080FF</color> <!-- Electric blue -->
-
-    <!-- Overlay Colors -->
-    <color name="eden_overlay_dark">#CC000000</color>
-    <color name="eden_overlay_medium">#80000000</color>
-    <color name="eden_overlay_light">#33000000</color>
-
-    <!-- Neon Button Colors -->
-    <color name="eden_button_primary_bg">#FF0080</color> <!-- Neon magenta -->
-    <color name="eden_button_secondary_bg">#00000000</color> <!-- Transparent -->
-    <color name="eden_button_secondary_border">#00FFFF</color> <!-- Electric cyan -->
-
-    <!-- Synthwave Card Colors -->
-    <color name="eden_card_background">#0D0D0D</color> <!-- Almost black -->
-    <color name="eden_card_background_elevated">#1A1A1A</color> <!-- Elevated black -->
-
-    <!-- Retro Navigation Colors -->
-    <color name="eden_nav_background">#000000</color> <!-- Pure black -->
-    <color name="eden_nav_selected">#FF0080</color> <!-- Neon magenta -->
-    <color name="eden_nav_unselected">#666666</color> <!-- Gray -->
-
-    <!-- Transparent versions for gradients -->
-    <color name="eden_transparent">#00000000</color>
-    <color name="eden_primary_transparent">#05FF0080</color>
-    <color name="eden_secondary_transparent">#0500FFFF</color>
-
-    <!-- Additional Synthwave Colors -->
-    <color name="eden_scan_line">#33FF0080</color> <!-- Scan line effect -->
-    <color name="eden_hologram">#1A00FFFF</color> <!-- Holographic effect -->
-    <color name="eden_neon_outline">#FFFF0080</color> <!-- Neon outline -->
-
-</resources>
\ No newline at end of file
diff --git a/src/android/app/src/main/res/values/themes.xml b/src/android/app/src/main/res/values/themes.xml
index 7f14c2205d..a0d194ab58 100644
--- a/src/android/app/src/main/res/values/themes.xml
+++ b/src/android/app/src/main/res/values/themes.xml
@@ -64,7 +64,7 @@
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowLightNavigationBar">false</item>
         <!-- Other theme attributes -->
-        <item name="android:shadowColor">@color/eden_overlay_dark</item>
+        <item name="android:shadowColor">@color/eden_overlay</item>
         <item name="sliderStyle">@style/EdenSlider</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:enforceStatusBarContrast">false</item>
diff --git a/src/android/app/src/main/res/values/yuzu_colors.xml b/src/android/app/src/main/res/values/yuzu_colors.xml
index a5af0886a9..3bb98e5410 100644
--- a/src/android/app/src/main/res/values/yuzu_colors.xml
+++ b/src/android/app/src/main/res/values/yuzu_colors.xml
@@ -221,6 +221,64 @@
     <color name="yuzu_inversePrimary_gray">#BDBDBD</color>
     <color name="yuzu_surfaceTint_gray">#9E9E9E</color>
 
+    <!-- Eden Theme Colors -->
+
+    <!-- Synthwave/Vaporwave Primary Colors -->
+    <color name="eden_primary">#FF0080</color> <!-- Neon magenta -->
+    <color name="eden_primary_variant">#E6006B</color> <!-- Darker magenta -->
+    <color name="eden_secondary">#60D1F6</color> <!-- Electric cyan -->
+    <color name="eden_secondary_variant">#00E6E6</color> <!-- Darker cyan -->
+
+    <!-- Background Colors - White -->
+    <color name="eden_background">#FFFFFF</color> <!-- Pure black background -->
+    <color name="eden_surface">#FFFFFF</color> <!-- Card surface -->
+    <color name="eden_surface_variant">#D3D3D3</color> <!-- Elevated surface -->
+
+    <!-- Text Colors - High contrast for readability -->
+    <color name="eden_on_background">#000000</color> <!-- Pure black text -->
+    <color name="eden_on_surface">#000000</color> <!-- Pure black text -->
+    <color name="eden_on_primary">#FFFFFF</color> <!-- White on neon -->
+    <color name="eden_on_secondary">#C0C0C0</color> <!-- Milky White on cyan -->
+
+    <!-- Synthwave Accent Colors -->
+    <color name="eden_accent_purple">#9D00FF</color> <!-- Electric purple -->
+    <color name="eden_accent_blue">#0080FF</color> <!-- Electric blue -->
+    <color name="eden_accent_orange">#FF8000</color> <!-- Neon orange -->
+
+    <!-- Neon Glow Effects -->
+    <color name="eden_glow_pink">#80FF0080</color> <!-- Magenta glow -->
+    <color name="eden_glow_cyan">#8060D1F6</color> <!-- Cyan glow -->
+    <color name="eden_glow_orange">#80FF8000</color> <!-- Orange glow -->
+
+    <!-- Neon Border Colors -->
+    <color name="eden_border">#7c757f</color> <!-- Subtle border -->
+    <color name="eden_border_light">#948b98</color> <!-- Lighter border -->
+    <color name="eden_border_gradient_start">#FF0080</color> <!-- Neon magenta -->
+    <color name="eden_border_gradient_end">#60D1F6</color> <!-- Electric cyan -->
+
+    <!-- Synthwave Status Colors -->
+    <color name="eden_error">#FF0040</color> <!-- Neon red -->
+    <color name="eden_success">#00FF80</color> <!-- Neon green -->
+    <color name="eden_warning">#FFFF00</color> <!-- Neon yellow -->
+    <color name="eden_info">#0080FF</color> <!-- Electric blue -->
+
+    <!-- Overlay Colors -->
+    <color name="eden_overlay">#CCFFFFFF</color>
+
+    <!-- Neon Button Colors -->
+    <color name="eden_button_primary_bg">#FF0080</color> <!-- Neon magenta -->
+    <color name="eden_button_secondary_bg">#00000000</color> <!-- Transparent -->
+    <color name="eden_button_secondary_border">#60D1F6</color> <!-- Electric cyan -->
+
+    <!-- Synthwave Card Colors -->
+    <color name="eden_card_background">#F0F0F0</color> <!-- Almost white -->
+    <color name="eden_card_background_elevated">#D8D8D8</color> <!-- Elevated white -->
+
+    <!-- Transparent versions for gradients -->
+    <color name="eden_transparent">#00000000</color>
+    <color name="eden_primary_transparent">#05FF0080</color>
+    <color name="eden_secondary_transparent">#0500FFFF</color>
+
     <!-- Common Colors Across All Themes -->
     <color name="yuzu_outlineVariant">#C6C5D0</color>
     <color name="yuzu_error">#BA1A1A</color>
@@ -230,7 +288,8 @@
     <color name="yuzu_shadow">#000000</color>
     <color name="yuzu_scrim">#000000</color>
     <color name="yuzu_transparent_black">#80000000</color>
-    <!-- Values used in dark mode but here are jsut white / black values-->
+
+    <!-- Values used in dark mode but here are just white / black values-->
     <color name="yuzu_onPrimary_blue">#FFFFFF</color>
     <color name="yuzu_onSecondary_blue">#FFFFFF</color>
     <color name="yuzu_onTertiary_blue">#FFFFFF</color>