diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/shutdown_funkey b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/shutdown_funkey
index a8b2819..54ed4ca 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/shutdown_funkey
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/shutdown_funkey
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# Notify system, reboot in progress
+REBOOTING_FILE="/run/rebooting"
+touch $REBOOTING_FILE
+
 # Notif fullscreen "Shutting down"
 notif_set 0 "^^^^^^^^      SHUTTING DOWN...^^^^^^^^"
 
@@ -9,6 +13,7 @@ start_audio_amp 0 >/dev/null 2>&1
 # Force Read Only 
 ro
 
+# Unmount writeable partition to force 
 umount -r /mnt
 
 # Poweroff
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 579d482..1c10d96 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher
@@ -6,6 +6,7 @@
 LOCK_FILE="/var/lock/launcher.lock"
 INSTANT_PLAY_FILE="/mnt/instant_play"
 PREVENT_LAUNCHER_FILE="/mnt/prevent_launcher"
+REBOOTING_FILE="/run/rebooting"
 
 
 if [ -f "${LOCK_FILE}" ]; then
@@ -56,12 +57,19 @@ while true; do
 		wait $!
 		erase_pid
 
-        # Restart ampli audio if necessary
-	    start_audio_amp 1 >/dev/null 2>&1
-
 		# In case retrofe quits with errors, clear graphic VT
 		termfix_all
     fi
+
+    # WD to prevent 100% CPU
+    sleep 0.5
+
+    # Exit if console rebooting
+    if [ -f $REBOOTING_FILE ]; then
+    	break
+    fi
 done
+
+# Remove lock file and exit
 rm "${LOCK_FILE}"
 exit 0
diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig
index f5a54ad..1f35af9 100644
--- a/FunKey/configs/funkey_defconfig
+++ b/FunKey/configs/funkey_defconfig
@@ -13,7 +13,7 @@ BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/FunKey-Project/FunKey-OS/releases
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
-BR2_TARGET_OPTIMIZATION="-fno-PIC -march=armv7-a+neon-vfpv4 -mtune=cortex-a7 -mfpu=neon-vfpv4 -mvectorize-with-neon-quad"
+BR2_TARGET_OPTIMIZATION="-fno-PIC -march=armv7-a+neon-vfpv4 -mtune=cortex-a7 -mfpu=neon-vfpv4 -mvectorize-with-neon-quad -D__ARM_NEON__"
 BR2_TARGET_GENERIC_HOSTNAME="FunKey"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the FunKey"
 BR2_ROOTFS_DEVICE_TABLE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/device_table.txt"
diff --git a/FunKey/package/gmenu2x/gmenu2x.mk b/FunKey/package/gmenu2x/gmenu2x.mk
index 0270dbc..6681a15 100644
--- a/FunKey/package/gmenu2x/gmenu2x.mk
+++ b/FunKey/package/gmenu2x/gmenu2x.mk
@@ -3,7 +3,7 @@
 # gmenu2x
 #
 #############################################################
-GMENU2X_VERSION = ac40292
+GMENU2X_VERSION = 168b4be
 GMENU2X_SITE_METHOD = git
 GMENU2X_SITE = https://github.com/FunKey-Project/gmenu2x.git
 GMENU2X_LICENSE = GPL-2.0
diff --git a/FunKey/package/retrofe/retrofe.mk b/FunKey/package/retrofe/retrofe.mk
index a871dfa..9a07b44 100644
--- a/FunKey/package/retrofe/retrofe.mk
+++ b/FunKey/package/retrofe/retrofe.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RETROFE_VERSION = d07ca9c
+RETROFE_VERSION = 473e951
 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