diff --git a/FunKey/board/funkey/rootfs-overlay/root/.profile b/FunKey/board/funkey/rootfs-overlay/root/.profile
index 3ab2884..15ec1c8 100755
--- a/FunKey/board/funkey/rootfs-overlay/root/.profile
+++ b/FunKey/board/funkey/rootfs-overlay/root/.profile
@@ -55,6 +55,9 @@ mkdir -p "${MEDNAFEN_HOME}"
 cp "/usr/games/lynxboot.img" "/usr/games/mednafen-09x.cfg" "${MEDNAFEN_HOME}/"
 export GMENU2X_HOME="$HOME/.gmenu2x"
 mkdir -p "${GMENU2X_HOME}"
+export RETROFE_HOME="$HOME/.retrofe"
+mkdir -p "${RETROFE_HOME}"
+mkdir -p "${RETROFE_HOME}/layouts"
 
 # Resize the console to the terminal dimensions
 resize() {
diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig
index 6ec9ebc..51bec87 100644
--- a/FunKey/configs/funkey_defconfig
+++ b/FunKey/configs/funkey_defconfig
@@ -105,7 +105,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="200M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="220M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_DTC=y
diff --git a/FunKey/package/bibi/Config.in b/FunKey/package/bibi/Config.in
new file mode 100644
index 0000000..30f5897
--- /dev/null
+++ b/FunKey/package/bibi/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_BIBI
+	bool "FunKey S - bibi"
+	default y
+	help
+	  Bomberman game in c with SDL, readapted for the FunKey S.
diff --git a/FunKey/package/bibi/bibi.mk b/FunKey/package/bibi/bibi.mk
new file mode 100644
index 0000000..5b2accb
--- /dev/null
+++ b/FunKey/package/bibi/bibi.mk
@@ -0,0 +1,48 @@
+################################################################################
+#
+# bibi
+#
+################################################################################
+
+BIBI_VERSION = 36a2f57
+BIBI_SITE_METHOD = git
+BIBI_SITE = https://github.com/FunKey-Project/Bibi.git
+BIBI_SITE_LICENSE = GPL-2.1+
+BIBI_SITE_LICENSE_FILES = COPYING
+
+BIBI_DEPENDENCIES = sdl sdl_image sdl_ttf
+
+BIBI_CFLAGS = $(TARGET_CFLAGS)
+
+BIBI_SDL_CFLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
+BIBI_SDL_LIBS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs)
+BIBI_SDL_CFLAGS += $(shell $(STAGING_DIR)/usr/bin/libmikmod-config --cflags)
+BIBI_SDL_LIBS += $(shell $(STAGING_DIR)/usr/bin/libmikmod-config --libs)
+
+BIBI_CFLAGS += -ggdb -O3
+BIBI_CFLAGS += $(BIBI_SDL_CFLAGS)
+BIBI_CFLAGS += -DFUNKEY -DHW_SCREEN_RESIZE -DSOUND_SDL_ACTIVATED -DBYPASS_MENU -DFUNKEY_MENU
+
+BIBI_LIBS += $(BIBI_SDL_LIBS)
+BIBI_LIBS += -lSDL -lSDL_ttf -lSDL_image -lSDL_mixer
+
+define BIBI_BUILD_CMDS
+	(cd $(@D); \
+	make \
+	CROSS_COMPILE=$(TARGET_CROSS) \
+	CFLAGS='$(BIBI_CFLAGS)' \
+	LDFLAGS='$(BIBI_LIBS)' \
+	SDL_INCLUDES='$(BIBI_SDL_CFLAGS)' \
+	SDL_LIBS='$(BIBI_SDL_LIBS)' \
+	)
+endef
+
+define BIBI_INSTALL_TARGET_CMDS
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games/bibi
+	$(INSTALL) -m 0755 $(@D)/bibi $(TARGET_DIR)/usr/games/bibi/bibi
+	$(INSTALL) -D -m 0755 -t $(TARGET_DIR)/usr/games/bibi/sprite $(@D)/sprite/* 
+	$(INSTALL) -D -m 0755 -t $(TARGET_DIR)/usr/games/bibi/data $(@D)/data/* 
+	$(INSTALL) -D -m 0755 -t $(TARGET_DIR)/usr/games/bibi/audio $(@D)/audio/* 
+endef
+
+$(eval $(generic-package))
diff --git a/FunKey/package/retrofe/retrofe.mk b/FunKey/package/retrofe/retrofe.mk
index dc66961..3657005 100644
--- a/FunKey/package/retrofe/retrofe.mk
+++ b/FunKey/package/retrofe/retrofe.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RETROFE_VERSION = f162704
+RETROFE_VERSION = 0fcc268
 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
diff --git a/genimage-prod.cfg b/genimage-prod.cfg
index 2fbe19a..b37fcd2 100644
--- a/genimage-prod.cfg
+++ b/genimage-prod.cfg
@@ -31,7 +31,7 @@ image sdcard-prod.img {
 		partition-type = 0x83
 		bootable = "yes"
 		image = "FunKey/output/images/rootfs.ext4"
-		size = 200M # This will be resized to 1G during first boot
+		size = 220M # This will be resized to 1G during first boot
 	}
 
 # These partitions will be created during first boot
diff --git a/genimage.cfg b/genimage.cfg
index 2cac992..2160658 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 = 200M # This will be resized to 1G during first boot
+		size = 220M # This will be resized to 1G during first boot
 	}
 
 # These partitions will be created during first boot