Merge pull request #5255 from AuxXxilium/dev

Dev
Merge pull request #5231 from AuxXxilium/dev
2024-12-18 21:25:18 +01:00 · 2024-12-11 22:21:20 +01:00 · 2024-12-07 18:51:59 +01:00 · 2024-12-07 15:25:13 +01:00 · 2024-12-07 13:45:34 +01:00 · 2024-12-05 19:38:57 +01:00
28 changed files with 1565 additions and 1871 deletions
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -0,0 +1,271 @@
+#
+# Copyright (C) 2024 AuxXxilium <https://github.com/AuxXxilium>
+#
+# This is free software, licensed under the MIT License.
+# See /LICENSE for more information.
+#
+
+name: Build Arc Image Development
+
+on:
+  workflow_dispatch:
+    inputs:
+      runs:
+        description: "runs-on"
+        type: choice
+        options:
+          - ubuntu-latest
+          - self-hosted
+      version:
+        description: "version (1.0.0)"
+        required: true
+        type: string
+      next:
+        description: "next"
+        default: true
+        type: boolean
+      stable:
+        description: "stable"
+        default: true
+        type: boolean
+
+jobs:
+  build:
+    runs-on: ${{ inputs.runs }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@main
+
+      # Install Dependencies
+      - name: Install Dependencies
+        if: ${{ inputs.runs == 'ubuntu-latest' }}
+        run: |
+          git config --global user.email "info@auxxxilium.tech"
+          git config --global user.name "AuxXxilium"
+          sudo timedatectl set-timezone "Europe/Berlin"
+
+          sudo apt update
+          sudo apt install -y locales busybox dialog gettext sed gawk jq curl 
+          sudo apt install -y python-is-python3 python3-pip libelf-dev qemu-utils cpio xz-utils lz4 lzma bzip2 gzip zstd
+          # sudo snap install yq
+          if ! command -v yq &>/dev/null || ! yq --version 2>/dev/null | grep -q "v4."; then
+            sudo curl -kL https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -o /usr/bin/yq && sudo chmod a+x /usr/bin/yq
+          fi
+
+          df -h
+
+      # Get extractor, LKM, Addons, Modules, Theme and Configs
+      - name: Get Buildroot
+        run: |
+          . scripts/func.sh "${{ secrets.BUILD_TOKEN }}"
+
+          echo "Get Dependencies"
+          getAddons "files/p3/addons"
+          getModules "files/p3/modules"
+          getConfigs "files/p3/configs"
+          getPatches "files/p3/patches"
+          getCustom "files/p3/custom"
+          getOffline "files/p3/configs"
+          getLKMs "files/p3/lkms"
+          getTheme "files/p1/boot/grub"
+          getBuildrootx "brx"
+          getBuildroots "brs"
+
+          # Export Dependencies Version to env
+          echo "ADDONTAG=${ADDONTAG}" >> $GITHUB_ENV
+          echo "MODULETAG=${MODULETAG}" >> $GITHUB_ENV
+          echo "CONFIGTAG=${CONFIGTAG}" >> $GITHUB_ENV
+          echo "PATCHTAG=${PATCHTAG}" >> $GITHUB_ENV
+          echo "CUSTOMTAG=${CUSTOMTAG}" >> $GITHUB_ENV
+          echo "LKMTAG=${LKMTAG}" >> $GITHUB_ENV
+          echo "THEMETAG=${THEMETAG}" >> $GITHUB_ENV
+          echo "BRXTAG=${BRXTAG}" >> $GITHUB_ENV
+          echo "BRSTAG=${BRSTAG}" >> $GITHUB_ENV
+          echo "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV
+
+          echo "OK"
+
+       # Build incremental
+      - name: Build Next Image
+        if: ${{ inputs.next == true }}
+        run: |
+          . scripts/func.sh
+
+          # Modify Source File
+          ARC_BUILD="`date +'%y%m%d'`"
+          ARC_VERSION="${{ inputs.version }}-dev"
+          ARC_BRANCH="next"
+          echo "${ARC_BUILD}" >files/p1/ARC-BUILD
+          echo "${ARC_VERSION}" >files/p1/ARC-VERSION
+          echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
+          echo "ARC_BUILD=${ARC_BUILD}" >> $GITHUB_ENV
+          echo "ARC_VERSION=${ARC_VERSION}" >> $GITHUB_ENV
+          echo "ARC_BRANCH=${ARC_BRANCH}" >> $GITHUB_ENV
+
+          echo "Create Arc Image"
+          IMAGE_FILE="arc.img"
+          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
+          fdisk -l "${IMAGE_FILE}"
+          
+          LOOPX=$(sudo losetup -f)
+          sudo losetup -P "${LOOPX}" "${IMAGE_FILE}"
+
+          echo "Mounting Image File"
+          mkdir -p "/tmp/p1"
+          mkdir -p "/tmp/p3"
+          sudo mount ${LOOPX}p1 "/tmp/p1"
+          sudo mount ${LOOPX}p3 "/tmp/p3"
+
+          [ ! -f "brx/bzImage-arc" ] || [ ! -f "brx/initrd-arc" ] && return 1
+          
+          echo "Repack initrd"
+          cp -f "brx/bzImage-arc" "files/p3/bzImage-arc"
+          repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"
+
+          echo "Copying files"
+          sudo cp -rf "files/p1/"* "/tmp/p1"
+          sudo cp -rf "files/p3/"* "/tmp/p3"
+          sudo sync
+
+          echo "Unmount image file"
+          sudo umount "/tmp/p1"
+          sudo umount "/tmp/p3"
+          rmdir "/tmp/p1"
+          rmdir "/tmp/p3"
+
+          sudo losetup --detach ${LOOPX}
+
+          echo "Image Converter"
+          qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk
+          qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
+
+          echo "Create Arc vhd"
+          createvmc "arc.vmc"
+          qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd
+
+          echo "Create Arc ova"
+          convertova "${IMAGE_FILE}" "arc.ova"
+
+      # Zip image and generate checksum
+      - name: Pack Next Image
+        if: ${{ inputs.next == true }}
+        run: |
+          if [ -n "${{ env.ARC_VERSION }}" ]; then
+            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
+            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-dyn.zip" arc-dyn.vmdk
+            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-flat.zip" arc.vmdk arc-flat.vmdk
+            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vhdx.zip" arc.vhdx
+            (cd files && zip -r ../update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip ./p1 ./p3)
+          fi
+
+      # Cleanup
+      - name: Cleanup
+        run: |
+          rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc-flat.vmdk" "arc.vhd" "arc.ova" "arc.vmc"
+
+       # Build incremental
+      - name: Build Stable Image
+        if: ${{ inputs.stable }}
+        run: |
+          . scripts/func.sh
+
+          # Modify Source File
+          ARC_BUILD="`date +'%y%m%d'`"
+          ARC_VERSION="${{ inputs.version }}-dev"
+          ARC_BRANCH="stable"
+          echo "${ARC_BUILD}" >files/p1/ARC-BUILD
+          echo "${ARC_VERSION}" >files/p1/ARC-VERSION
+          echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
+          echo "ARC_BUILD=${ARC_BUILD}" >> $GITHUB_ENV
+          echo "ARC_VERSION=${ARC_VERSION}" >> $GITHUB_ENV
+          echo "ARC_BRANCH=${ARC_BRANCH}" >> $GITHUB_ENV
+
+          echo "Create Arc Image"
+          IMAGE_FILE="arc.img"
+          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
+          fdisk -l "${IMAGE_FILE}"
+          
+          LOOPX=$(sudo losetup -f)
+          sudo losetup -P "${LOOPX}" "${IMAGE_FILE}"
+
+          echo "Mounting Image File"
+          mkdir -p "/tmp/p1"
+          mkdir -p "/tmp/p3"
+          sudo mount ${LOOPX}p1 "/tmp/p1"
+          sudo mount ${LOOPX}p3 "/tmp/p3"
+
+          [ ! -f "brs/bzImage-arc" ] || [ ! -f "brs/initrd-arc" ] && return 1
+          
+          echo "Repack initrd"
+          cp -f "brs/bzImage-arc" "files/p3/bzImage-arc"
+          #cp -f "brs/initrd-arc" "files/p3/initrd-arc"
+          repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"
+
+          echo "Copying files"
+          sudo cp -rf "files/p1/"* "/tmp/p1"
+          sudo cp -rf "files/p3/"* "/tmp/p3"
+          sudo sync
+
+          echo "Unmount image file"
+          sudo umount "/tmp/p1"
+          sudo umount "/tmp/p3"
+          rmdir "/tmp/p1"
+          rmdir "/tmp/p3"
+
+          sudo losetup --detach ${LOOPX}
+
+          echo "Image Converter"
+          qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk
+          qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
+
+          echo "Create Arc vhd"
+          createvmc "arc.vmc"
+          qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd
+
+          echo "Create Arc ova"
+          convertova "${IMAGE_FILE}" "arc.ova"
+
+      # Zip image and generate checksum
+      - name: Pack Stable Image
+        if: ${{ inputs.stable }}
+        run: |
+          if [ -n "${{ env.ARC_VERSION }}" ]; then
+            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
+            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-dyn.zip" arc-dyn.vmdk
+            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-flat.zip" arc.vmdk arc-flat.vmdk
+            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vhdx.zip" arc.vhdx
+            (cd files && zip -r ../update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip ./p1 ./p3)
+          fi
+
+      # Publish a release if is a tag
+      - name: Release
+        if: success() && env.ARC_VERSION != ''
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ env.ARC_VERSION }}
+          prerelease: true
+          makeLatest: false
+          allowUpdates: true
+          body: |
+            ### Note:
+              - Development Build
+
+            ### Information:
+              - Full Changelog is available in my Discord
+              - Discord Account for Arc Patch needed
+
+            ### Dependencies:
+              - Addons: ${{ env.ADDONTAG }}
+              - Modules: ${{ env.MODULETAG }}
+              - Configs: ${{ env.CONFIGTAG }}
+              - Patches: ${{ env.PATCHTAG }}
+              - Custom: ${{ env.CUSTOMTAG }}
+              - LKMs: ${{ env.LKMTAG }}
+              - Buildroot Stable: ${{ env.BRSTAG }}
+              - Buildroot Next: ${{ env.BRXTAG }}
+
+            ### Release
+              - ${{ env.BUILD_TIME }}
+          artifacts: |
+            arc-*.zip
+            update-*.zip
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium>
+# Copyright (C) 2024 AuxXxilium <https://github.com/AuxXxilium>
 #
 # This is free software, licensed under the MIT License.
 # See /LICENSE for more information.
@@ -32,17 +32,13 @@ on:
        description: "pre release"
        default: false
        type: boolean
-      minimal:
-        description: "minimal"
+      next:
+        description: "next"
        default: true
        type: boolean
-      microcode:
-        description: "microcode"
-        default: false
-        type: boolean
-      extended:
-        description: "extended"
-        default: false
+      stable:
+        description: "stable"
+        default: true
        type: boolean
      clean:
        description: "clean"
@@ -57,14 +53,14 @@ jobs:
        uses: actions/checkout@main

      - name: Delete releases and workflows runs
-        if: ${{ inputs.clean }}
+        if: ${{ inputs.clean == true }}
        uses: ophub/delete-releases-workflows@main
        with:
          delete_releases: true
          releases_keep_latest: 1
          delete_workflows: false
          delete_tags: true
-          gh_token: ${{ secrets.BUILD_TOKEN }}
+          gh_token: ${{ secrets.GITHUB_TOKEN }}

      # Install Dependencies
      - name: Install Dependencies
@@ -98,15 +94,8 @@ jobs:
          getOffline "files/p3/configs"
          getLKMs "files/p3/lkms"
          getTheme "files/p1/boot/grub"
-          if [ "${{ inputs.extended }}" = "true" ]; then
-            getBuildroot "ext" "brx"
-          fi
-          if [ "${{ inputs.minimal }}" = "true" ]; then
-            getBuildroot "min" "brs"
-          fi
-          if [ "${{ inputs.microcode }}" = "true" ]; then
-            getBuildroot "micro" "brm"
-          fi
+          getBuildrootx "brx" 
+          getBuildroots "brs"

          # Export Dependencies Version to env
          echo "ADDONTAG=${ADDONTAG}" >> $GITHUB_ENV
@@ -118,26 +107,25 @@ jobs:
          echo "THEMETAG=${THEMETAG}" >> $GITHUB_ENV
          echo "BRXTAG=${BRXTAG}" >> $GITHUB_ENV
          echo "BRSTAG=${BRSTAG}" >> $GITHUB_ENV
-          echo "BRMTAG=${BRMTAG}" >> $GITHUB_ENV
          echo "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV

          echo "OK"

       # Build incremental
-      - name: Build extended Image
-        if: ${{ inputs.extended }}
+      - name: Build Next Image
+        if: ${{ inputs.next == true }}
        run: |
          . scripts/func.sh

          # Modify Source File
-          ARC_BUILD="$(date +'%y%m%d')"
+          ARC_BUILD="`date +'%y%m%d'`"
          ARC_VERSION="${{ inputs.version }}"
-          ARC_BRANCH="extended"
-          echo "${ARC_BUILD}" > "files/p1/ARC-BUILD"
+          ARC_BRANCH="next"
+          echo "${ARC_BUILD}" >files/p1/ARC-BUILD
+          echo "${ARC_VERSION}" >files/p1/ARC-VERSION
+          echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
          echo "ARC_BUILD=${ARC_BUILD}" >> $GITHUB_ENV
-          echo "${ARC_VERSION}" > "files/p1/ARC-VERSION"
          echo "ARC_VERSION=${ARC_VERSION}" >> $GITHUB_ENV
-          echo "${ARC_BRANCH}" > "files/p1/ARC-BRANCH"
          echo "ARC_BRANCH=${ARC_BRANCH}" >> $GITHUB_ENV

          echo "Create Arc Image"
@@ -185,8 +173,8 @@ jobs:
          convertova "${IMAGE_FILE}" "arc.ova"

      # Zip image and generate checksum
-      - name: Pack extended Image
-        if: ${{ inputs.extended }}
+      - name: Pack Next Image
+        if: ${{ inputs.next == true }}
        run: |
          if [ -n "${{ env.ARC_VERSION }}" ]; then
            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
@@ -195,30 +183,28 @@ jobs:
            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vhd.zip" arc.vhd arc.vmc
            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.ova.zip" arc.ova
            (cd files && zip -r ../update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip ./p1 ./p3)
-            sha256sum update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip >"update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.hash"
          fi

      # Cleanup
      - name: Cleanup
-        if: ${{ inputs.extended }}
        run: |
-          rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc-flat.vmdk" "arc.vhd" "arc.ova" "arc.vmc" 2>/dev/null
+          rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc-flat.vmdk" "arc.vhd" "arc.ova" "arc.vmc"

       # Build incremental
-      - name: Build minimal Image
-        if: ${{ inputs.minimal }}
+      - name: Build Stable Image
+        if: ${{ inputs.stable == true }}
        run: |
          . scripts/func.sh

          # Modify Source File
-          ARC_BUILD="$(date +'%y%m%d')"
+          ARC_BUILD="`date +'%y%m%d'`"
          ARC_VERSION="${{ inputs.version }}"
-          ARC_BRANCH="minimal"
-          echo "${ARC_BUILD}" > "files/p1/ARC-BUILD"
+          ARC_BRANCH="stable"
+          echo "${ARC_BUILD}" >files/p1/ARC-BUILD
+          echo "${ARC_VERSION}" >files/p1/ARC-VERSION
+          echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
          echo "ARC_BUILD=${ARC_BUILD}" >> $GITHUB_ENV
-          echo "${ARC_VERSION}" > "files/p1/ARC-VERSION"
          echo "ARC_VERSION=${ARC_VERSION}" >> $GITHUB_ENV
-          echo "${ARC_BRANCH}" > "files/p1/ARC-BRANCH"
          echo "ARC_BRANCH=${ARC_BRANCH}" >> $GITHUB_ENV

          echo "Create Arc Image"
@@ -239,6 +225,7 @@ jobs:
          
          echo "Repack initrd"
          cp -f "brs/bzImage-arc" "files/p3/bzImage-arc"
+          #cp -f "brs/initrd-arc" "files/p3/initrd-arc"
          repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"

          echo "Copying files"
@@ -266,8 +253,8 @@ jobs:
          convertova "${IMAGE_FILE}" "arc.ova"

      # Zip image and generate checksum
-      - name: Pack minimal Image
-        if: ${{ inputs.minimal }}
+      - name: Pack Stable Image
+        if: ${{ inputs.stable == true }}
        run: |
          if [ -n "${{ env.ARC_VERSION }}" ]; then
            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
@@ -276,88 +263,6 @@ jobs:
            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vhd.zip" arc.vhd arc.vmc
            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.ova.zip" arc.ova
            (cd files && zip -r ../update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip ./p1 ./p3)
-            sha256sum update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip >"update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.hash"
-          fi
-
-      # Cleanup
-      - name: Cleanup
-        if: ${{ inputs.minimal }}
-        run: |
-          rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc-flat.vmdk" "arc.vhd" "arc.ova" "arc.vmc" 2>/dev/null
-
-       # Build incremental
-      - name: Build microcode Image
-        if: ${{ inputs.microcode }}
-        run: |
-          . scripts/func.sh
-
-          # Modify Source File
-          ARC_BUILD="$(date +'%y%m%d')"
-          ARC_VERSION="${{ inputs.version }}"
-          ARC_BRANCH="microcode"
-          echo "${ARC_BUILD}" > "files/p1/ARC-BUILD"
-          echo "ARC_BUILD=${ARC_BUILD}" >> $GITHUB_ENV
-          echo "${ARC_VERSION}" > "files/p1/ARC-VERSION"
-          echo "ARC_VERSION=${ARC_VERSION}" >> $GITHUB_ENV
-          echo "${ARC_BRANCH}" > "files/p1/ARC-BRANCH"
-          echo "ARC_BRANCH=${ARC_BRANCH}" >> $GITHUB_ENV
-
-          echo "Create Arc Image"
-          IMAGE_FILE="arc.img"
-          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
-          fdisk -l "${IMAGE_FILE}"
-          
-          LOOPX=$(sudo losetup -f)
-          sudo losetup -P "${LOOPX}" "${IMAGE_FILE}"
-
-          echo "Mounting Image File"
-          mkdir -p "/tmp/p1"
-          mkdir -p "/tmp/p3"
-          sudo mount ${LOOPX}p1 "/tmp/p1"
-          sudo mount ${LOOPX}p3 "/tmp/p3"
-
-          [ ! -f "brm/bzImage-arc" ] || [ ! -f "brm/initrd-arc" ] && return 1
-          
-          echo "Repack initrd"
-          cp -f "brm/bzImage-arc" "files/p3/bzImage-arc"
-          repackInitrd "brm/initrd-arc" "files/initrd" "files/p3/initrd-arc"
-
-          echo "Copying files"
-          sudo cp -rf "files/p1/"* "/tmp/p1"
-          sudo cp -rf "files/p3/"* "/tmp/p3"
-          sudo sync
-
-          echo "Unmount image file"
-          sudo umount "/tmp/p1"
-          sudo umount "/tmp/p3"
-          rmdir "/tmp/p1"
-          rmdir "/tmp/p3"
-
-          sudo losetup --detach ${LOOPX}
-
-          echo "Image Converter"
-          qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk
-          qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
-
-          echo "Create Arc vhd"
-          createvmc "arc.vmc"
-          qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd
-
-          echo "Create Arc ova"
-          convertova "${IMAGE_FILE}" "arc.ova"
-
-      # Zip image and generate checksum
-      - name: Pack minimal Image
-        if: ${{ inputs.minimal }}
-        run: |
-          if [ -n "${{ env.ARC_VERSION }}" ]; then
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-dyn.zip" arc-dyn.vmdk
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-flat.zip" arc.vmdk arc-flat.vmdk
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vhd.zip" arc.vhd arc.vmc
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.ova.zip" arc.ova
-            (cd files && zip -r ../update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip ./p1 ./p3)
-            sha256sum update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip >"update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.hash"
          fi

      # Publish a release if is a tag
@@ -374,13 +279,12 @@ jobs:
              - ${{ inputs.notice }}

            ### Information:
-              - Changelog is available in my Discord
+              - Full Changelog is available in my Discord
              - Discord Account for Arc Patch needed

            ### Versions:
-              ${{ inputs.minimal && '- minimal: full image, all dependencies included (reduced size, faster boot)' || '' }}
-              ${{ inputs.microcode && '- microcode: minimal + additional microcode updates' || '' }}
-              ${{ inputs.extended && '- extended: full image, all dependencies included (new features to test)' || '' }}
+              - stable: Stable Image (Full Image, all dependencies are included, less hardware support)
+              - next: Next Image (Full Image, all dependencies are included, more hardware support, new features to test)

            ### Dependencies:
              - Addons: ${{ env.ADDONTAG }}
@@ -389,13 +293,11 @@ jobs:
              - Patches: ${{ env.PATCHTAG }}
              - Custom: ${{ env.CUSTOMTAG }}
              - LKMs: ${{ env.LKMTAG }}
-              ${{ inputs.minimal && format('- Buildroot minimal: {0}', env.BRSTAG) || '' }}
-              ${{ inputs.microcode && format('- Buildroot microcode: {0}', env.BRMTAG) || '' }}
-              ${{ inputs.extended && format('- Buildroot extended: {0}', env.BRXTAG) || '' }}
+              - Buildroot Stable: ${{ env.BRSTAG }}
+              - Buildroot Next: ${{ env.BRXTAG }}

            ### Release
              - ${{ env.BUILD_TIME }}
          artifacts: |
            arc-*.zip
            update-*.zip
-            update-*.hash
--- a/.github/workflows/custom.yml
+++ b/.github/workflows/custom.yml
@@ -247,7 +247,7 @@ jobs:
            arc-${{ env.MODEL }}-${{ env.VERSION }} is ready to download: ${{ env.FIOURL }}
            > ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

-            If this isn't working, do not use customized Versions!
+            If this will not work, do not use customized Versions!
            ----

      - name: Update Comment Fail
@@ -260,8 +260,10 @@ jobs:
          update-mode: replace
          body: |
            Hi @${{ github.event.issue.user.login }}.  
-            arc-${{ env.MODEL }}-${{ env.PRODUCTVER }}-${{ env.VERSION }} failed to build and package, please try again later.  
+            arc-${{ env.MODEL }}-${{ env.PRODUCTVER }}-${{ env.VERSION }} failed to build and package, please try again.  
            > ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} 
+
+            If this will not work, do not use customized Versions!
            ----

      - name: Close Issues
--- a/.github/workflows/grub.yml
+++ b/.github/workflows/grub.yml
@@ -28,19 +28,20 @@ jobs:
          sudo timedatectl set-timezone "Europe/Berlin"

          sudo apt update
-          sudo apt install -y autoconf automake autopoint build-essential pkg-config bison flex gettext gawk libtool dosfstools e2fsprogs
-          sudo apt install -y libfreetype6-dev unifont fonts-dejavu libfuse-dev libzfslinux-dev liblzma-dev libdevmapper-dev
+          sudo apt install -y autoconf automake autopoint gettext build-essential bison flex libtool dosfstools e2fsprogs
+          sudo apt install -y libfreetype6-dev unifont fonts-dejavu libfuse-dev liblzma-dev libzfslinux-dev

      - name: Make Grub
        run: |
-          rm -f grub.img.gz
-          . scripts/grub.sh "grub-2.12" "i386-pc i386-efi x86_64-efi" "ARC"
+          . scripts/grub.sh "grub-2.12" "i386-pc i386-efi x86_64-efi"

      - name: Check and Push
        if: success() && inputs.push == true
        run: |
          if [ -f "grub.img.gz" ]; then
-            mv -f "grub.img.gz" "files/initrd/opt/arc/grub.img.gz"
+            echo "Copy img ..."
+            mv -f grub.img.gz files/initrd/opt/arc/grub.img.gz
+
            echo "Git push ..."
            git pull
            status=$(git status -s | grep -E 'grub.img.gz' | awk '{printf " %s", $2}')
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -3,23 +3,15 @@
 version: "3"

 tasks:
-  build-ext:
+  build-img-n:
    cmds:
-      - git reset --hard
      - git pull
-      - ./img-gen.sh ext
+      - ./img-gen-n.sh

-  build-min:
+  build-img-s:
    cmds:
-      - git reset --hard
      - git pull
-      - ./img-gen.sh min
-
-  build-micro:
-    cmds:
-      - git reset --hard
-      - git pull
-      - ./img-gen.sh micro
+      - ./img-gen-s.sh

  compile-kpatch:
    dir: kpatch
--- a/files/initrd/opt/arc/arc-functions.sh
+++ b/files/initrd/opt/arc/arc-functions.sh
@@ -39,245 +39,259 @@ function addonSelection() {
  PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
  ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
-
  # read addons from user config
+  unset ADDONS
  declare -A ADDONS
  while IFS=': ' read -r KEY VALUE; do
    [ -n "${KEY}" ] && ADDONS["${KEY}"]="${VALUE}"
  done < <(readConfigMap "addons" "${USER_CONFIG_FILE}")
-
-  rm -f "${TMP_PATH}/opts"
+  rm -f "${TMP_PATH}/opts" >/dev/null
  touch "${TMP_PATH}/opts"
-
  while read -r ADDON DESC; do
    arrayExistItem "${ADDON}" "${!ADDONS[@]}" && ACT="on" || ACT="off"
-    if { [[ "${ADDON}" = "amepatch" || "${ADDON}" = "arcdns" ]] && [ -z "${ARCCONF}" ]; } || { [ "${ADDON}" = "codecpatch" ] && [ -n "${ARCCONF}" ]; }; then
+    if [[ "${ADDON}" = "amepatch" || "${ADDON}" = "arcdns" ]] && [ -z "${ARCCONF}" ]; then
+      continue
+    elif [ "${ADDON}" = "codecpatch" ] && [ -n "${ARCCONF}" ]; then
      continue
    else
      echo -e "${ADDON} \"${DESC}\" ${ACT}" >>"${TMP_PATH}/opts"
    fi
  done < <(availableAddons "${PLATFORM}")
-
-  dialog --backtitle "$(backtitle)" --title "Addons" --colors --aspect 18 \
-    --checklist "Select Addons to include.\nAddons: \Z1System Addon\Zn | \Z4App Addon\Zn\nSelect with SPACE, Confirm with ENTER!" 0 0 0 \
-    --file "${TMP_PATH}/opts" 2>"${TMP_PATH}/resp"
-  [ $? -ne 0 ] && return 1
-  resp=$(cat "${TMP_PATH}/resp")
-
+  if [ "${STEP}" = "addons" ]; then
+    dialog --backtitle "$(backtitlep)" --title "Addons" --colors --aspect 18 \
+      --checklist "Select Addons to include.\nAddons: \Z1System Addon\Zn | \Z4App Addon\Zn\nSelect with SPACE, Confirm with ENTER!" 0 0 0 \
+      --file "${TMP_PATH}/opts" 2>"${TMP_PATH}/resp"
+    [ $? -ne 0 ] && return 1
+    resp=$(cat ${TMP_PATH}/resp)
+  else
+    dialog --backtitle "$(backtitle)" --title "Addons" --colors --aspect 18 \
+      --checklist "Select Addons to include.\nAddons: \Z1System Addon\Zn | \Z4App Addon\Zn\nSelect with SPACE, Confirm with ENTER!" 0 0 0 \
+      --file "${TMP_PATH}/opts" 2>"${TMP_PATH}/resp"
+    [ $? -ne 0 ] && return 1
+    resp=$(cat ${TMP_PATH}/resp)
+  fi
+  unset ADDONS
  declare -A ADDONS
  writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
  for ADDON in ${resp}; do
    ADDONS["${ADDON}"]=""
    writeConfigKey "addons.\"${ADDON}\"" "" "${USER_CONFIG_FILE}"
  done
-
  ADDONSINFO="$(readConfigEntriesArray "addons" "${USER_CONFIG_FILE}")"
-  dialog --backtitle "$(backtitle)" --title "Addons" \
-    --msgbox "Addons selected:\n${ADDONSINFO}" 7 70
+  if [ "${STEP}" = "addons" ]; then
+    dialog --backtitle "$(backtitlep)" --title "Addons" \
+      --msgbox "Addons selected:\n${ADDONSINFO}" 7 70
+  else
+    dialog --backtitle "$(backtitle)" --title "Addons" \
+      --msgbox "Addons selected:\n${ADDONSINFO}" 7 70
+  fi
+  return
 }

 ###############################################################################
 # Permit user select the modules to include
 function modulesMenu() {
-  NEXT="1"
  PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
  KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
+  # Modify KVER for Epyc7002
  [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
-  # loop menu
+  # menu loop
  while true; do
-    rm -f "${TMP_PATH}/menu"
-    {
-      echo "1 \"Show/Select Modules\""
-      echo "2 \"Select loaded Modules\""
-      echo "3 \"Upload a external Module\""
-      echo "4 \"Deselect i915 with dependencies\""
-      echo "5 \"Edit Modules that need to be copied to DSM\""
-      echo "6 \"Blacklist Modules to prevent loading\""
-    } >"${TMP_PATH}/menu"
-    dialog --backtitle "$(backtitle)" --title "Modules" \
-      --cancel-label "Exit" --menu "Choose an option" 0 0 0 --file "${TMP_PATH}/menu" \
-      2>${TMP_PATH}/resp
+    dialog --backtitle "$(backtitle)" --title "Modules" --cancel-label "Exit" --menu "Choose an Option" 0 0 0 \
+      1 "Show selected Modules" \
+      2 "Select loaded Modules" \
+      3 "Select all Modules" \
+      4 "Deselect all Modules" \
+      5 "Choose Modules" \
+      6 "Add external module" \
+      7 "Edit Modules copied to DSM" \
+      8 "Force-copy loaded Modules to DSM" \
+      9 "Blacklist Modules to prevent loading in DSM" \
+      2>"${TMP_PATH}/resp"
    [ $? -ne 0 ] && break
    case "$(cat ${TMP_PATH}/resp)" in
-    1)
-      while true; do
-        dialog --backtitle "$(backtitle)" --title "Modules" \
-          --infobox "Reading Modules ..." 3 25
-        ALLMODULES=$(getAllModules "${PLATFORM}" "${KVERP}")
+      1)
+        dialog --backtitle "$(backtitle)" --title "Modules" --aspect 18 \
+          --infobox "Reading modules" 0 0
        unset USERMODULES
        declare -A USERMODULES
        while IFS=': ' read -r KEY VALUE; do
          [ -n "${KEY}" ] && USERMODULES["${KEY}"]="${VALUE}"
        done < <(readConfigMap "modules" "${USER_CONFIG_FILE}")
-        rm -f "${TMP_PATH}/opts"
+        ITEMS=""
+        for KEY in ${!USERMODULES[@]}; do
+          ITEMS+="${KEY}: ${USERMODULES[$KEY]}\n"
+        done
+        dialog --backtitle "$(backtitle)" --title "Modules" \
+          --msgbox "${ITEMS}" 0 0
+        ;;
+      2)
+        dialog --backtitle "$(backtitle)" --colors --title "Modules" \
+          --infobox "Selecting loaded Modules" 0 0
+        KOLIST=""
+        for I in $(lsmod | awk -F' ' '{print $1}' | grep -v 'Module'); do
+          KOLIST+="$(getdepends "${PLATFORM}" "${KVERP}" "${I}") ${I} "
+        done
+        KOLIST=($(echo ${KOLIST} | tr ' ' '\n' | sort -u))
+        unset USERMODULES
+        declare -A USERMODULES
+        writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+        for ID in ${KOLIST[@]}; do
+          USERMODULES["${ID}"]=""
+          writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}"
+        done
+        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+        ;;
+      3)
+        dialog --backtitle "$(backtitle)" --title "Modules" \
+           --infobox "Selecting all Modules" 0 0
+        unset USERMODULES
+        declare -A USERMODULES
+        writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+        while read -r ID DESC; do
+          USERMODULES["${ID}"]=""
+          writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}"
+        done < <(getAllModules "${PLATFORM}" "${KVERP}")
+        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+        ;;
+      4)
+        dialog --backtitle "$(backtitle)" --title "Modules" \
+           --infobox "Deselecting all Modules" 0 0
+        writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+        unset USERMODULES
+        declare -A USERMODULES
+        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+        ;;
+      5)
+        rm -f "${TMP_PATH}/opts" >/dev/null
        while read -r ID DESC; do
          arrayExistItem "${ID}" "${!USERMODULES[@]}" && ACT="on" || ACT="off"
          echo "${ID} ${DESC} ${ACT}" >>"${TMP_PATH}/opts"
-        done <<<${ALLMODULES}
+        done < <(getAllModules "${PLATFORM}" "${KVERP}")
+        dialog --backtitle "$(backtitle)" --title "Modules" --aspect 18 \
+          --checklist "Select Modules to include" 0 0 0 \
+          --file "${TMP_PATH}/opts" 2>"${TMP_PATH}/resp"
+        [ $? -ne 0 ] && return 1
+        resp=$(cat ${TMP_PATH}/resp)
        dialog --backtitle "$(backtitle)" --title "Modules" \
-          --cancel-label "Exit" \
-          --extra-button --extra-label "Select all" \
-          --help-button --help-label "Deselect all" \
-          --checklist "Select Modules to include" 0 0 0 --file "${TMP_PATH}/opts" \
-          2>${TMP_PATH}/resp
-        RET=$?
-        case ${RET} in
-        0)
-          # ok-button
-          writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
-          mergeConfigModules "$(cat "${TMP_PATH}/resp" 2>/dev/null)" "${USER_CONFIG_FILE}"
-          writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
-          BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-          break
-          ;;
-        3)
-          # extra-button
-          writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
-          mergeConfigModules "$(echo "${ALLMODULES}" | awk '{print $1}')" "${USER_CONFIG_FILE}"
-          writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
-          BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-          ;;
-        2)
-          # help-button
-          writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
-          writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
-          BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-          ;;
-        1)
-          # cancel-button
-          break
-          ;;
-        255)
-          # ESC
-          break
-          ;;
-        esac
-      done
-      ;;
-    2)
-      dialog --backtitle "$(backtitle)" --title "Modules" \
-        --infobox "Select loaded modules" 0 0
-      KOLIST=""
-      for I in $(lsmod 2>/dev/null | awk -F' ' '{print $1}' | grep -v 'Module'); do
-        KOLIST+="$(getdepends "${PLATFORM}" "${KVERP}" "${I}") ${I} "
-      done
-      KOLIST=($(echo ${KOLIST} | tr ' ' '\n' | sort -u))
-      writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
-      for ID in ${KOLIST[@]}; do
-        writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}"
-      done
-      writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
-      BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-      ;;
-    3)
-      if ! tty 2>/dev/null | grep -q "/dev/pts"; then #if ! tty 2>/dev/null | grep -q "/dev/pts" || [ -z "${SSH_TTY}" ]; then
-        MSG=""
-        MSG+="This feature is only available when accessed via ssh (Requires a terminal that supports ZModem protocol)."
-        dialog --backtitle "$(backtitle)" --title "Modules" \
-          --msgbox "${MSG}" 0 0
-        return
-      fi
-      MSG=""
-      MSG+="This function is experimental and dangerous. If you don't know much, please exit.\n"
-      MSG+="The imported .ko of this function will be implanted into the corresponding arch's modules package, which will affect all models of the arch.\n"
-      MSG+="This program will not determine the availability of imported modules or even make type judgments, as please double check if it is correct.\n"
-      MSG+="If you want to remove it, please go to the \"Update Menu\" -> \"Update Dependencies\" to forcibly update the modules. All imports will be reset.\n"
-      MSG+="Do you want to continue?"
-      dialog --backtitle "$(backtitle)" --title "Modules" \
-        --yesno "${MSG}" 0 0
-      [ $? -ne 0 ] && continue
-      dialog --backtitle "$(backtitle)" --title "Modules" \
-        --msgbox "Please upload the *.ko file." 0 0
-      TMP_UP_PATH=${TMP_PATH}/users
-      USER_FILE=""
-      rm -rf ${TMP_UP_PATH}
-      mkdir -p ${TMP_UP_PATH}
-      pushd ${TMP_UP_PATH}
-      rz -be
-      for F in $(ls -A 2>/dev/null); do
-        USER_FILE=${F}
-        break
-      done
-      popd
-      if [ -n "${USER_FILE}" ] && [ "${USER_FILE##*.}" = "ko" ]; then
-        addToModules ${PLATFORM} "${KVERP}" "${TMP_UP_PATH}/${USER_FILE}"
-        [ -f "${MODULES_PATH}/VERSION" ] && rm -f "${MODULES_PATH}/VERSION"
-        dialog --backtitle "$(backtitle)" --title "Modules" \
-          --msgbox "$(printf "Module '%s' added to %s-%s" "${USER_FILE}" "${PLATFORM}" "${KVERP}")" 0 0
-        rm -f "${TMP_UP_PATH}/${USER_FILE}"
-        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
-        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-      else
-        dialog --backtitle "$(backtitle)" --title "Modules" \
-          --msgbox "Not a valid file, please try again!" 0 0
-      fi
-      ;;
-    4)
-      DEPS="$(getdepends "${PLATFORM}" "${KVERP}" i915) i915"
-      DELS=()
-      while IFS=': ' read -r KEY VALUE; do
-        [ -z "${KEY}" ] && continue
-        if echo "${DEPS}" | grep -wq "${KEY}"; then
-          DELS+=("${KEY}")
-        fi
-      done <<<$(readConfigMap "modules" "${USER_CONFIG_FILE}")
-      if [ ${#DELS[@]} -eq 0 ]; then
-        dialog --backtitle "$(backtitle)" --title "Modules" \
-          --msgbox "No i915 with dependencies module to deselect." 0 0
-      else
-        for ID in ${DELS[@]}; do
-          deleteConfigKey "modules.\"${ID}\"" "${USER_CONFIG_FILE}"
+           --infobox "Writing to user config" 20 5
+        unset USERMODULES
+        declare -A USERMODULES
+        writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+        for ID in ${resp}; do
+          USERMODULES["${ID}"]=""
+          writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}"
        done
-        dialog --backtitle "$(backtitle)" --title "Modules" \
-          --msgbox "$(printf "Module %s deselected." "${DELS[@]}")" 0 0
-      fi
-      writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
-      BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-      ;;
-    5)
-      if [ -f ${USER_UP_PATH}/modulelist ]; then
-        cp -f "${USER_UP_PATH}/modulelist" "${TMP_PATH}/modulelist.tmp"
-      else
-        cp -f "${ARC_PATH}/include/modulelist" "${TMP_PATH}/modulelist.tmp"
-      fi
-      while true; do
-        dialog --backtitle "$(backtitle)" --title "Edit with caution" \
-          --ok-label "Save" --cancel-label "Exit" \
-          --editbox "${TMP_PATH}/modulelist.tmp" 0 0 2>"${TMP_PATH}/modulelist.user"
-        [ $? -ne 0 ] && break
-        [ ! -d "${USER_UP_PATH}" ] && mkdir -p "${USER_UP_PATH}"
-        mv -f "${TMP_PATH}/modulelist.user" "${USER_UP_PATH}/modulelist"
-        dos2unix "${USER_UP_PATH}/modulelist"
        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-        break
-      done
-      ;;
-    6)
-      # modprobe.blacklist
-      MSG=""
-      MSG+="The blacklist is used to prevent the kernel from loading specific modules.\n"
-      MSG+="The blacklist is a list of module names separated by ','.\n"
-      MSG+="For example: \Z4evbug,cdc_ether\Zn\n"
-      while true; do
-        modblacklist="$(readConfigKey "modblacklist" "${USER_CONFIG_FILE}")"
-        dialog --backtitle "$(backtitle)" --title "Modules" \
-          --inputbox "${MSG}" 12 70 "${modblacklist}" \
-          2>${TMP_PATH}/resp
-        [ $? -ne 0 ] && break
-        VALUE="$(cat "${TMP_PATH}/resp")"
-        if echo "${VALUE}" | grep -q " "; then
-          dialog --backtitle "$(backtitle)" --title "Modules/Cmdline" \
-            --yesno "Invalid list, No spaces should appear, retry?" 0 0
-          [ $? -eq 0 ] && continue || break
+        ;;
+      6)
+        MSG=""
+        MSG+="This function is experimental and dangerous. If you don't know much, please exit.\n"
+        MSG+="The imported .ko of this function will be implanted into the corresponding arch's modules package, which will affect all models of the arch.\n"
+        MSG+="This program will not determine the availability of imported modules or even make type judgments, as please double check if it is correct.\n"
+        MSG+="If you want to remove it, please go to the \"Update\" -> \"Update Modules\" to forcibly update the modules. All imports will be reset.\n"
+        MSG+="Do you want to continue?"
+        dialog --backtitle "$(backtitle)" --title "External Modules" \
+          --yesno "${MSG}" 0 0
+        [ $? -ne 0 ] && return
+        TMP_UP_PATH=${TMP_PATH}/users
+        USER_FILE=""
+        rm -rf "${TMP_UP_PATH}" >/dev/null
+        mkdir -p "${TMP_UP_PATH}"
+        dialog --backtitle "$(backtitle)" --title "External Modules" \
+          --ok-label "Proceed" --msgbox "Please upload the *.ko file to /tmp/users.\n- Use SFTP at ${IPCON}:22 User: root PW: arc\n- Use Webclient at http://${IPCON}:7304" 7 50
+        for F in $(ls "${TMP_UP_PATH}" 2>/dev/null); do
+          USER_FILE="${F}"
+          if [ -n "${USER_FILE}" ] && [ "${USER_FILE##*.}" = "ko" ]; then
+            addToModules "${PLATFORM}" "${KVERP}" "${TMP_UP_PATH}/${USER_FILE}"
+            dialog --backtitle "$(backtitle)" --title "External Modules" \
+              --msgbox "Module: ${USER_FILE}\nadded to ${PLATFORM}-${KVERP}" 7 50
+            rm -f "${TMP_UP_PATH}/${USER_FILE}" >/dev/null
+          else
+            dialog --backtitle "$(backtitle)" --title "External Modules" \
+              --msgbox "Not a valid file, please try again!" 7 50
+          fi
+        done
+        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+        ;;
+      7)
+        if [ -f "${USER_UP_PATH}/modulelist" ]; then
+          cp -f "${USER_UP_PATH}/modulelist" "${TMP_PATH}/modulelist.tmp"
+        else
+          cp -f "${ARC_PATH}/include/modulelist" "${TMP_PATH}/modulelist.tmp"
        fi
-        writeConfigKey "modblacklist" "${VALUE}" "${USER_CONFIG_FILE}"
+        while true; do
+          dialog --backtitle "$(backtitle)" --title "Edit Modules copied to DSM" \
+            --editbox "${TMP_PATH}/modulelist.tmp" 0 0 2>"${TMP_PATH}/modulelist.user"
+          [ $? -ne 0 ] && return
+          [ ! -d "${USER_UP_PATH}" ] && mkdir -p "${USER_UP_PATH}"
+          mv -f "${TMP_PATH}/modulelist.user" "${USER_UP_PATH}/modulelist"
+          dos2unix "${USER_UP_PATH}/modulelist"
+          break
+        done
+        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+        ;;
+      8)
+        if [ -f "${USER_UP_PATH}/modulelist" ]; then
+          cp -f "${USER_UP_PATH}/modulelist" "${TMP_PATH}/modulelist.tmp"
+        else
+          cp -f "${ARC_PATH}/include/modulelist" "${TMP_PATH}/modulelist.tmp"
+        fi
+        echo -e "\n\n# Arc Modules" >>"${TMP_PATH}/modulelist.tmp"
+        KOLIST=""
+        for I in $(lsmod | awk -F' ' '{print $1}' | grep -v 'Module'); do
+          KOLIST+="$(getdepends "${PLATFORM}" "${KVERP}" "${I}") ${I} "
+        done
+        KOLIST=($(echo ${KOLIST} | tr ' ' '\n' | sort -u))
+        while read -r ID DESC; do
+          for MOD in ${KOLIST[@]}; do
+            [ "${MOD}" = "${ID}" ] && echo "F ${ID}.ko" >>"${TMP_PATH}/modulelist.tmp"
+          done
+        done < <(getAllModules "${PLATFORM}" "${KVERP}")
+        [ ! -d "${USER_UP_PATH}" ] && mkdir -p "${USER_UP_PATH}"
+        mv -f "${TMP_PATH}/modulelist.tmp" "${USER_UP_PATH}/modulelist"
+        dos2unix "${USER_UP_PATH}/modulelist"
+        dialog --backtitle "$(backtitle)" --title "Loaded Modules Copy" \
+            --msgbox "All loaded Modules will be copied to DSM!" 5 50
+        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+        ;;
+      9)
+        MSG=""
+        MSG+="The blacklist is used to prevent the kernel from loading specific modules.\n"
+        MSG+="The blacklist is a list of module names separated by ','.\n"
+        MSG+="For example: \Z4evbug,cdc_ether\Zn\n"
+        while true; do
+          modblacklist="$(readConfigKey "modblacklist" "${USER_CONFIG_FILE}")"
+          dialog --backtitle "$(backtitle)" --title "Blacklist Modules" \
+            --inputbox "${MSG}" 12 70 "${modblacklist}" \
+            2>${TMP_PATH}/resp
+          [ $? -ne 0 ] && break
+          VALUE="$(cat "${TMP_PATH}/resp")"
+          if [[ ${VALUE} = *" "* ]]; then
+            dialog --backtitle "$(backtitle)" --title  "Blacklist Module" \
+              --yesno "Invalid list, No spaces should appear, retry?" 0 0
+            [ $? -eq 0 ] && continue || break
+          fi
+          writeConfigKey "modblacklist" "${VALUE}" "${USER_CONFIG_FILE}"
+          break
+        done
+        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+        ;;
+      *)
        break
-      done
-      ;;
+        ;;
    esac
  done
+  return
 }

 ###############################################################################
@@ -761,16 +775,18 @@ function backupMenu() {
            PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
            KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
            [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
-            if [ -n "${PLATFORM}" ] && [ -n "${KVERP}" ]; then
-              writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
-              mergeConfigModules "$(getAllModules "${PLATFORM}" "${KVERP}" | awk '{print $1}')" "${USER_CONFIG_FILE}"
-            fi
+          fi
+          if [ -n "${PLATFORM}" ] && [ -n "${KVERP}" ]; then
+            writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+            while read -r ID DESC; do
+              writeConfigKey "modules.${ID}" "" "${USER_CONFIG_FILE}"
+            done < <(getAllModules "${PLATFORM}" "${KVERP}")
          fi
        fi
        dialog --backtitle "$(backtitle)" --title "Restore Arc Config" \
          --aspect 18 --infobox "Restore successful! -> Reload Arc Init now" 5 50
        sleep 2
-        rm -f "${HOME}/.initialized" && exec init.sh
+        exec init.sh
        ;;
      2)
        DSMROOTS="$(findDSMRoot)"
@@ -810,20 +826,15 @@ function backupMenu() {
        (
          mkdir -p "${TMP_PATH}/mdX"
          for I in ${DSMROOTS}; do
-            while true; do
-              # fixDSMRootPart "${I}"
-              mount -t ext4 "${I}" "${TMP_PATH}/mdX"
-              if [ -f "${PART2_PATH}/machine.key" ]; then
-                mkdir -p "${TMP_PATH}/mdX/usr/arc/backup/p2"
-                cp -f "${PART2_PATH}/machine.key" "${TMP_PATH}/mdX/usr/arc/backup/p2/machine.key"
-                if [ -f "${TMP_PATH}/mdX/usr/arc/backup/p2/machine.key" ]; then
-                  BACKUPKEY="true"
-                  sync
-                  break
-                fi
-              fi
-              umount "${TMP_PATH}/mdX"
-            done
+            # fixDSMRootPart "${I}"
+            mount -t ext4 "${I}" "${TMP_PATH}/mdX"
+            [ $? -ne 0 ] && continue
+            if [ -f "${PART2_PATH}/machine.key" ]; then
+              cp -f "${PART2_PATH}/machine.key" "${TMP_PATH}/mdX/usr/arc/backup/p2/machine.key"
+              BACKUPKEY="true"
+              sync
+            fi
+            umount "${TMP_PATH}/mdX"
          done
          rm -rf "${TMP_PATH}/mdX" >/dev/null
        ) 2>&1 | dialog --backtitle "$(backtitle)" --title "Backup Encrytion Key" \
@@ -865,7 +876,7 @@ function backupMenu() {
        dialog --backtitle "$(backtitle)" --title "Online Restore" \
          --aspect 18 --infobox "Restore successful! -> Reload Arc Init now" 5 50
        sleep 2
-        rm -f "${HOME}/.initialized" && exec init.sh
+        exec init.sh
        ;;
      5)
        HWID="$(genHWID)"
@@ -891,8 +902,8 @@ function updateMenu() {
  while true; do
    dialog --backtitle "$(backtitle)" --title "Update" --colors --cancel-label "Exit" \
      --menu "Choose an Option" 0 0 0 \
-      1 "Update Full Loader \Z1(no reflash)\Zn" \
-      2 "Update Dependencies (only integrated Parts)" \
+      1 "Update Loader \Z1(no reflash)\Zn" \
+      2 "Update Dependencies" \
      3 "Update Configs and Arc Patch" \
      4 "Switch Arc Branch: \Z1${ARC_BRANCH}\Zn" \
      2>"${TMP_PATH}/resp"
@@ -930,20 +941,17 @@ function updateMenu() {
      4)
        dialog --backtitle "$(backtitle)" --title "Switch Arc Branch" \
          --menu "Choose a Branch" 0 0 0 \
-          1 "minimal - reduced size and faster boot" \
-          2 "microcode - minimal with microcode" \
-          3 "extended - new features to test" \
-          4 "dev - Development only" \
+          1 "stable - Less Hardware support / faster Boot" \
+          2 "next - More Hardware support / slower Boot" \
+          3 "dev - Development only" \
          2>"${TMP_PATH}/opts"
        [ $? -ne 0 ] && break
        opts=$(cat ${TMP_PATH}/opts)
        if [ ${opts} -eq 1 ]; then
-          ARC_BRANCH="minimal"
+          ARC_BRANCH="stable"
        elif [ ${opts} -eq 2 ]; then
-          ARC_BRANCH="microcode"
+          ARC_BRANCH="next"
        elif [ ${opts} -eq 3 ]; then
-          ARC_BRANCH="extended"
-        elif [ ${opts} -eq 4 ]; then
          ARC_BRANCH="dev"
        fi
        writeConfigKey "arc.branch" "${ARC_BRANCH}" "${USER_CONFIG_FILE}"
@@ -988,13 +996,11 @@ function sysinfo() {
  [ -d /sys/firmware/efi ] && BOOTSYS="UEFI" || BOOTSYS="BIOS"
  USERID="$(readConfigKey "arc.userid" "${USER_CONFIG_FILE}")"
  CPU="$(cat /proc/cpuinfo 2>/dev/null | grep 'model name' | uniq | awk -F':' '{print $2}')"
-  GOVERNOR="$(readConfigKey "governor" "${USER_CONFIG_FILE}")"
  SECURE=$(dmesg 2>/dev/null | grep -i "Secure Boot" | awk -F'] ' '{print $2}')
  VENDOR=$(dmesg 2>/dev/null | grep -i "DMI:" | head -1 | sed 's/\[.*\] DMI: //i')
-  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth)
+  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
  ETHN=$(echo ${ETHX} | wc -w)
  ARC_BRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")"
-  HWID="$(genHWID)"
  CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
  BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
  if [ "${CONFDONE}" = "true" ]; then
@@ -1035,8 +1041,9 @@ function sysinfo() {
  CONFIGSVERSION="$(cat "${MODEL_CONFIG_PATH}/VERSION")"
  PATCHESVERSION="$(cat "${PATCH_PATH}/VERSION")"
  TIMEOUT=5
+  TEXT=""
  # Print System Informations
-  TEXT="\n\n\Z4> System: ${MACHINE} | ${BOOTSYS} | ${BUS}\Zn"
+  TEXT+="\n\n\Z4> System: ${MACHINE} | ${BOOTSYS} | ${BUS}\Zn"
  TEXT+="\n  Vendor: \Zb${VENDOR}\Zn"
  TEXT+="\n  CPU: \Zb${CPU}\Zn"
  if [ $(lspci -d ::300 | wc -l) -gt 0 ]; then
@@ -1048,36 +1055,35 @@ function sysinfo() {
  fi
  TEXT+="\n  Memory: \Zb$((${RAMTOTAL}))GB\Zn"
  TEXT+="\n  AES | ACPI: \Zb${AESSYS} | ${ACPISYS}\Zn"
-  TEXT+="\n  CPU Scaling | Governor: \Zb${CPUFREQ} | ${GOVERNOR}\Zn"
+  TEXT+="\n  CPU Scaling: \Zb${CPUFREQ}\Zn"
  TEXT+="\n  Secure Boot: \Zb${SECURE}\Zn"
  TEXT+="\n  Bootdisk: \Zb${LOADER_DISK}\Zn"
  TEXT+="\n"
  TEXT+="\n\Z4> Network: ${ETHN} NIC\Zn"
  for N in ${ETHX}; do
    COUNT=0
-    DRIVER="$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')"
-    MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g' | tr '[:upper:]' '[:lower:]')"
+    DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
    while true; do
      if [ -z "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
-        TEXT+="\n   ${DRIVER} (${MAC}): \ZbDOWN\Zn"
+        TEXT+="\n   ${DRIVER}: \ZbDOWN\Zn"
        break
      fi
      if [ "0" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
-        TEXT+="\n   ${DRIVER} (${MAC}): \ZbNOT CONNECTED\Zn"
+        TEXT+="\n   ${DRIVER}: \ZbNOT CONNECTED\Zn"
        break
      fi
      if [ ${COUNT} -ge ${TIMEOUT} ]; then
-        TEXT+="\n   ${DRIVER} (${MAC}): \ZbTIMEOUT\Zn"
+        TEXT+="\n   ${DRIVER}: \ZbTIMEOUT\Zn"
        break
      fi
      COUNT=$((${COUNT} + 1))
      IP="$(getIP "${N}")"
      if [ -n "${IP}" ]; then
-        SPEED="$(ethtool ${N} 2>/dev/null | grep "Speed:" | awk '{print $2}')"
+        SPEED=$(ethtool ${N} 2>/dev/null | grep "Speed:" | awk '{print $2}')
        if [[ "${IP}" =~ ^169\.254\..* ]]; then
-          TEXT+="\n   ${DRIVER} (${SPEED} | ${MAC}): \ZbLINK LOCAL (No DHCP server found.)\Zn"
+          TEXT+="\n   ${DRIVER} (${SPEED}): \ZbLINK LOCAL (No DHCP server found.)\Zn"
        else
-          TEXT+="\n   ${DRIVER} (${SPEED} | ${MAC}): \Zb${IP}\Zn"
+          TEXT+="\n   ${DRIVER} (${SPEED}): \Zb${IP}\Zn"
        fi
        break
      fi
@@ -1089,8 +1095,6 @@ function sysinfo() {
  TEXT+="\n  Subversion: \ZbAddons ${ADDONSVERSION} | Configs ${CONFIGSVERSION} | LKM ${LKMVERSION} | Modules ${MODULESVERSION} | Patches ${PATCHESVERSION}\Zn"
  TEXT+="\n  Config | Build: \Zb${CONFDONE} | ${BUILDDONE}\Zn"
  TEXT+="\n  Config Version: \Zb${CONFIGVER}\Zn"
-  TEXT+="\n  HardwareID: \Zb${HWID}\Zn"
-  TEXT+="\n  Offline Mode: \Zb${ARCOFFLINE}\Zn"
  [ "${ARCOFFLINE}" = "true" ] && TEXT+="\n  Offline Mode: \Zb${ARCOFFLINE}\Zn"
  if [ "${CONFDONE}" = "true" ]; then
    TEXT+="\n\Z4> DSM ${PRODUCTVER} (${BUILDNUM}): ${MODELID:-${MODEL}}\Zn"
@@ -1282,7 +1286,7 @@ function uploadDiag () {
 # Shows Networkdiag to user
 function networkdiag() {
  (
-  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth)
+  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
  for N in ${ETHX}; do
    echo
    DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
@@ -1386,7 +1390,7 @@ function credits() {
 ###############################################################################
 # Setting Static IP for Loader
 function staticIPMenu() {
-  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth)
+  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
  IPCON=""
  for N in ${ETHX}; do
    MACR="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g')"
@@ -1672,11 +1676,11 @@ function loaderPassword() {
 # Change Arc Loader Password
 function loaderPorts() {
  MSG="Modify Ports (0-65535) (Leave empty for default):"
-  unset HTTPPORT DUFSPORT TTYDPORT
+  unset HTTP_PORT DUFS_PORT TTYD_PORT
  [ -f "/etc/arc.conf" ] && source "/etc/arc.conf" 2>/dev/null
-  local HTTP=${HTTPPORT:-8080}
-  local DUFS=${DUFSPORT:-7304}
-  local TTYD=${TTYDPORT:-7681}
+  local HTTP=${HTTP_PORT:-7080}
+  local DUFS=${DUFS_PORT:-7304}
+  local TTYD=${TTYD_PORT:-7681}
  while true; do
    dialog --backtitle "$(backtitle)" --title "Loader Ports" \
      --form "${MSG}" 11 70 3 "HTTP" 1 1 "${HTTPPORT}" 1 10 55 0 "DUFS" 2 1 "${DUFSPORT}" 2 10 55 0 "TTYD" 3 1 "${TTYDPORT}" 3 10 55 0 \
@@ -1750,9 +1754,9 @@ function loaderPorts() {
        --msgbox "${MSG}" 0 0
      rm -f "${TMP_PATH}/restartS.sh"
      {
-        [ ! "${HTTP:-8080}" = "${HTTPPORT:-8080}" ] && echo "/etc/init.d/S90thttpd restart"
-        [ ! "${DUFS:-7304}" = "${DUFSPORT:-7304}" ] && echo "/etc/init.d/S99dufs restart"
-        [ ! "${TTYD:-7681}" = "${TTYDPORT:-7681}" ] && echo "/etc/init.d/S99ttyd restart"
+        [ ! "${HTTP:-8080}" = "${HTTP_PORT:-8080}" ] && echo "/etc/init.d/S90thttpd restart"
+        [ ! "${DUFS:-7304}" = "${DUFS_PORT:-7304}" ] && echo "/etc/init.d/S99dufs restart"
+        [ ! "${TTYD:-7681}" = "${TTYD_PORT:-7681}" ] && echo "/etc/init.d/S99ttyd restart"
      } >"${TMP_PATH}/restartS.sh"
      chmod +x "${TMP_PATH}/restartS.sh"
      nohup "${TMP_PATH}/restartS.sh" >/dev/null 2>&1
@@ -2049,7 +2053,7 @@ function greplogs() {
    tar -czf "${TMP_PATH}/logs.tar.gz" -C "${TMP_PATH}" logs
    if [ -z "${SSH_TTY}" ]; then # web
      mv -f "${TMP_PATH}/logs.tar.gz" "/var/www/data/logs.tar.gz"
-      URL="http://${IPCON}:${HTTPPORT:-8080}/logs.tar.gz"
+      URL="http://${IPCON}/logs.tar.gz"
      MSG+="Please via ${URL} to download the logs,\nAnd go to Github or Discord to create an issue and upload the logs."
    else
      sz -be -B 536870912 "${TMP_PATH}/logs.tar.gz"
@@ -2068,9 +2072,9 @@ function getbackup() {
    rm -f "${TMP_PATH}/dsmconfig.tar.gz" >/dev/null
    tar -czf "${TMP_PATH}/dsmconfig.tar.gz" -C "${PART1_PATH}" dsmbackup
    if [ -z "${SSH_TTY}" ]; then # web
-      cp -f "${TMP_PATH}/dsmconfig.tar.gz" "/var/www/data/dsmconfig.tar.gz"
+      mv -f "${TMP_PATH}/dsmconfig.tar.gz" "/var/www/data/dsmconfig.tar.gz"
      chmod 644 "/var/www/data/dsmconfig.tar.gz"
-      URL="http://${IPCON}:${HTTPPORT:-8080}/dsmconfig.tar.gz"
+      URL="http://${IPCON}/dsmconfig.tar.gz"
      dialog --backtitle "$(backtitle)" --colors --title "DSM Config" \
        --msgbox "Please via ${URL}\nto download the dsmconfig and unzip it and back it up in order by file name." 0 0
    else
@@ -2125,7 +2129,7 @@ function rebootMenu() {
    echo -e "recovery \"DSM: Recovery Mode\"" >>"${TMP_PATH}/opts"
    echo -e "junior \"DSM: Reinstall Mode\"" >>"${TMP_PATH}/opts"
  fi
-  echo -e "uefi \"System: UEFI\"" >>"${TMP_PATH}/opts"
+  echo -e "bios \"System: BIOS/UEFI\"" >>"${TMP_PATH}/opts"
  echo -e "poweroff \"System: Shutdown\"" >>"${TMP_PATH}/opts"
  echo -e "shell \"System: Shell Cmdline\"" >>"${TMP_PATH}/opts"
  dialog --backtitle "$(backtitle)" --title "Power Menu" \
@@ -2146,7 +2150,7 @@ function rebootMenu() {
  elif [ "${REDEST}" = "network" ]; then
    clear
    /etc/init.d/S41dhcpcd restart
-    rm -f "${HOME}/.initialized" && exec init.sh
+    exec init.sh
  else
    rebootTo ${REDEST}
    exit 0
@@ -2205,18 +2209,9 @@ function mountDSM() {
    umount "${I}" 2>/dev/null
    mount ${I} "/mnt/DSM/${NAME}" -o ro
  done
-  MSG="Storage pools are mounted at /mnt/DSM.\nPlease check them via ${IPCON}:7304."
+  MSG="Storage pools are mounted under /mnt/DSM.\nPlease check them via ${IPCON}:7304."
  dialog --backtitle "$(backtitle)" --title "Mount DSM Pool" \
-    --msgbox "${MSG}" 6 50
-  if [ -n "${VOLS}" ]; then
-    dialog --backtitle "$(backtitle)" --title "Mount DSM Pool" \
-      --yesno "Unmount all storage pools?" 5 30
-    [ $? -ne 0 ] && return
-    for I in ${VOLS}; do
-      umount "${I}" 2>/dev/null
-    done
-    rm -rf /mnt/DSM
-  fi
+    --msgbox "${MSG}" 7 50
  return
 }

@@ -2232,20 +2227,26 @@ function governorMenu () {
 function governorSelection () {
  rm -f "${TMP_PATH}/opts" >/dev/null
  touch "${TMP_PATH}/opts"
-  # Selectable CPU governors
-  [ "${PLATFORM}" = "epyc7002" ] && echo -e "schedutil \"use schedutil to scale frequency *\"" >>"${TMP_PATH}/opts"
-  [ "${PLATFORM}" != "epyc7002" ] && echo -e "conservative \"use conservative to scale frequency *\"" >>"${TMP_PATH}/opts"
-  [ "${PLATFORM}" != "epyc7002" ] && echo -e "ondemand \"use ondemand to scale frequency\"" >>"${TMP_PATH}/opts"
-  echo -e "performance \"always run at max frequency\"" >>"${TMP_PATH}/opts"
-  echo -e "powersave \"always run at lowest frequency\"" >>"${TMP_PATH}/opts"
-  dialog --backtitle "$(backtitle)" --title "CPU Frequency Scaling" \
-    --menu  "Choose a Governor\n* Recommended Option" 0 0 0 --file "${TMP_PATH}/opts" \
-    2>${TMP_PATH}/resp
-  [ $? -ne 0 ] && return
-  resp=$(cat ${TMP_PATH}/resp)
-  [ -z "${resp}" ] && return
-  GOVERNOR=${resp}
-  writeConfigKey "governor" "${GOVERNOR}" "${USER_CONFIG_FILE}"
+  if [ "${ARCMODE}" = "config" ]; then
+    # Selectable CPU governors
+    [ "${PLATFORM}" = "epyc7002" ] && echo -e "schedutil \"use schedutil to scale frequency *\"" >>"${TMP_PATH}/opts"
+    [ "${PLATFORM}" != "epyc7002" ] && echo -e "ondemand \"use ondemand to scale frequency *\"" >>"${TMP_PATH}/opts"
+    [ "${PLATFORM}" != "epyc7002" ] && echo -e "conservative \"use conservative to scale frequency\"" >>"${TMP_PATH}/opts"
+    echo -e "performance \"always run at max frequency\"" >>"${TMP_PATH}/opts"
+    echo -e "powersave \"always run at lowest frequency\"" >>"${TMP_PATH}/opts"
+    dialog --backtitle "$(backtitle)" --title "CPU Frequency Scaling" \
+      --menu  "Choose a Governor\n* Recommended Option" 0 0 0 --file "${TMP_PATH}/opts" \
+      2>${TMP_PATH}/resp
+    [ $? -ne 0 ] && return
+    resp=$(cat ${TMP_PATH}/resp)
+    [ -z "${resp}" ] && return
+    CPUGOVERNOR=${resp}
+  else
+    [ "${PLATFORM}" = "epyc7002" ] && CPUGOVERNOR="schedutil"
+    [ "${PLATFORM}" != "epyc7002" ] && CPUGOVERNOR="ondemand"
+  fi
+  writeConfigKey "addons.cpufreqscaling" "${CPUGOVERNOR}" "${USER_CONFIG_FILE}"
+  CPUGOVERNOR="$(readConfigKey "addons.cpufreqscaling" "${USER_CONFIG_FILE}")"
 }

 ###############################################################################
@@ -2359,7 +2360,7 @@ function getpatfiles() {
  VALID="false"
  if [ ! -f "${DSM_FILE}" ] && [ "${ARCOFFLINE}" = "false" ]; then
    rm -f ${USER_UP_PATH}/*.tar
-    dialog --backtitle "$(backtitle)" --colors --title "DSM Boot Files" \
+    dialog --backtitle "$(backtitlep)" --colors --title "DSM Boot Files" \
      --infobox "Downloading DSM Boot Files..." 3 40
    # Get new Files
    DSM_URL="https://raw.githubusercontent.com/AuxXxilium/arc-dsm/main/files/${MODEL/+/%2B}/${PRODUCTVER}/${PAT_HASH}.tar"
@@ -2368,7 +2369,7 @@ function getpatfiles() {
    fi
  elif [ ! -f "${DSM_FILE}" ] && [ "${ARCOFFLINE}" = "true" ]; then
    rm -f ${USER_UP_PATH}/*.tar
-    dialog --backtitle "$(backtitle)" --colors --title "DSM Boot Files" \
+    dialog --backtitle "$(backtitlep)" --colors --title "DSM Boot Files" \
      --msgbox "Please upload the DSM Boot File to ${USER_UP_PATH}.\nUse ${IPCON}:7304 to upload and press OK after it's finished.\nLink: https://github.com/AuxXxilium/arc-dsm/blob/main/files/${MODEL}/${PRODUCTVER}/${PAT_HASH}.tar" 8 120
    [ $? -ne 0 ] && VALID="false"
    if [ -f "${DSM_FILE}" ]; then
@@ -2379,7 +2380,7 @@ function getpatfiles() {
  fi
  mkdir -p "${UNTAR_PAT_PATH}"
  if [ "${VALID}" = "true" ]; then
-    dialog --backtitle "$(backtitle)" --title "DSM Boot Files" --aspect 18 \
+    dialog --backtitle "$(backtitlep)" --title "DSM Boot Files" --aspect 18 \
      --infobox "Copying DSM Boot Files..." 3 40
    tar -xf "${DSM_FILE}" -C "${UNTAR_PAT_PATH}" 2>/dev/null
    copyDSMFiles "${UNTAR_PAT_PATH}" 2>/dev/null
@@ -2400,28 +2401,20 @@ function genHardwareID() {
  HWID="$(genHWID)"
  while true; do
    USERID="$(curl -skL -m 10 "https://arc.auxxxilium.tech?hwid=${HWID}" 2>/dev/null)"
-    if echo "${USERID}" | grep -qE '^[0-9]+$'; then
-      writeConfigKey "arc.hardwareid" "${HWID}" "${USER_CONFIG_FILE}"
-      writeConfigKey "arc.userid" "${USERID}" "${USER_CONFIG_FILE}"
-      writeConfigKey "bootscreen.hwidinfo" "true" "${USER_CONFIG_FILE}"
+    if echo "${USERID}" | grep -vq "Hardware ID"; then
      dialog --backtitle "$(backtitle)" --title "HardwareID" \
        --msgbox "HardwareID: ${HWID}\nYour HardwareID is registered to UserID: ${USERID}!" 6 70
+      writeConfigKey "arc.hardwareid" "${HWID}" "${USER_CONFIG_FILE}"
+      writeConfigKey "arc.userid" "${USERID}" "${USER_CONFIG_FILE}"
      break
    else
-      USERID=""
+      dialog --backtitle "$(backtitle)" --title "HardwareID" \
+        --yes-label "Retry" --no-label "Cancel" --yesno "HardwareID: ${HWID}\nRegister your HardwareID on\nhttps://arc.auxxxilium.tech (Discord Account needed).\nPress Retry after you registered it." 8 60
+      [ $? -ne 0 ] && break
      writeConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}"
      writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
-      writeConfigKey "bootscreen.hwidinfo" "false" "${USER_CONFIG_FILE}"
-      dialog --backtitle "$(backtitle)" --title "HardwareID" \
-        --yes-label "Retry" --no-label "Cancel" --yesno "HardwareID: ${HWID}\nRegister your HardwareID at\nhttps://arc.auxxxilium.tech (Discord Account needed).\nPress Retry after you registered it." 8 60
-      [ $? -ne 0 ] && break
-      continue
    fi
  done
-  CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
-  if [ -n "${USERID}" ] && [ "${CONFDONE}" = "true"]; then
-    ONLYPATCH="true" && arcPatch
-  fi
  return
 }

@@ -2431,62 +2424,51 @@ function checkHardwareID() {
  HWID="$(genHWID)"
  USERID="$(curl -skL -m 10 "https://arc.auxxxilium.tech?hwid=${HWID}" 2>/dev/null)"
  [ ! -f "${S_FILE}.bak" ] && cp -f "${S_FILE}" "${S_FILE}.bak" 2>/dev/null || true
-  if echo "${USERID}" | grep -qE '^[0-9]+$'; then
+  if echo "${USERID}" | grep -vq "Hardware ID"; then
    if curl -skL -m 10 "https://arc.auxxxilium.tech?hwid=${HWID}&userid=${USERID}" -o "${S_FILE}" 2>/dev/null; then
      writeConfigKey "arc.hardwareid" "${HWID}" "${USER_CONFIG_FILE}"
      writeConfigKey "arc.userid" "${USERID}" "${USER_CONFIG_FILE}"
-      writeConfigKey "bootscreen.hwidinfo" "true" "${USER_CONFIG_FILE}"
    else
-      USERID=""
      writeConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}"
      writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
-      writeConfigKey "bootscreen.hwidinfo" "false" "${USER_CONFIG_FILE}"
      [ -f "${S_FILE}.bak" ] && mv -f "${S_FILE}.bak" "${S_FILE}" 2>/dev/null
    fi
  else
    USERID=""
    writeConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}"
    writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
-    writeConfigKey "bootscreen.hwidinfo" "false" "${USER_CONFIG_FILE}"
    [ -f "${S_FILE}.bak" ] && mv -f "${S_FILE}.bak" "${S_FILE}" 2>/dev/null
  fi
-  return
+  return 0
 }

 ###############################################################################
 # Bootsreen Menu
 function bootScreen () {
-  rm -f "${TMP_PATH}/bootscreen" "${TMP_PATH}/opts" "${TMP_PATH}/resp" >/dev/null
+  rm -f "${TMP_PATH}/boot" "${TMP_PATH}/opts" "${TMP_PATH}/resp" >/dev/null
  unset BOOTSCREENS
  declare -A BOOTSCREENS
  while IFS=': ' read -r KEY VALUE; do
    [ -n "${KEY}" ] && BOOTSCREENS["${KEY}"]="${VALUE}"
-  done < <(readConfigMap "bootscreen" "${USER_CONFIG_FILE}")
-  cat <<EOL >"${TMP_PATH}/bootscreen"
-dsminfo: DSM Information
-systeminfo: System Information
-diskinfo: Disk Information
-hwidinfo: HardwareID Information
-dsmlogo: DSM Logo
-EOL
-  while IFS=': ' read -r BOOTSCREEN BOOTDESCRIPTION; do
-    if [ "${BOOTSCREENS[${BOOTSCREEN}]}" = "true" ]; then
-      ACT="on"
-    else
-      ACT="off"
-    fi
-    echo -e "${BOOTSCREEN} \"${BOOTDESCRIPTION}\" ${ACT}" >>"${TMP_PATH}/opts"
-  done < "${TMP_PATH}/bootscreen"
+  done < <(readConfigMap "boot" "${USER_CONFIG_FILE}")
+  echo -e "dsminfo" >"${TMP_PATH}/boot"
+  echo -e "systeminfo" >>"${TMP_PATH}/boot"
+  echo -e "diskinfo" >>"${TMP_PATH}/boot"
+  echo -e "dsmlogo" >>"${TMP_PATH}/boot"
+  while read -r BOOTSCREEN; do
+    arrayExistItem "${BOOTSCREEN}" "${!BOOTSCREENS[@]}" && ACT="on" || ACT="off"
+    echo -e "${BOOTSCREEN} \"${DESC}\" ${ACT}" >>"${TMP_PATH}/opts"
+  done < <(cat "${TMP_PATH}/boot")
  dialog --backtitle "$(backtitle)" --title "Bootscreen" --colors --aspect 18 \
    --checklist "Select Bootscreen Informations\Zn\nSelect with SPACE, Confirm with ENTER!" 0 0 0 \
    --file "${TMP_PATH}/opts" 2>"${TMP_PATH}/resp"
  [ $? -ne 0 ] && return 1
-  resp=$(cat "${TMP_PATH}/resp")
-  for BOOTSCREEN in dsminfo systeminfo diskinfo hwidinfo dsmlogo; do
-    if echo "${resp}" | grep -q "${BOOTSCREEN}"; then
-      writeConfigKey "bootscreen.${BOOTSCREEN}" "true" "${USER_CONFIG_FILE}"
-    else
-      writeConfigKey "bootscreen.${BOOTSCREEN}" "false" "${USER_CONFIG_FILE}"
-    fi
+  resp=$(cat ${TMP_PATH}/resp)
+  unset BOOTSCREENS
+  declare -A BOOTSCREENS
+  writeConfigKey "boot" "{}" "${USER_CONFIG_FILE}"
+  for BOOTSCREEN in ${resp}; do
+    BOOTSCREENS["${BOOTSCREEN}"]=""
+    writeConfigKey "boot.\"${BOOTSCREEN}\"" "true" "${USER_CONFIG_FILE}"
  done
 }
--- a/files/initrd/opt/arc/arc.sh
+++ b/files/initrd/opt/arc/arc.sh
@@ -5,12 +5,13 @@
 [[ -z "${ARC_PATH}" || ! -d "${ARC_PATH}/include" ]] && ARC_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd)"

 . "${ARC_PATH}/include/functions.sh"
-. "${ARC_PATH}/arc-functions.sh"
 . "${ARC_PATH}/include/addons.sh"
 . "${ARC_PATH}/include/modules.sh"
 . "${ARC_PATH}/include/update.sh"
 . "${ARC_PATH}/include/storage.sh"
 . "${ARC_PATH}/include/network.sh"
+. "${ARC_PATH}/include/compat.sh"
+. "${ARC_PATH}/arc-functions.sh"

 # Get Keymap and Timezone and check System
 onlineCheck
@@ -71,11 +72,24 @@ function backtitle() {
  echo "${BACKTITLE}"
 }

+function backtitlep() {
+  [ "${STEP}" = "model" ] && BACKTITLEP="CHOOSE MODEL >>> " || BACKTITLEP="Choose Model >>> "
+  [ "${STEP}" = "version" ] && BACKTITLEP+="CHOOSE VERSION >>> " || BACKTITLEP+="Choose Version >>> "
+  [ "${STEP}" = "snmac" ] && BACKTITLEP+="SET SN/MAC >>> " || BACKTITLEP+="Set SN/Mac >>> "
+  [ "${STEP}" = "network" ] && BACKTITLEP+="SET NETWORK >>> " || BACKTITLEP+="Set Network >>> "
+  [ "${STEP}" = "storagemap" ] && BACKTITLEP+="SET STORAGEMAP >>> " || BACKTITLEP+="Set StorageMap >>> "
+  [ "${STEP}" = "addons" ] && BACKTITLEP+="SET ADDONS >>> " || BACKTITLEP+="Set Addons >>> "
+  [ "${STEP}" = "build" ] && BACKTITLEP+="BUILD LOADER >>> " || BACKTITLEP+="Build Loader >>> "
+  [ "${STEP}" = "boot" ] && BACKTITLEP+="BOOT DSM" || BACKTITLEP+="Boot DSM"
+  echo "${BACKTITLEP}"
+}
+
 ###############################################################################
 # Model Selection
 function arcModel() {
+  STEP="model"
  [ "${ARCOFFLINE}" != "true" ] && checkHardwareID || true
-  dialog --backtitle "$(backtitle)" --title "Model" \
+  dialog --backtitle "$(backtitlep)" --title "Model" \
    --infobox "Reading Models..." 3 25
  ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
  # Loop menu
@@ -100,17 +114,9 @@ function arcModel() {
        BETA=""
        [ -n "${ARCCONFM}" ] && ARC="x" || ARC=""
        [ "${DT}" = "true" ] && DTS="x" || DTS=""
-        IGPU=""
        IGPUS=""
-        IGPUID="$(lspci -nd ::300 2>/dev/null | grep "8086" | cut -d' ' -f3 | sed 's/://g')"
-        if [ -n "${IGPUID}" ]; then grep -iq "${IGPUID}" ${ARC_PATH}/include/i915ids && IGPU="all" || IGPU="epyc7002"; else IGPU=""; fi
-        if [[ "${A}" = "apollolake" || "${A}" = "geminilake" ]] && [ "${IGPU}" = "all" ]; then
-          IGPUS="+"
-        elif [ "${A}" = "epyc7002" ] && [[ "${IGPU}" = "epyc7002" || "${IGPU}" = "all" ]]; then
-          IGPUS="x"
-        else
-          IGPUS=""
-        fi
+        [[ "${A}" = "apollolake" || "${A}" = "geminilake" ]] && IGPUS="up to 9th"
+        [ "${A}" = "epyc7002" ] && IGPUS="up to 14th" 
        [ "${DT}" = "true" ] && HBAS="" || HBAS="x"
        [ "${M}" = "SA6400" ] && HBAS="x"
        [ "${DT}" = "false" ] && USBS="int/ext" || USBS="ext"
@@ -119,9 +125,10 @@ function arcModel() {
        [[ "${M}" = "DS220+" || "${M}" = "DS224+" || "${M}" = "DS718+" || "${M}" = "DS918+" || "${M}" = "DS1019+" || "${M}" = "DS1621xs+" || "${M}" = "RS1619xs+" ]] && M_2_STORAGE="" || M_2_STORAGE="+"
        # Check id model is compatible with CPU
        if [ ${RESTRICT} -eq 1 ]; then
-          for F in ${FLAGS}; do
+          for F in "${FLAGS}"; do
            if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
              COMPATIBLE=0
+              break
            fi
          done
          if [ "${A}" != "epyc7002" ] && [ "${DT}" = "true" ] && [ "${EXTERNALCONTROLLER}" = "true" ]; then
@@ -143,15 +150,15 @@ function arcModel() {
        [ -n "$(grep -w "${M}" "${S_FILE}")" ] && BETA="Arc" || BETA="Syno"
        [ -z "$(grep -w "${A}" "${P_FILE}")" ] && COMPATIBLE=0
        if [ -n "${ARCCONF}" ]; then
-          [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${ARC}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu"
+          [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${ARC}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu"
        else
-          [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu"
+          [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu"
        fi
      done < <(cat "${TMP_PATH}/modellist")
      ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
-      [ -n "${ARCCONF}" ] && MSG="Supported Models for your Hardware (x = supported / + = need Addons)\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Arc" "iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" || MSG="Supported Models for your Hardware (x = supported / + = need Addons) | Syno Models can have faulty Values.\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")"
+      [ -n "${ARCCONF}" ] && MSG="Supported Models for your Hardware (x = supported / + = need Addons)\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Arc" "Intel iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" || MSG="Supported Models for your Hardware (x = supported / + = need Addons) | Syno Models can have faulty Values.\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Intel iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")"
      [ -n "${ARCCONF}" ] && TITLEMSG="Arc Model" || TITLEMSG="Model"
-      dialog --backtitle "$(backtitle)" --title "${TITLEMSG}" --colors \
+      dialog --backtitle "$(backtitlep)" --title "${TITLEMSG}" --colors \
        --cancel-label "Show all" --help-button --help-label "Exit" \
        --extra-button --extra-label "Info" \
        --menu "${MSG}" 0 115 0 \
@@ -160,7 +167,7 @@ function arcModel() {
      case ${RET} in
        0)
          resp=$(cat ${TMP_PATH}/resp)
-          [ -z "${resp}" ] && return
+          [ -z "${resp}" ] && return 1
          break
          ;;
        1)
@@ -169,11 +176,11 @@ function arcModel() {
        3)
          resp=$(cat ${TMP_PATH}/resp)
          PLATFORM="$(grep -w "${resp}" "${TMP_PATH}/modellist" | awk '{print $2}' | head -n 1)"
-          dialog --backtitle "$(backtitle)" --colors \
+          dialog --backtitle "$(backtitlep)" --colors \
            --title "Platform Info" --textbox "./informations/${PLATFORM}.yml" 70 80
          ;;
        *)
-          return 
+          return 1
          break
          ;;
      esac
@@ -219,6 +226,7 @@ function arcModel() {
 ###############################################################################
 # Arc Version Section
 function arcVersion() {
+  STEP="version"
  # Read Model Config
  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
@@ -231,12 +239,12 @@ function arcVersion() {
  if [ "${ARCMODE}" = "config" ] && [ "${ARCRESTORE}" != "true" ]; then
    # Select Build for DSM
    ITEMS="$(readConfigEntriesArray "platforms.${PLATFORM}.productvers" "${P_FILE}" | sort -r)"
-    dialog --clear --no-items --nocancel --title "DSM Version" --backtitle "$(backtitle)" \
+    dialog --clear --no-items --nocancel --title "DSM Version" --backtitle "$(backtitlep)" \
      --no-items --menu "Select DSM Version" 7 30 0 ${ITEMS} \
    2>"${TMP_PATH}/resp"
-    [ $? -ne 0 ] && return
+    [ $? -ne 0 ] && return 0
    resp=$(cat ${TMP_PATH}/resp)
-    [ -z "${resp}" ] && return
+    [ -z "${resp}" ] && return 1
    if [ "${PRODUCTVER}" != "${resp}" ]; then
      PRODUCTVER="${resp}"
      writeConfigKey "productver" "${PRODUCTVER}" "${USER_CONFIG_FILE}"
@@ -247,8 +255,12 @@ function arcVersion() {
      writeConfigKey "ramdisk-hash" "" "${USER_CONFIG_FILE}"
      writeConfigKey "smallnum" "" "${USER_CONFIG_FILE}"
      writeConfigKey "zimage-hash" "" "${USER_CONFIG_FILE}"
+      writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+      writeConfigKey "arc.confdone" "false" "${USER_CONFIG_FILE}"
+      BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+      CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
    fi
-    dialog --backtitle "$(backtitle)" --title "Version" \
+    dialog --backtitle "$(backtitlep)" --title "Version" \
    --infobox "Reading DSM Build..." 3 25
    PAT_URL=""
    PAT_HASH=""
@@ -265,7 +277,7 @@ function arcVersion() {
        PREV="${V}"
      done < <(echo "${PVS}")
      DSMPVS="$(cat ${TMP_PATH}/versions)"
-      dialog --backtitle "$(backtitle)" --colors --title "DSM Build" \
+      dialog --backtitle "$(backtitlep)" --colors --title "DSM Build" \
      --no-items --menu "Select DSM Build" 0 0 0 ${DSMPVS} \
      2>${TMP_PATH}/resp
      RET=$?
@@ -273,18 +285,16 @@ function arcVersion() {
      PV=$(cat ${TMP_PATH}/resp)
      PAT_URL="$(readConfigKey "${PLATFORM}.\"${MODEL}\".\"${PV}\".url" "${D_FILE}")"
      PAT_HASH="$(readConfigKey "${PLATFORM}.\"${MODEL}\".\"${PV}\".hash" "${D_FILE}")"
-      writeConfigKey "productver" "${PV:0:3}" "${USER_CONFIG_FILE}"
-      if [ -n "${PAT_URL}" ] && [ -n "${PAT_HASH}" ]; then
-        VALID="true"
-        break
-      fi
+      [ "${PRODUCTVER}" != "${PV:0:3}" ] && PRODUCTVER="${PV:0:3}"
+      writeConfigKey "productver" "${PRODUCTVER}" "${USER_CONFIG_FILE}"
+      [ -n "${PAT_URL}" ] && [ -n "${PAT_HASH}" ] && VALID="true" && break
    done
    if [ -z "${PAT_URL}" ] || [ -z "${PAT_HASH}" ]; then
      while true; do
        MSG="Failed to get PAT Data.\n"
        MSG+="Please manually fill in the URL and Hash of PAT.\n"
        MSG+="You will find these Data at: https://github.com/AuxXxilium/arc-dsm/blob/main/webdata.txt"
-        dialog --backtitle "$(backtitle)" --colors --title "Arc Build" --default-button "OK" \
+        dialog --backtitle "$(backtitlep)" --colors --title "Arc Build" --default-button "OK" \
          --form "${MSG}" 11 120 2 "Url" 1 1 "${PAT_URL}" 1 8 110 0 "Hash" 2 1 "${PAT_HASH}" 2 8 110 0 \
          2>"${TMP_PATH}/resp"
        RET=$?
@@ -301,36 +311,22 @@ function arcVersion() {
      rm -f "${PART1_PATH}/grub_cksum.syno" "${PART1_PATH}/GRUB_VER" >/dev/null 2>&1 || true
      rm -f "${USER_UP_PATH}/"*.tar >/dev/null 2>&1 || true
    fi
-    if [ "${ONLYVERSION}" != "true" ]; then
-      MSG="Do you want to try Automated Mode?\nIf yes, Loader will configure, build and boot DSM."
-      dialog --backtitle "$(backtitle)" --colors --title "Automated Mode" \
-        --yesno "${MSG}" 6 55
-      if [ $? -eq 0 ]; then
-        writeConfigKey "arc.mode" "automated" "${USER_CONFIG_FILE}"
-      else
-        writeConfigKey "arc.mode" "config" "${USER_CONFIG_FILE}"
-      fi
-      ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
-    fi
+    MSG="Do you want to try Automated Mode?\nIf yes, Loader will configure, build and boot DSM."
+    dialog --backtitle "$(backtitlep)" --colors --title "Automated Mode" \
+      --yesno "${MSG}" 6 55
+    [ $? -eq 0 ] && ARCMODE="automated" || ARCMODE="config"
  elif [ "${ARCMODE}" = "automated" ] || [ "${ARCRESTORE}" = "true" ]; then
    VALID="true"
  fi
  # Change Config if Files are valid
  if [ "${VALID}" = "true" ]; then
-    dialog --backtitle "$(backtitle)" --title "Arc Config" \
-      --infobox "Reconfiguring Cmdline, Modules and Synoinfo" 3 60
+    dialog --backtitle "$(backtitlep)" --title "Arc Config" \
+      --infobox "Reconfiguring Addons, Cmdline, Modules and Synoinfo" 3 60
    # Reset Synoinfo
    writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
    while IFS=': ' read -r KEY VALUE; do
      writeConfigKey "synoinfo.\"${KEY}\"" "${VALUE}" "${USER_CONFIG_FILE}"
    done < <(readConfigMap "platforms.${PLATFORM}.synoinfo" "${P_FILE}")
-    # Reset Modules
-    KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
-    [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
-    if [ -n "${PLATFORM}" ] && [ -n "${KVERP}" ]; then
-      writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
-      mergeConfigModules "$(getAllModules "${PLATFORM}" "${KVERP}" | awk '{print $1}')" "${USER_CONFIG_FILE}"
-    fi
    # Check Addons for Platform
    ADDONS="$(readConfigKey "addons" "${USER_CONFIG_FILE}")"
    DEVICENIC="$(readConfigKey "device.nic" "${USER_CONFIG_FILE}")"
@@ -356,8 +352,7 @@ function arcVersion() {
        initConfigKey "addons.sensors" "" "${USER_CONFIG_FILE}"
      fi
      if [ "${PLATFORM}" = "apollolake" ] || [ "${PLATFORM}" = "geminilake" ]; then
-        if [ -n "${IGPUID}" ]; then grep -iq "${IGPUID}" ${ARC_PATH}/include/i915ids && IGPU="all" || IGPU="epyc7002"; else IGPU=""; fi
-        [ "${IGPU}"="all" ] && initConfigKey "addons.i915" "" "${USER_CONFIG_FILE}" || true
+        initConfigKey "addons.i915" "" "${USER_CONFIG_FILE}"
      fi
      if echo "${PAT_URL}" 2>/dev/null | grep -q "7.2.2"; then
        initConfigKey "addons.allowdowngrade" "" "${USER_CONFIG_FILE}"
@@ -375,83 +370,93 @@ function arcVersion() {
        deleteConfigKey "addons.\"${ADDON}\"" "${USER_CONFIG_FILE}"
      fi
    done < <(readConfigMap "addons" "${USER_CONFIG_FILE}")
+    KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
+    [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
+    if [ -n "${PLATFORM}" ] && [ -n "${KVERP}" ]; then
+      writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+      while read -r ID DESC; do
+        writeConfigKey "modules.${ID}" "" "${USER_CONFIG_FILE}"
+      done < <(getAllModules "${PLATFORM}" "${KVERP}")
+    fi
    # Check for Only Version
    if [ "${ONLYVERSION}" = "true" ]; then
      writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
      BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
      ONLYVERSION="false"
-      return
+      return 0
    else
      arcPatch
    fi
  else
-    dialog --backtitle "$(backtitle)" --title "Arc Config" --aspect 18 \
+    dialog --backtitle "$(backtitlep)" --title "Arc Config" --aspect 18 \
      --infobox "Arc Config failed!\nExit." 4 40
    writeConfigKey "arc.confdone" "false" "${USER_CONFIG_FILE}"
    CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
    sleep 5
-    return
+    return 1
  fi
 }

 ###############################################################################
 # Arc Patch Section
 function arcPatch() {
+  STEP="snmac"
  # Read Model Values
  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
-  ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
-  
+  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
+  # Check for Custom Build
  if [ "${ARCMODE}" = "automated" ] && [ "${ARCPATCH}" != "user" ]; then
-    if [ -n "${ARCCONF}" ]; then
-      generate_and_write_serial "true"
-    else
-      generate_and_write_serial "false"
-    fi
+      ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
+      [ -n "${ARCCONF}" ] && SN="$(generateSerial "${MODEL}" "true")" || SN="$(generateSerial "${MODEL}" "false")"
+      [ -n "${ARCCONF}" ] && writeConfigKey "arc.patch" "true" "${USER_CONFIG_FILE}" || writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
+      writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
  elif [ "${ARCMODE}" = "config" ]; then
-   if [ -n "${ARCCONF}" ]; then
-    dialog --clear --backtitle "$(backtitle)" \
-      --nocancel --title "SN/Mac Options" \
+    dialog --clear --backtitle "$(backtitlep)" \
+      --nocancel --title "SN/Mac Options"\
      --menu "Choose an Option" 7 60 0 \
      1 "Use Arc Patch (AME, QC, Push Notify and more)" \
      2 "Use random SN/Mac (Reduced DSM Features)" \
      3 "Use my own SN/Mac (Be sure your Data is valid)" \
-      2>"${TMP_PATH}/resp"
-    else
-      dialog --clear --backtitle "$(backtitle)" \
-        --nocancel --title "SN/Mac Options" \
-        --menu "Choose an Option" 7 60 0 \
-        2 "Use random SN/Mac (Reduced DSM Features)" \
-        3 "Use my own SN/Mac (Be sure your Data is valid)" \
-        2>"${TMP_PATH}/resp"
-    fi
-    
-    resp=$(cat "${TMP_PATH}/resp")
+    2>"${TMP_PATH}/resp"
+    resp=$(cat ${TMP_PATH}/resp)
    [ -z "${resp}" ] && return 1
-    
-    case ${resp} in
-      1)
-        generate_and_write_serial "true"
-        ;;
-      2)
-        generate_and_write_serial "false"
-        ;;
-      3)
-        while true; do
-          dialog --backtitle "$(backtitle)" --colors --title "Serial" \
-            --inputbox "Please enter a valid SN!" 7 50 "" \
-            2>"${TMP_PATH}/resp"
-          [ $? -ne 0 ] && break 2
-          SN="$(cat "${TMP_PATH}/resp" | tr '[:lower:]' '[:upper:]')"
-          [ -z "${SN}" ] && return
+    if [ ${resp} -eq 1 ]; then
+      ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
+      if [ -n "${ARCCONF}" ]; then
+        dialog --backtitle "$(backtitlep)" --colors --title "Arc Patch" \
+          --infobox "Arc Patch successful!" 3 30
+        sleep 2
+        SN="$(generateSerial "${MODEL}" "true")"
+        writeConfigKey "arc.patch" "true" "${USER_CONFIG_FILE}"
+      else
+        dialog --backtitle "$(backtitlep)" --colors --title "Arc Patch" \
+          --infobox "Arc Patch failed!" 3 30
+        sleep 2
+        SN="$(generateSerial "${MODEL}" "false")"
+        writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
+      fi
+    elif [ ${resp} -eq 2 ]; then
+      # Generate random Serial
+      SN="$(generateSerial "${MODEL}" "false")"
+      writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
+    elif [ ${resp} -eq 3 ]; then
+      while true; do
+        dialog --backtitle "$(backtitlep)" --colors --title "Serial" \
+          --inputbox "Please enter a valid SN!" 7 50 "" \
+          2>"${TMP_PATH}/resp"
+        [ $? -ne 0 ] && break 2
+        SN="$(cat ${TMP_PATH}/resp)"
+        if [ -z "${SN}" ]; then
+          return
+        else
          break
-        done
-        writeConfigKey "arc.patch" "user" "${USER_CONFIG_FILE}"
-        writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
-        ;;
-    esac
+        fi
+      done
+      writeConfigKey "arc.patch" "user" "${USER_CONFIG_FILE}"
+    fi
+    writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
  fi
-
  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
  arcSettings
 }
@@ -459,71 +464,85 @@ function arcPatch() {
 ###############################################################################
 # Arc Settings Section
 function arcSettings() {
+  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
  PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
-  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
  KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
  PAT_URL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")"
  PAT_HASH="$(readConfigKey "pathash" "${USER_CONFIG_FILE}")"
  DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
-  
-  # Network Config for Loader
-  if [ "${ARCMODE}" = "config" ]; then
-    dialog --backtitle "$(backtitle)" --colors --title "Network Config" \
+  # Get Network Config for Loader
+  if [ "${ARCMODE}" = "config" ] || [ "${ARCPATCH}" = "true" ] || [ "${ARCPATCH}" = "false" ]; then
+    STEP="network"
+    dialog --backtitle "$(backtitlep)" --colors --title "Network Config" \
      --infobox "Generating Network Config..." 3 40
    sleep 2
-    getnet || return
+    getnet
+    [ $? -ne 0 ] && return 1
  fi
-  
  if [ "${ONLYPATCH}" = "true" ]; then
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
    ONLYPATCH="false"
    return 0
  fi
-  
  # Select Portmap for Loader
  if [ "${DT}" = "false" ] && [ ${SATADRIVES} -gt 0 ]; then
-    dialog --backtitle "$(backtitle)" --colors --title "Storage Map" \
+    STEP="storagemap"
+    dialog --backtitle "$(backtitlep)" --colors --title "Storage Map" \
      --infobox "Generating Storage Map..." 3 40
    sleep 2
-    getmapSelection || return
+    getmapSelection
+    [ $? -ne 0 ] && return 1
  fi
-  
-  # Select Addons
+  # Check for Custom Build
  if [ "${ARCMODE}" = "config" ]; then
-    dialog --backtitle "$(backtitle)" --colors --title "Addons" \
+    # Select Addons
+    STEP="addons"
+    dialog --backtitle "$(backtitlep)" --colors --title "Addons" \
      --infobox "Loading Addons Table..." 3 40
-    addonSelection || return
+    addonSelection
+    [ $? -ne 0 ] && return 1
  fi
-  
-  # CPU Frequency Scaling & Governor
-  if readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then
-    if [ "${ARCMODE}" = "config" ] && [ "${MACHINE}" = "Native" ]; then
-      dialog --backtitle "$(backtitle)" --colors --title "CPU Frequency Scaling" \
-        --infobox "Generating Governor Table..." 3 40
-      governorSelection || return
-    elif [ "${ARCMODE}" = "automated" ] && [ "${MACHINE}" = "Native" ]; then
-      if [ "${PLATFORM}" = "epyc7002" ]; then
-        writeConfigKey "governor" "schedutil" "${USER_CONFIG_FILE}"
-      else
-        writeConfigKey "governor" "conservative" "${USER_CONFIG_FILE}"
-      fi
-    fi
+  # Check for CPU Frequency Scaling & Governor
+  if [ "${ARCMODE}" = "config" ] && [ "${MACHINE}" = "Native" ] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then
+    dialog --backtitle "$(backtitlep)" --colors --title "CPU Frequency Scaling" \
+      --infobox "Generating Governor Table..." 3 40
+    governorSelection
+    [ $? -ne 0 ] && return 1
+  elif [ "${ARCMODE}" = "automated" ] && [ "${MACHINE}" = "Native" ] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then
+    [ "${PLATFORM}" = "epyc7002" ] && writeConfigKey "addons.cpufreqscaling" "schedutil" "${USER_CONFIG_FILE}" || writeConfigKey "addons.cpufreqscaling" "conservative" "${USER_CONFIG_FILE}"
  fi
-  
-  # Warnings and Checks
  if [ "${ARCMODE}" = "config" ]; then
-    [ "${DT}" = "true" ] && [ "${EXTERNALCONTROLLER}" = "true" ] && dialog --backtitle "$(backtitle)" --title "Arc Warning" --msgbox "WARN: You use a HBA/Raid Controller and selected a DT Model.\nThis is still an experimental." 6 70
+    # Check for DT and HBA/Raid Controller
+    if [ "${DT}" = "true" ] && [ "${EXTERNALCONTROLLER}" = "true" ]; then
+      dialog --backtitle "$(backtitlep)" --title "Arc Warning" \
+        --msgbox "WARN: You use a HBA/Raid Controller and selected a DT Model.\nThis is still an experimental." 6 70
+    fi
+    # Check for more then 8 Ethernet Ports
    DEVICENIC="$(readConfigKey "device.nic" "${USER_CONFIG_FILE}")"
    MODELNIC="$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)"
-    [ ${DEVICENIC} -gt 8 ] && dialog --backtitle "$(backtitle)" --title "Arc Warning" --msgbox "WARN: You have more NIC (${DEVICENIC}) than 8 NIC.\nOnly 8 supported by DSM." 6 60
-    [ ${DEVICENIC} -gt ${MODELNIC} ] && [ "${ARCPATCH}" = "true" ] && dialog --backtitle "$(backtitle)" --title "Arc Warning" --msgbox "WARN: You have more NIC (${DEVICENIC}) than supported by Model (${MODELNIC}).\nOnly the first ${MODELNIC} are used by Arc Patch." 6 80
-    [ "${AESSYS}" = "false" ] && dialog --backtitle "$(backtitle)" --title "Arc Warning" --msgbox "WARN: Your System doesn't support Hardware encryption in DSM. (AES)" 5 70
-    [[ "${CPUFREQ}" = "false" || "${ACPISYS}" = "false" ]] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling" && dialog --backtitle "$(backtitle)" --title "Arc Warning" --msgbox "WARN: It is possible that CPU Frequency Scaling is not working properly with your System." 6 80
+    if [ ${DEVICENIC} -gt 8 ]; then
+      dialog --backtitle "$(backtitlep)" --title "Arc Warning" \
+        --msgbox "WARN: You have more NIC (${DEVICENIC}) then 8 NIC.\nOnly 8 supported by DSM." 6 60
+    fi
+    if [ ${DEVICENIC} -gt ${MODELNIC} ] && [ "${ARCPATCH}" = "true" ]; then
+      dialog --backtitle "$(backtitlep)" --title "Arc Warning" \
+        --msgbox "WARN: You have more NIC (${DEVICENIC}) than supported by Model (${MODELNIC}).\nOnly the first ${MODELNIC} are used by Arc Patch." 6 80
+    fi
+    # Check for AES
+    if [ "${AESSYS}" = "false" ]; then
+      dialog --backtitle "$(backtitlep)" --title "Arc Warning" \
+        --msgbox "WARN: Your System doesn't support Hardwareencryption in DSM. (AES)" 5 70
+    fi
+    # Check for CPUFREQ
+    if [[ "${CPUFREQ}" = "false" || "${ACPISYS}" = "false" ]] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then
+      dialog --backtitle "$(backtitlep)" --title "Arc Warning" \
+        --msgbox "WARN: It is possible that CPU Frequency Scaling is not working properly with your System." 6 80
+    fi
  fi
-  
-  # eMMC Boot Support
  EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
+  # eMMC Boot Support
  if [ "${EMMCBOOT}" = "true" ]; then
    writeConfigKey "modules.mmc_block" "" "${USER_CONFIG_FILE}"
    writeConfigKey "modules.mmc_core" "" "${USER_CONFIG_FILE}"
@@ -531,25 +550,33 @@ function arcSettings() {
    deleteConfigKey "modules.mmc_block" "${USER_CONFIG_FILE}"
    deleteConfigKey "modules.mmc_core" "${USER_CONFIG_FILE}"
  fi
-  
-  # Final Config Check
  if [ -n "${PLATFORM}" ] && [ -n "${MODEL}" ] && [ -n "${KVER}" ] && [ -n "${PAT_URL}" ] && [ -n "${PAT_HASH}" ]; then
+    # Config is done
    writeConfigKey "arc.confdone" "true" "${USER_CONFIG_FILE}"
    CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
+    # Check for Custom Build
    if [ "${ARCMODE}" = "config" ]; then
-      dialog --clear --backtitle "$(backtitle)" --title "Config done" \
+      # Ask for Build
+      dialog --clear --backtitle "$(backtitlep)" --title "Config done" \
        --no-cancel --menu "Build now?" 7 40 0 \
        1 "Yes - Build Arc Loader now" \
        2 "No - I want to make changes" \
      2>"${TMP_PATH}/resp"
      resp=$(cat ${TMP_PATH}/resp)
-      [ -z "${resp}" ] && return
-      [ ${resp} -eq 1 ] && arcSummary || dialog --clear --no-items --backtitle "$(backtitle)"
+      [ -z "${resp}" ] && return 1
+      if [ ${resp} -eq 1 ]; then
+        arcSummary
+      elif [ ${resp} -eq 2 ]; then
+        dialog --clear --no-items --backtitle "$(backtitle)"
+        return 1
+      fi
    else
+      # Build Loader
      make
    fi
  else
-    dialog --backtitle "$(backtitle)" --title "Config failed" --msgbox "ERROR: Config failed!\nExit." 6 40
+    dialog --backtitle "$(backtitle)" --title "Config failed" \
+      --msgbox "ERROR: Config failed!\nExit." 6 40
    return 1
  fi
 }
@@ -557,6 +584,7 @@ function arcSettings() {
 ###############################################################################
 # Show Summary of Config
 function arcSummary() {
+  STEP="build"
  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
  PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
@@ -567,13 +595,19 @@ function arcSummary() {
  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
  ADDONSINFO="$(readConfigEntriesArray "addons" "${USER_CONFIG_FILE}")"
  REMAP="$(readConfigKey "arc.remap" "${USER_CONFIG_FILE}")"
-  
-  # Read remap configurations
-  PORTMAP="$(readConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}")"
-  DISKMAP="$(readConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}")"
-  PORTREMAP="$(readConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}")"
-  AHCIPORTREMAP="$(readConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}")"
-  
+  if [ "${REMAP}" = "acports" ] || [ "${REMAP}" = "maxports" ]; then
+    PORTMAP="$(readConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}")"
+    DISKMAP="$(readConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}")"
+  elif [ "${REMAP}" = "remap" ]; then
+    PORTREMAP="$(readConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}")"
+  elif [ "${REMAP}" = "ahci" ]; then
+    AHCIPORTREMAP="$(readConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}")"
+  else
+    PORTMAP="$(readConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}")"
+    DISKMAP="$(readConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}")"
+    PORTREMAP="$(readConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}")"
+    AHCIPORTREMAP="$(readConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}")"
+  fi
  DIRECTBOOT="$(readConfigKey "directboot" "${USER_CONFIG_FILE}")"
  KERNELLOAD="$(readConfigKey "kernelload" "${USER_CONFIG_FILE}")"
  HDDSORT="$(readConfigKey "hddsort" "${USER_CONFIG_FILE}")"
@@ -583,14 +617,13 @@ function arcSummary() {
  DRIVES="$(readConfigKey "device.drives" "${USER_CONFIG_FILE}")"
  EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
  KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
-  
-  # Check for user-defined remap values
-  if [ "${DT}" = "false" ] && [ "${REMAP}" = "user" ] && [ -z "${PORTMAP}${DISKMAP}${PORTREMAP}${AHCIPORTREMAP}" ]; then
-    dialog --backtitle "$(backtitle)" --title "Arc Error" \
-      --msgbox "ERROR: You selected Portmap: User and not set any values. -> Can't build Loader!\nGo need to go Cmdline Options and add your Values." 6 80
-    return 1
+  if [ "${DT}" = "false" ] && [ "${REMAP}" = "user" ]; then
+    if [ -z "${PORTMAP}" ] && [ -z "${DISKMAP}"] && [ -z "${PORTREMAP}" ] && [ -z "${AHCIPORTREMAP}" ]; then
+      dialog --backtitle "$(backtitle)" --title "Arc Error" \
+        --msgbox "ERROR: You selected Portmap: User and not set any values. -> Can't build Loader!\nGo need to go Cmdline Options and add your Values." 6 80
+      return 1
+    fi
  fi
-  
  # Print Summary
  SUMMARY="\Z4> DSM Information\Zn"
  SUMMARY+="\n>> Model: \Zb${MODEL}\Zn"
@@ -615,21 +648,24 @@ function arcSummary() {
  SUMMARY+="\n>> Addons: \Zb${ADDONSINFO}\Zn"
  SUMMARY+="\n"
  SUMMARY+="\n\Z4> Device Information\Zn"
+  SUMMARY+="\n>> AES: \Zb${AESSYS}\Zn"
+  SUMMARY+="\n>> CPU FreqScaling | ACPI: \Zb${CPUFREQ} | ${ACPISYS}\Zn"
  SUMMARY+="\n>> NIC: \Zb${NIC}\Zn"
  SUMMARY+="\n>> Total Disks: \Zb${DRIVES}\Zn"
  SUMMARY+="\n>> Internal Disks: \Zb${HARDDRIVES}\Zn"
  SUMMARY+="\n>> Additional Controller: \Zb${EXTERNALCONTROLLER}\Zn"
-  SUMMARY+="\n"
-  
-  dialog --backtitle "$(backtitle)" --colors --title "Config Summary" \
+  SUMMARY+="\n>> Memory: \Zb${RAMTOTAL}GB\Zn"
+  dialog --backtitle "$(backtitlep)" --colors --title "Config Summary" \
    --extra-button --extra-label "Cancel" --msgbox "${SUMMARY}" 0 0
-  
  RET=$?
  case ${RET} in
-    0)
+    0) # ok-button
      make
      ;;
-    3|255)
+    3) # extra-button
+      return 0
+      ;;
+    255) # ESC
      return 0
      ;;
  esac
@@ -638,6 +674,7 @@ function arcSummary() {
 ###############################################################################
 # Building Loader
 function make() {
+  STEP="build"
  # Read Model Config
  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
@@ -665,13 +702,13 @@ function make() {
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
    sleep 2
-    return
+    return 1
  fi
  if [ -f "${ORI_ZIMAGE_FILE}" ] && [ -f "${ORI_RDGZ_FILE}" ] && [ "${CONFDONE}" = "true" ] && [ -n "${PAT_URL}" ] && [ -n "${PAT_HASH}" ]; then
    (
      livepatch
      sleep 3
-    ) 2>&1 | dialog --backtitle "$(backtitle)" --colors --title "Build Loader" \
+    ) 2>&1 | dialog --backtitle "$(backtitlep)" --colors --title "Build Loader" \
      --progressbox "Patching DSM Files..." 20 70
  else
    dialog --backtitle "$(backtitle)" --title "Build Loader" --aspect 18 \
@@ -680,10 +717,11 @@ function make() {
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
    sleep 2
-    return
+    return 1
  fi
+  STEP="boot"
  if [ -f "${ORI_ZIMAGE_FILE}" ] && [ -f "${ORI_RDGZ_FILE}" ] && [ -f "${MOD_ZIMAGE_FILE}" ] && [ -f "${MOD_RDGZ_FILE}" ]; then
-    MODELID="$(echo ${MODEL} | sed 's/d$/D/; s/rp$/RP/; s/rp+/RP+/')"
+    MODELID=$(echo ${MODEL} | sed 's/d$/D/; s/rp$/RP/; s/rp+/RP+/')
    writeConfigKey "modelid" "${MODELID}" "${USER_CONFIG_FILE}"
    writeConfigKey "arc.version" "${ARC_VERSION}" "${USER_CONFIG_FILE}"
    arcFinish
@@ -694,7 +732,7 @@ function make() {
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
    sleep 2
-    return
+    return 1
  fi
 }

@@ -703,22 +741,25 @@ function make() {
 function arcFinish() {
  rm -f "${LOG_FILE}" >/dev/null 2>&1 || true
  MODELID="$(readConfigKey "modelid" "${USER_CONFIG_FILE}")"
-  
  if [ -n "${MODELID}" ]; then
    writeConfigKey "arc.builddone" "true" "${USER_CONFIG_FILE}"
    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-  
    if [ "${ARCMODE}" = "automated" ] || [ "${UPDATEMODE}" = "true" ]; then
      boot
    else
      # Ask for Boot
-      dialog --clear --backtitle "$(backtitle)" --title "Build done" \
+      dialog --clear --backtitle "$(backtitle)" --title "Build done"\
        --no-cancel --menu "Boot now?" 7 40 0 \
        1 "Yes - Boot DSM now" \
        2 "No - I want to make changes" \
      2>"${TMP_PATH}/resp"
-      resp=$(cat "${TMP_PATH}/resp")
-      [ "${resp}" -eq 1 ] && boot || return
+      resp=$(cat ${TMP_PATH}/resp)
+      [ -z "${resp}" ] && return 1
+      if [ ${resp} -eq 1 ]; then
+        boot
+      elif [ ${resp} -eq 2 ]; then
+        return 0
+      fi
    fi
  fi
 }
@@ -783,18 +824,16 @@ elif [ "${ARCMODE}" = "automated" ]; then
  else
    make
  fi
-elif [ "${ARCMODE}" = "config" ]; then
+else
  [ "${CONFDONE}" = "true" ] && NEXT="2" || NEXT="1"
  [ "${BUILDDONE}" = "true" ] && NEXT="3" || NEXT="1"
  while true; do
    echo "= \"\Z4===== Main =====\Zn \" "                                                     >"${TMP_PATH}/menu"
-    if [ -z "${USERID}" ] && [ "${ARCOFFLINE}" = "false" ]; then
+    if [ -z "${USERID}" ] && [ "${ARCOFFLINE}" != "true" ]; then
      echo "0 \"HardwareID for Arc Patch\" "                                                  >>"${TMP_PATH}/menu"
    fi
    echo "1 \"Choose Model \" "                                                               >>"${TMP_PATH}/menu"
-    if [ "${CONFDONE}" = "true" ] && [ -f "${MOD_ZIMAGE_FILE}" ] && [ -f "${MOD_RDGZ_FILE}" ]; then
-      echo "2 \"Rebuild Loader \" "                                                           >>"${TMP_PATH}/menu"
-    elif [ "${CONFDONE}" = "true" ]; then
+    if [ "${CONFDONE}" = "true" ]; then
      echo "2 \"Build Loader \" "                                                             >>"${TMP_PATH}/menu"
    fi
    if [ "${BUILDDONE}" = "true" ]; then
@@ -837,7 +876,7 @@ elif [ "${ARCMODE}" = "config" ]; then
        if [ "${DT}" = "true" ]; then
          echo "H \"Hotplug/SortDrives: \Z4${HDDSORT}\Zn \" "                                 >>"${TMP_PATH}/menu"
        else
-          echo "h \"USB Mount as Internal: \Z4${USBMOUNT}\Zn \" "                             >>"${TMP_PATH}/menu"
+          echo "h \"USB Mount: \Z4${USBMOUNT}\Zn \" "                                         >>"${TMP_PATH}/menu"
        fi
      fi
      if [ "${BOOTOPTS}" = "true" ]; then
@@ -867,9 +906,7 @@ elif [ "${ARCMODE}" = "config" ]; then
        echo "t \"Change User Password \" "                                                   >>"${TMP_PATH}/menu"
        echo "J \"Reset Network Config \" "                                                   >>"${TMP_PATH}/menu"
        echo "T \"Disable all scheduled Tasks \" "                                            >>"${TMP_PATH}/menu"
-        if [ "${PLATFORM}" = "epyc7002" ]; then
-          echo "M \"Mount DSM Storage Pool \" "                                               >>"${TMP_PATH}/menu"
-        fi
+        echo "M \"Mount DSM Storage Pool (not SHR) \" "                                       >>"${TMP_PATH}/menu"
        echo "l \"Edit User Config \" "                                                       >>"${TMP_PATH}/menu"
        echo "s \"Allow Downgrade Version \" "                                                >>"${TMP_PATH}/menu"
        echo "O \"Official Driver Priority: \Z4${ODP}\Zn \" "                                 >>"${TMP_PATH}/menu"
@@ -901,7 +938,7 @@ elif [ "${ARCMODE}" = "config" ]; then
    fi
    echo "= \"\Z4===== Misc =====\Zn \" "                                                     >>"${TMP_PATH}/menu"
    echo "x \"Backup/Restore/Recovery \" "                                                    >>"${TMP_PATH}/menu"
-    [ "${ARCOFFLINE}" = "false" ] && echo "z \"Update Menu \" "                               >>"${TMP_PATH}/menu"
+    [ "${ARCOFFLINE}" != "true" ] && echo "z \"Update Menu \" "                               >>"${TMP_PATH}/menu"
    echo "I \"Power/Service Menu \" "                                                         >>"${TMP_PATH}/menu"
    echo "V \"Credits \" "                                                                    >>"${TMP_PATH}/menu"

@@ -991,10 +1028,12 @@ elif [ "${ARCMODE}" = "config" ]; then
        PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
        PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
        KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
-        [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
-        if [ -n "${PLATFORM}" ] && [ -n "${KVERP}" ]; then
+        if [ -n "${PLATFORM}" ] && [ -n "${KVER}" ]; then
+          [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
          writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
-          mergeConfigModules "$(getAllModules "${PLATFORM}" "${KVERP}" | awk '{print $1}')" "${USER_CONFIG_FILE}"
+          while read -r ID DESC; do
+            writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}"
+          done < <(getAllModules "${PLATFORM}" "${KVERP}")
        fi
        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
@@ -1006,7 +1045,13 @@ elif [ "${ARCMODE}" = "config" ]; then
        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
        NEXT="H"
        ;;
-      h) [ "${USBMOUNT}" = "true" ] && USBMOUNT='false' || USBMOUNT='true'
+      h) if [ "${USBMOUNT}" = "auto" ]; then
+          USBMOUNT='internal'
+        elif [ "${USBMOUNT}" = "internal" ]; then
+          USBMOUNT='external'
+        elif [ "${USBMOUNT}" = "external" ]; then
+          USBMOUNT='auto'
+        fi
        writeConfigKey "usbmount" "${USBMOUNT}" "${USER_CONFIG_FILE}"
        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
@@ -1060,18 +1105,16 @@ elif [ "${ARCMODE}" = "config" ]; then
    esac
  done
  clear
-else
-  exec reboot
 fi

 # Inform user
 echo -e "Call \033[1;34marc.sh\033[0m to configure Loader"
 echo
-echo -e "Web Terminal: \033[1;34mhttp://${IPCON}:${TTYDPORT:-7681}\033[0m"
-echo -e "Web Filemanager: \033[1;34mhttp://${IPCON}:${DUFSPORT:-7304}\033[0m"
-echo
 echo -e "SSH Access:"
 echo -e "IP: \033[1;34m${IPCON}\033[0m"
 echo -e "User: \033[1;34mroot\033[0m"
 echo -e "Password: \033[1;34marc\033[0m"
 echo
+echo -e "Web Terminal: \033[1;34mhttp://${IPCON}:${TTYDPORT}\033[0m"
+echo -e "Web Filemanager: \033[1;34mhttp://${IPCON}:${DUFSPORT}\033[0m"
+echo
--- a/files/initrd/opt/arc/boot.sh
+++ b/files/initrd/opt/arc/boot.sh
@@ -9,6 +9,7 @@ set -e
 rm -rf "${PART1_PATH}/logs" >/dev/null 2>&1 || true

 BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+[ "${BUILDDONE}" = "false" ] && die "Loader build not completed!"
 ARC_BRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")"

 # Get Loader Disk Bus
@@ -54,31 +55,9 @@ LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")"
 CPU="$(echo $(cat /proc/cpuinfo 2>/dev/null | grep 'model name' | uniq | awk -F':' '{print $2}'))"
 RAMTOTAL="$(awk '/MemTotal:/ {printf "%.0f\n", $2 / 1024 / 1024 + 0.5}' /proc/meminfo 2>/dev/null)"
 VENDOR="$(dmesg 2>/dev/null | grep -i "DMI:" | head -1 | sed 's/\[.*\] DMI: //i')"
-DSMINFO="$(readConfigKey "bootscreen.dsminfo" "${USER_CONFIG_FILE}")"
-SYSTEMINFO="$(readConfigKey "bootscreen.systeminfo" "${USER_CONFIG_FILE}")"
-DISKINFO="$(readConfigKey "bootscreen.diskinfo" "${USER_CONFIG_FILE}")"
-HWIDINFO="$(readConfigKey "bootscreen.hwidinfo" "${USER_CONFIG_FILE}")"
-GOVERNOR="$(readConfigKey "governor" "${USER_CONFIG_FILE}")"
-USBMOUNT="$(readConfigKey "usbmount" "${USER_CONFIG_FILE}")"
-
-# Build Sanity Check
-[ "${BUILDDONE}" = "false" ] && die "Loader build not completed!"
-if [ -z "${MODELID}" ] || [ "${MODELID}" != "${MODEL}" ]; then
-  die "Loader build not completed! Model mismatch!"
-fi
-# HardwareID Check
-if [ "${ARCPATCH}" = "true" ]; then
-  HARDWAREID="$(readConfigKey "arc.hardwareid" "${USER_CONFIG_FILE}")"
-  HWID="$(genHWID)"
-  if [ "${HARDWAREID}" != "${HWID}" ]; then
-    echo "\033[1;31m*** HardwareID does not match! - Loader can't boot to DSM! You need to reconfigure your Loader - Rebooting to Config Mode! ***\033[0m"
-    writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
-    writeConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}"
-    writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
-    sleep 5
-    rebootTo "config"
-  fi
-fi
+DSMINFO="$(readConfigKey "boot.dsminfo" "${USER_CONFIG_FILE}")"
+SYSTEMINFO="$(readConfigKey "boot.systeminfo" "${USER_CONFIG_FILE}")"
+DISKINFO="$(readConfigKey "boot.diskinfo" "${USER_CONFIG_FILE}")"

 if [ "${DSMINFO}" = "true" ]; then
  echo -e "\033[1;37mDSM:\033[0m"
@@ -93,19 +72,12 @@ if [ "${SYSTEMINFO}" = "true" ]; then
  echo -e "Vendor: \033[1;37m${VENDOR}\033[0m"
  echo -e "CPU: \033[1;37m${CPU}\033[0m"
  echo -e "Memory: \033[1;37m${RAMTOTAL}GB\033[0m"
-  echo -e "Governor: \033[1;37m${GOVERNOR}\033[0m"
-  [ "${USBMOUNT}" = "true" ] && echo -e "USB Mount: \033[1;37m${USBMOUNT}\033[0m"
  echo
 fi
 if [ "${DISKINFO}" = "true" ]; then
  echo -e "\033[1;37mDisks:\033[0m"
  echo -e "Disks: \033[1;37m$(lsblk -dpno NAME | grep -v "${LOADER_DISK}" | wc -l)\033[0m"
 fi
-if [ "${HWIDINFO}" = "true" ]; then
-  echo -e "\033[1;37mHardwareID:\033[0m"
-  echo -e "HWID: \033[1;37m$(genHWID)\033[0m"
-  echo
-fi

 if ! readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q nvmesystem; then
  HASATA=0
@@ -116,12 +88,7 @@ if ! readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q nvmesystem; then
      break
    fi
  done
-  [ ${HASATA} -eq 0 ] && echo -e "\033[1;31m*** Note: Please insert at least one Sata/SAS/SCSI Disk for System installation, except the Bootloader Disk. ***\033[0m"
-fi
-
-if checkBIOS_VT_d && [ $(echo "${KVER:-4}" | cut -d'.' -f1) -lt 5 ]; then
-  echo -e "\033[1;31m*** Notice: Disable Intel(VT-d)/AMD(AMD-V) in BIOS/UEFI settings if you encounter a boot failure. ***\033[0m"
-  echo
+  [ ${HASATA} -eq 0 ] && echo -e "\033[1;31m*** Please insert at least one Sata/SAS/SCSI Disk for System installation, except for the Bootloader Disk. ***\033[0m"
 fi

 # Read necessary variables
@@ -135,29 +102,28 @@ EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
 MODBLACKLIST="$(readConfigKey "modblacklist" "${USER_CONFIG_FILE}")"
 ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"

+# HardwareID Check
+if [ "${ARCPATCH}" = "true" ]; then
+  HARDWAREID="$(readConfigKey "arc.hardwareid" "${USER_CONFIG_FILE}")"
+  HWID="$(genHWID)"
+  if [ "${HARDWAREID}" != "${HWID}" ]; then
+    echo "\033[1;31m*** HardwareID does not match! - Loader can't boot to DSM! You need to reconfigure your Loader - Rebooting to Config Mode! ***\033[0m"
+    writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
+    writeConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}"
+    writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
+    sleep 5
+    rebootTo "config"
+  fi
+fi
+
 declare -A CMDLINE

 # Automated Cmdline
-CMDLINE["syno_hw_version"]="${MODELID}"
+CMDLINE["syno_hw_version"]="${MODELID:-${MODEL}}"
 CMDLINE["vid"]="${VID:-"0x46f4"}" # Sanity check
 CMDLINE["pid"]="${PID:-"0x0001"}" # Sanity check
 CMDLINE["sn"]="${SN}"

-# NIC Cmdline
-ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth)
-ETHM=$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)
-ETHN=$(echo "${ETHX}" | wc -w)
-ETHM=${ETHM:-${ETHN}}
-NIC=0
-for N in ${ETHX}; do
-  MAC=$(readConfigKey "${N}" "${USER_CONFIG_FILE}")
-  MAC=${MAC:-$(cat /sys/class/net/${N}/address 2>/dev/null | tr '[:upper:]' '[:lower:]')}
-  NIC=$((NIC + 1))
-  CMDLINE["mac${NIC}"]="${MAC}"
-  [ ${NIC} -ge ${ETHM} ] && break
-done
-CMDLINE["netif_num"]="${NIC}"
-
 # Boot Cmdline
 if grep -q "force_junior" /proc/cmdline; then
  CMDLINE["force_junior"]=""
@@ -180,14 +146,13 @@ if [ $(echo "${KVER:-4}" | cut -d'.' -f1) -lt 5 ]; then
    SIZE=$((${SZ:-0} * ${SS:-0} / 1024 / 1024 + 10))
    # Read SATADoM type
    SATADOM="$(readConfigKey "satadom" "${USER_CONFIG_FILE}")"
-    CMDLINE['synoboot_satadom']="${SATADOM:-2}"
-    CMDLINE['dom_szmax']="${SIZE}"
+    CMDLINE["synoboot_satadom"]="${SATADOM:-2}"
+    CMDLINE["dom_szmax"]="${SIZE}"
  fi
-  CMDLINE["elevator"]="elevator"
+  CMDLINE['elevator']="elevator"
 else
  CMDLINE["split_lock_detect"]="off"
 fi
-
 if [ "${DT}" = "true" ]; then
  CMDLINE["syno_ttyS0"]="serial,0x3f8"
  CMDLINE["syno_ttyS1"]="serial,0x2f8"
@@ -196,42 +161,30 @@ else
  CMDLINE["syno_hdd_detect"]="0"
  CMDLINE["syno_hdd_powerup_seq"]="0"
 fi
-
 CMDLINE["HddHotplug"]="1"
 CMDLINE["vender_format_version"]="2"
-CMDLINE['skip_vender_mac_interfaces']="0,1,2,3,4,5,6,7"
-CMDLINE['earlyprintk']=""
-CMDLINE['earlycon']="uart8250,io,0x3f8,115200n8"
-CMDLINE['console']="ttyS0,115200n8"
-CMDLINE['consoleblank']="600"
+CMDLINE["skip_vender_mac_interfaces"]="0,1,2,3,4,5,6,7"
+CMDLINE["earlyprintk"]=""
+CMDLINE["earlycon"]="uart8250,io,0x3f8,115200n8"
+CMDLINE["console"]="ttyS0,115200n8"
+CMDLINE["consoleblank"]="600"
 # CMDLINE['no_console_suspend']="1"
-CMDLINE['root']="/dev/md0"
-CMDLINE['loglevel']="15"
-CMDLINE['log_buf_len']="32M"
-CMDLINE['rootwait']=""
-CMDLINE['panic']="${KERNELPANIC:-0}"
-# CMDLINE['intremap']="off" # no need
-# CMDLINE['amd_iommu_intr']="legacy" # no need
-CMDLINE['pcie_aspm']="off"
-# CMDLINE['intel_pstate']="disable"
-# CMDLINE['amd_pstate']="disable"
-# CMDLINE['nomodeset']=""
-CMDLINE['modprobe.blacklist']="${MODBLACKLIST}"
-
-if [ "${USBMOUNT}" = "true" ]; then
-  CMDLINE['usbinternal']=""
-fi
-
-if [ -n "${GOVERNOR}" ]; then
-  CMDLINE['governor']="${GOVERNOR}"
-fi
+CMDLINE["root"]="/dev/md0"
+CMDLINE["loglevel"]="15"
+CMDLINE["log_buf_len"]="32M"
+CMDLINE["rootwait"]=""
+CMDLINE["panic"]="${KERNELPANIC:-0}"

+# DSM Specific Cmdline
+CMDLINE["pcie_aspm"]="off"
+CMDLINE["modprobe.blacklist"]="${MODBLACKLIST}"
+[ $(cat /proc/cpuinfo | grep Intel | wc -l) -gt 0 ] && CMDLINE["intel_pstate"]="passive"
+[ $(cat /proc/cpuinfo | grep AMD | wc -l) -gt 0 ] && CMDLINE["amd_pstate"]="passive"
+# CMDLINE["nomodeset"]=""
 if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then
  CMDLINE["nox2apic"]=""
 fi
-
-# Disabled for now
-# if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ] && [ "${BUS}" != "mmc" ] && [ "${EMMCBOOT}" != "true" ]; then
+#if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ] && [ "${BUS}" != "mmc" ] && [ "${EMMCBOOT}" != "true" ]; then
 #   if ! echo "${CMDLINE["modprobe.blacklist"]}" | grep -q "sdhci"; then
 #     [ ! "${CMDLINE["modprobe.blacklist"]}" = "" ] && CMDLINE["modprobe.blacklist"]+=","
 #     CMDLINE["modprobe.blacklist"]+="sdhci,sdhci_pci,sdhci_acpi"
@@ -239,24 +192,33 @@ fi
 # fi
 if [ "${DT}" = "true" ] && ! echo "epyc7002 purley broadwellnkv2" | grep -wq "${PLATFORM}"; then
  if ! echo "${CMDLINE['modprobe.blacklist']}" | grep -q "mpt3sas"; then
-    [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
-    CMDLINE['modprobe.blacklist']+="mpt3sas"
+    [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE["modprobe.blacklist"]+=","
+    CMDLINE["modprobe.blacklist"]+="mpt3sas"
  fi
-#else
-#  CMDLINE['scsi_mod.scan']="sync"  # TODO: redpill panic of vmware scsi? (add to cmdline)
 fi
-
 # CMDLINE['kvm.ignore_msrs']="1"
 # CMDLINE['kvm.report_ignored_msrs']="0"
-
 if echo "apollolake geminilake" | grep -wq "${PLATFORM}"; then
  CMDLINE["intel_iommu"]="igfx_off"
 fi
-
 if echo "purley broadwellnkv2" | grep -wq "${PLATFORM}"; then
  CMDLINE["SASmodel"]="1"
 fi

+# NIC Cmdline
+ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
+ETHM=$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)
+ETHN=$(echo ${ETHX} | wc -w)
+[ -z "${ETHM}" ] && ETHM="${ETHN}"
+NIC=0
+for N in ${ETHX}; do
+  MAC="$(readConfigKey "${N}" "${USER_CONFIG_FILE}")"
+  [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | tr '[:upper:]' '[:lower:]')" || NIC=$((NIC + 1))
+  [ ${NIC} -le ${ETHM} ] && CMDLINE["mac${NIC}"]="${MAC}"
+  [ ${NIC} -ge ${ETHM} ] && break
+done
+CMDLINE["netif_num"]="${NIC}"
+
 # Read user network settings
 while IFS=': ' read -r KEY VALUE; do
  [ -n "${KEY}" ] && CMDLINE["network.${KEY}"]="${VALUE}"
@@ -283,6 +245,7 @@ if [ "${DIRECTBOOT}" = "true" ]; then
  CMDLINE_DIRECT=$(echo ${CMDLINE_LINE} | sed 's/>/\\\\>/g') # Escape special chars
  grub-editenv ${USER_GRUBENVFILE} set dsm_cmdline="${CMDLINE_DIRECT}"
  grub-editenv ${USER_GRUBENVFILE} set next_entry="direct"
+  _bootwait || true
  echo -e "\033[1;34mReboot with Directboot\033[0m"
  reboot
  exit 0
@@ -299,17 +262,14 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
    echo -e "\033[1;37mDetected ${ETHN} NIC:\033[0m"
  fi
  echo
-
  [ ! -f /var/run/dhcpcd/pid ] && /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
-  sleep 2
-
+  sleep 3
  for N in ${ETHX}; do
    COUNT=0
    DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
-    MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g' | tr '[:upper:]' '[:lower:]')"
    while true; do
      if [ "0" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
-        echo -e "\r${DRIVER}: \033[1;37mNOT CONNECTED @ Mac: ${MAC}\033[0m"
+        echo -e "\r${DRIVER}: \033[1;37mNOT CONNECTED\033[0m"
        break
      fi
      COUNT=$((COUNT + 1))
@@ -317,27 +277,27 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
      if [ -n "${IP}" ]; then
        SPEED=$(ethtool ${N} 2>/dev/null | grep "Speed:" | awk '{print $2}')
        if [[ "${IP}" =~ ^169\.254\..* ]]; then
-          echo -e "\r${DRIVER} (${SPEED} | ${MAC}): \033[1;37mLINK LOCAL (No DHCP server found.)\033[0m"
+          echo -e "\r${DRIVER} (${SPEED}): \033[1;37mLINK LOCAL (No DHCP server found.)\033[0m"
        else
-          echo -e "\r${DRIVER} (${SPEED} | ${MAC}): \033[1;37m${IP}\033[0m"
+          echo -e "\r${DRIVER} (${SPEED}): \033[1;37m${IP}\033[0m"
          [ -z "${IPCON}" ] && IPCON="${IP}"
        fi
        break
      fi
      if [ -z "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
-        echo -e "\r${DRIVER} (${MAC}): \033[1;37mDOWN\033[0m"
+        echo -e "\r${DRIVER}: \033[1;37mDOWN\033[0m"
        break
      fi
      if [ ${COUNT} -ge ${BOOTIPWAIT} ]; then
-        echo -e "\r${DRIVER} (${MAC}): \033[1;37mTIMEOUT\033[0m"
+        echo -e "\r${DRIVER}: \033[1;37mTIMEOUT\033[0m"
        break
      fi
      sleep 1
    done
  done
-  echo
+   _bootwait || true

-  DSMLOGO="$(readConfigKey "bootscreen.dsmlogo" "${USER_CONFIG_FILE}")"
+  DSMLOGO="$(readConfigKey "boot.dsmlogo" "${USER_CONFIG_FILE}")"
  if [ "${DSMLOGO}" = "true" ] && [ -c "/dev/fb0" ]; then
    [[ "${IPCON}" =~ ^169\.254\..* ]] && IPCON=""
    [ -n "${IPCON}" ] && URL="http://${IPCON}:5000" || URL="http://find.synology.com/"
@@ -347,8 +307,7 @@ elif [ "${DIRECTBOOT}" = "false" ]; then

  for T in $(busybox w 2>/dev/null | grep -v 'TTY' | awk '{print $2}'); do
    if [ -w "/dev/${T}" ]; then
-      [ -n "${IPCON}" ] && echo -e "Use \033[1;34mhttp://${IPCON}:5000\033[0m or try \033[1;34mhttp://find.synology.com/ \033[0mto find DSM and proceed.\n\n\033[1;37mThis interface will not be operational. Wait a few minutes - Network will be unreachable until DSM boot.\033[0m\n" >"/dev/${T}" 2>/dev/null \
-      || echo -e "Try \033[1;34mhttp://find.synology.com/ \033[0mto find DSM and proceed.\n\n\033[1;37mThis interface will not be operational. Wait a few minutes - Network will be unreachable until DSM boot.\nNo IP found - DSM will not work properly!\033[0m\n" >"/dev/${T}" 2>/dev/null
+      [ -n "${IPCON}" ] && echo -e "Use \033[1;34mhttp://${IPCON}:5000\033[0m or try \033[1;34mhttp://find.synology.com/ \033[0mto find DSM and proceed.\n\n\033[1;37mThis interface will not be operational. Wait a few minutes.\033[0m\n" >"/dev/${T}" 2>/dev/null || echo -e "Try \033[1;34mhttp://find.synology.com/ \033[0mto find DSM and proceed.\n\n\033[1;37mThis interface will not be operational. Wait a few minutes.\nNo IP found.\033[0m\n" >"/dev/${T}" 2>/dev/null
    fi
  done

@@ -362,14 +321,17 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
  # done

  echo -e "\033[1;37mLoading DSM Kernel...\033[0m"
+  # Executes DSM kernel via KEXEC
  KEXECARGS="-a"
  if [ $(echo "${KVER:-4}" | cut -d'.' -f1) -lt 4 ] && [ ${EFI} -eq 1 ]; then
    echo -e "\033[1;33mWarning, running kexec with --noefi param, strange things will happen!!\033[0m"
    KEXECARGS+=" --noefi"
  fi
-  kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE} kexecboot" >"${LOG_FILE}" 2>&1 || dieLog
+  kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog

  echo -e "\033[1;37mBooting DSM...\033[0m"
+  # Boot to DSM
  [ "${KERNELLOAD}" = "kexec" ] && kexec -e || poweroff
-  exit 0
 fi
+
+exit 0
--- a/files/initrd/opt/arc/grub.img.gz
+++ b/files/initrd/opt/arc/grub.img.gz
--- a/files/initrd/opt/arc/include/addons.sh
+++ b/files/initrd/opt/arc/include/addons.sh
@@ -8,7 +8,6 @@ function availableAddons() {
  fi
  local ARCOFFLINE="$(readConfigKey "arc.offline" "${USER_CONFIG_FILE}")"
  local ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
-  local PAT_URL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")"
  for D in $(find "${ADDONS_PATH}" -maxdepth 1 -type d 2>/dev/null | sort); do
    [ ! -f "${D}/manifest.yml" ] && continue
    local ADDON=$(basename ${D})
@@ -113,19 +112,3 @@ function updateAddon() {
    rm -f "${F}"
  done
 }
-
-###############################################################################
-# Read Addon Key
-# 1 - Addon
-# 2 - key
-function readAddonKey() {
-  if [ -z "${1}" ] || [ -z "${2}" ]; then
-    echo ""
-    return 1
-  fi
-  if [ ! -f "${ADDONS_PATH}/${1}/manifest.yml" ]; then
-    echo ""
-    return 1
-  fi
-  readConfigKey "${2}" "${ADDONS_PATH}/${1}/manifest.yml"
-}
--- a/files/initrd/opt/arc/include/compat.sh
+++ b/files/initrd/opt/arc/include/compat.sh
@@ -0,0 +1 @@
+###############################################################################
--- a/files/initrd/opt/arc/include/configFile.sh
+++ b/files/initrd/opt/arc/include/configFile.sh
@@ -26,20 +26,6 @@ function readConfigKey() {
  [ "${RESULT}" = "null" ] && echo "" || echo "${RESULT}"
 }

-###############################################################################
-# Write to yaml config file
-# 1 - Modules
-# 2 - Path of yaml config file
-function mergeConfigModules() {
-  local MS="ARCMOD\n${1// /\\n}"
-  local L="$(echo -en "${MS}" | awk '{print "modules."$1":"}')"
-  local xmlfile=$(mktemp)
-  echo -en "${L}" | yq -p p -o=yaml >"${xmlfile}"
-  deleteConfigKey "modules.\"ARCMOD\"" "${xmlfile}"
-  yq eval-all --inplace 'select(fileIndex == 0) * select(fileIndex == 1)' "${2}" "${xmlfile}" 2>/dev/null
-  rm -f "${xmlfile}"
-}
-
 ###############################################################################
 # Write to yaml config file if key not exists
 # 1 - Path of Key
--- a/files/initrd/opt/arc/include/consts.sh
+++ b/files/initrd/opt/arc/include/consts.sh
@@ -43,7 +43,7 @@ EXTRACTOR_PATH="${PART3_PATH}/extractor"
 EXTRACTOR_BIN="syno_extract_system_patch"

 HTTPPORT=$(grep -i '^HTTP_PORT=' /etc/arc.conf 2>/dev/null | cut -d'=' -f2)
-[ -z "${HTTPPORT}" ] && HTTPPORT=8080 || true
+[ -z "${HTTPPORT}" ] && HTTPPORT=7080 || true
 DUFSPORT=$(grep -i '^DUFS_PORT=' /etc/arc.conf 2>/dev/null | cut -d'=' -f2)
 [ -z "${DUFSPORT}" ] && DUFSPORT=7304 || true
 TTYDPORT=$(grep -i '^TTYD_PORT=' /etc/arc.conf 2>/dev/null | cut -d'=' -f2)
--- a/files/initrd/opt/arc/include/functions.py
+++ b/files/initrd/opt/arc/include/functions.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium> and Ing <https://github.com/wjz304>
+# Copyright (C) 2023 AuxXxilium <https://github.com/AuxXxilium> and Ing <https://github.com/wjz304>
 #
 # This is free software, licensed under the MIT License.
 # See /LICENSE for more information.
--- a/files/initrd/opt/arc/include/functions.sh
+++ b/files/initrd/opt/arc/include/functions.sh
@@ -68,12 +68,6 @@ function randomhex() {
  printf "&02X" "$((${RANDOM} % 255 + 1))"
 }

-###############################################################################
-# Generate a random digit (0-9A-Z)
-function genRandomDigit() {
-  echo {0..9} | tr ' ' '\n' | sort -R | head -1
-}
-
 ###############################################################################
 # Generate a random letter
 function genRandomLetter() {
@@ -147,14 +141,6 @@ function generateMacAddress() {
  return 0
 }

-###############################################################################
-function generate_and_write_serial() {
-  local use_patch=$1
-  SN="$(generateSerial "${MODEL}" "${use_patch}")"
-  writeConfigKey "arc.patch" "${use_patch}" "${USER_CONFIG_FILE}"
-  writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
-}
-
 ###############################################################################
 # Validate a serial number for a model
 # 1 - Model
@@ -389,39 +375,13 @@ function delCmdline() {
  setCmdline "${1}" "${CMDLINE}"
 }

-###############################################################################
-# check CPU Intel(VT-d)/AMD(AMD-Vi)
-function checkCPU_VT_d() {
-  lsmod | grep -q msr || modprobe msr 2>/dev/null
-  if grep -q "GenuineIntel" /proc/cpuinfo 2>/dev/null; then
-    local VT_D_ENABLED=$(rdmsr 0x3a 2>/dev/null)
-    [ "$((${VT_D_ENABLED:-0x0} & 0x5))" -eq $((0x5)) ] && return 0
-  elif grep -q "AuthenticAMD" /proc/cpuinfo 2>/dev/null; then
-    local IOMMU_ENABLED=$(rdmsr 0xC0010114 2>/dev/null)
-    [ "$((${IOMMU_ENABLED:-0x0} & 0x1))" -eq $((0x1)) ] && return 0
-  else
-    return 1
-  fi
-}
-
-###############################################################################
-# check BIOS Intel(VT-d)/AMD(AMD-Vi)
-function checkBIOS_VT_d() {
-  if grep -q "GenuineIntel" /proc/cpuinfo 2>/dev/null; then
-    dmesg 2>/dev/null | grep -iq "DMAR-IR.*DRHD base" && return 0
-  elif grep -q "AuthenticAMD" /proc/cpuinfo 2>/dev/null; then
-    dmesg 2>/dev/null | grep -iq "AMD-Vi.*enabled" && return 0
-  else
-    return 1
-  fi
-}
-
 ###############################################################################
 # Rebooting
+# (based on pocopico's TCRP code)
 function rebootTo() {
  local MODES="config recovery junior automated update bios memtest"
  [ -z "${1}" ] && exit 1
-  if ! echo "${MODES}" | grep -wq "${1}"; then exit 1; fi
+  if ! echo "${MODES}" | grep -qw "${1}"; then exit 1; fi
  [ "${1}" = "automated" ] && echo "arc-${MODEL}-${PRODUCTVER}-${ARC_VERSION}" >"${PART3_PATH}/automated"
  [ ! -f "${USER_GRUBENVFILE}" ] && grub-editenv ${USER_GRUBENVFILE} create
  # echo -e "Rebooting to ${1} mode..."
@@ -597,7 +557,7 @@ function systemCheck () {
  fi
  # Check for CPU Frequency Scaling
  CPUFREQUENCIES=$(ls -ltr /sys/devices/system/cpu/cpufreq/* 2>/dev/null | wc -l)
-  if [ ${CPUFREQUENCIES} -gt 1 ]; then
+  if [ ${CPUFREQUENCIES} -gt 1 ] && [ "${ACPISYS}" = "true" ]; then
    CPUFREQ="true"
  else
    CPUFREQ="false"
@@ -605,8 +565,6 @@ function systemCheck () {
  # Check for Arc Patch
  ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
  [ -z "${ARCCONF}" ] && writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
-  # Check for Disks
-  getmap
 }

 ###############################################################################
@@ -646,21 +604,21 @@ function __umountDSMRootDisk() {
 ###############################################################################
 # bootwait SSH/Web
 function _bootwait() {
-  BOOTWAIT="$(readConfigKey "bootwait" "${USER_CONFIG_FILE}")"
-  [ -z "${BOOTWAIT}" ] && BOOTWAIT=10
+  # Exec Bootwait to check SSH/Web connection
+  BOOTWAIT=5
  busybox w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WB
  MSG=""
-  while [ ${BOOTWAIT} -gt 0 ]; do
-    sleep 1
-    BOOTWAIT=$((BOOTWAIT - 1))
+  while test ${BOOTWAIT} -ge 0; do
    MSG="\033[1;33mAccess to SSH/Web will interrupt boot...\033[0m"
    echo -en "\r${MSG}"
    busybox w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WC
    if ! diff WB WC >/dev/null 2>&1; then
      echo -en "\r\033[1;33mAccess to SSH/Web detected and boot is interrupted.\033[0m\n"
      rm -f WB WC
-      return 1
+      exit 0
    fi
+    sleep 1
+    BOOTWAIT=$((BOOTWAIT - 1))
  done
  rm -f WB WC
  echo -en "\r$(printf "%$((${#MSG} * 2))s" " ")\n"
--- a/files/initrd/opt/arc/include/i915ids
+++ b/files/initrd/opt/arc/include/i915ids
@@ -1,390 +0,0 @@
-# INTEL_I810_IDS
-80867121
-80867123
-80867125
-# INTEL_I815_IDS
-80861132
-# INTEL_I830_IDS
-80863577
-# INTEL_I845G_IDS
-80862562
-# INTEL_I85X_IDS
-80863582
-8086358e
-# INTEL_I865G_IDS
-80862572
-# INTEL_I915G_IDS
-80862582
-8086258a
-# INTEL_I915GM_IDS
-80862592
-# INTEL_I945G_IDS
-80862772
-# INTEL_I945GM_IDS
-808627a2
-808627ae
-# INTEL_I965G_IDS
-80862972
-80862982
-80862992
-808629a2
-# INTEL_G33_IDS
-808629b2
-808629c2
-808629d2
-# INTEL_I965GM_IDS
-80862a02
-80862a12
-# INTEL_GM45_IDS
-80862a42
-# INTEL_G45_IDS
-80862e02
-80862e12
-80862e22
-80862e32
-80862e42
-80862e92
-# INTEL_PINEVIEW_G_IDS
-8086a001
-# INTEL_PINEVIEW_M_IDS
-8086a011
-# INTEL_IRONLAKE_D_IDS
-80860042
-# INTEL_IRONLAKE_M_IDS
-80860046
-# INTEL_SNB_D_GT1_IDS
-80860102
-8086010A
-# INTEL_SNB_D_GT2_IDS
-80860112
-80860122
-# INTEL_SNB_M_GT1_IDS
-80860106
-# INTEL_SNB_M_GT2_IDS
-80860116
-80860126
-# INTEL_IVB_M_GT1_IDS
-80860156
-# INTEL_IVB_M_GT2_IDS
-80860166
-# INTEL_IVB_D_GT1_IDS
-80860152
-8086015a
-# INTEL_IVB_D_GT2_IDS
-80860162
-8086016a
-# INTEL_HSW_ULT_GT1_IDS
-80860A02
-80860A06
-80860A0A
-80860A0B
-# INTEL_HSW_ULX_GT1_IDS
-80860A0E
-# INTEL_HSW_GT1_IDS
-80860402
-80860406
-8086040A
-8086040B
-8086040E
-80860C02
-80860C06
-80860C0A
-80860C0B
-80860C0E
-80860D02
-80860D06
-80860D0A
-80860D0B
-80860D0E
-# INTEL_HSW_ULT_GT2_IDS
-80860A12
-80860A16
-80860A1A
-80860A1B
-# INTEL_HSW_ULX_GT2_IDS
-80860A1E
-# INTEL_HSW_GT2_IDS
-80860412
-80860416
-8086041A
-8086041B
-8086041E
-80860C12
-80860C16
-80860C1A
-80860C1B
-80860C1E
-80860D12
-80860D16
-80860D1A
-80860D1B
-80860D1E
-# INTEL_HSW_ULT_GT3_IDS
-80860A22
-80860A26
-80860A2A
-80860A2B
-80860A2E
-# INTEL_HSW_GT3_IDS
-80860422
-80860426
-8086042A
-8086042B
-8086042E
-80860C22
-80860C26
-80860C2A
-80860C2B
-80860C2E
-80860D22
-80860D26
-80860D2A
-80860D2B
-80860D2E
-# INTEL_VLV_IDS
-80860f30
-80860f31
-80860f32
-80860f33
-# INTEL_BDW_ULT_GT1_IDS
-80861606
-8086160B
-# INTEL_BDW_ULX_GT1_IDS
-8086160E
-# INTEL_BDW_GT1_IDS
-80861602
-8086160A
-8086160D
-# INTEL_BDW_ULT_GT2_IDS
-80861616
-8086161B
-# INTEL_BDW_ULX_GT2_IDS
-8086161E
-# INTEL_BDW_GT2_IDS
-80861612
-8086161A
-8086161D
-# INTEL_BDW_ULT_GT3_IDS
-80861626
-8086162B
-# INTEL_BDW_ULX_GT3_IDS
-8086162E
-# INTEL_BDW_GT3_IDS
-80861622
-8086162A
-8086162D
-# INTEL_BDW_ULT_RSVD_IDS
-80861636
-8086163B
-# INTEL_BDW_ULX_RSVD_IDS
-8086163E
-# INTEL_BDW_RSVD_IDS
-80861632
-8086163A
-8086163D
-# INTEL_CHV_IDS
-808622b0
-808622b1
-808622b2
-808622b3
-# INTEL_SKL_ULT_GT1_IDS
-80861906
-80861913~
-# INTEL_SKL_ULX_GT1_IDS
-8086190E
-80861915~
-# INTEL_SKL_GT1_IDS
-80861902
-8086190A
-8086190B
-80861917~
-# INTEL_SKL_ULT_GT2_IDS
-80861916
-80861921
-# INTEL_SKL_ULX_GT2_IDS
-8086191E
-# INTEL_SKL_GT2_IDS
-80861912
-8086191A
-8086191B
-8086191D
-# INTEL_SKL_ULT_GT3_IDS
-80861923
-80861926
-80861927
-# INTEL_SKL_GT3_IDS
-8086192A
-8086192B
-8086192D
-# INTEL_SKL_GT4_IDS
-80861932
-8086193A
-8086193B
-8086193D
-# INTEL_BXT_IDS
-80860A84
-80861A84
-80861A85
-80865A84
-80865A85
-# INTEL_GLK_IDS
-80863184
-80863185
-# INTEL_KBL_ULT_GT1_IDS
-80865906
-80865913
-# INTEL_KBL_ULX_GT1_IDS
-8086590E
-80865915
-# INTEL_KBL_GT1_IDS
-80865902
-80865908
-8086590A
-8086590B
-# INTEL_KBL_ULT_GT2_IDS
-80865916
-80865921
-# INTEL_KBL_ULX_GT2_IDS
-8086591E
-# INTEL_KBL_GT2_IDS
-80865912
-80865917
-8086591A
-8086591B
-8086591D
-# INTEL_KBL_ULT_GT3_IDS
-80865926
-# INTEL_KBL_GT3_IDS
-80865923
-80865927
-# INTEL_KBL_GT4_IDS
-8086593B
-# INTEL_AML_KBL_GT2_IDS
-8086591C
-808687C0
-# INTEL_AML_CFL_GT2_IDS
-808687CA
-# INTEL_CML_GT1_IDS
-80869BA2
-80869BA4
-80869BA5
-80869BA8
-# INTEL_CML_U_GT1_IDS
-80869B21
-80869BAA
-80869BAC
-# INTEL_CML_GT2_IDS
-80869BC2
-80869BC4
-80869BC5
-80869BC6
-80869BC8
-80869BE6
-80869BF6
-# INTEL_CML_U_GT2_IDS
-80869B41
-80869BCA
-80869BCC
-# INTEL_CFL_S_GT1_IDS
-80863E90
-80863E93
-80863E99
-# INTEL_CFL_S_GT2_IDS
-80863E91
-80863E92
-80863E96
-80863E98
-80863E9A
-# INTEL_CFL_H_GT1_IDS
-80863E9C
-# INTEL_CFL_H_GT2_IDS
-80863E94
-80863E9B
-# INTEL_CFL_U_GT2_IDS
-80863EA9
-# INTEL_CFL_U_GT3_IDS
-80863EA5
-80863EA6
-80863EA7
-80863EA8
-# INTEL_WHL_U_GT1_IDS
-80863EA1
-80863EA4
-# INTEL_WHL_U_GT2_IDS
-80863EA0
-80863EA3
-# INTEL_WHL_U_GT3_IDS
-80863EA2
-# INTEL_CNL_PORT_F_IDS
-80865A44
-80865A4C
-80865A54
-80865A5C
-# INTEL_CNL_IDS
-80865A40
-80865A41
-80865A42
-80865A49
-80865A4A
-80865A50
-80865A51
-80865A52
-80865A59
-80865A5A
-# INTEL_ICL_PORT_F_IDS
-80868A50
-80868A52
-80868A53
-80868A54
-80868A56
-80868A57
-80868A58
-80868A59
-80868A5A
-80868A5B
-80868A5C
-80868A70
-80868A71
-# INTEL_ICL_11_IDS
-80868A51
-80868A5D
-# INTEL_EHL_IDS
-80864500~
-80864541
-80864551
-80864555
-80864557
-80864570~
-80864571
-# INTEL_JSL_IDS
-80864E51
-80864E55
-80864E57
-80864E61
-80864E71
-# INTEL_TGL_12_GT1_IDS
-80869A60
-80869A68
-80869A70
-# INTEL_TGL_12_GT2_IDS
-80869A40
-80869A49
-80869A59
-80869A78
-80869AC0
-80869AC9
-80869AD9
-80869AF8
-# INTEL_RKL_IDS
-80864C80
-80864C8A
-80864C8B
-80864C8C
-80864C90
-80864C9A
-# INTEL_DG1_IDS
-80864905
-80864906~
-80864907~
-80864908~
-80864909~
--- a/files/initrd/opt/arc/include/modulelist
+++ b/files/initrd/opt/arc/include/modulelist
@@ -7,25 +7,13 @@
 # eg: N i915.ko

 # kvm
-F irqbypass.ko
-F kvm-intel.ko
-F kvm-amd.ko
-F kvm.ko
+N irqbypass.ko
+N kvm-intel.ko
+N kvm-amd.ko
+N kvm.ko

 # acpi
 N acpi_call.ko
-N acpi-cpufreq.ko
-N processor.ko
-N button.ko
-
-# cpufreq
-N cpufreq_governor.ko
-N cpufreq_ondemand.ko
-N cpufreq_conservative.ko
-N cpufreq_performance.ko
-N cpufreq_powersave.ko
-N cpufreq_userspace.ko
-N cpufreq_stats.ko

 # misc
 N check_signature.ko
@@ -46,6 +34,14 @@ N cdc_ether.ko
 N rndis_host.ko
 N r8152.ko

+# iwlwifi
+N libarc4.ko
+N cfg80211.ko
+N mac80211.ko
+N iwlwifi.ko
+N iwlmvm.ko
+N iwldvm.ko
+
 ## i915
 #N dmabuf.ko
 #N drm.ko
--- a/files/initrd/opt/arc/include/modules.sh
+++ b/files/initrd/opt/arc/include/modules.sh
@@ -1,37 +1,3 @@
-###############################################################################
-# Unpack modules from a tgz file
-# 1 - Platform
-# 2 - Kernel Version
-function unpackModules() {
-  local PLATFORM=${1}
-  local KVER=${2}
-  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
-
-  rm -rf "${TMP_PATH}/modules"
-  mkdir -p "${TMP_PATH}/modules"
-  if [ "${KERNEL}" = "custom" ]; then
-    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
-  else
-    tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
-  fi
-}
-
-###############################################################################
-# Packag modules to a tgz file
-# 1 - Platform
-# 2 - Kernel Version
-function packModules() {
-  local PLATFORM=${1}
-  local KVER=${2}
-  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
-
-  if [ "${KERNEL}" = "custom" ]; then
-    tar -zcf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" .
-  else
-    tar -zcf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" .
-  fi
-}
-
 ###############################################################################
 # Return list of all modules available
 # 1 - Platform
@@ -44,9 +10,15 @@ function getAllModules() {
    echo ""
    return 1
  fi
-
-  unpackModules "${PLATFORM}" "${KVER}"
-
+  # Unzip modules for temporary folder
+  rm -rf "${TMP_PATH}/modules"
+  mkdir -p "${TMP_PATH}/modules"
+  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  else
+    tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  fi
  # Get list of all modules
  for F in $(ls ${TMP_PATH}/modules/*.ko 2>/dev/null); do
    local X=$(basename ${F})
@@ -73,24 +45,34 @@ function installModules() {
    echo "ERROR: installModules: Platform or Kernel Version not defined" >"${LOG_FILE}"
    return 1
  fi
-
-  unpackModules "${PLATFORM}" "${KVER}"
+  # Unzip modules for temporary folder
+  rm -rf "${TMP_PATH}/modules"
+  mkdir -p "${TMP_PATH}/modules"
+  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" 2>"${LOG_FILE}"
+  else
+    tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" 2>"${LOG_FILE}"
+  fi
+  if [ $? -ne 0 ]; then
+    return 1
+  fi

  local ODP="$(readConfigKey "odp" "${USER_CONFIG_FILE}")"
  for F in $(ls "${TMP_PATH}/modules/"*.ko 2>/dev/null); do
    local M=$(basename ${F})
    [ "${ODP}" = "true" ] && [ -f "${RAMDISK_PATH}/usr/lib/modules/${M}" ] && continue
    if echo "${MLIST}" | grep -wq "${M:0:-3}"; then
-      cp -f "${F}" "${RAMDISK_PATH}/usr/lib/modules/${M}"
+      cp -f "${F}" "${RAMDISK_PATH}/usr/lib/modules/${M}" 2>"${LOG_FILE}"
    else
-      rm -f "${RAMDISK_PATH}/usr/lib/modules/${M}"
+      rm -f "${RAMDISK_PATH}/usr/lib/modules/${M}" 2>"${LOG_FILE}"
    fi
  done
  mkdir -p "${RAMDISK_PATH}/usr/lib/firmware"
  if [ "${KERNEL}" = "custom" ]; then
-    tar -zxf "${CUSTOM_PATH}/firmware.tgz" -C "${RAMDISK_PATH}/usr/lib/firmware"
+    tar -zxf "${CUSTOM_PATH}/firmware.tgz" -C "${RAMDISK_PATH}/usr/lib/firmware" 2>"${LOG_FILE}"
  else
-    tar -zxf "${MODULES_PATH}/firmware.tgz" -C "${RAMDISK_PATH}/usr/lib/firmware"
+    tar -zxf "${MODULES_PATH}/firmware.tgz" -C "${RAMDISK_PATH}/usr/lib/firmware" 2>"${LOG_FILE}"
  fi
  if [ $? -ne 0 ]; then
    return 1
@@ -115,12 +97,21 @@ function addToModules() {
    echo ""
    return 1
  fi
-
-  unpackModules "${PLATFORM}" "${KVER}"
-
+  # Unzip modules for temporary folder
+  rm -rf "${TMP_PATH}/modules"
+  mkdir -p "${TMP_PATH}/modules"
+  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  else
+    tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  fi
  cp -f ${KOFILE} ${TMP_PATH}/modules
-
-  packModules "${PLATFORM}" "${KVER}"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zcf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" .
+  else
+    tar -zcf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" .
+  fi
 }

 ###############################################################################
@@ -137,12 +128,21 @@ function delToModules() {
    echo ""
    return 1
  fi
-
-  unpackModules "${PLATFORM}" "${KVER}"
-
+  # Unzip modules for temporary folder
+  rm -rf "${TMP_PATH}/modules"
+  mkdir -p "${TMP_PATH}/modules"
+  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  else
+    tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  fi
  rm -f ${TMP_PATH}/modules/${KONAME}
-
-  packModules "${PLATFORM}" "${KVER}"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zcf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" .
+  else
+    tar -zcf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" .
+  fi
 }

 ###############################################################################
@@ -170,9 +170,15 @@ function getdepends() {
    echo ""
    return 1
  fi
-
-  unpackModules "${PLATFORM}" "${KVER}"
-
+  # Unzip modules for temporary folder
+  rm -rf "${TMP_PATH}/modules"
+  mkdir -p "${TMP_PATH}/modules"
+  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  else
+    tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  fi
  local DPS=($(_getdepends ${KONAME} | tr ' ' '\n' | sort -u))
  echo ${DPS[@]}
  rm -rf "${TMP_PATH}/modules"
--- a/files/initrd/opt/arc/include/network.sh
+++ b/files/initrd/opt/arc/include/network.sh
@@ -1,33 +1,34 @@
 # Get Network Config for Loader
 function getnet() {
-  generate_and_write_macs() {
-    local patch=$1
-    local macs=($(generateMacAddress "${MODEL}" "${ETHN}" "${patch}"))
-
-    for i in $(seq 1 "${ETHN}"); do
-      local mac="${macs[$((i - 1))]}"
-      writeConfigKey "eth$((i - 1))" "${mac}" "${USER_CONFIG_FILE}"
+  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
+  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
+  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
+  NICPORTS="$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)"
+  ETHN=$(echo ${ETHX} | wc -w)
+  if [ "${ARCPATCH}" = "true" ]; then
+    MACS=($(generateMacAddress "${MODEL}" "${ETHN}" "true"))
+    for I in $(seq 1 ${ETHN}); do
+      eval MAC${I}="${MACS[$((${I} - 1))]}"
+      writeConfigKey "eth$((${I} - 1))" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}"
    done
-  }
-
-  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth)
-  MODEL=$(readConfigKey "model" "${USER_CONFIG_FILE}")
-  ARCPATCH=$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")
-  ETHN=$(echo "${ETHX}" | wc -w)
-
-  if [ "${ARCPATCH}" != "user" ]; then
-    generate_and_write_macs "${ARCPATCH}"
-  else
+  elif [ "${ARCPATCH}" = "false" ]; then
+    MACS=($(generateMacAddress "${MODEL}" "${ETHN}" "false"))
+    for I in $(seq 1 ${ETHN}); do
+      eval MAC${I}="${MACS[$((${I} - 1))]}"
+      writeConfigKey "eth$((${I} - 1))" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}"
+    done
+  elif [ "${ARCPATCH}" = "user" ]; then
+    # User Mac
    for N in ${ETHX}; do
      while true; do
        dialog --backtitle "$(backtitle)" --title "Mac Setting" \
-          --inputbox "Type a custom Mac for ${N} (Eq. 001132a1b2c3).\nA custom Mac will not be applied to NIC!" 8 50 \
+          --inputbox "Type a custom Mac for ${N} (Eq. 001132a1b2c3).\nA custom Mac will not be applied to NIC!" 8 50\
          2>"${TMP_PATH}/resp"
        [ $? -ne 0 ] && break
        MAC=$(cat "${TMP_PATH}/resp")
-        [ -z "${MAC}" ] && MAC=$(readConfigKey "${N}" "${USER_CONFIG_FILE}")
-        [ -z "${MAC}" ] && MAC=$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g')
-        MAC=$(echo "${MAC}" | tr '[:upper:]' '[:lower:]')
+        [ -z "${MAC}" ] && MAC="$(readConfigKey "${N}" "${USER_CONFIG_FILE}")"
+        [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g')"
+        MAC="$(echo "${MAC}" | tr '[:upper:]' '[:lower:]')"
        if [ ${#MAC} -eq 12 ]; then
          dialog --backtitle "$(backtitle)" --title "Mac Setting" --msgbox "Set Mac for ${N} to ${MAC}!" 5 50
          writeConfigKey "${N}" "${MAC}" "${USER_CONFIG_FILE}"
@@ -41,7 +42,7 @@ function getnet() {
 }

 # Get Amount of NIC
-ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth)
+ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
 # Get actual IP
 for N in ${ETHX}; do
  IPCON="$(getIP "${N}")"
--- a/files/initrd/opt/arc/include/storage.sh
+++ b/files/initrd/opt/arc/include/storage.sh
@@ -1,135 +1,109 @@
 # Get PortMap for Loader
 function getmap() {
-  function show_dialog() {
-    dialog --backtitle "$(backtitle)" --title "Sata Portmap" \
-      --menu "Choose a Portmap for Sata!?\n* Recommended Option" 8 60 0 \
-      1 "DiskIdxMap: Active Ports ${REMAP1}" \
-      2 "DiskIdxMap: Max Ports ${REMAP2}" \
-      3 "SataRemap: Remove empty Ports ${REMAP3}" \
-      4 "AhciRemap: Remove empty Ports (new) ${REMAP4}" \
-      5 "Set my own Portmap in Config" \
-    2>"${TMP_PATH}/resp"
-    [ $? -ne 0 ] && return 1
-    resp=$(cat "${TMP_PATH}/resp")
-    [ -z "${resp}" ] && return 1
-  }
-
-  function set_remap() {
-    case ${resp} in
-      1) writeConfigKey "arc.remap" "acports" "${USER_CONFIG_FILE}" ;;
-      2) writeConfigKey "arc.remap" "maxports" "${USER_CONFIG_FILE}" ;;
-      3) writeConfigKey "arc.remap" "remap" "${USER_CONFIG_FILE}" ;;
-      4) writeConfigKey "arc.remap" "ahci" "${USER_CONFIG_FILE}" ;;
-      5) writeConfigKey "arc.remap" "user" "${USER_CONFIG_FILE}" ;;
-    esac
-  }
-
  # Sata Disks
  SATADRIVES=0
  if [ $(lspci -d ::106 2>/dev/null | wc -l) -gt 0 ]; then
    # Clean old files
-    for file in drivesmax drivescon ports remap; do
-      > "${TMP_PATH}/${file}"
-    done
-
-    DISKIDXMAPIDX=0
-    DISKIDXMAP=""
-    DISKIDXMAPIDXMAX=0
-    DISKIDXMAPMAX=""
-
-    for PCI in $(lspci -d ::106 2>/dev/null | awk '{print $1}'); do
-      NUMPORTS=0
-      CONPORTS=0
-      declare -A HOSTPORTS
-
-      while read -r LINE; do
-        PORT=$(echo ${LINE} | grep -o 'ata[0-9]*' | sed 's/ata//')
-        HOSTPORTS[${PORT}]=$(echo ${LINE} | grep -o 'host[0-9]*$')
-      done < <(ls -l /sys/class/scsi_host | grep -F "${PCI}")
-
-      for PORT in $(echo ${!HOSTPORTS[@]} | tr ' ' '\n' | sort -n); do
-        ATTACH=$(ls -l /sys/block | grep -F -q "${PCI}/ata${PORT}" && echo 1 || echo 0)
-        PCMD=$(cat /sys/class/scsi_host/${HOSTPORTS[${PORT}]}/ahci_port_cmd)
-        DUMMY=$([ ${PCMD} = 0 ] && echo 1 || echo 0)
-
-        [ ${ATTACH} = 1 ] && CONPORTS=$((CONPORTS + 1)) && echo $((PORT - 1)) >>"${TMP_PATH}/ports"
-        NUMPORTS=$((NUMPORTS + 1))
+    [ -f "${TMP_PATH}/drivesmax" ] && rm -f "${TMP_PATH}/drivesmax" && touch "${TMP_PATH}/drivesmax" || true
+    [ -f "${TMP_PATH}/drivescon" ] && rm -f "${TMP_PATH}/drivescon" && touch "${TMP_PATH}/drivescon" || true
+    [ -f "${TMP_PATH}/ports" ] && rm -f "${TMP_PATH}/ports" && touch "${TMP_PATH}/ports" || true
+    [ -f "${TMP_PATH}/remap" ] && rm -f "${TMP_PATH}/remap" && touch "${TMP_PATH}/remap" || true
+    if [ $(lspci -d ::106 | wc -l) -gt 0 ]; then
+      let DISKIDXMAPIDX=0
+      DISKIDXMAP=""
+      let DISKIDXMAPIDXMAX=0
+      DISKIDXMAPMAX=""
+      for PCI in $(lspci -d ::106 2>/dev/null | awk '{print $1}'); do
+        NUMPORTS=0
+        CONPORTS=0
+        unset HOSTPORTS
+        declare -A HOSTPORTS
+        while read -r LINE; do
+          ATAPORT="$(echo ${LINE} | grep -o 'ata[0-9]*')"
+          PORT=$(echo ${ATAPORT} | sed 's/ata//')
+          HOSTPORTS[${PORT}]=$(echo ${LINE} | grep -o 'host[0-9]*$')
+        done < <(ls -l /sys/class/scsi_host | grep -F "${PCI}")
+        while read -r PORT; do
+          ls -l /sys/block | grep -F -q "${PCI}/ata${PORT}" && ATTACH=1 || ATTACH=0
+          PCMD=$(cat /sys/class/scsi_host/${HOSTPORTS[${PORT}]}/ahci_port_cmd)
+          [ ${PCMD} = 0 ] && DUMMY=1 || DUMMY=0
+          [ ${ATTACH} = 1 ] && CONPORTS="$((${CONPORTS} + 1))" && echo "$((${PORT} - 1))" >>"${TMP_PATH}/ports"
+          [ ${DUMMY} = 1 ] # Do nothing for now
+          NUMPORTS=$((${NUMPORTS} + 1))
+        done < <(echo ${!HOSTPORTS[@]} | tr ' ' '\n' | sort -n)
+        [ ${NUMPORTS} -gt 8 ] && NUMPORTS=8
+        [ ${CONPORTS} -gt 8 ] && CONPORTS=8
+        echo -n "${NUMPORTS}" >>"${TMP_PATH}/drivesmax"
+        echo -n "${CONPORTS}" >>"${TMP_PATH}/drivescon"
+        DISKIDXMAP=$DISKIDXMAP$(printf "%02x" $DISKIDXMAPIDX)
+        let DISKIDXMAPIDX=$DISKIDXMAPIDX+$CONPORTS
+        DISKIDXMAPMAX=$DISKIDXMAPMAX$(printf "%02x" $DISKIDXMAPIDXMAX)
+        let DISKIDXMAPIDXMAX=$DISKIDXMAPIDXMAX+$NUMPORTS
+        SATADRIVES=$((${SATADRIVES} + ${CONPORTS}))
      done
-
-      NUMPORTS=$((NUMPORTS > 8 ? 8 : NUMPORTS))
-      CONPORTS=$((CONPORTS > 8 ? 8 : CONPORTS))
-
-      echo -n "${NUMPORTS}" >>"${TMP_PATH}/drivesmax"
-      echo -n "${CONPORTS}" >>"${TMP_PATH}/drivescon"
-      DISKIDXMAP+=$(printf "%02x" $DISKIDXMAPIDX)
-      DISKIDXMAPIDX=$((DISKIDXMAPIDX + CONPORTS))
-      DISKIDXMAPMAX+=$(printf "%02x" $DISKIDXMAPIDXMAX)
-      DISKIDXMAPIDXMAX=$((DISKIDXMAPIDXMAX + NUMPORTS))
-      SATADRIVES=$((SATADRIVES + CONPORTS))
-    done
+    fi
  fi
-
  # SAS Disks
  SASDRIVES=0
  if [ $(lspci -d ::107 2>/dev/null | wc -l) -gt 0 ]; then
    for PCI in $(lspci -d ::107 2>/dev/null | awk '{print $1}'); do
+      NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
      PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n 2>/dev/null)
      PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l)
-      SASDRIVES=$((SASDRIVES + PORTNUM))
+      SASDRIVES=$((${SASDRIVES} + ${PORTNUM}))
    done
  fi
-
  # SCSI Disks
  SCSIDRIVES=0
  if [ $(lspci -d ::100 2>/dev/null | wc -l) -gt 0 ]; then
    for PCI in $(lspci -d ::100 2>/dev/null | awk '{print $1}'); do
-      PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n 2>/dev/null)
+      NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
+      PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort - 2>/dev/null)
      PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l)
-      SCSIDRIVES=$((SCSIDRIVES + PORTNUM))
+      SCSIDRIVES=$((${SCSIDRIVES} + ${PORTNUM}))
    done
  fi
-
  # Raid Disks
  RAIDDRIVES=0
  if [ $(lspci -d ::104 2>/dev/null | wc -l) -gt 0 ]; then
    for PCI in $(lspci -d ::104 2>/dev/null | awk '{print $1}'); do
+      NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
      PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n 2>/dev/null)
      PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l)
-      RAIDDRIVES=$((RAIDDRIVES + PORTNUM))
+      RAIDDRIVES=$((${RAIDDRIVES} + ${PORTNUM}))
    done
  fi
-
-  # NVMe Disks
-  NVMEDRIVES=0
-  if [ $(ls -l /sys/class/nvme 2>/dev/null | wc -l) -gt 0 ]; then
-    for PCI in $(lspci -d ::108 2>/dev/null | awk '{print $1}'); do
-      PORTNUM=$(ls -l /sys/class/nvme | grep "${PCI}" | wc -l 2>/dev/null)
-      [ ${PORTNUM} -eq 0 ] && continue
-      NVMEDRIVES=$((NVMEDRIVES + PORTNUM))
-    done
-  fi
-
  # USB Disks
  USBDRIVES=0
  if [ $(ls -l /sys/class/scsi_host 2>/dev/null | grep usb | wc -l) -gt 0 ]; then
    for PCI in $(lspci -d ::c03 2>/dev/null | awk '{print $1}'); do
+      NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
      PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n 2>/dev/null)
      PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l)
      [ ${PORTNUM} -eq 0 ] && continue
-      USBDRIVES=$((USBDRIVES + PORTNUM))
+      USBDRIVES=$((${USBDRIVES} + ${PORTNUM}))
    done
  fi
-
  # MMC Disks
  MMCDRIVES=0
  if [ $(ls -l /sys/block/mmc* 2>/dev/null | wc -l) -gt 0 ]; then
    for PCI in $(lspci -d ::805 | awk '{print $1}'); do
+      NAME=$(lspci -s "${PCI}" 2>/dev/null | sed "s/\ .*://")
      PORTNUM=$(ls -l /sys/block/mmc* | grep "${PCI}" | wc -l 2>/dev/null)
      [ ${PORTNUM} -eq 0 ] && continue
-      MMCDRIVES=$((MMCDRIVES + PORTNUM))
+      MMCDRIVES=$((${MMCDRIVES} + ${PORTNUM}))
+    done
+  fi
+  # NVMe Disks
+  NVMEDRIVES=0
+  if [ $(lspci -d ::108 2>/dev/null | wc -l) -gt 0 ]; then
+    for PCI in $(lspci -d ::108 2>/dev/null | awk '{print $1}'); do
+      NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
+      PORT=$(ls -l /sys/class/nvme | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/nvme//' | sort -n 2>/dev/null)
+      PORTNUM=$(lsscsi -b | grep -v - | grep "\[N:${PORT}:" | wc -l)
+      NVMEDRIVES=$((${NVMEDRIVES} + ${PORTNUM}))
    done
  fi
-
  # Disk Count for MaxDisks
  DRIVES=$((${SATADRIVES} + ${SASDRIVES} + ${SCSIDRIVES} + ${RAIDDRIVES} + ${USBDRIVES} + ${MMCDRIVES} + ${NVMEDRIVES}))
  HARDDRIVES=$((${SATADRIVES} + ${SASDRIVES} + ${SCSIDRIVES} + ${RAIDDRIVES} + ${NVMEDRIVES}))
@@ -142,32 +116,30 @@ function getmap() {
  writeConfigKey "device.nvmedrives" "${NVMEDRIVES}" "${USER_CONFIG_FILE}"
  writeConfigKey "device.drives" "${DRIVES}" "${USER_CONFIG_FILE}"
  writeConfigKey "device.harddrives" "${HARDDRIVES}" "${USER_CONFIG_FILE}"
-
  # Check for Sata Boot
  if [ $(lspci -d ::106 2>/dev/null | wc -l) -gt 0 ]; then
    LASTDRIVE=0
    while read -r D; do
      if [ "${BUS}" = "sata" ] && [ "${MACHINE}" != "Native" ] && [ ${D} -eq 0 ]; then
        MAXDISKS=${DRIVES}
-        echo -n "${D}>${MAXDISKS}:" >>"${TMP_PATH}/remap"
-      elif [ ${D} -ne ${LASTDRIVE} ]; then
-        echo -n "${D}>${LASTDRIVE}:" >>"${TMP_PATH}/remap"
-        LASTDRIVE=$((LASTDRIVE + 1))
-      else
-        LASTDRIVE=$((D + 1))
+        echo -n "${D}>${MAXDISKS}:">>"${TMP_PATH}/remap"
+      elif [ ${D} != ${LASTDRIVE} ]; then
+        echo -n "${D}>${LASTDRIVE}:">>"${TMP_PATH}/remap"
+        LASTDRIVE=$((${LASTDRIVE} + 1))
+      elif [ ${D} = ${LASTDRIVE} ]; then
+        LASTDRIVE=$((${D} + 1))
      fi
-    done < "${TMP_PATH}/ports"
+    done < <(cat "${TMP_PATH}/ports")
  fi
 }

 function getmapSelection() {
  # Compute PortMap Options
-  SATAPORTMAPMAX=$(awk '{print $1}' "${TMP_PATH}/drivesmax")
-  SATAPORTMAP=$(awk '{print $1}' "${TMP_PATH}/drivescon")
-  SATAREMAP=$(awk '{print $1}' "${TMP_PATH}/remap" | sed 's/.$//')
-  EXTERNALCONTROLLER=$(readConfigKey "device.externalcontroller" "${USER_CONFIG_FILE}")
-  ARCMODE=$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")
-  
+  SATAPORTMAPMAX="$(awk '{print $1}' "${TMP_PATH}/drivesmax")"
+  SATAPORTMAP="$(awk '{print $1}' "${TMP_PATH}/drivescon")"
+  SATAREMAP="$(awk '{print $1}' "${TMP_PATH}/remap" | sed 's/.$//')"
+  EXTERNALCONTROLLER="$(readConfigKey "device.externalcontroller" "${USER_CONFIG_FILE}")"
+  ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
  if [ "${ARCMODE}" = "config" ]; then
    # Show recommended Option to user
    if [ -n "${SATAREMAP}" ] && [ "${EXTERNALCONTROLLER}" = "true" ] && [ "${MACHINE}" = "Native" ]; then
@@ -177,9 +149,43 @@ function getmapSelection() {
    else
      REMAP1="*"
    fi
-  
-    show_dialog
-    set_remap
+    # Ask for Portmap
+    if [ "${STEP}" = "storagemap" ]; then
+      dialog --backtitle "$(backtitlep)" --title "Sata Portmap" \
+        --menu "Choose a Portmap for Sata!?\n* Recommended Option" 8 60 0 \
+        1 "DiskIdxMap: Active Ports ${REMAP1}" \
+        2 "DiskIdxMap: Max Ports ${REMAP2}" \
+        3 "SataRemap: Remove empty Ports ${REMAP3}" \
+        4 "AhciRemap: Remove empty Ports (new) ${REMAP4}" \
+        5 "Set my own Portmap in Config" \
+      2>"${TMP_PATH}/resp"
+      [ $? -ne 0 ] && return 1
+      resp=$(cat "${TMP_PATH}/resp")
+      [ -z "${resp}" ] && return 1
+    else
+        dialog --backtitle "$(backtitle)" --title "Sata Portmap" \
+        --menu "Choose a Portmap for Sata!?\n* Recommended Option" 8 60 0 \
+        1 "DiskIdxMap: Active Ports ${REMAP1}" \
+        2 "DiskIdxMap: Max Ports ${REMAP2}" \
+        3 "SataRemap: Remove empty Ports ${REMAP3}" \
+        4 "AhciRemap: Remove empty Ports (new) ${REMAP4}" \
+        5 "Set my own Portmap in Config" \
+      2>"${TMP_PATH}/resp"
+      [ $? -ne 0 ] && return 1
+      resp=$(cat "${TMP_PATH}/resp")
+      [ -z "${resp}" ] && return 1
+    fi
+    if [ ${resp} -eq 1 ]; then
+      writeConfigKey "arc.remap" "acports" "${USER_CONFIG_FILE}"
+    elif [ ${resp} -eq 2 ]; then
+      writeConfigKey "arc.remap" "maxports" "${USER_CONFIG_FILE}"
+    elif [ ${resp} -eq 3 ]; then
+      writeConfigKey "arc.remap" "remap" "${USER_CONFIG_FILE}"
+    elif [ ${resp} -eq 4 ]; then
+      writeConfigKey "arc.remap" "ahci" "${USER_CONFIG_FILE}"
+    elif [ ${resp} -eq 5 ]; then
+      writeConfigKey "arc.remap" "user" "${USER_CONFIG_FILE}"
+    fi
  else
    # Show recommended Option to user
    if [ -n "${SATAREMAP}" ] && [ "${EXTERNALCONTROLLER}" = "true" ] && [ "${MACHINE}" = "Native" ]; then
@@ -192,46 +198,55 @@ function getmapSelection() {
  fi
  # Check Remap for correct config
  REMAP="$(readConfigKey "arc.remap" "${USER_CONFIG_FILE}")"
-  deleteConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}"
-  deleteConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}"
-  deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
-  deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
-  
-  case "${REMAP}" in
-    "acports")
-      writeConfigKey "cmdline.SataPortMap" "${SATAPORTMAP}" "${USER_CONFIG_FILE}"
-      writeConfigKey "cmdline.DiskIdxMap" "${DISKIDXMAP}" "${USER_CONFIG_FILE}"
-      ;;
-    "maxports")
-      writeConfigKey "cmdline.SataPortMap" "${SATAPORTMAPMAX}" "${USER_CONFIG_FILE}"
-      writeConfigKey "cmdline.DiskIdxMap" "${DISKIDXMAPMAX}" "${USER_CONFIG_FILE}"
-      ;;
-    "remap")
-      writeConfigKey "cmdline.sata_remap" "${SATAREMAP}" "${USER_CONFIG_FILE}"
-      ;;
-    "ahci")
-      writeConfigKey "cmdline.ahci_remap" "${SATAREMAP}" "${USER_CONFIG_FILE}"
-      ;;
-  esac
-  return
+  # Write Map to config and show Map to User
+  if [ "${REMAP}" = "acports" ]; then
+    writeConfigKey "cmdline.SataPortMap" "${SATAPORTMAP}" "${USER_CONFIG_FILE}"
+    writeConfigKey "cmdline.DiskIdxMap" "${DISKIDXMAP}" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
+  elif [ "${REMAP}" = "maxports" ]; then
+    writeConfigKey "cmdline.SataPortMap" "${SATAPORTMAPMAX}" "${USER_CONFIG_FILE}"
+    writeConfigKey "cmdline.DiskIdxMap" "${DISKIDXMAPMAX}" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
+  elif [ "${REMAP}" = "remap" ]; then
+    writeConfigKey "cmdline.sata_remap" "${SATAREMAP}" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
+  elif [ "${REMAP}" = "ahci" ]; then
+    writeConfigKey "cmdline.ahci_remap" "${SATAREMAP}" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
+  elif [ "${REMAP}" = "user" ]; then
+    deleteConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
+    deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
+  fi
 }

 # Check for Controller // 104=RAID // 106=SATA // 107=SAS // 100=SCSI // c03=USB
-declare -A controllers=(
-  [satacontroller]=106
-  [sascontroller]=107
-  [scsicontroller]=100
-  [raidcontroller]=104
-)
-
-external_controller=false
-
-for controller in "${!controllers[@]}"; do
-  count=$(lspci -d ::${controllers[$controller]} 2>/dev/null | wc -l)
-  writeConfigKey "device.${controller}" "${count}" "${USER_CONFIG_FILE}"
-  if [ "${controller}" != "satacontroller" ] && [ ${count} -gt 0 ]; then
-    external_controller=true
-  fi
-done
-
-writeConfigKey "device.externalcontroller" "${external_controller}" "${USER_CONFIG_FILE}"
+SATACONTROLLER=$(lspci -d ::106 2>/dev/null | wc -l)
+writeConfigKey "device.satacontroller" "${SATACONTROLLER}" "${USER_CONFIG_FILE}"
+if [ ${SATACONTROLLER} -gt 0 ]; then
+  writeConfigKey "device.externalcontroller" "false" "${USER_CONFIG_FILE}"
+fi
+SASCONTROLLER=$(lspci -d ::107 2>/dev/null | wc -l)
+writeConfigKey "device.sascontroller" "${SASCONTROLLER}" "${USER_CONFIG_FILE}"
+if [ ${SASCONTROLLER} -gt 0 ]; then
+  writeConfigKey "device.externalcontroller" "true" "${USER_CONFIG_FILE}"
+fi
+SCSICONTROLLER=$(lspci -d ::100 2>/dev/null | wc -l)
+writeConfigKey "device.scsicontroller" "${SCSICONTROLLER}" "${USER_CONFIG_FILE}"
+if [ ${SCSICONTROLLER} -gt 0 ]; then
+  writeConfigKey "device.externalcontroller" "true" "${USER_CONFIG_FILE}"
+fi
+RAIDCONTROLLER=$(lspci -d ::104 2>/dev/null | wc -l)
+writeConfigKey "device.raidcontroller" "${RAIDCONTROLLER}" "${USER_CONFIG_FILE}"
+if [ ${RAIDCONTROLLER} -gt 0 ]; then
+  writeConfigKey "device.externalcontroller" "true" "${USER_CONFIG_FILE}"
+fi
+# Check Controller for Disks
+getmap
--- a/files/initrd/opt/arc/include/update.sh
+++ b/files/initrd/opt/arc/include/update.sh
@@ -43,23 +43,13 @@ function updateLoader() {
      dialog --gauge "Download Update: ${TAG}..." 14 72 4>&-
    } 4>&1
    if [ -f "${TMP_PATH}/update.zip" ] && [ $(ls -s "${TMP_PATH}/update.zip" | cut -d' ' -f1) -gt 300000 ]; then
-      HASHURL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/update-${TAG}-${ARC_BRANCH}.hash"
-      HASH="$(curl -skL "${HASHURL}" | awk '{print $1}')"
-      if [ "${HASH}" != "$(sha256sum "${TMP_PATH}/update.zip" | awk '{print $1}')" ]; then
-        dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \
-          --infobox "Update failed - Hash mismatch!\nTry again later." 0 0
-        sleep 3
-        exec reboot
-      else
-        rm -rf "/mnt/update"
-        mkdir -p "${TMP_PATH}/update"
-        dialog --backtitle "$(backtitle)" --title "Update Loader" \
-          --infobox "Updating Loader..." 3 50
-        if unzip -oq "${TMP_PATH}/update.zip" -d "${TMP_PATH}/update"; then
-          cp -rf "${TMP_PATH}/update"/* "/mnt"
-          rm -rf "${TMP_PATH}/update"
-          rm -f "${TMP_PATH}/update.zip"
-        fi
+      mkdir -p "${TMP_PATH}/update"
+      dialog --backtitle "$(backtitle)" --title "Update Loader" \
+        --infobox "Updating Loader..." 3 50
+      if unzip -oq "${TMP_PATH}/update.zip" -d "${TMP_PATH}/update"; then
+        cp -rf "${TMP_PATH}/update"/* "/mnt"
+        rm -rf "${TMP_PATH}/update"
+        rm -f "${TMP_PATH}/update.zip"
      fi
      if [ "$(cat "${PART1_PATH}/ARC-VERSION")" = "${TAG}" ]; then
        dialog --backtitle "$(backtitle)" --title "Update Loader" \
@@ -457,14 +447,9 @@ function updateLKMs() {
 function updateOffline() {
  local ARCOFFLINE="$(readConfigKey "arc.offline" "${USER_CONFIG_FILE}")"
  if [ "${ARCOFFLINE}" != "true" ]; then
-    [ -f "${MODEL_CONFIG_PATH}/data.yml" ] && cp -f "${MODEL_CONFIG_PATH}/data.yml" "${MODEL_CONFIG_PATH}/data.yml.bak" || true
+    [ -f "${MODEL_CONFIG_PATH}/data.yml" ] && cp -f "${MODEL_CONFIG_PATH}/data.yml" "${MODEL_CONFIG_PATH}/data.yml.bak"
    curl -skL "https://raw.githubusercontent.com/AuxXxilium/arc-dsm/refs/heads/main/data.yml" -o "${MODEL_CONFIG_PATH}/data.yml"
-    
-    # Check file size and restore backup if necessary
-    local FILESIZE=$(stat -c%s "${MODEL_CONFIG_PATH}/data.yml")
-    if [ "${FILESIZE}" -lt 3072 ]; then
-      cp -f "${MODEL_CONFIG_PATH}/data.yml.bak" "${MODEL_CONFIG_PATH}/data.yml"
-    fi
+    [ ! -f "${MODEL_CONFIG_PATH}/data.yml" ] && cp -f "${MODEL_CONFIG_PATH}/data.yml.bak" "${MODEL_CONFIG_PATH}/data.yml"
  fi
  return 0
 }
@@ -472,24 +457,34 @@ function updateOffline() {
 ###############################################################################
 # Loading Update Mode
 function dependenciesUpdate() {
+  BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+  FAILED="false"
  dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \
    --infobox "Updating Dependencies..." 3 40
  sleep 2
-
-  FAILED="false"
-  for updateFunction in updateAddons updateModules updateCustom updatePatches updateLKMs updateOffline; do
-    $updateFunction || FAILED="true"
-  done
-
+  updateAddons
+  [ $? -ne 0 ] && FAILED="true"
+  updateModules
+  [ $? -ne 0 ] && FAILED="true"
+  updateCustom
+  [ $? -ne 0 ] && FAILED="true"
+  updatePatches
+  [ $? -ne 0 ] && FAILED="true"
+  updateLKMs
+  [ $? -ne 0 ] && FAILED="true"
+  updateOffline
+  [ $? -ne 0 ] && FAILED="true"
  if [ "${FAILED}" = "true" ]; then
    dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \
      --infobox "Update Dependencies failed! Try again later." 3 40
-  else
+    sleep 3
+  elif [ "${FAILED}" = "false" ]; then
    dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \
      --infobox "Update Dependencies successful!" 3 40
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+    sleep 3
+    clear
+    exec arc.sh
  fi
-  sleep 3
-  clear
-  exec arc.sh
 }
--- a/files/initrd/opt/arc/init.sh
+++ b/files/initrd/opt/arc/init.sh
@@ -8,10 +8,6 @@ set -e
 # Get Loader Disk Bus
 [ -z "${LOADER_DISK}" ] && die "Loader Disk not found!"
 checkBootLoader || die "The loader is corrupted, please rewrite it!"
-
-[ -f "${HOME}/.initialized" ] && exec arc.sh || true
-[ -f "${USER_CONFIG_FILE}" ] && sed -i "s/'/\"/g" "${USER_CONFIG_FILE}" >/dev/null 2>&1 || true
-
 BUS=$(getBus "${LOADER_DISK}")
 EFI=$([ -d /sys/firmware/efi ] && echo 1 || echo 0)

@@ -45,17 +41,14 @@ initConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
 initConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}"
 initConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
 initConfigKey "arc.version" "${ARC_VERSION}" "${USER_CONFIG_FILE}"
-initConfigKey "bootscreen" "{}" "${USER_CONFIG_FILE}"
-initConfigKey "bootscreen.dsminfo" "true" "${USER_CONFIG_FILE}"
-initConfigKey "bootscreen.systeminfo" "true" "${USER_CONFIG_FILE}"
-initConfigKey "bootscreen.diskinfo" "false" "${USER_CONFIG_FILE}"
-initConfigKey "bootscreen.hwidinfo" "false" "${USER_CONFIG_FILE}"
-initConfigKey "bootscreen.dsmlogo" "true" "${USER_CONFIG_FILE}"
+initConfigKey "boot" "{}" "${USER_CONFIG_FILE}"
+initConfigKey "boot.dsminfo" "true" "${USER_CONFIG_FILE}"
+initConfigKey "boot.systeminfo" "true" "${USER_CONFIG_FILE}"
+initConfigKey "boot.dsmlogo" "true" "${USER_CONFIG_FILE}"
 initConfigKey "bootipwait" "30" "${USER_CONFIG_FILE}"
 initConfigKey "device" "{}" "${USER_CONFIG_FILE}"
 initConfigKey "directboot" "false" "${USER_CONFIG_FILE}"
 initConfigKey "emmcboot" "false" "${USER_CONFIG_FILE}"
-initConfigKey "governor" "performance" "${USER_CONFIG_FILE}"
 initConfigKey "hddsort" "false" "${USER_CONFIG_FILE}"
 initConfigKey "kernel" "official" "${USER_CONFIG_FILE}"
 initConfigKey "kernelload" "power" "${USER_CONFIG_FILE}"
@@ -82,7 +75,7 @@ initConfigKey "rd-compressed" "false" "${USER_CONFIG_FILE}"
 initConfigKey "satadom" "2" "${USER_CONFIG_FILE}"
 initConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
 initConfigKey "time" "{}" "${USER_CONFIG_FILE}"
-initConfigKey "usbmount" "false" "${USER_CONFIG_FILE}"
+initConfigKey "usbmount" "auto" "${USER_CONFIG_FILE}"
 initConfigKey "zimage-hash" "" "${USER_CONFIG_FILE}"
 if grep -q "automated_arc" /proc/cmdline; then
  writeConfigKey "arc.mode" "automated" "${USER_CONFIG_FILE}"
@@ -135,8 +128,8 @@ PID="0x0001"

 BUSLIST="usb sata sas scsi nvme mmc ide virtio vmbus xen"
 if [ "${BUS}" = "usb" ]; then
-  VID="0x$(udevadm info --query property --name "${LOADER_DISK}" 2>/dev/null | grep "ID_VENDOR_ID" | cut -d= -f2)"
-  PID="0x$(udevadm info --query property --name "${LOADER_DISK}" 2>/dev/null | grep "ID_MODEL_ID" | cut -d= -f2)"
+  VID="0x$(udevadm info --query property --name "${LOADER_DISK}" | grep ID_VENDOR_ID | cut -d= -f2)"
+  PID="0x$(udevadm info --query property --name "${LOADER_DISK}" | grep ID_MODEL_ID | cut -d= -f2)"
 elif ! echo "${BUSLIST}" | grep -wq "${BUS}"; then
  die "$(printf "The boot disk does not support the current %s, only %s are supported." "${BUS}" "${BUSLIST// /\/}")"
 fi
@@ -221,7 +214,7 @@ touch "${HOME}/.initialized"
 # Load Arc Overlay
 echo -e "\033[1;34mLoading Arc Overlay...\033[0m"
 echo
-echo -e "Use \033[1;34mDisplay Output\033[0m or \033[1;34mhttp://${IPCON}:${TTYDPORT:-7681}\033[0m to configure Loader."
+echo -e "Use \033[1;34mDisplay Output\033[0m or \033[1;34mhttp://${IPCON}:${TTYDPORT}\033[0m to configure Loader."

 # Check memory and load Arc
 RAM=$(awk '/MemTotal:/ {printf "%.0f", $2 / 1024}' /proc/meminfo 2>/dev/null)
@@ -230,4 +223,5 @@ if [ ${RAM} -le 3500 ]; then
 else
  exec arc.sh
 fi
+
 exit 0
--- a/files/initrd/opt/arc/ramdisk-patch.sh
+++ b/files/initrd/opt/arc/ramdisk-patch.sh
@@ -43,50 +43,46 @@ ARCBRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")"
 PAT_URL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")"
 PAT_HASH="$(readConfigKey "pathash" "${USER_CONFIG_FILE}")"

+[ "${PATURL:0:1}" = "#" ] && PATURL=""
+[ "${PATSUM:0:1}" = "#" ] && PATSUM=""
+
 # Check if DSM Version changed
 . "${RAMDISK_PATH}/etc/VERSION"

-if [[ -n "${BUILDNUM}" && ("${PRODUCTVER}" != "${majorversion}.${minorversion}" || "${BUILDNUM}" != "${buildnumber}" || "${SMALLNUM}" != "${smallfixnumber}") ]]; then
-  OLDVER="${PRODUCTVER}(${BUILDNUM}$([[ ${SMALLNUM:-0} -ne 0 ]] && echo "u${SMALLNUM}"))"
-  NEWVER="${majorversion}.${minorversion}(${buildnumber}$([[ ${smallfixnumber:-0} -ne 0 ]] && echo "u${smallfixnumber}"))"
+if [[ -n "${PRODUCTVER}" && -n "${BUILDNUM}" && -n "${SMALLNUM}" ]] &&
+  ([ "${PRODUCTVER}" != "${majorversion}.${minorversion}" ] || [ "${BUILDNUM}" != "${buildnumber}" ] || [ "${SMALLNUM}" != "${smallfixnumber}" ]); then
+  OLDVER="${PRODUCTVER}(${BUILDNUM}$([ ${SMALLNUM:-0} -ne 0 ] && echo "u${SMALLNUM}"))"
+  NEWVER="${majorversion}.${minorversion}(${buildnumber}$([ ${smallfixnumber:-0} -ne 0 ] && echo "u${smallfixnumber}"))"
  PAT_URL=""
  PAT_HASH=""
-  echo "\nVersion changed from ${OLDVER} to ${NEWVER}"
 fi
-
-# Re-read PAT_URL and PAT_HASH if they are empty or commented out
-if [[ -z "${PAT_URL}" || "${PAT_URL:0:1}" == "#" ]]; then
-  PAT_URL="$(readConfigKey "${PLATFORM}.\"${MODEL}\".\"${majorversion}.${minorversion}\".url" "${D_FILE}")"
-fi
-if [[ -z "${PAT_HASH}" || "${PAT_HASH:0:1}" == "#" ]]; then
-  PAT_HASH="$(readConfigKey "${PLATFORM}.\"${MODEL}\".\"${majorversion}.${minorversion}\".hash" "${D_FILE}")"
-fi
-
-PRODUCTVER="${majorversion}.${minorversion}"
-BUILDNUM="${buildnumber}"
-SMALLNUM="${smallfixnumber}"
-
+PRODUCTVER=${majorversion}.${minorversion}
+BUILDNUM=${buildnumber}
+SMALLNUM=${smallfixnumber}
 writeConfigKey "productver" "${PRODUCTVER}" "${USER_CONFIG_FILE}"
 writeConfigKey "buildnum" "${BUILDNUM}" "${USER_CONFIG_FILE}"
 writeConfigKey "smallnum" "${SMALLNUM}" "${USER_CONFIG_FILE}"

 # Read model data
 KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
+
+# Modify KVER for Epyc7002
 [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"

 # Sanity check
 if [ -z "${PLATFORM}" ] || [ -z "${KVER}" ]; then
-  echo "ERROR: Configuration for Model ${MODEL} and Version ${PRODUCTVER} not found." >"${LOG_FILE}"
+  echo "ERROR: Configuration for model ${MODEL} and productversion ${PRODUCTVER} not found." >"${LOG_FILE}"
  exit 1
 fi

-# Read synoinfo and addons from config
-declare -A SYNOINFO ADDONS MODULES
+declare -A SYNOINFO
+declare -A ADDONS
+declare -A MODULES

+# Read synoinfo and addons from config
 while IFS=': ' read -r KEY VALUE; do
  [ -n "${KEY}" ] && SYNOINFO["${KEY}"]="${VALUE}"
 done < <(readConfigMap "synoinfo" "${USER_CONFIG_FILE}")
-
 while IFS=': ' read -r KEY VALUE; do
  [ -n "${KEY}" ] && ADDONS["${KEY}"]="${VALUE}"
 done < <(readConfigMap "addons" "${USER_CONFIG_FILE}")
@@ -97,39 +93,35 @@ while IFS=': ' read -r KEY VALUE; do
 done < <(readConfigMap "modules" "${USER_CONFIG_FILE}")

 # Patches (diff -Naru OLDFILE NEWFILE > xxx.patch)
-PATCHES=(
+PATCHS=(
  "ramdisk-etc-rc-*.patch"
  "ramdisk-init-script-*.patch"
  "ramdisk-post-init-script-*.patch"
  "ramdisk-disable-root-pwd-*.patch"
  "ramdisk-disable-disabled-ports-*.patch"
 )
-
-for PATCH in "${PATCHES[@]}"; do
-  echo "Patching with ${PATCH}" >>"${LOG_FILE}"
-  for PF in ${PATCH_PATH}/${PATCH}; do
-    [ -e "${PF}" ] || continue
-    echo "Applying patch ${PF}" >>"${LOG_FILE}"
-    if ! (cd "${RAMDISK_PATH}" && busybox patch -p1 -i "${PF}") >>"${LOG_FILE}" 2>&1; then
-      echo "Failed to apply patch ${FILE}" >>"${LOG_FILE}"
-      continue
-    fi
+for PE in "${PATCHS[@]}"; do
+  RET=1
+  echo "Patching with ${PE}" >"${LOG_FILE}"
+  # ${PE} contains *, so double quotes cannot be added
+  for PF in $(ls ${PATCH_PATH}/${PE} 2>/dev/null); do
+    echo "Patching with ${PF}" >>"${LOG_FILE}"
+    # busybox patch and gun patch have different processing methods and parameters.
+    (cd "${RAMDISK_PATH}" && busybox patch -p1 -i "${PF}") >>"${LOG_FILE}" 2>&1
+    RET=$?
+    [ ${RET} -eq 0 ] && break
  done
+  [ ${RET} -ne 0 ] && exit 1
 done

-# Add serial number to synoinfo.conf, to help to recover an installed DSM
-{
-  echo "Set synoinfo SN"
-  _set_conf_kv "SN" "${SN}" "${RAMDISK_PATH}/etc/synoinfo.conf" || exit 1
-  _set_conf_kv "SN" "${SN}" "${RAMDISK_PATH}/etc.defaults/synoinfo.conf" || exit 1
-} >>"${LOG_FILE}" 2>&1
-
-for KEY in "${!SYNOINFO[@]}"; do
-  {
-    echo "Set synoinfo ${KEY}"
-    _set_conf_kv "${KEY}" "${SYNOINFO[${KEY}]}" "${RAMDISK_PATH}/etc/synoinfo.conf" || exit 1
-    _set_conf_kv "${KEY}" "${SYNOINFO[${KEY}]}" "${RAMDISK_PATH}/etc.defaults/synoinfo.conf" || exit 1
-  } >>"${LOG_FILE}" 2>&1
+# Add serial number to synoinfo.conf, to help to recovery a installed DSM
+echo "Set synoinfo SN" >"${LOG_FILE}"
+_set_conf_kv "SN" "${SN}" "${RAMDISK_PATH}/etc/synoinfo.conf" >>"${LOG_FILE}" 2>&1 || exit 1
+_set_conf_kv "SN" "${SN}" "${RAMDISK_PATH}/etc.defaults/synoinfo.conf" >>"${LOG_FILE}" 2>&1 || exit 1
+for KEY in ${!SYNOINFO[@]}; do
+  echo "Set synoinfo ${KEY}" >>"${LOG_FILE}"
+  _set_conf_kv "${KEY}" "${SYNOINFO[${KEY}]}" "${RAMDISK_PATH}/etc/synoinfo.conf" >>"${LOG_FILE}" 2>&1 || exit 1
+  _set_conf_kv "${KEY}" "${SYNOINFO[${KEY}]}" "${RAMDISK_PATH}/etc.defaults/synoinfo.conf" >>"${LOG_FILE}" 2>&1 || exit 1
 done

 # Patch /sbin/init.post
@@ -171,20 +163,21 @@ mkdir -p "${RAMDISK_PATH}/addons"
  echo "export PLATFORM=\"${PLATFORM}\""
  echo "export MODEL=\"${MODEL}\""
  echo "export MODELID=\"${MODELID}\""
-  echo "export PRODUCTVERL=\"${PRODUCTVERL}\""
+  echo "export PRODUCTVER=\"${PRODUCTVER}\""
  echo "export MLINK=\"${PAT_URL}\""
  echo "export MCHECKSUM=\"${PAT_HASH}\""
-  echo "export LAYOUT=\"${LAYOUT:-qwerty}\""
-  echo "export KEYMAP=\"${KEYMAP:-en}\""
+  echo "export LAYOUT=\"${LAYOUT}\""
+  echo "export KEYMAP=\"${KEYMAP}\""
 } >"${RAMDISK_PATH}/addons/addons.sh"
 chmod +x "${RAMDISK_PATH}/addons/addons.sh"

 # System Addons
-for ADDON in redpill revert misc eudev disks localrss notify wol mountloader; do
+for ADDON in "redpill" "revert" "misc" "eudev" "disks" "localrss" "notify" "wol" "mountloader"; do
  PARAMS=""
  if [ "${ADDON}" = "disks" ]; then
    HDDSORT="$(readConfigKey "hddsort" "${USER_CONFIG_FILE}")"
-    PARAMS="${HDDSORT}"
+    USBMOUNT="$(readConfigKey "usbmount" "${USER_CONFIG_FILE}")"
+    PARAMS="${HDDSORT} ${USBMOUNT}"
    [ -f "${USER_UP_PATH}/${MODEL}.dts" ] && cp -f "${USER_UP_PATH}/${MODEL}.dts" "${RAMDISK_PATH}/addons/model.dts"
  fi
  installAddon "${ADDON}" "${PLATFORM}" || exit 1
@@ -192,8 +185,8 @@ for ADDON in redpill revert misc eudev disks localrss notify wol mountloader; do
 done

 # User Addons
-for ADDON in "${!ADDONS[@]}"; do
-  PARAMS="${ADDONS[${ADDON}]}"
+for ADDON in ${!ADDONS[@]}; do
+  PARAMS=${ADDONS[${ADDON}]}
  installAddon "${ADDON}" "${PLATFORM}" || echo "Addon ${ADDON} not found"
  echo "/addons/${ADDON}.sh \${1} ${PARAMS}" >>"${RAMDISK_PATH}/addons/addons.sh" 2>>"${LOG_FILE}" || exit 1
 done
--- a/files/p1/boot/grub/grub.cfg
+++ b/files/p1/boot/grub/grub.cfg
@@ -1,66 +1,47 @@
-
+set default="boot"
 set timeout="5"
 set timeout_style="menu"
-
-if [ -s ${prefix}/grubenv ]; then
-  load_env --skip-sig
-fi
-
-if [ "${next_entry}" ]; then
-  set default="${next_entry}"
-  unset next_entry
-  save_env next_entry
-else
-  set default="boot"
-fi
-
-if [ "${linux_gfx_mode}" ]; then
-  save_env linux_gfx_mode
-else
-  set linux_gfx_mode=keep
-  save_env linux_gfx_mode
-fi
-
-if [ x"${feature_menuentry_id}" = xy ]; then
-  menuentry_id_option="--id"
-else
-  menuentry_id_option=""
-fi
-
-export menuentry_id_option
-
-function load_video {
-  if [ x"${feature_all_video_module}" = xy ]; then
-    insmod all_video
-  else
-    insmod efi_gop
-    insmod efi_uga
-    insmod ieee1275_fb
-    insmod vbe
-    insmod vga
-    insmod video_bochs
-    insmod video_cirrus
-  fi
-}
-
+set pager=1
+set vesa_mode=1
 set menu_color_normal=white/black
 set menu_color_highlight=white/red
 set color_normal=white/black

-if [ x"${feature_default_font_path}" = xy ]; then
-  font=unicode
-else
-  font=${prefix}/fonts/unicode.pf2
+if [ -s ${prefix}/grubenv ]; then
+  load_env --skip-sig
+fi
+if [ "${next_entry}" ]; then
+  set default="${next_entry}"
+  unset next_entry
+  save_env next_entry
+fi
+if [ "${vesa_mode}" ]; then
+  set vesa_mode=${vesa_mode}
 fi

-if loadfont ${font}; then
-  if [ "${grub_platform}" = "efi" ]; then
-    set gfxmode=auto
-  else
-    set gfxmode=1024x768
-  fi
-  load_video
+terminal_input console
+terminal_output console
+
+if [ "${feature_all_video_module}" = "y" ]; then
+  insmod all_video
+else
+  insmod efi_gop
+  insmod efi_uga
+  insmod vbe
+  insmod vga
+  insmod video_bochs
+  insmod video_cirrus
+fi
+
+if loadfont unicode; then
  insmod gfxterm
+  set gfxmode=auto
+  set gfxpayload=auto
+  if [ "${grub_platform}" = "efi" ]; then
+    terminal_output --append gfxterm
+  else
+    terminal_output gfxterm
+  fi
  insmod gfxmenu
  loadfont ${prefix}/theme/dejavu_bold_14.pf2
  loadfont ${prefix}/theme/dejavu_mono_12.pf2
@@ -69,30 +50,27 @@ if loadfont ${font}; then
  export theme
 fi

-terminal_output gfxterm
-
 if serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1; then
  terminal_input --append serial
  terminal_output --append serial
 fi

-function gfxmode {
-	set gfxpayload="${linux_gfx_mode}"
-	if [ "${linux_gfx_mode}" = "keep" ]; then
-		set vt_handoff=vt.handoff=7
-	else
-		set vt_handoff=
-	fi
+function set_gfxpayload {
+  if [ ${vesa_mode} -eq 1 ]; then
+    set gfxpayload=keep
+  else
+    set gfxpayload=text
+  fi
 }

-set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait intremap=off amd_iommu_intr=legacy net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off intel_pstate=disable amd_pstate=disable nox2apic nomodeset"
+set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait intremap=off net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off nox2apic nomodeset intel_pstate=passive amd_pstate=passive"

 search --set=root --label "ARC3"
 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
  if [ "${default}" = "direct" ]; then
    set timeout="1"
-    menuentry 'DSM Direct Mode' ${menuentry_id_option} direct {
-      gfxmode
+    menuentry 'DSM Direct Mode' --id direct {
+      set_gfxpayload
      echo "Loading DSM Kernel..."
      linux /zImage-dsm ${dsm_cmdline}
      echo "Loading DSM Initramfs..."
@@ -101,8 +79,8 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
      echo "Access http://find.synology.com/ to connect the DSM via web."
    }
  fi
-  menuentry 'Arc DSM Mode' ${menuentry_id_option} boot {
-    gfxmode
+  menuentry 'Arc DSM Mode' --id boot {
+    set_gfxpayload
    echo "Loading Arc Kernel..."
    linux /bzImage-arc ${ARC_CMDLINE} ${arc_cmdline}
    echo "Loading Arc Initramfs..."
@@ -116,8 +94,8 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
 fi

 if [ -e /automated ]; then
-  menuentry 'Arc Automated Mode' ${menuentry_id_option} automated {
-    gfxmode
+  menuentry 'Arc Automated Mode' --id automated {
+    set_gfxpayload
    echo "Loading Arc Kernel..."
    linux /bzImage-arc ${ARC_CMDLINE} ${arc_cmdline} automated_arc
    echo "Loading Arc Initramfs..."
@@ -130,8 +108,8 @@ if [ -e /automated ]; then
  }
 fi

-menuentry 'Arc Config Mode' ${menuentry_id_option} config {
-  gfxmode
+menuentry 'Arc Config Mode' --id config {
+  set_gfxpayload
  echo "Loading Arc Kernel..."
  linux /bzImage-arc ${ARC_CMDLINE} ${arc_cmdline} force_arc
  echo "Loading Arc Initramfs..."
@@ -144,8 +122,8 @@ menuentry 'Arc Config Mode' ${menuentry_id_option} config {
 }

 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
-  menuentry 'Arc Update Mode' ${menuentry_id_option} update {
-    gfxmode
+  menuentry 'Arc Update Mode' --id update {
+    set_gfxpayload
    echo "Loading Arc Kernel..."
    linux /bzImage-arc ${ARC_CMDLINE} ${arc_cmdline} update_arc
    echo "Loading Arc Initramfs..."
@@ -156,8 +134,8 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
    fi
    echo "Booting..."
  }
-  menuentry 'DSM Recovery Mode' ${menuentry_id_option} recovery {
-    gfxmode
+  menuentry 'DSM Recovery Mode' --id recovery {
+    set_gfxpayload
    echo "Loading Arc Kernel..."
    linux /bzImage-arc ${ARC_CMDLINE} ${arc_cmdline} recovery
    echo "Loading Arc Initramfs..."
@@ -168,8 +146,8 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
    fi
    echo "Booting..."
  }
-  menuentry 'DSM Reinstall Mode' ${menuentry_id_option} junior {
-    gfxmode
+  menuentry 'DSM Reinstall Mode' --id junior {
+    set_gfxpayload
    echo "Loading Arc Kernel..."
    linux /bzImage-arc ${ARC_CMDLINE} ${arc_cmdline} force_junior
    echo "Loading Arc Initramfs..."
@@ -182,28 +160,23 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
  }
 fi

-menuentry 'Enter UEFI Setup' ${menuentry_id_option} uefi {
+menuentry 'Enter BIOS Setup' --id bios  {
  fwsetup
 }

-menuentry 'Start Memtest86+' ${menuentry_id_option} memtest {
+menuentry 'Start Memtest86+' --id memtest {
  echo "Loading memtest86+..."
  linux ${prefix}/memtest 
 }

-menuentry 'Poweroff' ${menuentry_id_option} poweroff {
-  echo "System is powering off..."
-  halt
-}
-
 if [ ${vesa_mode} = 1 ]; then
-  menuentry 'Change Vesa to Text Output' ${menuentry_id_option} videomode {
+  menuentry 'Change Vesa to Text Output' --id videomode {
    set vesa_mode=0
    save_env vesa_mode
    configfile ${prefix}/grub.cfg
  }
 else
-  menuentry 'Change Text to Vesa Output' ${menuentry_id_option} videomode {
+  menuentry 'Change Text to Vesa Output' --id videomode {
    set vesa_mode=1
    save_env vesa_mode
    reboot
--- a/img-gen-n.sh
+++ b/img-gen-n.sh
@@ -1,10 +1,4 @@
 #!/usr/bin/env bash
-#
-# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium>
-#
-# This is free software, licensed under the MIT License.
-# See /LICENSE for more information.
-#

 set -e

@@ -13,10 +7,6 @@ sudo git clean -fdx

 . scripts/func.sh "${AUX_TOKEN}"

-# Unmount Image File
-sudo umount "/tmp/p1" 2>/dev/null || true
-sudo umount "/tmp/p3" 2>/dev/null || true
-
 # Get extractor, LKM, addons and Modules
 echo "Get Dependencies"
 getAddons "files/p3/addons"
@@ -27,12 +17,8 @@ getCustom "files/p3/custom"
 getLKMs "files/p3/lkms"
 getTheme "files/p1/boot/grub"
 getOffline "files/p3/configs"
-case "${1}" in
-  min) getBuildroot "${1}" "br" ;;
-  ext) getBuildroot "${1}" "br" ;;
-  micro) getBuildroot "${1}" "br" ;;
-  *) echo "Invalid option specified" ;;
-esac
+mkdir -p "brx"
+[ ! -f "../brx/bzImage" ] && getBuildrootx "brx" || copyBuildroot "brx"

 # Sbase
 IMAGE_FILE="arc.img"
@@ -50,19 +36,20 @@ mkdir -p "/tmp/p3"
 sudo mount ${LOOPX}p1 "/tmp/p1"
 sudo mount ${LOOPX}p3 "/tmp/p3"

-ARC_BUILD="$(date +'%y%m%d')"
+ARC_BUILD="`date +'%y%m%d'`"
 ARC_VERSION="13.3.7"
-ARC_BRANCH="dev"
-
-for file in ARC_BUILD ARC_VERSION ARC_BRANCH; do
-  echo "${!file}" > "files/p1/${file}"
-done
+ARC_BRANCH="next"
+echo "${ARC_BUILD}" >files/p1/ARC-BUILD
+echo "${ARC_VERSION}" >files/p1/ARC-VERSION
+echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH

 echo "Repack initrd"
-if [ -f "br/bzImage-arc" ] && [ -f "br/initrd-arc" ]; then
-    cp -f "br/bzImage-arc" "files/p3/bzImage-arc"
-    repackInitrd "br/initrd-arc" "files/initrd" "files/p3/initrd-arc"
+if [ -f "brx/bzImage-arc" ] && [ -f "brx/initrd-arc" ]; then
+    cp -f "brx/bzImage-arc" "files/p3/bzImage-arc"
+    repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"
 else
+    sudo umount "/tmp/p1"
+    sudo umount "/tmp/p3"
    exit 1
 fi

@@ -74,8 +61,8 @@ sync
 echo "Unmount image file"
 sudo umount "/tmp/p1"
 sudo umount "/tmp/p3"
-sudo rm -rf "/tmp/p1"
-sudo rm -rf "/tmp/p3"
+rmdir "/tmp/p1"
+rmdir "/tmp/p3"

 sudo losetup --detach ${LOOPX}

--- a/img-gen-s.sh
+++ b/img-gen-s.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Clean cached Files
+sudo git clean -fdx
+
+. scripts/func.sh "${AUX_TOKEN}"
+
+# Get extractor, LKM, addons and Modules
+echo "Get Dependencies"
+getAddons "files/p3/addons"
+getModules "files/p3/modules"
+getConfigs "files/p3/configs"
+getPatches "files/p3/patches"
+getCustom "files/p3/custom"
+getLKMs "files/p3/lkms"
+getTheme "files/p1/boot/grub"
+getOffline "files/p3/configs"
+[ -f "../brs/bzImage" ] && copyBuildroot "brs" || getBuildroots "brs"
+
+# Sbase
+IMAGE_FILE="arc.img"
+gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
+fdisk -l "${IMAGE_FILE}"
+
+LOOPX=$(sudo losetup -f)
+sudo losetup -P "${LOOPX}" "${IMAGE_FILE}"
+
+echo "Mounting Image File"
+sudo rm -rf "/tmp/p1"
+sudo rm -rf "/tmp/p3"
+mkdir -p "/tmp/p1"
+mkdir -p "/tmp/p3"
+sudo mount ${LOOPX}p1 "/tmp/p1"
+sudo mount ${LOOPX}p3 "/tmp/p3"
+
+ARC_BUILD="`date +'%y%m%d'`"
+ARC_VERSION="13.3.7"
+ARC_BRANCH="stable"
+echo "${ARC_BUILD}" >files/p1/ARC-BUILD
+echo "${ARC_VERSION}" >files/p1/ARC-VERSION
+echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
+
+echo "Repack initrd"
+if [ -f "brs/bzImage-arc" ] && [ -f "brs/initrd-arc" ]; then
+    cp -f "brs/bzImage-arc" "files/p3/bzImage-arc"
+    repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"
+else
+    sudo umount "/tmp/p1"
+    sudo umount "/tmp/p3"
+    exit 1
+fi
+
+echo "Copying files"
+sudo cp -rf "files/p1/"* "/tmp/p1"
+sudo cp -rf "files/p3/"* "/tmp/p3"
+sync
+
+echo "Unmount image file"
+sudo umount "/tmp/p1"
+sudo umount "/tmp/p3"
+rmdir "/tmp/p1"
+rmdir "/tmp/p3"
+
+sudo losetup --detach ${LOOPX}
+
+qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
--- a/scripts/func.sh
+++ b/scripts/func.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium>
-#
+# Copyright (C) 2024 AuxXxilium <https://github.com/AuxXxilium>
+# 
 # This is free software, licensed under the MIT License.
 # See /LICENSE for more information.
 #
@@ -15,21 +15,19 @@ function getLKMs() {
  local DEST_PATH="${1}"
  local CACHE_FILE="/tmp/rp-lkms.zip"
  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-lkm/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s "https://api.github.com/repos/AuxXxilium/arc-lkm/releases/latest" | grep -oP '"tag_name": "\K(.*)(?=")')"
  export LKMTAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "rp-lkms.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-lkm/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip LKMs
-      rm -rf "${DEST_PATH}"
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"; then
-        rm -f "${CACHE_FILE}"
-        echo "Getting LKMs end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-lkm/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-lkm/releases/download/${TAG}/rp-lkms.zip" -o "${CACHE_FILE}"; then
+    # Unzip LKMs
+    rm -rf "${DEST_PATH}"
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    rm -f "${CACHE_FILE}"
+    echo "Getting LKMs end - ${TAG}"
+  else
+    echo "Failed to get LKMs"
+    exit 1
+  fi
 }

 # Get latest Addons
@@ -39,31 +37,28 @@ function getAddons() {
  local DEST_PATH="${1}"
  local CACHE_DIR="/tmp/addons"
  local CACHE_FILE="/tmp/addons.zip"
-  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-addons/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-addons/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export ADDONTAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "addons-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-addons/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip Addons
-      rm -rf "${CACHE_DIR}"
-      mkdir -p "${CACHE_DIR}"
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${CACHE_DIR}"; then
-        echo "Installing Addons to ${DEST_PATH}"
-        [ -f /tmp/addons/VERSION ] && cp -f /tmp/addons/VERSION ${DEST_PATH}/
-        for PKG in $(ls ${CACHE_DIR}/*.addon); do
-          ADDON=$(basename "${PKG}" .addon)
-          mkdir -p "${DEST_PATH}/${ADDON}"
-          echo "Extracting ${PKG} to ${DEST_PATH}/${ADDON}"
-          tar -xaf "${PKG}" -C "${DEST_PATH}/${ADDON}"
-        done
-        rm -f "${CACHE_FILE}"
-        echo "Getting Addons end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-addons/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-addons/releases/download/${TAG}/addons-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip Addons
+    rm -rf "${CACHE_DIR}"
+    mkdir -p "${CACHE_DIR}"
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${CACHE_DIR}"
+    echo "Installing Addons to ${DEST_PATH}"
+    [ -f /tmp/addons/VERSION ] && cp -f /tmp/addons/VERSION ${DEST_PATH}/
+    for PKG in $(ls ${CACHE_DIR}/*.addon); do
+      ADDON=$(basename "${PKG}" .addon)
+      mkdir -p "${DEST_PATH}/${ADDON}"
+      echo "Extracting ${PKG} to ${DEST_PATH}/${ADDON}"
+      tar -xaf "${PKG}" -C "${DEST_PATH}/${ADDON}"
+    done
+    rm -f "${CACHE_FILE}"
+    echo "Getting Addons end - ${TAG}"
+  else
+    echo "Failed to get Addons"
+    exit 1
+  fi
 }

 # Get latest Modules
@@ -73,21 +68,18 @@ function getModules() {
  local DEST_PATH="${1}"
  local CACHE_FILE="/tmp/modules.zip"
  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-modules/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-modules/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export MODULETAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "modules-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-modules/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip Modules
-      rm -rf "${DEST_PATH}"
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"; then
-        rm -f "${CACHE_FILE}"
-        echo "Getting Modules end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-modules/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-modules/releases/download/${TAG}/modules-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip Modules
+    rm -rf "${DEST_PATH}"
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    echo "Getting Modules end - ${TAG}"
+  else
+    echo "Failed to get Modules"
+    exit 1
+  fi
 }

 # Get latest Configs
@@ -97,21 +89,19 @@ function getConfigs() {
  local DEST_PATH="${1}"
  local CACHE_FILE="/tmp/configs.zip"
  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-configs/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-configs/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export CONFIGTAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "configs-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-configs/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip Configs
-      rm -rf "${DEST_PATH}"
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"; then
-        rm -f "${CACHE_FILE}"
-        echo "Getting Configs end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-configs/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-configs/releases/download/${TAG}/configs-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip Configs
+    rm -rf "${DEST_PATH}"
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    rm -f "${CACHE_FILE}"
+    echo "Getting Configs end - ${TAG}"
+  else
+    echo "Failed to get Configs"
+    exit 1
+  fi
 }

 # Get latest Patches
@@ -121,21 +111,19 @@ function getPatches() {
  local DEST_PATH="${1}"
  local CACHE_FILE="/tmp/patches.zip"
  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-patches/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-patches/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export PATCHTAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "patches-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-patches/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip Patches
-      rm -rf "${DEST_PATH}"
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"; then
-        rm -f "${CACHE_FILE}"
-        echo "Getting Patches end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-patches/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-patches/releases/download/${TAG}/patches-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip Patches
+    rm -rf "${DEST_PATH}"
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    rm -f "${CACHE_FILE}"
+    echo "Getting Patches end - ${TAG}"
+  else
+    echo "Failed to get Patches"
+    exit 1
+  fi
 }

 # Get latest Custom
@@ -145,21 +133,19 @@ function getCustom() {
  local DEST_PATH="${1}"
  local CACHE_FILE="/tmp/custom.zip"
  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-custom/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-custom/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export CUSTOMTAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "custom-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-custom/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip Custom
-      rm -rf "${DEST_PATH}"
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"; then
-        rm -f "${CACHE_FILE}"
-        echo "Getting Custom end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-custom/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-custom/releases/download/${TAG}/custom-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip Custom
+    rm -rf "${DEST_PATH}"
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    rm -f "${CACHE_FILE}"
+    echo "Getting Custom end - ${TAG}"
+  else
+    echo "Failed to get Custom"
+    exit 1
+  fi
 }

 # Get latest Theme
@@ -169,67 +155,64 @@ function getTheme() {
  local DEST_PATH="${1}"
  local CACHE_FILE="/tmp/theme.zip"
  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-theme/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-theme/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export THEMETAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "arc-theme-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-theme/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip Theme
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"; then
-        rm -f "${CACHE_FILE}"
-        echo "Getting Theme end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-theme/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-theme/releases/download/${TAG}/arc-theme-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip Theme
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    rm -f "${CACHE_FILE}"
+    echo "Getting Theme end - ${TAG}"
+  else
+    echo "Failed to get Theme"
+    exit 1
+  fi
 }

-# Get latest Buildroot
-# $1 type (min for S, ext for X, micro for M)
-# $2 path
-function getBuildroot() {
-  local TYPE="${1}"
-  local DEST_PATH="${2}"
-  local REPO=""
-  local ZIP_NAME=""
-  local TAG_VAR=""
+# Get latest Buildroot-X
+# $1 path
+function getBuildrootx() {
+  echo "Getting Buildroot-X begin"
+  local DEST_PATH="${1}"

-  case "${TYPE}" in
-    min)
-      REPO="arc-buildroot-s"
-      TAG_VAR="BRSTAG"
-      ;;
-    ext)
-      REPO="arc-buildroot-x"
-      TAG_VAR="BRXTAG"
-      ;;
-    micro)
-      REPO="arc-buildroot-m"
-      TAG_VAR="BRMTAG"
-      ;;
-    *)
-      echo "Invalid type specified"
-      return 1
-      ;;
-  esac
-
-  echo "Getting Buildroot-${TYPE} begin"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/${REPO}/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
-  export ${TAG_VAR}="${TAG}"
+  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-buildroot-x/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  export BRXTAG="${TAG}"
  [ ! -d "${DEST_PATH}" ] && mkdir -p "${DEST_PATH}"
  rm -f "${DEST_PATH}/bzImage-arc"
  rm -f "${DEST_PATH}/initrd-arc"
  while read -r ID NAME; do
    if [ "${NAME}" = "buildroot-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/${REPO}/releases/assets/${ID}" -o "${DEST_PATH}/br.zip"
-      echo "Buildroot-${TYPE}: ${TAG}"
-      unzip -o "${DEST_PATH}/br.zip" -d "${DEST_PATH}"
+      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-buildroot-x/releases/assets/${ID}" -o "${DEST_PATH}/brx.zip"
+      echo "Buildroot-X: ${TAG}"
+      unzip -o "${DEST_PATH}/brx.zip" -d "${DEST_PATH}"
      mv -f "${DEST_PATH}/bzImage" "${DEST_PATH}/bzImage-arc"
      mv -f "${DEST_PATH}/rootfs.cpio.zst" "${DEST_PATH}/initrd-arc"
      [ -f "${DEST_PATH}/bzImage-arc" ] && [ -f "${DEST_PATH}/initrd-arc" ] && break
    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/${REPO}/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  done <<<$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-buildroot-x/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+}
+
+# Get latest Buildroot-S
+# $1 path
+function getBuildroots() {
+  echo "Getting Buildroot-S begin"
+  local DEST_PATH="${1}"
+
+  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-buildroot-s/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  export BRSTAG="${TAG}"
+  [ ! -d "${DEST_PATH}" ] && mkdir -p "${DEST_PATH}"
+  rm -f "${DEST_PATH}/bzImage-arc"
+  rm -f "${DEST_PATH}/initrd-arc"
+  while read -r ID NAME; do
+    if [ "${NAME}" = "buildroot-${TAG}.zip" ]; then
+      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-buildroot-s/releases/assets/${ID}" -o "${DEST_PATH}/brs.zip"
+      echo "Buildroot-S: ${TAG}"
+      unzip -o "${DEST_PATH}/brs.zip" -d "${DEST_PATH}"
+      mv -f "${DEST_PATH}/bzImage" "${DEST_PATH}/bzImage-arc"
+      mv -f "${DEST_PATH}/rootfs.cpio.zst" "${DEST_PATH}/initrd-arc"
+      [ -f "${DEST_PATH}/bzImage-arc" ] && [ -f "${DEST_PATH}/initrd-arc" ] && break
+    fi
+  done <<<$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-buildroot-s/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
 }

 # Get latest Offline
@@ -295,46 +278,36 @@ function repackInitrd() {
  sudo rm -rf "${RDXZ_PATH}"
 }

-# resizeImg
+# resizeimg
 # $1 input file  
-# $2 change size MB e.g., +50M -50M
+# $2 changsize MB eg: +50M -50M
 # $3 output file
 function resizeImg() {
-  local INPUT_FILE="${1}"
-  local CHANGE_SIZE="${2}"
-  local OUTPUT_FILE="${3:-${INPUT_FILE}}"
+  INPUT_FILE="${1}"
+  CHANGE_SIZE="${2}"
+  OUTPUT_FILE="${3:-${INPUT_FILE}}"

-  [[ -z "${INPUT_FILE}" || ! -f "${INPUT_FILE}" ]] && { echo "Input file not specified or does not exist"; exit 1; }
-  [[ -z "${CHANGE_SIZE}" ]] && { echo "Change size not specified"; exit 1; }
+  [[ -z "${INPUT_FILE}" || ! -f "${INPUT_FILE}" ]] && exit 1
+  [ -z "${CHANGE_SIZE}" ] && exit 1

  INPUT_FILE="$(realpath "${INPUT_FILE}")"
  OUTPUT_FILE="$(realpath "${OUTPUT_FILE}")"

-  local CURRENT_SIZE
-  CURRENT_SIZE=$(du -m "${INPUT_FILE}" | awk '{print $1}')
-  local SIZE
-  SIZE=$((CURRENT_SIZE + ${CHANGE_SIZE//M/}))

-  [[ -z "${SIZE}" || "${SIZE}" -lt 0 ]] && { echo "Invalid size calculated"; exit 1; }
+  SIZE=$(($(du -m "${INPUT_FILE}" | awk '{print $1}')$(echo "${CHANGE_SIZE}" | sed 's/M//g; s/b//g')))
+  [[ -z "${SIZE}" || "${SIZE}" -lt 0 ]] && exit 1

-  if [[ "${INPUT_FILE}" != "${OUTPUT_FILE}" ]]; then
+  if [ ! "${INPUT_FILE}" = "${OUTPUT_FILE}" ]; then
    sudo cp -f "${INPUT_FILE}" "${OUTPUT_FILE}"
  fi

-  sudo truncate -s "${SIZE}M" "${OUTPUT_FILE}"
-
-  # Use `parted` to resize partition 3
-  sudo parted "${OUTPUT_FILE}" --script -- resizepart 3 "${SIZE}M"
-
-  local LOOPX
+  sudo truncate -s ${SIZE}M "${OUTPUT_FILE}"
+  echo -e "d\n\nn\n\n\n\n\nn\nw" | sudo fdisk "${OUTPUT_FILE}"
  LOOPX=$(sudo losetup -f)
-  sudo losetup -P "${LOOPX}" "${OUTPUT_FILE}"
-  local PARTITION
-  PARTITION=$(ls "${LOOPX}p3")
-  sudo e2fsck -fp "${PARTITION}"
-  sudo tune2fs -l "${PARTITION}" | grep "Block size"
-  sudo resize2fs "${PARTITION}"
-  sudo losetup -d "${LOOPX}"
+  sudo losetup -P ${LOOPX} "${OUTPUT_FILE}"
+  sudo e2fsck -fp $(ls ${LOOPX}* | sort -n | tail -1)
+  sudo resize2fs $(ls ${LOOPX}* | sort -n | tail -1)
+  sudo losetup -d ${LOOPX}
 }

 # createvmx
@@ -510,4 +483,4 @@ function copyBuildroot() {
  mkdir -p "${DEST_PATH}"
  cp -f "../${DEST_PATH}/bzImage" "${DEST_PATH}/bzImage-arc"
  cp -f "../${DEST_PATH}/rootfs.cpio.zst" "${DEST_PATH}/initrd-arc"
-}
+}
--- a/scripts/grub.sh
+++ b/scripts/grub.sh
@@ -29,7 +29,7 @@ done
 popd

 rm -f grub.img
-dd if=/dev/zero of=grub.img bs=1M seek=2048 count=0
+dd if=/dev/zero of=grub.img bs=1M seek=1024 count=0
 echo -e "n\np\n1\n\n+50M\nn\np\n2\n\n+50M\nn\np\n3\n\n\na\n1\nw\nq\n" | fdisk grub.img
 fdisk -l grub.img

@@ -71,4 +71,4 @@ sudo umount ${LOOPX}p1
 sudo losetup -d ${LOOPX}
 sudo rm -rf ${NAME}1

-gzip grub.img
+gzip grub.img
Author	SHA1	Message	Date
AuxXxilium	8f4cb31962	Merge pull request #5255 from AuxXxilium/dev Dev	2024-12-18 21:25:18 +01:00
AuxXxilium	80d3118e7d	Merge pull request #5231 from AuxXxilium/dev Dev	2024-12-11 22:21:20 +01:00
AuxXxilium	a4a3c1998b	Merge pull request #5133 from AuxXxilium/dev functions: rewrite text	2024-12-07 18:51:59 +01:00
AuxXxilium	8adb3026f7	Merge pull request #5128 from AuxXxilium/dev arc: fix port change	2024-12-07 15:25:13 +01:00
AuxXxilium	4902d10167	Merge pull request #5124 from AuxXxilium/dev Dev	2024-12-07 13:45:34 +01:00
AuxXxilium	fe3430df09	Merge pull request #5093 from AuxXxilium/dev Dev	2024-12-05 19:38:57 +01:00
AuxXxilium	a40b66063a	Merge pull request #5066 from AuxXxilium/dev Dev	2024-12-03 22:17:06 +01:00
AuxXxilium	04da524e3d	Merge pull request #5065 from AuxXxilium/dev Dev	2024-12-03 22:05:58 +01:00
AuxXxilium	135505bf22	Merge pull request #5046 from AuxXxilium/dev tree: fix more logic	2024-12-02 23:53:57 +01:00
AuxXxilium	85e636d0e6	Merge pull request #5045 from AuxXxilium/dev func: fix typo	2024-12-02 23:30:28 +01:00
AuxXxilium	a886046e64	Merge pull request #5044 from AuxXxilium/dev Dev	2024-12-02 23:12:32 +01:00
AuxXxilium	8d2b2acb62	Merge pull request #5029 from AuxXxilium/dev arc: update model table	2024-12-01 20:46:09 +01:00
AuxXxilium	0acb2020c8	Merge pull request #5028 from AuxXxilium/dev tree: rewrite more	2024-12-01 19:19:29 +01:00
AuxXxilium	fb44e027b3	Merge pull request #5027 from AuxXxilium/dev Dev	2024-12-01 18:12:30 +01:00
AuxXxilium	a3f6d44b52	Merge pull request #5024 from AuxXxilium/dev Dev	2024-12-01 16:44:44 +01:00
AuxXxilium	4418bfa3f9	Merge pull request #5005 from AuxXxilium/dev tree: fix automated	2024-11-30 23:27:14 +01:00
AuxXxilium	9a50bf50ea	Merge pull request #5003 from AuxXxilium/dev Dev	2024-11-30 22:16:48 +01:00
AuxXxilium	0cf78e4fbf	Merge pull request #5000 from AuxXxilium/dev Dev	2024-11-30 20:18:33 +01:00
				`@@ -0,0 +1 @@`
				`###############################################################################`