From c30baceb7de78f845309fef01b1ddfed648ece0d Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 10:16:26 -0400
Subject: [PATCH 01/18] Update PSBBN-Definitive-Patch.sh

---
 PSBBN-Definitive-Patch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PSBBN-Definitive-Patch.sh b/PSBBN-Definitive-Patch.sh
index eeef3cc0..4d31f17a 100755
--- a/PSBBN-Definitive-Patch.sh
+++ b/PSBBN-Definitive-Patch.sh
@@ -540,7 +540,7 @@ check_dep(){
     check_cmd bchunk
     check_cmd pkg-config
     check_cmd ffmpegthumbnailer
-    check_cmd unrar-free
+    check_cmd bsdtar
     check_cmd dmsetup
 
     if ! pkg-config --exists icu-i18n 2>/dev/null; then

From a68d2d7c5bcdee28386f648ba6639ec7a4d91e90 Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 10:40:30 -0400
Subject: [PATCH 02/18] Update Setup.sh

Switch zip, unzip, and unrar-free to bsdtar. Add Gentoo support.
---
 scripts/Setup.sh | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/scripts/Setup.sh b/scripts/Setup.sh
index 23967b9b..adfa01d5 100755
--- a/scripts/Setup.sh
+++ b/scripts/Setup.sh
@@ -123,20 +123,47 @@ if [ -x "$(command -v apt-get)" ]; then
         sudo dpkg --add-architecture i386
         i386="libc6:i386"
     fi
-    sudo apt-get -q update && sudo apt-get install -y axel imagemagick xxd python3 python3-venv python3-pip bc rsync curl zip unzip wget ffmpeg lvm2 libfuse2 dosfstools e2fsprogs libc-bin exfatprogs exfat-fuse util-linux fdisk parted bchunk build-essential libicu-dev pkg-config ffmpegthumbnailer binfmt-support unrar-free dmsetup $i386 2>&1 | tee -a "${LOG_FILE}"
+    sudo apt-get -q update && sudo apt-get install -y axel imagemagick xxd python3 python3-venv python3-pip bc rsync curl wget ffmpeg lvm2 libfuse2 dosfstools e2fsprogs libc-bin exfatprogs exfat-fuse util-linux fdisk parted bchunk build-essential libicu-dev pkg-config ffmpegthumbnailer binfmt-support libarchive-tools dmsetup $i386 2>&1 | tee -a "${LOG_FILE}"
 # Or if user is on Fedora-based system, do this instead
 elif [ -x "$(command -v dnf)" ]; then
     if [[ "$arch" = "x86_64" ]]; then
         i386="glibc.i686"
     fi
     sudo dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm 2>&1 | tee -a "${LOG_FILE}"
-    sudo dnf install -y gcc-c++ axel ImageMagick xxd python3 python3-devel python3-pip bc rsync curl zip unzip wget ffmpeg lvm2 fuse-libs dosfstools e2fsprogs glibc-common exfatprogs fuse-exfat util-linux parted bchunk libicu-devel pkgconf ffmpegthumbnailer unrar-free device-mapper $i386 2>&1 | tee -a "${LOG_FILE}"
+    sudo dnf install -y gcc-c++ axel ImageMagick xxd python3 python3-devel python3-pip bc rsync curl wget ffmpeg lvm2 fuse-libs dosfstools e2fsprogs glibc-common exfatprogs fuse-exfat util-linux parted bchunk libicu-devel pkgconf ffmpegthumbnailer bsdtar device-mapper $i386 2>&1 | tee -a "${LOG_FILE}"
 # Or if user is on Arch-based system, do this instead
 elif [ -x "$(command -v pacman)" ]; then
     if [[ "$arch" = "x86_64" ]]; then
         i386="lib32-glibc"
     fi
-    sudo pacman -S --needed --noconfirm axel imagemagick xxd python pyenv python-pip bc rsync curl zip unzip wget ffmpeg lvm2 fuse2 dosfstools e2fsprogs glibc exfatprogs util-linux parted bchunk base-devel icu pkgconf ffmpegthumbnailer unrar-free device-mapper $i386 2>&1 | tee -a "${LOG_FILE}"
+    sudo pacman -S --needed --noconfirm axel imagemagick xxd python pyenv python-pip bc rsync curl wget ffmpeg lvm2 fuse2 dosfstools e2fsprogs glibc exfatprogs util-linux parted bchunk base-devel icu pkgconf ffmpegthumbnailer libarchive device-mapper $i386 2>&1 | tee -a "${LOG_FILE}"
+# Or if user is on Gentoo-based system, do this instead
+elif [ -x "$(command -v emerge)" ]; then
+    if [[ "$arch" = "x86_64" ]]; then
+        i386="glibc"
+    fi
+    # Check if device-mapper is in the user's kernel
+    # First, see if it's built in
+    if grep -q "device-mapper" /proc/devices 2>/dev/null && ! lsmod 2>/dev/null | grep -q "^dm_mod"; then
+    # If it's not built in, see if it's configured as a module
+    elif modprobe -n dm_mod &>/dev/null || lsmod 2>/dev/null | grep -q "^dm_mod"; then
+        # If it's a module, check if it's loaded
+        if grep -q "device-mapper" /proc/devices 2>/dev/null || lsmod 2>/dev/null | grep -q "^dm_mod"; then
+        else
+        # If it's not loaded, attempt to load it
+        if sudo modprobe dm_mod 2>/dev/null; then
+        else
+        echo "Error: Failed to load the 'dm_mod' kernel module." >&2
+        exit 1
+        fi
+    fi
+    else
+    # If it's not present at all, halt and throw this error message
+    echo "Error: device-mapper (CONFIG_BLK_DEV_DM) is missing from your kernel." >&2
+    echo "Please rebuild your kernel with CONFIG_BLK_DEV_DM=y or CONFIG_BLK_DEV_DM=m before running this installer." >&2
+        exit 1
+    fi
+    sudo USE='lvm' emerge --ask net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
 elif [ -n "$IN_NIX_SHELL" ]; then
     echo Running in Nix environment - packages should be provided by flake and setup should not be run. >> "${LOG_FILE}"
     error_msg "${UI_TEXT[ERROR_NIX]}"
@@ -176,4 +203,4 @@ echo
 echo "[✓] Setup completed successfully!" >> "${LOG_FILE}"
 echo -n "[✓] ${UI_TEXT[SETUP_SUCCESS]}"
 sleep 3
-echo
\ No newline at end of file
+echo

From a7e90b856985d4c4e799dd08c08b29bd2d55afb0 Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 10:46:17 -0400
Subject: [PATCH 03/18] Update Game-Installer.sh

Switch zip and unzip commands to bsdtar
---
 scripts/Game-Installer.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/Game-Installer.sh b/scripts/Game-Installer.sh
index 9aab323e..36cb0914 100755
--- a/scripts/Game-Installer.sh
+++ b/scripts/Game-Installer.sh
@@ -920,7 +920,7 @@ install_pops() {
             if [[ -f "${ASSETS_DIR}/POPS-binaries-main.zip" && ! -f "${ASSETS_DIR}/POPS-binaries-main.zip.st" ]]; then
                 echo | tee -a "${LOG_FILE}"
                 echo "POPS-binaries-main.zip found in ${ASSETS_DIR}. Extracting..." >> "${LOG_FILE}"
-                if ! unzip -o "${ASSETS_DIR}/POPS-binaries-main.zip" -d "${ASSETS_DIR}" >> "${LOG_FILE}" 2>&1; then
+                if ! bsdtar -xf "${ASSETS_DIR}/POPS-binaries-main.zip" -C "${ASSETS_DIR}" >> "${LOG_FILE}" 2>&1; then
                     echo "[!] Warning: Failed to extract POPS binaries." >> "${LOG_FILE}"
                     error_msg "Warning" "${UI_TEXT[WARN_INSTALL_POPS_1]}"
                 fi
@@ -932,7 +932,7 @@ install_pops() {
                     echo "[!] Warning: Failed to download POPS binaries." >> "${LOG_FILE}"
                     error_msg "Warning" "Failed to download POPS binaries."
                 fi
-                if ! unzip -o "${ASSETS_DIR}/POPS-binaries-main.zip" -d "${ASSETS_DIR}" >> "${LOG_FILE}" 2>&1; then
+                if ! bsdtar -xf "${ASSETS_DIR}/POPS-binaries-main.zip" -C "${ASSETS_DIR}" >> "${LOG_FILE}" 2>&1; then
                     error_msg "Warning" "${UI_TEXT[WARN_INSTALL_POPS_2]}"
                 fi
             fi
@@ -3943,9 +3943,9 @@ cp "${MISSING_ICON}" "${ICONS_DIR}/ico/tmp" >> "${LOG_FILE}" 2>&1
 
 cd "${ICONS_DIR}/ico/tmp/"
 rm *.png >/dev/null 2>&1
-zip -r "${ARTWORK_DIR}/tmp/ico.zip" * >/dev/null 2>&1
+bsdtar -acf "${ARTWORK_DIR}/tmp/ico.zip" * >/dev/null 2>&1
 cd "${ARTWORK_DIR}/tmp/" 
-zip -r "${ARTWORK_DIR}/tmp/art.zip" * >/dev/null 2>&1
+bsdtar -acf "${ARTWORK_DIR}/tmp/art.zip" * >/dev/null 2>&1
 
 if [ -f "${ARTWORK_DIR}/tmp/art.zip" ]; then
     echo "Contributing to the PSBBN art & HDD-OSD databases..." >> "${LOG_FILE}"

From 7156380fb09d43ccb6d1eb2ae471f8c2197647d8 Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 10:47:48 -0400
Subject: [PATCH 04/18] Update HOSDMenu-Installer.sh

Switch zip and unzip to bsdtar
---
 scripts/HOSDMenu-Installer.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/HOSDMenu-Installer.sh b/scripts/HOSDMenu-Installer.sh
index a9e2498a..fd0a83dc 100755
--- a/scripts/HOSDMenu-Installer.sh
+++ b/scripts/HOSDMenu-Installer.sh
@@ -367,14 +367,14 @@ download_files() {
         # Check if extras.zip exists
         if [[ -f "${ASSETS_DIR}/extras.zip" && ! -f "${ASSETS_DIR}/extras.zip.st" ]]; then
             echo "extras.zip found in ${ASSETS_DIR}. Extracting..." >> "${LOG_FILE}"
-            unzip -o "${ASSETS_DIR}/extras.zip" -d "${ASSETS_DIR}" >> "${LOG_FILE}" 2>&1
+            bsdtar -xf "${ASSETS_DIR}/extras.zip" -C "${ASSETS_DIR}" >> "${LOG_FILE}" 2>&1
         else
             echo "Downloading..." >> "${LOG_FILE}"
             echo -n "${UI_TEXT[DOWNLOAD_LATEST_FILE_2]}..."
             wget --quiet --timeout=10 --tries=3 -O "${ASSETS_DIR}/extras.zip" https://archive.org/download/psbbn-definitive-english-patch-v2/extras.zip
             echo
             if [[ -s "${ASSETS_DIR}/extras.zip" ]]; then
-                unzip -o "${ASSETS_DIR}/extras.zip" -d "${ASSETS_DIR}" >> "${LOG_FILE}" 2>&1
+                bsdtar -xf "${ASSETS_DIR}/extras.zip" -C "${ASSETS_DIR}" >> "${LOG_FILE}" 2>&1
             else
                 rm "${ASSETS_DIR}/extras.zip"
                 echo "[X] Error: Download failed for HDD-OSD." >> "${LOG_FILE}" 2>&1
@@ -828,4 +828,4 @@ lsblk -p -o MODEL,NAME,SIZE,LABEL,MOUNTPOINT >> "${LOG_FILE}"
 echo "[✓] ${UI_TEXT[HOSDMENU_SUCCESS]}" | tee -a "${LOG_FILE}"
 echo
 read -n 1 -s -r -p "${UI_TEXT[MENU_RETURN]}" </dev/tty
-echo
\ No newline at end of file
+echo

From bb1d312c12cb8b1390ed4085f45040e406862f55 Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 10:48:57 -0400
Subject: [PATCH 05/18] Update Media-Installer.sh

Switch unzip to bsdtar
---
 scripts/Media-Installer.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/Media-Installer.sh b/scripts/Media-Installer.sh
index e703788f..2cc0de31 100755
--- a/scripts/Media-Installer.sh
+++ b/scripts/Media-Installer.sh
@@ -583,14 +583,14 @@ download_ps2str() {
     if [[ -f "${ASSETS_DIR}/ps2str_v1.08_2001.zip" ]]; then
       echo "Found ${ASSETS_DIR}/ps2str_v1.08_2001.zip..." >> "${LOG_FILE}"
         echo "${UI_TEXT[GET_LATEST_FILE_1]} ${ASSETS_DIR}/ps2str_v1.08_2001.zip..."
-        unzip -o "${ASSETS_DIR}/ps2str_v1.08_2001.zip" -d "${ASSETS_DIR}" >> "${LOG_FILE}" 2>&1
+        bsdtar -xf "${ASSETS_DIR}/ps2str_v1.08_2001.zip" -C "${ASSETS_DIR}" >> "${LOG_FILE}" 2>&1
     else
         echo "Downloading ps2str..." >> "${LOG_FILE}"
         echo "${UI_TEXT[DOWNLOAD_REQUIRED]}"
         wget --quiet --timeout=10 --tries=3 -O "${ASSETS_DIR}/ps2str_v1.08_2001.zip" https://archive.org/download/ps2str_v1.08_2001/ps2str_v1.08_2001.zip
         echo
         if [[ -s "${ASSETS_DIR}/ps2str_v1.08_2001.zip" ]]; then
-            unzip -o "${ASSETS_DIR}/ps2str_v1.08_2001.zip" -d "${ASSETS_DIR}" >> "${LOG_FILE}" 2>&1
+            bsdtar -xf "${ASSETS_DIR}/ps2str_v1.08_2001.zip" -C "${ASSETS_DIR}" >> "${LOG_FILE}" 2>&1
         fi
     fi
 }
@@ -1844,4 +1844,4 @@ while true; do
             sleep 2
             ;;
     esac
-done
\ No newline at end of file
+done

From b265d0302fe5b8b70213ebf44270b854be0e7bcd Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 10:51:16 -0400
Subject: [PATCH 06/18] Update Game-Installer.sh

Oh yeah, and switch unrar-free too
---
 scripts/Game-Installer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Game-Installer.sh b/scripts/Game-Installer.sh
index 36cb0914..45933ee0 100755
--- a/scripts/Game-Installer.sh
+++ b/scripts/Game-Installer.sh
@@ -473,7 +473,7 @@ POPS_PATCH_DL() {
         wget -qO- 'https://www.mediafire.com/file/rznkr05pci45w5p/Hugopocked_POPStarter_Fixes_%25282023-08-11%2529.rar/file' \
         | grep -o 'https://download[^"]*Hugopocked+POPStarter+Fixes+%282023-08-11%29.rar' | head -n1)"
 
-    unrar-free x "${ASSETS_DIR}/Hugopocked_POPStarter_Fixes.rar" "$ASSETS_DIR"
+    bsdtar -xf "${ASSETS_DIR}/Hugopocked_POPStarter_Fixes.rar" -C "$ASSETS_DIR"
 }
 
 CREATE_PS1_VMC() {

From 9c7261f000ddb47dad11c581a95c91e013c0d937 Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 10:52:34 -0400
Subject: [PATCH 07/18] Update flake.nix

Remove zip and unzip and switch unrar-free to libarchive
---
 scripts/nix/flake.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/nix/flake.nix b/scripts/nix/flake.nix
index 9ca080eb..17e9a70c 100644
--- a/scripts/nix/flake.nix
+++ b/scripts/nix/flake.nix
@@ -40,8 +40,6 @@
           bc
           rsync
           curl
-          zip
-          unzip
           wget
           exfatprogs
           ffmpeg
@@ -50,7 +48,7 @@
           bchunk
           e2fsprogs
           ffmpegthumbnailer
-          unrar-free
+          libarchive
           lvm2
           dosfstools
           util-linux

From a7f6af47af6be3936bc22e152f5bea86e4fb03e3 Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 10:53:08 -0400
Subject: [PATCH 08/18] Update PSBBN-Definitive-Patch.sh

Oh yeah, remove zip and unzip checks
---
 PSBBN-Definitive-Patch.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/PSBBN-Definitive-Patch.sh b/PSBBN-Definitive-Patch.sh
index 4d31f17a..aa2be161 100755
--- a/PSBBN-Definitive-Patch.sh
+++ b/PSBBN-Definitive-Patch.sh
@@ -526,8 +526,6 @@ check_dep(){
     check_cmd bc
     check_cmd rsync
     check_cmd curl
-    check_cmd zip
-    check_cmd unzip
     check_cmd wget
     check_cmd ffmpeg
     check_cmd lvm

From da4475b50826d5e5bece6382003ee7f147fc7d30 Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 11:06:16 -0400
Subject: [PATCH 09/18] Update Setup.sh

Fix syntax error
---
 scripts/Setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/Setup.sh b/scripts/Setup.sh
index adfa01d5..5000b735 100755
--- a/scripts/Setup.sh
+++ b/scripts/Setup.sh
@@ -144,14 +144,14 @@ elif [ -x "$(command -v emerge)" ]; then
     fi
     # Check if device-mapper is in the user's kernel
     # First, see if it's built in
-    if grep -q "device-mapper" /proc/devices 2>/dev/null && ! lsmod 2>/dev/null | grep -q "^dm_mod"; then
+    if grep -q "device-mapper" /proc/devices 2>/dev/null && ! lsmod 2>/dev/null | grep -q "^dm_mod"; then :
     # If it's not built in, see if it's configured as a module
     elif modprobe -n dm_mod &>/dev/null || lsmod 2>/dev/null | grep -q "^dm_mod"; then
         # If it's a module, check if it's loaded
-        if grep -q "device-mapper" /proc/devices 2>/dev/null || lsmod 2>/dev/null | grep -q "^dm_mod"; then
+        if grep -q "device-mapper" /proc/devices 2>/dev/null || lsmod 2>/dev/null | grep -q "^dm_mod"; then :
         else
         # If it's not loaded, attempt to load it
-        if sudo modprobe dm_mod 2>/dev/null; then
+        if sudo modprobe dm_mod 2>/dev/null; then :
         else
         echo "Error: Failed to load the 'dm_mod' kernel module." >&2
         exit 1

From af75320b937cfbb83dcc4be405bd565bd1a19109 Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 12:02:51 -0400
Subject: [PATCH 10/18] Change to debugged Setup.sh from testing branch

Debugged using Gentoo LiveCD
---
 scripts/Setup.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/Setup.sh b/scripts/Setup.sh
index 5000b735..04767201 100755
--- a/scripts/Setup.sh
+++ b/scripts/Setup.sh
@@ -163,7 +163,19 @@ elif [ -x "$(command -v emerge)" ]; then
     echo "Please rebuild your kernel with CONFIG_BLK_DEV_DM=y or CONFIG_BLK_DEV_DM=m before running this installer." >&2
         exit 1
     fi
-    sudo USE='lvm' emerge --ask net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
+    sudo mkdir -p /etc/portage/package.use
+    cat << 'EOF' | sudo tee /etc/portage/package.use/psbbn-installer > /dev/null
+    # Specific USE requirements for PSBBN installer dependencies
+sys-fs/lvm2 lvm
+media-video/ffmpeg opus
+EOF
+# Swap deprecated exfat-utils with exfatprogs if present
+    if portageq has_version / sys-fs/exfat-utils &>/dev/null; then
+        echo "Removing deprecated sys-fs/exfat-utils to prevent package blocks..."
+        sudo emerge --deselect sys-fs/exfat-utils &>/dev/null
+        sudo emerge --unmerge --quiet sys-fs/exfat-utils
+    fi
+    sudo emerge --sync && sudo USE='lvm' emerge -q --ask=n --quiet-fail --autounmask=y --autounmask-continue=y --autounmask-write=y -- net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
 elif [ -n "$IN_NIX_SHELL" ]; then
     echo Running in Nix environment - packages should be provided by flake and setup should not be run. >> "${LOG_FILE}"
     error_msg "${UI_TEXT[ERROR_NIX]}"

From 0739661c9f7462b34b549c2ce9e145b12d09de5b Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 12:17:01 -0400
Subject: [PATCH 11/18] Mention Gentoo support

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8e18f0f8..b78f590e 100755
--- a/README.md
+++ b/README.md
@@ -691,7 +691,7 @@ For the best experience, a PS2 Fat model (SCPH-30000 to SCPH-55000 series) is re
 The **PSBBN Definitive Project** requires an x86-64 or ARM64 PC for installation. Connect the HDD or SSD to the PC via SATA or a USB adapter.
 
 ## Installing on Linux
-64-bit Debian-based distributions using `apt`, Arch-based distributions using `pacman`, and Fedora-based[*](#troubleshooting) distributions using `dnf` are supported. Nix-based systems are also supported via flakes. Recommended distributions are Linux Mint, Debian, and for Raspberry Pi, Raspberry Pi OS.
+64-bit Debian-based distributions using `apt`, Arch-based distributions using `pacman`, Fedora-based[*](#troubleshooting) distributions using `dnf`, and Gentoo-based distributions using `emerge` are supported. Nix-based systems are also supported via flakes. Recommended distributions are Linux Mint, Debian, and for Raspberry Pi, Raspberry Pi OS.
 
 **The PSBBN Definitive Project is a rolling release. To get automatic updates and the latest bug fixes, you must install the scripts using `git clone`.**
 

From 0a6f0531c8cbf569ba75440fae4aa85cb72a316a Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 12:34:15 -0400
Subject: [PATCH 12/18] Fix fuse version

---
 scripts/Setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Setup.sh b/scripts/Setup.sh
index 04767201..b66087b1 100755
--- a/scripts/Setup.sh
+++ b/scripts/Setup.sh
@@ -175,7 +175,7 @@ EOF
         sudo emerge --deselect sys-fs/exfat-utils &>/dev/null
         sudo emerge --unmerge --quiet sys-fs/exfat-utils
     fi
-    sudo emerge --sync && sudo USE='lvm' emerge -q --ask=n --quiet-fail --autounmask=y --autounmask-continue=y --autounmask-write=y -- net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
+    sudo emerge --sync && sudo USE='lvm' emerge -q --ask=n --quiet-fail --autounmask=y --autounmask-continue=y --autounmask-write=y -- net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse:0 sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
 elif [ -n "$IN_NIX_SHELL" ]; then
     echo Running in Nix environment - packages should be provided by flake and setup should not be run. >> "${LOG_FILE}"
     error_msg "${UI_TEXT[ERROR_NIX]}"

From 444dfc80b7c02663c62d390944b5ebd968bba5ae Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 12:37:47 -0400
Subject: [PATCH 13/18] Update Setup.sh

Don't rebuild already built packages
---
 scripts/Setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Setup.sh b/scripts/Setup.sh
index b66087b1..accbdcde 100755
--- a/scripts/Setup.sh
+++ b/scripts/Setup.sh
@@ -175,7 +175,7 @@ EOF
         sudo emerge --deselect sys-fs/exfat-utils &>/dev/null
         sudo emerge --unmerge --quiet sys-fs/exfat-utils
     fi
-    sudo emerge --sync && sudo USE='lvm' emerge -q --ask=n --quiet-fail --autounmask=y --autounmask-continue=y --autounmask-write=y -- net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse:0 sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
+    sudo emerge --sync && sudo USE='lvm' emerge -qn --ask=n --quiet-fail --autounmask=y --autounmask-continue=y --autounmask-write=y -- net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse:0 sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
 elif [ -n "$IN_NIX_SHELL" ]; then
     echo Running in Nix environment - packages should be provided by flake and setup should not be run. >> "${LOG_FILE}"
     error_msg "${UI_TEXT[ERROR_NIX]}"

From ddae7f6bd3dd4096156c47d30ef8d2e6e316ba93 Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 12:44:16 -0400
Subject: [PATCH 14/18] Update Setup.sh

---
 scripts/Setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Setup.sh b/scripts/Setup.sh
index accbdcde..48059770 100755
--- a/scripts/Setup.sh
+++ b/scripts/Setup.sh
@@ -175,7 +175,7 @@ EOF
         sudo emerge --deselect sys-fs/exfat-utils &>/dev/null
         sudo emerge --unmerge --quiet sys-fs/exfat-utils
     fi
-    sudo emerge --sync && sudo USE='lvm' emerge -qn --ask=n --quiet-fail --autounmask=y --autounmask-continue=y --autounmask-write=y -- net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse:0 sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
+    sudo emerge --sync && sudo USE='lvm' emerge --noreplace --quiet --quiet-fail --autounmask=y --autounmask-continue=y --autounmask-write=y -- net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse:0 sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
 elif [ -n "$IN_NIX_SHELL" ]; then
     echo Running in Nix environment - packages should be provided by flake and setup should not be run. >> "${LOG_FILE}"
     error_msg "${UI_TEXT[ERROR_NIX]}"

From 6a41871f501105970aa16cc0dba35917de3b8da9 Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 26 Aug 2026 12:50:26 -0400
Subject: [PATCH 15/18] Add libarchive fedora

---
 scripts/Setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Setup.sh b/scripts/Setup.sh
index 48059770..5c5e30e2 100755
--- a/scripts/Setup.sh
+++ b/scripts/Setup.sh
@@ -130,7 +130,7 @@ elif [ -x "$(command -v dnf)" ]; then
         i386="glibc.i686"
     fi
     sudo dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm 2>&1 | tee -a "${LOG_FILE}"
-    sudo dnf install -y gcc-c++ axel ImageMagick xxd python3 python3-devel python3-pip bc rsync curl wget ffmpeg lvm2 fuse-libs dosfstools e2fsprogs glibc-common exfatprogs fuse-exfat util-linux parted bchunk libicu-devel pkgconf ffmpegthumbnailer bsdtar device-mapper $i386 2>&1 | tee -a "${LOG_FILE}"
+    sudo dnf install -y gcc-c++ axel ImageMagick xxd python3 python3-devel python3-pip bc rsync curl wget ffmpeg lvm2 fuse-libs dosfstools e2fsprogs glibc-common exfatprogs fuse-exfat util-linux parted bchunk libicu-devel pkgconf ffmpegthumbnailer libarchive bsdtar device-mapper $i386 2>&1 | tee -a "${LOG_FILE}"
 # Or if user is on Arch-based system, do this instead
 elif [ -x "$(command -v pacman)" ]; then
     if [[ "$arch" = "x86_64" ]]; then

From 32abcd607205918702c7d5d58d09a3b5f6bbc81e Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Thu, 27 Aug 2026 16:06:56 -0400
Subject: [PATCH 16/18] Update Setup.sh

Clean up emerge command and ask before attempting to remove exfat-utils
---
 scripts/Setup.sh | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/scripts/Setup.sh b/scripts/Setup.sh
index 5c5e30e2..95665639 100755
--- a/scripts/Setup.sh
+++ b/scripts/Setup.sh
@@ -171,11 +171,25 @@ media-video/ffmpeg opus
 EOF
 # Swap deprecated exfat-utils with exfatprogs if present
     if portageq has_version / sys-fs/exfat-utils &>/dev/null; then
-        echo "Removing deprecated sys-fs/exfat-utils to prevent package blocks..."
-        sudo emerge --deselect sys-fs/exfat-utils &>/dev/null
-        sudo emerge --unmerge --quiet sys-fs/exfat-utils
+        while true; do
+        read -p "You have deprecated exfat-utils installed. It must be removed for this program to function. Do you want to remove it now and replace it with exfatprogs? (y/n): " yn
+        case $yn in
+            [Yy]* )
+                sudo emerge --deselect sys-fs/exfat-utils &>/dev/null
+                sudo emerge --unmerge --quiet sys-fs/exfat-utils
+                break
+                ;;
+            [Nn]* )
+                echo "Please remove sys-fs/exfat-utils manually before running this script again."
+                exit 0
+                ;;
+            * )
+                echo "Invalid input! Please enter y or n."
+                ;;
+            esac
+        done
     fi
-    sudo emerge --sync && sudo USE='lvm' emerge --noreplace --quiet --quiet-fail --autounmask=y --autounmask-continue=y --autounmask-write=y -- net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse:0 sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
+    sudo emerge --sync && sudo USE='lvm' emerge --noreplace --quiet --quiet-fail --autounmask=y --autounmask-continue=y --autounmask-write=y net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse:0 sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
 elif [ -n "$IN_NIX_SHELL" ]; then
     echo Running in Nix environment - packages should be provided by flake and setup should not be run. >> "${LOG_FILE}"
     error_msg "${UI_TEXT[ERROR_NIX]}"

From 9b37bf3da29969d812329636bd857b3f9bce7242 Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Fri, 28 Aug 2026 10:52:03 -0400
Subject: [PATCH 17/18] Remove redundancy in kernel checking and improve emerge
 command

Makes it so the emerge command rebuilds packages if they need to be rebuilt with a new USE flag (i.e. lvm). --update is used instead of --noreplace to achieve this behaviour. --ask is used instead of --autounmask to avoid angering people by forcing changed to their configs, instead asking and allowing them to do it themselves if necessary.
---
 scripts/Setup.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/scripts/Setup.sh b/scripts/Setup.sh
index 95665639..98fe5394 100755
--- a/scripts/Setup.sh
+++ b/scripts/Setup.sh
@@ -143,13 +143,10 @@ elif [ -x "$(command -v emerge)" ]; then
         i386="glibc"
     fi
     # Check if device-mapper is in the user's kernel
-    # First, see if it's built in
+    # First, see if it's built into the kernel or if it's a module and currently loaded
     if grep -q "device-mapper" /proc/devices 2>/dev/null && ! lsmod 2>/dev/null | grep -q "^dm_mod"; then :
-    # If it's not built in, see if it's configured as a module
-    elif modprobe -n dm_mod &>/dev/null || lsmod 2>/dev/null | grep -q "^dm_mod"; then
-        # If it's a module, check if it's loaded
-        if grep -q "device-mapper" /proc/devices 2>/dev/null || lsmod 2>/dev/null | grep -q "^dm_mod"; then :
-        else
+    # If it's not built in or loaded, check if it's built as a module but not currently loaded
+    elif modprobe -n dm_mod &>/dev/null || lsmod 2>/dev/null | grep -q "^dm_mod"; then   
         # If it's not loaded, attempt to load it
         if sudo modprobe dm_mod 2>/dev/null; then :
         else
@@ -189,7 +186,7 @@ EOF
             esac
         done
     fi
-    sudo emerge --sync && sudo USE='lvm' emerge --noreplace --quiet --quiet-fail --autounmask=y --autounmask-continue=y --autounmask-write=y net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse:0 sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
+    sudo emerge --sync && sudo USE='lvm' emerge --update --quiet --quiet-fail --changed-use --ask net-misc/axel media-gfx/imagemagick dev-util/xxd dev-lang/python dev-python/pip sys-devel/bc net-misc/rsync net-misc/curl net-misc/wget media-video/ffmpeg sys-fs/lvm2 sys-fs/fuse:0 sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/exfatprogs sys-apps/util-linux sys-block/parted app-cdr/bchunk dev-libs/icu dev-util/pkgconf media-video/ffmpegthumbnailer app-arch/libarchive $i386 2>&1 | tee -a "${LOG_FILE}"
 elif [ -n "$IN_NIX_SHELL" ]; then
     echo Running in Nix environment - packages should be provided by flake and setup should not be run. >> "${LOG_FILE}"
     error_msg "${UI_TEXT[ERROR_NIX]}"

From d6eddc30a1274c1b7dd276bc53136904b52679cc Mon Sep 17 00:00:00 2001
From: finn <56238271+quisys@users.noreply.github.com>
Date: Wed, 2 Sep 2026 22:58:18 -0400
Subject: [PATCH 18/18] Fix typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b78f590e..11c35c75 100755
--- a/README.md
+++ b/README.md
@@ -1153,7 +1153,7 @@ The full readme can be found [here](https://github.com/pcm720/OSDMenu/blob/main/
 **Warning: Manually creating new APA partitions on your PS2 drive and exceeding the allocated space for APA will corrupt the drive.**
 
 ## Early (SCPH-10000–18000) and Slim (SCPH-700xx) Consoles
-The **PSBBN Definitive Project** can be installed on PS2 Slim **SCPH-700xx** models with an [IDE Resurrector](https://gusse.in/shop/ps2-modding-parts/ide-resurrector-origami-v0-7-flex-cable-for-ps2-slim-spch700xx/) or similar hardware mod. Installing to an SD card is not supported on Windows. For PSBBN compatibility, an SATA adapter must be used, such as the [iFlash-Sata v10](https://www.iflash.xyz/store/iflash-sata-v10/).
+The **PSBBN Definitive Project** can be installed on PS2 Slim **SCPH-700xx** models with an [IDE Resurrector](https://gusse.in/shop/ps2-modding-parts/ide-resurrector-origami-v0-7-flex-cable-for-ps2-slim-spch700xx/) or similar hardware mod. Installing to an SD card is not supported on Windows. For PSBBN compatibility, a SATA adapter must be used, such as the [iFlash-Sata v10](https://www.iflash.xyz/store/iflash-sata-v10/).
 
 You must also download the [External HDD Drivers](https://israpps.github.io/FreeMcBoot-Installer/test/8_Downloads.html). Extract the files and place `hddload.irx`, `dev9.irx`, and `atad.irx` in the appropriate system folder for your region on an **official Sony PS2 Memory Card**: