diff --git a/FunKey/Config.in b/FunKey/Config.in
index 61b75af..3bdc226 100644
--- a/FunKey/Config.in
+++ b/FunKey/Config.in
@@ -9,3 +9,7 @@ source "$BR2_EXTERNAL_FUNKEY_PATH/package/PocketSNES/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/gpsp/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/dmtx-utils/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/ProdScreens/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/fonts-droid/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/libini/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/libopk/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/gmenu2x/Config.in"
diff --git a/FunKey/board/funkey/linux.config b/FunKey/board/funkey/linux.config
index 8ff92a7..9e958a1 100644
--- a/FunKey/board/funkey/linux.config
+++ b/FunKey/board/funkey/linux.config
@@ -152,7 +152,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_CONFIGFS_FS=y
-# CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_SQUASHFS=y
 # CONFIG_NETWORK_FILESYSTEMS is not set
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig
index 49ed628..dcb7f5f 100644
--- a/FunKey/configs/funkey_defconfig
+++ b/FunKey/configs/funkey_defconfig
@@ -49,7 +49,6 @@ 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_GFX=y
 BR2_PACKAGE_SDL_IMAGE_GIF=y
 BR2_PACKAGE_SDL_IMAGE_JPEG=y
 BR2_PACKAGE_SDL_IMAGE_PNG=y
@@ -86,3 +85,5 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_DTC=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_LIBOPK=y
+BR2_PACKAGE_GMENU2X=y
diff --git a/FunKey/package/fonts-droid/Config.in b/FunKey/package/fonts-droid/Config.in
new file mode 100644
index 0000000..a964265
--- /dev/null
+++ b/FunKey/package/fonts-droid/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_FONTS_DROID
+	bool "fonts-droid"
+	help
+	  Android (AOSP) "droid" family of fonts
diff --git a/FunKey/package/fonts-droid/fonts-droid.mk b/FunKey/package/fonts-droid/fonts-droid.mk
new file mode 100644
index 0000000..b5a828a
--- /dev/null
+++ b/FunKey/package/fonts-droid/fonts-droid.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# fonts-droid
+#
+################################################################################
+
+FONTS_DROID_VERSION = 074990596701553b8b51ff22290453de522f0d15
+FONTS_DROID_SITE = https://android.googlesource.com/platform/frameworks/base/+archive/$(FONTS_DROID_VERSION)/data
+FONTS_DROID_SOURCE = fonts.tar.gz
+FONTS_DROID_LICENSE = Apache-2.0
+FONTS_DROID_STRIP_COMPONENTS = 0
+
+# We cannot verify the hash because googlesource.com produces an archive
+# with a different hash on every request.
+#
+# This still issues a warning.
+BR_NO_CHECK_HASH_FOR += $(FONTS_DROID_SOURCE)
+
+define FONTS_DROID_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/share/fonts/droid/
+	install -m 0644 $(@D)/NOTICE $(@D)/DroidSansFallback.ttf \
+	  $(TARGET_DIR)/usr/share/fonts/droid/
+endef
+
+$(eval $(generic-package))
diff --git a/FunKey/package/gmenu2x/Config.in b/FunKey/package/gmenu2x/Config.in
new file mode 100644
index 0000000..833c465
--- /dev/null
+++ b/FunKey/package/gmenu2x/Config.in
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_GMENU2X
+	bool "gmenu2x"
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_SDL
+	select BR2_PACKAGE_SDL_TTF
+	select BR2_PACKAGE_SDL_GFX
+	select BR2_PACKAGE_DEJAVU
+	select BR2_PACKAGE_FONTS_DROID
+	help
+	  Application menu for devices with a 320x240 screen and buttons.
+
+	  This is a forked version with cleanups, targeted at the Ben NanoNote
+	  and the Dingoo A320/A330.
+
+	  http://projects.qi-hardware.com/index.php/p/gmenu2x
+
+if BR2_PACKAGE_GMENU2X
+
+config BR2_PACKAGE_GMENU2X_SHOW_CLOCK
+	bool "Show clock"
+
+config BR2_PACKAGE_GMENU2X_CPUFREQ
+	bool "Support CPU frequency control"
+
+endif
diff --git a/FunKey/package/gmenu2x/gmenu2x.hash b/FunKey/package/gmenu2x/gmenu2x.hash
new file mode 100644
index 0000000..9b7d393
--- /dev/null
+++ b/FunKey/package/gmenu2x/gmenu2x.hash
@@ -0,0 +1 @@
+sha256	7a24a8d20533038613c3475fc96575f0e3d878207b4e2da0c70068f5a3a179c0	gmenu2x-c6e2883.tar.gz
diff --git a/FunKey/package/gmenu2x/gmenu2x.mk b/FunKey/package/gmenu2x/gmenu2x.mk
new file mode 100644
index 0000000..42c78b8
--- /dev/null
+++ b/FunKey/package/gmenu2x/gmenu2x.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# gmenu2x
+#
+#############################################################
+GMENU2X_VERSION = c6e2883
+GMENU2X_SITE = $(call github,opendingux,gmenu2x,$(GMENU2X_VERSION))
+GMENU2X_DEPENDENCIES = sdl sdl_ttf sdl_gfx dejavu libpng fonts-droid
+GMENU2X_CONF_OPTS = -DBIND_CONSOLE=ON
+
+ifeq ($(BR2_PACKAGE_GMENU2X_SHOW_CLOCK),y)
+GMENU2X_CONF_OPTS += -DCLOCK=ON
+else
+GMENU2X_CONF_OPTS += -DCLOCK=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_GMENU2X_CPUFREQ),y)
+GMENU2X_CONF_OPTS += -DCPUFREQ=ON
+else
+GMENU2X_CONF_OPTS += -DCPUFREQ=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LIBOPK),y)
+GMENU2X_DEPENDENCIES += libopk
+endif
+
+ifeq ($(BR2_PACKAGE_LIBXDGMIME),y)
+GMENU2X_DEPENDENCIES += libxdgmime
+endif
+
+$(eval $(cmake-package))
diff --git a/FunKey/package/libini/Config.in b/FunKey/package/libini/Config.in
new file mode 100644
index 0000000..a42967b
--- /dev/null
+++ b/FunKey/package/libini/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBINI
+	bool "libini"
+	help
+	  Tiny library to help reading INI files.
+
+	  https://github.com/pcercuei/libini
diff --git a/FunKey/package/libini/libini.hash b/FunKey/package/libini/libini.hash
new file mode 100644
index 0000000..b2213d9
--- /dev/null
+++ b/FunKey/package/libini/libini.hash
@@ -0,0 +1 @@
+sha256 fbb4fd49d367f4c700e893a5ea82e3c8c0175ee917d456de34593a981d7a68b3  libini-c3413da.tar.gz
diff --git a/FunKey/package/libini/libini.mk b/FunKey/package/libini/libini.mk
new file mode 100644
index 0000000..d8fd6fe
--- /dev/null
+++ b/FunKey/package/libini/libini.mk
@@ -0,0 +1,10 @@
+#############################################################
+#
+# libini
+#
+#############################################################
+LIBINI_VERSION = c3413da
+LIBINI_SITE = $(call github,pcercuei,libini,$(LIBINI_VERSION))
+LIBINI_INSTALL_STAGING = YES
+
+$(eval $(cmake-package))
diff --git a/FunKey/package/libopk/Config.in b/FunKey/package/libopk/Config.in
new file mode 100644
index 0000000..db3bce9
--- /dev/null
+++ b/FunKey/package/libopk/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBOPK
+        bool "libopk"
+        select BR2_PACKAGE_ZLIB
+        select BR2_PACKAGE_LIBINI
+        help
+          Library to handle OPK packages.
+
+          https://github.com/pcercuei/libopk
diff --git a/FunKey/package/libopk/libopk.hash b/FunKey/package/libopk/libopk.hash
new file mode 100644
index 0000000..e632a35
--- /dev/null
+++ b/FunKey/package/libopk/libopk.hash
@@ -0,0 +1 @@
+sha256	99f5f55038bcda1b66de369897a9612fa52a657d1c573d1932e3eaa3d07ee7b1	libopk-3c918c8.tar.gz
diff --git a/FunKey/package/libopk/libopk.mk b/FunKey/package/libopk/libopk.mk
new file mode 100644
index 0000000..6bb18ea
--- /dev/null
+++ b/FunKey/package/libopk/libopk.mk
@@ -0,0 +1,11 @@
+#############################################################
+#
+# libopk
+#
+#############################################################
+LIBOPK_VERSION = 3c918c8
+LIBOPK_SITE = $(call github,pcercuei,libopk,$(LIBOPK_VERSION))
+LIBOPK_DEPENDENCIES = libini zlib
+LIBOPK_INSTALL_STAGING = YES
+
+$(eval $(cmake-package))
diff --git a/Recovery/board/funkey/linux.config b/Recovery/board/funkey/linux.config
index 20f59df..bb0dc81 100644
--- a/Recovery/board/funkey/linux.config
+++ b/Recovery/board/funkey/linux.config
@@ -153,7 +153,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_CONFIGFS_FS=y
-# CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_SQUASHFS=y
 # CONFIG_NETWORK_FILESYSTEMS is not set
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
diff --git a/genimage.cfg b/genimage.cfg
index 5570864..5a3173d 100644
--- a/genimage.cfg
+++ b/genimage.cfg
@@ -31,7 +31,7 @@ image sdcard.img {
 		partition-type = 0x83
 		bootable = "yes"
 		image = "FunKey/output/images/rootfs.ext4"
-		size = 100M # This will be resized to 1G during first boot
+		size = 128M # This will be resized to 1G during first boot
 	}
 
 # These partitions will be created during first boot