diff --git a/.gitmodules b/.gitmodules
index 4f2c72a..449a166 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "buildroot"]
 	path = buildroot
 	url = git://git.buildroot.net/buildroot
+[submodule "funkey_retrofe"]
+	path = funkey_retrofe
+	url = git@bitbucket.org:keymu2/funkey_retrofe.git
+[submodule "funkey_retrofe_layout_240x240"]
+	path = funkey_retrofe_layout_240x240
+	url = git@bitbucket.org:keymu2/funkey_retrofe_layout_240x240.git
diff --git a/FunKey/Config.in b/FunKey/Config.in
index 69640c7..7392cc0 100644
--- a/FunKey/Config.in
+++ b/FunKey/Config.in
@@ -1 +1,3 @@
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/mednafen/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/retrofe/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/retrofe-layout/Config.in"
diff --git a/FunKey/board/funkey/local.mk b/FunKey/board/funkey/local.mk
new file mode 100644
index 0000000..4c1481b
--- /dev/null
+++ b/FunKey/board/funkey/local.mk
@@ -0,0 +1,2 @@
+RETROFE_OVERRIDE_SRCDIR = ../funkey_retrofe
+RETROFE_LAYOUT_OVERRIDE_SRCDIR = ../funkey_retrofe_layout_240x240
diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig
index 51dedf3..b34eb95 100644
--- a/FunKey/configs/funkey_defconfig
+++ b/FunKey/configs/funkey_defconfig
@@ -2,6 +2,7 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_DL_DIR="$(BR2_EXTERNAL_FUNKEY_PATH)/dl"
 BR2_CCACHE=y
+BR2_PACKAGE_OVERRIDE_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/local.mk"
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/patches"
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TARGET_GENERIC_HOSTNAME="funkey"
@@ -51,16 +52,10 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 # BR2_PACKAGE_E2FSPROGS_FSCK is not set
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
-BR2_PACKAGE_SDL=y
-BR2_PACKAGE_SDL_GFX=y
-BR2_PACKAGE_SDL_IMAGE=y
-BR2_PACKAGE_SDL_MIXER=y
 BR2_PACKAGE_SDL_SOUND=y
 BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
-BR2_PACKAGE_SDL_TTF=y
 BR2_PACKAGE_UBOOT_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y
-BR2_PACKAGE_ZLIB=y
 BR2_PACKAGE_DHCPCD=y
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
@@ -70,6 +65,7 @@ BR2_PACKAGE_UTIL_LINUX_BINARIES=y
 BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="100M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
@@ -87,3 +83,5 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_MEDNAFEN=y
+BR2_PACKAGE_RETROFE=y
+BR2_PACKAGE_RETROFE_LAYOUT=y
diff --git a/FunKey/package/retrofe-layout/Config.in b/FunKey/package/retrofe-layout/Config.in
new file mode 100644
index 0000000..8fc750b
--- /dev/null
+++ b/FunKey/package/retrofe-layout/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_RETROFE_LAYOUT
+	bool "retrofe layout"
+	help
+	  The cross-platform game frontend layout.
+
+	  https://bitbucket.org/phulshof/retrofe/src/default/
diff --git a/FunKey/package/retrofe-layout/retrofe-layout.mk b/FunKey/package/retrofe-layout/retrofe-layout.mk
new file mode 100644
index 0000000..6af45ee
--- /dev/null
+++ b/FunKey/package/retrofe-layout/retrofe-layout.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# retrofe-layout
+#
+################################################################################
+#https://bitbucket.org/keymu2/funkey_retrofe_layout_240x240/get/aaa4b639a5f1.zip
+RETROFE_LAYOUT_VERSION = aaa4b639a5f1
+RETROFE_LAYOUT_SOURCE = $(RETROFE_LAYOUT_VERSION).zip
+RETROFE_LAYOUT_SITE = https://bitbucket.org/keymu2/funkey_retrofe_layout_240x240/get
+RETROFE_LAYOUT_LICENSE = GPL-2.0+
+RETROFE_LAYOUT_LICENSE_FILES = LICENSE.txt
+
+define RETROFE_LAYOUT_INSTALL_TARGET_CMDS
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games
+	cp -r $(@D)/collections $(TARGET_DIR)/usr/games/
+	cp -r $(@D)/launchers $(TARGET_DIR)/usr/games/
+	cp -r $(@D)/layouts/Default_240x240 $(TARGET_DIR)/usr/games/layouts
+	cp -r $(@D)/settings.conf $(TARGET_DIR)/usr/games/
+	cp -r $(@D)/controls.conf $(TARGET_DIR)/usr/games/
+endef
+
+$(eval $(generic-package))
diff --git a/FunKey/package/retrofe/Config.in b/FunKey/package/retrofe/Config.in
new file mode 100644
index 0000000..4359b36
--- /dev/null
+++ b/FunKey/package/retrofe/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_RETROFE
+	bool "retrofe"
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_GSTREAMER1
+	select BR2_PACKAGE_GST1_PLUGINS_BASE
+	select BR2_PACKAGE_SDL
+	select BR2_PACKAGE_SDL_IMAGE
+	select BR2_PACKAGE_SDL_MIXER
+	select BR2_PACKAGE_SDL_TTF
+	select BR2_PACKAGE_SDL_GFX
+	select BR2_PACKAGE_ZLIB
+	help
+	  The cross-platform game frontend.
+
+	  https://bitbucket.org/phulshof/retrofe/src/default/
diff --git a/FunKey/package/retrofe/retrofe.mk b/FunKey/package/retrofe/retrofe.mk
new file mode 100644
index 0000000..93a2e22
--- /dev/null
+++ b/FunKey/package/retrofe/retrofe.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# retrofe
+#
+################################################################################
+#https://bitbucket.org/keymu2/funkey_retrofe/get/0961a03bf242.zip
+RETROFE_VERSION = 0961a03bf242
+RETROFE_SOURCE = $(RETROFE_VERSION).zip
+RETROFE_SITE = https://bitbucket.org/keymu2/funkey_retrofe/get
+RETROFE_LICENSE = GPL-2.0+
+RETROFE_LICENSE_FILES = LICENSE.txt
+RETROFE_SUBDIR = RetroFE/Source
+
+RETROFE_DEPENDENCIES = libglib2 gstreamer1 gst1-plugins-base sdl sdl_image sdl_mixer sdl_ttf sdl_gfx zlib
+
+define RETROFE_INSTALL_TARGET_CMDS
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games
+	$(INSTALL) -m 0755 $(@D)/RetroFE/Build/retrofe $(TARGET_DIR)/usr/games/retrofe
+endef
+
+$(eval $(cmake-package))
diff --git a/funkey_retrofe b/funkey_retrofe
new file mode 160000
index 0000000..0961a03
--- /dev/null
+++ b/funkey_retrofe
@@ -0,0 +1 @@
+Subproject commit 0961a03bf242f5107106a94307a31f93fd10b029
diff --git a/funkey_retrofe_layout_240x240 b/funkey_retrofe_layout_240x240
new file mode 160000
index 0000000..f29381a
--- /dev/null
+++ b/funkey_retrofe_layout_240x240
@@ -0,0 +1 @@
+Subproject commit f29381aafcc9e75ac169acef9ad2d490aa2375a4