diff --git a/Assets/retro-esp32/logos/logo3d.gif b/Assets/retro-esp32/logos/logo3d.gif
index 12f0ecd7..c78d68db 100644
Binary files a/Assets/retro-esp32/logos/logo3d.gif and b/Assets/retro-esp32/logos/logo3d.gif differ
diff --git a/Emulators/handy-go/sdkconfig b/Emulators/handy-go/sdkconfig
index 3ed7fd0d..895a6022 100755
--- a/Emulators/handy-go/sdkconfig
+++ b/Emulators/handy-go/sdkconfig
@@ -83,10 +83,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
-CONFIG_DEFAULT_MENU_KEY=y
-CONFIG_COMBO_MENU_KEY=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
+CONFIG_DEFAULT_MENU_KEY=
+CONFIG_COMBO_MENU_KEY=y
 CONFIG_IN_GAME_MENU_YES=y
 CONFIG_IN_GAME_MENU_NO=
 
diff --git a/Firmware/Assets/retro-esp32.jpg b/Firmware/Assets/retro-esp32.jpg
index 7854f1ab..42cac366 100755
Binary files a/Firmware/Assets/retro-esp32.jpg and b/Firmware/Assets/retro-esp32.jpg differ
diff --git a/Firmware/Assets/retro-esp32.psd b/Firmware/Assets/retro-esp32.psd
index 7ab7b40f..fbad8406 100755
Binary files a/Firmware/Assets/retro-esp32.psd and b/Firmware/Assets/retro-esp32.psd differ
diff --git a/Firmware/Assets/retro-esp32.raw b/Firmware/Assets/retro-esp32.raw
index a6cbd37e..57015e7a 100755
Binary files a/Firmware/Assets/retro-esp32.raw and b/Firmware/Assets/retro-esp32.raw differ
diff --git a/Firmware/Releases/odroid-go.zip b/Firmware/Releases/odroid-go.zip
index 6e950129..d4917b46 100755
Binary files a/Firmware/Releases/odroid-go.zip and b/Firmware/Releases/odroid-go.zip differ
diff --git a/Firmware/Releases/odroid-go/Retro ESP32.fw b/Firmware/Releases/odroid-go/Retro ESP32.fw
index 1404ee93..461dca99 100644
Binary files a/Firmware/Releases/odroid-go/Retro ESP32.fw and b/Firmware/Releases/odroid-go/Retro ESP32.fw differ
diff --git a/Firmware/Releases/retro-esp.zip b/Firmware/Releases/retro-esp.zip
index c5f64f65..b14789dd 100755
Binary files a/Firmware/Releases/retro-esp.zip and b/Firmware/Releases/retro-esp.zip differ
diff --git a/Firmware/Releases/retro-esp/Retro ESP32.fw b/Firmware/Releases/retro-esp/Retro ESP32.fw
index c8e9feab..6f9a00f0 100644
Binary files a/Firmware/Releases/retro-esp/Retro ESP32.fw and b/Firmware/Releases/retro-esp/Retro ESP32.fw differ
diff --git a/Launchers/retro-esp32/main/includes/definitions.h b/Launchers/retro-esp32/main/includes/definitions.h
index 99a56c90..bfe4b3ff 100755
--- a/Launchers/retro-esp32/main/includes/definitions.h
+++ b/Launchers/retro-esp32/main/includes/definitions.h
@@ -31,6 +31,8 @@
 */
 #define MAX_FILES 8192
 #define MAX_LENGTH 64
+#define MAX_FILES_LIST 512
+
 
 /*
 
@@ -42,7 +44,7 @@
 /*
 
 */
-#define BUILD "Version 2 Build 5 (v.2.5)"
+#define BUILD "Version 2 Build 6 (v.2.6)"
 
 
 #define _GNU_SOURCE
diff --git a/Launchers/retro-esp32/main/main.c b/Launchers/retro-esp32/main/main.c
index 8295cc13..4725b5eb 100755
--- a/Launchers/retro-esp32/main/main.c
+++ b/Launchers/retro-esp32/main/main.c
@@ -1382,7 +1382,7 @@
     ROMS.total = 0;
 
     free(FAVORITES);
-    FAVORITES = (char**)malloc((100) * sizeof(void*));
+    FAVORITES = (char**)malloc((MAX_FILES_LIST) * sizeof(void*));
 
     char file[256] = "/sd/odroid/data";
     sprintf(file, "%s/%s", file, RETROESP_FOLDER);
@@ -1416,7 +1416,7 @@
     } 
 
     free(FAVORITES);
-    FAVORITES = (char**)malloc((100) * sizeof(void*));
+    FAVORITES = (char**)malloc((MAX_FILES_LIST) * sizeof(void*));
 
     for(int n = 0; n < ROMS.total; n++) {
       size_t len = strlen(TEMP[n]);                                               
@@ -1667,7 +1667,7 @@
     ROMS.total = 0;
 
     free(RECENTS);
-    RECENTS = (char**)malloc((100) * sizeof(void*));
+    RECENTS = (char**)malloc((MAX_FILES_LIST) * sizeof(void*));
 
     char file[256] = "/sd/odroid/data";
     sprintf(file, "%s/%s", file, RETROESP_FOLDER);
@@ -1701,7 +1701,7 @@
     } 
 
     free(RECENTS);
-    RECENTS = (char**)malloc((100) * sizeof(void*));
+    RECENTS = (char**)malloc((MAX_FILES_LIST) * sizeof(void*));
 
     for(int n = 0; n < ROMS.total; n++) {
       size_t len = strlen(TEMP[n]);                                               
diff --git a/Launchers/retro-esp32/main/sprites/logo3d.h b/Launchers/retro-esp32/main/sprites/logo3d.h
index f03af8d2..9d743628 100644
--- a/Launchers/retro-esp32/main/sprites/logo3d.h
+++ b/Launchers/retro-esp32/main/sprites/logo3d.h
@@ -11,9 +11,9 @@ const uint16_t logo3d[38][155] = {
 	{0,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,65535,0,0,0,0,0,0,0,0,0,0,16904,16904,16904,16904,16904,16904,65535,65535,0,0,0,0,0,0,0,0,0,0,65535,65535},
 	{0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,65535,0,0,0,0,0,0,0,0,0,16904,16904,16904,16904,16904,16904,65535,65535,0,0,0,0,0,0,0,0,0,0,65535,65535},
 	{0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,33808,33808,33808,33808,33808,33808,33808,33808,65535,65535,0,0,16904,16904,16904,16904,16904,16904,65535,65535,0,0,0,0,65535,65535,0,0,0,0,65535,65535},
-	{0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,0,0,0,0,0,0,65535,65535,65535,0,0,0,0,0,65535,65535,0,0,0,0,0,0,65535,65535,65535,65535,0,0,0,0,0,65535,65535,65535,0,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,33808,33808,33808,33808,33808,33808,33808,33808,65535,65535,65535,65535,0,0,16904,16904,16904,16904,16904,16904,65535,65535,0,0,65535,65535,65535,65535,0,0,0,0,65535,65535},
-	{65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,0,0,65535,65535,65535,65535,65535,65535,0,0,65535,65535,65535,0,0,65535,0,0,65535,65535,65535,0,0,65535,65535,0,0,65535,65535,65535,0,0,65535,0,0,65535,65535,65535,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,33808,33808,33808,33808,33808,33808,33808,33808,65535,65535,65535,65535,65535,65535,33808,33808,33808,33808,33808,33808,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0,65535,65535,65535,65535},
-	{65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,0,0,65535,65535,65535,65535,65535,65535,0,0,65535,65535,65535,0,0,65535,0,0,65535,65535,65535,0,0,65535,65535,0,0,65535,65535,65535,0,0,65535,0,0,65535,65535,65535,0,0,65535,65535,65535,65535,65535,65535,65535,33808,33808,33808,33808,33808,33808,33808,33808,65535,65535,65535,65535,0,0,65535,65535,33808,33808,33808,33808,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0,65535,65535,65535,65535,65535,65535},
+	{0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,0,0,0,0,0,0,65535,65535,65535,0,0,0,0,0,65535,65535,0,0,0,0,0,0,65535,65535,65535,65535,0,0,0,0,0,65535,65535,65535,0,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,33808,33808,33808,33808,33808,33808,33808,33808,65535,65535,65535,65535,0,0,16904,16904,16904,16904,16904,16904,65535,65535,0,0,0,0,65535,65535,0,0,0,0,65535,65535},
+	{65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,0,0,65535,65535,65535,65535,65535,65535,0,0,65535,65535,65535,0,0,65535,0,0,65535,65535,65535,0,0,65535,65535,0,0,65535,65535,65535,0,0,65535,0,0,65535,65535,65535,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,33808,33808,33808,33808,33808,33808,33808,33808,65535,65535,65535,65535,65535,65535,33808,33808,33808,33808,33808,33808,65535,65535,65535,65535,0,0,0,0,0,0,0,0,65535,65535,65535,65535},
+	{65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,0,0,65535,65535,65535,65535,65535,65535,0,0,65535,65535,65535,0,0,65535,0,0,65535,65535,65535,0,0,65535,65535,0,0,65535,65535,65535,0,0,65535,0,0,65535,65535,65535,0,0,65535,65535,65535,65535,65535,65535,65535,33808,33808,33808,33808,33808,33808,33808,33808,65535,65535,65535,65535,0,0,65535,65535,33808,33808,33808,33808,65535,65535,65535,65535,65535,65535,0,0,0,0,0,0,65535,65535,65535,65535,65535,65535},
 	{65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,65535,65535,65535,65535,65535,0,0,0,65535,65535,65535,0,0,0,65535,65535,65535,65535,65535,65535,0,0,65535,65535,65535,65535,65535,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,65535,0,0,0,0,0,65535,65535,65535,65535,0,0,0,65535,65535,65535,65535,0,0,65535,65535,65535,0,0,65535,65535,65535,65535,65535,0,0,0,65535,65535,65535,65535,65535,0,0,0,65535,65535,65535,65535,65535,65535,33808,33808,33808,33808,33808,33808,33808,33808,65535,65535,65535,65535,0,0,0,0,65535,65535,33808,33808,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535},
 	{65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,0,0,0,65535,65535,65535,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,65535,65535,65535,65535,0,0,0,65535,65535,65535,0,65535,65535,65535,0,0,0,0,0,0,65535,65535,65535,65535,65535,65535,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,65535,65535,0,0,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,0,0,65535,65535,0,0,0,65535,65535,65535,65535,65535,65535,33808,33808,33808,33808,33808,33808,33808,33808,65535,65535,65535,65535,0,0,0,0,0,0,65535,65535,65535,65535,65535,65535,0,0,65535,65535,65535,65535,0,0,65535,65535,65535,65535,65535,65535,65535,65535,0,0},
 	{65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,65535,65535,65535,65535,65535,65535,65535,0,0,65535,65535,65535,65535,0,0,65535,65535,65535,0,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,0,0,65535,65535,65535,65535,65535,65535,0,0,65535,65535,65535,0,0,65535,0,0,65535,65535,65535,65535,65535,65535,65535,0,0,65535,65535,65535,0,0,65535,0,0,65535,65535,65535,65535,65535,65535,65535,65535,16904,16904,16904,16904,16904,16904,65535,65535,65535,65535,0,0,0,0,0,0,0,0,65535,65535,65535,65535,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0},
diff --git a/Launchers/retro-esp32/sdkconfig b/Launchers/retro-esp32/sdkconfig
index 3e9e65e9..1d6df2a4 100644
--- a/Launchers/retro-esp32/sdkconfig
+++ b/Launchers/retro-esp32/sdkconfig
@@ -38,7 +38,7 @@ CONFIG_FLASH_ENCRYPTION_ENABLED=
 #
 # Serial flasher config
 #
-CONFIG_ESPTOOLPY_PORT="/dev/cu.SLAB_USBtoUART"
+CONFIG_ESPTOOLPY_PORT="/dev/cu.usbserial-AB0JESEM"
 CONFIG_ESPTOOLPY_BAUD_115200B=
 CONFIG_ESPTOOLPY_BAUD_230400B=
 CONFIG_ESPTOOLPY_BAUD_921600B=
@@ -83,10 +83,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
-CONFIG_DEFAULT_MENU_KEY=y
-CONFIG_COMBO_MENU_KEY=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
+CONFIG_DEFAULT_MENU_KEY=
+CONFIG_COMBO_MENU_KEY=y
 
 #
 # Partition Table
diff --git a/Launchers/retro-esp32/sdkconfig.old b/Launchers/retro-esp32/sdkconfig.old
index e8ba0e79..1d6df2a4 100644
--- a/Launchers/retro-esp32/sdkconfig.old
+++ b/Launchers/retro-esp32/sdkconfig.old
@@ -38,7 +38,7 @@ CONFIG_FLASH_ENCRYPTION_ENABLED=
 #
 # Serial flasher config
 #
-CONFIG_ESPTOOLPY_PORT="/dev/cu.SLAB_USBtoUART "
+CONFIG_ESPTOOLPY_PORT="/dev/cu.usbserial-AB0JESEM"
 CONFIG_ESPTOOLPY_BAUD_115200B=
 CONFIG_ESPTOOLPY_BAUD_230400B=
 CONFIG_ESPTOOLPY_BAUD_921600B=
@@ -83,10 +83,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
-CONFIG_DEFAULT_MENU_KEY=y
-CONFIG_COMBO_MENU_KEY=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
+CONFIG_DEFAULT_MENU_KEY=
+CONFIG_COMBO_MENU_KEY=y
 
 #
 # Partition Table