diff --git a/FunKey/board/funkey/sw-description b/FunKey/board/funkey/sw-description
index 87f53b8..28736cb 100644
--- a/FunKey/board/funkey/sw-description
+++ b/FunKey/board/funkey/sw-description
@@ -2,7 +2,7 @@ software =
 {
 	version = "2.1.0";
 
-	hardware-compatibility = [ "#RE:^Rev\.[D-E]$" ];
+	hardware-compatibility = [ "#RE:^Rev\.[D-F]$" ];
 
 	images: (
 	{
diff --git a/FunKey/board/funkey/update_partition b/FunKey/board/funkey/update_partition
index a0d646e..634f02c 100755
--- a/FunKey/board/funkey/update_partition
+++ b/FunKey/board/funkey/update_partition
@@ -9,7 +9,7 @@ root_mount=/tmp/rootfs
 
 do_preinst()
 {
-    notif " 1/5 EXTRACT FIRMWARE UPDATE..^DO NOT TURN OFF THE CONSOLE"
+    notif " 1/4 EXTRACT FIRMWARE UPDATE..^DO NOT TURN OFF THE CONSOLE"
     exit 0
 }
 
@@ -19,7 +19,7 @@ do_postinst()
     #################
     # Resize Rootfs #
     #################
-    notif " 3/5 RESIZE ROOT FILESYSTEM^DO NOT TURN OFF THE CONSOLE"
+    notif " 2/4 RESIZE ROOT FILESYSTEM^DO NOT TURN OFF THE CONSOLE"
     resize2fs ${root_part}
     if [ $? -ne 0 ]; then
     	notif " CANNOT RESIZE ROOT^FILESYSTEM"
@@ -29,7 +29,7 @@ do_postinst()
     ##############################
     # SHARED PARTITION PROCESSES #
     ##############################
-    notif " 4/5 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
+    notif " 3/4 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
     
     # Mount Rootfs
     mkdir -p ${root_mount}
@@ -66,7 +66,7 @@ do_postinst()
     # Erase update file #
     #####################
     for file in $(ls /mnt/FunKey-*.fwu); do
-        notif " 5/5 ERASE UPDATE FILE^DO NOT TURN OFF THE CONSOLE"
+        notif " 4/4 ERASE UPDATE FILE^DO NOT TURN OFF THE CONSOLE"
     	rm -f "${file}"
     done
     exit 0
diff --git a/FunKey/package/FCEUX/FCEUX.mk b/FunKey/package/FCEUX/FCEUX.mk
index 5591164..a679d87 100644
--- a/FunKey/package/FCEUX/FCEUX.mk
+++ b/FunKey/package/FCEUX/FCEUX.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FCEUX_VERSION = 8a54185
+FCEUX_VERSION = b6af0b2
 FCEUX_SITE_METHOD = git
 FCEUX_SITE = https://github.com/FunKey-Project/fceux.git
 FCEUX_LICENSE = GPL-2.0
diff --git a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
index 57dad9d..6d44bb3 100644
--- a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
+++ b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PCSX_REARMED_VERSION = c2f5d2a
+PCSX_REARMED_VERSION = 24d02b6
 PCSX_REARMED_SITE_METHOD = git
 PCSX_REARMED_SITE = https://github.com/FunKey-Project/pcsx_rearmed.git
 PCSX_REARMED_LICENSE = GPL-2.0
diff --git a/FunKey/package/PocketSNES/PocketSNES.mk b/FunKey/package/PocketSNES/PocketSNES.mk
index e7c568e..0dfa138 100644
--- a/FunKey/package/PocketSNES/PocketSNES.mk
+++ b/FunKey/package/PocketSNES/PocketSNES.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-POCKETSNES_VERSION = 09f5c30
+POCKETSNES_VERSION = 10fb949
 POCKETSNES_SITE_METHOD = git
 POCKETSNES_SITE = https://github.com/FunKey-Project/PocketSNES.git
 POCKETSNES_LICENSE = GPL-2.0
diff --git a/FunKey/package/gmenu2x/gmenu2x.mk b/FunKey/package/gmenu2x/gmenu2x.mk
index 8f432bd..40ece34 100644
--- a/FunKey/package/gmenu2x/gmenu2x.mk
+++ b/FunKey/package/gmenu2x/gmenu2x.mk
@@ -3,7 +3,7 @@
 # gmenu2x
 #
 #############################################################
-GMENU2X_VERSION = gmenu2x-FunKey-1.0.2
+GMENU2X_VERSION = 938ebd0
 GMENU2X_SITE_METHOD = git
 GMENU2X_SITE = https://github.com/FunKey-Project/gmenu2x.git
 GMENU2X_LICENSE = GPL-2.0
diff --git a/FunKey/package/gnuboy/gnuboy.mk b/FunKey/package/gnuboy/gnuboy.mk
index 2f04b8f..bf14e8c 100644
--- a/FunKey/package/gnuboy/gnuboy.mk
+++ b/FunKey/package/gnuboy/gnuboy.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUBOY_VERSION = 1905515
+GNUBOY_VERSION = 051950a
 GNUBOY_SITE_METHOD = git
 GNUBOY_SITE = https://github.com/FunKey-Project/gnuboy.git
 GNUBOY_LICENSE = GPL-2.0
diff --git a/FunKey/package/gpsp/gpsp.mk b/FunKey/package/gpsp/gpsp.mk
index 2617da8..a6745e8 100644
--- a/FunKey/package/gpsp/gpsp.mk
+++ b/FunKey/package/gpsp/gpsp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GPSP_VERSION = 31f430c
+GPSP_VERSION = 643b9eb
 GPSP_SITE_METHOD = git
 GPSP_SITE = https://github.com/FunKey-Project/gpsp.git
 GPSP_LICENSE = GPL-2.0
diff --git a/FunKey/package/mednafen/mednafen.mk b/FunKey/package/mednafen/mednafen.mk
index 2788501..61da2b6 100644
--- a/FunKey/package/mednafen/mednafen.mk
+++ b/FunKey/package/mednafen/mednafen.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MEDNAFEN_VERSION = 498e85b
+MEDNAFEN_VERSION = ba18334
 MEDNAFEN_SITE_METHOD = git
 MEDNAFEN_SITE = https://github.com/FunKey-Project/mednafen-git.git
 MEDNAFEN_LICENSE = GPL-2.0+
diff --git a/FunKey/package/picodrive/picodrive.mk b/FunKey/package/picodrive/picodrive.mk
index 8ddc6ff..55189fd 100644
--- a/FunKey/package/picodrive/picodrive.mk
+++ b/FunKey/package/picodrive/picodrive.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PICODRIVE_VERSION = de8a8a23
+PICODRIVE_VERSION = 009d007
 PICODRIVE_SITE_METHOD = git
 PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive-irixxxx.git
 PICODRIVE_LICENSE = MAME
diff --git a/FunKey/package/retrofe/retrofe.mk b/FunKey/package/retrofe/retrofe.mk
index 82a9f51..5bcc757 100644
--- a/FunKey/package/retrofe/retrofe.mk
+++ b/FunKey/package/retrofe/retrofe.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RETROFE_VERSION = RetroFE-FunKey-1.1.0
+RETROFE_VERSION = 152bae7
 RETROFE_SITE_METHOD = git
 RETROFE_SITE = https://github.com/FunKey-Project/RetroFE.git
 RETROFE_DEPENDENCIES = gstreamer1 gst1-plugins-base sdl sdl_image sdl_mixer sdl_sound sdl_ttf libglib2 sqlite zlib
diff --git a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery
index a76f8df..c023ef2 100755
--- a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery
+++ b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery
@@ -18,8 +18,8 @@ case "$1" in
 	    for file in ${updates} ; do
 		swupdate -i "${file}"
 		if [ $? -ne 0 ]; then
-	            menu &
-		    exit 1
+	            notif_disp 10 "         CORRUPTED^        UPDATE FILE"
+		    rm -f "${file}"
 		fi
 	    done
 	    notif "^^^^^^^^      RESTARTING...^^^^^^^^"
diff --git a/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu b/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu
index 88b8b89..c0571fd 100755
--- a/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu
+++ b/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu
@@ -139,8 +139,10 @@ menu_run () {
 		    for file in $(ls /mnt/FunKey-*.fwu); do
 			swupdate -i "${file}"
 			if [ $? -ne 0 ]; then
-			    notif "${message}...^CANNOT UPDATE!"
-			    break
+			    notif_disp 10 "${message}...^         CORRUPTED^        UPDATE FILE"
+			    rm -f "${file}"
+			    notif "^^^^^^^^         RESTARTING...^^^^^^^^"
+			    normal_mode
 			fi
 		    done
 		    message=" USB MOUNT"