navidrome: restore data folder ownership on install and update

Upstream's deb postinstall runs chown navidrome:navidrome on /var/lib/navidrome/cache without -R, and only behind an .installed flag, so it never runs again on an upgrade. Every navidrome command the packaging invokes as root creates cache content owned by root, which the service then cannot write as the navidrome user - artwork that was already cached keeps working while newly resolved album and playlist covers fail. Reassert ownership of the data folder after deploying the release. The music folder is left alone, it is commonly a bind mount.
2026-09-16 17:54:01 +00:00 · 2026-09-14 16:03:47 +02:00
24 changed files with 1170 additions and 598 deletions
--- a/.github/autolabeler-config.json
+++ b/.github/autolabeler-config.json
@@ -8,12 +8,7 @@
        "turnkey/**",
        "vm/**"
      ],
-      "excludeGlobs": [
-        "**/headers/**",
-        "ct/headers/**",
-        "tools/headers/**",
-        "vm/headers/**"
-      ]
+      "excludeGlobs": []
    }
  ],
  "update script": [
@@ -46,12 +41,7 @@
      "includeGlobs": [
        "vm/**"
      ],
-      "excludeGlobs": [
-        "**/headers/**",
-        "ct/headers/**",
-        "tools/headers/**",
-        "vm/headers/**"
-      ]
+      "excludeGlobs": []
    }
  ],
  "tools": [
--- a/.github/workflows/close-new-script-prs.yml
+++ b/.github/workflows/close-new-script-prs.yml
@@ -28,7 +28,6 @@ jobs:
            const allowedBots = [
              "push-app-to-main[bot]",
              "push-app-to-main",
-              "community-scripts-pr-app[bot]",
              "community-scripts-pr-app"
            ];

@@ -63,9 +62,7 @@ jobs:
                per_page: 100,
              });
              hasAddedScriptFile = files.some(
-                f => f.status === "added" &&
-                     !f.filename.includes("/headers/") &&
-                     scriptPrefixes.some(p => f.filename.startsWith(p))
+                f => f.status === "added" && scriptPrefixes.some(p => f.filename.startsWith(p))
              );
            } catch (error) {
              core.warning(`Could not list files for PR #${prNumber}: ${error.message}`);
--- a/.github/workflows/pocketbase-bot.yml
+++ b/.github/workflows/pocketbase-bot.yml
@@ -26,7 +26,6 @@ jobs:
          COMMENT_BODY: ${{ github.event.comment.body }}
          COMMENT_ID: ${{ github.event.comment.id }}
          ISSUE_NUMBER: ${{ github.event.issue.number }}
-          IS_PR_COMMENT: ${{ github.event.issue.pull_request && 'true' || 'false' }}
          REPO_OWNER: ${{ github.repository_owner }}
          REPO_NAME: ${{ github.event.repository.name }}
          ACTOR: ${{ github.event.comment.user.login }}
@@ -85,7 +84,6 @@ jobs:
            const owner = process.env.REPO_OWNER;
            const repo = process.env.REPO_NAME;
            const issueNumber = parseInt(process.env.ISSUE_NUMBER, 10);
-            const isPrComment = process.env.IS_PR_COMMENT === 'true';
            const commentId = parseInt(process.env.COMMENT_ID, 10);
            const actor = process.env.ACTOR;

@@ -218,22 +216,11 @@ jobs:

              const prTitle = 'chore(ct): sync ' + slugValue + ' defaults with PocketBase';
              const prBody =
-                '## ✍️ Description\n\n' +
-                'Sync of the default CT variables for `' + slugValue + '` after a `/pocketbase` update by @' + actor + '.\n\n' +
-                'Updated: `' + updateResult.updatedVars.join('`, `') + '`\n\n' +
-                '## 🔗 Related Issue\n\n' +
-                (isPrComment ? 'Triggered from #' : 'Fixes #') + issueNumber + '\n\n' +
-                '## ✅ Prerequisites (**X** in brackets)\n\n' +
-                '- [x] **Self-review completed** – Code follows project standards.\n' +
-                '- [ ] **Tested thoroughly** – Changes work as expected.\n' +
-                '- [x] **No security risks** – No hardcoded secrets, unnecessary privilege escalations, or permission issues.\n\n' +
-                '**Tested on:** not tested — generated from the PocketBase record, only `var_` defaults changed.\n\n' +
-                '---\n\n' +
-                '## 🤖 AI Assistance (**X** in brackets)\n\n' +
-                '- [x] **No AI used** – Scripts were written without AI assistance.\n\n' +
-                '---\n\n' +
-                '## 🛠️ Type of Change (**X** in brackets)\n\n' +
-                '- [x] 🐞 **Bug fix** – Resolves an issue without breaking functionality.\n';
+                '## Summary\n' +
+                '- Sync default CT variables for `' + slugValue + '` after `/pocketbase` update.\n' +
+                '- Updated vars: `' + updateResult.updatedVars.join('`, `') + '`.\n\n' +
+                '## Source\n' +
+                '- Triggered by @' + actor + ' via PocketBase bot.\n';
              const createPrRes = await ghRequest('/repos/' + owner + '/' + repo + '/pulls', 'POST', {
                title: prTitle,
                body: prBody,
@@ -348,10 +335,7 @@ jobs:
              '`architectures` (amd64,arm64) `platforms` (pve,incus) ' +
              '`execute_in` (pve,lxc,pbs,vm,pmg,pdm) `categories` (names or ids) ' +
              '`type` (ct, vm, addon, …) ' +
-              '`is_disabled` `disable_message` `is_deleted` `deleted_message` ' +
-              '`pin_reason` `last_update_commit`\n\n' +
-              'The `var_` names from the ct scripts work too: `var_cpu` `var_ram` `var_disk`\n' +
-              '`var_os` `var_version` `var_port` `var_tags` `var_unprivileged`\n\n' +
+              '`is_disabled` `disable_message` `is_deleted` `deleted_message`\n\n' +
              '**Screenshots:**\n' +
              '```\n' +
              '/pocketbase <slug> screenshot https://example.com/one.png https://example.com/two.png\n' +
@@ -415,14 +399,6 @@ jobs:

            // ── Shared helpers ─────────────────────────────────────────────────

-            // The ct scripts name these var_cpu/var_ram/var_disk, and that is what
-            // people type. Accept them for the PocketBase keys.
-            const KEY_ALIASES = {
-              var_cpu: 'cpu', var_ram: 'ram', var_disk: 'hdd', var_hdd: 'hdd',
-              var_os: 'os', var_version: 'version', var_unprivileged: 'unprivileged',
-              var_port: 'port', var_tags: 'tags', disk: 'hdd', memory: 'ram',
-            };
-
            // Key=value parser: handles unquoted and "quoted" values
            function parseKVPairs(str) {
              const fields = {};
@@ -450,7 +426,7 @@ jobs:
                  while (pos < str.length && !/\s/.test(str[pos])) pos++;
                  value = str.substring(valStart, pos);
                }
-                fields[KEY_ALIASES[key.toLowerCase()] || key] = value;
+                fields[key] = value;
              }
              return fields;
            }
@@ -1006,8 +982,6 @@ jobs:
                disable_message:  'string',
                is_deleted:       'boolean',
                deleted_message:  'string',
-                pin_reason:       'string',
-                last_update_commit: 'string',
              };

              const parsedFields = parseKVPairs(rest);
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -543,55 +543,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit

 </details>

-## 2026-09-16
-
-### 🚀 Updated Scripts
-
-  - #### 🐞 Bug Fixes
-
-    - navidrome: repair root-owned data folders left by 0.61.x [@MickLesk](https://github.com/MickLesk) ([#17275](https://github.com/community-scripts/ProxmoxVE/pull/17275))
-    - tor-snowflake: read the Go version from the module root [@MickLesk](https://github.com/MickLesk) ([#17276](https://github.com/community-scripts/ProxmoxVE/pull/17276))
-    - docmost: stop corepack asking for confirmation during the build [@MickLesk](https://github.com/MickLesk) ([#17282](https://github.com/community-scripts/ProxmoxVE/pull/17282))
-
-  - #### ✨ New Features
-
-    - Frigate: Bump to 0.18.0 [@MickLesk](https://github.com/MickLesk) ([#17273](https://github.com/community-scripts/ProxmoxVE/pull/17273))
-    - Refactor: HomeAssistant-OS (core / improve functions / performance) [@MickLesk](https://github.com/MickLesk) ([#17281](https://github.com/community-scripts/ProxmoxVE/pull/17281))
-
-  - #### 🔧 Refactor
-
-    - Refactor: TrueNAS VM (core / improve functions / performance) [@MickLesk](https://github.com/MickLesk) ([#17277](https://github.com/community-scripts/ProxmoxVE/pull/17277))
-
-### 💾 Core
-
-  - Read the IGC version compute-runtime pins, instead of taking the newest [@MickLesk](https://github.com/MickLesk) ([core#43](https://github.com/community-scripts/core/pull/43))
- Install the Intel driver dependency before the .deb that needs it [@MickLesk](https://github.com/MickLesk) ([core#42](https://github.com/community-scripts/core/pull/42))
-
-## 2026-09-15
-
-### 🆕 New Scripts
-
-  - valhalla ([#17231](https://github.com/community-scripts/ProxmoxVE/pull/17231))
-
-### 🚀 Updated Scripts
-
-  - #### 🐞 Bug Fixes
-
-    - borg-ui: missing dependency `sshpass` [@christian-forgacs](https://github.com/christian-forgacs) ([#17286](https://github.com/community-scripts/ProxmoxVE/pull/17286))
-    - tracearr: copy packages/emails into the deploy tree [@connorgallopo](https://github.com/connorgallopo) ([#17268](https://github.com/community-scripts/ProxmoxVE/pull/17268))
-    - Immich: Pin to v3.2.1 [@vhsdream](https://github.com/vhsdream) ([#17264](https://github.com/community-scripts/ProxmoxVE/pull/17264))
-
-### 💾 Core
-
-  - Add vm_extract_image, which two VM scripts already call [@MickLesk](https://github.com/MickLesk) ([core#40](https://github.com/community-scripts/core/pull/40))
- Releases: rank releases on their numbers, not on sort -V over the raw tag [@MickLesk](https://github.com/MickLesk) ([core#39](https://github.com/community-scripts/core/pull/39))
-
-### 🧰 Tools
-
-  - #### 🔧 Refactor
-
-    - Refactor: monitor-all (decide on flag values, not on key presence) [@MickLesk](https://github.com/MickLesk) ([#17261](https://github.com/community-scripts/ProxmoxVE/pull/17261))
-
 ## 2026-09-14

 ### 🆕 New Scripts
--- a/ct/docmost.sh
+++ b/ct/docmost.sh
@@ -57,7 +57,6 @@ function update_script() {

    msg_info "Configuring Docmost"
    cd /opt/docmost
-    export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
    $STD pnpm install --force
    $STD pnpm build
    msg_ok "Configured Docmost"
--- a/ct/frigate.sh
+++ b/ct/frigate.sh
@@ -10,8 +10,8 @@ source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_
 APP="Frigate"
 var_tags="${var_tags:-nvr}"
 var_cpu="${var_cpu:-8}"
-var_ram="${var_ram:-6144}"
-var_disk="${var_disk:-25}"
+var_ram="${var_ram:-4096}"
+var_disk="${var_disk:-20}"
 var_os="${var_os:-debian}"
 var_version="${var_version:-12}"
 var_arm64="${var_arm64:-no}"
--- a/ct/headers/valhalla
+++ b/ct/headers/valhalla
@@ -1,6 +0,0 @@
- _    __      ____          ____     
-| |  / /___ _/ / /_  ____ _/ / /___ _
-| | / / __ `/ / __ \/ __ `/ / / __ `/
-| |/ / /_/ / / / / / /_/ / / / /_/ / 
-|___/\__,_/_/_/ /_/\__,_/_/_/\__,_/  
-                                     
--- a/ct/immich.sh
+++ b/ct/immich.sh
@@ -112,7 +112,7 @@ EOF
    msg_ok "Image-processing libraries up to date"
  fi

-  RELEASE="v3.2.1"
+  RELEASE="v3.2.0"
  if check_for_gh_release "Immich" "immich-app/immich" "${RELEASE}" "each release is tested individually before the version is updated. Please do not open issues for this"; then
    if [[ $(cat ~/.immich) > "2.5.1" ]]; then
      msg_info "Enabling Maintenance Mode"
--- a/ct/navidrome.sh
+++ b/ct/navidrome.sh
@@ -38,8 +38,14 @@ function update_script() {

    fetch_and_deploy_gh_release "navidrome" "navidrome/navidrome" "binary"

-    find /var/lib/navidrome/cache /var/lib/navidrome/artwork /var/lib/navidrome/plugins \
-      -maxdepth 0 -type d -user root -exec chown -h navidrome:navidrome {} + 2>/dev/null || true
+    # The upstream postinstall only chowns the cache directory itself, and only
+    # on the very first install, so root-owned subdirectories survive upgrades
+    # and the service can no longer write its artwork there.
+    if id -u navidrome >/dev/null 2>&1; then
+      msg_info "Fixing Data Folder Ownership"
+      chown -R navidrome:navidrome /var/lib/navidrome
+      msg_ok "Fixed Data Folder Ownership"
+    fi

    msg_info "Starting Services"
    systemctl start navidrome
--- a/ct/tor-snowflake.sh
+++ b/ct/tor-snowflake.sh
@@ -44,8 +44,7 @@ function update_script() {
    msg_ok "Stopped Service"

    CLEAN_INSTALL=1 GITLAB_URL="https://gitlab.torproject.org" fetch_and_deploy_gl_release "tor-snowflake" "tpo/anti-censorship/pluggable-transports/snowflake" "tarball"
-    GO_VERSION="$(awk '/^go /{print $2; exit}' /opt/tor-snowflake/go.mod 2>/dev/null || true)"
-    GO_VERSION="${GO_VERSION:-latest}" setup_go
+    GO_VERSION="$(grep -m1 '^go ' /opt/tor-snowflake/proxy/go.mod | awk '{print $2}')" setup_go

    msg_info "Building Snowflake"
    cd /opt/tor-snowflake/proxy
--- a/ct/tracearr.sh
+++ b/ct/tracearr.sh
@@ -124,7 +124,7 @@ EOF
    $STD pnpm turbo telemetry disable
    $STD pnpm turbo run build --no-daemon --filter=@tracearr/shared --filter=@tracearr/server --filter=@tracearr/web
    rm -rf /opt/tracearr
-    mkdir -p /opt/tracearr/{packages/shared,packages/emails,apps/server,apps/web,apps/server/src/db}
+    mkdir -p /opt/tracearr/{packages/shared,apps/server,apps/web,apps/server/src/db}
    cp -rf package.json /opt/tracearr/
    cp -rf pnpm-workspace.yaml /opt/tracearr/
    cp -rf pnpm-lock.yaml /opt/tracearr/
@@ -134,8 +134,6 @@ EOF
    cp -rf apps/web/dist /opt/tracearr/apps/web/dist
    cp -rf packages/shared/package.json /opt/tracearr/packages/shared/
    cp -rf packages/shared/dist /opt/tracearr/packages/shared/dist
-    cp -rf packages/emails/package.json /opt/tracearr/packages/emails/
-    cp -rf packages/emails/dist /opt/tracearr/packages/emails/dist
    cp -rf apps/server/src/db/migrations /opt/tracearr/apps/server/src/db/migrations
    cp -rf data /opt/tracearr/data
    mkdir -p /opt/tracearr/data/image-cache
--- a/ct/valhalla.sh
+++ b/ct/valhalla.sh
@@ -1,104 +0,0 @@
-#!/usr/bin/env bash
-_CS_DEFAULT_URL="https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main"
-_cs_boot="${COMMUNITY_SCRIPTS_CORE_DIR:-$(dirname "${BASH_SOURCE[0]}")/../../core}/core/build.func"
-source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/build.func")
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: CrazyWolf13
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/valhalla/valhalla
-
-APP="Valhalla"
-var_tags="${var_tags:-mapping;routing}"
-var_cpu="${var_cpu:-6}"
-var_ram="${var_ram:-6144}"
-var_disk="${var_disk:-24}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-13}"
-var_arm64="${var_arm64:-yes}"
-var_unprivileged="${var_unprivileged:-1}"
-
-header_info "$APP"
-variables
-color
-catch_errors
-
-function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-
-  if [[ ! -f /etc/systemd/system/valhalla.service ]]; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-
-  if check_for_gh_release "prime_server" "kevinkreiser/prime_server"; then
-    RELEASE="$CHECK_UPDATE_RELEASE"
-
-    msg_info "Stopping Service"
-    systemctl stop valhalla
-    msg_ok "Stopped Service"
-
-    msg_info "Building prime_server ${RELEASE} (Patience)"
-    rm -rf /tmp/prime_server
-    $STD git clone --recurse-submodules --depth 1 --branch "$RELEASE" https://github.com/kevinkreiser/prime_server /tmp/prime_server
-    cd /tmp/prime_server
-    $STD ./autogen.sh
-    $STD ./configure
-    $STD make -j"$(nproc)"
-    $STD make install
-    cd /
-    rm -rf /tmp/prime_server
-    ldconfig
-    echo "${RELEASE#v}" >"$HOME/.prime_server"
-    msg_ok "Built prime_server ${RELEASE}"
-
-    msg_info "Starting Service"
-    systemctl start valhalla
-    msg_ok "Started Service"
-  fi
-
-  if check_for_gh_release "valhalla" "valhalla/valhalla"; then
-    RELEASE="$CHECK_UPDATE_RELEASE"
-
-    msg_info "Stopping Service"
-    systemctl stop valhalla
-    msg_ok "Stopped Service"
-
-    msg_info "Fetching Valhalla ${RELEASE} (Patience)"
-    rm -rf /opt/valhalla
-    $STD git clone --recurse-submodules --depth 1 --branch "$RELEASE" https://github.com/valhalla/valhalla.git /opt/valhalla
-    msg_ok "Fetched Valhalla ${RELEASE}"
-
-    msg_info "Compiling Valhalla ${RELEASE} (this takes 20-45+ minutes, be patient)"
-    MEM_MB=$(awk '/MemTotal/{print int($2/1024)}' /proc/meminfo)
-    BUILD_JOBS=$((MEM_MB / 2000))
-    [[ $BUILD_JOBS -lt 1 ]] && BUILD_JOBS=1
-    [[ $BUILD_JOBS -gt $(nproc) ]] && BUILD_JOBS=$(nproc)
-    cd /opt/valhalla
-    $STD cmake -B build -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON_BINDINGS=OFF -DENABLE_TESTS=OFF -DENABLE_SINGLE_FILES_WERROR=OFF
-    $STD cmake --build build -- -j"$BUILD_JOBS"
-    $STD cmake --install build
-    ldconfig
-    echo "${RELEASE#v}" >"$HOME/.valhalla"
-    msg_ok "Compiled Valhalla ${RELEASE}"
-
-    msg_info "Starting Service"
-    systemctl start valhalla
-    msg_ok "Started Service"
-  fi
-
-  msg_ok "Updated Successfully!\n"
-  exit
-}
-
-start
-build_container
-description
-
-msg_ok "Completed Successfully!\n"
-echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
-echo -e "${INFO}${YW}Access it using the following URL:${CL}"
-echo -e "${GATEWAY}${BGN}http://${IP}:8002/status${CL}"
-echo -e "${INFO}${YW}No routing tiles are built yet. Build them for your region with:${CL}"
-echo -e "${TAB}${BGN}/opt/valhalla_data/build-tiles.sh https://download.geofabrik.de/<continent>/<region>-latest.osm.pbf${CL}"
--- a/install/borg-ui-install.sh
+++ b/install/borg-ui-install.sh
@@ -28,8 +28,7 @@ $STD apt install -y \
  fuse3 \
  rsync \
  sshfs \
-  openssh-client \
-  sshpass
+  openssh-client
 msg_ok "Installed Dependencies"

 UV_PYTHON="3.12" setup_uv
--- a/install/docmost-install.sh
+++ b/install/docmost-install.sh
@@ -48,7 +48,6 @@ sed -i -e "s|APP_SECRET=.*|APP_SECRET=$(openssl rand -base64 32 | tr -dc 'a-zA-Z
  -e "s|^STORAGE_DRIVER=azure|#STORAGE_DRIVER=azure|" \
  /opt/docmost/.env
 export NODE_OPTIONS="--max-old-space-size=2048"
-export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
 $STD pnpm install
 $STD pnpm build
 msg_ok "Configured Docmost"
--- a/install/frigate-install.sh
+++ b/install/frigate-install.sh
@@ -110,7 +110,7 @@ export AUTOGRAPH_VERBOSITY=0
 export GLOG_minloglevel=3
 export GLOG_logtostderr=0

-fetch_and_deploy_gh_release "frigate" "blakeblackshear/frigate" "tarball" "v0.18.0" "/opt/frigate"
+fetch_and_deploy_gh_release "frigate" "blakeblackshear/frigate" "tarball" "v0.17.2" "/opt/frigate"

 msg_info "Building Nginx"
 $STD bash /opt/frigate/docker/main/build_nginx.sh
@@ -122,18 +122,7 @@ msg_info "Building SQLite Extensions"
 $STD bash /opt/frigate/docker/main/build_sqlite_vec.sh
 msg_ok "Built SQLite Extensions"

-if [[ "$(arch_resolve)" == "amd64" ]]; then
-  msg_info "Building Intel Media Driver (Patience)"
-  $STD bash /opt/frigate/docker/main/build_intel_media_driver.sh
-  cp -a /rootfs/. /
-  rm -rf /rootfs
-  rm -f /etc/apt/sources.list.d/intel-gpu-jammy.list /usr/share/keyrings/intel-graphics.gpg
-  $STD apt update
-  ldconfig
-  msg_ok "Built Intel Media Driver"
-fi
-
-fetch_and_deploy_gh_release "go2rtc" "AlexxIT/go2rtc" "singlefile" "v1.9.14" "/usr/local/go2rtc/bin" "go2rtc_linux_$(arch_resolve)"
+fetch_and_deploy_gh_release "go2rtc" "AlexxIT/go2rtc" "singlefile" "latest" "/usr/local/go2rtc/bin" "go2rtc_linux_$(arch_resolve)"

 msg_info "Installing Tempio"
 sed -i 's|/rootfs/usr/local|/usr/local|g' /opt/frigate/docker/main/install_tempio.sh
@@ -205,7 +194,17 @@ if python3 /opt/frigate/docker/main/build_ov_model.py &>/dev/null; then
  mkdir -p /openvino-model
  cp /models/ssdlite_mobilenet_v2.xml /openvino-model/
  cp /models/ssdlite_mobilenet_v2.bin /openvino-model/
-  curl_with_retry "https://raw.githubusercontent.com/openvinotoolkit/open_model_zoo/master/data/dataset_classes/coco_91cl_bkgr.txt" "/openvino-model/coco_91cl_bkgr.txt"
+  OV_LABELS=$(python3 -c "import omz_tools; import os; print(os.path.join(omz_tools.__path__[0], 'data/dataset_classes/coco_91cl_bkgr.txt'))" 2>/dev/null)
+  if [[ -n "$OV_LABELS" && -f "$OV_LABELS" ]]; then
+    ln -sf "$OV_LABELS" /openvino-model/coco_91cl_bkgr.txt
+  else
+    OV_LABELS=$(find /usr/local/lib -name "coco_91cl_bkgr.txt" 2>/dev/null | head -1)
+    if [[ -n "$OV_LABELS" ]]; then
+      ln -sf "$OV_LABELS" /openvino-model/coco_91cl_bkgr.txt
+    else
+      curl_with_retry "https://raw.githubusercontent.com/openvinotoolkit/open_model_zoo/master/data/dataset_classes/coco_91cl_bkgr.txt" "/openvino-model/coco_91cl_bkgr.txt"
+    fi
+  fi
  sed -i 's/truck/car/g' /openvino-model/coco_91cl_bkgr.txt
  msg_ok "Built OpenVino Model"
 else
@@ -252,8 +251,8 @@ curl_download "/media/frigate/person-bicycle-car-detection.mp4" "https://github.
 echo "tmpfs   /tmp/cache      tmpfs   defaults        0       0" >>/etc/fstab

 cat <<EOF >/etc/frigate.env
-DEFAULT_FFMPEG_VERSION="8.0"
-INCLUDED_FFMPEG_VERSIONS="8.0:7.0:5.0"
+DEFAULT_FFMPEG_VERSION="7.0"
+INCLUDED_FFMPEG_VERSIONS="7.0:5.0"
 NVIDIA_VISIBLE_DEVICES=all
 NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 TOKENIZERS_PARALLELISM=true
@@ -269,23 +268,6 @@ GLOG_minloglevel=3
 GLOG_logtostderr=0
 EOF

-if grep -q -o -m1 -E 'avx[^ ]*|sse4_2' /proc/cpuinfo && [[ -f /openvino-model/ssdlite_mobilenet_v2.xml ]] && [[ -f /openvino-model/coco_91cl_bkgr.txt ]]; then
-  DETECTOR_CONFIG="detectors:
-  detector01:
-    type: openvino
-    device: AUTO
-model:
-  width: 300
-  height: 300
-  input_tensor: nhwc
-  input_pixel_format: bgr
-  path: /openvino-model/ssdlite_mobilenet_v2.xml
-  labelmap_path: /openvino-model/coco_91cl_bkgr.txt"
-else
-  DETECTOR_CONFIG="model:
-  path: /models/cpu_model.tflite"
-fi
-
 cat <<EOF >/config/config.yml
 mqtt:
  enabled: false
@@ -305,10 +287,32 @@ auth:
  enabled: false
 detect:
  enabled: false
+EOF
+
+if grep -q -o -m1 -E 'avx[^ ]*|sse4_2' /proc/cpuinfo && [[ -f /openvino-model/ssdlite_mobilenet_v2.xml ]] && [[ -f /openvino-model/coco_91cl_bkgr.txt ]]; then
+  cat <<EOF >/config/config.yml
 ffmpeg:
  hwaccel_args: auto
-${DETECTOR_CONFIG}
+detectors:
+  detector01:
+    type: openvino
+    device: AUTO
+model:
+  width: 300
+  height: 300
+  input_tensor: nhwc
+  input_pixel_format: bgr
+  path: /openvino-model/ssdlite_mobilenet_v2.xml
+  labelmap_path: /openvino-model/coco_91cl_bkgr.txt
 EOF
+else
+  cat <<EOF >/config/config.yml
+ffmpeg:
+  hwaccel_args: auto
+model:
+  path: /models/cpu_model.tflite
+EOF
+fi
 msg_ok "Configured Frigate"

 msg_info "Creating Services"
--- a/install/immich-install.sh
+++ b/install/immich-install.sh
@@ -353,7 +353,7 @@ ML_DIR="${APP_DIR}/machine-learning"
 GEO_DIR="${INSTALL_DIR}/geodata"
 mkdir -p {"${APP_DIR}","${UPLOAD_DIR}","${GEO_DIR}","${INSTALL_DIR}"/cache}

-fetch_and_deploy_gh_release "Immich" "immich-app/immich" "tarball" "v3.2.1" "$SRC_DIR"
+fetch_and_deploy_gh_release "Immich" "immich-app/immich" "tarball" "v3.2.0" "$SRC_DIR"
 PNPM_VERSION="$(jq -r '.packageManager | split("@")[1] | split("+")[0]' ${SRC_DIR}/package.json)"
 export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
 NODE_VERSION="24" NODE_MODULE="corepack" setup_nodejs
--- a/install/navidrome-install.sh
+++ b/install/navidrome-install.sh
@@ -19,6 +19,10 @@ msg_ok "Installed Dependencies"

 fetch_and_deploy_gh_release "navidrome" "navidrome/navidrome" "binary"

+if id -u navidrome >/dev/null 2>&1; then
+  chown -R navidrome:navidrome /var/lib/navidrome
+fi
+
 msg_info "Starting Navidrome"
 systemctl enable -q --now navidrome
 msg_ok "Started Navidrome"
--- a/install/tor-snowflake-install.sh
+++ b/install/tor-snowflake-install.sh
@@ -16,8 +16,7 @@ update_os

 msg_info "Building Snowflake"
 GITLAB_URL="https://gitlab.torproject.org" fetch_and_deploy_gl_release "tor-snowflake" "tpo/anti-censorship/pluggable-transports/snowflake" "tarball"
-GO_VERSION="$(awk '/^go /{print $2; exit}' /opt/tor-snowflake/go.mod 2>/dev/null || true)"
-GO_VERSION="${GO_VERSION:-latest}" setup_go
+GO_VERSION="$(grep -m1 '^go ' /opt/tor-snowflake/proxy/go.mod | awk '{print $2}')" setup_go
 cd /opt/tor-snowflake/proxy
 $STD go build -o snowflake-proxy .
 msg_ok "Built Snowflake Proxy"
--- a/install/tracearr-install.sh
+++ b/install/tracearr-install.sh
@@ -67,7 +67,7 @@ cd /opt/tracearr.build
 $STD pnpm install --frozen-lockfile --force
 $STD pnpm turbo telemetry disable
 $STD pnpm turbo run build --no-daemon --filter=@tracearr/shared --filter=@tracearr/server --filter=@tracearr/web
-mkdir -p /opt/tracearr/{packages/shared,packages/emails,apps/server,apps/web,apps/server/src/db}
+mkdir -p /opt/tracearr/{packages/shared,apps/server,apps/web,apps/server/src/db}
 cp -rf package.json /opt/tracearr/
 cp -rf pnpm-workspace.yaml /opt/tracearr/
 cp -rf pnpm-lock.yaml /opt/tracearr/
@@ -77,8 +77,6 @@ cp -rf apps/server/scripts /opt/tracearr/apps/server/scripts
 cp -rf apps/web/dist /opt/tracearr/apps/web/dist
 cp -rf packages/shared/package.json /opt/tracearr/packages/shared/
 cp -rf packages/shared/dist /opt/tracearr/packages/shared/dist
-cp -rf packages/emails/package.json /opt/tracearr/packages/emails/
-cp -rf packages/emails/dist /opt/tracearr/packages/emails/dist
 cp -rf apps/server/src/db/migrations /opt/tracearr/apps/server/src/db/migrations
 cp -rf data /opt/tracearr/data
 mkdir -p /opt/tracearr/data/image-cache
--- a/install/valhalla-install.sh
+++ b/install/valhalla-install.sh
@@ -1,187 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: CrazyWolf13
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/valhalla/valhalla
-
-source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
-color
-verb_ip6
-catch_errors
-setting_up_container
-network_check
-update_os
-
-msg_info "Installing Dependencies"
-$STD apt install -y \
-  autoconf \
-  automake \
-  ccache \
-  clang \
-  clang-tidy \
-  coreutils \
-  cmake \
-  g++ \
-  gcc \
-  git \
-  jq \
-  lcov \
-  libboost-all-dev \
-  libcurl4-openssl-dev \
-  libczmq-dev \
-  libgdal-dev \
-  libgeos++-dev \
-  libgeos-dev \
-  libluajit-5.1-dev \
-  liblz4-dev \
-  libprotobuf-dev \
-  libspatialite-dev \
-  libsqlite3-dev \
-  libsqlite3-mod-spatialite \
-  libtool \
-  libzmq3-dev \
-  lld \
-  locales \
-  luajit \
-  make \
-  osmium-tool \
-  parallel \
-  pkgconf \
-  protobuf-compiler \
-  python3-all-dev \
-  python3-shapely \
-  python3-requests \
-  python3-pip \
-  spatialite-bin \
-  unzip \
-  zlib1g-dev
-msg_ok "Installed Dependencies"
-
-PRIME_SERVER_RELEASE=$(get_latest_github_release "kevinkreiser/prime_server" "false")
-msg_info "Building prime_server ${PRIME_SERVER_RELEASE} (Patience)"
-$STD git clone --recurse-submodules --depth 1 --branch "$PRIME_SERVER_RELEASE" https://github.com/kevinkreiser/prime_server /tmp/prime_server
-cd /tmp/prime_server
-$STD ./autogen.sh
-$STD ./configure
-$STD make -j"$(nproc)"
-$STD make install
-cd /
-rm -rf /tmp/prime_server
-echo "${PRIME_SERVER_RELEASE#v}" >"$HOME/.prime_server"
-msg_ok "Built prime_server"
-
-RELEASE=$(get_latest_github_release "valhalla/valhalla" "false")
-msg_info "Cloning Valhalla ${RELEASE} (Patience)"
-mkdir -p /opt/valhalla
-$STD git clone --recurse-submodules --depth 1 --branch "$RELEASE" https://github.com/valhalla/valhalla.git /opt/valhalla
-msg_ok "Cloned Valhalla ${RELEASE}"
-
-msg_info "Compiling Valhalla ${RELEASE} (this takes 20-45+ minutes, be patient)"
-MEM_MB=$(awk '/MemTotal/{print int($2/1024)}' /proc/meminfo)
-BUILD_JOBS=$((MEM_MB / 2000))
-[[ $BUILD_JOBS -lt 1 ]] && BUILD_JOBS=1
-[[ $BUILD_JOBS -gt $(nproc) ]] && BUILD_JOBS=$(nproc)
-cd /opt/valhalla
-$STD cmake -B build -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON_BINDINGS=OFF -DENABLE_TESTS=OFF -DENABLE_SINGLE_FILES_WERROR=OFF
-$STD cmake --build build -- -j"$BUILD_JOBS"
-$STD cmake --install build
-ldconfig
-echo "${RELEASE#v}" >"$HOME/.valhalla"
-msg_ok "Compiled Valhalla ${RELEASE}"
-
-msg_info "Configuring Valhalla"
-useradd --system --no-create-home --shell /usr/sbin/nologin valhalla 2>/dev/null || true
-mkdir -p /opt/valhalla_data/{valhalla_tiles,pbf}
-THREADS=$(nproc)
-valhalla_build_config \
-  --mjolnir-tile-dir /opt/valhalla_data/valhalla_tiles \
-  --mjolnir-tile-extract /opt/valhalla_data/valhalla_tiles.tar \
-  --mjolnir-admin /opt/valhalla_data/admins.sqlite \
-  --mjolnir-timezone /opt/valhalla_data/timezones.sqlite \
-  --mjolnir-concurrency "$THREADS" \
-  >/opt/valhalla_data/valhalla.json
-
-cat <<'EOF' >/opt/valhalla_data/build-tiles.sh
-#!/usr/bin/env bash
-# (Re)builds Valhalla routing tiles from one or more OSM extracts.
-# Usage: build-tiles.sh <pbf-url-or-path> [<pbf-url-or-path> ...]
-# Example: build-tiles.sh https://download.geofabrik.de/europe/germany-latest.osm.pbf
-set -euo pipefail
-export PATH="/usr/local/bin:/usr/local/sbin:$PATH"
-if [[ $# -eq 0 ]]; then
-  echo "Usage: $0 <pbf-url-or-path> [<pbf-url-or-path> ...]" >&2
-  exit 1
-fi
-
-DATA_DIR=/opt/valhalla_data
-CONFIG="$DATA_DIR/valhalla.json"
-mkdir -p "$DATA_DIR/pbf"
-
-FILES=()
-for src in "$@"; do
-  if [[ "$src" == http://* || "$src" == https://* ]]; then
-    fname="$DATA_DIR/pbf/$(basename "$src")"
-    echo "Downloading $src"
-    curl -fL --progress-bar -o "$fname" "$src"
-  else
-    fname="$src"
-  fi
-  FILES+=("$fname")
-done
-
-systemctl stop valhalla
-
-echo "Building admin database"
-valhalla_build_admins --config "$CONFIG" "${FILES[@]}"
-
-echo "Building timezone database"
-valhalla_build_timezones >"$DATA_DIR/timezones.sqlite"
-
-echo "Building initial tile graph"
-valhalla_build_tiles -c "$CONFIG" -e build "${FILES[@]}"
-
-echo "Enhancing tile graph"
-valhalla_build_tiles -c "$CONFIG" -s enhance "${FILES[@]}"
-
-echo "Packing tiles into a single extract"
-valhalla_build_extract -c "$CONFIG" -v
-
-chown -R valhalla:valhalla "$DATA_DIR"
-systemctl start valhalla
-echo "Done. Tiles are in $DATA_DIR/valhalla_tiles (and packed at $DATA_DIR/valhalla_tiles.tar)."
-EOF
-chmod +x /opt/valhalla_data/build-tiles.sh
-chown -R valhalla:valhalla /opt/valhalla_data
-msg_ok "Configured Valhalla"
-
-msg_info "Creating Service"
-cat <<EOF >/etc/systemd/system/valhalla.service
-[Unit]
-Description=Valhalla Routing Engine
-After=network.target
-
-[Service]
-Type=simple
-User=valhalla
-Group=valhalla
-WorkingDirectory=/opt/valhalla_data
-ExecStart=/usr/local/bin/valhalla_service /opt/valhalla_data/valhalla.json ${THREADS}
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-EOF
-systemctl enable -q --now valhalla
-msg_ok "Created Service"
-
-if [[ -n "${VALHALLA_PBF_URLS:-}" ]]; then
-  msg_info "Building Initial Tiles from VALHALLA_PBF_URLS (this can take a long time)"
-  $STD /opt/valhalla_data/build-tiles.sh $VALHALLA_PBF_URLS
-  msg_ok "Built Initial Tiles"
-fi
-
-motd_ssh
-customize
-cleanup_lxc
--- a/tools/pve/monitor-all.sh
+++ b/tools/pve/monitor-all.sh
@@ -45,8 +45,6 @@ add() {
 excluded_instances=("$@")
 echo "Excluded instances: ${excluded_instances[@]}"

-value_of() { sed -n "s/^$1:[[:space:]]*//p" <<<"$config" | head -n1; }
-
 while true; do

  for instance in $(pct list | awk 'NR>1 {print $1}'; qm list | awk 'NR>1 {print $1}'); do
@@ -61,21 +59,21 @@ while true; do
    if [ -r "/etc/pve/lxc/$instance.conf" ]; then
      type="ct"
      config_file="/etc/pve/lxc/$instance.conf"
-    elif [ -r "/etc/pve/qemu-server/$instance.conf" ]; then
+    else
      type="vm"
      config_file="/etc/pve/qemu-server/$instance.conf"
-    else
-      echo "Skipping $instance because its config is no longer readable"
-      continue
    fi
    config=$(sed '/^\[/,$d' "$config_file")

-    # Both are booleans that Proxmox also writes as 0, so the value decides and
-    # not the presence of the key.
-    [ "$(value_of onboot)" = "1" ] && onboot="true" || onboot="false"
-    [ "$(value_of template)" = "1" ] && template="true" || template="false"
+    # Skip templates and onboot-disabled
+    if grep -q "onboot: 0" <<<"$config" || ! grep -q "onboot" <<<"$config"; then
+      onboot="true"
+    else
+      onboot="false"
+    fi
+    template=$(grep -q "^template:" <<<"$config" && echo "true" || echo "false")

-    if [ "$onboot" != "true" ]; then
+    if [ "$onboot" == "true" ]; then
      echo "Skipping $instance because it is set not to boot"
      continue
    elif [ "$template" == "true" ]; then
@@ -83,40 +81,34 @@ while true; do
      continue
    fi

-    # Tags are semicolon separated, so match a whole entry instead of a
-    # substring of a longer tag such as mon-restart-disabled.
-    tags=";$(value_of tags | tr -d '[:space:]');"
-    if [[ "$tags" != *";mon-restart;"* ]]; then
+    # Check for mon-restart tag
+    has_tag=$(grep -q "tags:.*mon-restart" <<<"$config" && echo "true" || echo "false")
+    if [ "$has_tag" != "true" ]; then
      echo "Skipping $instance because it does not have 'mon-restart' tag"
      continue
    fi

    # Responsiveness check and restart if needed
    if [ "$type" == "vm" ]; then
-      if ! qm status "$instance" 2>/dev/null | grep -q "status: running"; then
-        echo "$(date): VM $instance is not running, starting..."
-        qm start "$instance" >/dev/null 2>&1
-      elif qm guest cmd "$instance" ping >/dev/null 2>&1; then
+      # Check if guest agent responds
+      if qm guest cmd $instance ping >/dev/null 2>&1; then
        echo "VM $instance is responsive via guest agent"
      else
        echo "$(date): VM $instance is not responding to agent ping, restarting..."
-        qm stop "$instance" >/dev/null 2>&1
-        sleep 5
-        qm start "$instance" >/dev/null 2>&1
+        if qm status $instance | grep -q "status: running"; then
+          qm stop $instance >/dev/null 2>&1
+          sleep 5
+        fi
+        qm start $instance >/dev/null 2>&1
      fi
    else
-      if ! pct status "$instance" 2>/dev/null | grep -q "status: running"; then
-        echo "$(date): CT $instance is not running, starting..."
-        pct start "$instance" >/dev/null 2>&1
-        continue
-      fi
-      # Not every container names its interface eth0.
-      IP=$(pct exec "$instance" -- ip -4 -o addr show scope global 2>/dev/null | awk '{print $4}' | cut -d/ -f1 | head -n1)
-      if [ -z "$IP" ] || ! ping -c 1 -W 2 "$IP" >/dev/null 2>&1; then
+      # Container: get IP and ping
+      IP=$(pct exec $instance ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1 | head -n1)
+      if ! ping -c 1 $IP >/dev/null 2>&1; then
        echo "$(date): CT $instance is not responding, restarting..."
-        pct stop "$instance" >/dev/null 2>&1
+        pct stop $instance >/dev/null 2>&1
        sleep 5
-        pct start "$instance" >/dev/null 2>&1
+        pct start $instance >/dev/null 2>&1
      else
        echo "CT $instance is responsive"
      fi
@@ -132,18 +124,23 @@ EOF
  touch /var/log/ping-instances.log
  chmod +x /usr/local/bin/ping-instances.sh

-  # The service loops with its own five minute sleep, so the timer that earlier
-  # versions installed could only ever start a unit that was already running.
-  if [[ -f /etc/systemd/system/ping-instances.timer ]]; then
-    systemctl disable -q --now ping-instances.timer 2>/dev/null || true
-    rm -f /etc/systemd/system/ping-instances.timer
-  fi
+  cat <<EOF >/etc/systemd/system/ping-instances.timer
+[Unit]
+Description=Delay ping-instances.service by 5 minutes
+
+[Timer]
+OnBootSec=300
+OnUnitActiveSec=300
+
+[Install]
+WantedBy=timers.target
+EOF

  cat <<EOF >/etc/systemd/system/ping-instances.service
 [Unit]
 Description=Ping instances every 5 minutes and restart if necessary
-After=pve-cluster.service
-Wants=pve-cluster.service
+After=ping-instances.timer
+Requires=ping-instances.timer

 [Service]
 Type=simple
@@ -161,6 +158,7 @@ WantedBy=multi-user.target
 EOF

  systemctl daemon-reload
+  systemctl enable -q --now ping-instances.timer
  systemctl enable -q --now ping-instances.service
  clear
  echo -e "\n Monitor All installed."
@@ -169,7 +167,7 @@ EOF
 }

 remove() {
-  systemctl disable -q --now ping-instances.timer 2>/dev/null || true
+  systemctl disable -q --now ping-instances.timer
  systemctl disable -q --now ping-instances.service
  rm -f /etc/systemd/system/ping-instances.service
  rm -f /etc/systemd/system/ping-instances.timer
--- a/vm/haos-vm.sh
+++ b/vm/haos-vm.sh
@@ -1,55 +1,289 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash
+
 # Copyright (c) 2021-2026 tteck
-# Author: tteck (tteckster) | MickLesk (CanbiZ)
+# Author: tteck (tteckster)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE

-COMMUNITY_SCRIPTS_URL="${COMMUNITY_SCRIPTS_URL:-https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main}"
-source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/pve/vm-core.func")
-load_functions
+source /dev/stdin <<<$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func)

+function header_info {
+  clear
+  cat <<"EOF"
+    __  __                        ___              _      __              __     ____  _____
+   / / / /___  ____ ___  ___     /   |  __________(_)____/ /_____ _____  / /_   / __ \/ ___/
+  / /_/ / __ \/ __ `__ \/ _ \   / /| | / ___/ ___/ / ___/ __/ __ `/ __ \/ __/  / / / /\__ \
+ / __  / /_/ / / / / / /  __/  / ___ |(__  |__  ) (__  ) /_/ /_/ / / / / /_   / /_/ /___/ /
+/_/ /_/\____/_/ /_/ /_/\___/  /_/  |_/____/____/_/____/\__/\__,_/_/ /_/\__/   \____//____/
+
+EOF
+}
+header_info
+echo -e "\n Loading..."
 GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
+VERSIONS=(stable beta dev)
 METHOD=""
-APP="Home Assistant OS"
-APP_TYPE="vm"
 NSAPP="haos-vm"
 var_os="homeassistant"
 DISK_SIZE="32G"

-for channel in stable beta dev; do
-  channel_version=$(curl -fsSL "https://raw.githubusercontent.com/home-assistant/version/master/${channel}.json" | grep '"ova"' | cut -d '"' -f 4) || channel_version=""
-  printf -v "$channel" '%s' "$channel_version"
+for version in "${VERSIONS[@]}"; do
+  eval "$version=$(curl -fsSL https://raw.githubusercontent.com/home-assistant/version/master/stable.json | grep '"ova"' | cut -d '"' -f 4)"
 done
-if [ -z "$stable" ]; then
-  echo -e "Could not determine the current Home Assistant OS release."
-  exit 1
-fi
-beta="${beta:-$stable}"
-dev="${dev:-$stable}"
+YW=$(echo "\033[33m")
+BL=$(echo "\033[36m")
 HA=$(echo "\033[1;34m")
+RD=$(echo "\033[01;31m")
+BGN=$(echo "\033[4;92m")
+GN=$(echo "\033[1;92m")
+DGN=$(echo "\033[32m")
+CL=$(echo "\033[m")
+
+BOLD=$(echo "\033[1m")
+BFR="\\r\\033[K"
+HOLD=" "
+TAB="  "
+
+CM="${TAB}✔️${TAB}${CL}"
+CROSS="${TAB}✖️${TAB}${CL}"
+INFO="${TAB}💡${TAB}${CL}"
+OS="${TAB}🖥️${TAB}${CL}"
+CONTAINERTYPE="${TAB}📦${TAB}${CL}"
+DISKSIZE="${TAB}💾${TAB}${CL}"
+CPUCORE="${TAB}🧠${TAB}${CL}"
+RAMSIZE="${TAB}🛠️${TAB}${CL}"
+CONTAINERID="${TAB}🆔${TAB}${CL}"
+HOSTNAME="${TAB}🏠${TAB}${CL}"
+BRIDGE="${TAB}🌉${TAB}${CL}"
+GATEWAY="${TAB}🌐${TAB}${CL}"
+DEFAULT="${TAB}⚙️${TAB}${CL}"
+MACADDRESS="${TAB}🔗${TAB}${CL}"
+VLANTAG="${TAB}🏷️${TAB}${CL}"
+CREATING="${TAB}🚀${TAB}${CL}"
+ADVANCED="${TAB}🧩${TAB}${CL}"
+CLOUD="${TAB}☁️${TAB}${CL}"

 THIN="discard=on,ssd=1,"
-
-header_info
-echo -e "\n Loading..."
 set -e
 trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
 trap cleanup EXIT
 trap 'post_update_to_api "failed" "130"' SIGINT
 trap 'post_update_to_api "failed" "143"' SIGTERM
 trap 'post_update_to_api "failed" "129"; exit 129' SIGHUP
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  post_update_to_api "failed" "${exit_code}"
+  echo -e "\n$error_message\n"
+  cleanup_vmid
+}
+
+function get_valid_nextid() {
+  local try_id
+  try_id=$(pvesh get /cluster/nextid)
+  while true; do
+    if [ -f "/etc/pve/qemu-server/${try_id}.conf" ] || [ -f "/etc/pve/lxc/${try_id}.conf" ]; then
+      try_id=$((try_id + 1))
+      continue
+    fi
+    if lvs --noheadings -o lv_name | grep -qE "(^|[-_])${try_id}($|[-_])"; then
+      try_id=$((try_id + 1))
+      continue
+    fi
+    break
+  done
+  echo "$try_id"
+}
+
+function cleanup_vmid() {
+  if qm status $VMID &>/dev/null; then
+    qm stop $VMID &>/dev/null
+    qm destroy $VMID &>/dev/null
+  fi
+}
+
+function cleanup() {
+  local exit_code=$?
+  popd >/dev/null
+  # Only send telemetry if post_to_api_vm was called (installing status was sent)
+  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
+    if [[ $exit_code -eq 0 ]]; then
+      post_update_to_api "done" "none"
+    else
+      post_update_to_api "failed" "$exit_code"
+    fi
+  fi
+  rm -rf $TEMP_DIR
+}

 TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
+if whiptail --backtitle "Proxmox VE Helper Scripts" --title "Homeassistant OS VM" --yesno "This will create a New Homeassistant OS VM. Proceed?" 10 58; then
+  :
+else
+  header_info && echo -e "${CROSS}${RD}User exited script${CL}\n" && exit
+fi
+
+function msg_info() {
+  local msg="$1"
+  echo -ne "${TAB}${YW}${HOLD}${msg}${HOLD}"
+}
+
+function msg_ok() {
+  local msg="$1"
+  echo -e "${BFR}${CM}${GN}${msg}${CL}"
+}
+
+function msg_error() {
+  local msg="$1"
+  echo -e "${BFR}${CROSS}${RD}${msg}${CL}"
+}
+
+function check_root() {
+  if [[ "$(id -u)" -ne 0 || $(ps -o comm= -p $PPID) == "sudo" ]]; then
+    clear
+    msg_error "Please run this script as root."
+    echo -e "\nExiting..."
+    sleep 2
+    exit
+  fi
+}
+
+# This function checks the version of Proxmox Virtual Environment (PVE) and exits if the version is not supported.
+# Supported: Proxmox VE 8.0.x – 8.9.x, 9.0 and 9.2
+pve_check() {
+  local PVE_VER
+  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
+
+  # Check for Proxmox VE 8.x: allow 8.0–8.9
+  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
+    local MINOR="${BASH_REMATCH[1]}"
+    if ((MINOR < 0 || MINOR > 9)); then
+      msg_error "This version of Proxmox VE is not supported."
+      msg_error "Supported: Proxmox VE version 8.0 – 8.9"
+      exit 105
+    fi
+    return 0
+  fi
+
+  # Check for Proxmox VE 9.x: allow 9.0 and 9.2
+  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
+    local MINOR="${BASH_REMATCH[1]}"
+    if ((MINOR < 0 || MINOR > 2)); then
+      msg_error "This version of Proxmox VE is not supported."
+      msg_error "Supported: Proxmox VE version 9.0 – 9.2"
+      exit 105
+    fi
+    return 0
+  fi
+
+  # All other unsupported versions
+  msg_error "This version of Proxmox VE is not supported."
+  msg_error "Supported versions: Proxmox VE 8.0 – 8.x or 9.0 – 9.2"
+  exit 105
+}
+
+function arch_check() {
+  if [ "$(dpkg --print-architecture)" != "amd64" ]; then
+    echo -e "\n ${INFO}${YWB}This script will not work with PiMox! \n"
+    echo -e "\n ${YWB}Visit https://github.com/asylumexp/Proxmox for ARM64 support. \n"
+    echo -e "Exiting..."
+    sleep 2
+    exit
+  fi
+}
+
+function ssh_check() {
+  if command -v pveversion >/dev/null 2>&1; then
+    if [ -n "${SSH_CLIENT:+x}" ]; then
+      if whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "SSH DETECTED" --yesno "It's suggested to use the Proxmox shell instead of SSH, since SSH can create issues while gathering variables. Would you like to proceed with using SSH?" 10 62; then
+        echo "you've been warned"
+      else
+        clear
+        exit
+      fi
+    fi
+  fi
+}
+
+function exit-script() {
+  clear
+  echo -e "\n${CROSS}${RD}User exited script${CL}\n"
+  exit
+}
+
+# Ensure pv is installed or abort with instructions
+function ensure_pv() {
+  if ! command -v pv &>/dev/null; then
+    msg_info "Installing required package: pv"
+    if ! apt-get update -qq &>/dev/null || ! apt-get install -y pv &>/dev/null; then
+      msg_error "Failed to install pv automatically."
+      echo -e "\nPlease run manually on the Proxmox host:\n  apt install pv\n"
+      exit 237
+    fi
+    msg_ok "Installed pv"
+  fi
+}
+
+# Download an .xz file and validate it
+# Args: $1=url $2=cache_file
+function download_and_validate_xz() {
+  local url="$1"
+  local file="$2"
+
+  # If file exists, check validity
+  if [[ -s "$file" ]]; then
+    if xz -t "$file" &>/dev/null; then
+      msg_ok "Using cached image $(basename "$file")"
+      return 0
+    else
+      msg_error "Cached file $(basename "$file") is corrupted. Deleting and retrying download..."
+      rm -f "$file"
+    fi
+  fi
+
+  # Download fresh file
+  msg_info "Downloading image: $(basename "$file")"
+  if ! curl -fSL -o "$file" "$url"; then
+    msg_error "Download failed: $url"
+    rm -f "$file"
+    exit 115
+  fi
+
+  # Validate again
+  if ! xz -t "$file" &>/dev/null; then
+    msg_error "Downloaded file $(basename "$file") is corrupted. Please try again later."
+    rm -f "$file"
+    exit 115
+  fi
+  msg_ok "Downloaded and validated $(basename "$file")"
+}
+
+# Extract .xz with pv
+# Args: $1=cache_file $2=target_img
+function extract_xz_with_pv() {
+  set -o pipefail
+  local file="$1"
+  local target="$2"
+
+  msg_info "Decompressing $(basename "$file") to $target"
+  if ! xz -dc "$file" | pv -N "Extracting" >"$target"; then
+    msg_error "Failed to extract $file"
+    rm -f "$target"
+    exit 115
+  fi
+  msg_ok "Decompressed to $target"
+}

 function default_settings() {
  BRANCH="$stable"
-  var_version="${BRANCH}"
  VMID=$(get_valid_nextid)
-  vm_apply_machine_type "q35"
+  MACHINE=" -machine q35"
+  FORMAT=""
  DISK_SIZE="32G"
-  DISK_CACHE=""
-  HN="homeassistant"
+  HN="haos-${BRANCH}"
  CPU_TYPE=""
  CORE_COUNT="2"
  RAM_SIZE="4096"
@@ -59,52 +293,297 @@ function default_settings() {
  MTU=""
  START_VM="yes"
  METHOD="default"
-  vm_echo_default_settings
+  echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}${VMID}${CL}"
+  echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}q35${CL}"
+  echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE}${CL}"
+  echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}${HN}${CL}"
+  echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}KVM64${CL}"
+  echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}${CORE_COUNT}${CL}"
+  echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE}${CL}"
+  echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}${BRG}${CL}"
+  echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}${MAC}${CL}"
+  echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}Default${CL}"
+  echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}Default${CL}"
+  echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}yes${CL}"
+  echo -e "${CREATING}${BOLD}${DGN}Creating a Homeassistant OS VM using the above default settings${CL}"
 }

 function advanced_settings() {
  METHOD="advanced"
-  if vm_dialog radiolist "Homeassistant OS Version" --cancel-button Exit-Script "Choose Version" 10 58 3 \
+  if BRANCH=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "Homeassistant OS Version" --radiolist "Choose Version" --cancel-button Exit-Script 10 58 3 \
    "$stable" "Stable  " ON \
    "$beta" "Beta  " OFF \
-    "$dev" "Dev  " OFF; then
-    BRANCH="$VM_DIALOG_RESULT"
+    "$dev" "Dev  " OFF \
+    3>&1 1>&2 2>&3); then
    var_version="${BRANCH}"
    echo -e "${DGN}Using HAOS Version: ${BGN}$BRANCH${CL}"
  else
-    exit_script
+    exit-script
  fi

-  vm_prompt_vmid "${VMID:-$(get_valid_nextid)}"
-  vm_prompt_machine_type "q35"
-  vm_prompt_disk_size "$DISK_SIZE" "Set Disk Size in GiB (e.g., 10, 20)"
-  vm_prompt_disk_cache "writethrough"
-  vm_prompt_hostname "homeassistant"
-  vm_prompt_cpu_model "kvm64"
-  vm_prompt_cpu_cores "2"
-  vm_prompt_ram "4096"
-  vm_prompt_bridge "vmbr0"
-  vm_prompt_mac "$GEN_MAC"
-  vm_prompt_vlan
-  vm_prompt_mtu
-  vm_prompt_verbose "no"
-  vm_prompt_start_vm "yes"
+  [ -z "${VMID:-}" ] && VMID=$(get_valid_nextid)
+  while true; do
+    if VMID=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Virtual Machine ID" 8 58 $VMID --title "VIRTUAL MACHINE ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$VMID" ]; then
+        VMID=$(get_valid_nextid)
+      fi
+      if pct status "$VMID" &>/dev/null || qm status "$VMID" &>/dev/null; then
+        echo -e "${CROSS}${RD} ID $VMID is already in use${CL}"
+        sleep 2
+        continue
+      fi
+      echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}$VMID${CL}"
+      break
+    else
+      exit-script
+    fi
+  done

-  if vm_confirm_advanced_settings "Ready to create Homeassistant OS ${BRANCH} VM?"; then
-    echo -e "${CREATING}${BOLD}${DGN}Creating a Homeassistant OS VM using the above advanced settings${CL}"
+  if MACH=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "MACHINE TYPE" --radiolist --cancel-button Exit-Script "Choose Machine Type" 10 58 2 \
+    "q35" "Modern (PCIe, UEFI, default)" ON \
+    "i440fx" "Legacy (older compatibility)" OFF \
+    3>&1 1>&2 2>&3); then
+    if [ "$MACH" = "q35" ]; then
+      echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}q35${CL}"
+      FORMAT=""
+      MACHINE=" -machine q35"
+    else
+      echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}i440fx${CL}"
+      FORMAT=",efitype=4m"
+      MACHINE=""
+    fi
+  else
+    exit-script
+  fi
+
+  if DISK_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Disk Size in GiB (e.g., 10, 20)" 8 58 "$DISK_SIZE" --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    DISK_SIZE=$(echo "$DISK_SIZE" | tr -d ' ')
+    if [[ "$DISK_SIZE" =~ ^[0-9]+$ ]]; then
+      DISK_SIZE="${DISK_SIZE}G"
+      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}$DISK_SIZE${CL}"
+    elif [[ "$DISK_SIZE" =~ ^[0-9]+G$ ]]; then
+      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}$DISK_SIZE${CL}"
+    else
+      echo -e "${DISKSIZE}${BOLD}${RD}Invalid Disk Size. Please use a number (e.g., 10 or 10G).${CL}"
+      exit-script
+    fi
+  else
+    exit-script
+  fi
+
+  if DISK_CACHE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISK CACHE" --radiolist "Choose" --cancel-button Exit-Script 10 58 2 \
+    "0" "None" OFF \
+    "1" "Write Through (Default)" ON \
+    3>&1 1>&2 2>&3); then
+    if [ $DISK_CACHE = "1" ]; then
+      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Cache: ${BGN}Write Through${CL}"
+      DISK_CACHE="cache=writethrough,"
+    else
+      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Cache: ${BGN}None${CL}"
+      DISK_CACHE=""
+    fi
+  else
+    exit-script
+  fi
+
+  if VM_NAME=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Hostname" 8 58 haos${BRANCH} --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    if [ -z $VM_NAME ]; then
+      HN="haos${BRANCH}"
+      echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
+    else
+      HN=$(echo "${VM_NAME,,}" | tr -cs 'a-z0-9-' '-' | sed 's/^-//;s/-$//')
+      if [ "$HN" != "${VM_NAME,,}" ]; then
+        whiptail --backtitle "Proxmox VE Helper Scripts" --title "HOSTNAME ADJUSTED" --msgbox "Invalid characters detected. Hostname has been adjusted to:\n\n  $HN" 10 58
+      fi
+      echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
+    fi
+  else
+    exit-script
+  fi
+
+  if CPU_TYPE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CPU MODEL" --radiolist "Choose CPU Model" --cancel-button Exit-Script 12 74 3 \
+    "KVM64" "Default - safe for migration/compatibility" ON \
+    "x86-64-v2-AES" "Wider feature set, needed by newer HA releases (PVE 8+, host CPU 2010+)" OFF \
+    "Host" "Use host CPU features (faster, no migration)" OFF \
+    3>&1 1>&2 2>&3); then
+    case "$CPU_TYPE1" in
+    Host)
+      echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}Host${CL}"
+      CPU_TYPE=" -cpu host"
+      ;;
+    x86-64-v2-AES)
+      echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}x86-64-v2-AES${CL}"
+      CPU_TYPE=" -cpu x86-64-v2-AES"
+      ;;
+    *)
+      echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}KVM64${CL}"
+      CPU_TYPE=""
+      ;;
+    esac
+  else
+    exit-script
+  fi
+
+  while true; do
+    if CORE_COUNT=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate CPU Cores" 8 58 2 --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$CORE_COUNT" ]; then CORE_COUNT="2"; fi
+      if [[ "$CORE_COUNT" =~ ^[1-9][0-9]*$ ]]; then
+        echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "CPU Cores must be a positive integer (e.g., 2)." 8 58
+    else
+      exit-script
+    fi
+  done
+
+  while true; do
+    if RAM_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate RAM in MiB" 8 58 2048 --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$RAM_SIZE" ]; then RAM_SIZE="4096"; fi
+      if [[ "$RAM_SIZE" =~ ^[1-9][0-9]*$ ]]; then
+        echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "RAM Size must be a positive integer in MiB (e.g., 4096)." 8 58
+    else
+      exit-script
+    fi
+  done
+
+  if BRG=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    if [ -z $BRG ]; then
+      BRG="vmbr0"
+      echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}"
+    else
+      echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}"
+    fi
+  else
+    exit-script
+  fi
+
+  while true; do
+    if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address" 8 58 $GEN_MAC --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$MAC1" ]; then
+        MAC="$GEN_MAC"
+        echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC${CL}"
+        break
+      fi
+      if [[ "$MAC1" =~ ^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$ ]]; then
+        MAC="$MAC1"
+        echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC1${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "Invalid MAC address format. Use XX:XX:XX:XX:XX:XX (e.g., AA:BB:CC:DD:EE:FF)." 8 58
+    else
+      exit-script
+    fi
+  done
+
+  while true; do
+    if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan (leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$VLAN1" ]; then
+        VLAN1="Default"
+        VLAN=""
+        echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}$VLAN1${CL}"
+        break
+      fi
+      if [[ "$VLAN1" =~ ^[0-9]+$ ]] && [ "$VLAN1" -ge 1 ] && [ "$VLAN1" -le 4094 ]; then
+        VLAN=",tag=$VLAN1"
+        echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}$VLAN1${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "VLAN must be a number between 1 and 4094, or leave blank for default." 8 58
+    else
+      exit-script
+    fi
+  done
+
+  while true; do
+    if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$MTU1" ]; then
+        MTU1="Default"
+        MTU=""
+        echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}"
+        break
+      fi
+      if [[ "$MTU1" =~ ^[0-9]+$ ]] && [ "$MTU1" -ge 576 ] && [ "$MTU1" -le 65520 ]; then
+        MTU=",mtu=$MTU1"
+        echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "MTU Size must be a number between 576 and 65520, or leave blank for default." 8 58
+    else
+      exit-script
+    fi
+  done
+
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then
+    echo -e "${DGN}Start VM when completed: ${BGN}yes${CL}"
+    START_VM="yes"
+  else
+    echo -e "${DGN}Start VM when completed: ${BGN}no${CL}"
+    START_VM="no"
+  fi
+
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create Homeassistant OS ${BRANCH} VM?" --no-button Do-Over 10 58); then
+    echo -e "${RD}Creating a Homeassistant OS VM using the above advanced settings${CL}"
  else
    header_info
-    echo -e "${ADVANCED}${BOLD}${RD}Using Advanced Settings${CL}"
+    echo -e "${RD}Using Advanced Settings${CL}"
    advanced_settings
  fi
 }

+function start_script() {
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
+    header_info
+    echo -e "${BL}Using Default Settings${CL}"
+    default_settings
+  else
+    header_info
+    echo -e "${RD}Using Advanced Settings${CL}"
+    advanced_settings
+  fi
+}

-vm_preflight
-vm_start_script "Use Default Settings?" 10 58
+check_root
+arch_check
+pve_check
+ssh_check
+ensure_pv
+start_script
 post_to_api_vm

-vm_select_storage "$HN"
+msg_info "Validating Storage"
+while read -r line; do
+  TAG=$(echo $line | awk '{print $1}')
+  TYPE=$(echo $line | awk '{printf "%-10s", $2}')
+  FREE=$(echo $line | numfmt --field 4-6 --from-unit=K --to=iec --format %.2f | awk '{printf( "%9sB", $6)}')
+  ITEM="  Type: $TYPE Free: $FREE "
+  OFFSET=2
+  if [[ $((${#ITEM} + $OFFSET)) -gt ${MSG_MAX_LENGTH:-} ]]; then
+    MSG_MAX_LENGTH=$((${#ITEM} + $OFFSET))
+  fi
+  STORAGE_MENU+=("$TAG" "$ITEM" "OFF")
+done < <(pvesm status -content images | awk 'NR>1')
+VALID=$(pvesm status -content images | awk 'NR>1')
+if [ -z "$VALID" ]; then
+  msg_error "Unable to detect a valid storage location."
+  exit
+elif [ $((${#STORAGE_MENU[@]} / 3)) -eq 1 ]; then
+  STORAGE=${STORAGE_MENU[0]}
+else
+  while [ -z "${STORAGE:+x}" ]; do
+    if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID >/dev/null; then kill $SPINNER_PID >/dev/null; fi
+    printf "\e[?25h"
+    STORAGE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "Storage Pools" --radiolist \
+      "Which storage pool would you like to use for ${HN}?\nTo make a selection, use the Spacebar.\n" \
+      16 $(($MSG_MAX_LENGTH + 23)) 6 \
+      "${STORAGE_MENU[@]}" 3>&1 1>&2 2>&3)
+  done
+fi
+msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location."
+msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}."

 var_version="${BRANCH}"
 msg_info "Retrieving the URL for Home Assistant ${BRANCH} Disk Image"
@@ -114,10 +593,14 @@ else
  URL="https://github.com/home-assistant/operating-system/releases/download/${BRANCH}/haos_ova-${BRANCH}.qcow2.xz"
 fi

-CACHE_FILE="$(vm_image_cache_path "$URL")"
+CACHE_DIR="/var/lib/vz/template/cache"
+CACHE_FILE="$CACHE_DIR/$(basename "$URL")"
+FILE_IMG="/var/lib/vz/template/tmp/${CACHE_FILE##*/%.xz}" # .qcow2
+
+mkdir -p "$CACHE_DIR" "$(dirname "$FILE_IMG")"
 msg_ok "${CL}${BL}${URL}${CL}"

-vm_fetch_image "$URL" "$CACHE_FILE" --cache --verify-xz || exit 115
+download_and_validate_xz "$URL" "$CACHE_FILE"

 msg_info "Creating Home Assistant OS VM shell"
 qm create $VMID${MACHINE} -bios ovmf -agent 1 -tablet 0 -localtime 1 ${CPU_TYPE} \
@@ -125,8 +608,7 @@ qm create $VMID${MACHINE} -bios ovmf -agent 1 -tablet 0 -localtime 1 ${CPU_TYPE}
  -net0 "virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU" -onboot 1 -ostype l26 -scsihw virtio-scsi-pci >/dev/null
 msg_ok "Created VM shell"

-vm_extract_image "$CACHE_FILE" || exit 115
-FILE_IMG="$VM_IMAGE_FILE"
+extract_xz_with_pv "$CACHE_FILE" "$FILE_IMG"

 msg_info "Importing disk into storage ($STORAGE)"
 if qm disk import --help >/dev/null 2>&1; then
@@ -155,20 +637,54 @@ qm set $VMID \
 qm set $VMID --agent enabled=1 >/dev/null
 msg_ok "Attached EFI and root disk"

-vm_resize_disk
+msg_info "Resizing disk to $DISK_SIZE"
+qm resize $VMID scsi0 ${DISK_SIZE} >/dev/null
+msg_ok "Resized disk"

-set_description
+DESCRIPTION=$(
+  cat <<EOF
+<div align='center'>
+  <a href='https://community-scripts.org' target='_blank' rel='noopener noreferrer'>
+    <img src='https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/images/logo-81x112.png' alt='Logo' style='width:81px;height:112px;'/>
+  </a>
+
+  <h2 style='font-size: 24px; margin: 20px 0;'>Homeassistant OS VM</h2>
+
+  <p style='margin: 16px 0;'>
+    <a href='https://ko-fi.com/community_scripts' target='_blank' rel='noopener noreferrer'>
+      <img src='https://img.shields.io/badge/&#x2615;-Buy us a coffee-blue' alt='spend Coffee' />
+    </a>
+  </p>
+
+  <span style='margin: 0 10px;'>
+    <i class="fa fa-github fa-fw" style="color: #f5f5f5;"></i>
+    <a href='https://github.com/community-scripts/ProxmoxVE' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>GitHub</a>
+  </span>
+  <span style='margin: 0 10px;'>
+    <i class="fa fa-comments fa-fw" style="color: #f5f5f5;"></i>
+    <a href='https://github.com/community-scripts/ProxmoxVE/discussions' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Discussions</a>
+  </span>
+  <span style='margin: 0 10px;'>
+    <i class="fa fa-exclamation-circle fa-fw" style="color: #f5f5f5;"></i>
+    <a href='https://github.com/community-scripts/ProxmoxVE/issues' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Issues</a>
+  </span>
+</div>
+EOF
+)
+qm set $VMID -description "$DESCRIPTION" >/dev/null
 msg_ok "Created Homeassistant OS VM ${CL}${BL}(${HN})"

-# vm_fetch_image --cache keeps it, as it does for every other VM script.
-if [[ "${VM_KEEP_IMAGE:-yes}" != "yes" ]]; then
+if whiptail --backtitle "Proxmox VE Helper Scripts" --title "Image Cache" \
+  --yesno "Keep downloaded Home Assistant OS image for future VMs?\n\nFile: $CACHE_FILE" 10 70; then
+  msg_ok "Keeping cached image"
+else
  rm -f "$CACHE_FILE"
  msg_ok "Deleted cached image"
 fi

 if [ "$START_VM" == "yes" ]; then
  msg_info "Starting Home Assistant OS VM"
-  $STD qm start $VMID
+  qm start $VMID
  msg_ok "Started Home Assistant OS VM"
 fi
 post_update_to_api "done" "none"
--- a/vm/headers/truenas
+++ b/vm/headers/truenas
@@ -1,6 +0,0 @@
-  ______                _   _____   _____
- /_  __/______  _____  / | / /   | / ___/
-  / / / ___/ / / / _ \/  |/ / /| | \__ \ 
- / / / /  / /_/ /  __/ /|  / ___ |___/ / 
-/_/ /_/   \__,_/\___/_/ |_/_/  |_/____/  
-                                         
--- a/vm/truenas-vm.sh
+++ b/vm/truenas-vm.sh
@@ -1,26 +1,64 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash

 # Copyright (c) 2021-2026 community-scripts ORG
 # Author: juronja
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://www.truenas.com/truenas-community-edition/

-COMMUNITY_SCRIPTS_URL="${COMMUNITY_SCRIPTS_URL:-https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main}"
-source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/pve/vm-core.func")
-load_functions
+source /dev/stdin <<<$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func)

+function header_info() {
+  clear
+  cat <<"EOF"
+  ______                _   _____   _____
+ /_  __/______  _____  / | / /   | / ___/
+  / / / ___/ / / / _ \/  |/ / /| | \__ \
+ / / / /  / /_/ /  __/ /|  / ___ |___/ /
+/_/ /_/   \__,_/\___/_/ |_/_/  |_/____/
+                                           (Community Edition)
+EOF
+}
+header_info
+echo -e "\n Loading..."
 GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
 METHOD=""
-APP="TrueNAS"
-APP_TYPE="vm"
 NSAPP="truenas-vm"

-header_info
-echo -e "\n Loading..."
+YW=$(echo "\033[33m")
+BL=$(echo "\033[36m")
+RD=$(echo "\033[01;31m")
+BGN=$(echo "\033[4;92m")
+GN=$(echo "\033[1;92m")
+DGN=$(echo "\033[32m")
+CL=$(echo "\033[m")

+CL=$(echo "\033[m")
+BOLD=$(echo "\033[1m")
+BFR="\\r\\033[K"
+HOLD=" "
+TAB="  "
+
+CM="${TAB}✔️${TAB}${CL}"
+CROSS="${TAB}✖️${TAB}${CL}"
+INFO="${TAB}💡${TAB}${CL}"
+OS="${TAB}🖥️${TAB}${CL}"
+CONTAINERTYPE="${TAB}📦${TAB}${CL}"
 ISO="${TAB}📀${TAB}${CL}"
+DISKSIZE="${TAB}💾${TAB}${CL}"
+CPUCORE="${TAB}🧠${TAB}${CL}"
+RAMSIZE="${TAB}🛠️${TAB}${CL}"
+CONTAINERID="${TAB}🆔${TAB}${CL}"
+HOSTNAME="${TAB}🏠${TAB}${CL}"
+BRIDGE="${TAB}🌉${TAB}${CL}"
+GATEWAY="${TAB}🌐${TAB}${CL}"
 DISK="${TAB}💽${TAB}${CL}"
+DEFAULT="${TAB}⚙️${TAB}${CL}"
+MACADDRESS="${TAB}🔗${TAB}${CL}"
+VLANTAG="${TAB}🏷️${TAB}${CL}"
+CREATING="${TAB}🚀${TAB}${CL}"
+ADVANCED="${TAB}🧩${TAB}${CL}"
+CLOUD="${TAB}☁️${TAB}${CL}"

 set -e
 trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
@@ -28,6 +66,15 @@ trap cleanup EXIT
 trap 'post_update_to_api "failed" "130"' SIGINT
 trap 'post_update_to_api "failed" "143"' SIGTERM
 trap 'post_update_to_api "failed" "129"; exit 129' SIGHUP
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  post_update_to_api "failed" "${command}"
+  echo -e "\n$error_message\n"
+  cleanup_vmid
+}

 function truenas_iso_lookup() {
  local BASE_URL="https://download.truenas.com"
@@ -53,7 +100,7 @@ function truenas_iso_lookup() {
      pre_releases+=("$path")
    else
      local major_version=$(echo "$version" | cut -d'.' -f1,2)
-      local current_stored_path=${latest_stables["$major_version"]:-}
+      local current_stored_path=${latest_stables["$major_version"]}
      if [[ -z "$current_stored_path" ]]; then
        latest_stables["$major_version"]="$path"
      else
@@ -74,17 +121,135 @@ function truenas_iso_lookup() {
  done | sort -V
 }

+function get_valid_nextid() {
+  local try_id
+  try_id=$(pvesh get /cluster/nextid)
+  while true; do
+    if [ -f "/etc/pve/qemu-server/${try_id}.conf" ] || [ -f "/etc/pve/lxc/${try_id}.conf" ]; then
+      try_id=$((try_id + 1))
+      continue
+    fi
+    if lvs --noheadings -o lv_name | grep -qE "(^|[-_])${try_id}($|[-_])"; then
+      try_id=$((try_id + 1))
+      continue
+    fi
+    break
+  done
+  echo "$try_id"
+}
+
+function cleanup_vmid() {
+  if qm status $VMID &>/dev/null; then
+    qm stop $VMID &>/dev/null
+    qm destroy $VMID &>/dev/null
+  fi
+}
+
+function cleanup() {
+  popd >/dev/null
+  post_update_to_api "done" "none"
+  rm -rf $TEMP_DIR
+}
+
 TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
+if whiptail --backtitle "Proxmox VE Helper Scripts" --title "TrueNAS VM" --yesno "This will create a New TrueNAS VM. Proceed?" 10 58; then
+  :
+else
+  header_info && echo -e "${CROSS}${RD}User exited script${CL}\n" && exit
+fi
+
+function msg_info() {
+  local msg="$1"
+  echo -ne "${TAB}${YW}${HOLD}${msg}${HOLD}"
+}
+
+function msg_ok() {
+  local msg="$1"
+  echo -e "${BFR}${CM}${GN}${msg}${CL}"
+}
+
+function msg_error() {
+  local msg="$1"
+  echo -e "${BFR}${CROSS}${RD}${msg}${CL}"
+}
+
+function check_root() {
+  if [[ "$(id -u)" -ne 0 || $(ps -o comm= -p $PPID) == "sudo" ]]; then
+    clear
+    msg_error "Please run this script as root."
+    echo -e "\nExiting..."
+    sleep 2
+    exit
+  fi
+}
+
+function pve_check() {
+  local PVE_VER
+  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
+
+  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
+    local MINOR="${BASH_REMATCH[1]}"
+    if ((MINOR < 0 || MINOR > 9)); then
+      msg_error "This version of Proxmox VE is not supported."
+      msg_error "Supported: Proxmox VE version 8.0 – 8.9"
+      exit 105
+    fi
+    return 0
+  fi
+
+  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
+    local MINOR="${BASH_REMATCH[1]}"
+    if ((MINOR < 0 || MINOR > 2)); then
+      msg_error "This version of Proxmox VE is not yet supported."
+      msg_error "Supported: Proxmox VE version 9.0 – 9.2"
+      exit 105
+    fi
+    return 0
+  fi
+
+  msg_error "This version of Proxmox VE is not supported."
+  msg_error "Supported versions: Proxmox VE 8.0 – 8.x or 9.0 – 9.2"
+  exit 105
+}
+
+function arch_check() {
+  if [ "$(dpkg --print-architecture)" != "amd64" ]; then
+    echo -e "\n ${INFO}${YWB}This script will not work with PiMox! \n"
+    echo -e "\n ${YWB}Visit https://github.com/asylumexp/Proxmox for ARM64 support. \n"
+    echo -e "Exiting..."
+    sleep 2
+    exit
+  fi
+}
+
+function ssh_check() {
+  if command -v pveversion >/dev/null 2>&1; then
+    if [ -n "${SSH_CLIENT:+x}" ]; then
+      if whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "SSH DETECTED" --yesno "It's suggested to use the Proxmox shell instead of SSH, since SSH can create issues while gathering variables. Would you like to proceed with using SSH?" 10 62; then
+        echo "you've been warned"
+      else
+        clear
+        exit
+      fi
+    fi
+  fi
+}
+
+function exit-script() {
+  clear
+  echo -e "\n${CROSS}${RD}User exited script${CL}\n"
+  exit
+}

 function default_settings() {
  VMID=$(get_valid_nextid)
  ISO_DEFAULT="latest stable"
-  vm_apply_machine_type "q35"
+  FORMAT=""
+  MACHINE="q35"
  DISK_SIZE="16"
-  DISK_CACHE=""
  HN="truenas"
-  CPU_TYPE=" -cpu host"
+  CPU_TYPE="host"
  CORE_COUNT="2"
  RAM_SIZE="8192"
  BRG="vmbr0"
@@ -92,38 +257,242 @@ function default_settings() {
  VLAN=""
  MTU=""
  START_VM="yes"
-  IMPORT_DISKS="no"
  METHOD="default"
+  echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}${VMID}${CL}"
  echo -e "${ISO}${BOLD}${DGN}ISO Chosen: ${BGN}${ISO_DEFAULT}${CL}"
-  vm_echo_default_settings
+  echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}${MACHINE}${CL}"
+  echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE}${CL}"
+  echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}${HN}${CL}"
+  echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}${CPU_TYPE}${CL}"
+  echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}${CORE_COUNT}${CL}"
+  echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE}${CL}"
+  echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}${BRG}${CL}"
+  echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}${MAC}${CL}"
+  echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}Default${CL}"
+  echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}Default${CL}"
+  echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}yes${CL}"
+  echo -e "${CREATING}${BOLD}${DGN}Creating a TrueNAS VM using the above default settings${CL}"
 }

 function advanced_settings() {
-  METHOD="advanced"
-  vm_prompt_vmid "${VMID:-$(get_valid_nextid)}"
-  vm_prompt_machine_type "q35"
-  vm_prompt_disk_size "16G" "Set Disk Size in GiB (e.g., 16, 32)"
-  vm_prompt_disk_cache "none"
-  vm_prompt_hostname "truenas"
-  vm_prompt_cpu_model "host"
-  vm_prompt_cpu_cores "2"
-  vm_prompt_ram "8192"
-  vm_prompt_bridge "vmbr0"
-  vm_prompt_mac "$GEN_MAC"
-  vm_prompt_vlan
-  vm_prompt_mtu
-  vm_prompt_verbose "no"
+  DISK_SIZE="16"
+  HN="truenas"
+  CORE_COUNT="2"
+  RAM_SIZE="8192"
+  BRG="vmbr0"

-  if vm_dialog yesno "IMPORT ONBOARD DISKS" --defaultno "Would you like to import onboard disks?" 10 58; then
+  METHOD="advanced"
+  [ -z "${VMID:-}" ] && VMID=$(get_valid_nextid)
+  while true; do
+    if VMID=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Virtual Machine ID" 8 58 $VMID --title "VIRTUAL MACHINE ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$VMID" ]; then
+        VMID=$(get_valid_nextid)
+      fi
+      if pct status "$VMID" &>/dev/null || qm status "$VMID" &>/dev/null; then
+        echo -e "${CROSS}${RD} ID $VMID is already in use${CL}"
+        sleep 2
+        continue
+      fi
+      echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}$VMID${CL}"
+      break
+    else
+      exit-script
+    fi
+  done
+
+  ISOARRAY=()
+  mapfile -t ALL_ISOS < <(truenas_iso_lookup | sort -V)
+  ISO_COUNT=${#ALL_ISOS[@]}
+
+  if [ $ISO_COUNT -eq 0 ]; then
+    echo "No ISOs found."
+    exit 115
+  fi
+
+  # Identify the index of the last stable release
+  LAST_STABLE_INDEX=-1
+  for i in "${!ALL_ISOS[@]}"; do
+    if [[ ! "${ALL_ISOS[$i]}" =~ (BETA|RC) ]]; then
+      LAST_STABLE_INDEX=$i
+    fi
+  done
+
+  # Build the whiptail array
+  for i in "${!ALL_ISOS[@]}"; do
+    ISOPATH="${ALL_ISOS[$i]}"
+    FILENAME=$(basename "$ISOPATH")
+
+    # Select ON if it's the last stable found, OR fallback to last item if no stable exists
+    if [[ "$i" -eq "$LAST_STABLE_INDEX" ]]; then
+      ISOARRAY+=("$ISOPATH" "$FILENAME" "ON")
+    elif [[ "$LAST_STABLE_INDEX" -eq -1 && "$i" -eq "$((ISO_COUNT - 1))" ]]; then
+      # Fallback: if somehow no stable is found, select the very last item
+      ISOARRAY+=("$ISOPATH" "$FILENAME" "ON")
+    else
+      ISOARRAY+=("$ISOPATH" "$FILENAME" "OFF")
+    fi
+  done
+
+  if SELECTED_ISO=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SELECT ISO TO INSTALL" --notags --radiolist "\nSelect version (BETA/RC/Latest stable):" 20 58 12 "${ISOARRAY[@]}" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    echo -e "${ISO}${BOLD}${DGN}ISO Chosen: ${BGN}$(basename "$SELECTED_ISO")${CL}"
+  else
+    exit-script
+  fi
+
+  if DISK_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Disk Size in GiB (e.g., 10, 20)" 8 58 "$DISK_SIZE" --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    DISK_SIZE=$(echo "$DISK_SIZE" | tr -d ' ')
+    if [[ "$DISK_SIZE" =~ ^[0-9]+$ ]]; then
+      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}$DISK_SIZE${CL}"
+    else
+      echo -e "${DISKSIZE}${BOLD}${RD}Invalid Disk Size. Please use a number (e.g., 10).${CL}"
+      exit-script
+    fi
+  else
+    exit-script
+  fi
+
+  if VM_NAME=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Hostname" 8 58 "$HN" --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    if [ -z $VM_NAME ]; then
+      echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
+    else
+      HN=$(echo "${VM_NAME,,}" | tr -cs 'a-z0-9-' '-' | sed 's/^-//;s/-$//')
+      if [ "$HN" != "${VM_NAME,,}" ]; then
+        whiptail --backtitle "Proxmox VE Helper Scripts" --title "HOSTNAME ADJUSTED" --msgbox "Invalid characters detected. Hostname has been adjusted to:\n\n  $HN" 10 58
+      fi
+      echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
+    fi
+  else
+    exit-script
+  fi
+
+  if CPU_TYPE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CPU MODEL" --radiolist "Choose CPU Model" --cancel-button Exit-Script 10 58 2 \
+    "KVM64" "Default – safe for migration/compatibility" OFF \
+    "Host" "Use host CPU features (faster, no migration)" ON \
+    3>&1 1>&2 2>&3); then
+    case "$CPU_TYPE1" in
+    Host)
+      echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}Host${CL}"
+      CPU_TYPE="host"
+      ;;
+    *)
+      echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}KVM64${CL}"
+      CPU_TYPE=""
+      ;;
+    esac
+  else
+    exit-script
+  fi
+
+  while true; do
+    if CORE_COUNT=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate CPU Cores" 8 58 "$CORE_COUNT" --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$CORE_COUNT" ]; then CORE_COUNT="2"; fi
+      if [[ "$CORE_COUNT" =~ ^[1-9][0-9]*$ ]]; then
+        echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "CPU Cores must be a positive integer (e.g., 2)." 8 58
+    else
+      exit-script
+    fi
+  done
+
+  while true; do
+    if RAM_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate RAM in MiB" 8 58 "$RAM_SIZE" --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$RAM_SIZE" ]; then RAM_SIZE="8192"; fi
+      if [[ "$RAM_SIZE" =~ ^[1-9][0-9]*$ ]]; then
+        echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "RAM Size must be a positive integer in MiB (e.g., 8192)." 8 58
+    else
+      exit-script
+    fi
+  done
+
+  if BRG=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Bridge" 8 58 "$BRG" --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    if [ -z $BRG ]; then
+      BRG="vmbr0"
+      echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}"
+    else
+      echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}"
+    fi
+  else
+    exit-script
+  fi
+
+  while true; do
+    if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address" 8 58 $GEN_MAC --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$MAC1" ]; then
+        MAC="$GEN_MAC"
+        echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC${CL}"
+        break
+      fi
+      if [[ "$MAC1" =~ ^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$ ]]; then
+        MAC="$MAC1"
+        echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC1${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "Invalid MAC address format. Use XX:XX:XX:XX:XX:XX (e.g., AA:BB:CC:DD:EE:FF)." 8 58
+    else
+      exit-script
+    fi
+  done
+
+  while true; do
+    if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$VLAN1" ]; then
+        VLAN1="Default"
+        VLAN=""
+        echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}$VLAN1${CL}"
+        break
+      fi
+      if [[ "$VLAN1" =~ ^[0-9]+$ ]] && [ "$VLAN1" -ge 1 ] && [ "$VLAN1" -le 4094 ]; then
+        VLAN=",tag=$VLAN1"
+        echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}$VLAN1${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "VLAN must be a number between 1 and 4094, or leave blank for default." 8 58
+    else
+      exit-script
+    fi
+  done
+
+  while true; do
+    if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$MTU1" ]; then
+        MTU1="Default"
+        MTU=""
+        echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}"
+        break
+      fi
+      if [[ "$MTU1" =~ ^[0-9]+$ ]] && [ "$MTU1" -ge 576 ] && [ "$MTU1" -le 65520 ]; then
+        MTU=",mtu=$MTU1"
+        echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "MTU Size must be a number between 576 and 65520, or leave blank for default." 8 58
+    else
+      exit-script
+    fi
+  done
+
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "IMPORT ONBOARD DISKS" --yesno "Would you like to import onboard disks?" 10 58); then
+    echo -e "${DISK}${BOLD}${DGN}Import onboard disks: ${BGN}yes${CL}"
    IMPORT_DISKS="yes"
  else
+    echo -e "${DISK}${BOLD}${DGN}Import onboard disks: ${BGN}no${CL}"
    IMPORT_DISKS="no"
  fi
-  echo -e "${DISK}${BOLD}${DGN}Import onboard disks: ${BGN}${IMPORT_DISKS}${CL}"

-  vm_prompt_start_vm "yes"
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then
+    echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}yes${CL}"
+    START_VM="yes"
+  else
+    echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}no${CL}"
+    START_VM="no"
+  fi

-  if vm_confirm_advanced_settings "Ready to create a TrueNAS VM?"; then
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create a TrueNAS VM?" --no-button Do-Over 10 58); then
    echo -e "${CREATING}${BOLD}${DGN}Creating a TrueNAS VM using the above advanced settings${CL}"
  else
    header_info
@@ -132,11 +501,54 @@ function advanced_settings() {
  fi
 }

-vm_preflight
-vm_start_script "Use Default Settings?" 10 58
+function start_script() {
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
+    header_info
+    echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings${CL}"
+    default_settings
+  else
+    header_info
+    echo -e "${ADVANCED}${BOLD}${RD}Using Advanced Settings${CL}"
+    advanced_settings
+  fi
+}
+check_root
+arch_check
+pve_check
+ssh_check
+start_script
 post_to_api_vm

-vm_select_storage "$HN"
+msg_info "Validating Storage"
+while read -r line; do
+  TAG=$(echo $line | awk '{print $1}')
+  TYPE=$(echo $line | awk '{printf "%-10s", $2}')
+  FREE=$(echo $line | numfmt --field 4-6 --from-unit=K --to=iec --format %.2f | awk '{printf( "%9sB", $6)}')
+  ITEM="  Type: $TYPE Free: $FREE "
+  OFFSET=2
+  if [[ $((${#ITEM} + $OFFSET)) -gt ${MSG_MAX_LENGTH:-} ]]; then
+    MSG_MAX_LENGTH=$((${#ITEM} + $OFFSET))
+  fi
+  STORAGE_MENU+=("$TAG" "$ITEM" "OFF")
+done < <(pvesm status -content images | awk 'NR>1')
+VALID=$(pvesm status -content images | awk 'NR>1')
+if [ -z "$VALID" ]; then
+  msg_error "Unable to detect a valid storage location."
+  exit
+elif [ $((${#STORAGE_MENU[@]} / 3)) -eq 1 ]; then
+  STORAGE=${STORAGE_MENU[0]}
+else
+  while [ -z "${STORAGE:+x}" ]; do
+    if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID >/dev/null; then kill $SPINNER_PID >/dev/null; fi
+    printf "\e[?25h"
+    STORAGE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "Storage Pools" --radiolist \
+      "Which storage pool would you like to use for ${HN}?\nTo make a selection, use the Spacebar.\n" \
+      16 $(($MSG_MAX_LENGTH + 23)) 6 \
+      "${STORAGE_MENU[@]}" 3>&1 1>&2 2>&3)
+  done
+fi
+msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location."
+msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}."

 if [ -z "${SELECTED_ISO:-}" ]; then
  SELECTED_ISO=$(truenas_iso_lookup | grep -vE 'RC|BETA' | sort -V | tail -n 1)
@@ -152,17 +564,21 @@ ISO_NAME=$(basename "$FULL_URL")
 CACHE_DIR="/var/lib/vz/template/iso"
 CACHE_FILE="$CACHE_DIR/$ISO_NAME"

-msg_info "Retrieving the ISO for the TrueNAS Disk Image"
-MIN_ISO_BYTES=$((500 * 1024 * 1024))
-vm_fetch_image "$FULL_URL" "$CACHE_FILE" --cache --min-bytes "$MIN_ISO_BYTES" || exit 115
+if [[ ! -s "$CACHE_FILE" ]]; then
+  msg_info "Retrieving the ISO for the TrueNAS Disk Image"
+  curl -f#SL -o "$CACHE_FILE" "$FULL_URL"
+  msg_ok "Downloaded ${CL}${BL}$(basename "$CACHE_FILE")${CL}"
+else
+  msg_ok "Using cached image ${CL}${BL}$(basename "$CACHE_FILE")${CL}"
+fi

 set -o pipefail
 msg_info "Creating TrueNAS VM shell"
-qm create "$VMID"${MACHINE} -bios ovmf -agent enabled=1 -tablet 0 -localtime 1${CPU_TYPE} \
+qm create "$VMID" -machine q35 -bios ovmf -agent enabled=1 -tablet 0 -localtime 1 -cpu "$CPU_TYPE" \
  -cores "$CORE_COUNT" -memory "$RAM_SIZE" -balloon 0 -name "$HN" -tags community-script \
  -net0 "virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU" -onboot 1 -ostype l26 \
  -efidisk0 $STORAGE:1,efitype=4m,pre-enrolled-keys=0 -sata0 $STORAGE:$DISK_SIZE,ssd=1 \
-  -scsihw virtio-scsi-single -cdrom local:iso/$ISO_NAME -boot order='sata0;ide2' -vga virtio >/dev/null
+  -scsihw virtio-scsi-single -cdrom local:iso/$ISO_NAME -vga virtio >/dev/null
 msg_ok "Created VM shell"

 if [ "$IMPORT_DISKS" == "yes" ]; then
@@ -178,9 +594,7 @@ if [ "$IMPORT_DISKS" == "yes" ]; then
    DISKARRAY+=("$LSOUTPUT" "$TRUNCATED" "OFF")
  done < <(ls /dev/disk/by-id | grep -E '^ata-|^nvme-|^usb-' | grep -v 'part')

-  vm_dialog checklist "SELECT DISKS TO IMPORT" --notags --cancel-button "Exit Script" \
-    "\nSelect disk IDs to import. (Use Spacebar to select)\n" 20 58 10 "${DISKARRAY[@]}" || exit
-  SELECTIONS=$(echo "$VM_DIALOG_RESULT" | tr -d '"')
+  SELECTIONS=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SELECT DISKS TO IMPORT" --checklist "\nSelect disk IDs to import. (Use Spacebar to select)\n" --notags --cancel-button "Exit Script" 20 58 10 "${DISKARRAY[@]}" 3>&1 1>&2 2>&3 | tr -d '"') || exit

  for SELECTION in $SELECTIONS; do
    ((++SCSI_NR))
@@ -193,14 +607,44 @@ if [ "$IMPORT_DISKS" == "yes" ]; then
  msg_ok "Disks imported successfully"
 fi

-set_description
+DESCRIPTION=$(
+  cat <<EOF
+<div align='center'>
+  <a href='https://community-scripts.org' target='_blank' rel='noopener noreferrer'>
+    <img src='https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/images/logo-81x112.png' alt='Logo' style='width:81px;height:112px;'/>
+  </a>
+
+  <h2 style='font-size: 24px; margin: 20px 0;'>TrueNAS Community Edition</h2>
+
+  <p style='margin: 16px 0;'>
+    <a href='https://ko-fi.com/community_scripts' target='_blank' rel='noopener noreferrer'>
+      <img src='https://img.shields.io/badge/&#x2615;-Buy us a coffee-blue' alt='spend Coffee' />
+    </a>
+  </p>
+
+  <span style='margin: 0 10px;'>
+    <i class="fa fa-github fa-fw" style="color: #f5f5f5;"></i>
+    <a href='https://github.com/community-scripts/ProxmoxVE' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>GitHub</a>
+  </span>
+  <span style='margin: 0 10px;'>
+    <i class="fa fa-comments fa-fw" style="color: #f5f5f5;"></i>
+    <a href='https://github.com/community-scripts/ProxmoxVE/discussions' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Discussions</a>
+  </span>
+  <span style='margin: 0 10px;'>
+    <i class="fa fa-exclamation-circle fa-fw" style="color: #f5f5f5;"></i>
+    <a href='https://github.com/community-scripts/ProxmoxVE/issues' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Issues</a>
+  </span>
+</div>
+EOF
+)
+qm set "$VMID" -description "$DESCRIPTION" >/dev/null

 sleep 3

 msg_ok "Created a TrueNAS VM ${CL}${BL}(${HN})"
 if [ "$START_VM" == "yes" ]; then
  msg_info "Starting TrueNAS VM"
-  $STD qm start $VMID
+  qm start $VMID
  msg_ok "Started TrueNAS VM"
 fi