diff --git a/packages/emulators/libretro/citra-lr/package.mk b/packages/emulators/libretro/citra-lr/package.mk
index 88102b70f..a02fcb1f0 100644
--- a/packages/emulators/libretro/citra-lr/package.mk
+++ b/packages/emulators/libretro/citra-lr/package.mk
@@ -26,6 +26,20 @@ pre_make_target() {
   then
     rm CMakeLists.txt
   fi
+
+  PKG_MAKE_OPTS_TARGET="GIT_REV=${PKG_VERSION:0:7} \
+                        HAVE_FFMPEG_STATIC=1 \
+                        FFMPEG_DISABLE_VDPAU=1 \
+                        HAVE_FFMPEG_CROSSCOMPILE=1 \
+                        FFMPEG_XC_CPU=${TARGET_CPU} \
+                        FFMPEG_XC_ARCH=${TARGET_ARCH} \
+                        FFMPEG_XC_PREFIX=${TARGET_PREFIX} \
+                        FFMPEG_XC_SYSROOT=${SYSROOT_PREFIX} \
+                        FFMPEG_XC_NM=${NM} \
+                        FFMPEG_XC_AR=${AR} \
+                        FFMPEG_XC_AS=${CC} \
+                        FFMPEG_XC_CC=${CC} \
+                        FFMPEG_XC_LD=${CC}"
 }
 
 makeinstall_target() {
diff --git a/packages/emulators/standalone/ryujinx-sa/package.mk b/packages/emulators/standalone/ryujinx-sa/package.mk
index cdcfc6f2f..24e1b0236 100644
--- a/packages/emulators/standalone/ryujinx-sa/package.mk
+++ b/packages/emulators/standalone/ryujinx-sa/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
 
 PKG_NAME="ryujinx-sa"
-PKG_VERSION="1.1.711"
+PKG_VERSION="1.1.725"
 PKG_ARCH="x86_64"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/Ryujinx"
diff --git a/packages/emulators/standalone/yuzu-sa/package.mk b/packages/emulators/standalone/yuzu-sa/package.mk
index 8250812e6..e40a989a8 100644
--- a/packages/emulators/standalone/yuzu-sa/package.mk
+++ b/packages/emulators/standalone/yuzu-sa/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
 
 PKG_NAME="yuzu-sa"
-PKG_VERSION="e0895a85810d76d810b40ade50dc514a459b685e"
+PKG_VERSION="d60018358366304db271c76d64ee753f7dde14b4"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/yuzu-emu/yuzu"
diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index 7d938cfc2..387a2a1d0 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -17,8 +17,8 @@ case ${DEVICE} in
         PKG_GIT_CLONE_BRANCH="csf"
   ;;
   *)
-	PKG_VERSION="23.0.2"
-	PKG_SHA256="1b7d3399fc6f16f030361f925d33ebc7600cbf98094582f54775b6a1180529e7"
+	PKG_VERSION="23.0.3"
+	PKG_SHA256="386362a5d80df3b096636b67f340e1ce67b705b44767d5bdd11d2ed1037192d5"
 	PKG_SITE="http://www.mesa3d.org/"
 	PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"
   ;;
diff --git a/packages/kernel/linux/package.mk b/packages/kernel/linux/package.mk
index abe7f2ea4..35b7ce7eb 100644
--- a/packages/kernel/linux/package.mk
+++ b/packages/kernel/linux/package.mk
@@ -4,7 +4,7 @@
 
 PKG_NAME="linux"
 PKG_LICENSE="GPL"
-PKG_VERSION="6.1.24"
+PKG_VERSION="6.1.25"
 PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_SITE="http://www.kernel.org"
 PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"
diff --git a/packages/ui/emulationstation/config/common/es_features.cfg b/packages/ui/emulationstation/config/common/es_features.cfg
index 5e26314a5..be9404374 100644
--- a/packages/ui/emulationstation/config/common/es_features.cfg
+++ b/packages/ui/emulationstation/config/common/es_features.cfg
@@ -228,7 +228,7 @@
         <choice name="on" value="1"/>
       </feature>
       <feature name="switch mode">
-        <choice name="AMD64" value="0"/>
+        <choice name="handheld" value="0"/>
         <choice name="docked" value="1"/>
       </feature>
       <feature name="vsync">
diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk
index 0909bcdd2..014b01d72 100644
--- a/packages/virtual/emulators/package.mk
+++ b/packages/virtual/emulators/package.mk
@@ -39,7 +39,7 @@ case "${DEVICE}" in
   RK3588)
     [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 flycast-lr pcsx_rearmed-lr"
     PKG_EMUS+=" aethersx2-sa duckstation-sa pcsx_rearmed-lr box64 yabasanshiro-sa"
-    LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr dolphin-lr mame-lr box64"
+    LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr citra-lr dolphin-lr mame-lr box64"
     PKG_RETROARCH+=" retropie-shaders"
   ;;
   RK3566)
diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk
index 3bbcce947..e70557f4e 100644
--- a/packages/virtual/image/package.mk
+++ b/packages/virtual/image/package.mk
@@ -11,7 +11,7 @@ PKG_LONGDESC="Root package used to build and create complete image"
 PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host \
                     mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware \
                     ${BOOTLOADER} busybox util-linux corefonts misc-packages debug \
-                    usb-modeswitch unzip poppler perl textviewer jq socat p7zip file bluez \
+                    usb-modeswitch unzip poppler textviewer jq socat p7zip file bluez \
                     splash initramfs plymouth-lite grep wget util-linux patchelf imagemagick \
                     terminus-font bash coreutils alsa-ucm-conf modules system-utils \
                     autostart quirks powerstate powertop ectool gnupg gzip six xmlstarlet \
diff --git a/projects/Amlogic/bootloader/install b/projects/Amlogic/bootloader/install
index d66c3a596..8e6e470da 100644
--- a/projects/Amlogic/bootloader/install
+++ b/projects/Amlogic/bootloader/install
@@ -20,7 +20,8 @@ esac
 if [ "${BIOS_BIN}" == true ]
 then
   echo "uboot: copy bios bin to ${INSTALL}/usr/share/bootloader..."
-  cp -av ${PKG_BUILD}/tools/odroid_resource/ODROIDBIOS.BIN ${INSTALL}/usr/share/bootloader
+  cp -rav ${PKG_BUILD}/tools/odroid_resource/* ${INSTALL}/usr/share/bootloader
+  convert ${ROOT}/build.${DISTRO}-${DEVICE}.aarch64/splash-*/.install_pkg/usr/config/splash/splash_270.png -type truecolor ${INSTALL}/usr/share/bootloader/res/logo.bmp
 fi
 
 if [ "${BOOT_INI}" == true ]
diff --git a/projects/Amlogic/bootloader/mkimage b/projects/Amlogic/bootloader/mkimage
index 39a8335ce..9fcff281d 100644
--- a/projects/Amlogic/bootloader/mkimage
+++ b/projects/Amlogic/bootloader/mkimage
@@ -19,6 +19,10 @@ if [ "${BIOS_BIN}" == true ]; then
     cp "${RELEASE_DIR}/3rdparty/bootloader/ODROIDBIOS.BIN" "${LE_TMP}/ODROIDBIOS.BIN"
     mcopy -so "${LE_TMP}/ODROIDBIOS.BIN" ::
   fi
+  if [ -d "${RELEASE_DIR}/3rdparty/bootloader/res" ]; then
+    cp -r "${RELEASE_DIR}/3rdparty/bootloader/res" "${LE_TMP}/res"
+    mcopy -so "${LE_TMP}/res" ::
+  fi
 fi
 
 #Create boot.ini
diff --git a/projects/Amlogic/bootloader/release b/projects/Amlogic/bootloader/release
index 677bb8207..e5b1c2e60 100644
--- a/projects/Amlogic/bootloader/release
+++ b/projects/Amlogic/bootloader/release
@@ -14,6 +14,9 @@ if [ -n "${UBOOT_CONFIG}" ]; then
       if [ -f ${INSTALL}/usr/share/bootloader/ODROIDBIOS.BIN ]; then
         cp -a ${INSTALL}/usr/share/bootloader/ODROIDBIOS.BIN ${RELEASE_DIR}/3rdparty/bootloader
       fi
+      if [ -d ${INSTALL}/usr/share/bootloader/res ]; then
+        cp -ra ${INSTALL}/usr/share/bootloader/res ${RELEASE_DIR}/3rdparty/bootloader
+      fi
     ;;
   esac
 fi
diff --git a/projects/Amlogic/bootloader/update.sh b/projects/Amlogic/bootloader/update.sh
index 8e776f33b..c30ec9070 100644
--- a/projects/Amlogic/bootloader/update.sh
+++ b/projects/Amlogic/bootloader/update.sh
@@ -78,6 +78,11 @@ if [ -f $SYSTEM_ROOT/usr/share/bootloader/ODROIDBIOS.BIN ]; then
   cp -p $SYSTEM_ROOT/usr/share/bootloader/ODROIDBIOS.BIN $BOOT_ROOT/ODROIDBIOS.BIN &>/dev/null
 fi
 
+if [ -d $SYSTEM_ROOT/usr/share/bootloader/res ]; then
+  echo "Updating res..."
+  cp -rp $SYSTEM_ROOT/usr/share/bootloader/res $BOOT_ROOT/ &>/dev/null
+fi
+
 # update device tree
   for all_dtb in $SYSTEM_ROOT/usr/share/bootloader/*.dtb; do
     dtb=$(basename $all_dtb)
diff --git a/projects/Amlogic/packages/u-boot/package.mk b/projects/Amlogic/packages/u-boot/package.mk
index 0c6e4f68c..9b00a0922 100644
--- a/projects/Amlogic/packages/u-boot/package.mk
+++ b/projects/Amlogic/packages/u-boot/package.mk
@@ -7,7 +7,7 @@ PKG_NAME="u-boot"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hardkernel/"
-PKG_DEPENDS_TARGET="toolchain swig:host rkbin amlogic-boot-fip"
+PKG_DEPENDS_TARGET="toolchain swig:host rkbin amlogic-boot-fip splash"
 PKG_LONGDESC="U-Boot is a bootloader for embedded systems."
 GET_HANDLER_SUPPORT="git"
 PKG_PATCH_DIRS+="${DEVICE}"