diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share
index fdcade6..038a3c6 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share
@@ -49,7 +49,8 @@ mount_share () {
 
     # Create the directory structure if required
     #(cd /mnt; mkdir -p "Applications" "Emulators" "Games" "Atari lynx" "Game Boy" "Game Boy Color" "Game Boy Advance" "Game Gear" "Neo Geo Pocket" "NES" "PS1" "PS1/bios" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan" "PCE-TurboGrafx")
-    (cd /mnt; mkdir -p "Libretro/cores" "Emulators" "Atari lynx" "Game Boy" "Game Boy Color" "Game Boy Advance" "Game Gear" "Neo Geo Pocket" "NES" "PS1" "PS1/bios" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan" "PCE-TurboGrafx")
+    (cd /mnt; mkdir -p "Libretro/cores" "Native games" "Applications" "Emulators" "Atari lynx" "Game Boy" "Game Boy Color" "Game Boy Advance" "Game Gear" "Neo Geo Pocket" "NES" "PS1" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan" "PCE-TurboGrafx")
+    (mkdir -p "/mnt/FunKey/.retrofe/collections"; cd /mnt/FunKey/.retrofe/collections; mkdir "Atari lynx" "Game Boy" "Game Boy Color" "Game Boy Advance" "Game Gear" "Neo Geo Pocket" "NES" "PS1" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan" "PCE-TurboGrafx" "Libretro" "Native games" "Main")
 
     # Check if there is a firmware update file
     if [ -f /mnt/FunKey-*.fwu ]; then
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/cores/README b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/cores/README
new file mode 100644
index 0000000..2bcc987
--- /dev/null
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/cores/README
@@ -0,0 +1 @@
+This is the folder where you can put all your roms and games for Libretro if you use RetroFE frontend (for GMenu2X users, you can put them wherever you want)
diff --git a/FunKey/board/funkey/update_partition b/FunKey/board/funkey/update_partition
index 5ab0a50..07d037b 100755
--- a/FunKey/board/funkey/update_partition
+++ b/FunKey/board/funkey/update_partition
@@ -47,7 +47,7 @@ do_postinst()
     # Copy OPKs
     cp -r ${root_mount}/usr/local/share/OPKs/* /mnt
 
-    # Copy freware games and other necessary mnt files
+    # Copy freeware games and other necessary mnt files
     unzip -q -o ${root_mount}/usr/local/share/mnt_files.zip -d /mnt/
 
     # Fix PCE opk name if necessary
diff --git a/FunKey/package/retrofe/retrofe.mk b/FunKey/package/retrofe/retrofe.mk
index a0787fe..e042c17 100644
--- a/FunKey/package/retrofe/retrofe.mk
+++ b/FunKey/package/retrofe/retrofe.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-RETROFE_VERSION = RetroFE-FunKey-1.1.4
+RETROFE_VERSION = v1.1.5-funkey-s
 RETROFE_SITE_METHOD = git
-RETROFE_SITE = https://github.com/FunKey-Project/RetroFE.git
+RETROFE_SITE = https://github.com/DrUm78/RetroFE.git
 RETROFE_DEPENDENCIES = gstreamer1 gst1-plugins-base sdl sdl_image sdl_mixer sdl_sound sdl_ttf libglib2 sqlite zlib
 RETROFE_LICENSE = GPL-3.0
 RETROFE_LICENSE_FILES = LICENSE.txt