diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Libretro/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Libretro/settings.conf
index 7e8b6a1..bba711e 100644
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Libretro/settings.conf
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Libretro/settings.conf
@@ -1,11 +1,11 @@
 # Uncomment and edit the following line to use a different ROM path.
 list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%
 list.includeMissingItems = false
-list.extensions = zip,ZIP,wad,WAD,pak,PAK,scummvm,SCUMMVM
+list.extensions = so,SO
 list.menuSort = yes
 list.romHierarchy = true
 
-launcher = sdlretro
+launcher = picoarch
 #metadata.type = MAME
 
 
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/picoarch.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/picoarch.conf
new file mode 100644
index 0000000..9a71bb1
--- /dev/null
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/picoarch.conf
@@ -0,0 +1,2 @@
+executable = %RETROFE_PATH%/launchers/picoarch_launch.sh
+arguments = "%ITEM_FILEPATH%"
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/sdlretro_launch.sh b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/picoarch_launch.sh
similarity index 91%
rename from FunKey/board/funkey/rootfs-overlay/usr/games/launchers/sdlretro_launch.sh
rename to FunKey/board/funkey/rootfs-overlay/usr/games/launchers/picoarch_launch.sh
index 63d4c48..a6fff89 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/sdlretro_launch.sh
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/picoarch_launch.sh
@@ -2,7 +2,7 @@
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
-sdlretro "$1"&
+picoarch "$1"&
 pid record $!
 wait $!
 pid erase
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/sdlretro.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/sdlretro.conf
deleted file mode 100644
index b95af82..0000000
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/launchers/sdlretro.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-executable = %RETROFE_PATH%/launchers/sdlretro_launch.sh
-arguments = "%ITEM_FILEPATH%"
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/sdlretro b/FunKey/board/funkey/rootfs-overlay/usr/games/sdlretro
deleted file mode 100755
index 697c2fe..0000000
Binary files a/FunKey/board/funkey/rootfs-overlay/usr/games/sdlretro and /dev/null differ
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share
index 6aa4beb..fdcade6 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share
@@ -49,7 +49,7 @@ 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" "FunKey/.sdlretro/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" "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")
 
     # 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/libretro_funkey-s.opk b/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/libretro_funkey-s.opk
deleted file mode 100644
index a6c0aa0..0000000
Binary files a/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/libretro_funkey-s.opk and /dev/null differ
diff --git a/Makefile b/Makefile
index bd63050..8dbd265 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ sdk: buildroot SDK/output/.config
 	@$(BRMAKE) BR2_EXTERNAL=../SDK O=../SDK/output prepare-sdk
 	@$(call MESSAGE,"Generating SDK tarball")
 	@export LC_ALL=C; \
-	SDK=FunKey-sdk-$(shell cat FunKey/board/funkey/rootfs-overlay/etc/sw-versions | cut -f 2)-DrUm78; \
+	SDK=FunKey-sdk-DrUm78; \
 	grep -lr "$(shell pwd)/SDK/output/host" SDK/output/host | while read -r FILE ; do \
 		if file -b --mime-type "$${FILE}" | grep -q '^text/'; then \
 			sed -i "s|$(shell pwd)/SDK/output/host|/opt/$${SDK}|g" "$${FILE}"; \
@@ -105,7 +105,7 @@ image: fun
 	@mkdir -p root tmp
 	@./Recovery/output/host/bin/genimage --loglevel 0 --inputpath .
 	@rm -rf root tmp
-	@mv images/sdcard.img images/FunKey-sdcard-$(shell cat FunKey/board/funkey/rootfs-overlay/etc/sw-versions | cut -f 2)-DrUm78.img
+	@mv images/sdcard.img images/FunKey-sdcard-DrUm78.img
 
 image-prod: fun
 	@$(call MESSAGE,"Creating disk image")
@@ -113,7 +113,7 @@ image-prod: fun
 	@mkdir -p root tmp
 	@./Recovery/output/host/bin/genimage --loglevel 0 --config "genimage-prod.cfg" --inputpath .
 	@rm -rf root tmp
-	@mv images/sdcard-prod.img images/FunKey-sdcard-prod-$(shell cat FunKey/board/funkey/rootfs-overlay/etc/sw-versions | cut -f 2)-DrUm78.img
+	@mv images/sdcard-prod.img images/FunKey-sdcard-prod-DrUm78.img
 
 update: fun
 	@$(call MESSAGE,"Creating update file")
@@ -128,7 +128,7 @@ update: fun
 	@cd tmp && \
 	echo sw-description rootfs.ext2.gz update_partition | \
 	tr " " "\n" | \
-	cpio -o -H crc --quiet > ../images/FunKey-rootfs-$(shell cat FunKey/board/funkey/rootfs-overlay/etc/sw-versions | cut -f 2)-DrUm78.fwu
+	cpio -o -H crc --quiet > ../images/FunKey-rootfs-DrUm78.fwu
 	@rm -rf tmp
 
 defconfig:
diff --git a/package b/package
new file mode 100755
index 0000000..9b7c321
--- /dev/null
+++ b/package
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+cd /opt/picoarch
+./package
+cp picoarch /opt/FunKey-OS/FunKey/board/funkey/rootfs-overlay/usr/games/
+cp picoarch_funkey-s.opk /opt/FunKey-OS/FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/
+
+cd ../FunKey-OS
+make
+
+rm -f FunKey/board/funkey/rootfs-overlay/usr/games/picoarch
+rm -f FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/picoarch_funkey-s.opk