diff --git a/packages/lang/Python3/package.mk b/packages/lang/Python3/package.mk
index 0da33df8a8..7f2b44b895 100644
--- a/packages/lang/Python3/package.mk
+++ b/packages/lang/Python3/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="93e583f243454e6e9e4588ca2c2662206ad961659863277afcdb96801647d640"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.python.org/"
 PKG_URL="https://www.python.org/ftp/python/${PKG_VERSION}/${PKG_NAME::-1}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_HOST="zlib:host bzip2:host libffi:host util-linux:host autoconf-archive:host openssl:host"
+PKG_DEPENDS_HOST="zlib:host bzip2:host xz:host libffi:host util-linux:host autoconf-archive:host openssl:host"
 PKG_DEPENDS_TARGET="autotools:host gcc:host Python3:host sqlite expat zlib bzip2 xz openssl libffi readline ncurses util-linux"
 PKG_LONGDESC="Python3 is an interpreted object-oriented programming language."
 PKG_BUILD_FLAGS="-cfg-libs -cfg-libs:host"
@@ -27,7 +27,6 @@ PKG_CONFIGURE_OPTS_HOST="ac_cv_prog_HAS_HG=/bin/false
                          py_cv_module__codecs_kr=n/a
                          py_cv_module__codecs_tw=n/a
                          py_cv_module__decimal=n/a
-                         py_cv_module__lzma=n/a
                          py_cv_module_nis=n/a
                          py_cv_module_ossaudiodev=n/a
                          py_cv_module__dbm=n/a
diff --git a/projects/ArchR/devices/RK3326/options b/projects/ArchR/devices/RK3326/options
index 3d4d1bcf5f..bfbad8e48f 100644
--- a/projects/ArchR/devices/RK3326/options
+++ b/projects/ArchR/devices/RK3326/options
@@ -36,7 +36,7 @@
     KERNEL_MAKE_EXTRACMD=" $(get_kernel_make_extracmd)"
 
   # Kernel cmdline
-    EXTRA_CMDLINE="quiet console=ttyS2,1500000 console=tty0 loglevel=0 vt.global_cursor_default=0 consoleblank=0 net.ifnames=0 systemd.show_status=false mitigations=off audit=0"
+    EXTRA_CMDLINE="quiet console=ttyS2,1500000 console=tty0 loglevel=0 vt.global_cursor_default=0 consoleblank=0 net.ifnames=0 systemd.show_status=false mitigations=off audit=0 loop.max_loop=16"
 
   # Bootloader to use (syslinux / u-boot)
     BOOTLOADER="u-boot"
diff --git a/projects/ArchR/packages/apps/portmaster/sources/control.txt b/projects/ArchR/packages/apps/portmaster/sources/control.txt
index 5028fc9a81..640f2367d1 100644
--- a/projects/ArchR/packages/apps/portmaster/sources/control.txt
+++ b/projects/ArchR/packages/apps/portmaster/sources/control.txt
@@ -80,9 +80,14 @@ case "${QUIRK_DEVICE}" in
     LOWRES="N"
     ANALOG_STICKS="0"
   ;;
+  "Game Console R36S"*|"R36S Clone")
+    param_device="oga"
+    LOWRES="Y"
+    ANALOG_STICKS="2"
+  ;;
   *)
-    param_device="rg552"
-    LOWRES="N"
+    param_device="oga"
+    LOWRES="Y"
     ANALOG_STICKS="2"
   ;;
 esac
diff --git a/projects/ArchR/packages/tools/dos2unix/package.mk b/projects/ArchR/packages/tools/dos2unix/package.mk
new file mode 100644
index 0000000000..65ac1980e2
--- /dev/null
+++ b/projects/ArchR/packages/tools/dos2unix/package.mk
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2024-present ArchR (https://github.com/archr-linux/Arch-R)
+
+PKG_NAME="dos2unix"
+PKG_VERSION="7.5.2"
+PKG_SHA256="264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a"
+PKG_LICENSE="BSD"
+PKG_SITE="https://waterlan.home.xs4all.nl/dos2unix.html"
+PKG_URL="https://waterlan.home.xs4all.nl/dos2unix/dos2unix-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="DOS/Mac to Unix and vice versa text file format converter."
+PKG_TOOLCHAIN="make"
+
+PKG_MAKE_OPTS_TARGET="prefix=/usr"
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/bin
+  cp -a ${PKG_BUILD}/dos2unix ${INSTALL}/usr/bin/
+  cp -a ${PKG_BUILD}/unix2dos ${INSTALL}/usr/bin/
+}
diff --git a/projects/ArchR/packages/tools/xdelta3/package.mk b/projects/ArchR/packages/tools/xdelta3/package.mk
new file mode 100644
index 0000000000..f6ac7260f1
--- /dev/null
+++ b/projects/ArchR/packages/tools/xdelta3/package.mk
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2024-present ArchR (https://github.com/archr-linux/Arch-R)
+
+PKG_NAME="xdelta3"
+PKG_VERSION="3.1.0"
+PKG_SHA256="114543336ab6cee3764e3c03202701ef79d7e5e8e4863fe64811e4d9e61884dc"
+PKG_LICENSE="GPL-2.0"
+PKG_SITE="https://github.com/jmacd/xdelta-gpl"
+PKG_URL="https://github.com/jmacd/xdelta-gpl/releases/download/v${PKG_VERSION}/xdelta3-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain xz"
+PKG_LONGDESC="Binary delta compression tool, used by PortMaster ports for patching game files."
+PKG_TOOLCHAIN="autotools"
+
+PKG_CONFIGURE_OPTS_TARGET="--with-liblzma"
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/bin
+  cp -a ${PKG_BUILD}/xdelta3 ${INSTALL}/usr/bin/
+}
diff --git a/projects/ArchR/packages/virtual/image/package.mk b/projects/ArchR/packages/virtual/image/package.mk
index 66362da913..899e22bb3d 100644
--- a/projects/ArchR/packages/virtual/image/package.mk
+++ b/projects/ArchR/packages/virtual/image/package.mk
@@ -12,7 +12,7 @@ PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host
                     mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware \
                     ${BOOTLOADER} busybox umtprd util-linux usb-modeswitch poppler jq socat \
                     p7zip file initramfs grep util-linux btrfs-progs zstd lz4 empty lzo libzip \
-                    bash coreutils sed gawk findutils diffutils \
+                    bash coreutils sed gawk findutils diffutils dos2unix xdelta3 \
                     system-utils autostart quirks powerstate gnupg \
                     gzip six xmlstarlet pyudev dialog network mako-osd archr \
                     pacman"
diff --git a/scripts/image b/scripts/image
index 1a7a646ac0..f505d029b4 100755
--- a/scripts/image
+++ b/scripts/image
@@ -162,6 +162,9 @@ echo "${TARGET_VERSION}" >${INSTALL}/etc/release
 
 # Create /etc/os-release
 cat <<EOF >${INSTALL}/etc/os-release
+NAME="${DISTRONAME}"
+ID="${OSNAME}"
+VERSION_ID="${OS_VERSION}"
 OS_NAME="${DISTRONAME}"
 OS_VERSION="${OS_VERSION}"
 OS_BUILD="${OS_BUILD}"