diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08b062d0c656f0439f3138670c83af7a3894f6d8..90373478a7dab90a6f90612b6c996d16a032cbd3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -220,7 +220,7 @@ appimage-amd64:
         echo "Create a configs/recalbox-rpizero2_defconfig"
         cp "configs/recalbox-rpi3_defconfig" "configs/recalbox-rpizero2_defconfig"
         sed -i "s/BR2_PACKAGE_RECALBOX_TARGET_RPI3=y/BR2_PACKAGE_RECALBOX_TARGET_RPIZERO2=y/g" configs/recalbox-rpizero2_defconfig
-        docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=rpizero2" -e "GITLAB_TOKEN_RB5000=${GITLAB_TOKEN_RB5000}" -e "GITLAB_TOKEN_THEMES=${GITLAB_TOKEN_THEMES}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" -e "FORCE_UNSAFE_CONFIGURE=1" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac
+        docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/hosts/${ARCH}:/work/output/host" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=rpizero2" -e "GITLAB_TOKEN_RB5000=${GITLAB_TOKEN_RB5000}" -e "GITLAB_TOKEN_THEMES=${GITLAB_TOKEN_THEMES}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" -e "FORCE_UNSAFE_CONFIGURE=1" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac
         export DIST_DIR="dist/rpizero2"
         mkdir -p "${DIST_DIR}"
         cp ${OUTPUTDIR}/images/recalbox/* "${DIST_DIR}"
@@ -230,7 +230,7 @@ appimage-amd64:
         cp ${WORKDIR}/RELEASE-NOTES-FULL.md "${DIST_DIR}/RELEASE-NOTES-FULL.md"
         uploadFolderToBucket "${AWS_ACCESS_KEY_ID}" "${AWS_SECRET_ACCESS_TOKEN}" "recalbox-builds-artifacts" "dist" "${CI_PIPELINE_ID}"
       fi
-    - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "GITLAB_TOKEN_RB5000=${GITLAB_TOKEN_RB5000}" -e "GITLAB_TOKEN_THEMES=${GITLAB_TOKEN_THEMES}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" -e "FORCE_UNSAFE_CONFIGURE=1" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac
+    - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/hosts/${ARCH}:/work/output/host" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "GITLAB_TOKEN_RB5000=${GITLAB_TOKEN_RB5000}" -e "GITLAB_TOKEN_THEMES=${GITLAB_TOKEN_THEMES}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" -e "FORCE_UNSAFE_CONFIGURE=1" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac
     - echo $?
     # Dist
     - export DIST_DIR="dist/${ARCH}"
diff --git a/Dockerfile b/Dockerfile
index 0c21406d5f47471dc2ec39c49f34173d4aa49eea..9363a49aad744eed59b0d03670b0f9e155b6162c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,4 +34,4 @@ CMD echo ">>> Setting recalbox version to ${RECALBOX_VERSION}" && echo "${RECALB
     echo ">>> Making recalbox-${ARCH}_defconfig" && make recalbox-${ARCH}_defconfig && \
     export RECALBOX_CCACHE=${RECALBOX_CCACHE_ENABLED:+"BR2_CCACHE=y BR2_CCACHE_DIR=/share/ccache BR2_CCACHE_INITIAL_SETUP=--max-size=500G BR2_CCACHE_USE_BASEDIR=y"} && \
     echo ">>> Make with command : BR2_DL_DIR="/share/dl" $RECALBOX_CCACHE $PACKAGE" && \
-    make BR2_DL_DIR="/share/dl" $RECALBOX_CCACHE $PACKAGE
+    make -j `nproc` BR2_DL_DIR="/share/dl" $RECALBOX_CCACHE $PACKAGE
diff --git a/configs/recalbox-odroidgo2_defconfig b/configs/recalbox-odroidgo2_defconfig
index 368bdbe7495ca593430a6627789952fbf974a7d7..d09ecb375ccc9553408c86c3da431758c2c7202e 100644
--- a/configs/recalbox-odroidgo2_defconfig
+++ b/configs/recalbox-odroidgo2_defconfig
@@ -1,3 +1,4 @@
+BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_aarch64=y
 BR2_cortex_a35=y
 BR2_OPTIMIZE_3=y
@@ -297,7 +298,6 @@ BR2_PACKAGE_FBV_RECALBOX=y
 BR2_PACKAGE_JSTEST2=y
 BR2_PACKAGE_WSD=y
 BR2_PACKAGE_LIBRETRO_CHEATS=y
-BR2_PACKAGE_MEGATOOLS=y
 BR2_PACKAGE_FLUIDSYNTH_PULSEAUDIO=y
 BR2_PACKAGE_PAMIX=y
 BR2_PACKAGE_RTL8189FS=y
diff --git a/configs/recalbox-rg353x_defconfig b/configs/recalbox-rg353x_defconfig
index 61a02b1991ed5316e132d681f9fc3205156bb48a..bf257cbd32c3fc4fec1316d122aca8386fdac6f1 100644
--- a/configs/recalbox-rg353x_defconfig
+++ b/configs/recalbox-rg353x_defconfig
@@ -1,3 +1,4 @@
+BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_aarch64=y
 BR2_cortex_a55=y
 BR2_OPTIMIZE_3=y
@@ -282,7 +283,6 @@ BR2_PACKAGE_WSD=y
 BR2_PACKAGE_RTL88X2BU=y
 BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_LIBRETRO_CHEATS=y
-BR2_PACKAGE_MEGATOOLS=y
 BR2_PACKAGE_PAMIX=y
 BR2_PACKAGE_KMSGRAB=y
 BR2_PACKAGE_RECALBOX_ROCKCHIP_MALI_BIFROST_G52=y
diff --git a/configs/recalbox-rpi3_defconfig b/configs/recalbox-rpi3_defconfig
index 0ce1f0e02fd712daa7cef43283108ea49a4fb7fe..c96cdc2da065258381120634e28f7cd6a0f6a1d6 100644
--- a/configs/recalbox-rpi3_defconfig
+++ b/configs/recalbox-rpi3_defconfig
@@ -1,3 +1,4 @@
+BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_arm=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_NEON_VFPV4=y
@@ -340,7 +341,6 @@ BR2_PACKAGE_JSTEST2=y
 BR2_PACKAGE_WSD=y
 BR2_PACKAGE_KERNELFIRMWARES=y
 BR2_PACKAGE_LIBRETRO_CHEATS=y
-BR2_PACKAGE_MEGATOOLS=y
 BR2_PACKAGE_UTIL_LINUX_RFKILL=y
 BR2_PACKAGE_TCL=y
 BR2_PACKAGE_EXPECT=y
diff --git a/configs/recalbox-rpi4_64_defconfig b/configs/recalbox-rpi4_64_defconfig
index 6a64c0108e9431f2a28f2175d69daaf8f4932d77..d6d3d2f4a9b6c71191f3fa81b1b9b9e8b453f39e 100644
--- a/configs/recalbox-rpi4_64_defconfig
+++ b/configs/recalbox-rpi4_64_defconfig
@@ -1,3 +1,4 @@
+BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_aarch64=y
 BR2_cortex_a72=y
 BR2_OPTIMIZE_3=y
@@ -333,7 +334,6 @@ BR2_PACKAGE_JSTEST2=y
 BR2_PACKAGE_WSD=y
 BR2_PACKAGE_KERNELFIRMWARES=y
 BR2_PACKAGE_LIBRETRO_CHEATS=y
-BR2_PACKAGE_MEGATOOLS=y
 BR2_PACKAGE_UTIL_LINUX_RFKILL=y
 BR2_PACKAGE_TCL=y
 BR2_PACKAGE_EXPECT=y
diff --git a/configs/recalbox-rpi5_64_defconfig b/configs/recalbox-rpi5_64_defconfig
index d71761c9048e460a777a4584c303c775d650d23d..7678e3ea3783b4bf838f8a879bbe848cf9a446b1 100644
--- a/configs/recalbox-rpi5_64_defconfig
+++ b/configs/recalbox-rpi5_64_defconfig
@@ -1,3 +1,4 @@
+BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_aarch64=y
 BR2_cortex_a76=y
 BR2_ARM64_PAGE_SIZE_16K=y
@@ -333,7 +334,6 @@ BR2_PACKAGE_JSTEST2=y
 BR2_PACKAGE_WSD=y
 BR2_PACKAGE_KERNELFIRMWARES=y
 BR2_PACKAGE_LIBRETRO_CHEATS=y
-BR2_PACKAGE_MEGATOOLS=y
 BR2_PACKAGE_UTIL_LINUX_RFKILL=y
 BR2_PACKAGE_TCL=y
 BR2_PACKAGE_EXPECT=y
diff --git a/configs/recalbox-rpizero2_defconfig b/configs/recalbox-rpizero2_defconfig
index 6ec80760ecd28dc9234f9b0d772dd55704a21664..1d16ebc813fe9dc72cb6977c278da27de1082153 100644
--- a/configs/recalbox-rpizero2_defconfig
+++ b/configs/recalbox-rpizero2_defconfig
@@ -1,3 +1,4 @@
+BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_arm=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_NEON_VFPV4=y
@@ -340,7 +341,6 @@ BR2_PACKAGE_JSTEST2=y
 BR2_PACKAGE_WSD=y
 BR2_PACKAGE_KERNELFIRMWARES=y
 BR2_PACKAGE_LIBRETRO_CHEATS=y
-BR2_PACKAGE_MEGATOOLS=y
 BR2_PACKAGE_UTIL_LINUX_RFKILL=y
 BR2_PACKAGE_TCL=y
 BR2_PACKAGE_EXPECT=y
diff --git a/configs/recalbox-x86_64_defconfig b/configs/recalbox-x86_64_defconfig
index a90241681a43f56c8b279733a35986a1d105756e..d2fd21eb872c7098e2a9a00f360522076873abab 100644
--- a/configs/recalbox-x86_64_defconfig
+++ b/configs/recalbox-x86_64_defconfig
@@ -1,3 +1,4 @@
+BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_x86_64=y
 BR2_OPTIMIZE_3=y
 BR2_SHARED_STATIC_LIBS=y
@@ -380,7 +381,6 @@ BR2_PACKAGE_HHPC=y
 BR2_PACKAGE_JSTEST2=y
 BR2_PACKAGE_WSD=y
 BR2_PACKAGE_LIBRETRO_CHEATS=y
-BR2_PACKAGE_MEGATOOLS=y
 BR2_PACKAGE_UTIL_LINUX_RFKILL=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
@@ -402,4 +402,4 @@ BR2_PACKAGE_XONE=y
 BR2_PACKAGE_XPAD_NOONE=y
 BR2_PACKAGE_WII_U_GC_ADAPTER=y
 BR2_PACKAGE_VVVVVV=y
-BR2_PACKAGE_LIBRETRO_TAMALIBRETRO=y
+BR2_PACKAGE_LIBRETRO_TAMALIBRETRO=y
\ No newline at end of file
diff --git a/package/libretro-tic80/Config.in b/package/libretro-tic80/Config.in
index 126a8c555a541b05fb1ca8b7f88627507470efa7..851132d2db02b408125ca2dc3f8efdea76e7f248 100644
--- a/package/libretro-tic80/Config.in
+++ b/package/libretro-tic80/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBRETRO_TIC80
 	bool "libretro-tic80"
 	depends on BR2_PACKAGE_RETROARCH
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_LIBCURL
 	help
 	  A libretro TIC-80 emulator core.
 
diff --git a/package/libretro-tic80/libretro-tic80.mk b/package/libretro-tic80/libretro-tic80.mk
index 1a3acf650ddd77d7edcd06cd3e5887db75b05dc2..a827c336117c0bce7dc797662f3562889a1fc428 100644
--- a/package/libretro-tic80/libretro-tic80.mk
+++ b/package/libretro-tic80/libretro-tic80.mk
@@ -8,8 +8,9 @@
 LIBRETRO_TIC80_VERSION = 0937023babce9dd55eba5ada4b46c2f98b740324
 LIBRETRO_TIC80_SITE = https://github.com/nesbox/TIC-80.git
 LIBRETRO_TIC80_LICENSE = MIT
-LIBRETRO_TIC80_SITE_METHOD=git
-LIBRETRO_TIC80_GIT_SUBMODULES=y
+LIBRETRO_TIC80_SITE_METHOD = git
+LIBRETRO_TIC80_GIT_SUBMODULES = y
+LIBRETRO_TIC80_DEPENDENCIES = libcurl
 
 LIBRETRO_TIC80_CONF_OPTS=-DBUILD_SDL=OFF \
 						-DBUILD_SOKOL=OFF \
diff --git a/package/recalbox-romfs2/recalbox-romfs2.mk b/package/recalbox-romfs2/recalbox-romfs2.mk
index 8627067bef862c73ba7393a27e333672e13fd98f..c7227af28f4e4ec1adf065e4b5978ae039035b44 100644
--- a/package/recalbox-romfs2/recalbox-romfs2.mk
+++ b/package/recalbox-romfs2/recalbox-romfs2.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 RECALBOX_ROMFS2_LICENSE = MIT
-RECALBOX_ROMFS2_DEPENDECIES = host-python3 recalbox-romfs
+RECALBOX_ROMFS2_DEPENDENCIES = host-python3
 
 define RECALBOX_ROMFS2_BUILD_CMDS
 	$(HOST_DIR)/bin/python3 $(RECALBOX_ROMFS2_PKGDIR)/scripts/romfs.py \
diff --git a/package/wildmidi/Config.in b/package/wildmidi/Config.in
index 1a1987cc3e4ac7cb4a55f1df3881e8ef6df8fabf..467da42e559f9d386f2e49c1bdd4864a18d3149e 100644
--- a/package/wildmidi/Config.in
+++ b/package/wildmidi/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_WILDMIDI
 	bool "wildmidi"
+	depends on BR2_PACKAGE_ALSA_LIB
 	help
 	  WildMIDI is a simple software midi
 	  player which has a core softsynth
diff --git a/package/wildmidi/wildmidi.mk b/package/wildmidi/wildmidi.mk
index 53ce54ca734b2f4c626556d0fbed1d609659b2c4..2d58c7c2ff42349244e7a43d75f6ba5de27243a7 100644
--- a/package/wildmidi/wildmidi.mk
+++ b/package/wildmidi/wildmidi.mk
@@ -9,6 +9,7 @@ WILDMIDI_SITE = https://github.com/Mindwerks/wildmidi.git
 WILDMIDI_SITE_METHOD = git
 WILDMIDI_LICENSE = LGPLv3
 WILDMIDI_LICENSE_FILE = COPYING
+WILDMIDI_DEPENDENCIES = alsa-lib
 
 WILDMIDI_CONF_OPTS += -WANT_PLAYER=OFF -DWANT_ALSA=ON