diff --git a/FunKey/board/funkey/rootfs-overlay/etc/hwrevision b/FunKey/board/funkey/rootfs-overlay/etc/hwrevision
index 0e1749c..2556686 100644
--- a/FunKey/board/funkey/rootfs-overlay/etc/hwrevision
+++ b/FunKey/board/funkey/rootfs-overlay/etc/hwrevision
@@ -1 +1 @@
-FunKey_S	Rev.E
+FunKey_S	Rev.F
diff --git a/FunKey/board/funkey/rootfs-overlay/etc/issue b/FunKey/board/funkey/rootfs-overlay/etc/issue
index 4e12cc2..d8e1e20 100644
--- a/FunKey/board/funkey/rootfs-overlay/etc/issue
+++ b/FunKey/board/funkey/rootfs-overlay/etc/issue
@@ -5,6 +5,6 @@
 |___|    |_____|__|__||__|\__||_____|___  |
          FUN ON A KEYCHAIN          |_____|
  -----------------------------------------------------
- Version 2.1.0
+ Version 2.2.0
  -----------------------------------------------------
 
diff --git a/FunKey/board/funkey/rootfs-overlay/etc/os-release b/FunKey/board/funkey/rootfs-overlay/etc/os-release
index 4166909..946739f 100644
--- a/FunKey/board/funkey/rootfs-overlay/etc/os-release
+++ b/FunKey/board/funkey/rootfs-overlay/etc/os-release
@@ -1,12 +1,12 @@
 NAME="FunKey-OS"
-VERSION="2.1.0 (Cruising Chicken)"
+VERSION="2.2.0 (Pyromaniac Penguin)"
 ID=funkey
 ID_LIKE=buildroot
-PRETTY_NAME="FunKey-OS 2.1.0"
-VERSION_ID="2.1.0"
+PRETTY_NAME="FunKey-OS 2.2.0"
+VERSION_ID="2.2.0"
 HOME_URL="https://www.funkey-project.com/"
 SUPPORT_URL="https://www.funkey-project.com/"
 BUG_REPORT_URL="https://www.funkey-project.com/"
 PRIVACY_POLICY_URL="https://www.funkey-project.com"
-VERSION_CODENAME=Cruising
-UBUNTU_CODENAME=Cruising
+VERSION_CODENAME=Pyromaniac
+UBUNTU_CODENAME=Pyromaniac
diff --git a/FunKey/board/funkey/rootfs-overlay/etc/sw-versions b/FunKey/board/funkey/rootfs-overlay/etc/sw-versions
index dffaffb..0730586 100644
--- a/FunKey/board/funkey/rootfs-overlay/etc/sw-versions
+++ b/FunKey/board/funkey/rootfs-overlay/etc/sw-versions
@@ -1 +1 @@
-rootfs	2.1.0
+rootfs	2.2.0
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher
index d7158d1..ea37a12 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher
@@ -60,8 +60,11 @@ while true; do
 		wait $!
 		erase_pid
 
-		# In case retrofe quits with errors, clear graphic VT
+		# In case retrofe/opkrun quits with errors, clear graphic VT
 		termfix_all
+
+		# In case retrofe/opkrun quits with errors, reset default key mapping
+		keymap reset
     fi
 
     # WD to prevent 100% CPU
diff --git a/FunKey/board/funkey/sw-description b/FunKey/board/funkey/sw-description
index f45b552..0d96bb2 100644
--- a/FunKey/board/funkey/sw-description
+++ b/FunKey/board/funkey/sw-description
@@ -1,8 +1,8 @@
 software =
 {
-	version = "2.1.0";
+	version = "2.2.0";
 
-	hardware-compatibility = [ "#RE:^Rev\.[D-E]$" ];
+	hardware-compatibility = [ "#RE:^Rev\.[D-F]$" ];
 
 	images: (
 	{
@@ -13,12 +13,6 @@ software =
 		compressed = "zlib";
 	}
 	);
-	files: (
-	{
-		filename = "funkey_gpio_management";
-		path = "/tmp/funkey_gpio_management";
-	}
-	);
 	scripts: (
 	{
 		filename = "update_partition";
diff --git a/FunKey/board/funkey/update_partition b/FunKey/board/funkey/update_partition
index 1a86c34..634f02c 100755
--- a/FunKey/board/funkey/update_partition
+++ b/FunKey/board/funkey/update_partition
@@ -9,35 +9,27 @@ 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
 }
 
 do_postinst()
 {
-    ################
-    # Fix recovery #
-    ################
-    notif " 2/5 FIX RECOVERY GPIO MANAGER"
-    rw
-    cp -a /tmp/funkey_gpio_management /usr/local/sbin/
-    chmod +x /usr/local/sbin/funkey_gpio_management
-    ro
-    
+
     #################
     # 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"
     	exit 1
     fi
 
-    #############
-    # Copy OPKs #
-    #############
-    notif " 4/5 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
+    ##############################
+    # SHARED PARTITION PROCESSES #
+    ##############################
+    notif " 3/4 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
     
     # Mount Rootfs
     mkdir -p ${root_mount}
@@ -48,12 +40,10 @@ do_postinst()
     fi
     
     # Copy OPKs
-    shared_partition=/mnt/
-    mkdir -p "$shared_partition"
-    cp -r ${root_mount}/usr/local/share/OPKs/* "$shared_partition"
+    cp -r ${root_mount}/usr/local/share/OPKs/* /mnt
 
     # Fix PCE opk name if necessary
-    mv "$shared_partition"/Emulators/pce_mednaefn_funkey-s.opk "$shared_partition"/Emulators/pce_mednafen_funkey-s.opk 1>/dev/null 2>&1
+    mv /mnt/Emulators/pce_mednaefn_funkey-s.opk /mnt/Emulators/pce_mednafen_funkey-s.opk 1>/dev/null 2>&1
 
     # Unmount Rootfs
     umount ${root_mount}
@@ -62,11 +52,21 @@ do_postinst()
     	exit 1
     fi
 
+    # Change FunKey config files extension from .cfg to .fkcfg
+    SAVEIFS=$IFS
+    IFS=$(echo -en "\n\b")
+    for FOLDER in "Atari lynx" "Game Boy" "Game Boy Advance" "Game Boy Color" "Game Gear" "Neo Geo Pocket" "NES" "PCE-TurboGrafx" "PS1" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan"; do
+        for FILE in $(ls /mnt/"${FOLDER}"/*.cfg 2>/dev/null); do
+            mv "$FILE" "${FILE%.cfg}.fkcfg"
+        done
+    done
+    IFS=$SAVEIFS
+
     #####################
     # 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/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig
index d4a5802..6ec9ebc 100644
--- a/FunKey/configs/funkey_defconfig
+++ b/FunKey/configs/funkey_defconfig
@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/FunKey-Project/linux/archive/linux-FunKey-1.0.1.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/FunKey-Project/linux/archive/refs/tags/linux-FunKey-1.0.2.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/linux.config"
 BR2_LINUX_KERNEL_LZO=y
diff --git a/FunKey/package/FCEUX/FCEUX.mk b/FunKey/package/FCEUX/FCEUX.mk
index 8ff174c..8e8d7db 100644
--- a/FunKey/package/FCEUX/FCEUX.mk
+++ b/FunKey/package/FCEUX/FCEUX.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FCEUX_VERSION = fceux-FunKey-1.2.0
+FCEUX_VERSION = fceux-FunKey-1.2.1
 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 7750a83..d84acce 100644
--- a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
+++ b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PCSX_REARMED_VERSION = pcsx_rearmed-FunKey-1.2.0
+PCSX_REARMED_VERSION = pcsx_rearmed-FunKey-1.2.1
 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 fc20e95..fd90c33 100644
--- a/FunKey/package/PocketSNES/PocketSNES.mk
+++ b/FunKey/package/PocketSNES/PocketSNES.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-POCKETSNES_VERSION = PocketSNES-FunKey-1.2.0
+POCKETSNES_VERSION = PocketSNES-FunKey-1.2.1
 POCKETSNES_SITE_METHOD = git
 POCKETSNES_SITE = https://github.com/FunKey-Project/PocketSNES.git
 POCKETSNES_LICENSE = GPL-2.0
diff --git a/FunKey/package/commander/commander.mk b/FunKey/package/commander/commander.mk
index fcd005f..bb24cd1 100644
--- a/FunKey/package/commander/commander.mk
+++ b/FunKey/package/commander/commander.mk
@@ -3,7 +3,7 @@
 # commander
 #
 #############################################################
-COMMANDER_VERSION = 936c912
+COMMANDER_VERSION = commander-FunKey-1.1.0
 COMMANDER_SITE_METHOD = git
 COMMANDER_SITE = https://github.com/FunKey-Project/commander.git
 COMMANDER_LICENSE = GPL-2.0
diff --git a/FunKey/package/fkgpiod/fkgpiod.mk b/FunKey/package/fkgpiod/fkgpiod.mk
index 7fbabd9..4ca8ffb 100644
--- a/FunKey/package/fkgpiod/fkgpiod.mk
+++ b/FunKey/package/fkgpiod/fkgpiod.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FKGPIOD_VERSION = 54d1051
+FKGPIOD_VERSION = fkgpiod-FunKey-1.0.0
 FKGPIOD_SITE_METHOD = git
 FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git
 FKGPIOD_SITE_LICENSE = GPL-2.1+
diff --git a/FunKey/package/gmenu2x/gmenu2x.mk b/FunKey/package/gmenu2x/gmenu2x.mk
index 8f432bd..f4c037b 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 = gmenu2x-FunKey-1.0.3
 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 3467b27..adda50b 100644
--- a/FunKey/package/gnuboy/gnuboy.mk
+++ b/FunKey/package/gnuboy/gnuboy.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUBOY_VERSION = gnuboy-FunKey-1.2.0
+GNUBOY_VERSION = gnuboy-FunKey-1.2.1
 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 1adeb19..40b6843 100644
--- a/FunKey/package/gpsp/gpsp.mk
+++ b/FunKey/package/gpsp/gpsp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GPSP_VERSION = gpsp-FunKey-1.2.0
+GPSP_VERSION = gpsp-FunKey-1.2.1
 GPSP_SITE_METHOD = git
 GPSP_SITE = https://github.com/FunKey-Project/gpsp.git
 GPSP_LICENSE = GPL-2.0
diff --git a/FunKey/package/libopk/libopk.mk b/FunKey/package/libopk/libopk.mk
index 7d93881..53b4bdc 100644
--- a/FunKey/package/libopk/libopk.mk
+++ b/FunKey/package/libopk/libopk.mk
@@ -3,8 +3,7 @@
 # libopk
 #
 #############################################################
-#LIBOPK_VERSION = libopk-FunKey-1.0.1
-LIBOPK_VERSION = 43e8380
+LIBOPK_VERSION = libopk-FunKey-1.0.2
 LIBOPK_SITE_METHOD = git
 LIBOPK_SITE = https://github.com/FunKey-Project/libopk.git
 
diff --git a/FunKey/package/mednafen/mednafen.mk b/FunKey/package/mednafen/mednafen.mk
index 3f11a43..8de4762 100644
--- a/FunKey/package/mednafen/mednafen.mk
+++ b/FunKey/package/mednafen/mednafen.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MEDNAFEN_VERSION = mednafen-git-FunKey-1.2.0
+MEDNAFEN_VERSION = mednafen-git-FunKey-1.2.1
 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 48d59d1..a2a7e50 100644
--- a/FunKey/package/picodrive/picodrive.mk
+++ b/FunKey/package/picodrive/picodrive.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PICODRIVE_VERSION = picodrive-FunKey-1.2.1
+PICODRIVE_VERSION = picodrive-FunKey-1.2.2
 PICODRIVE_SITE_METHOD = git
 PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive.git
 PICODRIVE_LICENSE = MAME
diff --git a/FunKey/package/retrofe/retrofe.mk b/FunKey/package/retrofe/retrofe.mk
index 82a9f51..1140671 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 = RetroFE-FunKey-1.1.2
 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/README.md b/README.md
index 9d3db06..1d654ad 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![FunKey-OS Build](https://github.com/FunKey-Project/FunKey-OS/workflows/FunKey-OS%20Build/badge.svg)
+<!-- ![FunKey-OS Build](https://github.com/FunKey-Project/FunKey-OS/workflows/FunKey-OS%20Build/badge.svg) -->
 # FunKey-OS
 
 ## Intro
diff --git a/Recovery/board/funkey/rootfs-overlay/etc/hwrevision b/Recovery/board/funkey/rootfs-overlay/etc/hwrevision
index 0e1749c..2556686 100644
--- a/Recovery/board/funkey/rootfs-overlay/etc/hwrevision
+++ b/Recovery/board/funkey/rootfs-overlay/etc/hwrevision
@@ -1 +1 @@
-FunKey_S	Rev.E
+FunKey_S	Rev.F
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/etc/issue b/Recovery/board/funkey/rootfs-overlay/etc/issue
index 62edbca..d2e81a5 100644
--- a/Recovery/board/funkey/rootfs-overlay/etc/issue
+++ b/Recovery/board/funkey/rootfs-overlay/etc/issue
@@ -5,6 +5,6 @@
 |___|    |_____|__|__||__|\__||_____|___  |
          FUN ON A KEYCHAIN          |_____|
  -----------------------------------------------------
- Version 2.0.0 (Recovery)
+ Version 2.1.0 (Recovery)
  -----------------------------------------------------
 
diff --git a/Recovery/board/funkey/rootfs-overlay/etc/os-release b/Recovery/board/funkey/rootfs-overlay/etc/os-release
index 8a1fa48..b8841f8 100644
--- a/Recovery/board/funkey/rootfs-overlay/etc/os-release
+++ b/Recovery/board/funkey/rootfs-overlay/etc/os-release
@@ -1,12 +1,12 @@
 NAME="FunKey-OS Recovery"
-VERSION="2.0.0 (Rowdy Rabbit)"
+VERSION="2.1.0 (Hoopy Hawk)"
 ID=funkey-recovery
 ID_LIKE=buildroot
-PRETTY_NAME="FunKey-OS Recovery 2.0.0"
-VERSION_ID="2.0.0"
+PRETTY_NAME="FunKey-OS Recovery 2.1.0"
+VERSION_ID="2.1.0"
 HOME_URL="https://www.funkey-project.com/"
 SUPPORT_URL="https://www.funkey-project.com/"
 BUG_REPORT_URL="https://www.funkey-project.com/"
 PRIVACY_POLICY_URL="https://www.funkey-project.com"
-VERSION_CODENAME=Rowdy
-UBUNTU_CODENAME=Rowdy
+VERSION_CODENAME=Hoopy
+UBUNTU_CODENAME=Hoopy
diff --git a/Recovery/board/funkey/rootfs-overlay/etc/sw-versions b/Recovery/board/funkey/rootfs-overlay/etc/sw-versions
index 4455861..175a929 100644
--- a/Recovery/board/funkey/rootfs-overlay/etc/sw-versions
+++ b/Recovery/board/funkey/rootfs-overlay/etc/sw-versions
@@ -1 +1 @@
-Recovery	2.0.0
+Recovery	2.1.0
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"
diff --git a/Recovery/package/fkgpiod/fkgpiod.mk b/Recovery/package/fkgpiod/fkgpiod.mk
index 7fbabd9..370293e 100644
--- a/Recovery/package/fkgpiod/fkgpiod.mk
+++ b/Recovery/package/fkgpiod/fkgpiod.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FKGPIOD_VERSION = 54d1051
+FKGPIOD_VERSION = e74f688
 FKGPIOD_SITE_METHOD = git
 FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git
 FKGPIOD_SITE_LICENSE = GPL-2.1+